From a863300ae39dcc80cc20a88fa3bde2af9e75b03f Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 9 Dec 2024 15:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91s-layout=20bgStyle=20=E6=A0=B7=E5=BC=8F=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/groupon/list.vue          | 2 +-
 pages/activity/seckill/list.vue          | 4 ++--
 pages/coupon/list.vue                    | 2 +-
 pages/index/cart.vue                     | 2 +-
 pages/index/category.vue                 | 2 +-
 pages/index/search.vue                   | 2 +-
 pages/pay/result.vue                     | 6 +++---
 pages/public/faq.vue                     | 2 +-
 pages/public/richtext.vue                | 2 +-
 pages/public/setting.vue                 | 2 +-
 pages/user/address/list.vue              | 4 ++--
 pages/user/goods-log.vue                 | 2 +-
 pages/user/goods_details_store/index.vue | 2 +-
 sheep/components/s-layout/s-layout.vue   | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue
index b5a27462..0e741876 100644
--- a/pages/activity/groupon/list.vue
+++ b/pages/activity/groupon/list.vue
@@ -1,6 +1,6 @@
 <!-- 拼团活动列表 -->
 <template>
-  <s-layout navbar="inner" :bgStyle="{ color: '#FE832A' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FE832A' }" navbar="inner">
     <view class="page-bg" :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]" />
     <view class="list-content">
       <!-- 参团会员统计 -->
diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue
index 8d3e371a..42b0e323 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -1,6 +1,6 @@
 <!-- 秒杀活动列表 -->
 <template>
-  <s-layout navbar="inner" :bgStyle="{ color: 'rgb(245,28,19)' }">
+  <s-layout :bgStyle="{ backgroundColor: 'rgb(245,28,19)' }" navbar="inner">
     <!--顶部背景图-->
     <view
       class="page-bg"
@@ -146,7 +146,7 @@
   </s-layout>
 </template>
 <script setup>
-  import { reactive, computed, ref, nextTick } from 'vue';
+  import { computed, nextTick, reactive, ref } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import { useDurationTime } from '@/sheep/hooks/useGoods';
diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
index a8055f36..80b850be 100644
--- a/pages/coupon/list.vue
+++ b/pages/coupon/list.vue
@@ -1,6 +1,6 @@
 <!-- 优惠券中心  -->
 <template>
-  <s-layout title="优惠券" :bgStyle="{ color: '#f2f2f2' }">
+  <s-layout :bgStyle="{ backgroundColor: '#f2f2f2' }" title="优惠券">
     <su-sticky bgColor="#fff">
       <su-tabs
         :list="tabMaps"
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 59d740e7..7fb150fd 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -1,5 +1,5 @@
 <template>
-  <s-layout :bgStyle="{ color: '#fff' }" tabbar="/pages/index/cart" title="购物车">
+  <s-layout :bgStyle="{ backgroundColor: '#fff' }" tabbar="/pages/index/cart" title="购物车">
     <s-empty v-if="state.list.length === 0" icon="/static/cart-empty.png" text="购物车空空如也,快去逛逛吧~" />
 
     <!-- 头部 -->
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 4c88f388..99fe3032 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -1,6 +1,6 @@
 <!-- 商品分类列表 -->
 <template>
-  <s-layout title="分类" tabbar="/pages/index/category" :bgStyle="{ color: '#fff' }">
+  <s-layout :bgStyle="{ backgroundColor: '#fff' }" tabbar="/pages/index/category" title="分类">
     <view class="s-category">
       <view class="three-level-wrap ss-flex ss-col-top" :style="[{ height: pageHeight + 'px' }]">
         <!-- 商品分类（左） -->
diff --git a/pages/index/search.vue b/pages/index/search.vue
index 84972987..a1806389 100644
--- a/pages/index/search.vue
+++ b/pages/index/search.vue
@@ -1,6 +1,6 @@
 <!-- 搜索界面 -->
 <template>
-  <s-layout class="set-wrap" title="搜索" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" class="set-wrap" title="搜索">
     <view class="ss-p-x-24">
       <view class="ss-flex ss-col-center">
         <uni-search-bar
diff --git a/pages/pay/result.vue b/pages/pay/result.vue
index 3a8a446d..0678b209 100644
--- a/pages/pay/result.vue
+++ b/pages/pay/result.vue
@@ -1,6 +1,6 @@
 <!-- 支付结果页面 -->
 <template>
