【缺陷修复】s-layout bgStyle 样式

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">
       <!-- 参团会员统计 -->

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"

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"

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"

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' }]">
         <!-- 商品分类（左） -->

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

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'" />

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>

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>

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"

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

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">

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"

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`,
       };