From 52cfca1ca17f35b320edd7c3c66ccbe7828e7fab Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 19 Dec 2024 16:23:35 +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?=
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          | 2 +-
 pages/coupon/list.vue                    | 2 +-
 pages/index/cart.vue                     | 2 +-
 pages/index/category.vue                 | 2 +-
 pages/index/search.vue                   | 2 +-
 pages/pay/result.vue                     | 2 +-
 pages/public/faq.vue                     | 2 +-
 pages/public/richtext.vue                | 2 +-
 pages/public/setting.vue                 | 2 +-
 pages/user/address/list.vue              | 2 +-
 pages/user/goods-log.vue                 | 2 +-
 pages/user/goods_details_store/index.vue | 2 +-
 sheep/components/s-layout/s-layout.vue   | 7 +++----
 14 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue
index 0e741876..0cd8bc97 100644
--- a/pages/activity/groupon/list.vue
+++ b/pages/activity/groupon/list.vue
@@ -1,6 +1,6 @@
 <!-- 拼团活动列表 -->
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#FE832A' }" navbar="inner">
+  <s-layout :bgStyle="{ color: '#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 42b0e323..54ec8ba3 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -1,6 +1,6 @@
 <!-- 秒杀活动列表 -->
 <template>
-  <s-layout :bgStyle="{ backgroundColor: 'rgb(245,28,19)' }" navbar="inner">
+  <s-layout :bgStyle="{ color: 'rgb(245,28,19)' }" navbar="inner">
     <!--顶部背景图-->
     <view
       class="page-bg"
diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
index 80b850be..5592e215 100644
--- a/pages/coupon/list.vue
+++ b/pages/coupon/list.vue
@@ -1,6 +1,6 @@
 <!-- 优惠券中心  -->
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#f2f2f2' }" title="优惠券">
+  <s-layout :bgStyle="{ color: '#f2f2f2' }" title="优惠券">
     <su-sticky bgColor="#fff">
       <su-tabs
         :list="tabMaps"
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index e6b58bea..2a114a8a 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -1,5 +1,5 @@
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#fff' }" tabbar="/pages/index/cart" title="购物车">
+  <s-layout :bgStyle="{ color: '#fff' }" tabbar="/pages/index/cart" title="购物车">
     <s-empty
       v-if="state.list.length === 0"
       icon="/static/cart-empty.png"
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 99fe3032..07a05204 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -1,6 +1,6 @@
 <!-- 商品分类列表 -->
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#fff' }" tabbar="/pages/index/category" title="分类">
+  <s-layout :bgStyle="{ color: '#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 a1806389..def16ccf 100644
--- a/pages/index/search.vue
+++ b/pages/index/search.vue
@@ -1,6 +1,6 @@
 <!-- 搜索界面 -->
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" class="set-wrap" title="搜索">
+  <s-layout :bgStyle="{ color: '#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 0678b209..c52b1195 100644
--- a/pages/pay/result.vue
+++ b/pages/pay/result.vue
@@ -1,6 +1,6 @@
 <!-- 支付结果页面 -->
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" title="支付结果">
+  <s-layout :bgStyle="{ color: '#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'" />
diff --git a/pages/public/faq.vue b/pages/public/faq.vue
index 6a28d50b..627f4d5a 100644
--- a/pages/public/faq.vue
+++ b/pages/public/faq.vue
@@ -1,6 +1,6 @@
 <!-- FAQ 常见问题 -->
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" class="set-wrap" title="常见问题">
+  <s-layout :bgStyle="{ color: '#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 dfa3ba7a..bf6385a9 100644
--- a/pages/public/richtext.vue
+++ b/pages/public/richtext.vue
@@ -1,6 +1,6 @@
 <!-- 文章展示 -->
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" :title="state.title" class="set-wrap">
+  <s-layout :bgStyle="{ color: '#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 dc5f5a1f..34da0dff 100644
--- a/pages/public/setting.vue
+++ b/pages/public/setting.vue
@@ -1,5 +1,5 @@
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#fff' }" class="set-wrap" title="系统设置">
+  <s-layout :bgStyle="{ color: '#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 a64410a0..15ce34ef 100644
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@@ -1,6 +1,6 @@
 <!-- 收件地址列表 -->
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" title="收货地址">
+  <s-layout :bgStyle="{ color: '#FFF' }" title="收货地址">
     <view v-if="state.list.length">
       <s-address-item
         hasBorderBottom
diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue
index 8758cc9b..4def00fd 100644
--- a/pages/user/goods-log.vue
+++ b/pages/user/goods-log.vue
@@ -1,6 +1,6 @@
 <!-- 商品浏览记录  -->
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#f2f2f2' }" title="我的足迹">
+  <s-layout :bgStyle="{ color: '#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 82a7911d..f1b0c84d 100644
--- a/pages/user/goods_details_store/index.vue
+++ b/pages/user/goods_details_store/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" title="选择自提门店">
+  <s-layout :bgStyle="{ color: '#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 5f93bdc3..be8eab20 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: '',
-        backgroundColor: 'var(--ui-BG-1)',
+        color: 'var(--ui-BG-1)',
       }),
     },
     tabbar: {
@@ -153,11 +153,10 @@
   });
 
   // 背景1
-  // TODO puhui999：是不是应该还是用 color。然后后端装修那，做下调整~
   const bgMain = computed(() => {
     if (navbarMode.value === 'inner') {
       return {
-        background: `${props.bgStyle.backgroundColor} url(${sheep.$url.cdn(
+        background: `${props.bgStyle.backgroundColor || props.bgStyle.color} url(${sheep.$url.cdn(
           props.bgStyle.backgroundImage,
         )}) no-repeat top center / 100% auto`,
       };
@@ -169,7 +168,7 @@
   const bgBody = computed(() => {
     if (navbarMode.value === 'normal') {
       return {
-        background: `${props.bgStyle.backgroundColor} url(${sheep.$url.cdn(
+        background: `${props.bgStyle.backgroundColor || props.bgStyle.color} url(${sheep.$url.cdn(
           props.bgStyle.backgroundImage,
         )}) no-repeat top center / 100% auto`,
       };