-  <s-layout title="支付结果" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" title="支付结果">
     <view class="pay-result-box ss-flex-col ss-row-center ss-col-center">
       <!-- 信息展示 -->
       <view class="pay-waiting ss-m-b-30" v-if="payResult === 'waiting'" />
@@ -63,8 +63,8 @@
 </template>
 
 <script setup>
-  import { onLoad, onHide, onShow } from '@dcloudio/uni-app';
-  import { reactive, computed, ref } from 'vue';
+  import { onHide, onLoad, onShow } from '@dcloudio/uni-app';
+  import { computed, reactive, ref } from 'vue';
   import { isEmpty } from 'lodash-es';
   import sheep from '@/sheep';
   import PayOrderApi from '@/sheep/api/pay/order';
diff --git a/pages/public/faq.vue b/pages/public/faq.vue
index ebfeaf85..6a28d50b 100644
--- a/pages/public/faq.vue
+++ b/pages/public/faq.vue
@@ -1,6 +1,6 @@
 <!-- FAQ 常见问题 -->
 <template>
-  <s-layout class="set-wrap" title="常见问题" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" class="set-wrap" title="常见问题">
     <uni-collapse>
       <uni-collapse-item v-for="(item, index) in state.list" :key="item">
         <template v-slot:title>
diff --git a/pages/public/richtext.vue b/pages/public/richtext.vue
index e4a09211..dfa3ba7a 100644
--- a/pages/public/richtext.vue
+++ b/pages/public/richtext.vue
@@ -1,6 +1,6 @@
 <!-- 文章展示 -->
 <template>
-  <s-layout class="set-wrap" :title="state.title" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" :title="state.title" class="set-wrap">
     <view class="ss-p-30">
       <mp-html class="richtext" :content="state.content" />
     </view>
diff --git a/pages/public/setting.vue b/pages/public/setting.vue
index 59a11b4b..dc5f5a1f 100644
--- a/pages/public/setting.vue
+++ b/pages/public/setting.vue
@@ -1,5 +1,5 @@
 <template>
-  <s-layout class="set-wrap" title="系统设置" :bgStyle="{ color: '#fff' }">
+  <s-layout :bgStyle="{ backgroundColor: '#fff' }" class="set-wrap" title="系统设置">
     <view class="header-box ss-flex-col ss-row-center ss-col-center">
       <image
         class="logo-img ss-m-b-46"
diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue
index 58b62147..a64410a0 100644
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@@ -1,6 +1,6 @@
 <!-- 收件地址列表 -->
 <template>
-  <s-layout title="收货地址" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" title="收货地址">
     <view v-if="state.list.length">
       <s-address-item
         hasBorderBottom
@@ -40,7 +40,7 @@
 
 <script setup>
   import { onBeforeMount, reactive } from 'vue';
-  import { onShow, onLoad } from '@dcloudio/uni-app';
+  import { onLoad, onShow } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import { isEmpty } from 'lodash-es';
   import AreaApi from '@/sheep/api/system/area';
diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue
index b52efe3c..8758cc9b 100644
--- a/pages/user/goods-log.vue
+++ b/pages/user/goods-log.vue
@@ -1,6 +1,6 @@
 <!-- 商品浏览记录  -->
 <template>
-  <s-layout title="我的足迹" :bgStyle="{ color: '#f2f2f2' }">
+  <s-layout :bgStyle="{ backgroundColor: '#f2f2f2' }" title="我的足迹">
     <view class="cart-box ss-flex ss-flex-col ss-row-between">
       <!-- 头部 -->
       <view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
index 86c2d4aa..82a7911d 100644
--- a/pages/user/goods_details_store/index.vue
+++ b/pages/user/goods_details_store/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <s-layout title="选择自提门店" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" title="选择自提门店">
     <view class="storeBox" ref="container">
       <view
         class="storeBox-box"
diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
index 6f5d3a24..e0ba1b33 100644
--- a/sheep/components/s-layout/s-layout.vue
+++ b/sheep/components/s-layout/s-layout.vue
@@ -107,7 +107,7 @@
       type: Object,
       default: () => ({
         src: '',
-        color: 'var(--ui-BG-1)',
+        backgroundColor: 'var(--ui-BG-1)',
       }),
     },
     tabbar: {