From 164589f63438df8eec9abf6e2e77ccfc7d90cf03 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 11 Dec 2024 13:08:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1?=
 =?UTF-8?q?=E3=80=91=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=8F=90=E4=BA=A4=E7=9A=84?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E3=80=81bgStyle=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/cart.vue                   | 68 +++++++++++++++++++-------
 sheep/components/s-layout/s-layout.vue |  1 +
 sheep/platform/share.js                |  1 -
 3 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 7fb150fd..c257ede2 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -1,6 +1,10 @@
 <template>
   <s-layout :bgStyle="{ backgroundColor: '#fff' }" tabbar="/pages/index/cart" title="购物车">
-    <s-empty v-if="state.list.length === 0" icon="/static/cart-empty.png" text="购物车空空如也,快去逛逛吧~" />
+    <s-empty
+      v-if="state.list.length === 0"
+      icon="/static/cart-empty.png"
+      text="购物车空空如也,快去逛逛吧~"
+    />
 
     <!-- 头部 -->
     <view v-if="state.list.length" class="cart-box ss-flex ss-flex-col ss-row-between">
@@ -24,16 +28,35 @@
         <view v-for="item in state.list" :key="item.id" class="goods-box ss-r-10 ss-m-b-14">
           <view class="ss-flex ss-col-center">
             <label class="check-box ss-flex ss-col-center ss-p-l-10" @tap="onSelectSingle(item.id)">
-              <radio :checked="state.selectedIds.includes(item.id)" color="var(--ui-BG-Main)"
-                     style="transform: scale(0.8)" @tap.stop="onSelectSingle(item.id)" />
+              <radio
+                :checked="state.selectedIds.includes(item.id)"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onSelectSingle(item.id)"
+              />
             </label>
-            <s-goods-item :img="item.spu.picUrl || item.goods.image" :price="item.sku.price"
-                          :skuText="item.sku.properties.length>1? item.sku.properties.reduce((items2,items)=>items2.valueName+' '+items.valueName):item.sku.properties[0].valueName"
-                          :title="item.spu.name"
-                          :titleWidth="400" priceColor="#FF3000">
+            <s-goods-item
+              :img="item.spu.picUrl || item.goods.image"
+              :price="item.sku.price"
+              :skuText="
+                item.sku.properties.length > 1
+                  ? item.sku.properties.reduce(
+                      (items2, items) => items2.valueName + ' ' + items.valueName,
+                    )
+                  : item.sku.properties[0].valueName
+              "
+              :title="item.spu.name"
+              :titleWidth="400"
+              priceColor="#FF3000"
+            >
               <template v-if="!state.editMode" v-slot:tool>
-                <su-number-box v-model="item.count" :max="item.sku.stock" :min="0" :step="1"
-                               @change="onNumberChange($event, item)" />
+                <su-number-box
+                  v-model="item.count"
+                  :max="item.sku.stock"
+                  :min="0"
+                  :step="1"
+                  @change="onNumberChange($event, item)"
+                />
               </template>
             </s-goods-item>
           </view>
@@ -44,8 +67,12 @@
         <view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
           <view class="footer-left ss-flex ss-col-center">
             <label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
-              <radio :checked="state.isAllSelected" color="var(--ui-BG-Main)"
-                     style="transform: scale(0.8)" @tap.stop="onSelectAll" />
+              <radio
+                :checked="state.isAllSelected"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onSelectAll"
+              />
               <view class="ss-m-l-8"> 全选</view>
             </label>
             <text>合计：</text>
@@ -54,12 +81,18 @@
             </view>
           </view>
           <view class="footer-right">
-            <button v-if="state.editMode" class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
-                    @tap="onDelete">
+            <button
+              v-if="state.editMode"
+              class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
+              @tap="onDelete"
+            >
               删除
             </button>
-            <button v-else class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
-                    @tap="onConfirm">
+            <button
+              v-else
+              class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
+              @tap="onConfirm"
+            >
               去结算
               {{ state.selectedIds?.length ? `(${state.selectedIds.length})` : '' }}
             </button>
@@ -133,8 +166,9 @@
         reject('获取商品信息失败！！！');
         return;
       }
-      let onlyExpress = false;  // 只快递
-      let onlyPickup = false;   // 只自提
+      let onlyExpress = false; // 只快递
+      let onlyPickup = false; // 只自提
+      // TODO @puhui999：这里需要比对，A 商品支持自提、B 商品支持快递，这样导致 A 和 B 无法一起下单。
       const deliveryTypes = data.map((item) => item.deliveryTypes);
       for (const deliveryType of deliveryTypes) {
         // 情况一：两种配送方式都支持
diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
index e0ba1b33..5f93bdc3 100644
--- a/sheep/components/s-layout/s-layout.vue
+++ b/sheep/components/s-layout/s-layout.vue
@@ -153,6 +153,7 @@
   });
 
   // 背景1
+  // TODO puhui999：是不是应该还是用 color。然后后端装修那，做下调整~
   const bgMain = computed(() => {
     if (navbarMode.value === 'inner') {
       return {
diff --git a/sheep/platform/share.js b/sheep/platform/share.js
index 7f47213c..c238e0e4 100644
--- a/sheep/platform/share.js
+++ b/sheep/platform/share.js
@@ -194,7 +194,6 @@ const bindBrokerageUser = async (val = undefined) => {
     if (!!data || msg.includes('不能绑定自己')) {
       uni.removeStorageSync('shareId');
     }
-
   } catch (e) {
     console.error(e);
   }