From b98f848be17ccd81f3649ea1d4646d5295f50113 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 5 Aug 2024 18:00:11 +0800
Subject: [PATCH 01/84] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?=
 =?UTF-8?q?=E8=87=AA=E6=8F=90=E9=97=A8=E5=BA=97=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                               |  12 +
 pages/order/addressSelection.vue         | 241 ++++++++++++++++++++
 pages/order/confirm.vue                  |  11 +-
 pages/user/goods_details_store/index.vue | 274 +++++++++++++++++++++++
 sheep/api/trade/delivery.js              |   8 +
 static/images/line.png                   | Bin 0 -> 3943 bytes
 6 files changed, 538 insertions(+), 8 deletions(-)
 create mode 100644 pages/order/addressSelection.vue
 create mode 100644 pages/user/goods_details_store/index.vue
 create mode 100644 static/images/line.png

diff --git a/pages.json b/pages.json
index 72d50091..78d7c311 100644
--- a/pages.json
+++ b/pages.json
@@ -307,6 +307,18 @@
 						"title": "编辑地址"
 					}
 				},
+                {
+                  "path": "goods_details_store/index",
+                  "style": {
+                    "navigationBarTitleText": "自提门店"
+                  },
+                  "meta": {
+                    "auth": true,
+                    "sync": true,
+                    "title": "地址管理",
+                    "group": "用户中心"
+                  }
+                },
 				{
 					"path": "wallet/money",
 					"style": {
diff --git a/pages/order/addressSelection.vue b/pages/order/addressSelection.vue
new file mode 100644
index 00000000..fd180371
--- /dev/null
+++ b/pages/order/addressSelection.vue
@@ -0,0 +1,241 @@
+<template>
+  <view class="allAddress" :style="state.isPickUp ? '':'padding-top:10rpx;'">
+    <view class="nav flex flex-wrap">
+      <view class="item font-color" :class="state.deliveryType === 1 ? 'on' : 'on2'"
+            @tap="switchDeliveryType(1)" v-if='state.isPickUp' />
+      <view class="item font-color" :class="state.deliveryType === 2 ? 'on' : 'on2'"
+            @tap="switchDeliveryType(2)" v-if='state.isPickUp' />
+    </view>
+    <!-- 收货地址的选择 -->
+    <view class='address flex flex-wrap flex-center ss-row-between' @tap='onSelectAddress' v-if='state.deliveryType === 1'
+          :style="state.isPickUp ? '':'border-top-left-radius: 14rpx;border-top-right-radius: 14rpx;'">
+      <view class='addressCon' v-if="state.addressInfo.name">
+        <view class='name'>{{ state.addressInfo.name }}
+          <text class='phone'>{{ state.addressInfo.mobile }}</text>
+        </view>
+        <view class="flex flex-wrap">
+          <text class='default font-color' v-if="state.addressInfo.defaultStatus">[默认]</text>
+          <text class="line2">{{ state.addressInfo.areaName }} {{ state.addressInfo.detailAddress }}</text>
+        </view>
+      </view>
+      <view class='addressCon' v-else>
+        <view class='setaddress'>设置收货地址</view>
+      </view>
+      <view class='iconfont'>
+        <view class="ss-rest-button">
+          <text class="_icon-forward" />
+        </view>
+      </view>
+    </view>
+    <!-- 门店的选择 -->
+    <view class='address flex flex-wrap flex-center ss-row-between' v-else @tap="onSelectAddress">
+        <view class='addressCon' v-if="state.pickUpInfo.name">
+          <view class='name'>{{ state.pickUpInfo.name }}
+            <text class='phone'>{{ state.pickUpInfo.phone }}</text>
+          </view>
+          <view class="line1"> {{ state.pickUpInfo.areaName }}{{ ', ' + state.pickUpInfo.detailAddress }}
+          </view>
+        </view>
+        <view class='addressCon' v-else>
+          <view class='setaddress'>选择自提门店</view>
+        </view>
+        <view class='iconfont'>
+          <view class="ss-rest-button">
+            <text class="_icon-forward" />
+          </view>
+        </view>
+    </view>
+    <view class='line'>
+      <image :src="sheep.$url.static('/static/images/line.png', 'local')"></image>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { reactive } from 'vue';
+  import sheep from '@/sheep';
+  import { isEmpty } from 'lodash';
+
+  const state = reactive({
+    addressInfo: {}, // 选择的收货地址
+    deliveryType: 1, // 收货方式 1 - 快递配送；2 - 门店自提
+    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
+    pickUpInfo: {}, // 选择的自提门店信息
+  });
+
+  // 选择地址
+  function onSelectAddress() {
+    let emitName = 'SELECT_ADDRESS'
+    let addressPage = '/pages/user/address/list'
+    if (state.deliveryType === 2){
+      emitName = 'SELECT_PICK_UP_INFO'
+      addressPage = '/pages/user/goods_details_store/index'
+    }
+    uni.$once(emitName, (e) => {
+      changeConsignee(e.addressInfo);
+    });
+    sheep.$router.go(addressPage);
+  }
+
+  // 更改收货人地址&计算订单信息
+  async function changeConsignee(addressInfo = {}) {
+    if (!isEmpty(addressInfo)) {
+      if (state.deliveryType === 1){
+        state.addressInfo = addressInfo;
+      }
+      if (state.deliveryType === 2){
+        state.pickUpInfo = addressInfo;
+      }
+    }
+  }
+
+  // 收货方式切换
+  const switchDeliveryType = (type) =>{
+    state.deliveryType = type;
+  }
+</script>
+
+<style scoped lang="scss">
+  .allAddress .font-color{
+    color: #E93323!important
+  }
+  .line2{
+    width: 504rpx;
+  }
+  .textR {
+    text-align: right;
+  }
+
+  .line {
+    width: 100%;
+    height: 3rpx;
+  }
+
+  .line image {
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+
+  .address {
+    padding: 28rpx;
+    background-color: #fff;
+    box-sizing: border-box;
+  }
+
+  .address .addressCon {
+    width: 596rpx;
+    font-size: 26rpx;
+    color: #666;
+  }
+
+  .address .addressCon .name {
+    font-size: 30rpx;
+    color: #282828;
+    font-weight: bold;
+    margin-bottom: 10rpx;
+  }
+
+  .address .addressCon .name .phone {
+    margin-left: 50rpx;
+  }
+
+  .address .addressCon .default {
+    margin-right: 12rpx;
+  }
+
+  .address .addressCon .setaddress {
+    color: #333;
+    font-size: 28rpx;
+  }
+
+  .address .iconfont {
+    font-size: 35rpx;
+    color: #707070;
+  }
+
+  .allAddress {
+    width: 100%;
+    background: linear-gradient(to bottom, #e93323 0%, #f5f5f5 100%);
+    // background-image: linear-gradient(to bottom, #e93323 0%, #f5f5f5 100%);
+    // background-image: -webkit-linear-gradient(to bottom, #e93323 0%, #f5f5f5 100%);
+    // background-image: -moz-linear-gradient(to bottom, #e93323 0%, #f5f5f5 100%);
+    //padding: 100rpx 30rpx 0 30rpx;
+    padding-top: 100rpx;
+    padding-bottom: 10rpx;
+  }
+
+  .allAddress .nav {
+    width: 690rpx;
+    margin: 0 auto;
+  }
+
+  .allAddress .nav .item {
+    width: 334rpx;
+  }
+
+  .allAddress .nav .item.on {
+    position: relative;
+    width: 230rpx;
+  }
+
+  .allAddress .nav .item.on::before {
+    position: absolute;
+    bottom: 0;
+    content: "快递配送";
+    font-size: 28rpx;
+    display: block;
+    height: 0;
+    width: 336rpx;
+    border-width: 0 20rpx 80rpx 0;
+    border-style: none solid solid;
+    border-color: transparent transparent #fff;
+    z-index: 2;
+    border-radius: 14rpx 36rpx 0 0;
+    text-align: center;
+    line-height: 80rpx;
+  }
+
+  .allAddress .nav .item:nth-of-type(2).on::before {
+    content: "到店自提";
+    border-width: 0 0 80rpx 20rpx;
+    border-radius: 36rpx 14rpx 0 0;
+  }
+
+  .allAddress .nav .item.on2 {
+    position: relative;
+  }
+
+  .allAddress .nav .item.on2::before {
+    position: absolute;
+    bottom: 0;
+    content: "到店自提";
+    font-size: 28rpx;
+    display: block;
+    height: 0;
+    width: 401rpx;
+    border-width: 0 0 60rpx 60rpx;
+    border-style: none solid solid;
+    border-color: transparent transparent #f7c1bd;
+    border-radius: 36rpx 14rpx 0 0;
+    text-align: center;
+    line-height: 60rpx;
+  }
+
+  .allAddress .nav .item:nth-of-type(1).on2::before {
+    content: "快递配送";
+    border-width: 0 60rpx 60rpx 0;
+    border-radius: 14rpx 36rpx 0 0;
+  }
+
+  .allAddress .address {
+    width: 690rpx;
+    max-height: 180rpx;
+    margin: 0 auto;
+  }
+
+  .allAddress .line {
+    width: 100%;
+    margin: 0 auto;
+  }
+</style>
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 5892a239..c84d2169 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -1,13 +1,7 @@
 <template>
   <s-layout title="确认订单">
-    <!-- TODO：这个判断先删除 v-if="state.orderInfo.need_address === 1" -->
-    <view class="bg-white address-box ss-m-b-14 ss-r-b-10" @tap="onSelectAddress">
-      <s-address-item :item="state.addressInfo" :hasBorderBottom="false">
-        <view class="ss-rest-button">
-          <text class="_icon-forward" />
-        </view>
-      </s-address-item>
-    </view>
+    <!-- 头部地址选择【配送地址】【自提地址】 -->
+    <AddressSelection></AddressSelection>
 
     <!-- 商品信息 -->
     <view class="order-card-box ss-m-b-14">
@@ -161,6 +155,7 @@
 <script setup>
   import { reactive } from 'vue';
   import { onLoad } from '@dcloudio/uni-app';
+  import AddressSelection from '@/pages/order/addressSelection.vue';
   import sheep from '@/sheep';
   import { isEmpty } from 'lodash';
   import OrderApi from '@/sheep/api/trade/order';
diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
new file mode 100644
index 00000000..88e006fb
--- /dev/null
+++ b/pages/user/goods_details_store/index.vue
@@ -0,0 +1,274 @@
+<template>
+  <view class="storeBox" ref="container">
+    <view class="storeBox-box" v-for="(item, index) in state.storeList" :key="index" @tap="checked(item)">
+      <view class="store-img">
+        <image :src="item.logo" class="img"/>
+      </view>
+      <view class="store-cent-left">
+        <view class="store-name">{{ item.name }}</view>
+        <view class="store-address line1">
+          {{ item.areaName }}{{ ', ' + item.detailAddress }}
+        </view>
+      </view>
+      <view class="row-right ss-flex-col ss-col-center">
+        <view>
+          <!-- #ifdef H5 -->
+          <a class="store-phone" :href="'tel:' + item.phone">
+            <view class="iconfont">
+              <view class="ss-rest-button">
+                <text class="_icon-forward" />
+              </view>
+            </view>
+          </a>
+          <!-- #endif -->
+          <!-- #ifdef MP -->
+          <view class="store-phone" @click="call(item.phone)">
+            <view class="iconfont">
+              <view class="ss-rest-button">
+                <text class="_icon-forward" />
+              </view>
+            </view>
+          </view>
+          <!-- #endif -->
+        </view>
+        <view class="store-distance ss-flex ss-row-center" @tap="showMaoLocation(item)">
+          <text class="addressTxt" v-if="item.distance">距离{{ item.distance.toFixed(2) }}千米</text>
+          <text class="addressTxt" v-else>查看地图</text>
+          <view class="iconfont">
+            <view class="ss-rest-button">
+              <text class="_icon-forward" />
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import DeliveryApi from '@/sheep/api/trade/delivery';
+  import { onMounted, reactive } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+
+  const LONGITUDE = 'user_longitude';
+  const LATITUDE = 'user_latitude';
+  const MAPKEY = 'mapKey';
+  const state = reactive({
+    loaded: false,
+    loading: false,
+    storeList: [],
+    system_store: {},
+    // mapKey: cookie.get(MAPKEY),
+    locationShow: false,
+    user_latitude: 0,
+    user_longitude: 0,
+  });
+
+  const call = (phone) => {
+    uni.makePhoneCall({
+      phoneNumber: phone,
+    });
+  };
+  const selfLocation = () => {
+    // TODO h5 地图
+    // #ifdef H5
+    // if (state.$wechat.isWeixin()) {
+    //   state.$wechat.location().then(res => {
+    //     state.user_latitude = res.latitude;
+    //     state.user_longitude = res.longitude;
+    //     uni.setStorageSync(LATITUDE, res.latitude);
+    //     uni.setStorageSync(LONGITUDE, res.longitude);
+    //     getList();
+    //   });
+    // } else {
+      // #endif
+      uni.getLocation({
+        type: 'gcj02',
+        success: (res) => {
+          try {
+            state.user_latitude = res.latitude;
+            state.user_longitude = res.longitude;
+            uni.setStorageSync(LATITUDE, res.latitude);
+            uni.setStorageSync(LONGITUDE, res.longitude);
+          } catch {
+          }
+          getList();
+        },
+        complete: () => {
+          getList();
+        },
+      });
+      // #ifdef H5
+    // }
+    // #endif
+  };
+  const showMaoLocation = (e) => {
+    // TODO h5 地图
+    // #ifdef H5
+    // if (state.$wechat.isWeixin()) {
+    //   state.$wechat.seeLocation({
+    //     latitude: Number(e.latitude),
+    //     longitude: Number(e.longitude),
+    //   }).then(res => {
+    //     console.log('success');
+    //   });
+    // } else {
+      // #endif
+      uni.openLocation({
+        latitude: Number(e.latitude),
+        longitude: Number(e.longitude),
+        name: e.name,
+        address: `${e.areaName}-${e.detailAddress}`,
+        success: function() {
+          console.log('success');
+        },
+      });
+      // #ifdef H5
+    // }
+    // #endif
+  };
+
+  /**
+   * 选中门店
+   */
+  const checked = (addressInfo) => {
+    uni.$emit('SELECT_PICK_UP_INFO', {
+      addressInfo
+    });
+    sheep.$router.back();
+  };
+
+  /**
+   * 获取门店列表数据
+   */
+  const getList = async () => {
+    if (state.loading || state.loaded) {
+      return;
+    }
+    state.loading = true;
+    const { data, code } = await DeliveryApi.getDeliveryPickUpStoreList({
+      latitude: state.user_latitude,
+      longitude: state.user_longitude,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.loading = false;
+    state.storeList = data;
+  };
+
+  onMounted(() => {
+    if (state.user_latitude && state.user_longitude) {
+      getList();
+    } else {
+      selfLocation();
+      getList();
+    }
+  });
+  onLoad(() => {
+    try {
+      state.user_latitude = uni.getStorageSync(LATITUDE);
+      state.user_longitude = uni.getStorageSync(LONGITUDE);
+    } catch (e) {
+      // error
+    }
+  });
+</script>
+<style lang="scss" scoped>
+  .line1 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap
+  }
+
+  .geoPage {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    z-index: 10000;
+  }
+
+  .storeBox {
+    width: 100%;
+    background-color: #fff;
+    padding: 0 30rpx;
+  }
+
+  .storeBox-box {
+    width: 100%;
+    height: auto;
+    display: flex;
+    align-items: center;
+    padding: 23rpx 0;
+    justify-content: space-between;
+    border-bottom: 1px solid #eee;
+  }
+
+  .store-cent {
+    display: flex;
+    align-items: center;
+    width: 80%;
+  }
+
+  .store-cent-left {
+    //width: 45%;
+    flex: 2;
+  }
+
+  .store-img {
+    flex: 1;
+    width: 120rpx;
+    height: 120rpx;
+    border-radius: 6rpx;
+    margin-right: 22rpx;
+  }
+
+  .store-img .img {
+    width: 100%;
+    height: 100%;
+  }
+
+  .store-name {
+    color: #282828;
+    font-size: 30rpx;
+    margin-bottom: 22rpx;
+    font-weight: 800;
+  }
+
+  .store-address {
+    color: #666666;
+    font-size: 24rpx;
+  }
+
+  .store-phone {
+    width: 50rpx;
+    height: 50rpx;
+    color: #fff;
+    border-radius: 50%;
+    display: block;
+    text-align: center;
+    line-height: 48rpx;
+    background-color: #e83323;
+    margin-bottom: 22rpx;
+    text-decoration: none;
+  }
+
+  .store-distance {
+    font-size: 22rpx;
+    color: #e83323;
+  }
+
+  .iconfont {
+    font-size: 20rpx;
+  }
+
+  .row-right {
+    flex: 2;
+    //display: flex;
+    //flex-direction: column;
+    //align-items: flex-end;
+    //width: 33.5%;
+  }
+</style>
diff --git a/sheep/api/trade/delivery.js b/sheep/api/trade/delivery.js
index 27a08d95..6f0f7f5a 100644
--- a/sheep/api/trade/delivery.js
+++ b/sheep/api/trade/delivery.js
@@ -7,6 +7,14 @@ const DeliveryApi = {
       url: `/trade/delivery/express/list`,
       method: 'get',
     });
+  },
+  // 获得自提门店列表
+  getDeliveryPickUpStoreList: (params) => {
+    return request({
+      url: `/trade/delivery/pick-up-store/list`,
+      method: 'GET',
+      params
+    });
   }
 };
 
diff --git a/static/images/line.png b/static/images/line.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4b633d00a10de9e9c9e65df7f46cb9dbc65ef50
GIT binary patch
literal 3943
zcmV-t518<YP)<h;3K|Lk000e1NJLTq00Qj*0009B0ssI2s12s;000jzNkl<ZcwT*2
z2X|A~vd%AlYrUI<Zfq>evaQ~`WXXjR!wUxEB1={?m=bCrK;Q;KfJ-n%^_;WYyqSGu
zLl9iA@$r#a-h4CP%r`UpI}Z58@X4T$k5?_oUzVYUOx3?`>4r*f_hU^nQM1xJ;4MS=
zQh(<$C?&Ww=`{RSXqHl7(&46BnHR+|dD5c_AvN!T;uI8oYJNr)r(tdeZT|)E<)jBZ
z-@~OMYkvSi$Kq-D#3Mm60rIalEMAd;W<T8&@vSf6?OVL6a+@M|MS5%8w_?_QQ*Hcf
z#Sjky6p909JqZ>b`}cF}j7DXfjbz@fU#3OTB~DNCMHkHa<a`KD&#=q^l^8d!H9=VT
z=Te!7kddcdeA!iS`dTlz#bet%QRRpvS?_0>MzSXGW1=q5;x&$zY)E{MT((>nx}`hN
z?&Dz`Ss+ij2F3(JHFuxEnHc0Jpy(0vJ_7bN6N_$Dbi<i2WXDwWAiuK7`xH7!L6jVX
zP*M{uZ~X}YL{$@Cw<eEOS+dS@HApr(@ofl}MReoCAFsQDNRWN<6e9=*{lJqsTrb0d
zo6kC6(GQD0vFKHEfxQ6k1#{0hhB|hL&-wX_N0cXw9_X+MQs4*K?-+3Iri|BQx^6}4
zYM5Eul64cIrW;1MCMQes=U<F&7vWI85x>#|&hZxn^4(K;HlpSxwN1hNUa}3$gZzp`
z2ZmP`LU6{TG6z*`#N640UQghWl5>5ILQfSD^5{L}>U}Q)sIz3%%2j2m#%yMX4T~k%
z0N-lw#uK|POkE-RTl5Jk=JfR{EX+V|5{mv|W^GdoE-1LgsQ{dG8;K))E(*_|3JMxJ
ztCJ9jWKi9ng7bF)6YLX)#%FXlja<b@*JZR}BpUtnm2S8S{t~-zZTGJ>QJ^sOluZgH
zH&G4-tDl7QxGKhBVOlPDRna?)a9}w<EX^391F$p;ofj6y58(k-ZqLGp*#o}$R8e_W
zA=I>nnYAs^V9};1G&-4Wa9t3^I)Amx$XSY_t`YneoXP~#=4J_IU8Eki*-BENTE>#G
zko00eoObi#xOE!y(+TNgVj%=i9xA1z_E59S=>Z?!Sn$)eeza=jYmjL6Qd|9elM4B(
zHe2oZw!w43+_>9iqy#8>m@LE#N|)9`3HNsRf(P=G6rACR*@g))KgmvoVR2f;4zsKq
z9zDjxn9dlgV#-Bywqq)>_5@-zb08z16)$mJXW1I$n!V^1GrDDEx2@2&@@~je+wWes
z@h~QBb|qtWHsg^me(TOp3rw&%56t=1oKIpN{-Z`dnX%-D#0X1`_ixsbTbl<RJ<LM`
zQ@Y3C|9(Z$VEOGn!W)j5ZP~hk|C+7!f;E_2wa#2OyIo`h&%q2NqCfGgxVpZkW+!CP
zDfjD_BIZHaL9{5^a>1`oBI6G6QvixiNFEdODR}+><<6E<YEM9}V+JBU>%XhyCS)oq
z(-73i>fgkf+v)|bNbDdB+v;T(55hw@vvWqGUQr7mx*ybFamFf6d`auRE&54(3f|tl
zUoE**`lu|r;P<DL9@O1XNWo&ZKJ<~K>MO`J-p9AvsfLAGm#FoykKnuAKJ0FSy*Ry%
zl`dm-@RlH3-u+`&pu<8iI+k#0ei;#My?q8h#i@_Xc?Big5JKBdO{u&WmV7dQ6yg(V
zr-Gc~IZ_8tk<ZxI@$l|PfTioqPQuUC#<qN&p}ZuvRk&(kjU;Y}Kpg^?dgVL2|LIe$
z>C_t>it*E_B;jF`opj1sKWZI<;qy~p!rL=d3}efK#BpAjhKD!5ql}?;NsaUOH*mVq
zo&LEMD0d^9##b#^>IFADp-nSV2G2^*d+}}QL6^D(h7J=>gTYr}&oIUZIG2UU2#^0L
zQX`NUgZwDuj*9H4$T@j-LS~&RH;M0P_%2fpWBOm#+M;Sb>yfL-E+c0Z`pFUM{Wq}K
z_~8E8@RW^s#TtgUZ=rHGwkfAqx}MeD$^+3sk*Ah~$SAWBoW)H-`}|fn=LOG?JnPuA
z2^){L2}q*qIn3;FNKMF?6M{!%eo|GIL3S)^>gcsa5<@A-+XfWNUH5tBS%YYq$JTkI
z1i=j!T4&)>pR8=4g*N+W_=3TlI@>vaxA%s!LqjByK}xwK>FUC>JFt)f&%t(n#LPKV
z#sL}USB+)HAu|cV5i2$-nrFd$PidkoLzsh<mJ%Jl`fnLI_r_h413bgF(ZkRMH(S1y
zK58XW9KH1B*Ik=VWP;?+&Ob^TqYaH!GwD>=x3VW7?PQS=nH+@-g%OQq9Bl91HbmG;
zO~S*gSgw7Vv9!}jjI^+NKQK6VwTrBUN*KCsq+$*;yU(w8os!UX{_W`--T%;drTs);
zf|8l)8GrNqVIPM-_hFeH(>9JVROyLNmKep!57Hx$J^|TDh#$66$6#X#j9r^mQhP~X
z^s3<Q8wf7H_N_2q4Z<ZWRu%a4mra}5VGFEt@AB)*&lOEVgQ1*YVn8imQoWZu8!~=E
zL=T8Lr%F!_Gdr-<1jB^H3UdAcb76S=i_pUXjlQ}SGiKt+Eelp}n-j|)sZLA1L8g7i
zueW4`*IA^b!kYq<(|f5qvuqY?AOAM==!}pAF|09?R0FhNc}aQ?tN0<FnS#_YG3(-)
zu`l86nNc`yxqq;J%E6zHX)xu~MK~B-7(%z@$^$dH)}Fc4OO|=K{LK;$ZJ42o46U~(
zFT5`{+YjChxTR@aktzrwNFp%3FQZpSSn7nxIM8?+pA-6JTw=bZFm%Tu>YxHikE1k$
z=degj$-i#m-%_6FG|>)A<Y$*dq1K*Re&^j%!8IAIi)cmp*Vr(^J)FkG%7@k4)~=pe
zlx~{z!$eiZjBdm2%aHPL|MyThVdcLJ*S=Zl@&4?niGt()5pq7bzpbYrZi_SOpJEoC
zilfNZZ~VmBT`j^y?mxgF*PAT3A%d%YUr9wbA+lk)Ryvtd>v?OyFX=Spi_$v|gQxf3
zr>8~aFzr97amYF$J1%qM!w3f!KGq71(CVVP)Ey=DV5(qAS%|+{yWO9;_|d-s;f>aR
zso!X&>sd46Wih$jI&-b{R}Zm~!c*uJ6`sX3zp4W}71MhduuhYNkU*w1t!cCgf|NWi
zV?;NVFiKG1NGm@BFQ3rNXKRAqhcRW)XVi)Hd;OUUo$1w1q}mErtWX64<!|DQZNZ6)
zZ%)_VJ$h#c5S^ucj_Hxh#Gh6Nt~OcPrF;iylN^qi&2Q?6$c<xzgWME&4q1^IxYy7r
zL+T>z)=A&|qaknnA-xw`?(^*^wvTlPZ2$^gcvFSemEAtDkVB;o!Xt&*==)1%<kG8q
zZ#6<4K$^B_mZpIk`-pma6BZKSJ=D#Qv03MT;g{48%RF+V7d-~J%b6cc-Ha#`QLeCU
zQtbiC#i^av)cHXY+U@Kgw$6MT2JXOUsdeUBwLB}Gr5&TK#aS0Jfz@Lsd2OH|-l#!*
z3jF_zFl25_=CR+64kNTp<i{X*K!zP~zloLdo$V~1_qxRk+m`d98LL2|+KpALuUZ&)
z&;~YX7Az|aZsoDPm$!%#B`m}z^p1!-)5mvW?JNYp#}3C9XGC!ZcP6#qkVOZLqPU%)
z;TAQ!_l}l!z;Zx#{w5c(fH_X6bXTO)QNHfV?B%ZOq7kV;tfAs1BT+Mk5!x27_QN%B
zm&N(J+#;P~_N5M8deDMRB?vEG%Ec)N{Ya}@!KG#=6(U4D^pQ-zyK%s>=AF2&5bVSW
zsGZeUCDuUarQPDy+rF8<`oVQc1ga2gn#ryAsd5je=2)#CuVPfKXxWTa*}mbng!C`p
zg16Lh``AA;v)o=@@ymMqZ+R-Lf<HiE0{39R0-l?OyzA>$Z~|@viKDQw2qv~OTGMq;
z$5w~g%y3q?^PGj(P2UPdZ#ZJMrOFZkCoUV2stj(JiITkeCkd+FgBgwEL=8n!D9d_y
zOT>@jb_?_4SRQ&6cEP+8<|YOU@vvbTKe?uL0BE_9$cB!j;vc)Pe9Jn1zU{99?&}C9
zQtk~Sv@Kfap$ZR_)!bFKiww{nV{#fQ2l-4)zkUTv5gzy-D7tZ(LyEOc4YqchVw9eo
zTjkv*{svdQ^eB{<bnBHp$`%p?ed9rwW6$0~uwqPJ>L+X9+ceW#7H;hbGTLOr2yF|L
zVEd`9fPGu71Z{`3A>oPq7j*RqBoAUy@WLcX^Dwiv6{iJGiuqC8QPiI|NTx7t^c@>b
z_*xFy9M<o0$GLW(0sCo2t5Wro1)H5ny&u`a0&ivN5UTRU8xreHmjrsMhjL0tpnU{~
z%dNBEJ_5Pp)=v{u4(a1Ci-kP)CA?2|5ElIK@s(C+I+UO>x-P<=xAUmyTeX5~5Uz=M
z1>4v+^AIB(Da+s%57*5{ZwU{LECfnlrjkDE>yztOAT$EWqr@y-^zQSk-{+={*>PAH
zN6c(?lKu&Ir;|Q-b=LwKVrb)%hQ1w>mQ=Wqox0k0UF?OL;BN?2x!5-5m>F-vFhbif
zS5N-JIyC#?+DchXq0?On{|o;3I;2pV4?<x~Ezm|Z6s|o>Pr<BH<wsR^1n%!(GSg&E
zxR_oMbr1zqe&sXEhOZ2mcqkwUAil+Hv+;zg?MSnyg^?$#M!3?+?(|+8c6UQUO--+^
zJnZbRpP7Y86*`0pL$fJvx&<fCjY9Fnm+<y2GXhuFv8U;jri17lNmrFUQ?A{?v8m-N
zL8^`!C?b__)<vwrkX&qXg&la;wOys_Nf@{*^-jmBw}nR`b%ZWsiY_@fC5ls$%63}L
zO|!WvR&b#BAmb*Aa}n17{OE<3_bh#fYUmvaL1NC(d<n35zvEjmJ)01|VnpgV3P7By
z;G6w!dIRFy#;f-_1C^!M8BY5gi6MSsokuqy;e^Nmy6V7{csOF()Z)1AbS^oIu^orU
zcX8FH@}<71NEwuUy9zg7n1S_{f4vjk;^`&|juoky@j6LOvLWrpfpkYJeL`4ep-nSb
zW)I(yzql=cMfa(CA0B-1chA(RpbGwr`UrNAq=QOh2;snTSSBYRa|||@@F?mdbY+Pi
z(^KEa@J<`f-r$a9x@rDAR{u!FW<T8MMz-1*<Xnw=%Y5mUMLg^2T$4hHNDrJYaY+CD
zHg1&=I>=6q>&xjenilfku9ws(%sJHk2CZ`f{vY?gr8=ET*|h)w002ovPDHLkV1k-a
Bs?7iZ

literal 0
HcmV?d00001


From 1bc75b2ff5d2973569e3887b7c448648da334d0d Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 5 Aug 2024 18:01:47 +0800
Subject: [PATCH 02/84] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?=
 =?UTF-8?q?=E8=87=AA=E6=8F=90=E9=97=A8=E5=BA=97=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/goods_details_store/index.vue | 134 ++++++++++++-----------
 1 file changed, 68 insertions(+), 66 deletions(-)

diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
index 88e006fb..20f3e084 100644
--- a/pages/user/goods_details_store/index.vue
+++ b/pages/user/goods_details_store/index.vue
@@ -1,48 +1,50 @@
 <template>
-  <view class="storeBox" ref="container">
-    <view class="storeBox-box" v-for="(item, index) in state.storeList" :key="index" @tap="checked(item)">
-      <view class="store-img">
-        <image :src="item.logo" class="img"/>
-      </view>
-      <view class="store-cent-left">
-        <view class="store-name">{{ item.name }}</view>
-        <view class="store-address line1">
-          {{ item.areaName }}{{ ', ' + item.detailAddress }}
+  <s-layout title="选择自提门店" :bgStyle="{ color: '#FFF' }">
+    <view class="storeBox" ref="container">
+      <view class="storeBox-box" v-for="(item, index) in state.storeList" :key="index" @tap="checked(item)">
+        <view class="store-img">
+          <image :src="item.logo" class="img" />
         </view>
-      </view>
-      <view class="row-right ss-flex-col ss-col-center">
-        <view>
-          <!-- #ifdef H5 -->
-          <a class="store-phone" :href="'tel:' + item.phone">
-            <view class="iconfont">
-              <view class="ss-rest-button">
-                <text class="_icon-forward" />
-              </view>
-            </view>
-          </a>
-          <!-- #endif -->
-          <!-- #ifdef MP -->
-          <view class="store-phone" @click="call(item.phone)">
-            <view class="iconfont">
-              <view class="ss-rest-button">
-                <text class="_icon-forward" />
-              </view>
-            </view>
+        <view class="store-cent-left">
+          <view class="store-name">{{ item.name }}</view>
+          <view class="store-address line1">
+            {{ item.areaName }}{{ ', ' + item.detailAddress }}
           </view>
-          <!-- #endif -->
         </view>
-        <view class="store-distance ss-flex ss-row-center" @tap="showMaoLocation(item)">
-          <text class="addressTxt" v-if="item.distance">距离{{ item.distance.toFixed(2) }}千米</text>
-          <text class="addressTxt" v-else>查看地图</text>
-          <view class="iconfont">
-            <view class="ss-rest-button">
-              <text class="_icon-forward" />
+        <view class="row-right ss-flex-col ss-col-center">
+          <view>
+            <!-- #ifdef H5 -->
+            <a class="store-phone" :href="'tel:' + item.phone">
+              <view class="iconfont">
+                <view class="ss-rest-button">
+                  <text class="_icon-forward" />
+                </view>
+              </view>
+            </a>
+            <!-- #endif -->
+            <!-- #ifdef MP -->
+            <view class="store-phone" @click="call(item.phone)">
+              <view class="iconfont">
+                <view class="ss-rest-button">
+                  <text class="_icon-forward" />
+                </view>
+              </view>
+            </view>
+            <!-- #endif -->
+          </view>
+          <view class="store-distance ss-flex ss-row-center" @tap="showMaoLocation(item)">
+            <text class="addressTxt" v-if="item.distance">距离{{ item.distance.toFixed(2) }}千米</text>
+            <text class="addressTxt" v-else>查看地图</text>
+            <view class="iconfont">
+              <view class="ss-rest-button">
+                <text class="_icon-forward" />
+              </view>
             </view>
           </view>
         </view>
       </view>
     </view>
-  </view>
+  </s-layout>
 </template>
 
 <script setup>
@@ -82,24 +84,24 @@
     //     getList();
     //   });
     // } else {
-      // #endif
-      uni.getLocation({
-        type: 'gcj02',
-        success: (res) => {
-          try {
-            state.user_latitude = res.latitude;
-            state.user_longitude = res.longitude;
-            uni.setStorageSync(LATITUDE, res.latitude);
-            uni.setStorageSync(LONGITUDE, res.longitude);
-          } catch {
-          }
-          getList();
-        },
-        complete: () => {
-          getList();
-        },
-      });
-      // #ifdef H5
+    // #endif
+    uni.getLocation({
+      type: 'gcj02',
+      success: (res) => {
+        try {
+          state.user_latitude = res.latitude;
+          state.user_longitude = res.longitude;
+          uni.setStorageSync(LATITUDE, res.latitude);
+          uni.setStorageSync(LONGITUDE, res.longitude);
+        } catch {
+        }
+        getList();
+      },
+      complete: () => {
+        getList();
+      },
+    });
+    // #ifdef H5
     // }
     // #endif
   };
@@ -114,17 +116,17 @@
     //     console.log('success');
     //   });
     // } else {
-      // #endif
-      uni.openLocation({
-        latitude: Number(e.latitude),
-        longitude: Number(e.longitude),
-        name: e.name,
-        address: `${e.areaName}-${e.detailAddress}`,
-        success: function() {
-          console.log('success');
-        },
-      });
-      // #ifdef H5
+    // #endif
+    uni.openLocation({
+      latitude: Number(e.latitude),
+      longitude: Number(e.longitude),
+      name: e.name,
+      address: `${e.areaName}-${e.detailAddress}`,
+      success: function() {
+        console.log('success');
+      },
+    });
+    // #ifdef H5
     // }
     // #endif
   };
@@ -134,7 +136,7 @@
    */
   const checked = (addressInfo) => {
     uni.$emit('SELECT_PICK_UP_INFO', {
-      addressInfo
+      addressInfo,
     });
     sheep.$router.back();
   };

From 196a1b2235d33ef03b3d6ecfbebfa34f6d85f4ff Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 6 Aug 2024 16:09:53 +0800
Subject: [PATCH 03/84] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7=E6=96=B9=E5=BC=8F=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/addressSelection.vue | 43 ++++++++++----
 pages/order/confirm.vue          | 99 ++++++++++++++++++++++----------
 sheep/api/trade/order.js         | 10 ++++
 sheep/helper/utils.js            |  6 +-
 4 files changed, 115 insertions(+), 43 deletions(-)

diff --git a/pages/order/addressSelection.vue b/pages/order/addressSelection.vue
index fd180371..1ee37c04 100644
--- a/pages/order/addressSelection.vue
+++ b/pages/order/addressSelection.vue
@@ -52,22 +52,41 @@
 </template>
 
 <script setup>
-  import { reactive } from 'vue';
+  import { computed } from 'vue';
   import sheep from '@/sheep';
   import { isEmpty } from 'lodash';
 
-  const state = reactive({
-    addressInfo: {}, // 选择的收货地址
-    deliveryType: 1, // 收货方式 1 - 快递配送；2 - 门店自提
-    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
-    pickUpInfo: {}, // 选择的自提门店信息
+  const props = defineProps({
+    modelValue: {
+      type: Object,
+      default() {},
+    }
   });
+  const emits = defineEmits(['update:modelValue']);
+
+  // computed 解决父子组件双向数据同步
+  const state = computed({
+    get(){
+      return new Proxy(props.modelValue, {
+        set(obj, name, val) {
+          emits('update:modelValue', {
+            ...obj,
+            [name]: val,
+          });
+          return true;
+        }
+      })
+    },
+    set(val){
+      emits('update:modelValue', val);
+    }
+  })
 
   // 选择地址
   function onSelectAddress() {
     let emitName = 'SELECT_ADDRESS'
     let addressPage = '/pages/user/address/list'
-    if (state.deliveryType === 2){
+    if (state.value.deliveryType === 2){
       emitName = 'SELECT_PICK_UP_INFO'
       addressPage = '/pages/user/goods_details_store/index'
     }
@@ -80,18 +99,18 @@
   // 更改收货人地址&计算订单信息
   async function changeConsignee(addressInfo = {}) {
     if (!isEmpty(addressInfo)) {
-      if (state.deliveryType === 1){
-        state.addressInfo = addressInfo;
+      if (state.value.deliveryType === 1){
+        state.value.addressInfo = addressInfo;
       }
-      if (state.deliveryType === 2){
-        state.pickUpInfo = addressInfo;
+      if (state.value.deliveryType === 2){
+        state.value.pickUpInfo = addressInfo;
       }
     }
   }
 
   // 收货方式切换
   const switchDeliveryType = (type) =>{
-    state.deliveryType = type;
+    state.value.deliveryType = type;
   }
 </script>
 
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index c84d2169..4b53af54 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -1,7 +1,7 @@
 <template>
   <s-layout title="确认订单">
     <!-- 头部地址选择【配送地址】【自提地址】 -->
-    <AddressSelection></AddressSelection>
+    <AddressSelection v-model="addressState"></AddressSelection>
 
     <!-- 商品信息 -->
     <view class="order-card-box ss-m-b-14">
@@ -54,12 +54,37 @@
             <text class="item-value ss-m-r-24">{{ state.orderInfo.score_amount }}</text>
           </view>
         </view>
-        <view class="order-item ss-flex ss-col-center ss-row-between">
+        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 1'>
           <view class="item-title">运费</view>
           <view class="ss-flex ss-col-center">
-            <text class="item-value ss-m-r-24">
+            <text class="item-value ss-m-r-24" v-if="state.orderInfo.price.deliveryPrice > 0">
               +￥{{ fen2yuan(state.orderInfo.price.deliveryPrice) }}
             </text>
+            <view class='item-value ss-m-r-24' v-else>免运费</view>
+          </view>
+        </view>
+        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 2'>
+          <view class="item-title">联系人</view>
+          <view class="ss-flex ss-col-center">
+            <uni-easyinput
+              maxlength="20"
+              placeholder="请填写您的联系姓名"
+              v-model="addressState.receiverName"
+              :inputBorder="false"
+              :clearable="false"
+            />
+          </view>
+        </view>
+        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 2'>
+          <view class="item-title">联系电话</view>
+          <view class="ss-flex ss-col-center">
+            <uni-easyinput
+              maxlength="20"
+              placeholder="请填写您的联系电话"
+              v-model="addressState.receiverMobile"
+              :inputBorder="false"
+              :clearable="false"
+            />
           </view>
         </view>
         <!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
@@ -114,7 +139,7 @@
           共{{ state.orderInfo.items.reduce((acc, item) => acc + item.count, 0) }}件
         </view>
         <view>合计：</view>
-        <view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }} </view>
+        <view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}</view>
       </view>
     </view>
 
@@ -153,15 +178,13 @@
 </template>
 
 <script setup>
-  import { reactive } from 'vue';
+  import { reactive, ref } from 'vue';
   import { onLoad } from '@dcloudio/uni-app';
   import AddressSelection from '@/pages/order/addressSelection.vue';
   import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
   import OrderApi from '@/sheep/api/trade/order';
   import CouponApi from '@/sheep/api/promotion/coupon';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
-  import { SubscribeTemplate } from '@/sheep/util/const';
 
   const state = reactive({
     orderPayload: {},
@@ -169,27 +192,19 @@
       items: [], // 商品项列表
       price: {}, // 价格信息
     },
-    addressInfo: {}, // 选择的收货地址
     showCoupon: false, // 是否展示优惠劵
     couponInfo: [], // 优惠劵列表
     showDiscount: false, // 是否展示营销活动
   });
 
-  // 选择地址
-  function onSelectAddress() {
-    uni.$once('SELECT_ADDRESS', (e) => {
-      changeConsignee(e.addressInfo);
-    });
-    sheep.$router.go('/pages/user/address/list');
-  }
-
-  // 更改收货人地址&计算订单信息
-  async function changeConsignee(addressInfo = {}) {
-    if (!isEmpty(addressInfo)) {
-      state.addressInfo = addressInfo;
-    }
-    await getOrderInfo();
-  }
+  const addressState = ref({
+    addressInfo: {}, // 选择的收货地址
+    deliveryType: 1, // 收货方式 1 - 快递配送；2 - 门店自提
+    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
+    pickUpInfo: {}, // 选择的自提门店信息
+    receiverName: '', // 收件人名称
+    receiverMobile: '', // 收件人手机
+  });
 
   // 选择优惠券
   async function onSelectCoupon(couponId) {
@@ -200,10 +215,28 @@
 
   // 提交订单
   function onConfirm() {
-    if (!state.addressInfo.id) {
+    if (addressState.value.deliveryType === 1 && !addressState.value.addressInfo.id) {
       sheep.$helper.toast('请选择收货地址');
       return;
     }
+    if (addressState.value.deliveryType === 2) {
+      if (!addressState.value.pickUpInfo.id) {
+        sheep.$helper.toast('请选择自提门店地址');
+        return;
+      }
+      if (addressState.value.receiverName === '' || addressState.value.receiverMobile === '') {
+        sheep.$helper.toast('请填写联系人或联系人电话');
+        return;
+      }
+      if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(addressState.value.receiverName)) {
+        sheep.$helper.toast('请填写您的真实姓名');
+        return;
+      }
+      if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(addressState.value.receiverMobile)) {
+        sheep.$helper.toast('请填写正确的手机号');
+        return;
+      }
+    }
     submitOrder();
   }
 
@@ -213,12 +246,15 @@
       items: state.orderPayload.items,
       couponId: state.orderPayload.couponId,
       remark: state.orderPayload.remark,
-      addressId: state.addressInfo.id,
-      deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
+      receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
       pointStatus: false, // TODO 芋艿：需要支持【积分选择】
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
-      seckillActivityId: state.orderPayload.seckillActivityId
+      seckillActivityId: state.orderPayload.seckillActivityId,
     });
     if (code !== 0) {
       return;
@@ -240,8 +276,11 @@
     const { data, code } = await OrderApi.settlementOrder({
       items: state.orderPayload.items,
       couponId: state.orderPayload.couponId,
-      addressId: state.addressInfo.id,
-      deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
+      receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
       pointStatus: false, // TODO 芋艿：需要支持【积分选择】
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
@@ -253,7 +292,7 @@
     state.orderInfo = data;
     // 设置收货地址
     if (state.orderInfo.address) {
-      state.addressInfo = state.orderInfo.address;
+      addressState.value.addressInfo = state.orderInfo.address;
     }
   }
 
diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js
index 4d571252..49661c79 100644
--- a/sheep/api/trade/order.js
+++ b/sheep/api/trade/order.js
@@ -1,4 +1,5 @@
 import request from '@/sheep/request';
+import { isEmpty } from '@/sheep/helper/utils';
 
 const OrderApi = {
   // 计算订单信息
@@ -13,6 +14,15 @@ const OrderApi = {
     if (!(data.addressId > 0)) {
       delete data2.addressId;
     }
+    if (!(data.pickUpStoreId > 0)) {
+      delete data2.pickUpStoreId;
+    }
+    if (isEmpty(data.receiverName)) {
+      delete data2.receiverName;
+    }
+    if (isEmpty(data.receiverMobile)) {
+      delete data2.receiverMobile;
+    }
     if (!(data.combinationActivityId > 0)) {
       delete data2.combinationActivityId;
     }
diff --git a/sheep/helper/utils.js b/sheep/helper/utils.js
index 15dec799..a0dd86f3 100644
--- a/sheep/helper/utils.js
+++ b/sheep/helper/utils.js
@@ -23,6 +23,10 @@ export function isString(value) {
 }
 
 export function isEmpty(value) {
+  if (value === '' || value === undefined || value === null){
+    return true;
+  }
+
   if (isArray(value)) {
     return value.length === 0;
   }
@@ -31,7 +35,7 @@ export function isEmpty(value) {
     return Object.keys(value).length === 0;
   }
 
-  return value === '' || value === undefined || value === null;
+  return false
 }
 
 export function isBoolean(value) {

From 44052b22c307a808ac321ce697c9e3b08737e357 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 6 Aug 2024 18:11:49 +0800
Subject: [PATCH 04/84] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=EF=BC=9A=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E5=8F=8A=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail.vue       |  33 ++++-
 pages/order/pickUpVerify.vue | 261 +++++++++++++++++++++++++++++++++++
 sheep/api/trade/delivery.js  |  14 +-
 static/images/writeOff.png   | Bin 0 -> 2315 bytes
 4 files changed, 299 insertions(+), 9 deletions(-)
 create mode 100644 pages/order/pickUpVerify.vue
 create mode 100644 static/images/writeOff.png

diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index b9527e76..e6ac016c 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -45,9 +45,9 @@
         </image>
         <view class="ss-font-30">{{ formatOrderStatus(state.orderInfo) }}</view>
       </view>
-      <view class="ss-font-26 ss-m-x-20 ss-m-b-70">{{
-        formatOrderStatusDescription(state.orderInfo)
-      }}</view>
+      <view class="ss-font-26 ss-m-x-20 ss-m-b-70">
+        {{ formatOrderStatusDescription(state.orderInfo) }}
+      </view>
     </view>
 
     <!-- 收货地址 -->
@@ -126,6 +126,9 @@
       </view>
     </view>
 
+    <!--  自提核销  -->
+    <PickUpVerify :order-info="state.orderInfo" :systemStore="systemStore" ref="pickUpVerifyRef"></PickUpVerify>
+
     <!-- 订单信息 -->
     <view class="notice-box">
       <view class="notice-box__content">
@@ -251,7 +254,7 @@
 <script setup>
   import sheep from '@/sheep';
   import { onLoad } from '@dcloudio/uni-app';
-  import { reactive } from 'vue';
+  import { reactive, ref } from 'vue';
   import { isEmpty } from 'lodash';
   import {
     fen2yuan,
@@ -260,6 +263,8 @@
     handleOrderButtons,
   } from '@/sheep/hooks/useGoods';
   import OrderApi from '@/sheep/api/trade/order';
+  import DeliveryApi from '@/sheep/api/trade/delivery';
+  import PickUpVerify from '@/pages/order/pickUpVerify.vue';
 
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
   const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
@@ -270,6 +275,9 @@
     comeinType: '', // 进入订单详情的来源类型
   });
 
+  // ========== 门店自提（核销） ==========
+  const systemStore = ref({}); // 门店信息
+
   // 复制
   const onCopy = () => {
     sheep.$helper.copyText(state.orderInfo.no);
@@ -294,7 +302,7 @@
     uni.showModal({
       title: '提示',
       content: '确定要取消订单吗?',
-      success: async function (res) {
+      success: async function(res) {
         if (!res.confirm) {
           return;
         }
@@ -366,15 +374,18 @@
       },
     });
   }
+
   // #endif
 
   // 评价
   function onComment(id) {
     sheep.$router.go('/pages/goods/comment/add', {
-      id
+      id,
     });
   }
 
+  const pickUpVerifyRef = ref();
+
   async function getOrderDetail(id) {
     // 对详情数据进行适配
     let res;
@@ -389,6 +400,14 @@
     if (res.code === 0) {
       state.orderInfo = res.data;
       handleOrderButtons(state.orderInfo);
+      // 配送方式：门店自提
+      if (res.data.pickUpStoreId) {
+        const { data } = await DeliveryApi.getDeliveryPickUpStore(res.data.pickUpStoreId);
+        systemStore.value = data || {};
+      }
+      if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
+        pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
+      }
     } else {
       sheep.$router.back();
     }
@@ -429,7 +448,7 @@
     color: rgba(#fff, 0.9);
     width: 100%;
     background: v-bind(headerBg) no-repeat,
-      linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
     background-size: 750rpx 100%;
     box-sizing: border-box;
 
diff --git a/pages/order/pickUpVerify.vue b/pages/order/pickUpVerify.vue
new file mode 100644
index 00000000..b16d0804
--- /dev/null
+++ b/pages/order/pickUpVerify.vue
@@ -0,0 +1,261 @@
+<template>
+  <view class='order-details'>
+    <!--  自提商品核销  -->
+    <view v-if="orderInfo.deliveryType === 2 && orderInfo.payStatus" class="writeOff borRadius14">
+      <view class="title">核销信息</view>
+      <view class="grayBg flex-center">
+        <view class="pictrue">
+          <image
+            v-if="!!painterImageUrl"
+            :src="painterImageUrl"
+            :style="{width: `${state.qrcodeSize}px`, height: `${state.qrcodeSize}px`}"
+            :show-menu-by-longpress="true"
+          />
+        </view>
+      </view>
+      <view class="gear">
+        <image :src="sheep.$url.static('/static/images/writeOff.png', 'local')"></image>
+      </view>
+      <view class="num">{{ orderInfo.pickUpVerifyCode }}</view>
+      <view class="rules">
+        <!-- TODO puhui999: 需要后端放回 -->
+<!--        <view class="item">-->
+<!--          <view class="rulesTitle flex flex-wrap align-center">-->
+<!--            核销时间-->
+<!--          </view>-->
+<!--          <view class="info">-->
+<!--            每日：-->
+<!--            <text class="time">2020-2-+52</text>-->
+<!--          </view>-->
+<!--        </view>-->
+        <view class="item">
+          <view class="rulesTitle flex flex-wrap align-center">
+            <text class="iconfont icon-shuoming1"></text>
+            使用说明
+          </view>
+          <view class="info">可将二维码出示给店员扫描或提供数字核销码</view>
+        </view>
+      </view>
+    </view>
+    <view v-if="orderInfo.deliveryType === 2" class="map flex flex-wrap align-center ss-row-between borRadius14">
+      <view>自提地址信息</view>
+      <view class="place cart-color flex flex-wrap flex-center" @tap="showMaoLocation">
+        查看位置
+      </view>
+    </view>
+    <!--  海报画板：默认隐藏只用来生成海报。生成方式为主动调用  -->
+    <l-painter
+      v-if="showPainter"
+      isCanvasToTempFilePath
+      pathType="url"
+      @success="setPainterImageUrl"
+      hidden
+      ref="painterRef"
+    />
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { reactive, ref } from 'vue';
+
+  const props = defineProps({
+    orderInfo: {
+      type: Object,
+      default() {},
+    },
+    systemStore:{
+      type: Object,
+      default() {},
+    }
+  });
+  const state = reactive({
+    qrcodeSize: 145
+  })
+
+  /**
+   * 打开地图
+   */
+  const showMaoLocation = () => {
+    console.log(props.systemStore);
+    if (!props.systemStore.latitude || !props.systemStore.longitude) {
+      sheep.$helper.toast('缺少经纬度信息无法查看地图!');
+      return
+    }
+    uni.openLocation({
+      latitude: props.systemStore.latitude,
+      longitude: props.systemStore.longitude,
+      scale: 8,
+      name: props.systemStore.name,
+      address: props.systemStore.areaName + props.systemStore.detailAddress,
+    });
+  }
+  /**
+   * 拨打电话
+   */
+  const makePhone = () => {
+    uni.makePhoneCall({
+      phoneNumber: props.systemStore.phone
+    })
+  }
+
+  const painterRef = ref(); // 海报画板
+  const painterImageUrl = ref(); // 海报 url
+  const showPainter = ref(true)
+  // 渲染海报
+  const renderPoster = async (poster) => {
+    await painterRef.value.render(poster);
+  };
+  // 获得生成的图片
+  const setPainterImageUrl = (path) => {
+    painterImageUrl.value = path;
+    showPainter.value = false
+  };
+  /**
+   * 生成核销二维码
+   */
+  const markCode = (text) => {
+    renderPoster({
+      css: {
+        width: `${state.qrcodeSize}px`,
+        height: `${state.qrcodeSize}px`
+      },
+      views:[
+        {
+          type: 'qrcode',
+          text: text,
+          css: {
+            width: `${state.qrcodeSize}px`,
+            height: `${state.qrcodeSize}px`
+          }
+        }
+      ]
+    })
+  }
+  defineExpose({
+    markCode
+  })
+</script>
+
+<style scoped lang="scss">
+  // TODO puhui999: 样式需要调整有 bug
+  .borRadius14 {
+    border-radius: 14rpx !important;
+  }
+  .cart-color {
+    color: #E93323 !important;
+    border: 1px solid #E93323 !important
+  }
+  .order-details{
+    border-radius: 10rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+  }
+  .order-details .writeOff {
+    background-color: #fff;
+    margin-top: 15rpx;
+    padding-bottom: 50rpx;
+  }
+
+  .order-details .writeOff .title {
+    font-size: 30rpx;
+    color: #282828;
+    height: 87rpx;
+    border-bottom: 1px solid #f0f0f0;
+    padding: 0 24rpx;
+    line-height: 87rpx;
+  }
+
+  .order-details .writeOff .grayBg {
+    background-color: #f2f5f7;
+    width: 590rpx;
+    height: 384rpx;
+    border-radius: 20rpx 20rpx 0 0;
+    margin: 50rpx auto 0 auto;
+    padding-top: 55rpx;
+  }
+
+  .order-details .writeOff .grayBg .pictrue {
+    width: 290rpx;
+    height: 290rpx;
+  }
+
+  .order-details .writeOff .grayBg .pictrue image {
+    width: 100%;
+    height: 100%;
+  }
+
+  .order-details .writeOff .gear {
+    width: 590rpx;
+    height: 30rpx;
+    margin: 0 auto;
+  }
+
+  .order-details .writeOff .gear image {
+    width: 100%;
+    height: 100%;
+  }
+
+  .order-details .writeOff .num {
+    background-color: #f0c34c;
+    width: 590rpx;
+    height: 84rpx;
+    color: #282828;
+    font-size: 48rpx;
+    margin: 0 auto;
+    border-radius: 0 0 20rpx 20rpx;
+    text-align: center;
+    padding-top: 4rpx;
+  }
+
+  .order-details .writeOff .rules {
+    margin: 46rpx 30rpx 0 30rpx;
+    border-top: 1px solid #f0f0f0;
+    padding-top: 10rpx;
+  }
+
+  .order-details .writeOff .rules .item {
+    margin-top: 20rpx;
+  }
+
+  .order-details .writeOff .rules .item .rulesTitle {
+    font-size: 28rpx;
+    color: #282828;
+  }
+
+  .order-details .writeOff .rules .item .rulesTitle .iconfont {
+    font-size: 30rpx;
+    color: #333;
+    margin-right: 8rpx;
+    margin-top: 5rpx;
+  }
+
+  .order-details .writeOff .rules .item .info {
+    font-size: 28rpx;
+    color: #999;
+    margin-top: 7rpx;
+  }
+
+  .order-details .writeOff .rules .item .info .time {
+    margin-left: 20rpx;
+  }
+
+  .order-details .map {
+    height: 86rpx;
+    font-size: 30rpx;
+    color: #282828;
+    line-height: 86rpx;
+    border-bottom: 1px solid #f0f0f0;
+    margin-top: 15rpx;
+    background-color: #fff;
+    padding: 0 24rpx;
+  }
+
+  .order-details .map .place {
+    font-size: 26rpx;
+    width: 176rpx;
+    height: 50rpx;
+    border-radius: 25rpx;
+    line-height: 50rpx;
+    text-align: center;
+  }
+</style>
diff --git a/sheep/api/trade/delivery.js b/sheep/api/trade/delivery.js
index 6f0f7f5a..a6551dab 100644
--- a/sheep/api/trade/delivery.js
+++ b/sheep/api/trade/delivery.js
@@ -13,9 +13,19 @@ const DeliveryApi = {
     return request({
       url: `/trade/delivery/pick-up-store/list`,
       method: 'GET',
-      params
+      params,
     });
-  }
+  },
+  // 获得自提门店
+  getDeliveryPickUpStore: (id) => {
+    return request({
+      url: `/trade/delivery/pick-up-store/get`,
+      method: 'GET',
+      params: {
+        id,
+      },
+    });
+  },
 };
 
 export default DeliveryApi;
diff --git a/static/images/writeOff.png b/static/images/writeOff.png
new file mode 100644
index 0000000000000000000000000000000000000000..68749d8bae1165c970e40afbcf88a4a4271984f3
GIT binary patch
literal 2315
zcmYjTc{mgPA0J(EEtM#9JzdVZ6S9!VmXU_AFUoyqEN3Yq3pqE(M!qs?Q<?L-X`(qN
zbJR5C%r(l9D}*0?{hr_Nd0x-w`TX(zyxzy>`Mh2qj3wMui2oEn000m&yJl<!0Pw<h
z_ELPjJFB(A!AJmruiMPn5E1J5BeyL8X)D>h38Wl+qyWWy3kCI?6Abu|Tc&b?+fQKh
zeeGmq&)mwt2PA4@^i}kL{MNij`Cfi5de*G5IvCWkasL59BV9}*k9qB4>uAW&1=n-w
z8}w#!@`K5|X6WPNR!eIC48IoWy9hq+77b<dXFFw=A!`IhajND-!z23*Q^cNqev0Z*
zWoEF_ykm>53verXn#3oOe6qy-0L3*o_Zp-9(rFY&FZ^3Vxnz3dy#(zmyT>MhnN$VE
z*j_<!V)tP07`-DcL5+3E7NNZ{(>lqGh!-i;LgJgNG<xsF`qsqaW%;6IS{6NQ65B6f
z+scu}ZeiooeiTtQ(F?!vq1l;$W#0W;{7Wy+sPE%w`wst+u><)^B02L`96Pb6G^WA$
zJJzrryS*12#V0?JQ2yhw5((eyzXji+<@;%rMFK~FzXVyZmv5mvNI$v&6B^1z$N4)r
zaIRHHyRUZC`5ngnVIoKDnv|v4K`;|J4?j4%{5GpNCU>n&yq=n0iT%J2*$b1cFgoSo
zfr_wV<WAAB+gq!}qzLtpv+p0Llq^Ga5t6$p(_|`tQZj-qK-v<CktW{BeWQSh7w+Zr
zpqIw7lc7U^W30f5cvTZGbA9VVtfQ)bm}{auk5D@HfEOdHTB)CcO<J;NP^9E<yO0;3
zV}y)FM#U$bh5vx%h4Maq=@3I}1PZm&lgc4{%d<h9|AMmUw_=BRmVtuYvaIgqW{7AW
zf^v)-?2i>lsu2{2@6h5c)QreDwy~B`S6tZi!}zKNBPc{&sH+pI5t!yPpVUfk0DY|g
z108eLf^XPAIBc*zktuOS=#z!Dwn}Mi6#`8yjPV4WIac(^?q@Qu&+8MZFFWFiN#ZaO
zxyrQ=nZZmUYfZiadxcoOrYsz)|BPW9T(RjQE7^xB&SPRN`oA7tp%5*HKii1<D3xQ?
zuHQXj;Rv~V$ALu4vX?fK1I`u!H+gThHm%%bjo(UI6hj;+Hc*wJku=w?OW8mp?g+u+
z^cts9dyrR|`%~Z9RP;dcqp(c<H$Hpy*As4zUsF4(yl9zl-0jWUB~dMb$U%p;odLNu
zW~<`UyWKm8Q(6X9l(C|APfueqf|$)_!g8<jC7m!zgD#pVGI-Nj@n+z^vR9JSslSyX
zunP?2%cFU!hl2hEJX_;7y!9fkp~Z&p@5W%4jGNU&5^OlKTg_w=#QD8&i?`*4akOin
zxvTz4*-BE&W`Utq{IUBVo2e_lu2(=eb;q<%2VmqjOkwi-Vhxy6-Vz21$vRmve-M;I
z&~1S_G&MbWq-BGGOUkF8w-~~agh3gfgbgkZ>vS2ji(X7K-lj=Rb|+~E&pp{18A1U|
z?%L;2{4vo_9J$k{bwbmJe&uX2aNOEgrXiKMN`GPN^hW<g@6AG;_54}-)BnpgG2yd5
z!LHcAo!YbuRE_rGIk=^=FAHLbI#|TWys#agLT+4jlpdgsg-bLKysbzFCQDk%R|I3#
zI)64DQI|qQ_yluO>DnBB59CmJhU!@f2`s=24>jGIcZqTl*c+JYq^6E(b#?!U!qDa&
z_IHc2(c`V#^^9-rb?`168EkIbL*xLIVKaiE%deyyJvYQecHcPl1`u32(o<N&2%ls-
zdvrUMNA&AjpZk?k_h_Nc#j5MEdinm(?^qC1G+01`iio??X6fFO7ciGPGI8hpAC>t2
zawE5dMhYQHmS9GR-lexgLNeCnaFgh+{$YZ=;%MDQJ{%cVia?)YQpd(e$M$KSovoic
z7n9Tom)Vu1Uc+#SAI|jIIZcLE)%zREDr<OK&XhLAH^``MVf0*s)iBn>4+dP&q1dVR
z;56*(B?Qj62M%t__g;R_IlQYXI(jXGjYZXcODeV-KGf2-@!ZW}=;EsM_??eMfhS`H
zhy74j(NZ6_)gNYyW+u>3ek<<q(dR9jbIg&xy(R>?{_gC`&DX8-9}wuw<)pUu0rD^r
zV_#%;!v?TVHyZ44U%6tOgrB93KE$S}Mu*P}&(xB_1@sMemAL%zO4alO(<K#noFwFH
z$$CF3fGk-;W;ns0D5XP9d+h>gpx+Ic?B~TaZui2^&JIMBTU3~XAS;#5+AH9?*FiD2
z_Zr-{<a(mgr3+K@bYXh=u^fxwY@|9bS;jEiD6AW-0J9crL*J%xgHA)Xw5Wk_DWnAU
zD600*t_Gv-X~ralm!7Th`8G(Kb&>?y;73TDfoBo;^r)@tyowSKat2-0z`VHlW3{N<
z3xeMXhpaqD%c}Ti<Gk~brjq7DlexqICzmg8F@tceIy8Fsa$r1BQ9+R&Pb4=l#Fouq
zlKoC%2w=&1OLzP)<lG~(VH<)<acQ4Y12;3}-N8UYAvhow5*dJ+6hZ~DXCF8$_4M+<
zVY?>h$WPiL25wib&#r!rxePBRh6)3(6pWYhW<Kruy<|X3A?xPCYQ2=j@<AVRiuUD-
zRJ<M=sacv`<u0pmXLCTlnsi&&ZRVact!Y3w{t;qR%POB7hSY#jbC<Lmea3kRF=eE$
zm)Emwyz|}M-JgnhAI2*57hLQ-y_o#`OZA&>x~+9c&A<@hD@2?7mh#uXK4N7MC+0O*
zF!j1J#&%k7$Z~t#+8g-duxuF6pBc=8q7-Yt#~dyAb~v<3+Vj=+CYTyzE(q?NRhS8|
zrMJB>EUvBmBwTB@G4o$nPM-4Dq-&u{<%J!KYbMP?k_I9iBG(hn+(PNPQq7xHT%xf6
zv=03t<YDsAm#B5MlixKN%PY<vUpK?cqn1NCC((KZ+seIkgp-qXbs&Xj*XvN7Go2%q
zW^>2^{ebWQ3SR74$osm0_i*5Y{MqdWNT_zts-foaXcR!j8x+TIxjnb@$pM&Mg&V&y
Ha*qBF@-=tW

literal 0
HcmV?d00001


From a2dec947a2e4421c238388be75f8446be6329468 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 7 Aug 2024 17:36:29 +0800
Subject: [PATCH 05/84] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=9A=E7=A7=AF=E5=88=86=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 4b53af54..139eb333 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -41,17 +41,25 @@
           </view>
         </view>
         <!-- TODO 芋艿：接入积分 -->
+        <!-- TODO puhui999: v-if="state.orderInfo.type === 0 && state.orderPayload.order_type === 'normal'" -->
+        <!-- TODO puhui999: 没有搞懂 order_type 和  orderInfo.type 的区别和作用暂时不考虑 order_type 条件-->
         <view
           class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="state.orderPayload.order_type === 'score'"
+          v-if="state.orderInfo.type === 0"
         >
-          <view class="item-title">扣除积分</view>
+          <view class="item-title">积分抵扣</view>
           <view class="ss-flex ss-col-center">
+            {{ state.pointStatus ? '剩余积分' : '当前积分' }}
             <image
               :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
               class="score-img"
             />
-            <text class="item-value ss-m-r-24">{{ state.orderInfo.score_amount }}</text>
+            <text class="item-value ss-m-r-24">
+              {{ state.pointStatus ? state.orderInfo.totalPoint - state.orderInfo.usePoint : (state.orderInfo.totalPoint || 0) }}
+            </text>
+            <checkbox-group @change="changeIntegral">
+              <checkbox :checked='state.pointStatus' :disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0" />
+            </checkbox-group>
           </view>
         </view>
         <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 1'>
@@ -195,6 +203,8 @@
     showCoupon: false, // 是否展示优惠劵
     couponInfo: [], // 优惠劵列表
     showDiscount: false, // 是否展示营销活动
+    // ========== 积分 ==========
+    pointStatus: false, //是否使用积分
   });
 
   const addressState = ref({
@@ -206,6 +216,15 @@
     receiverMobile: '', // 收件人手机
   });
 
+  // ========== 积分 ==========
+  /**
+   * 使用积分抵扣
+   */
+  const changeIntegral = async () => {
+    state.pointStatus = !state.pointStatus;
+    await getOrderInfo();
+  };
+
   // 选择优惠券
   async function onSelectCoupon(couponId) {
     state.orderPayload.couponId = couponId || 0;
@@ -251,7 +270,7 @@
       pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
       receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
       receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
-      pointStatus: false, // TODO 芋艿：需要支持【积分选择】
+      pointStatus: state.pointStatus,
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
       seckillActivityId: state.orderPayload.seckillActivityId,
@@ -281,10 +300,10 @@
       pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
       receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
       receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
-      pointStatus: false, // TODO 芋艿：需要支持【积分选择】
+      pointStatus: state.pointStatus,
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
-      seckillActivityId: state.orderPayload.seckillActivityId
+      seckillActivityId: state.orderPayload.seckillActivityId,
     });
     if (code !== 0) {
       return;

From c78a849c96d1144c38bcdbbb105ddec815ee5cb9 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 7 Aug 2024 17:37:03 +0800
Subject: [PATCH 06/84] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=EF=BC=9A=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E6=8A=B5=E6=89=A3=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index e6ac016c..15702932 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -175,6 +175,10 @@
         <text class="title">优惠劵金额</text>
         <text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
       </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.pointPrice > 0">
+        <text class="title">积分抵扣</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.pointPrice) }}</text>
+      </view>
       <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.discountPrice > 0">
         <text class="title">活动优惠</text>
         <text class="detail">¥{{ fen2yuan(state.orderInfo.discountPrice) }}</text>

From c7ea2f97ac90b8967458039ba4c493ca163cba4e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 7 Aug 2024 22:09:15 +0800
Subject: [PATCH 07/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E3=80=91=E9=97=A8=E5=BA=97=E8=87=AA=E6=8F=90=EF=BC=9A?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E7=9A=84=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=81=E4=BB=A5=E5=8F=8A=20todo=20=E8=AF=84=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/index.vue            | 5 +----
 pages/index/cart.vue             | 7 +------
 pages/order/addressSelection.vue | 7 ++++---
 pages/order/confirm.vue          | 7 +++----
 pages/order/pickUpVerify.vue     | 2 +-
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 87408b9a..75f986f6 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -157,10 +157,7 @@
         items: [{
           skuId: e.id,
           count: e.goods_num
-        }],
-        // TODO 芋艿：后续清理掉这 2 参数
-        deliveryType: 1,
-        pointStatus: false,
+        }]
       }),
     });
 	}
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index ae90777f..3f42523b 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -124,12 +124,7 @@
 		}
 		sheep.$router.go('/pages/order/confirm', {
 			data: JSON.stringify({
-				// order_type: 'goods',
-				// goods_list,
-				items,
-				// from: 'cart',
-				deliveryType: 1,
-				pointStatus: false,
+				items
 			}),
 		});
 	}
diff --git a/pages/order/addressSelection.vue b/pages/order/addressSelection.vue
index 1ee37c04..f8d05323 100644
--- a/pages/order/addressSelection.vue
+++ b/pages/order/addressSelection.vue
@@ -1,3 +1,4 @@
+<!-- 下单界面，收货地址 or 自提门店的选择组件 -->
 <template>
   <view class="allAddress" :style="state.isPickUp ? '':'padding-top:10rpx;'">
     <view class="nav flex flex-wrap">
@@ -6,7 +7,7 @@
       <view class="item font-color" :class="state.deliveryType === 2 ? 'on' : 'on2'"
             @tap="switchDeliveryType(2)" v-if='state.isPickUp' />
     </view>
-    <!-- 收货地址的选择 -->
+    <!-- 情况一：收货地址的选择 -->
     <view class='address flex flex-wrap flex-center ss-row-between' @tap='onSelectAddress' v-if='state.deliveryType === 1'
           :style="state.isPickUp ? '':'border-top-left-radius: 14rpx;border-top-right-radius: 14rpx;'">
       <view class='addressCon' v-if="state.addressInfo.name">
@@ -27,7 +28,7 @@
         </view>
       </view>
     </view>
-    <!-- 门店的选择 -->
+    <!-- 情况二：门店的选择 -->
     <view class='address flex flex-wrap flex-center ss-row-between' v-else @tap="onSelectAddress">
         <view class='addressCon' v-if="state.pickUpInfo.name">
           <view class='name'>{{ state.pickUpInfo.name }}
@@ -46,7 +47,7 @@
         </view>
     </view>
     <view class='line'>
-      <image :src="sheep.$url.static('/static/images/line.png', 'local')"></image>
+      <image :src="sheep.$url.static('/static/images/line.png', 'local')" />
     </view>
   </view>
 </template>
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 139eb333..23ef75e8 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -1,7 +1,7 @@
 <template>
   <s-layout title="确认订单">
     <!-- 头部地址选择【配送地址】【自提地址】 -->
-    <AddressSelection v-model="addressState"></AddressSelection>
+    <AddressSelection v-model="addressState" />
 
     <!-- 商品信息 -->
     <view class="order-card-box ss-m-b-14">
@@ -40,9 +40,6 @@
             </text>
           </view>
         </view>
-        <!-- TODO 芋艿：接入积分 -->
-        <!-- TODO puhui999: v-if="state.orderInfo.type === 0 && state.orderPayload.order_type === 'normal'" -->
-        <!-- TODO puhui999: 没有搞懂 order_type 和  orderInfo.type 的区别和作用暂时不考虑 order_type 条件-->
         <view
           class="order-item ss-flex ss-col-center ss-row-between"
           v-if="state.orderInfo.type === 0"
@@ -62,6 +59,7 @@
             </checkbox-group>
           </view>
         </view>
+        <!-- 快递配置时，信息的展示 -->
         <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 1'>
           <view class="item-title">运费</view>
           <view class="ss-flex ss-col-center">
@@ -71,6 +69,7 @@
             <view class='item-value ss-m-r-24' v-else>免运费</view>
           </view>
         </view>
+        <!-- 门店自提时，需要填写姓名和手机号 -->
         <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 2'>
           <view class="item-title">联系人</view>
           <view class="ss-flex ss-col-center">
diff --git a/pages/order/pickUpVerify.vue b/pages/order/pickUpVerify.vue
index b16d0804..1e8bb6e8 100644
--- a/pages/order/pickUpVerify.vue
+++ b/pages/order/pickUpVerify.vue
@@ -18,7 +18,7 @@
       </view>
       <view class="num">{{ orderInfo.pickUpVerifyCode }}</view>
       <view class="rules">
-        <!-- TODO puhui999: 需要后端放回 -->
+        <!-- TODO puhui999: 需要后端放回：使用 receiveTime 即可 -->
 <!--        <view class="item">-->
 <!--          <view class="rulesTitle flex flex-wrap align-center">-->
 <!--            核销时间-->

From 3099c8c49103311ab4404af2111e96196033c363 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 7 Aug 2024 23:51:29 +0800
Subject: [PATCH 08/84] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=8A=96=E9=9F=B3?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/index.vue            | 2 +-
 pages/order/addressSelection.vue | 2 +-
 pages/order/detail.vue           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 75f986f6..488c435d 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -113,7 +113,7 @@
 	import detailCommentCard from './components/detail/detail-comment-card.vue';
 	import detailContentCard from './components/detail/detail-content-card.vue';
 	import detailActivityTip from './components/detail/detail-activity-tip.vue';
-	import { isEmpty } from 'lodash';
+	import { isEmpty } from 'lodash-es';
   import SpuApi from '@/sheep/api/product/spu';
 
 	onPageScroll(() => {});
diff --git a/pages/order/addressSelection.vue b/pages/order/addressSelection.vue
index f8d05323..106621e3 100644
--- a/pages/order/addressSelection.vue
+++ b/pages/order/addressSelection.vue
@@ -55,7 +55,7 @@
 <script setup>
   import { computed } from 'vue';
   import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
+  import { isEmpty } from 'lodash-es';
 
   const props = defineProps({
     modelValue: {
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 15702932..4366a9fb 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -259,7 +259,7 @@
   import sheep from '@/sheep';
   import { onLoad } from '@dcloudio/uni-app';
   import { reactive, ref } from 'vue';
-  import { isEmpty } from 'lodash';
+  import { isEmpty } from 'lodash-es';
   import {
     fen2yuan,
     formatOrderStatus,

From 2eb1a1bf41473920363f73584e1e0662b1a1a401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 8 Aug 2024 09:45:12 +0800
Subject: [PATCH 09/84] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=92=8C=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=A1=B5=E9=9D=A2=E6=97=B6=E4=BC=A0=E5=85=A5?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E7=BC=96=E5=8F=B7=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E4=BE=BF=E6=9F=A5=E8=AF=A2=E5=8F=AF=E7=94=A8=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/index.vue | 3 ++-
 pages/index/cart.vue  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 488c435d..bf0b0cb9 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -156,7 +156,8 @@
       data: JSON.stringify({
         items: [{
           skuId: e.id,
-          count: e.goods_num
+          count: e.goods_num,
+		  categoryId: state.goodsInfo.categoryId
         }]
       }),
     });
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 3f42523b..633b567d 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -107,6 +107,7 @@
 				skuId: item.sku.id,
 				count: item.count,
 				cartId: item.id,
+				categoryId: item.spu.categoryId
 			})
 			goods_list.push({
 				// goods_id: item.goods_id,

From e12698162892ea919105ced07380c62688126d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 8 Aug 2024 09:56:21 +0800
Subject: [PATCH 10/84] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=96=B9=E5=BC=8F=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E5=81=B6=E7=8E=B0=E7=99=BB=E5=BD=95=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=BC=B9=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/hooks/useModal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sheep/hooks/useModal.js b/sheep/hooks/useModal.js
index b8505256..003fe809 100644
--- a/sheep/hooks/useModal.js
+++ b/sheep/hooks/useModal.js
@@ -14,7 +14,7 @@ export function showAuthModal(type = 'smsLogin') {
       modal.$patch((state) => {
         state.auth = type;
       });
-    }, 200);
+    }, 500);
     closeAuthModal();
   } else {
     modal.$patch((state) => {

From 1fc3537bf4645975619095ffe37e46a1e3ecae44 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 8 Aug 2024 12:26:09 +0800
Subject: [PATCH 11/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E9=97=A8=E5=BA=97=E8=87=AA=E6=8F=90=EF=BC=9A?=
 =?UTF-8?q?h5=20=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/goods_details_store/index.vue      | 103 +++++++++---------
 sheep/libs/sdk-h5-weixin.js                   |  12 +-
 .../provider/wechat/officialAccount.js        |   2 +-
 3 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
index 20f3e084..07b68508 100644
--- a/pages/user/goods_details_store/index.vue
+++ b/pages/user/goods_details_store/index.vue
@@ -32,7 +32,7 @@
             </view>
             <!-- #endif -->
           </view>
-          <view class="store-distance ss-flex ss-row-center" @tap="showMaoLocation(item)">
+          <view class="store-distance ss-flex ss-row-center" @tap.stop="showMaoLocation(item)">
             <text class="addressTxt" v-if="item.distance">距离{{ item.distance.toFixed(2) }}千米</text>
             <text class="addressTxt" v-else>查看地图</text>
             <view class="iconfont">
@@ -55,13 +55,11 @@
 
   const LONGITUDE = 'user_longitude';
   const LATITUDE = 'user_latitude';
-  const MAPKEY = 'mapKey';
   const state = reactive({
     loaded: false,
     loading: false,
     storeList: [],
     system_store: {},
-    // mapKey: cookie.get(MAPKEY),
     locationShow: false,
     user_latitude: 0,
     user_longitude: 0,
@@ -73,61 +71,62 @@
     });
   };
   const selfLocation = () => {
-    // TODO h5 地图
     // #ifdef H5
-    // if (state.$wechat.isWeixin()) {
-    //   state.$wechat.location().then(res => {
-    //     state.user_latitude = res.latitude;
-    //     state.user_longitude = res.longitude;
-    //     uni.setStorageSync(LATITUDE, res.latitude);
-    //     uni.setStorageSync(LONGITUDE, res.longitude);
-    //     getList();
-    //   });
-    // } else {
-    // #endif
-    uni.getLocation({
-      type: 'gcj02',
-      success: (res) => {
-        try {
-          state.user_latitude = res.latitude;
-          state.user_longitude = res.longitude;
-          uni.setStorageSync(LATITUDE, res.latitude);
-          uni.setStorageSync(LONGITUDE, res.longitude);
-        } catch {
-        }
+    const jsWxSdk = sheep.$platform.useProvider('wechat').jsWxSdk;
+    if (jsWxSdk.isWechat()) {
+      jsWxSdk.getLocation((res) => {
+        console.log(res);
+        state.user_latitude = res.latitude;
+        state.user_longitude = res.longitude;
+        uni.setStorageSync(LATITUDE, res.latitude);
+        uni.setStorageSync(LONGITUDE, res.longitude);
         getList();
-      },
-      complete: () => {
-        getList();
-      },
-    });
-    // #ifdef H5
-    // }
+      });
+    } else {
+      // #endif
+      uni.getLocation({
+        type: 'gcj02',
+        success: (res) => {
+          try {
+            state.user_latitude = res.latitude;
+            state.user_longitude = res.longitude;
+            uni.setStorageSync(LATITUDE, res.latitude);
+            uni.setStorageSync(LONGITUDE, res.longitude);
+          } catch {
+          }
+          getList();
+        },
+        complete: () => {
+          getList();
+        },
+      });
+      // #ifdef H5
+    }
     // #endif
   };
   const showMaoLocation = (e) => {
-    // TODO h5 地图
     // #ifdef H5
-    // if (state.$wechat.isWeixin()) {
-    //   state.$wechat.seeLocation({
-    //     latitude: Number(e.latitude),
-    //     longitude: Number(e.longitude),
-    //   }).then(res => {
-    //     console.log('success');
-    //   });
-    // } else {
-    // #endif
-    uni.openLocation({
-      latitude: Number(e.latitude),
-      longitude: Number(e.longitude),
-      name: e.name,
-      address: `${e.areaName}-${e.detailAddress}`,
-      success: function() {
-        console.log('success');
-      },
-    });
-    // #ifdef H5
-    // }
+    const jsWxSdk = sheep.$platform.useProvider('wechat').jsWxSdk;
+    if (jsWxSdk.isWechat()) {
+      jsWxSdk.openLocation({
+        latitude: Number(e.latitude),
+        longitude: Number(e.longitude),
+        name: e.name,
+        address: `${e.areaName}-${e.detailAddress}`
+      });
+    } else {
+      // #endif
+      uni.openLocation({
+        latitude: Number(e.latitude),
+        longitude: Number(e.longitude),
+        name: e.name,
+        address: `${e.areaName}-${e.detailAddress}`,
+        success: function() {
+          console.log('success');
+        },
+      });
+      // #ifdef H5
+    }
     // #endif
   };
 
diff --git a/sheep/libs/sdk-h5-weixin.js b/sheep/libs/sdk-h5-weixin.js
index a71b9513..1df26f94 100644
--- a/sheep/libs/sdk-h5-weixin.js
+++ b/sheep/libs/sdk-h5-weixin.js
@@ -1,9 +1,10 @@
 /**
  * 本模块封装微信浏览器下的一些方法。
  * 更多微信网页开发sdk方法,详见:https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html
+ * 有 the permission value is offline verifying 报错请参考 @see https://segmentfault.com/a/1190000042289419 解决
  */
 
-import jweixin, { ready } from 'weixin-js-sdk';
+import jweixin from 'weixin-js-sdk';
 import $helper from '@/sheep/helper';
 import AuthUtil from '@/sheep/api/member/auth';
 
@@ -38,7 +39,7 @@ export default {
         timestamp: data.timestamp,
         nonceStr: data.nonceStr,
         signature: data.signature,
-        jsApiList: ['chooseWXPay'], // TODO 芋艿：后续可以设置更多权限；
+        jsApiList: ['chooseWXPay', 'openLocation', 'getLocation','updateTimelineShareData','scanQRCode'], // TODO 芋艿：后续可以设置更多权限；
         openTagList: data.openTagList
       });
     }
@@ -137,9 +138,10 @@ export default {
   openLocation(data, callback) {
     this.isReady(() => {
       jweixin.openLocation({
-        //根据传入的坐标打开地图
-        latitude: data.latitude,
-        longitude: data.longitude,
+        ...data,
+        success: function (res) {
+          console.log(res);
+        }
       });
     });
   },
diff --git a/sheep/platform/provider/wechat/officialAccount.js b/sheep/platform/provider/wechat/officialAccount.js
index 2d3e5dd0..404b8660 100644
--- a/sheep/platform/provider/wechat/officialAccount.js
+++ b/sheep/platform/provider/wechat/officialAccount.js
@@ -103,5 +103,5 @@ export default {
   unbind,
   getInfo,
   getOpenid,
-  jssdk: $wxsdk,
+  jsWxSdk: $wxsdk,
 };

From bb1da04177667a289dcda1c6d16f84d4d8db5a2a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 8 Aug 2024 13:04:34 +0800
Subject: [PATCH 12/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E5=AE=9E=E7=8E=B0=E5=8A=A8=E6=80=81=20termin?=
 =?UTF-8?q?al=20=E7=BB=88=E7=AB=AF=E7=B1=BB=E5=9E=8B=E7=9A=84=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/request/index.js |  6 ++----
 sheep/util/const.js    | 21 +++++++++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/sheep/request/index.js b/sheep/request/index.js
index 50ac2dea..492f08c9 100644
--- a/sheep/request/index.js
+++ b/sheep/request/index.js
@@ -9,7 +9,7 @@ import $store from '@/sheep/store';
 import $platform from '@/sheep/platform';
 import { showAuthModal } from '@/sheep/hooks/useModal';
 import AuthUtil from '@/sheep/api/member/auth';
-import { getTerminalEnumByUniPlatform } from '@/sheep/util/const';
+import { getTerminal } from '@/sheep/util/const';
 
 const options = {
 	// 显示操作成功消息 默认不显示
@@ -94,9 +94,7 @@ http.interceptors.request.use(
 		if (token) {
 			config.header['Authorization'] = token;
 		}
-
-		const terminalType = uni.getSystemInfoSync().uniPlatform
-		config.header['terminal'] = getTerminalEnumByUniPlatform(terminalType);
+		config.header['terminal'] = getTerminal();
 
     config.header['Accept'] = '*/*';
     config.header['tenant-id'] = tenantId;
diff --git a/sheep/util/const.js b/sheep/util/const.js
index 4339ef90..9cf98bf3 100644
--- a/sheep/util/const.js
+++ b/sheep/util/const.js
@@ -12,26 +12,23 @@ export const TerminalEnum = {
 };
 
 /**
- * 将Uniapp提供的平台转换为后端所需的Terminal值
- * @param platformType Uniapp提供的平台类型
+ * 将 uni-app 提供的平台转换为后端所需的 terminal值
+ *
+ * @return 终端
  */
-export const getTerminalEnumByUniPlatform = (platformType) => {
-  let terminal;
+export const getTerminal = () => {
+  const platformType = uni.getSystemInfoSync().uniPlatform;
   // 与后端terminal枚举一一对应
   switch (platformType) {
     case 'app':
-      terminal = TerminalEnum.APP;
-      break;
+      return TerminalEnum.APP;
     case 'web':
-      terminal = TerminalEnum.H5;
-      break;
+      return TerminalEnum.H5;
     case 'mp-weixin':
-      terminal = TerminalEnum.WECHAT_MINI_PROGRAM;
-      break;
+      return TerminalEnum.WECHAT_MINI_PROGRAM;
     default:
-      terminal = TerminalEnum.UNKNOWN;
+      return TerminalEnum.UNKNOWN;
   }
-  return terminal;
 };
 
 // ========== MALL - 营销模块 ==========

From e7ba7a82e351e4d246867e34947a5616edc00441 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 9 Aug 2024 10:10:01 +0800
Subject: [PATCH 13/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=9C=B0=E5=9D=80=E5=88=97=E8=A1=A8=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=9C=B0=E5=9D=80=E5=8D=A1=E7=89=87=E4=BC=9A=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=B8=8A=E4=B8=80=E9=A1=B5=E7=9A=84=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/addressSelection.vue |  2 +-
 pages/user/address/list.vue      | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pages/order/addressSelection.vue b/pages/order/addressSelection.vue
index 106621e3..2432d413 100644
--- a/pages/order/addressSelection.vue
+++ b/pages/order/addressSelection.vue
@@ -86,7 +86,7 @@
   // 选择地址
   function onSelectAddress() {
     let emitName = 'SELECT_ADDRESS'
-    let addressPage = '/pages/user/address/list'
+    let addressPage = '/pages/user/address/list?type=select';
     if (state.value.deliveryType === 2){
       emitName = 'SELECT_PICK_UP_INFO'
       addressPage = '/pages/user/goods_details_store/index'
diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue
index 47b0b1a3..f3bc6869 100644
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@@ -39,8 +39,8 @@
 </template>
 
 <script setup>
-  import { reactive, onBeforeMount } from 'vue';
-  import { onShow } from '@dcloudio/uni-app';
+  import { onBeforeMount, reactive } from 'vue';
+  import { onShow, onLoad } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import { isEmpty } from 'lodash-es';
   import AreaApi from '@/sheep/api/system/area';
@@ -49,10 +49,14 @@
   const state = reactive({
     list: [], // 地址列表
     loading: true,
+    openType: '', // 页面打开类型
   });
 
   // 选择收货地址
   const onSelect = (addressInfo) => {
+    if (state.openType !== 'select'){ // 不作为选择组件时阻断操作
+      return
+    }
     uni.$emit('SELECT_ADDRESS', {
       addressInfo,
     });
@@ -110,6 +114,12 @@
     // #endif
   }
 
+  onLoad((option) => {
+    if (option.type) {
+      state.openType = option.type;
+    }
+  });
+
   onShow(async () => {
     state.list = (await AddressApi.getAddressList()).data;
     state.loading = false;

From a9a522880d45a568d6e1c657e014b5338916e4e9 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 9 Aug 2024 10:46:12 +0800
Subject: [PATCH 14/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BF=AE=E5=A4=8D=E7=A7=92=E6=9D=80=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/seckill.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index aed2cd33..6ae46d6e 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -63,7 +63,7 @@
             <detail-progress :percent="state.percent" />
           </view>
 
-          <view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo?.name }}</view>
+          <view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo.name || '' }}</view>
           <view class="subtitle-text ss-line-1">{{ state.goodsInfo.introduction }}</view>
         </view>
 
@@ -135,7 +135,7 @@
 </template>
 
 <script setup>
-  import { reactive, computed, ref } from 'vue';
+  import { reactive, computed, ref, unref } from 'vue';
   import { onLoad, onPageScroll } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import { isEmpty, min } from 'lodash-es';
@@ -198,7 +198,7 @@
 
   // 分享信息 TODO 芋艿：待接入
   const shareInfo = computed(() => {
-    if (isEmpty(activity)) return {};
+    if (isEmpty(unref(activity))) return {};
     return sheep.$platform.share.getShareInfo(
       {
         title: activity.value.name,

From b093f99ab5ac9f308c561c64aec6bc20092e488c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Fri, 9 Aug 2024 20:16:56 +0800
Subject: [PATCH 15/84] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=BB=8E=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E6=9F=90=E4=B8=AA=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=88=86=E7=B1=BB=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E8=87=AA=E5=8A=A8=E9=80=89=E4=B8=AD=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/category.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pages/index/category.vue b/pages/index/category.vue
index cb87b0b5..619220b2 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -131,8 +131,16 @@
     getGoodsList();
   }
 
-  onLoad(async () => {
+  onLoad(async (params) => {
     await getList();
+	// 从主页点进来的时候自动选中左侧一级菜单
+	const cateList = state.categoryList
+	for (let index = 0; index < cateList.length;index++) {
+		if (cateList[index].id == params.id) {
+			state.activeMenu = index
+			break;
+		}
+	}
     // 如果是 first 风格，需要加载商品分页
     if (state.style === 'first_one' || state.style === 'first_two') {
       onMenu(0);

From fd83bcf02a3bf60e0a2441450060016e18a5d2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Fri, 9 Aug 2024 21:26:29 +0800
Subject: [PATCH 16/84] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=97=B6=E5=80=99=E8=87=AA=E5=8A=A8=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E5=B7=A6=E4=BE=A7=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/category.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/index/category.vue b/pages/index/category.vue
index 619220b2..52e46aaa 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -135,9 +135,9 @@
     await getList();
 	// 从主页点进来的时候自动选中左侧一级菜单
 	const cateList = state.categoryList
-	for (let index = 0; index < cateList.length;index++) {
+	for (let index = 0; index < cateList.length; index++) {
 		if (cateList[index].id == params.id) {
-			state.activeMenu = index
+			onMenu(index);
 			break;
 		}
 	}

From cc9f31f8c39e6c29bc3b416e67d8c92722e65793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Fri, 9 Aug 2024 22:06:35 +0800
Subject: [PATCH 17/84] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=97=B6=E5=80=99=E8=87=AA=E5=8A=A8=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E5=B7=A6=E4=BE=A7=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/category.vue | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pages/index/category.vue b/pages/index/category.vue
index 52e46aaa..b4ab3b00 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -133,14 +133,12 @@
 
   onLoad(async (params) => {
     await getList();
-	// 从主页点进来的时候自动选中左侧一级菜单
-	const cateList = state.categoryList
-	for (let index = 0; index < cateList.length; index++) {
-		if (cateList[index].id == params.id) {
-			onMenu(index);
-			break;
-		}
-	}
+	
+	// 首页点击分类的处理：查找满足条件的分类
+	const foundCategory = state.categoryList.find(category => category.id == params.id);
+	// 如果找到则调用 onMenu 自动勾选相应分类，否则调用 onMenu(0) 勾选第一个分类
+	onMenu(foundCategory ? state.categoryList.indexOf(foundCategory) : 0);
+	
     // 如果是 first 风格，需要加载商品分页
     if (state.style === 'first_one' || state.style === 'first_two') {
       onMenu(0);

From 51ba185e8111cae754e3eb8e87c8235cdad386f6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 10 Aug 2024 10:25:51 +0800
Subject: [PATCH 18/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E8=BF=9B=E5=85=A5=E5=88=86=E7=B1=BB=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E5=B7=A6=E4=BE=A7=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=88=E6=AF=94=E5=A6=82=E4=BB=8E=E9=A6=96=E9=A1=B5=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/index.vue    |  2 +-
 pages/goods/seckill.vue  |  2 +-
 pages/index/category.vue | 15 +++++----------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index bf0b0cb9..dc3f73aa 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -157,7 +157,7 @@
         items: [{
           skuId: e.id,
           count: e.goods_num,
-		  categoryId: state.goodsInfo.categoryId
+		      categoryId: state.goodsInfo.categoryId
         }]
       }),
     });
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 6ae46d6e..30a64305 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -196,7 +196,7 @@
     });
   }
 
-  // 分享信息 TODO 芋艿：待接入
+  // 分享信息
   const shareInfo = computed(() => {
     if (isEmpty(unref(activity))) return {};
     return sheep.$platform.share.getShareInfo(
diff --git a/pages/index/category.vue b/pages/index/category.vue
index b4ab3b00..4c88f388 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -133,16 +133,11 @@
 
   onLoad(async (params) => {
     await getList();
-	
-	// 首页点击分类的处理：查找满足条件的分类
-	const foundCategory = state.categoryList.find(category => category.id == params.id);
-	// 如果找到则调用 onMenu 自动勾选相应分类，否则调用 onMenu(0) 勾选第一个分类
-	onMenu(foundCategory ? state.categoryList.indexOf(foundCategory) : 0);
-	
-    // 如果是 first 风格，需要加载商品分页
-    if (state.style === 'first_one' || state.style === 'first_two') {
-      onMenu(0);
-    }
+
+    // 首页点击分类的处理：查找满足条件的分类
+    const foundCategory = state.categoryList.find(category => category.id === params.id);
+    // 如果找到则调用 onMenu 自动勾选相应分类，否则调用 onMenu(0) 勾选第一个分类
+    onMenu(foundCategory ? state.categoryList.indexOf(foundCategory) : 0);
   });
 
   onReachBottom(() => {

From 5feab41b3df75397619ead3635fa04bac3093197 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 10 Aug 2024 11:36:02 +0800
Subject: [PATCH 19/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E6=8B=BC=E5=9B=A2=EF=BC=9A=E6=9C=AA=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E6=8B=BC=E5=9B=A2=E7=9A=84=20SKU=20=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/groupon.vue | 14 +++++++++++++-
 pages/goods/seckill.vue |  3 ++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 354d6ed9..3f464ed9 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -199,6 +199,7 @@
 
   /**
    * 去参团
+   *
    * @param record 团长的团购记录
    */
   function onJoinGroupon(record) {
@@ -227,7 +228,6 @@
   }
 
   // 分享信息
-  // TODO @芋艿：分享的接入
   const shareInfo = computed(() => {
     if (isEmpty(state.activity)) return {};
     return sheep.$platform.share.getShareInfo(
@@ -262,9 +262,21 @@
     // 加载商品信息
     const { data: spu } = await SpuApi.getSpuDetail(activity.spuId);
     state.goodsId = spu.id;
+    // 默认显示最低价
     activity.products.forEach((product) => {
       spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
     });
+    // 价格、库存使用活动的
+    spu.skus.forEach((sku) => {
+      const product = activity.products.find((product) => product.skuId === sku.id);
+      if (product) {
+        sku.price = product.combinationPrice;
+      } else {
+        // 找不到可能是没配置，则不能发起秒杀
+        sku.stock = 0;
+      }
+    });
+
     // 关闭骨架屏
     state.skeletonLoading = false;
     if (code === 0) {
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 30a64305..34708d62 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -220,6 +220,7 @@
 
   const activity = ref();
   const timeStatusEnum = ref('');
+
   // 查询活动
   const getActivity = async (id) => {
     const { data } = await SeckillApi.getSeckillActivity(id);
@@ -230,9 +231,9 @@
     await getSpu(data.spuId);
   };
 
+  // 查询商品
   const getSpu = async (id) => {
     const { data } = await SpuApi.getSpuDetail(id);
-    // 模拟
     data.activity_type = 'seckill';
     state.goodsInfo = data;
     // 处理轮播图

From 19d3cb33e2d3f78b2399c87b4032eaa650acfd60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 11 Aug 2024 14:03:20 +0800
Subject: [PATCH 20/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E8=A3=85=E4=BF=AE=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8D=A1=E7=89=87=E4=BD=BF=E7=94=A8=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-block-item/s-block-item.vue  |  2 +-
 sheep/components/s-user-card/s-user-card.vue  | 28 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 9cd60073..ee1ff8de 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -47,7 +47,7 @@
     <s-richtext-block v-if="type === 'PromotionArticle'" :data="data" :styles="styles" />
 
     <!-- 用户组件：用户卡片 -->
-    <s-user-card v-if="type === 'UserCard'" />
+    <s-user-card v-if="type === 'UserCard'" :data="data" :styles="styles" />
     <!-- 用户组件：用户订单 -->
     <s-order-card v-if="type === 'UserOrder'" :data="data" />
     <!-- 用户组件：用户资产 -->
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index d2340985..2d32745e 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户卡片 -->
 <template>
-	<view class="ss-user-info-wrap ss-p-t-50">
+	<view class="ss-user-info-wrap ss-p-t-50"  :style="[style, { marginLeft: `${data.space}px` }]">
 		<view class="ss-flex ss-col-center ss-row-between ss-m-b-20">
 			<view class="left-box ss-flex ss-col-center ss-m-l-36">
 				<view class="avatar-box ss-m-r-24">
@@ -70,9 +70,15 @@
 	const isLogin = computed(() => sheep.$store('user').isLogin);
 	// 接收参数
 	const props = defineProps({
-		background: {
-			type: String,
-			default: '',
+		// 装修数据
+		data: {
+		  type: Object,
+		  default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+		  type: Object,
+		  default: () => ({}),
 		},
 		// 头像
 		avatar: {
@@ -96,7 +102,19 @@
 			default: '1',
 		},
 	});
-
+	// 设置背景样式
+	const style = computed(() => {
+	  // 直接从 props.styles 解构
+	  const { bgType, bgImg, bgColor } = props.styles; 
+	
+	  // 根据 bgType 返回相应的样式
+	  return {
+		background: bgType === 'img'
+			? `url(${bgImg}) no-repeat top center / 100% 100%`
+			: bgColor
+		};
+	});
+	// 绑定手机号
 	function onBind() {
 		showAuthModal('changeMobile');
 	}

From 35c75338ee5da4bdbf25718d823a7536b05d7806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 11 Aug 2024 14:59:08 +0800
Subject: [PATCH 21/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8D=A1=E7=89=87=E8=A3=85=E4=BF=AE=E7=9A=84=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-block-item/s-block-item.vue  |  2 +-
 .../components/s-order-card/s-order-card.vue  | 28 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index ee1ff8de..09b069c3 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -49,7 +49,7 @@
     <!-- 用户组件：用户卡片 -->
     <s-user-card v-if="type === 'UserCard'" :data="data" :styles="styles" />
     <!-- 用户组件：用户订单 -->
-    <s-order-card v-if="type === 'UserOrder'" :data="data" />
+    <s-order-card v-if="type === 'UserOrder'" :data="data" :styles="styles" />
     <!-- 用户组件：用户资产 -->
     <s-wallet-card v-if="type === 'UserWallet'" />
     <!-- 用户组件：用户卡券 -->
diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue
index 095e6cfd..b3d851bd 100644
--- a/sheep/components/s-order-card/s-order-card.vue
+++ b/sheep/components/s-order-card/s-order-card.vue
@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户订单 -->
 <template>
-  <view class="ss-order-menu-wrap ss-flex ss-col-center">
+  <view class="ss-order-menu-wrap ss-flex ss-col-center" :style="[style, { marginLeft: `${data.space}px` }]">
     <view
       class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
       v-for="item in orderMap"
@@ -67,8 +67,32 @@
       path: '/pages/order/list',
     },
   ];
-
+  // 接收参数
+  const props = defineProps({
+  	// 装修数据
+  	data: {
+  	  type: Object,
+  	  default: () => ({}),
+  	},
+  	// 装修样式
+  	styles: {
+  	  type: Object,
+  	  default: () => ({}),
+  	},
+  });
+  // 设置角标
   const numData = computed(() => sheep.$store('user').numData);
+  // 设置背景样式
+  const style = computed(() => {
+    // 直接从 props.styles 解构
+    const { bgType, bgImg, bgColor } = props.styles; 
+    // 根据 bgType 返回相应的样式
+    return {
+  		background: bgType === 'img'
+  			? `url(${bgImg}) no-repeat top center / 100% 100%`
+  			: bgColor
+  	};
+  });
 </script>
 
 <style lang="scss" scoped>

From 58af434a90441d72e879f83c057ff4e11647ee9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 12 Aug 2024 10:05:39 +0800
Subject: [PATCH 22/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=A3=85=E4=BF=AE=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-block-item/s-block-item.vue  |  2 +-
 sheep/components/s-user-card/s-user-card.vue  |  2 +-
 .../s-wallet-card/s-wallet-card.vue           | 30 +++++++++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 09b069c3..f1ed4231 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -51,7 +51,7 @@
     <!-- 用户组件：用户订单 -->
     <s-order-card v-if="type === 'UserOrder'" :data="data" :styles="styles" />
     <!-- 用户组件：用户资产 -->
-    <s-wallet-card v-if="type === 'UserWallet'" />
+    <s-wallet-card v-if="type === 'UserWallet'" :data="data" :styles="styles" />
     <!-- 用户组件：用户卡券 -->
     <s-coupon-card v-if="type === 'UserCoupon'" />
   </view>
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index 2d32745e..a05f834b 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户卡片 -->
 <template>
-	<view class="ss-user-info-wrap ss-p-t-50"  :style="[style, { marginLeft: `${data.space}px` }]">
+	<view class="ss-user-info-wrap ss-p-t-50" :style="[style, { marginLeft: `${data.space}px` }]">
 		<view class="ss-flex ss-col-center ss-row-between ss-m-b-20">
 			<view class="left-box ss-flex ss-col-center ss-m-l-36">
 				<view class="avatar-box ss-m-r-24">
diff --git a/sheep/components/s-wallet-card/s-wallet-card.vue b/sheep/components/s-wallet-card/s-wallet-card.vue
index 54348e90..7588c206 100644
--- a/sheep/components/s-wallet-card/s-wallet-card.vue
+++ b/sheep/components/s-wallet-card/s-wallet-card.vue
@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户资产 -->
 <template>
-	<view class="ss-wallet-menu-wrap ss-flex ss-col-center">
+	<view class="ss-wallet-menu-wrap ss-flex ss-col-center" :style="[style, { marginLeft: `${data.space}px` }]">
 		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
 			@tap="sheep.$router.go('/pages/user/wallet/money')">
 			<view class="value-box ss-flex ss-col-bottom">
@@ -42,8 +42,34 @@
 	 */
 	import { computed } from 'vue';
 	import sheep from '@/sheep';
-  import { fen2yuan } from '../../hooks/useGoods';
+	import { fen2yuan } from '../../hooks/useGoods';
 
+	// 接收参数
+	const props = defineProps({
+		// 装修数据
+		data: {
+		  type: Object,
+		  default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+		  type: Object,
+		  default: () => ({}),
+		},
+	});
+	// 设置背景样式
+	const style = computed(() => {
+	  // 直接从 props.styles 解构
+	  const { bgType, bgImg, bgColor } = props.styles; 
+	
+	  // 根据 bgType 返回相应的样式
+	  return {
+		background: bgType === 'img'
+			? `url(${bgImg}) no-repeat top center / 100% 100%`
+			: bgColor
+		};
+	});
+	
 	const userWallet = computed(() => sheep.$store('user').userWallet);
 	const userInfo = computed(() => sheep.$store('user').userInfo);
 	const numData = computed(() => sheep.$store('user').numData);

From 438897b9d34b61eacf1620f0629b58b90abfcd35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 12 Aug 2024 10:15:51 +0800
Subject: [PATCH 23/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E5=8D=A1?=
 =?UTF-8?q?=E5=88=B8=E8=A3=85=E4=BF=AE=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-block-item/s-block-item.vue  |  2 +-
 .../s-coupon-card/s-coupon-card.vue           | 25 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index f1ed4231..156f36f6 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -53,7 +53,7 @@
     <!-- 用户组件：用户资产 -->
     <s-wallet-card v-if="type === 'UserWallet'" :data="data" :styles="styles" />
     <!-- 用户组件：用户卡券 -->
-    <s-coupon-card v-if="type === 'UserCoupon'" />
+    <s-coupon-card v-if="type === 'UserCoupon'" :data="data" :styles="styles" />
   </view>
 </template>
 
diff --git a/sheep/components/s-coupon-card/s-coupon-card.vue b/sheep/components/s-coupon-card/s-coupon-card.vue
index bd5705bb..e30f39ea 100644
--- a/sheep/components/s-coupon-card/s-coupon-card.vue
+++ b/sheep/components/s-coupon-card/s-coupon-card.vue
@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户卡券 -->
 <template>
-	<view class="ss-coupon-menu-wrap ss-flex ss-col-center">
+	<view class="ss-coupon-menu-wrap ss-flex ss-col-center" :style="[style, { marginLeft: `${data.space}px` }]">
 		<view class="menu-item ss-flex-col ss-row-center ss-col-center" v-for="item in props.list" :key="item.title"
 			@tap="sheep.$router.go(item.path, { type: item.type })"
 			:class="item.type === 'all' ? 'menu-wallet' : 'ss-flex-1'">
@@ -15,6 +15,7 @@
 	 * 装修组件 - 优惠券菜单
 	 */
 	import sheep from '@/sheep';
+	import { computed } from 'vue';
 
 	// 接收参数
 	const props = defineProps({
@@ -52,6 +53,28 @@
 				];
 			},
 		},
+		// 装修数据
+		data: {
+		  type: Object,
+		  default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+		  type: Object,
+		  default: () => ({}),
+		},
+	});
+	// 设置背景样式
+	const style = computed(() => {
+	  // 直接从 props.styles 解构
+	  const { bgType, bgImg, bgColor } = props.styles; 
+	
+	  // 根据 bgType 返回相应的样式
+	  return {
+		background: bgType === 'img'
+			? `url(${bgImg}) no-repeat top center / 100% 100%`
+			: bgColor
+		};
 	});
 </script>
 

From 34274cbaa8891bce745969a5cb98030d30abc7ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 12 Aug 2024 11:03:39 +0800
Subject: [PATCH 24/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E8=A3=85=E4=BF=AE=E5=AE=AB?=
 =?UTF-8?q?=E6=A0=BC=E5=AF=BC=E8=88=AA=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-block-item/s-block-item.vue  |   2 +-
 sheep/components/s-menu-grid/s-menu-grid.vue  | 164 ++++++++++--------
 2 files changed, 94 insertions(+), 72 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 156f36f6..5e65b36b 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -9,7 +9,7 @@
     <!-- 基础组件：列表导航 -->
     <s-menu-list v-if="type === 'MenuList'" :data="data" />
     <!-- 基础组件：宫格导航 -->
-    <s-menu-grid v-if="type === 'MenuGrid'" :data="data" />
+    <s-menu-grid v-if="type === 'MenuGrid'" :data="data" :styles="styles" />
     <!-- 基础组件：弹窗广告 -->
     <s-popup-image v-if="type === 'Popover'" :data="data" />
     <!-- 基础组件：悬浮按钮 -->
diff --git a/sheep/components/s-menu-grid/s-menu-grid.vue b/sheep/components/s-menu-grid/s-menu-grid.vue
index 518d6edf..deae0663 100644
--- a/sheep/components/s-menu-grid/s-menu-grid.vue
+++ b/sheep/components/s-menu-grid/s-menu-grid.vue
@@ -1,82 +1,104 @@
 <!-- 装修基础组件：宫格导航 -->
 <template>
-  <uni-grid :showBorder="Boolean(data.border)" :column="data.column">
-    <uni-grid-item
-      v-for="(item, index) in data.list"
-      :key="index"
-      @tap="sheep.$router.go(item.url)"
-    >
-      <view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center">
-        <view class="img-box">
-          <view
-            class="tag-box"
-            v-if="item.badge.show"
-            :style="[{ background: item.badge.bgColor, color: item.badge.textColor }]"
-          >
-            {{ item.badge.text }}
-          </view>
-          <image class="menu-image" :src="sheep.$url.cdn(item.iconUrl)"></image>
-        </view>
+	<view :style="[style, { marginLeft: `${data.space}px` }]">
+		<uni-grid :showBorder="Boolean(data.border)" :column="data.column">
+			<uni-grid-item v-for="(item, index) in data.list" :key="index" @tap="sheep.$router.go(item.url)">
+				<view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center">
+					<view class="img-box">
+						<view class="tag-box" v-if="item.badge.show"
+							:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]">
+							{{ item.badge.text }}
+						</view>
+						<image class="menu-image" :src="sheep.$url.cdn(item.iconUrl)"></image>
+					</view>
+
+					<view class="title-box ss-flex ss-flex-col ss-row-center ss-col-center">
+						<view class="grid-text" :style="[{ color: item.titleColor }]">
+							{{ item.title }}
+						</view>
+						<view class="grid-tip" :style="[{ color: item.subtitleColor }]">
+							{{ item.subtitle }}
+						</view>
+					</view>
+				</view>
+			</uni-grid-item>
+		</uni-grid>
+	</view>
 
-        <view class="title-box ss-flex ss-flex-col ss-row-center ss-col-center">
-          <view class="grid-text" :style="[{ color: item.titleColor }]">
-            {{ item.title }}
-          </view>
-          <view class="grid-tip" :style="[{ color: item.subtitleColor }]">
-            {{ item.subtitle }}
-          </view>
-        </view>
-      </view>
-    </uni-grid-item>
-  </uni-grid>
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
+	import sheep from '@/sheep';
+	import {
+		computed
+	} from 'vue';
 
-  const props = defineProps({
-    data: {
-      type: Object,
-      default() {},
-    },
-  });
+	const props = defineProps({
+		// 装修数据
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+	});
+	// 设置背景样式
+	const style = computed(() => {
+		// 直接从 props.styles 解构
+		const {
+			bgType,
+			bgImg,
+			bgColor
+		} = props.styles;
+
+		// 根据 bgType 返回相应的样式
+		return {
+			background: bgType === 'img' ? `url(${bgImg}) no-repeat top center / 100% 100%` : bgColor
+		};
+	});
 </script>
 
 <style lang="scss" scoped>
-  .menu-image {
-    width: 24px;
-    height: 24px;
-  }
-  .grid-item-box {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    .img-box {
-      position: relative;
-      .tag-box {
-        position: absolute;
-        z-index: 2;
-        top: 0;
-        right: 0;
-        font-size: 2em;
-        line-height: 1;
-        padding: 0.4em 0.6em 0.3em;
-        transform: scale(0.4) translateX(0.5em) translatey(-0.6em);
-        transform-origin: 100% 0;
-        border-radius: 200rpx;
-        white-space: nowrap;
-      }
-    }
+	.menu-image {
+		width: 24px;
+		height: 24px;
+	}
 
-    .title-box {
-      .grid-tip {
-        font-size: 24rpx;
-        white-space: nowrap;
-        text-align: center;
-      }
-    }
-  }
-</style>
+	.grid-item-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+
+		.img-box {
+			position: relative;
+
+			.tag-box {
+				position: absolute;
+				z-index: 2;
+				top: 0;
+				right: 0;
+				font-size: 2em;
+				line-height: 1;
+				padding: 0.4em 0.6em 0.3em;
+				transform: scale(0.4) translateX(0.5em) translatey(-0.6em);
+				transform-origin: 100% 0;
+				border-radius: 200rpx;
+				white-space: nowrap;
+			}
+		}
+
+		.title-box {
+			.grid-tip {
+				font-size: 24rpx;
+				white-space: nowrap;
+				text-align: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file

From be5db900a0e34c216d77cf180a4f9265bdcc3dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 12 Aug 2024 13:06:35 +0800
Subject: [PATCH 25/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E6=A0=87=E9=A2=98=E6=A0=8F?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AE=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-title-block/s-title-block.vue           | 177 +++++++++---------
 1 file changed, 93 insertions(+), 84 deletions(-)

diff --git a/sheep/components/s-title-block/s-title-block.vue b/sheep/components/s-title-block/s-title-block.vue
index 513a3cc0..3d639b73 100644
--- a/sheep/components/s-title-block/s-title-block.vue
+++ b/sheep/components/s-title-block/s-title-block.vue
@@ -1,100 +1,109 @@
 <!-- 装修商品组件：标题栏 -->
 <template>
-  <view
-    class="ss-title-wrap ss-flex ss-col-center"
-    :class="[state.typeMap[data.textAlign]]"
-    :style="[elStyles]"
-  >
-    <view class="title-content">
-      <!-- 主标题 -->
-      <view v-if="data.title" class="title-text" :style="[titleStyles]">{{ data.title }}</view>
-      <!-- 副标题 -->
-      <view v-if="data.description" :style="[descStyles]" class="sub-title-text">{{ data.description }}</view>
-    </view>
-    <!-- 查看更多 -->
-    <view v-if="data.more?.show" class="more-box ss-flex ss-col-center" @tap="sheep.$router.go(data.more.url)"
-          :style="{color: data.descriptionColor}">
-      <view class="more-text" v-if="data.more.type !== 'icon'">{{ data.more.text }} </view>
-      <text class="_icon-forward" v-if="data.more.type !== 'text'"></text>
-    </view>
-  </view>
+	<view class="ss-title-wrap ss-flex ss-col-center" :class="[state.typeMap[data.textAlign]]" :style="[bgStyle, { marginLeft: `${data.space}px` }]">
+		<view class="title-content">
+			<!-- 主标题 -->
+			<view v-if="data.title" class="title-text" :style="[titleStyles]">{{ data.title }}</view>
+			<!-- 副标题 -->
+			<view v-if="data.description" :style="[descStyles]" class="sub-title-text">{{ data.description }}</view>
+		</view>
+		<!-- 查看更多 -->
+		<view v-if="data.more?.show" class="more-box ss-flex ss-col-center" @tap="sheep.$router.go(data.more.url)"
+			:style="{color: data.descriptionColor}">
+			<view class="more-text" v-if="data.more.type !== 'icon'">{{ data.more.text }} </view>
+			<text class="_icon-forward" v-if="data.more.type !== 'text'"></text>
+		</view>
+	</view>
 </template>
 
 <script setup>
-  /**
-   * 标题栏
-   */
-  import { reactive } from 'vue';
-  import sheep from '@/sheep';
+	/**
+	 * 标题栏
+	 */
+	import {
+		reactive,
+		computed
+	} from 'vue';
+	import sheep from '@/sheep';
 
-  // 数据
-  const state = reactive({
-    typeMap: {
-      left: 'ss-row-left',
-      center: 'ss-row-center',
-    },
-  });
+	// 数据
+	const state = reactive({
+		typeMap: {
+			left: 'ss-row-left',
+			center: 'ss-row-center',
+		},
+	});
 
-  // 接收参数
-  const props = defineProps({
-    data: {
-      type: Object,
-      default() {},
-    },
-    styles: {
-      type: Object,
-      default() {},
-    },
-  });
+	// 接收参数
+	const props = defineProps({
+		// 装修数据
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+	});
+	// 设置背景样式
+	const bgStyle = computed(() => {
+		console.log(props.data)
+		// 直接从 props.styles 解构
+		const {
+			bgType,
+			bgImg,
+			bgColor
+		} = props.styles;
 
-  // 组件样式
-  const elStyles = {
-    background: `url(${sheep.$url.cdn(props.data.bgImgUrl)}) no-repeat top center / 100% auto`,
-    fontSize: `${props.data.titleSize}px`,
-    fontWeight: `${props.data.titleWeight}px`,
-  };
+		// 根据 bgType 返回相应的样式
+		return {
+			background: bgType === 'img' ? `url(${bgImg}) no-repeat top center / 100% 100%` : bgColor
+		};
+	});
 
-  // 标题样式
-  const titleStyles = {
-    color: props.data.titleColor,
-    fontSize: `${props.data.titleSize}px`,
-    textAlign: props.data.textAlign
-  };
+	// 标题样式
+	const titleStyles = {
+		color: props.data.titleColor,
+		fontSize: `${props.data.titleSize}px`,
+		textAlign: props.data.textAlign
+	};
 
-  // 副标题
-  const descStyles = {
-    color: props.data.descriptionColor,
-    textAlign: props.data.textAlign,
-    fontSize: `${props.data.descriptionSize}px`,
-    fontWeight: `${props.data.descriptionWeight}px`,
-  };
+	// 副标题
+	const descStyles = {
+		color: props.data.descriptionColor,
+		textAlign: props.data.textAlign,
+		fontSize: `${props.data.descriptionSize}px`,
+		fontWeight: `${props.data.descriptionWeight}px`,
+	};
 </script>
 
 <style lang="scss" scoped>
-  .ss-title-wrap {
-    height: 80rpx;
-    position: relative;
+	.ss-title-wrap {
+		height: 80rpx;
+		position: relative;
 
-    .title-content {
-      .title-text {
-        font-size: 30rpx;
-        color: #333;
-      }
+		.title-content {
+			.title-text {
+				font-size: 30rpx;
+				color: #333;
+			}
 
-      .sub-title-text {
-        font-size: 22rpx;
-        color: #999;
-      }
-    }
+			.sub-title-text {
+				font-size: 22rpx;
+				color: #999;
+			}
+		}
 
-    .more-box {
-      white-space: nowrap;
-      font-size: 22rpx;
-      color: #999;
-      position: absolute;
-      top: 50%;
-      transform: translateY(-50%);
-      right: 20rpx;
-    }
-  }
-</style>
+		.more-box {
+			white-space: nowrap;
+			font-size: 22rpx;
+			color: #999;
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			right: 20rpx;
+		}
+	}
+</style>
\ No newline at end of file

From e13eedc2c269954c2d1ad739fae766f6802429ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 12 Aug 2024 13:57:25 +0800
Subject: [PATCH 26/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E8=A3=85=E4=BF=AE=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E8=88=AA=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-menu-button/s-menu-button.vue           | 633 +++++++++---------
 1 file changed, 307 insertions(+), 326 deletions(-)

diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
index 375a5913..5a6653aa 100644
--- a/sheep/components/s-menu-button/s-menu-button.vue
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -1,363 +1,344 @@
 <!-- 装修基础组件：菜单导航（金刚区） -->
 <template>
-  <!-- 包裹层 -->
-  <view
-    class="ui-swiper"
-    :class="[props.mode, props.bg, props.ui]"
-    :style="[{ height: swiperHeight + (menuList.length > 1 ? 50 : 0) + 'rpx' }]"
-  >
-    <!-- 轮播 -->
-    <swiper
-      :circular="props.circular"
-      :current="state.cur"
-      :autoplay="props.autoplay"
-      :interval="props.interval"
-      :duration="props.duration"
-      :style="[{ height: swiperHeight + 'rpx' }]"
-      @change="swiperChange"
-    >
-      <swiper-item
-        v-for="(arr, index) in menuList"
-        :key="index"
-        :class="{ cur: state.cur == index }"
-      >
-        <!-- 宫格 -->
-        <view class="grid-wrap">
-          <view
-            v-for="(item, index) in arr"
-            :key="index"
-            class="grid-item ss-flex ss-flex-col ss-col-center ss-row-center"
-            :style="[{ width: `${100 * (1 / data.column)}%`, height: '200rpx' }]"
-            hover-class="ss-hover-btn"
-            @tap="sheep.$router.go(item.url)"
-          >
-            <view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center">
-              <view
-                v-if="item.badge.show"
-                class="tag-box"
-                :style="[{ background: item.badge.bgColor, color: item.badge.textColor }]"
-              >
-                {{ item.badge.text }}
-              </view>
-              <image
-                v-if="item.iconUrl"
-                class="menu-icon"
-                :style="[
+	<!-- 包裹层 -->
+	<view class="ui-swiper" :class="[props.mode, props.ui]"
+		:style="[bgStyle, { height: swiperHeight + (menuList.length > 1 ? 50 : 0) + 'rpx' }]">
+		<!-- 轮播 -->
+		<swiper :circular="props.circular" :current="state.cur" :autoplay="props.autoplay" :interval="props.interval"
+			:duration="props.duration" :style="[{ height: swiperHeight + 'rpx' }]" @change="swiperChange">
+			<swiper-item v-for="(arr, index) in menuList" :key="index" :class="{ cur: state.cur == index }">
+				<!-- 宫格 -->
+				<view class="grid-wrap">
+					<view v-for="(item, index) in arr" :key="index"
+						class="grid-item ss-flex ss-flex-col ss-col-center ss-row-center"
+						:style="[{ width: `${100 * (1 / data.column)}%`, height: '200rpx' }]" hover-class="ss-hover-btn"
+						@tap="sheep.$router.go(item.url)">
+						<view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center">
+							<view v-if="item.badge.show" class="tag-box"
+								:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]">
+								{{ item.badge.text }}
+							</view>
+							<image v-if="item.iconUrl" class="menu-icon" :style="[
                   {
                     width: props.iconSize + 'rpx',
                     height: props.iconSize + 'rpx',
                   },
-                ]"
-                :src="sheep.$url.cdn(item.iconUrl)"
-                mode="aspectFill"
-              ></image>
-              <view
-                v-if="data.layout === 'iconText'"
-                class="menu-title"
-                :style="[{ color: item.titleColor }]"
-              >
-                {{ item.title }}
-              </view>
-            </view>
-          </view>
-        </view>
-      </swiper-item>
-    </swiper>
-    <!-- 指示点 -->
-    <template v-if="menuList.length > 1">
-      <view class="ui-swiper-dot" :class="props.dotStyle" v-if="props.dotStyle != 'tag'">
-        <view
-          class="line-box"
-          v-for="(item, index) in menuList.length"
-          :key="index"
-          :class="[state.cur == index ? 'cur' : '', props.dotCur]"
-        ></view>
-      </view>
-      <view class="ui-swiper-dot" :class="props.dotStyle" v-if="props.dotStyle == 'tag'">
-        <view class="ui-tag radius" :class="[props.dotCur]" style="pointer-events: none">
-          <view style="transform: scale(0.7)">{{ state.cur + 1 }} / {{ menuList.length }}</view>
-        </view>
-      </view>
-    </template>
-  </view>
+                ]" :src="sheep.$url.cdn(item.iconUrl)" mode="aspectFill"></image>
+							<view v-if="data.layout === 'iconText'" class="menu-title"
+								:style="[{ color: item.titleColor }]">
+								{{ item.title }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+		<!-- 指示点 -->
+		<template v-if="menuList.length > 1">
+			<view class="ui-swiper-dot" :class="props.dotStyle" v-if="props.dotStyle != 'tag'">
+				<view class="line-box" v-for="(item, index) in menuList.length" :key="index"
+					:class="[state.cur == index ? 'cur' : '', props.dotCur]"></view>
+			</view>
+			<view class="ui-swiper-dot" :class="props.dotStyle" v-if="props.dotStyle == 'tag'">
+				<view class="ui-tag radius" :class="[props.dotCur]" style="pointer-events: none">
+					<view style="transform: scale(0.7)">{{ state.cur + 1 }} / {{ menuList.length }}</view>
+				</view>
+			</view>
+		</template>
+	</view>
 </template>
 
 <script setup>
-  /**
-   * 轮播menu
-   *
-   * @property {Boolean} circular = false  		- 是否采用衔接滑动，即播放到末尾后重新回到开头
-   * @property {Boolean} autoplay = true  		- 是否自动切换
-   * @property {Number} interval = 5000  			- 自动切换时间间隔
-   * @property {Number} duration = 500  			- 滑动动画时长,app-nvue不支持
-   * @property {Array} list = [] 					- 轮播数据
-   * @property {String} ui = ''  					- 样式class
-   * @property {String} mode  					- 模式
-   * @property {String} dotStyle  				- 指示点样式
-   * @property {String} dotCur= 'ui-BG-Main' 		- 当前指示点样式,默认主题色
-   * @property {String} bg  						- 背景
-   *
-   * @property {String|Number} col = 4  			- 一行数量
-   *  @property {String|Number} row = 1 			- 几行
-   * @property {String} hasBorder 				- 是否有边框
-   * @property {String} borderColor 				- 边框颜色
-   * @property {String} background		  		- 背景
-   * @property {String} hoverClass 				- 按压样式类
-   * @property {String} hoverStayTime 		  	- 动画时间
-   *
-   * @property {Array} list 		  				- 导航列表
-   * @property {Number} iconSize 		  			- 图标大小
-   * @property {String} color 		  			- 标题颜色
-   *
-   */
+	/**
+	 * 轮播menu
+	 *
+	 * @property {Boolean} circular = false  		- 是否采用衔接滑动，即播放到末尾后重新回到开头
+	 * @property {Boolean} autoplay = true  		- 是否自动切换
+	 * @property {Number} interval = 5000  			- 自动切换时间间隔
+	 * @property {Number} duration = 500  			- 滑动动画时长,app-nvue不支持
+	 * @property {Array} list = [] 					- 轮播数据
+	 * @property {String} ui = ''  					- 样式class
+	 * @property {String} mode  					- 模式
+	 * @property {String} dotStyle  				- 指示点样式
+	 * @property {String} dotCur= 'ui-BG-Main' 		- 当前指示点样式,默认主题色
+	 * @property {String} bg  						- 背景
+	 *
+	 * @property {String|Number} col = 4  			- 一行数量
+	 * @property {String|Number} row = 1 			- 几行
+	 * @property {String} hasBorder 				- 是否有边框
+	 * @property {String} borderColor 				- 边框颜色
+	 * @property {String} background		  		- 背景
+	 * @property {String} hoverClass 				- 按压样式类
+	 * @property {String} hoverStayTime 		  	- 动画时间
+	 *
+	 * @property {Array} list 		  				- 导航列表
+	 * @property {Number} iconSize 		  			- 图标大小
+	 * @property {String} color 		  			- 标题颜色
+	 *
+	 */
 
-  import { reactive, computed } from 'vue';
-  import sheep from '@/sheep';
+	import {
+		reactive,
+		computed
+	} from 'vue';
+	import sheep from '@/sheep';
 
-  // 数据
-  const state = reactive({
-    cur: 0,
-  });
+	// 数据
+	const state = reactive({
+		cur: 0,
+	});
 
-  // 接收参数
+	// 接收参数
 
-  const props = defineProps({
-    data: {
-      type: Object,
-      default() {},
-    },
-    styles: {
-      type: Object,
-      default() {},
-    },
-    circular: {
-      type: Boolean,
-      default: true,
-    },
-    autoplay: {
-      type: Boolean,
-      default: false,
-    },
-    interval: {
-      type: Number,
-      default: 5000,
-    },
-    duration: {
-      type: Number,
-      default: 500,
-    },
+	const props = defineProps({
+		// 装修数据
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+		circular: {
+			type: Boolean,
+			default: true,
+		},
+		autoplay: {
+			type: Boolean,
+			default: false,
+		},
+		interval: {
+			type: Number,
+			default: 5000,
+		},
+		duration: {
+			type: Number,
+			default: 500,
+		},
+		ui: {
+			type: String,
+			default: '',
+		},
+		mode: {
+			//default
+			type: String,
+			default: 'default',
+		},
+		dotStyle: {
+			type: String,
+			default: 'long', //default long tag
+		},
+		dotCur: {
+			type: String,
+			default: 'ui-BG-Main',
+		},
+		height: {
+			type: Number,
+			default: 300,
+		},
+		// 是否有边框
+		hasBorder: {
+			type: Boolean,
+			default: true,
+		},
+		// 边框颜色
+		borderColor: {
+			type: String,
+			default: 'red',
+		},
+		background: {
+			type: String,
+			default: 'blue',
+		},
+		hoverClass: {
+			type: String,
+			default: 'ss-hover-class', //'none'为没有hover效果
+		},
+		// 一排宫格数
+		col: {
+			type: [Number, String],
+			default: 3,
+		},
+		iconSize: {
+			type: Number,
+			default: 80,
+		},
+		color: {
+			type: String,
+			default: '#000',
+		},
+	});
 
-    ui: {
-      type: String,
-      default: '',
-    },
-    mode: {
-      //default
-      type: String,
-      default: 'default',
-    },
-    dotStyle: {
-      type: String,
-      default: 'long', //default long tag
-    },
-    dotCur: {
-      type: String,
-      default: 'ui-BG-Main',
-    },
-    bg: {
-      type: String,
-      default: 'bg-none',
-    },
-    height: {
-      type: Number,
-      default: 300,
-    },
+	// 设置背景样式
+	const bgStyle = computed(() => {
+		console.log(props.styles)
+		// 直接从 props.styles 解构
+		const {
+			bgType,
+			bgImg,
+			bgColor
+		} = props.styles;
 
-    // 是否有边框
-    hasBorder: {
-      type: Boolean,
-      default: true,
-    },
-    // 边框颜色
-    borderColor: {
-      type: String,
-      default: 'red',
-    },
-    background: {
-      type: String,
-      default: 'blue',
-    },
-    hoverClass: {
-      type: String,
-      default: 'ss-hover-class', //'none'为没有hover效果
-    },
-    // 一排宫格数
-    col: {
-      type: [Number, String],
-      default: 3,
-    },
-    iconSize: {
-      type: Number,
-      default: 80,
-    },
-    color: {
-      type: String,
-      default: '#000',
-    },
-  });
+		// 根据 bgType 返回相应的样式
+		return {
+			background: bgType === 'img' ? `url(${bgImg}) no-repeat top center / 100% 100%` : bgColor
+		};
+	});
 
-  // 生成数据
-  const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.column));
-  const swiperHeight = computed(() => props.data.row * (props.data.layout === 'iconText' ? 200 : 180));
-  const windowWidth = sheep.$platform.device.windowWidth;
+	// 生成数据
+	const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.column));
+	const swiperHeight = computed(() => props.data.row * (props.data.layout === 'iconText' ? 200 : 180));
+	const windowWidth = sheep.$platform.device.windowWidth;
 
-  // current 改变时会触发 change 事件
-  const swiperChange = (e) => {
-    state.cur = e.detail.current;
-  };
+	// current 改变时会触发 change 事件
+	const swiperChange = (e) => {
+		state.cur = e.detail.current;
+	};
 
-  // 重组数据
-  const splitData = (oArr = [], length = 1) => {
-    let arr = [];
-    let minArr = [];
-    oArr.forEach((c) => {
-      if (minArr.length === length) {
-        minArr = [];
-      }
-      if (minArr.length === 0) {
-        arr.push(minArr);
-      }
-      minArr.push(c);
-    });
+	// 重组数据
+	const splitData = (oArr = [], length = 1) => {
+		let arr = [];
+		let minArr = [];
+		oArr.forEach((c) => {
+			if (minArr.length === length) {
+				minArr = [];
+			}
+			if (minArr.length === 0) {
+				arr.push(minArr);
+			}
+			minArr.push(c);
+		});
 
-    return arr;
-  };
+		return arr;
+	};
 </script>
 
 <style lang="scss" scoped>
-  .grid-wrap {
-    width: 100%;
-    display: flex;
-    position: relative;
-    box-sizing: border-box;
-    overflow: hidden;
-    flex-wrap: wrap;
-    align-items: center;
-  }
-  .menu-box {
-    position: relative;
-    z-index: 1;
-    transform: translate(0, 0);
+	.grid-wrap {
+		width: 100%;
+		display: flex;
+		position: relative;
+		box-sizing: border-box;
+		overflow: hidden;
+		flex-wrap: wrap;
+		align-items: center;
+	}
 
-    .tag-box {
-      position: absolute;
-      z-index: 2;
-      top: 0;
-      right: -6rpx;
-      font-size: 2em;
-      line-height: 1;
-      padding: 0.4em 0.6em 0.3em;
-      transform: scale(0.4) translateX(0.5em) translatey(-0.6em);
-      transform-origin: 100% 0;
-      border-radius: 200rpx;
-      white-space: nowrap;
-    }
+	.menu-box {
+		position: relative;
+		z-index: 1;
+		transform: translate(0, 0);
 
-    .menu-icon {
-      transform: translate(0, 0);
-      width: 80rpx;
-      height: 80rpx;
-      padding-bottom: 10rpx;
-    }
+		.tag-box {
+			position: absolute;
+			z-index: 2;
+			top: 0;
+			right: -6rpx;
+			font-size: 2em;
+			line-height: 1;
+			padding: 0.4em 0.6em 0.3em;
+			transform: scale(0.4) translateX(0.5em) translatey(-0.6em);
+			transform-origin: 100% 0;
+			border-radius: 200rpx;
+			white-space: nowrap;
+		}
 
-    .menu-title {
-      font-size: 24rpx;
-      color: #333;
-    }
-  }
+		.menu-icon {
+			transform: translate(0, 0);
+			width: 80rpx;
+			height: 80rpx;
+			padding-bottom: 10rpx;
+		}
 
-  ::v-deep(.ui-swiper) {
-    position: relative;
-    z-index: 1;
+		.menu-title {
+			font-size: 24rpx;
+			color: #333;
+		}
+	}
 
-    .ui-swiper-dot {
-      position: absolute;
-      width: 100%;
-      bottom: 20rpx;
-      height: 30rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      z-index: 2;
+	::v-deep(.ui-swiper) {
+		position: relative;
+		z-index: 1;
 
-      &.default .line-box {
-        display: inline-flex;
-        border-radius: 50rpx;
-        width: 6px;
-        height: 6px;
-        border: 2px solid transparent;
-        margin: 0 10rpx;
-        opacity: 0.3;
-        position: relative;
-        justify-content: center;
-        align-items: center;
+		.ui-swiper-dot {
+			position: absolute;
+			width: 100%;
+			bottom: 20rpx;
+			height: 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			z-index: 2;
 
-        &.cur {
-          width: 8px;
-          height: 8px;
-          opacity: 1;
-          border: 0px solid transparent;
-        }
+			&.default .line-box {
+				display: inline-flex;
+				border-radius: 50rpx;
+				width: 6px;
+				height: 6px;
+				border: 2px solid transparent;
+				margin: 0 10rpx;
+				opacity: 0.3;
+				position: relative;
+				justify-content: center;
+				align-items: center;
 
-        &.cur::after {
-          content: '';
-          border-radius: 50rpx;
-          width: 4px;
-          height: 4px;
-          background-color: #fff;
-        }
-      }
+				&.cur {
+					width: 8px;
+					height: 8px;
+					opacity: 1;
+					border: 0px solid transparent;
+				}
 
-      &.long .line-box {
-        display: inline-block;
-        border-radius: 100rpx;
-        width: 6px;
-        height: 6px;
-        margin: 0 10rpx;
-        opacity: 0.3;
-        position: relative;
+				&.cur::after {
+					content: '';
+					border-radius: 50rpx;
+					width: 4px;
+					height: 4px;
+					background-color: #fff;
+				}
+			}
 
-        &.cur {
-          width: 24rpx;
-          opacity: 1;
-        }
+			&.long .line-box {
+				display: inline-block;
+				border-radius: 100rpx;
+				width: 6px;
+				height: 6px;
+				margin: 0 10rpx;
+				opacity: 0.3;
+				position: relative;
 
-        &.cur::after {
-        }
-      }
+				&.cur {
+					width: 24rpx;
+					opacity: 1;
+				}
 
-      &.line {
-        bottom: 20rpx;
+				&.cur::after {}
+			}
 
-        .line-box {
-          display: inline-block;
-          width: 30px;
-          height: 3px;
-          opacity: 0.3;
-          position: relative;
+			&.line {
+				bottom: 20rpx;
 
-          &.cur {
-            opacity: 1;
-          }
-        }
-      }
+				.line-box {
+					display: inline-block;
+					width: 30px;
+					height: 3px;
+					opacity: 0.3;
+					position: relative;
 
-      &.tag {
-        justify-content: flex-end;
-        position: absolute;
-        bottom: 20rpx;
-        right: 20rpx;
-      }
-    }
-  }
-</style>
+					&.cur {
+						opacity: 1;
+					}
+				}
+			}
+
+			&.tag {
+				justify-content: flex-end;
+				position: absolute;
+				bottom: 20rpx;
+				right: 20rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file

From e9a91b84fc825d03aeaf01366f25efc6a8a163ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 12 Aug 2024 14:13:11 +0800
Subject: [PATCH 27/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-coupon-card/s-coupon-card.vue | 4 ++--
 sheep/components/s-menu-grid/s-menu-grid.vue     | 4 ++--
 sheep/components/s-user-card/s-user-card.vue     | 5 +++--
 sheep/components/s-wallet-card/s-wallet-card.vue | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sheep/components/s-coupon-card/s-coupon-card.vue b/sheep/components/s-coupon-card/s-coupon-card.vue
index e30f39ea..dac69e31 100644
--- a/sheep/components/s-coupon-card/s-coupon-card.vue
+++ b/sheep/components/s-coupon-card/s-coupon-card.vue
@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户卡券 -->
 <template>
-	<view class="ss-coupon-menu-wrap ss-flex ss-col-center" :style="[style, { marginLeft: `${data.space}px` }]">
+	<view class="ss-coupon-menu-wrap ss-flex ss-col-center" :style="[bgStyle, { marginLeft: `${data.space}px` }]">
 		<view class="menu-item ss-flex-col ss-row-center ss-col-center" v-for="item in props.list" :key="item.title"
 			@tap="sheep.$router.go(item.path, { type: item.type })"
 			:class="item.type === 'all' ? 'menu-wallet' : 'ss-flex-1'">
@@ -65,7 +65,7 @@
 		},
 	});
 	// 设置背景样式
-	const style = computed(() => {
+	const bgStyle = computed(() => {
 	  // 直接从 props.styles 解构
 	  const { bgType, bgImg, bgColor } = props.styles; 
 	
diff --git a/sheep/components/s-menu-grid/s-menu-grid.vue b/sheep/components/s-menu-grid/s-menu-grid.vue
index deae0663..d05a49d4 100644
--- a/sheep/components/s-menu-grid/s-menu-grid.vue
+++ b/sheep/components/s-menu-grid/s-menu-grid.vue
@@ -1,6 +1,6 @@
 <!-- 装修基础组件：宫格导航 -->
 <template>
-	<view :style="[style, { marginLeft: `${data.space}px` }]">
+	<view :style="[bgStyle, { marginLeft: `${data.space}px` }]">
 		<uni-grid :showBorder="Boolean(data.border)" :column="data.column">
 			<uni-grid-item v-for="(item, index) in data.list" :key="index" @tap="sheep.$router.go(item.url)">
 				<view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center">
@@ -46,7 +46,7 @@
 		},
 	});
 	// 设置背景样式
-	const style = computed(() => {
+	const bgStyle = computed(() => {
 		// 直接从 props.styles 解构
 		const {
 			bgType,
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index a05f834b..920fd57d 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户卡片 -->
 <template>
-	<view class="ss-user-info-wrap ss-p-t-50" :style="[style, { marginLeft: `${data.space}px` }]">
+	<view class="ss-user-info-wrap ss-p-t-50" :style="[bgStyle, { marginLeft: `${data.space}px` }]">
 		<view class="ss-flex ss-col-center ss-row-between ss-m-b-20">
 			<view class="left-box ss-flex ss-col-center ss-m-l-36">
 				<view class="avatar-box ss-m-r-24">
@@ -102,8 +102,9 @@
 			default: '1',
 		},
 	});
+	
 	// 设置背景样式
-	const style = computed(() => {
+	const bgStyle = computed(() => {
 	  // 直接从 props.styles 解构
 	  const { bgType, bgImg, bgColor } = props.styles; 
 	
diff --git a/sheep/components/s-wallet-card/s-wallet-card.vue b/sheep/components/s-wallet-card/s-wallet-card.vue
index 7588c206..aff0bf88 100644
--- a/sheep/components/s-wallet-card/s-wallet-card.vue
+++ b/sheep/components/s-wallet-card/s-wallet-card.vue
@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户资产 -->
 <template>
-	<view class="ss-wallet-menu-wrap ss-flex ss-col-center" :style="[style, { marginLeft: `${data.space}px` }]">
+	<view class="ss-wallet-menu-wrap ss-flex ss-col-center" :style="[bgStyle, { marginLeft: `${data.space}px` }]">
 		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
 			@tap="sheep.$router.go('/pages/user/wallet/money')">
 			<view class="value-box ss-flex ss-col-bottom">
@@ -58,7 +58,7 @@
 		},
 	});
 	// 设置背景样式
-	const style = computed(() => {
+	const bgStyle = computed(() => {
 	  // 直接从 props.styles 解构
 	  const { bgType, bgImg, bgColor } = props.styles; 
 	

From 42bcab7f2838652d2c9e3c98ca9a38a15e523598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Tue, 13 Aug 2024 12:29:02 +0800
Subject: [PATCH 28/84] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-title-block/s-title-block.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sheep/components/s-title-block/s-title-block.vue b/sheep/components/s-title-block/s-title-block.vue
index 3d639b73..cb610336 100644
--- a/sheep/components/s-title-block/s-title-block.vue
+++ b/sheep/components/s-title-block/s-title-block.vue
@@ -49,7 +49,6 @@
 	});
 	// 设置背景样式
 	const bgStyle = computed(() => {
-		console.log(props.data)
 		// 直接从 props.styles 解构
 		const {
 			bgType,

From b22cdae4fe587ce998590cac1c479ef71ee96fc8 Mon Sep 17 00:00:00 2001
From: D <sddfp@163.com>
Date: Tue, 13 Aug 2024 21:57:04 +0800
Subject: [PATCH 29/84] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=95=B0=E9=87=8F=E5=87=8F=E4=B8=BA0=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/store/cart.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sheep/store/cart.js b/sheep/store/cart.js
index 7ea70199..edde779d 100644
--- a/sheep/store/cart.js
+++ b/sheep/store/cart.js
@@ -57,7 +57,13 @@ const cart = defineStore({
 
     // 移除购物车
     async delete(ids) {
-      const { code } = await CartApi.deleteCart(ids.join(','));
+      let idsTemp = '';
+      if (Array.isArray(ids)) {
+        idsTemp = ids.join(',');
+      } else {
+        idsTemp = ids;
+      }
+      const { code } = await CartApi.deleteCart(idsTemp);
       if (code === 0) {
         await this.getList();
       }

From 532503b65b9c72ac92da1b2cfdbba014cab1ec1b Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 14 Aug 2024 11:08:55 +0800
Subject: [PATCH 30/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91h5-router-mode:=20hash=20=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=20history=20=E8=A7=A3=E5=86=B3=E5=88=86=E4=BA=AB=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E8=BD=AC=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 447 ++++++++++++++++++++++++--------------------------
 1 file changed, 216 insertions(+), 231 deletions(-)

diff --git a/manifest.json b/manifest.json
index 2dfab7c7..7e3aa40f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,239 +1,224 @@
 {
-  "name": "芋道商城",
-  "appid": "__UNI__460BC4C",
-  "description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
-  "versionName": "2.1.0",
-  "versionCode": 183,
-  "transformPx": false,
-  "app-plus": {
-    "usingComponents": true,
-    "nvueCompiler": "uni-app",
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "nvueLaunchMode": "fast",
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
-    },
-    "safearea": {
-      "bottom": {
-        "offset": "none"
-      }
-    },
-    "modules": {
-      "Payment": {},
-      "Share": {},
-      "VideoPlayer": {},
-      "OAuth": {}
-    },
-    "distribute": {
-      "android": {
-        "permissions": [
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
-          "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
-          "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
-          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-          "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
-          "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
-          "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-        ],
-        "minSdkVersion": 21,
-        "schemes": "shopro"
-      },
-      "ios": {
-        "urlschemewhitelist": [
-          "baidumap",
-          "iosamap"
-        ],
-        "dSYMs": false,
-        "privacyDescription": {
-          "NSPhotoLibraryUsageDescription": "需要同意访问您的相册选取图片才能完善该条目",
-          "NSPhotoLibraryAddUsageDescription": "需要同意访问您的相册才能保存该图片",
-          "NSCameraUsageDescription": "需要同意访问您的摄像头拍摄照片才能完善该条目",
-          "NSUserTrackingUsageDescription": "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验"
+    "name" : "芋道商城",
+    "appid" : "__UNI__460BC4C",
+    "description" : "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
+    "versionName" : "2.1.0",
+    "versionCode" : 183,
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "nvueLaunchMode" : "fast",
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
         },
-        "urltypes": "shopro",
-        "capabilities": {
-          "entitlements": {
-            "com.apple.developer.associated-domains": [
-              "applinks:shopro.sheepjs.com"
-            ]
-          }
+        "safearea" : {
+            "bottom" : {
+                "offset" : "none"
+            }
         },
-        "idfa": true
-      },
-      "sdkConfigs": {
-        "speech": {
-          "ifly": {}
+        "modules" : {
+            "Payment" : {},
+            "Share" : {},
+            "VideoPlayer" : {},
+            "OAuth" : {}
         },
-        "ad": {},
-        "oauth": {
-          "apple": {},
-          "weixin": {
-            "appid": "wxae7a0c156da9383b",
-            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-          }
-        },
-        "payment": {
-          "weixin": {
-            "__platform__": [
-              "ios",
-              "android"
-            ],
-            "appid": "wxae7a0c156da9383b",
-            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-          },
-          "alipay": {
-            "__platform__": [
-              "ios",
-              "android"
-            ]
-          }
-        },
-        "share": {
-          "weixin": {
-            "appid": "wxae7a0c156da9383b",
-            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-          }
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
+                ],
+                "minSdkVersion" : 21,
+                "schemes" : "shopro"
+            },
+            "ios" : {
+                "urlschemewhitelist" : [ "baidumap", "iosamap" ],
+                "dSYMs" : false,
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "需要同意访问您的相册选取图片才能完善该条目",
+                    "NSPhotoLibraryAddUsageDescription" : "需要同意访问您的相册才能保存该图片",
+                    "NSCameraUsageDescription" : "需要同意访问您的摄像头拍摄照片才能完善该条目",
+                    "NSUserTrackingUsageDescription" : "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验"
+                },
+                "urltypes" : "shopro",
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:shopro.sheepjs.com" ]
+                    }
+                },
+                "idfa" : true
+            },
+            "sdkConfigs" : {
+                "speech" : {
+                    "ifly" : {}
+                },
+                "ad" : {},
+                "oauth" : {
+                    "apple" : {},
+                    "weixin" : {
+                        "appid" : "wxae7a0c156da9383b",
+                        "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wxae7a0c156da9383b",
+                        "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+                    },
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxae7a0c156da9383b",
+                        "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+                    }
+                }
+            },
+            "orientation" : [ "portrait-primary" ],
+            "splashscreen" : {
+                "androidStyle" : "common",
+                "iosStyle" : "common",
+                "useOriginalMsgbox" : true
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
         }
-      },
-      "orientation": [
-        "portrait-primary"
-      ],
-      "splashscreen": {
-        "androidStyle": "common",
-        "iosStyle": "common",
-        "useOriginalMsgbox": true
-      },
-      "icons": {
-        "android": {
-          "hdpi": "unpackage/res/icons/72x72.png",
-          "xhdpi": "unpackage/res/icons/96x96.png",
-          "xxhdpi": "unpackage/res/icons/144x144.png",
-          "xxxhdpi": "unpackage/res/icons/192x192.png"
+    },
+    "quickapp" : {},
+    "quickapp-native" : {
+        "icon" : "/static/logo.png",
+        "package" : "com.example.demo",
+        "features" : [
+            {
+                "name" : "system.clipboard"
+            }
+        ]
+    },
+    "quickapp-webview" : {
+        "icon" : "/static/logo.png",
+        "package" : "com.example.demo",
+        "minPlatformVersion" : 1070,
+        "versionName" : "1.0.0",
+        "versionCode" : 100
+    },
+    "mp-weixin" : {
+        "appid" : "wx66186af0759f47c9",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : true
         },
-        "ios": {
-          "appstore": "unpackage/res/icons/1024x1024.png",
-          "ipad": {
-            "app": "unpackage/res/icons/76x76.png",
-            "app@2x": "unpackage/res/icons/152x152.png",
-            "notification": "unpackage/res/icons/20x20.png",
-            "notification@2x": "unpackage/res/icons/40x40.png",
-            "proapp@2x": "unpackage/res/icons/167x167.png",
-            "settings": "unpackage/res/icons/29x29.png",
-            "settings@2x": "unpackage/res/icons/58x58.png",
-            "spotlight": "unpackage/res/icons/40x40.png",
-            "spotlight@2x": "unpackage/res/icons/80x80.png"
-          },
-          "iphone": {
-            "app@2x": "unpackage/res/icons/120x120.png",
-            "app@3x": "unpackage/res/icons/180x180.png",
-            "notification@2x": "unpackage/res/icons/40x40.png",
-            "notification@3x": "unpackage/res/icons/60x60.png",
-            "settings@2x": "unpackage/res/icons/58x58.png",
-            "settings@3x": "unpackage/res/icons/87x87.png",
-            "spotlight@2x": "unpackage/res/icons/80x80.png",
-            "spotlight@3x": "unpackage/res/icons/120x120.png"
-          }
+        "optimization" : {
+            "subPackages" : true
+        },
+        "plugins" : {},
+        "lazyCodeLoading" : "requiredComponents",
+        "usingComponents" : {},
+        "permission" : {},
+        "requiredPrivateInfos" : [ "chooseAddress" ]
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "mp-jd" : {
+        "usingComponents" : true
+    },
+    "h5" : {
+        "template" : "index.html",
+        "router" : {
+            "mode" : "history",
+            "base" : "./"
+        },
+        "sdkConfigs" : {
+            "maps" : {}
+        },
+        "async" : {
+            "timeout" : 20000
+        },
+        "title" : "芋道商城",
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
         }
-      }
-    }
-  },
-  "quickapp": {},
-  "quickapp-native": {
-    "icon": "/static/logo.png",
-    "package": "com.example.demo",
-    "features": [
-      {
-        "name": "system.clipboard"
-      }
-    ]
-  },
-  "quickapp-webview": {
-    "icon": "/static/logo.png",
-    "package": "com.example.demo",
-    "minPlatformVersion": 1070,
-    "versionName": "1.0.0",
-    "versionCode": 100
-  },
-  "mp-weixin": {
-    "appid": "wx66186af0759f47c9",
-    "setting": {
-      "urlCheck": false,
-      "minified": true,
-      "postcss": true
     },
-    "optimization": {
-      "subPackages": true
-    },
-    "plugins": {},
-    "lazyCodeLoading": "requiredComponents",
-    "usingComponents": {},
-    "permission": {},
-    "requiredPrivateInfos": [
-      "chooseAddress"
-    ]
-  },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "mp-jd": {
-    "usingComponents": true
-  },
-  "h5": {
-    "template": "index.html",
-    "router": {
-      "mode": "hash",
-      "base": "./"
-    },
-    "sdkConfigs": {
-      "maps": {}
-    },
-    "async": {
-      "timeout": 20000
-    },
-    "title": "芋道商城",
-    "optimization": {
-      "treeShaking": {
-        "enable": true
-      }
-    }
-  },
-  "vueVersion": "3",
-  "_spaceID": "192b4892-5452-4e1d-9f09-eee1ece40639",
-  "locale": "zh-Hans",
-  "fallbackLocale": "zh-Hans"
-}
\ No newline at end of file
+    "vueVersion" : "3",
+    "_spaceID" : "192b4892-5452-4e1d-9f09-eee1ece40639",
+    "locale" : "zh-Hans",
+    "fallbackLocale" : "zh-Hans"
+}

From fc396021c646f077177c5e5a02703d8822dc7488 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 14 Aug 2024 11:09:25 +0800
Subject: [PATCH 31/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=8B=BC=E5=9B=A2=EF=BC=9A=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E9=82=80=E8=AF=B7=E6=8B=BC=E5=9B=A2=E6=B5=B7=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/groupon/detail.vue                      |  7 +++----
 sheep/components/s-share-modal/canvas-poster/index.vue |  2 +-
 .../s-share-modal/canvas-poster/poster/groupon.js      | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue
index 86daff20..54388bdd 100644
--- a/pages/activity/groupon/detail.vue
+++ b/pages/activity/groupon/detail.vue
@@ -203,7 +203,7 @@
   import { computed, reactive } from 'vue';
   import sheep from '@/sheep';
   import { onLoad } from '@dcloudio/uni-app';
-  import { useDurationTime } from '@/sheep/hooks/useGoods';
+  import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
   import { showShareModal } from '@/sheep/hooks/useModal';
   import { isEmpty } from 'lodash-es';
   import CombinationApi from '@/sheep/api/promotion/combination';
@@ -231,15 +231,14 @@
         desc: state.data.goods?.subtitle,
         params: {
           page: '5',
-          query: state.data.id,
+          query: state.data.headRecord.id,
         },
       },
       {
         type: 'groupon', // 邀请拼团海报
         title: state.data.headRecord.spuName, // 商品标题
         image: sheep.$url.cdn(state.data.headRecord.picUrl), // 商品主图
-        price: state.data.goods?.price, // 商品价格
-        original_price: state.data.goods?.original_price, // 商品原价
+        price: fen2yuan(state.data.headRecord.combinationPrice), // 商品价格
       },
     );
   });
diff --git a/sheep/components/s-share-modal/canvas-poster/index.vue b/sheep/components/s-share-modal/canvas-poster/index.vue
index 87ee562a..9e67943b 100644
--- a/sheep/components/s-share-modal/canvas-poster/index.vue
+++ b/sheep/components/s-share-modal/canvas-poster/index.vue
@@ -66,7 +66,7 @@
     css: {
       // 根节点若无尺寸，自动获取父级节点
       width: sheep.$platform.device.windowWidth * 0.9,
-      height: 550,
+      height: 600,
     },
     views: [],
   });
diff --git a/sheep/components/s-share-modal/canvas-poster/poster/groupon.js b/sheep/components/s-share-modal/canvas-poster/poster/groupon.js
index d1b6b78a..4b33c8ca 100644
--- a/sheep/components/s-share-modal/canvas-poster/poster/groupon.js
+++ b/sheep/components/s-share-modal/canvas-poster/poster/groupon.js
@@ -82,12 +82,12 @@ const groupon = async (poster) => {
       type: 'text',
       text: '2人团',
       css: {
-        color: '#ff0000',
-        fontSize: 30,
+        color: '#fff',
+        fontSize: 12,
         fontFamily: 'OPPOSANS',
         position: 'fixed',
-        left: width * 0.3,
-        top: width * 1.32,
+        left: width * 0.84,
+        top: width * 1.3,
       },
     },
     // #ifndef MP-WEIXIN
@@ -96,7 +96,7 @@ const groupon = async (poster) => {
       text: poster.shareInfo.link,
       css: {
         position: 'fixed',
-        left: width * 0.75,
+        left: width * 0.5,
         top: width * 1.3,
         width: width * 0.2,
         height: width * 0.2,

From 154a706af4365c4fec38e6b2b7e351487005017f Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 14 Aug 2024 11:46:59 +0800
Subject: [PATCH 32/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=8B=BC=E5=9B=A2=EF=BC=9A=E5=85=B6=E5=AE=83?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E6=89=93=E5=BC=80=E5=9B=A2=E9=95=BF?=
 =?UTF-8?q?=E7=9A=84=E7=95=8C=E9=9D=A2=E7=9A=84=E7=9B=B8=E5=85=B3=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/groupon/detail.vue | 48 +++++++++++++++++++------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue
index 54388bdd..66976f3c 100644
--- a/pages/activity/groupon/detail.vue
+++ b/pages/activity/groupon/detail.vue
@@ -181,11 +181,11 @@
         </view>
       </view>
 
-      <!-- TODO 芋艿：这里暂时没接入 -->
-      <view v-if="state.data.goods">
+      <view v-if="!isEmpty(state.goodsInfo)">
+        <!-- 规格与数量弹框 -->
         <s-select-groupon-sku
           :show="state.showSelectSku"
-          :goodsInfo="state.data.goods"
+          :goodsInfo="state.goodsInfo"
           :grouponAction="state.grouponAction"
           :grouponNum="state.grouponNum"
           @buy="onBuy"
@@ -193,6 +193,7 @@
           @close="state.showSelectSku = false"
         />
       </view>
+
     </view>
 
     <s-empty v-if="!state.data && !state.loading" icon="/static/goods-empty.png" />
@@ -207,21 +208,24 @@
   import { showShareModal } from '@/sheep/hooks/useModal';
   import { isEmpty } from 'lodash-es';
   import CombinationApi from '@/sheep/api/promotion/combination';
+  import SpuApi from '@/sheep/api/product/spu';
 
   const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
   const state = reactive({
     data: {}, // 拼团详情
-    loading: true,
-    grouponAction: 'create',
-    showSelectSku: false,
-    grouponNum: 0,
-    number: 0,
-    activity: {},
+    goodsId: 0, // 商品ID
+    goodsInfo: {}, // 商品信息
+    showSelectSku: false, // 显示规格弹框
+    selectedSkuPrice: {}, // 选中的规格价格
+    activity: {}, // 团购活动
+    grouponId: 0, // 团购ID
+    grouponNum: 0, // 团购人数
+    grouponAction: 'create', // 团购操作
     combinationHeadId: null, // 拼团团长编号
+    loading: true,
   });
 
-  // todo 芋艿：分享要再接下
   const shareInfo = computed(() => {
     if (isEmpty(state.data)) return {};
     return sheep.$platform.share.getShareInfo(
@@ -250,33 +254,33 @@
     });
   }
 
-  // 去开团 TODO 芋艿：这里没接入
+  // 去开团
   function onCreateGroupon() {
     state.grouponAction = 'create';
     state.grouponId = 0;
     state.showSelectSku = true;
   }
 
-  // 规格变更 TODO 芋艿：这里没接入
+  // 规格变更
   function onSkuChange(e) {
     state.selectedSkuPrice = e;
   }
 
-  // 立即参团 TODO 芋艿：这里没接入
+  // 立即参团
   function onJoinGroupon() {
     state.grouponAction = 'join';
-    state.grouponId = state.data.activityId;
-    state.combinationHeadId = state.data.id;
-    state.grouponNum = state.data.num;
+    state.grouponId = state.data.headRecord.activityId;
+    state.combinationHeadId = state.data.headRecord.id;
+    state.grouponNum = state.data.headRecord.userSize;
     state.showSelectSku = true;
   }
 
-  // 立即购买 TODO 芋艿：这里没接入
+  // 立即购买
   function onBuy(sku) {
     sheep.$router.go('/pages/order/confirm', {
       data: JSON.stringify({
         order_type: 'goods',
-        combinationActivityId: state.data.activity.id,
+        combinationActivityId: state.activity.id,
         combinationHeadId: state.combinationHeadId,
         items: [
           {
@@ -305,6 +309,14 @@
         data.headRecord.activityId,
       );
       state.activity = activity;
+      state.grouponNum = activity.userSize;
+      // 加载商品信息
+      const { data: spu } = await SpuApi.getSpuDetail(activity.spuId);
+      state.goodsId = spu.id;
+      activity.products.forEach((product) => {
+        spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
+      });
+      state.goodsInfo = spu;
     } else {
       state.data = null;
     }

From 8154108fe9bb5e8d2017e38ab7903af75a81d1c4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 15 Aug 2024 09:24:39 +0800
Subject: [PATCH 33/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E6=8B=BC=E5=9B=A2=EF=BC=9A=E6=9C=AA=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E6=8B=BC=E5=9B=A2=E7=9A=84=20SKU=20=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/groupon/detail.vue                 | 11 +++++++++++
 pages/order/detail.vue                            |  3 +--
 sheep/api/migration/chat.js                       | 14 --------------
 sheep/libs/sdk-h5-weixin.js                       |  2 +-
 sheep/platform/provider/wechat/miniProgram.js     |  1 -
 sheep/platform/provider/wechat/officialAccount.js |  1 -
 6 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 sheep/api/migration/chat.js

diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue
index 66976f3c..7b606ec6 100644
--- a/pages/activity/groupon/detail.vue
+++ b/pages/activity/groupon/detail.vue
@@ -313,10 +313,21 @@
       // 加载商品信息
       const { data: spu } = await SpuApi.getSpuDetail(activity.spuId);
       state.goodsId = spu.id;
+      // 默认显示最低价
       activity.products.forEach((product) => {
         spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
       });
       state.goodsInfo = spu;
+      // 价格、库存使用活动的
+      spu.skus.forEach((sku) => {
+        const product = activity.products.find((product) => product.skuId === sku.id);
+        if (product) {
+          sku.price = product.combinationPrice;
+        } else {
+          // 找不到可能是没配置，则不能发起秒杀
+          sku.stock = 0;
+        }
+      });
     } else {
       state.data = null;
     }
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 4366a9fb..ed0119fa 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -170,7 +170,6 @@
         <text class="title">运费</text>
         <text class="detail">￥{{ fen2yuan(state.orderInfo.deliveryPrice) }}</text>
       </view>
-      <!-- TODO 芋艿：优惠劵抵扣、积分抵扣 -->
       <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.couponPrice > 0">
         <text class="title">优惠劵金额</text>
         <text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
@@ -325,7 +324,7 @@
     });
   }
 
-  // 确认收货 TODO 芋艿：待测试
+  // 确认收货
   async function onConfirm(orderId, ignore = false) {
     // 需开启确认收货组件
     // todo: 芋艿：待接入微信
diff --git a/sheep/api/migration/chat.js b/sheep/api/migration/chat.js
deleted file mode 100644
index 140dd75d..00000000
--- a/sheep/api/migration/chat.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import request from '@/sheep/request';
-
-// TODO 芋艿：暂不支持 socket 聊天
-export default {
-  // 获取聊天token
-  unifiedToken: () =>
-    request({
-      url: 'unifiedToken',
-      custom: {
-        showError: false,
-        showLoading: false,
-      },
-    }),
-};
diff --git a/sheep/libs/sdk-h5-weixin.js b/sheep/libs/sdk-h5-weixin.js
index 1df26f94..984b8dbd 100644
--- a/sheep/libs/sdk-h5-weixin.js
+++ b/sheep/libs/sdk-h5-weixin.js
@@ -78,7 +78,7 @@ export default {
     });
   },
 
-  //获取微信收货地址 TODO 芋艿：未测试
+  // 获取微信收货地址
   openAddress(callback) {
     this.isReady(() => {
       jweixin.openAddress({
diff --git a/sheep/platform/provider/wechat/miniProgram.js b/sheep/platform/provider/wechat/miniProgram.js
index 26d42d42..5e95edad 100644
--- a/sheep/platform/provider/wechat/miniProgram.js
+++ b/sheep/platform/provider/wechat/miniProgram.js
@@ -53,7 +53,6 @@ const mobileLogin = async (e) => {
     } else {
       return resolve(false);
     }
-    // TODO 芋艿：shareInfo: uni.getStorageSync('shareLog') || {},
   });
 };
 
diff --git a/sheep/platform/provider/wechat/officialAccount.js b/sheep/platform/provider/wechat/officialAccount.js
index 404b8660..ed7beb32 100644
--- a/sheep/platform/provider/wechat/officialAccount.js
+++ b/sheep/platform/provider/wechat/officialAccount.js
@@ -24,7 +24,6 @@ async function login(code = '', state = '') {
     // 解密 code 发起登陆
     const loginResult = await AuthUtil.socialLogin(socialType, code, state);
     if (loginResult.code === 0) {
-      // TODO 芋艿：shareLog
       setOpenid(loginResult.data.openid);
       return loginResult;
     }

From bf75dc276803954bf6f76898a44e0c8b73d2a85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 15 Aug 2024 14:18:44 +0800
Subject: [PATCH 34/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E8=A3=85=E4=BF=AE=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E6=95=B4=E4=BD=93=E7=9A=84=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98=EF=BC=9B=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?2=E5=88=97=E6=88=96=E8=80=853=E6=8E=92=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E7=8E=B0=E5=9C=A8=E5=B1=85=E4=B8=AD=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E6=9C=89=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-coupon-block/s-coupon-block.vue         | 297 ++++++++++--------
 .../s-menu-button/s-menu-button.vue           |   1 -
 2 files changed, 159 insertions(+), 139 deletions(-)

diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index 6250b4b6..8f66087b 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -1,152 +1,173 @@
 <!-- 装修营销组件：优惠券  -->
 <template>
-  <scroll-view class="scroll-box" scroll-x scroll-anchoring>
-    <view class="coupon-box ss-flex">
-      <view
-        class="coupon-item"
-        :style="[couponBg, { marginLeft: `${data.space}px` }]"
-        v-for="(item, index) in couponList"
-        :key="index"
-      >
-        <su-coupon
-          :size="SIZE_LIST[columns - 1]"
-          :textColor="data.textColor"
-          background=""
-          :couponId="item.id"
-          :title="item.name"
-          :type="formatCouponDiscountType(item)"
-          :value="formatCouponDiscountValue(item)"
-          :sellBy="formatValidityType(item)"
-        >
-          <template v-slot:btn>
-            <!-- 两列时，领取按钮坚排 -->
-            <button
-              v-if="columns === 2"
-              @click.stop="onGetCoupon(item.id)"
-              class="ss-reset-button card-btn vertical"
-              :style="[btnStyles]"
-            >
-              <view class="btn-text">立即领取</view>
-            </button>
-            <button
-              v-else
-              class="ss-reset-button card-btn"
-              :style="[btnStyles]"
-              @click.stop="onGetCoupon(item.id)"
-            >
-              立即领取
-            </button>
-          </template>
-        </su-coupon>
-      </view>
-    </view>
-  </scroll-view>
+	<scroll-view class="scroll-box" scroll-x scroll-anchoring :style="[bgStyle, { marginLeft: `${data.space}px` }]">
+		<view class="coupon-box ss-flex">
+			<view class="coupon-item" :style="[couponBg, { marginLeft: `${data.space}px` }]"
+				v-for="(item, index) in couponList" :key="index">
+				<su-coupon :size="SIZE_LIST[columns - 1]" :textColor="data.textColor" background="" :couponId="item.id"
+					:title="item.name" :type="formatCouponDiscountType(item)" :value="formatCouponDiscountValue(item)"
+					:sellBy="formatValidityType(item)">
+					<template v-slot:btn>
+						<!-- 两列时，领取按钮坚排 -->
+						<button v-if="columns === 2" @click.stop="onGetCoupon(item.id)"
+							class="ss-reset-button card-btn vertical" :style="[btnStyles]">
+							<view class="btn-text">立即领取</view>
+						</button>
+						<button v-else class="ss-reset-button card-btn" :style="[btnStyles]"
+							@click.stop="onGetCoupon(item.id)">
+							立即领取
+						</button>
+					</template>
+				</su-coupon>
+			</view>
+		</view>
+	</scroll-view>
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-  import CouponApi from '@/sheep/api/promotion/coupon';
-  import { ref, onMounted } from 'vue';
-  import { CouponTemplateValidityTypeEnum, PromotionDiscountTypeEnum } from "@/sheep/util/const";
-  import { floatToFixed2, formatDate } from "@/sheep/util";
+	import sheep from '@/sheep';
+	import CouponApi from '@/sheep/api/promotion/coupon';
+	import {
+		ref,
+		onMounted,
+		computed
+	} from 'vue';
+	import {
+		CouponTemplateValidityTypeEnum,
+		PromotionDiscountTypeEnum
+	} from "@/sheep/util/const";
+	import {
+		floatToFixed2,
+		formatDate
+	} from "@/sheep/util";
 
-  const props = defineProps({
-    data: {
-      type: Object,
-      default: () => ({}),
-    },
-    styles: {
-      type: Object,
-      default: () => ({}),
-    },
-  });
-  const { columns, button } = props.data;
-  const SIZE_LIST = ['lg', 'md', 'xs']
-  const couponBg = {
-    background: `url(${sheep.$url.cdn(props.data.bgImg)}) no-repeat top center / 100% 100%`,
-  };
-  const btnStyles = {
-    background: button.bgColor,
-    color: button.color,
-  };
+	const props = defineProps({
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+	});
+	const {
+		columns,
+		button
+	} = props.data;
+	const SIZE_LIST = ['lg', 'md', 'xs']
+	const couponBg = {
+		background: `url(${sheep.$url.cdn(props.data.bgImg)}) no-repeat top center / 100% 100%`,
+	};
+	const btnStyles = {
+		background: button.bgColor,
+		color: button.color,
+	};
+	// 设置背景样式
+	const bgStyle = computed(() => {
+		// 直接从 props.styles 解构
+		const {
+			bgType,
+			bgImg,
+			bgColor
+		} = props.styles;
 
-  // 格式化【折扣类型】
-  const formatCouponDiscountType = (coupon) => {
-    if(coupon.discountType === PromotionDiscountTypeEnum.PRICE.type) {
-      return 'reduce'
-    }
-    if(coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
-      return 'percent'
-    }
-    return `未知【${coupon.discountType}】`
-  }
+		// 根据 bgType 返回相应的样式
+		return {
+			background: bgType === 'img' ? `url(${bgImg}) no-repeat top center / 100% 100%` : bgColor
+		};
+	});
+	// 格式化【折扣类型】
+	const formatCouponDiscountType = (coupon) => {
+		if (coupon.discountType === PromotionDiscountTypeEnum.PRICE.type) {
+			return 'reduce'
+		}
+		if (coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
+			return 'percent'
+		}
+		return `未知【${coupon.discountType}】`
+	}
 
-  // 格式化【折扣】
-  const formatCouponDiscountValue = (coupon) => {
-    if(coupon.discountType === PromotionDiscountTypeEnum.PRICE.type) {
-      return floatToFixed2(coupon.discountPrice)
-    }
-    if(coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
-      return coupon.discountPercent
-    }
-    return `未知【${coupon.discountType}】`
-  }
+	// 格式化【折扣】
+	const formatCouponDiscountValue = (coupon) => {
+		if (coupon.discountType === PromotionDiscountTypeEnum.PRICE.type) {
+			return floatToFixed2(coupon.discountPrice)
+		}
+		if (coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
+			return coupon.discountPercent
+		}
+		return `未知【${coupon.discountType}】`
+	}
 
-  // 格式化【有效期限】
-  const formatValidityType = (row) => {
-    if (row.validityType === CouponTemplateValidityTypeEnum.DATE.type) {
-      return `${formatDate(row.validStartTime)} 至 ${formatDate(row.validEndTime)}`
-    }
-    if (row.validityType === CouponTemplateValidityTypeEnum.TERM.type) {
-      return `领取后第 ${row.fixedStartTerm} - ${row.fixedEndTerm} 天内可用`
-    }
-    return '未知【' + row.validityType + '】'
-  }
+	// 格式化【有效期限】
+	const formatValidityType = (row) => {
+		if (row.validityType === CouponTemplateValidityTypeEnum.DATE.type) {
+			return `${formatDate(row.validStartTime)} 至 ${formatDate(row.validEndTime)}`
+		}
+		if (row.validityType === CouponTemplateValidityTypeEnum.TERM.type) {
+			return `领取后第 ${row.fixedStartTerm} - ${row.fixedEndTerm} 天内可用`
+		}
+		return '未知【' + row.validityType + '】'
+	}
 
-  const couponList = ref([]);
-  // 立即领取优惠券
-  async function onGetCoupon(id) {
-    const { error, msg } = await CouponApi.takeCoupon(id);
-    if (error === 0) {
-      uni.showToast({
-        title: msg,
-        icon: 'none',
-      });
-      return
-    }
-    await getCouponTemplateList()
-  }
-  const getCouponTemplateList = async () => {
-    const { data } = await CouponApi.getCouponTemplateListByIds(props.data.couponIds.join(','));
-    couponList.value = data;
-  }
-  onMounted(() => {
-    getCouponTemplateList()
-  });
+	const couponList = ref([]);
+	// 立即领取优惠券
+	async function onGetCoupon(id) {
+		const {
+			error,
+			msg
+		} = await CouponApi.takeCoupon(id);
+		if (error === 0) {
+			uni.showToast({
+				title: msg,
+				icon: 'none',
+			});
+			return
+		}
+		await getCouponTemplateList()
+	}
+	const getCouponTemplateList = async () => {
+		const {
+			data
+		} = await CouponApi.getCouponTemplateListByIds(props.data.couponIds.join(','));
+		couponList.value = data;
+	}
+	onMounted(() => {
+		getCouponTemplateList()
+	});
 </script>
 
 <style lang="scss" scoped>
-  .card-btn {
-    width: 140rpx;
-    height: 50rpx;
-    border-radius: 25rpx;
-    font-size: 24rpx;
-    line-height: 50rpx;
-    &.vertical {
-      width: 50rpx;
-      height: 140rpx;
-      margin: auto 20rpx auto 0;
+	.scroll-box {
+		.coupon-box {
+			display: flex;
+			justify-content: space-around;
 
-      .btn-text {
-        font-size: 24rpx;
-        text-align: center;
-        writing-mode: vertical-lr;
-      }
-    }
-  }
-  .coupon-item {
-    &:nth-of-type(1) {
-      margin-left: 0 !important;
-    }
-  }
-</style>
+			.card-btn {
+				width: 140rpx;
+				height: 50rpx;
+				border-radius: 25rpx;
+				font-size: 24rpx;
+				line-height: 50rpx;
+
+				&.vertical {
+					width: 50rpx;
+					height: 140rpx;
+					margin: auto 20rpx auto 0;
+
+					.btn-text {
+						font-size: 24rpx;
+						text-align: center;
+						writing-mode: vertical-lr;
+					}
+				}
+			}
+
+			.coupon-item {
+				&:nth-of-type(1) {
+					margin-left: 0 !important;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
index 5a6653aa..ef647b89 100644
--- a/sheep/components/s-menu-button/s-menu-button.vue
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -173,7 +173,6 @@
 
 	// 设置背景样式
 	const bgStyle = computed(() => {
-		console.log(props.styles)
 		// 直接从 props.styles 解构
 		const {
 			bgType,

From c8a95ef3ec6e27eeb0e76be4bccc22b3f0be68ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 15 Aug 2024 14:27:27 +0800
Subject: [PATCH 35/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E8=A3=85=E4=BF=AE=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=A4=9A=E4=B8=AA=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=8C?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-coupon-block/s-coupon-block.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index 8f66087b..59d49714 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -141,7 +141,7 @@
 	.scroll-box {
 		.coupon-box {
 			display: flex;
-			justify-content: space-around;
+			justify-content: space-between;
 
 			.card-btn {
 				width: 140rpx;

From ea8ea9e74466ff565f11e73b01294117272c6e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 15 Aug 2024 14:51:15 +0800
Subject: [PATCH 36/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E8=A3=85=E4=BF=AE=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=AF=8F=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=8C=E5=88=99?=
 =?UTF-8?q?=E8=AE=A9=E4=BC=98=E6=83=A0=E5=88=B8=E5=B1=85=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E5=88=86=E6=95=A3=E5=9C=A8=E4=B8=A4?=
 =?UTF-8?q?=E8=BE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-coupon-block/s-coupon-block.vue         | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index 59d49714..9e75f93d 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -1,7 +1,7 @@
 <!-- 装修营销组件：优惠券  -->
 <template>
 	<scroll-view class="scroll-box" scroll-x scroll-anchoring :style="[bgStyle, { marginLeft: `${data.space}px` }]">
-		<view class="coupon-box ss-flex">
+		<view class="coupon-box ss-flex" :style="columns === 2 ? couponBoxStyleTwo : couponBoxStyleNormal">
 			<view class="coupon-item" :style="[couponBg, { marginLeft: `${data.space}px` }]"
 				v-for="(item, index) in couponList" :key="index">
 				<su-coupon :size="SIZE_LIST[columns - 1]" :textColor="data.textColor" background="" :couponId="item.id"
@@ -63,6 +63,16 @@
 		background: button.bgColor,
 		color: button.color,
 	};
+	// 两列优惠券时的排版方式
+	const couponBoxStyleNormal = {
+		'display': 'flex',
+		'justify-content': 'space-between'
+	};
+	// 非两列优惠券时的排版方式
+	const couponBoxStyleTwo = {
+		'display': 'flex',
+		'justify-content': 'space-around'
+	};
 	// 设置背景样式
 	const bgStyle = computed(() => {
 		// 直接从 props.styles 解构
@@ -138,36 +148,29 @@
 </script>
 
 <style lang="scss" scoped>
-	.scroll-box {
-		.coupon-box {
-			display: flex;
-			justify-content: space-between;
+	.card-btn {
+		width: 140rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		font-size: 24rpx;
+		line-height: 50rpx;
 
-			.card-btn {
-				width: 140rpx;
-				height: 50rpx;
-				border-radius: 25rpx;
+		&.vertical {
+			width: 50rpx;
+			height: 140rpx;
+			margin: auto 20rpx auto 0;
+
+			.btn-text {
 				font-size: 24rpx;
-				line-height: 50rpx;
-
-				&.vertical {
-					width: 50rpx;
-					height: 140rpx;
-					margin: auto 20rpx auto 0;
-
-					.btn-text {
-						font-size: 24rpx;
-						text-align: center;
-						writing-mode: vertical-lr;
-					}
-				}
-			}
-
-			.coupon-item {
-				&:nth-of-type(1) {
-					margin-left: 0 !important;
-				}
+				text-align: center;
+				writing-mode: vertical-lr;
 			}
 		}
 	}
+
+	.coupon-item {
+		&:nth-of-type(1) {
+			margin-left: 0 !important;
+		}
+	}
 </style>
\ No newline at end of file

From e66e1c6eac736c413de19d2be2555911d7cac99b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 15 Aug 2024 15:46:22 +0800
Subject: [PATCH 37/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E6=8E=92=E7=89=88=E9=97=AE=E9=A2=98=E5=92=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-coupon-block/s-coupon-block.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index 9e75f93d..89a0f0e8 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -1,7 +1,7 @@
 <!-- 装修营销组件：优惠券  -->
 <template>
 	<scroll-view class="scroll-box" scroll-x scroll-anchoring :style="[bgStyle, { marginLeft: `${data.space}px` }]">
-		<view class="coupon-box ss-flex" :style="columns === 2 ? couponBoxStyleTwo : couponBoxStyleNormal">
+		<view class="coupon-box ss-flex" :style="couponList.length === 2 ? couponBoxStyleTwo : couponBoxStyleNormal">
 			<view class="coupon-item" :style="[couponBg, { marginLeft: `${data.space}px` }]"
 				v-for="(item, index) in couponList" :key="index">
 				<su-coupon :size="SIZE_LIST[columns - 1]" :textColor="data.textColor" background="" :couponId="item.id"

From f4adfde90bad282c433f4d9163785292cb6b1b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Fri, 16 Aug 2024 17:29:09 +0800
Subject: [PATCH 38/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E6=8B=BC?=
 =?UTF-8?q?=E5=9B=A2=E5=92=8C=E7=A7=92=E6=9D=80=E4=BB=B7=E6=A0=BC=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-groupon-block/s-groupon-block.vue       | 260 +++++++++--------
 .../s-seckill-block/s-seckill-block.vue       | 272 +++++++++---------
 2 files changed, 262 insertions(+), 270 deletions(-)

diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 2c32d603..67da2e15 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -1,154 +1,150 @@
 <!-- 装修组件 - 拼团 -->
 <template>
-  <view>
-    <view
-      v-if="layoutType === 'threeCol'"
-      class="goods-sm-box ss-flex ss-flex-wrap"
-      :style="[{ margin: '-' + data.space + 'rpx' }]"
-    >
-      <view
-        v-for="product in productList"
-        :key="product.id"
-        class="goods-card-box"
-        :style="[
+	<view>
+		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap"
+			:style="[{ margin: '-' + data.space + 'rpx' }]">
+			<view v-for="product in productList" :key="product.id" class="goods-card-box" :style="[
           {
             padding: data.space + 'rpx',
           },
-        ]"
-      >
-        <s-goods-column
-          class="goods-card"
-          size="sm"
-          :goodsFields="data.fields"
-          :tagStyle="tagStyle"
-          :data="product"
-          :titleColor="data.fields.name?.color"
-          :topRadius="data.borderRadiusTop"
-          :bottomRadius="data.borderRadiusBottom"
-          @click="
+        ]">
+				<s-goods-column class="goods-card" size="sm" :goodsFields="data.fields" :tagStyle="tagStyle"
+					:data="product" :titleColor="data.fields.name?.color" :topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom" @click="
             sheep.$router.go('/pages/goods/groupon', {
               id: props.data.activityId,
             })
-          "
-        ></s-goods-column>
-      </view>
-    </view>
-    <!-- 样式2 一行一个 图片左 文案右 -->
-    <view class="goods-box" v-if="layoutType === 'oneCol'">
-      <view
-        class="goods-list"
-        v-for="(product, index) in productList"
-        :key="index"
-        :style="[{ marginBottom: space + 'px' }]"
-      >
-        <s-goods-column
-          class="goods-card"
-          size="lg"
-          :goodsFields="data.fields"
-          :tagStyle="tagStyle"
-          :data="product"
-          :titleColor="data.fields.name?.color"
-          :subTitleColor="data.fields.introduction?.color"
-          :topRadius="data.borderRadiusTop"
-          :bottomRadius="data.borderRadiusBottom"
-          @click="
+          "></s-goods-column>
+			</view>
+		</view>
+		<!-- 样式2 一行一个 图片左 文案右 -->
+		<view class="goods-box" v-if="layoutType === 'oneCol'">
+			<view class="goods-list" v-for="(product, index) in productList" :key="index"
+				:style="[{ marginBottom: space + 'px' }]">
+				<s-goods-column class="goods-card" size="lg" :goodsFields="data.fields" :tagStyle="tagStyle"
+					:data="product" :titleColor="data.fields.name?.color"
+					:subTitleColor="data.fields.introduction?.color" :topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom" @click="
             sheep.$router.go('/pages/goods/groupon', {
               id: props.data.activityId,
             })
-          "
-        >
-          <template v-slot:cart>
-            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-              {{ btnBuy?.type === 'text' ? btnBuy.text : '' }}
-            </button>
-          </template>
-        </s-goods-column>
-      </view>
-    </view>
-  </view>
+          ">
+					<template v-slot:cart>
+						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+							{{ btnBuy?.type === 'text' ? btnBuy.text : '' }}
+						</button>
+					</template>
+				</s-goods-column>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-  /**
-   * 拼团
-   */
-  import { computed, onMounted, ref } from 'vue';
-  import sheep from '@/sheep';
-  import SpuApi from "@/sheep/api/product/spu";
-  import CombinationApi from "@/sheep/api/promotion/combination";
+	/**
+	 * 拼团
+	 */
+	import {
+		computed,
+		onMounted,
+		ref
+	} from 'vue';
+	import sheep from '@/sheep';
+	import SpuApi from "@/sheep/api/product/spu";
+	import CombinationApi from "@/sheep/api/promotion/combination";
 
-  // 接收参数
-  const props = defineProps({
-    data: {
-      type: Object,
-      default() {},
-    },
-    styles: {
-      type: Object,
-      default() {},
-    },
-  });
+	// 接收参数
+	const props = defineProps({
+		data: {
+			type: Object,
+			default () {},
+		},
+		styles: {
+			type: Object,
+			default () {},
+		},
+	});
 
-  let { layoutType, tagStyle, btnBuy, space } = props.data;
-  let { marginLeft, marginRight } = props.styles;
+	let {
+		layoutType,
+		tagStyle,
+		btnBuy,
+		space
+	} = props.data;
+	let {
+		marginLeft,
+		marginRight
+	} = props.styles;
 
-  // 购买按钮样式
-  const buyStyle = computed(() => {
-    let btnBuy = props.data.btnBuy;
-    if (btnBuy?.type === 'text') {
-      return {
-        background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
-      };
-    }
+	// 购买按钮样式
+	const buyStyle = computed(() => {
+		let btnBuy = props.data.btnBuy;
+		if (btnBuy?.type === 'text') {
+			return {
+				background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
+			};
+		}
 
-    if (btnBuy?.type === 'img') {
-      return {
-        width: '54rpx',
-        height: '54rpx',
-        background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
-        backgroundSize: '100% 100%',
-      };
-    }
-  });
+		if (btnBuy?.type === 'img') {
+			return {
+				width: '54rpx',
+				height: '54rpx',
+				background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
+				backgroundSize: '100% 100%',
+			};
+		}
+	});
 
-  const productList = ref([]);
-  onMounted(async () => {
-    // todo：@owen 与Yudao结构不一致，待重构
-    const { data: activity } = await CombinationApi.getCombinationActivity(props.data.activityId);
-    const { data: spu } = await SpuApi.getSpuDetail(activity.spuId)
-    productList.value = [spu];
-  });
+	const productList = ref([]);
+	onMounted(async () => {
+		// todo：@owen 与Yudao结构不一致，待重构
+		const {
+			data: activity
+		} = await CombinationApi.getCombinationActivity(props.data.activityId);
+		const {
+			data: spu
+		} = await SpuApi.getSpuDetail(activity.spuId)
+		// 循环活动信息，赋值拼团最低价格
+		activity.products.forEach((product) => {
+		  spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
+		});
+		productList.value = [spu];
+	});
 </script>
 
 <style lang="scss" scoped>
-  .goods-list {
-    position: relative;
-    .cart-btn {
-      position: absolute;
-      bottom: 10rpx;
-      right: 20rpx;
-      z-index: 11;
-      height: 50rpx;
-      line-height: 50rpx;
-      padding: 0 20rpx;
-      border-radius: 25rpx;
-      font-size: 24rpx;
-      color: #fff;
-    }
-  }
-  .goods-list {
-    &:nth-last-of-type(1) {
-      margin-bottom: 0 !important;
-    }
-  }
-  .goods-sm-box {
-    margin: 0 auto;
-    box-sizing: border-box;
-    .goods-card-box {
-      flex-shrink: 0;
-      overflow: hidden;
-      width: 33.3%;
-      box-sizing: border-box;
-    }
-  }
-</style>
+	.goods-list {
+		position: relative;
+
+		.cart-btn {
+			position: absolute;
+			bottom: 10rpx;
+			right: 20rpx;
+			z-index: 11;
+			height: 50rpx;
+			line-height: 50rpx;
+			padding: 0 20rpx;
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			color: #fff;
+		}
+	}
+
+	.goods-list {
+		&:nth-last-of-type(1) {
+			margin-bottom: 0 !important;
+		}
+	}
+
+	.goods-sm-box {
+		margin: 0 auto;
+		box-sizing: border-box;
+
+		.goods-card-box {
+			flex-shrink: 0;
+			overflow: hidden;
+			width: 33.3%;
+			box-sizing: border-box;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index 09c26136..a83ce75b 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -1,160 +1,156 @@
 <!-- 装修组件 - 秒杀 -->
 <template>
-  <view>
-    <!-- 样式一：三列 - 上图下文 -->
-    <view
-      v-if="layoutType === 'threeCol'"
-      class="goods-sm-box ss-flex ss-flex-wrap"
-      :style="[{ margin: '-' + data.space + 'rpx' }]"
-    >
-      <view
-        v-for="product in productList"
-        :key="product.id"
-        class="goods-card-box"
-        :style="[
+	<view>
+		<!-- 样式一：三列 - 上图下文 -->
+		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap"
+			:style="[{ margin: '-' + data.space + 'rpx' }]">
+			<view v-for="product in productList" :key="product.id" class="goods-card-box" :style="[
           {
             padding: data.space + 'rpx',
           },
-        ]"
-      >
-        <s-goods-column
-          class="goods-card"
-          size="sm"
-          :goodsFields="data.fields"
-          :tagStyle="tagStyle"
-          :data="product"
-          :titleColor="data.fields.name?.color"
-          :topRadius="data.borderRadiusTop"
-          :bottomRadius="data.borderRadiusBottom"
-          @click="
+        ]">
+				<s-goods-column class="goods-card" size="sm" :goodsFields="data.fields" :tagStyle="tagStyle"
+					:data="product" :titleColor="data.fields.name?.color" :topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom" @click="
             sheep.$router.go('/pages/goods/seckill', {
               id: props.data.activityId,
             })
-          "
-        ></s-goods-column>
-      </view>
-    </view>
-    <!-- 样式二：一列 - 左图右文 -->
-    <view class="goods-box" v-if="layoutType === 'oneCol'">
-      <view
-        class="goods-list"
-        v-for="(product, index) in productList"
-        :key="index"
-        :style="[{ marginBottom: space + 'px' }]"
-      >
-        <s-goods-column
-          class="goods-card"
-          size="lg"
-          :goodsFields="data.fields"
-          :tagStyle="tagStyle"
-          :data="product"
-          :titleColor="data.fields.name?.color"
-          :subTitleColor="data.fields.introduction?.color"
-          :topRadius="data.borderRadiusTop"
-          :bottomRadius="data.borderRadiusBottom"
-          @click="
+          "></s-goods-column>
+			</view>
+		</view>
+		<!-- 样式二：一列 - 左图右文 -->
+		<view class="goods-box" v-if="layoutType === 'oneCol'">
+			<view class="goods-list" v-for="(product, index) in productList" :key="index"
+				:style="[{ marginBottom: space + 'px' }]">
+				<s-goods-column class="goods-card" size="lg" :goodsFields="data.fields" :tagStyle="tagStyle"
+					:data="product" :titleColor="data.fields.name?.color"
+					:subTitleColor="data.fields.introduction?.color" :topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom" @click="
             sheep.$router.go('/pages/goods/seckill', {
               id: props.data.activityId,
             })
-          "
-        >
-          <template v-slot:cart>
-            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-              {{ btnBuy?.type === 'text' ? btnBuy.text : '' }}
-            </button>
-          </template>
-        </s-goods-column>
-      </view>
-    </view>
-  </view>
+          ">
+					<template v-slot:cart>
+						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+							{{ btnBuy?.type === 'text' ? btnBuy.text : '' }}
+						</button>
+					</template>
+				</s-goods-column>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-  /**
-   * 秒杀商品列表
-   *
-   * @property {Array} list 商品列表
-   */
-  import { computed, onMounted, ref } from 'vue';
-  import sheep from '@/sheep';
-  import SeckillApi from "@/sheep/api/promotion/seckill";
-  import SpuApi from "@/sheep/api/product/spu";
+	/**
+	 * 秒杀商品列表
+	 *
+	 * @property {Array} list 商品列表
+	 */
+	import {
+		computed,
+		onMounted,
+		ref
+	} from 'vue';
+	import sheep from '@/sheep';
+	import SeckillApi from "@/sheep/api/promotion/seckill";
+	import SpuApi from "@/sheep/api/product/spu";
 
-  // 接收参数
-  const props = defineProps({
-    data: {
-      type: Object,
-      default() {},
-    },
-    styles: {
-      type: Object,
-      default() {},
-    },
-  });
+	// 接收参数
+	const props = defineProps({
+		data: {
+			type: Object,
+			default () {},
+		},
+		styles: {
+			type: Object,
+			default () {},
+		},
+	});
 
-  let { layoutType, tagStyle, btnBuy, space } = props.data;
-  let { marginLeft, marginRight } = props.styles;
+	let {
+		layoutType,
+		tagStyle,
+		btnBuy,
+		space
+	} = props.data;
+	let {
+		marginLeft,
+		marginRight
+	} = props.styles;
 
-  // 购买按钮样式
-  const buyStyle = computed(() => {
-    let btnBuy = props.data.btnBuy;
-    if (btnBuy?.type === 'text') {
-      return {
-        background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
-      };
-    }
-    if (btnBuy?.type === 'img') {
-      return {
-        width: '54rpx',
-        height: '54rpx',
-        background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
-        backgroundSize: '100% 100%',
-      };
-    }
-  });
+	// 购买按钮样式
+	const buyStyle = computed(() => {
+		let btnBuy = props.data.btnBuy;
+		if (btnBuy?.type === 'text') {
+			return {
+				background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
+			};
+		}
+		if (btnBuy?.type === 'img') {
+			return {
+				width: '54rpx',
+				height: '54rpx',
+				background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
+				backgroundSize: '100% 100%',
+			};
+		}
+	});
 
-  // 商品列表
-  const productList = ref([]);
-  // 查询秒杀活动商品
-  onMounted(async () => {
-    // todo：@owen 与Yudao结构不一致，待重构
-    const { data: activity } = await SeckillApi.getSeckillActivity(props.data.activityId);
-    const { data: spu } = await SpuApi.getSpuDetail(activity.spuId)
-    productList.value = [spu];
-  });
+	// 商品列表
+	const productList = ref([]);
+	// 查询秒杀活动商品
+	onMounted(async () => {
+		// todo：@owen 与Yudao结构不一致，待重构
+		const {
+			data: activity
+		} = await SeckillApi.getSeckillActivity(props.data.activityId);
+		const {
+			data: spu
+		} = await SpuApi.getSpuDetail(activity.spuId)
+		// 循环活动信息，赋值秒杀最低价格
+		activity.products.forEach((product) => {
+			spu.price = Math.min(spu.price, product.seckillPrice); // 设置 SPU 的最低价格
+		});
+		productList.value = [spu];
+	});
 </script>
 
 <style lang="scss" scoped>
-  .header-box {
-    height: 100rpx;
-  }
+	.header-box {
+		height: 100rpx;
+	}
 
-  .goods-list {
-    position: relative;
-    &:nth-last-child(1) {
-      margin-bottom: 0 !important;
-    }
-    .cart-btn {
-      position: absolute;
-      bottom: 10rpx;
-      right: 20rpx;
-      z-index: 11;
-      height: 50rpx;
-      line-height: 50rpx;
-      padding: 0 20rpx;
-      border-radius: 25rpx;
-      font-size: 24rpx;
-      color: #fff;
-    }
-  }
-  .goods-sm-box {
-    margin: 0 auto;
-    box-sizing: border-box;
-    .goods-card-box {
-      flex-shrink: 0;
-      overflow: hidden;
-      width: 33.3%;
-      box-sizing: border-box;
-    }
-  }
-</style>
+	.goods-list {
+		position: relative;
+
+		&:nth-last-child(1) {
+			margin-bottom: 0 !important;
+		}
+
+		.cart-btn {
+			position: absolute;
+			bottom: 10rpx;
+			right: 20rpx;
+			z-index: 11;
+			height: 50rpx;
+			line-height: 50rpx;
+			padding: 0 20rpx;
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			color: #fff;
+		}
+	}
+
+	.goods-sm-box {
+		margin: 0 auto;
+		box-sizing: border-box;
+
+		.goods-card-box {
+			flex-shrink: 0;
+			overflow: hidden;
+			width: 33.3%;
+			box-sizing: border-box;
+		}
+	}
+</style>
\ No newline at end of file

From 8a6ec1cb02a487d1f2b318fb6f77d7c809c2fa7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 18 Aug 2024 08:50:54 +0800
Subject: [PATCH 39/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=9B=A2=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=9A=84=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/groupon.vue                                  | 9 +++++----
 .../s-select-groupon-sku/s-select-groupon-sku.vue        | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 3f464ed9..ae4ea0d6 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -80,7 +80,7 @@
         <!-- 功能卡片 -->
         <view class="detail-cell-card detail-card ss-flex-col">
           <!-- 规格 -->
-          <detail-cell-sku :sku="state.selectedSkuPrice" @tap="state.showSelectSku = true" />
+          <detail-cell-sku :sku="state.selectedSku" @tap="state.showSelectSku = true" />
         </view>
 
         <!-- 参团列表 -->
@@ -90,6 +90,7 @@
         <s-select-groupon-sku
           :show="state.showSelectSku"
           :goodsInfo="state.goodsInfo"
+		  :selectedSku="state.selectedSku"
           :grouponAction="state.grouponAction"
           :grouponNum="state.grouponNum"
           @buy="onBuy"
@@ -125,7 +126,7 @@
             :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0"
           >
             <view class="btn-price">{{
-              fen2yuan(state.activity.price || state.goodsInfo.price)
+              fen2yuan(state.selectedSku.price * state.selectedSku.count || state.activity.price * state.selectedSku.count || state.goodsInfo.price * state.selectedSku.count || state.goodsInfo.price)
             }}</view>
             <view v-if="state.activity.startTime > new Date().getTime()">未开始</view>
             <view v-else-if="state.activity.endTime <= new Date().getTime()">已结束</view>
@@ -168,7 +169,7 @@
     goodsInfo: {}, // 商品信息
     goodsSwiper: [], // 商品轮播图
     showSelectSku: false, // 显示规格弹框
-    selectedSkuPrice: {}, // 选中的规格价格
+    selectedSku: {}, // 选中的规格价格
     activity: {}, // 团购活动
     grouponId: 0, // 团购ID
     grouponNum: 0, // 团购人数
@@ -183,7 +184,7 @@
 
   // 规格变更
   function onSkuChange(e) {
-    state.selectedSkuPrice = e;
+    state.selectedSku = e;
   }
 
   function onSkuClose() {
diff --git a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
index e2a2950d..6259a088 100644
--- a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
+++ b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
@@ -22,7 +22,7 @@
             </view>
           </view>
           <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
-            <view class="price-text"> {{ fen2yuan(goodsInfo.price) }}</view>
+            <view class="price-text"> {{ fen2yuan(state.selectedSku.price || goodsInfo.price || state.selectedSku.marketPrice) }}</view>
 
             <view class="stock-text ss-m-l-20">
               库存{{ state.selectedSku.stock || goodsInfo.stock }}件
@@ -63,7 +63,7 @@
               <view class="btn-title">{{ grouponNum + '人团' }}</view>
             </button>
             <button class="ss-reset-button btn-tox ss-flex-col" @tap="onBuy">
-              <view class="btn-price">{{ fen2yuan(goodsInfo.price) }}</view>
+              <view class="btn-price">{{ fen2yuan(state.selectedSku.price * state.selectedSku.count || goodsInfo.price * state.selectedSku.count || state.selectedSku.marketPrice * state.selectedSku.count || goodsInfo.price) }}</view>
               <view v-if="grouponAction === 'create'">立即开团</view>
               <view v-else-if="grouponAction === 'join'">参与拼团</view>
             </button>

From 47f42953161806d01614c59e0cc4349f6dd874fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 18 Aug 2024 09:10:40 +0800
Subject: [PATCH 40/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=9B=A2=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=9A=84=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/groupon.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index ae4ea0d6..ae333cfb 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -169,7 +169,7 @@
     goodsInfo: {}, // 商品信息
     goodsSwiper: [], // 商品轮播图
     showSelectSku: false, // 显示规格弹框
-    selectedSku: {}, // 选中的规格价格
+    selectedSku: {}, // 选中的规格属性
     activity: {}, // 团购活动
     grouponId: 0, // 团购ID
     grouponNum: 0, // 团购人数

From ef3a82ee146cd198ed0172ee5b66b2e7d07bdb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 18 Aug 2024 12:30:04 +0800
Subject: [PATCH 41/84] =?UTF-8?q?=E3=80=90=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96=E8=A3=85=E4=BF=AE=E6=8B=BC?=
 =?UTF-8?q?=E5=9B=A2=E5=8D=95=E5=88=97=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-groupon-block/s-groupon-block.vue       | 83 ++++++++++++-------
 1 file changed, 52 insertions(+), 31 deletions(-)

diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 67da2e15..d7e6fcf5 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -1,37 +1,38 @@
 <!-- 装修组件 - 拼团 -->
 <template>
 	<view>
-		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap"
-			:style="[{ margin: '-' + data.space + 'rpx' }]">
-			<view v-for="product in productList" :key="product.id" class="goods-card-box" :style="[
-          {
-            padding: data.space + 'rpx',
-          },
-        ]">
-				<s-goods-column class="goods-card" size="sm" :goodsFields="data.fields" :tagStyle="tagStyle"
-					:data="product" :titleColor="data.fields.name?.color" :topRadius="data.borderRadiusTop"
-					:bottomRadius="data.borderRadiusBottom" @click="
-            sheep.$router.go('/pages/goods/groupon', {
-              id: props.data.activityId,
-            })
-          "></s-goods-column>
+		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap" :style="[{ margin: '-' + data.space + 'rpx' }]">
+			<view v-for="product in productList" class="goods-card-box" :key="product.id" :style="[{padding: data.space + 'rpx',},]">
+				<s-goods-column
+					class="goods-card"
+					size="sm"
+					:goodsFields="goodsFields"
+					:tagStyle="badge"
+					:data="product"
+					:titleColor="data.fields.name?.color"
+					:topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom"
+					@click="sheep.$router.go('/pages/goods/groupon', { id: props.data.activityId, })">
+				</s-goods-column>
 			</view>
 		</view>
 		<!-- 样式2 一行一个 图片左 文案右 -->
 		<view class="goods-box" v-if="layoutType === 'oneCol'">
-			<view class="goods-list" v-for="(product, index) in productList" :key="index"
-				:style="[{ marginBottom: space + 'px' }]">
-				<s-goods-column class="goods-card" size="lg" :goodsFields="data.fields" :tagStyle="tagStyle"
-					:data="product" :titleColor="data.fields.name?.color"
-					:subTitleColor="data.fields.introduction?.color" :topRadius="data.borderRadiusTop"
-					:bottomRadius="data.borderRadiusBottom" @click="
-            sheep.$router.go('/pages/goods/groupon', {
-              id: props.data.activityId,
-            })
-          ">
+			<view class="goods-list" v-for="(product, index) in productList" :key="index" :style="[{ marginBottom: space + 'px' }]">
+				<s-goods-column
+					class="goods-card" size="lg"
+					:grouponTag="true"
+					:goodsFields="goodsFields"
+					:tagStyle="badge"
+					:data="product"
+					:titleColor="data.fields.name?.color"
+					:subTitleColor="data.fields.introduction?.color"
+					:topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom"
+					@click="sheep.$router.go('/pages/goods/groupon', { id: props.data.activityId, })">
 					<template v-slot:cart>
 						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
-							{{ btnBuy?.type === 'text' ? btnBuy.text : '' }}
+							{{ btnBuy?.type === 'text' ? btnBuy.text : '去拼团' }}
 						</button>
 					</template>
 				</s-goods-column>
@@ -47,6 +48,7 @@
 	import {
 		computed,
 		onMounted,
+		reactive,
 		ref
 	} from 'vue';
 	import sheep from '@/sheep';
@@ -55,28 +57,46 @@
 
 	// 接收参数
 	const props = defineProps({
+		// 装修数据
 		data: {
 			type: Object,
-			default () {},
+			default: () => ({}),
 		},
+		// 装修样式
 		styles: {
 			type: Object,
-			default () {},
+			default: () => ({}),
 		},
 	});
+	
+	// 设置相关信息是否显示
+	const goodsFields = reactive({
+	  // 商品价格
+	  price: { show: true },
+	  // 库存
+	  stock: { show: true },
+	  // 商品名称
+	  name: { show: true },
+	  // 商品介绍
+	  introduction: { show: true },
+	  // 市场价
+	  marketPrice: { show: true },
+	  // 销量
+	  salesCount: { show: true },
+	});
 
 	let {
 		layoutType,
-		tagStyle,
+		badge,
 		btnBuy,
-		space
+		space,
 	} = props.data;
 	let {
 		marginLeft,
 		marginRight
 	} = props.styles;
 
-	// 购买按钮样式
+	// 购买按钮样式（暂未实现）
 	const buyStyle = computed(() => {
 		let btnBuy = props.data.btnBuy;
 		if (btnBuy?.type === 'text') {
@@ -106,7 +126,7 @@
 		} = await SpuApi.getSpuDetail(activity.spuId)
 		// 循环活动信息，赋值拼团最低价格
 		activity.products.forEach((product) => {
-		  spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
+			spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
 		});
 		productList.value = [spu];
 	});
@@ -127,6 +147,7 @@
 			border-radius: 25rpx;
 			font-size: 24rpx;
 			color: #fff;
+			background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
 		}
 	}
 

From f10c9ec16c2ce11ed6bf2f153bb929a17f914c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 18 Aug 2024 13:03:52 +0800
Subject: [PATCH 42/84] =?UTF-8?q?=E3=80=90=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96=E8=A3=85=E4=BF=AE=E7=A7=92?=
 =?UTF-8?q?=E6=9D=80=E5=88=97=E8=A1=A8=E7=9A=84=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=85=B3=E9=94=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-seckill-block/s-seckill-block.vue       | 78 ++++++++++++-------
 1 file changed, 50 insertions(+), 28 deletions(-)

diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index a83ce75b..50cef6da 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -2,37 +2,39 @@
 <template>
 	<view>
 		<!-- 样式一：三列 - 上图下文 -->
-		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap"
-			:style="[{ margin: '-' + data.space + 'rpx' }]">
-			<view v-for="product in productList" :key="product.id" class="goods-card-box" :style="[
-          {
-            padding: data.space + 'rpx',
-          },
-        ]">
-				<s-goods-column class="goods-card" size="sm" :goodsFields="data.fields" :tagStyle="tagStyle"
-					:data="product" :titleColor="data.fields.name?.color" :topRadius="data.borderRadiusTop"
-					:bottomRadius="data.borderRadiusBottom" @click="
-            sheep.$router.go('/pages/goods/seckill', {
-              id: props.data.activityId,
-            })
-          "></s-goods-column>
+		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap" :style="[{ margin: '-' + data.space + 'rpx' }]">
+			<view v-for="product in productList" :key="product.id" class="goods-card-box" :style="[{padding: data.space + 'rpx',},]">
+				<s-goods-column
+					class="goods-card" size="sm"
+					:goodsFields="goodsFields"
+					:tagStyle="badge"
+					:data="product"
+					:titleColor="data.fields.name?.color"
+					:topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom"
+					@click="sheep.$router.go('/pages/goods/seckill', { id: props.data.activityId, })">
+				</s-goods-column>
 			</view>
 		</view>
 		<!-- 样式二：一列 - 左图右文 -->
 		<view class="goods-box" v-if="layoutType === 'oneCol'">
 			<view class="goods-list" v-for="(product, index) in productList" :key="index"
 				:style="[{ marginBottom: space + 'px' }]">
-				<s-goods-column class="goods-card" size="lg" :goodsFields="data.fields" :tagStyle="tagStyle"
-					:data="product" :titleColor="data.fields.name?.color"
-					:subTitleColor="data.fields.introduction?.color" :topRadius="data.borderRadiusTop"
-					:bottomRadius="data.borderRadiusBottom" @click="
-            sheep.$router.go('/pages/goods/seckill', {
-              id: props.data.activityId,
-            })
-          ">
+				<s-goods-column
+					class="goods-card"
+					size="lg"
+					:goodsFields="goodsFields"
+					:seckillTag="true"
+					:tagStyle="badge"
+					:data="product"
+					:titleColor="data.fields.name?.color"
+					:subTitleColor="data.fields.introduction?.color"
+					:topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom"
+					@click="sheep.$router.go('/pages/goods/seckill', { id: props.data.activityId, })">
 					<template v-slot:cart>
 						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
-							{{ btnBuy?.type === 'text' ? btnBuy.text : '' }}
+							{{ btnBuy?.type === 'text' ? btnBuy.text : '立即秒杀' }}
 						</button>
 					</template>
 				</s-goods-column>
@@ -50,6 +52,7 @@
 	import {
 		computed,
 		onMounted,
+		reactive,
 		ref
 	} from 'vue';
 	import sheep from '@/sheep';
@@ -58,21 +61,39 @@
 
 	// 接收参数
 	const props = defineProps({
+		// 装修数据
 		data: {
 			type: Object,
-			default () {},
+			default: () => ({}),
 		},
+		// 装修样式
 		styles: {
 			type: Object,
-			default () {},
+			default: () => ({}),
 		},
 	});
-
+	
+	// 设置相关信息是否显示
+	const goodsFields = reactive({
+	  // 商品价格
+	  price: { show: true },
+	  // 库存
+	  stock: { show: true },
+	  // 商品名称
+	  name: { show: true },
+	  // 商品介绍
+	  introduction: { show: true },
+	  // 市场价
+	  marketPrice: { show: true },
+	  // 销量
+	  salesCount: { show: true },
+	});
+	
 	let {
 		layoutType,
-		tagStyle,
+		badge,
 		btnBuy,
-		space
+		space,
 	} = props.data;
 	let {
 		marginLeft,
@@ -139,6 +160,7 @@
 			border-radius: 25rpx;
 			font-size: 24rpx;
 			color: #fff;
+			background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
 		}
 	}
 

From d37b8483074f767fcd8f7021121fda0e2d03afb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 19 Aug 2024 11:52:05 +0800
Subject: [PATCH 43/84] =?UTF-8?q?=E3=80=90=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=9B=B4=E6=96=B0=E6=B4=BB=E5=8A=A8=E7=9A=84?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=88=E6=8B=BC=E5=9B=A2=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E6=9C=89=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-groupon-block/s-groupon-block.vue | 2 ++
 sheep/components/s-seckill-block/s-seckill-block.vue | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index d7e6fcf5..b90951b9 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -128,6 +128,8 @@
 		activity.products.forEach((product) => {
 			spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
 		});
+    // 将活动总限购数量赋值给库存
+    spu.stock = activity.totalLimitCount
 		productList.value = [spu];
 	});
 </script>
diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index 50cef6da..bfc61be0 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -133,6 +133,10 @@
 		activity.products.forEach((product) => {
 			spu.price = Math.min(spu.price, product.seckillPrice); // 设置 SPU 的最低价格
 		});
+    // 将活动库存赋值给商品库存
+    spu.stock = activity.stock
+    // 活动总库存 - 活动库存 = 销量
+    spu.salesCount = activity.totalStock - activity.stock
 		productList.value = [spu];
 	});
 </script>

From 9d333085cbb10133d91fc21cda37c927e7850f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 19 Aug 2024 17:40:17 +0800
Subject: [PATCH 44/84] =?UTF-8?q?=E3=80=90=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=8B=BC=E5=9B=A2=E5=BA=93=E5=AD=98=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=80=BB=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-groupon-block/s-groupon-block.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index b90951b9..d7e6fcf5 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -128,8 +128,6 @@
 		activity.products.forEach((product) => {
 			spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
 		});
-    // 将活动总限购数量赋值给库存
-    spu.stock = activity.totalLimitCount
 		productList.value = [spu];
 	});
 </script>

From 512d87c6f2c13b391a757190385328835f09cdd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Tue, 20 Aug 2024 16:38:50 +0800
Subject: [PATCH 45/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E5=95=86=E5=93=81=E7=BB=93=E7=AE=97=E9=A1=B5?=
 =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=8F=AF=E5=B1=95=E7=A4=BA=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8=E7=9A=84=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-coupon-select/s-coupon-select.vue       | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/sheep/components/s-coupon-select/s-coupon-select.vue b/sheep/components/s-coupon-select/s-coupon-select.vue
index e1a9db43..42d7e7f5 100644
--- a/sheep/components/s-coupon-select/s-coupon-select.vue
+++ b/sheep/components/s-coupon-select/s-coupon-select.vue
@@ -1,24 +1,19 @@
 <!-- 订单确认的优惠劵选择弹窗 -->
 <template>
-  <su-popup
-    :show="show"
-    type="bottom"
-    round="20"
-    @close="emits('close')"
-    showClose
-    backgroundColor="#f2f2f2"
-  >
+  <su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose backgroundColor="#f2f2f2">
     <view class="model-box">
       <view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠券</view>
-      <scroll-view
-        class="model-content"
-        scroll-y
-        :scroll-with-animation="false"
-        :enable-back-to-top="true"
-      >
+      <scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
+        <!--可使用的优惠券区域-->
         <view class="subtitle ss-m-l-20">可使用优惠券</view>
-        <view v-for="(item, index) in state.couponInfo" :key="index">
+        <view v-for="(item, index) in state.couponInfo.filter(coupon => coupon.match)" :key="index">
           <s-coupon-list :data="item" type="user" :disabled="false">
+            <template v-slot:reason>
+              <view class="ss-flex ss-m-t-24">
+                <view class="reason-title">可用原因：</view>
+                <view class="reason-desc">{{ item.description || '已达到使用门槛' }}</view>
+              </view>
+            </template>
             <template #default>
               <label class="ss-flex ss-col-center" @tap="radioChange(item.id)">
                 <radio
@@ -31,19 +26,18 @@
             </template>
           </s-coupon-list>
         </view>
-        <!-- TODO 芋艿：未来接口需要支持下
+        <!--不可使用的优惠券区域-->
         <view class="subtitle ss-m-t-40 ss-m-l-20">不可使用优惠券</view>
-        <view v-for="item in state.couponInfo.cannot_use" :key="item.id">
+        <view v-for="item in state.couponInfo.filter(coupon => !coupon.match)" :key="item.id">
           <s-coupon-list :data="item" type="user" :disabled="true">
             <template v-slot:reason>
               <view class="ss-flex ss-m-t-24">
                 <view class="reason-title"> 不可用原因：</view>
-                <view class="reason-desc">{{ item.cannot_use_msg }}</view>
+                <view class="reason-desc">{{ item.description || '未达到使用门槛' }}</view>
               </view>
             </template>
           </s-coupon-list>
         </view>
-      -->
       </scroll-view>
     </view>
     <view class="modal-footer ss-flex">
@@ -57,7 +51,8 @@
   const props = defineProps({
     modelValue: { // 优惠劵列表
       type: Object,
-      default() {},
+      default() {
+      },
     },
     show: {
       type: Boolean,
@@ -84,7 +79,7 @@
   // 确认优惠劵
   const onConfirm = () => {
     emits('confirm', state.couponId);
-  }
+  };
 </script>
 <style lang="scss" scoped>
   :deep() {
@@ -96,25 +91,30 @@
   .model-box {
     height: 60vh;
   }
+
   .title {
     font-size: 36rpx;
     height: 80rpx;
     font-weight: bold;
     color: #333333;
   }
+
   .subtitle {
     font-size: 26rpx;
     font-weight: 500;
     color: #333333;
   }
+
   .model-content {
     height: 54vh;
   }
+
   .modal-footer {
     width: 100%;
     height: 120rpx;
     background: #fff;
   }
+
   .confirm-btn {
     width: 710rpx;
     margin-left: 20rpx;
@@ -123,12 +123,14 @@
     border-radius: 40rpx;
     color: #fff;
   }
+
   .reason-title {
     font-weight: 600;
     font-size: 20rpx;
     line-height: 26rpx;
     color: #ff0003;
   }
+
   .reason-desc {
     font-weight: 600;
     font-size: 20rpx;

From 356193aab545dbdbbda03a83f2d03be2ffa298e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Wed, 21 Aug 2024 09:10:21 +0800
Subject: [PATCH 46/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 445 ++++++++++++++++++++++++++------------------------
 1 file changed, 230 insertions(+), 215 deletions(-)

diff --git a/manifest.json b/manifest.json
index 7e3aa40f..4732b6d3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,224 +1,239 @@
 {
-    "name" : "芋道商城",
-    "appid" : "__UNI__460BC4C",
-    "description" : "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
-    "versionName" : "2.1.0",
-    "versionCode" : 183,
-    "transformPx" : false,
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "nvueLaunchMode" : "fast",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
+  "name": "芋道商城",
+  "appid": "__UNI__460BC4C",
+  "description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
+  "versionName": "2.1.0",
+  "versionCode": 183,
+  "transformPx": false,
+  "app-plus": {
+    "usingComponents": true,
+    "nvueCompiler": "uni-app",
+    "nvueStyleCompiler": "uni-app",
+    "compilerVersion": 3,
+    "nvueLaunchMode": "fast",
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
+    },
+    "safearea": {
+      "bottom": {
+        "offset": "none"
+      }
+    },
+    "modules": {
+      "Payment": {},
+      "Share": {},
+      "VideoPlayer": {},
+      "OAuth": {}
+    },
+    "distribute": {
+      "android": {
+        "permissions": [
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+          "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+          "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
+        ],
+        "minSdkVersion": 21,
+        "schemes": "shopro"
+      },
+      "ios": {
+        "urlschemewhitelist": [
+          "baidumap",
+          "iosamap"
+        ],
+        "dSYMs": false,
+        "privacyDescription": {
+          "NSPhotoLibraryUsageDescription": "需要同意访问您的相册选取图片才能完善该条目",
+          "NSPhotoLibraryAddUsageDescription": "需要同意访问您的相册才能保存该图片",
+          "NSCameraUsageDescription": "需要同意访问您的摄像头拍摄照片才能完善该条目",
+          "NSUserTrackingUsageDescription": "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验"
         },
-        "safearea" : {
-            "bottom" : {
-                "offset" : "none"
-            }
+        "urltypes": "shopro",
+        "capabilities": {
+          "entitlements": {
+            "com.apple.developer.associated-domains": [
+              "applinks:shopro.sheepjs.com"
+            ]
+          }
         },
-        "modules" : {
-            "Payment" : {},
-            "Share" : {},
-            "VideoPlayer" : {},
-            "OAuth" : {}
+        "idfa": true
+      },
+      "sdkConfigs": {
+        "speech": {
+          "ifly": {}
         },
-        "distribute" : {
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-                ],
-                "minSdkVersion" : 21,
-                "schemes" : "shopro"
-            },
-            "ios" : {
-                "urlschemewhitelist" : [ "baidumap", "iosamap" ],
-                "dSYMs" : false,
-                "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "需要同意访问您的相册选取图片才能完善该条目",
-                    "NSPhotoLibraryAddUsageDescription" : "需要同意访问您的相册才能保存该图片",
-                    "NSCameraUsageDescription" : "需要同意访问您的摄像头拍摄照片才能完善该条目",
-                    "NSUserTrackingUsageDescription" : "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验"
-                },
-                "urltypes" : "shopro",
-                "capabilities" : {
-                    "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:shopro.sheepjs.com" ]
-                    }
-                },
-                "idfa" : true
-            },
-            "sdkConfigs" : {
-                "speech" : {
-                    "ifly" : {}
-                },
-                "ad" : {},
-                "oauth" : {
-                    "apple" : {},
-                    "weixin" : {
-                        "appid" : "wxae7a0c156da9383b",
-                        "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-                    }
-                },
-                "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wxae7a0c156da9383b",
-                        "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-                    },
-                    "alipay" : {
-                        "__platform__" : [ "ios", "android" ]
-                    }
-                },
-                "share" : {
-                    "weixin" : {
-                        "appid" : "wxae7a0c156da9383b",
-                        "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
-                    }
-                }
-            },
-            "orientation" : [ "portrait-primary" ],
-            "splashscreen" : {
-                "androidStyle" : "common",
-                "iosStyle" : "common",
-                "useOriginalMsgbox" : true
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            }
+        "ad": {},
+        "oauth": {
+          "apple": {},
+          "weixin": {
+            "appid": "wxae7a0c156da9383b",
+            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+          }
+        },
+        "payment": {
+          "weixin": {
+            "__platform__": [
+              "ios",
+              "android"
+            ],
+            "appid": "wxae7a0c156da9383b",
+            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+          },
+          "alipay": {
+            "__platform__": [
+              "ios",
+              "android"
+            ]
+          }
+        },
+        "share": {
+          "weixin": {
+            "appid": "wxae7a0c156da9383b",
+            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+          }
         }
-    },
-    "quickapp" : {},
-    "quickapp-native" : {
-        "icon" : "/static/logo.png",
-        "package" : "com.example.demo",
-        "features" : [
-            {
-                "name" : "system.clipboard"
-            }
-        ]
-    },
-    "quickapp-webview" : {
-        "icon" : "/static/logo.png",
-        "package" : "com.example.demo",
-        "minPlatformVersion" : 1070,
-        "versionName" : "1.0.0",
-        "versionCode" : 100
-    },
-    "mp-weixin" : {
-        "appid" : "wx66186af0759f47c9",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true,
-            "postcss" : true
+      },
+      "orientation": [
+        "portrait-primary"
+      ],
+      "splashscreen": {
+        "androidStyle": "common",
+        "iosStyle": "common",
+        "useOriginalMsgbox": true
+      },
+      "icons": {
+        "android": {
+          "hdpi": "unpackage/res/icons/72x72.png",
+          "xhdpi": "unpackage/res/icons/96x96.png",
+          "xxhdpi": "unpackage/res/icons/144x144.png",
+          "xxxhdpi": "unpackage/res/icons/192x192.png"
         },
-        "optimization" : {
-            "subPackages" : true
-        },
-        "plugins" : {},
-        "lazyCodeLoading" : "requiredComponents",
-        "usingComponents" : {},
-        "permission" : {},
-        "requiredPrivateInfos" : [ "chooseAddress" ]
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "mp-jd" : {
-        "usingComponents" : true
-    },
-    "h5" : {
-        "template" : "index.html",
-        "router" : {
-            "mode" : "history",
-            "base" : "./"
-        },
-        "sdkConfigs" : {
-            "maps" : {}
-        },
-        "async" : {
-            "timeout" : 20000
-        },
-        "title" : "芋道商城",
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
+        "ios": {
+          "appstore": "unpackage/res/icons/1024x1024.png",
+          "ipad": {
+            "app": "unpackage/res/icons/76x76.png",
+            "app@2x": "unpackage/res/icons/152x152.png",
+            "notification": "unpackage/res/icons/20x20.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "proapp@2x": "unpackage/res/icons/167x167.png",
+            "settings": "unpackage/res/icons/29x29.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "spotlight": "unpackage/res/icons/40x40.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png"
+          },
+          "iphone": {
+            "app@2x": "unpackage/res/icons/120x120.png",
+            "app@3x": "unpackage/res/icons/180x180.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "notification@3x": "unpackage/res/icons/60x60.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "settings@3x": "unpackage/res/icons/87x87.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png",
+            "spotlight@3x": "unpackage/res/icons/120x120.png"
+          }
         }
+      }
+    }
+  },
+  "quickapp": {},
+  "quickapp-native": {
+    "icon": "/static/logo.png",
+    "package": "com.example.demo",
+    "features": [
+      {
+        "name": "system.clipboard"
+      }
+    ]
+  },
+  "quickapp-webview": {
+    "icon": "/static/logo.png",
+    "package": "com.example.demo",
+    "minPlatformVersion": 1070,
+    "versionName": "1.0.0",
+    "versionCode": 100
+  },
+  "mp-weixin": {
+    "appid": "wx66186af0759f47c9",
+    "setting": {
+      "urlCheck": false,
+      "minified": true,
+      "postcss": true
     },
-    "vueVersion" : "3",
-    "_spaceID" : "192b4892-5452-4e1d-9f09-eee1ece40639",
-    "locale" : "zh-Hans",
-    "fallbackLocale" : "zh-Hans"
+    "optimization": {
+      "subPackages": true
+    },
+    "plugins": {},
+    "lazyCodeLoading": "requiredComponents",
+    "usingComponents": {},
+    "permission": {},
+    "requiredPrivateInfos": [
+      "chooseAddress"
+    ]
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "mp-jd": {
+    "usingComponents": true
+  },
+  "h5": {
+    "template": "index.html",
+    "router": {
+      "mode": "history",
+      "base": "./"
+    },
+    "sdkConfigs": {
+      "maps": {}
+    },
+    "async": {
+      "timeout": 20000
+    },
+    "title": "芋道商城",
+    "optimization": {
+      "treeShaking": {
+        "enable": true
+      }
+    }
+  },
+  "vueVersion": "3",
+  "_spaceID": "192b4892-5452-4e1d-9f09-eee1ece40639",
+  "locale": "zh-Hans",
+  "fallbackLocale": "zh-Hans"
 }

From a0f85bf15740b1e78021ad876dcbfb87835add39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 22 Aug 2024 21:59:07 +0800
Subject: [PATCH 47/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E6=97=B6=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E6=83=A0=E5=88=B8=E6=89=BE=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=E7=8E=B0=E5=9C=A8?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=93=E7=AE=97=E9=A1=B5=E9=9D=A2=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=9C=B0=E5=9D=80=E6=88=96=E8=80=85=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BC=9A=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue                            | 14 +++++++++++---
 .../components/s-coupon-select/s-coupon-select.vue |  6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 23ef75e8..2ab6998f 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -185,7 +185,7 @@
 </template>
 
 <script setup>
-  import { reactive, ref } from 'vue';
+  import { reactive, ref, watch } from 'vue';
   import { onLoad } from '@dcloudio/uni-app';
   import AddressSelection from '@/pages/order/addressSelection.vue';
   import sheep from '@/sheep';
@@ -208,7 +208,7 @@
 
   const addressState = ref({
     addressInfo: {}, // 选择的收货地址
-    deliveryType: 1, // 收货方式 1 - 快递配送；2 - 门店自提
+    deliveryType: 1, // 收货方式：1-快递配送，2-门店自提
     isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
     pickUpInfo: {}, // 选择的自提门店信息
     receiverName: '', // 收件人名称
@@ -226,7 +226,7 @@
 
   // 选择优惠券
   async function onSelectCoupon(couponId) {
-    state.orderPayload.couponId = couponId || 0;
+    state.orderPayload.couponId = couponId;
     await getOrderInfo();
     state.showCoupon = false;
   }
@@ -336,6 +336,14 @@
     await getOrderInfo();
     await getCoupons();
   });
+
+  // 使用 watch 监听地址和配送方式的变化
+  watch(addressState, async (newAddress, oldAddress) => {
+    // 如果收货地址或配送方式有变化，则重新计算价格
+    if (newAddress.addressInfo.id !== oldAddress.addressInfo.id || newAddress.deliveryType !== oldAddress.deliveryType) {
+      await getOrderInfo();
+    }
+  });
 </script>
 
 <style lang="scss" scoped>
diff --git a/sheep/components/s-coupon-select/s-coupon-select.vue b/sheep/components/s-coupon-select/s-coupon-select.vue
index 42d7e7f5..f77a250d 100644
--- a/sheep/components/s-coupon-select/s-coupon-select.vue
+++ b/sheep/components/s-coupon-select/s-coupon-select.vue
@@ -6,7 +6,7 @@
       <scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
         <!--可使用的优惠券区域-->
         <view class="subtitle ss-m-l-20">可使用优惠券</view>
-        <view v-for="(item, index) in state.couponInfo.filter(coupon => coupon.match)" :key="index">
+        <view v-for="(item, index) in state.couponInfo" :key="index">
           <s-coupon-list :data="item" type="user" :disabled="false">
             <template v-slot:reason>
               <view class="ss-flex ss-m-t-24">
@@ -64,13 +64,13 @@
 
   const state = reactive({
     couponInfo: computed(() => props.modelValue), // 优惠劵列表
-    couponId: 0, // 选中的优惠劵编号
+    couponId: undefined, // 选中的优惠劵编号
   });
 
   // 选中优惠劵
   function radioChange(couponId) {
     if (state.couponId === couponId) {
-      state.couponId = 0;
+      state.couponId = undefined;
     } else {
       state.couponId = couponId;
     }

From 53920d2efad91cf1d38790991a8307597dd96eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 22 Aug 2024 22:01:14 +0800
Subject: [PATCH 48/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BC=98=E6=83=A0=E5=88=B8=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-coupon-select/s-coupon-select.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sheep/components/s-coupon-select/s-coupon-select.vue b/sheep/components/s-coupon-select/s-coupon-select.vue
index f77a250d..ecca7762 100644
--- a/sheep/components/s-coupon-select/s-coupon-select.vue
+++ b/sheep/components/s-coupon-select/s-coupon-select.vue
@@ -6,7 +6,7 @@
       <scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
         <!--可使用的优惠券区域-->
         <view class="subtitle ss-m-l-20">可使用优惠券</view>
-        <view v-for="(item, index) in state.couponInfo" :key="index">
+        <view v-for="(item, index) in state.couponInfo.filter(coupon => coupon.match)" :key="index">
           <s-coupon-list :data="item" type="user" :disabled="false">
             <template v-slot:reason>
               <view class="ss-flex ss-m-t-24">

From 522591c48660b4da14d14bbd44c225cf21025f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 25 Aug 2024 14:06:33 +0800
Subject: [PATCH 49/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E9=A1=B6=E9=83=A8=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F=E8=A3=85=E4=BF=AE=E6=97=A0=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-custom-navbar/s-custom-navbar.vue       |  27 +-
 sheep/components/s-user-card/s-user-card.vue  | 309 +++++++++---------
 2 files changed, 173 insertions(+), 163 deletions(-)

diff --git a/sheep/components/s-custom-navbar/s-custom-navbar.vue b/sheep/components/s-custom-navbar/s-custom-navbar.vue
index d5f24182..62f6e218 100644
--- a/sheep/components/s-custom-navbar/s-custom-navbar.vue
+++ b/sheep/components/s-custom-navbar/s-custom-navbar.vue
@@ -44,9 +44,9 @@
    *
    * @property {Number | String}  alwaysShow = [0,1]			    - 是否常驻
    * @property {Number | String}  styleType = [inner]			   	- 是否沉浸式
-   * @property {String | Number} type 		 					- 标题背景模式
-   * @property {String} color 		 							- 页面背景色
-   * @property {String} src 		 								- 页面背景图片
+   * @property {String | Number} type              - 标题背景模式
+   * @property {String} color                  - 页面背景色
+   * @property {String} src                    - 页面背景图片
    */
   import { computed, unref } from 'vue';
   import sheep from '@/sheep';
@@ -77,7 +77,7 @@
   });
   const navList = computed(() => {
     // #ifdef MP
-    return props.data.mapCells || [];
+    return props.data.mpCells || [];
     // #endif
     return props.data.otherCells || [];
   });
@@ -117,11 +117,12 @@
   const bgStyles = computed(() => {
     return {
       background:
-          props.data.bgType === 'img' && props.data.bgImg
+        props.data.bgType === 'img' && props.data.bgImg
           ? `url(${sheep.$url.cdn(props.data.bgImg)}) no-repeat top center / 100% 100%`
-          : props.data.bgColor
+          : props.data.bgColor,
     };
   });
+
   // 左侧按钮：返回上一页或首页
   function onClickLeft() {
     if (hasHistory) {
@@ -130,6 +131,7 @@
       sheep.$router.go('/pages/index/index');
     }
   }
+
   // 右侧按钮：打开快捷菜单
   function onClickRight() {
     showMenuTools();
@@ -147,44 +149,53 @@
       top: 50%;
       transform: translateY(-50%);
     }
+
     .nav-icon {
       position: absolute;
       top: 50%;
       transform: translateY(-50%);
       left: 20rpx;
+
       .inner-icon-box {
         border: 1px solid rgba(#fff, 0.4);
         background: none !important;
       }
+
       .icon-box {
         background: #ffffff;
-        box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08),
-          0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
+        box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
         border-radius: 30rpx;
         width: 134rpx;
         height: 56rpx;
         margin-left: 8rpx;
+
         .line {
           width: 2rpx;
           height: 24rpx;
           background: #e5e5e7;
         }
+
         .sicon-back {
           font-size: 32rpx;
         }
+
         .sicon-home {
           font-size: 32rpx;
         }
+
         .sicon-more {
           font-size: 32rpx;
         }
+
         .icon-button {
           width: 67rpx;
           height: 56rpx;
+
           &-left:hover {
             background: rgba(0, 0, 0, 0.16);
             border-radius: 30rpx 0px 0px 30rpx;
           }
+
           &-right:hover {
             background: rgba(0, 0, 0, 0.16);
             border-radius: 0px 30rpx 30rpx 0px;
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index 920fd57d..754d5361 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -1,186 +1,185 @@
 <!-- 装修用户组件：用户卡片 -->
 <template>
-	<view class="ss-user-info-wrap ss-p-t-50" :style="[bgStyle, { marginLeft: `${data.space}px` }]">
-		<view class="ss-flex ss-col-center ss-row-between ss-m-b-20">
-			<view class="left-box ss-flex ss-col-center ss-m-l-36">
-				<view class="avatar-box ss-m-r-24">
-					<image class="avatar-img" :src="
+  <view class="ss-user-info-wrap ss-p-t-50" :style="[bgStyle, { marginLeft: `${data.space}px` }]">
+    <view class="ss-flex ss-col-center ss-row-between ss-m-b-20">
+      <view class="left-box ss-flex ss-col-center ss-m-l-36">
+        <view class="avatar-box ss-m-r-24">
+          <image class="avatar-img" :src="
               isLogin
                 ? sheep.$url.cdn(userInfo.avatar)
-                : sheep.$url.static('/static/img/shop/default_avatar.png')
-            " mode="aspectFill" @tap="sheep.$router.go('/pages/user/info')"></image>
-				</view>
-				<view>
-					<view class="nickname-box ss-flex ss-col-center">
-						<view class="nick-name ss-m-r-20">{{ userInfo?.nickname || nickname }}</view>
-					</view>
-				</view>
-			</view>
-			<view class="right-box ss-m-r-52">
-				<button class="ss-reset-button" @tap="showShareModal">
-					<text class="sicon-qrcode"></text>
-				</button>
-			</view>
-		</view>
+                : sheep.$url.static('/static/img/shop/default_avatar.png')"
+                 mode="aspectFill" @tap="sheep.$router.go('/pages/user/info')">
+          </image>
+        </view>
+        <view>
+          <view class="nickname-box ss-flex ss-col-center">
+            <view class="nick-name ss-m-r-20">{{ userInfo?.nickname || nickname }}</view>
+          </view>
+        </view>
+      </view>
+      <view class="right-box ss-m-r-52">
+        <button class="ss-reset-button" @tap="showShareModal">
+          <text class="sicon-qrcode"></text>
+        </button>
+      </view>
+    </view>
 
-		<!-- 提示绑定手机号 先隐藏 yudao 需要再修改 -->
-		<view
+    <!-- 提示绑定手机号 先隐藏 yudao 需要再修改 -->
+    <view
       class="bind-mobile-box ss-flex ss-row-between ss-col-center"
       v-if="isLogin && !userInfo.mobile"
     >
       <view class="ss-flex">
         <text class="cicon-mobile-o" />
-        <view class="mobile-title ss-m-l-20"> 点击绑定手机号确保账户安全 </view>
+        <view class="mobile-title ss-m-l-20"> 点击绑定手机号确保账户安全</view>
       </view>
       <button class="ss-reset-button bind-btn" @tap="onBind">去绑定</button>
     </view>
-	</view>
+  </view>
 </template>
 
 <script setup>
-	/**
-	 * 用户卡片
-	 *
-	 * @property {Number} leftSpace 									- 容器左间距
-	 * @property {Number} rightSpace 									- 容器右间距
-	 *
-	 * @property {String} avatar 					- 头像
-	 * @property {String} nickname 					- 昵称
-	 * @property {String} vip		  				- 等级
-	 * @property {String} collectNum 				- 收藏数
-	 * @property {String} likeNum 					- 点赞数
-	 *
-	 *
-	 */
-	import {
-		computed,
-		reactive
-	} from 'vue';
-	import sheep from '@/sheep';
-	import {
-		showShareModal,
-		showAuthModal
-	} from '@/sheep/hooks/useModal';
+  /**
+   * 用户卡片
+   *
+   * @property {Number} leftSpace                  - 容器左间距
+   * @property {Number} rightSpace                  - 容器右间距
+   *
+   * @property {String} avatar          - 头像
+   * @property {String} nickname          - 昵称
+   * @property {String} vip              - 等级
+   * @property {String} collectNum        - 收藏数
+   * @property {String} likeNum          - 点赞数
+   *
+   *
+   */
+  import { computed } from 'vue';
+  import sheep from '@/sheep';
+  import {
+    showShareModal,
+    showAuthModal,
+  } from '@/sheep/hooks/useModal';
 
-	// 用户信息
-	const userInfo = computed(() => sheep.$store('user').userInfo);
-	console.log('用户信息', userInfo)
+  // 用户信息
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+  console.log('用户信息', userInfo);
 
-	// 是否登录
-	const isLogin = computed(() => sheep.$store('user').isLogin);
-	// 接收参数
-	const props = defineProps({
-		// 装修数据
-		data: {
-		  type: Object,
-		  default: () => ({}),
-		},
-		// 装修样式
-		styles: {
-		  type: Object,
-		  default: () => ({}),
-		},
-		// 头像
-		avatar: {
-			type: String,
-			default: '',
-		},
-		nickname: {
-			type: String,
-			default: '请先登录',
-		},
-		vip: {
-			type: [String, Number],
-			default: '1',
-		},
-		collectNum: {
-			type: [String, Number],
-			default: '1',
-		},
-		likeNum: {
-			type: [String, Number],
-			default: '1',
-		},
-	});
-	
-	// 设置背景样式
-	const bgStyle = computed(() => {
-	  // 直接从 props.styles 解构
-	  const { bgType, bgImg, bgColor } = props.styles; 
-	
-	  // 根据 bgType 返回相应的样式
-	  return {
-		background: bgType === 'img'
-			? `url(${bgImg}) no-repeat top center / 100% 100%`
-			: bgColor
-		};
-	});
-	// 绑定手机号
-	function onBind() {
-		showAuthModal('changeMobile');
-	}
+  // 是否登录
+  const isLogin = computed(() => sheep.$store('user').isLogin);
+  // 接收参数
+  const props = defineProps({
+    // 装修数据
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+    // 装修样式
+    styles: {
+      type: Object,
+      default: () => ({}),
+    },
+    // 头像
+    avatar: {
+      type: String,
+      default: '',
+    },
+    nickname: {
+      type: String,
+      default: '请先登录',
+    },
+    vip: {
+      type: [String, Number],
+      default: '1',
+    },
+    collectNum: {
+      type: [String, Number],
+      default: '1',
+    },
+    likeNum: {
+      type: [String, Number],
+      default: '1',
+    },
+  });
+
+  // 设置背景样式
+  const bgStyle = computed(() => {
+    // 直接从 props.styles 解构
+    const { bgType, bgImg, bgColor } = props.styles;
+
+    // 根据 bgType 返回相应的样式
+    return {
+      background: bgType === 'img'
+        ? `url(${bgImg}) no-repeat top center / 100% 100%`
+        : bgColor,
+    };
+  });
+
+  // 绑定手机号
+  function onBind() {
+    showAuthModal('changeMobile');
+  }
 </script>
 
 <style lang="scss" scoped>
-	.ss-user-info-wrap {
-		box-sizing: border-box;
+  .ss-user-info-wrap {
+    box-sizing: border-box;
 
-		.avatar-box {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 50%;
-			overflow: hidden;
+    .avatar-box {
+      width: 100rpx;
+      height: 100rpx;
+      border-radius: 50%;
+      overflow: hidden;
 
-			.avatar-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
+      .avatar-img {
+        width: 100%;
+        height: 100%;
+      }
+    }
 
-		.nick-name {
-			font-size: 34rpx;
-			font-weight: 400;
-			color: #333333;
-			line-height: normal;
-		}
+    .nick-name {
+      font-size: 34rpx;
+      font-weight: 400;
+      color: #333333;
+      line-height: normal;
+    }
 
-		.vip-img {
-			width: 30rpx;
-			height: 30rpx;
-		}
+    .vip-img {
+      width: 30rpx;
+      height: 30rpx;
+    }
 
-		.sicon-qrcode {
-			font-size: 40rpx;
-		}
-	}
+    .sicon-qrcode {
+      font-size: 40rpx;
+    }
+  }
 
-	.bind-mobile-box {
-		width: 100%;
-		height: 84rpx;
-		padding: 0 34rpx 0 44rpx;
-		box-sizing: border-box;
-		background: #ffffff;
-		box-shadow: 0px -8rpx 9rpx 0px rgba(#e0e0e0, 0.3);
+  .bind-mobile-box {
+    width: 100%;
+    height: 84rpx;
+    padding: 0 34rpx 0 44rpx;
+    box-sizing: border-box;
+    background: #ffffff;
+    box-shadow: 0px -8rpx 9rpx 0px rgba(#e0e0e0, 0.3);
 
-		.cicon-mobile-o {
-			font-size: 30rpx;
-			color: #ff690d;
-		}
+    .cicon-mobile-o {
+      font-size: 30rpx;
+      color: #ff690d;
+    }
 
-		.mobile-title {
-			font-size: 24rpx;
-			font-weight: 500;
-			color: #ff690d;
-		}
+    .mobile-title {
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #ff690d;
+    }
 
-		.bind-btn {
-			width: 100rpx;
-			height: 50rpx;
-			background: #ff6100;
-			border-radius: 25rpx;
-			font-size: 24rpx;
-			font-weight: 500;
-			color: #ffffff;
-		}
-	}
+    .bind-btn {
+      width: 100rpx;
+      height: 50rpx;
+      background: #ff6100;
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #ffffff;
+    }
+  }
 </style>
\ No newline at end of file

From 75c5203c904d222b93d2d2ae49a9677fcfea2443 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 25 Aug 2024 14:33:27 +0800
Subject: [PATCH 50/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E3=80=91=E5=95=86=E5=9F=8E=E7=9A=84=20todo=20?=
 =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/app/sign.vue                                    | 4 ++--
 pages/commission/goods.vue                            | 2 +-
 pages/coupon/detail.vue                               | 2 +-
 pages/coupon/list.vue                                 | 1 -
 pages/goods/comment/add.vue                           | 4 ++--
 pages/goods/components/detail/detail-activity-tip.vue | 3 ---
 pages/goods/index.vue                                 | 3 +--
 pages/order/confirm.vue                               | 4 ++--
 pages/order/express/log.vue                           | 4 ++--
 pages/pay/result.vue                                  | 1 -
 pages/public/faq.vue                                  | 2 +-
 pages/user/address/list.vue                           | 1 -
 pages/user/wallet/score.vue                           | 2 +-
 13 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/pages/app/sign.vue b/pages/app/sign.vue
index cb87bbe8..cf299d3c 100644
--- a/pages/app/sign.vue
+++ b/pages/app/sign.vue
@@ -62,7 +62,7 @@
         </view>
       </view>
 
-      <!-- 签到说明 TODO @科举：这里改成【已累计签到】 -->
+      <!-- 签到说明 TODO @芋艿：【签到】这里改成【已累计签到】；改版，接入 sheepjs  -->
       <view class="bg-white ss-m-t-16 ss-p-t-30 ss-p-b-60 ss-p-x-40">
         <view class="activity-title ss-m-b-30">签到说明</view>
         <view class="activity-des">1、已累计签到{{state.signInfo.totalDay}}天</view>
@@ -110,7 +110,7 @@
     signInfo: {}, // 签到信息
 
     signConfigList: [], // 签到配置列表
-    maxDay: 0, // 最大的签到天数 
+    maxDay: 0, // 最大的签到天数
 
     showModel: false, // 签到弹框
     signResult: {}, // 签到结果
diff --git a/pages/commission/goods.vue b/pages/commission/goods.vue
index b9df293a..4a3d9eba 100644
--- a/pages/commission/goods.vue
+++ b/pages/commission/goods.vue
@@ -76,7 +76,7 @@
     shareInfo: {},
   });
 
-  // TODO 芋艿：分享的接入
+  // TODO @puhui999：【分享】接入
   function onShareGoods(goodsInfo) {
     state.shareInfo = $share.getShareInfo(
       {
diff --git a/pages/coupon/detail.vue b/pages/coupon/detail.vue
index 6ebaa854..65496eaa 100644
--- a/pages/coupon/detail.vue
+++ b/pages/coupon/detail.vue
@@ -57,7 +57,7 @@
               <view>优惠券类型</view>
               <view>{{ state.coupon.discountType === 1 ? '满减券' : '折扣券' }}</view>
             </view>
-            <!-- TODO 芋艿：可优化，增加优惠劵的描述 -->
+            <!-- TODO 芋艿：【优惠劵】可优化，增加优惠劵的描述 -->
             <uni-collapse>
               <uni-collapse-item title="优惠券说明" v-if="state.coupon.description">
                 <view class="content ss-p-b-20">
diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
index 08addbd0..a8055f36 100644
--- a/pages/coupon/list.vue
+++ b/pages/coupon/list.vue
@@ -107,7 +107,6 @@
     },
   ];
 
-  // TODO yunai:
   function onTabsChange(e) {
     state.currentTab = e.index;
     state.type = e.value;
diff --git a/pages/goods/comment/add.vue b/pages/goods/comment/add.vue
index 43d08c44..912d424c 100644
--- a/pages/goods/comment/add.vue
+++ b/pages/goods/comment/add.vue
@@ -30,7 +30,7 @@
 							<uni-easyinput :inputBorder="false" type="textarea" maxlength="120" autoHeight
 								v-model="state.commentList[index].content"
 								placeholder="宝贝满足你的期待吗？说说你的使用心得，分享给想买的他们吧~" />
-              <!-- TODO 芋艿：文件上传 -->
+              <!-- TODO 卢越：【评论】文件上传 -->
 							<view class="img-box">
 								<s-uploader v-model:url="state.commentList[index].images" fileMediatype="image"
 									limit="9" mode="grid" :imageStyles="{ width: '168rpx', height: '168rpx' }" />
@@ -40,7 +40,7 @@
 				</view>
 			</view>
 		</view>
-    <!-- TODO 芋艿：是否匿名 -->
+    <!-- TODO 卢越：【评论】是否匿名 -->
 
 		<su-fixed bottom placeholder>
 			<view class="foot_box ss-flex ss-row-center ss-col-center">
diff --git a/pages/goods/components/detail/detail-activity-tip.vue b/pages/goods/components/detail/detail-activity-tip.vue
index 5d74c08e..84244539 100644
--- a/pages/goods/components/detail/detail-activity-tip.vue
+++ b/pages/goods/components/detail/detail-activity-tip.vue
@@ -2,7 +2,6 @@
   <su-fixed bottom placeholder :val="44">
     <view>
       <view v-for="activity in props.activityList" :key="activity.id">
-        <!-- TODO 芋艿：拼团 -->
         <view
           class="activity-box ss-p-x-38 ss-flex ss-row-between ss-col-center"
           :class="activity.type === 1 ? 'seckill-box' : 'groupon-box'"
@@ -14,7 +13,6 @@
                 :src="sheep.$url.static('/static/img/shop/goods/seckill-icon.png')"
                 class="activity-icon"
               />
-              <!-- TODO 芋艿：拼团 -->
               <image
                 v-else-if="activity.type === 3"
                 :src="sheep.$url.static('/static/img/shop/goods/groupon-icon.png')"
@@ -33,7 +31,6 @@
 <script setup>
   import sheep from '@/sheep';
 
-  // TODO 芋艿：这里要迁移下；
   const seckillBg = sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png');
   const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
 
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index dc3f73aa..5d4d7a1f 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -182,7 +182,6 @@
     }, 1000);
 	}
 
-	//  TODO 芋艿：待测试
 	const shareInfo = computed(() => {
 		if (isEmpty(state.goodsInfo)) return {};
 		return sheep.$platform.share.getShareInfo({
@@ -251,7 +250,7 @@
           state.activityList.push(activity);
         } else if (activity.type === 5) { // 情况二：满减送
           state.activityInfo.push(activity);
-        } else { // 情况三：限时折扣 TODO 芋艿
+        } else { // 情况三：限时折扣 TODO puhui999：【折扣】
           console.log('待实现！优先级不高');
         }
       })
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 2ab6998f..b18df4f7 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -122,7 +122,7 @@
         >
           <view class="item-title">活动优惠</view>
           <view class="ss-flex ss-col-center">
-            <!--                @tap="state.showDiscount = true" TODO 芋艿：后续要把优惠信息打进去 -->
+            <!--                @tap="state.showDiscount = true" TODO puhui999：【折扣】后续要把优惠信息打进去 -->
             <text class="item-value text-red">
               -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
             </text>
@@ -158,7 +158,7 @@
       @close="state.showCoupon = false"
     />
 
-    <!-- 满额折扣弹框 TODO 芋艿：后续要把优惠信息打进去 -->
+    <!-- 满额折扣弹框 TODO @puhui999：【折扣】后续要把优惠信息打进去 -->
     <s-discount-list
       v-model="state.orderInfo"
       :show="state.showDiscount"
diff --git a/pages/order/express/log.vue b/pages/order/express/log.vue
index 0292dbf3..eb992a58 100644
--- a/pages/order/express/log.vue
+++ b/pages/order/express/log.vue
@@ -12,7 +12,7 @@
           </swiper>
         </uni-swiper-dot>
         <view class="log-card-msg">
-          <!-- TODO 芋艿：优化点：展示状态 -->
+          <!-- TODO 芋艿：【物流】优化点：展示状态 -->
 <!--          <view class="ss-flex ss-m-b-8">-->
 <!--            <view>物流状态：</view>-->
 <!--            <view class="warning-color">{{ state.info.status_text }}</view>-->
@@ -34,7 +34,7 @@
             <view v-if="state.tracks.length - 1 !== index" class="line" />
           </view>
           <view class="log-content-msg">
-            <!-- TODO 芋艿：优化点：展示状态 -->
+            <!-- TODO 芋艿：【物流】优化点：展示状态 -->
 <!--            <view class="log-msg-title ss-m-b-20">-->
 <!--              {{ item.status_text }}-->
 <!--            </view>-->
diff --git a/pages/pay/result.vue b/pages/pay/result.vue
index 49a65f4f..53e72b3d 100644
--- a/pages/pay/result.vue
+++ b/pages/pay/result.vue
@@ -39,7 +39,6 @@
         <button class="check-btn ss-reset-button" v-if="payResult === 'success'" @tap="onOrder">
           查看订单
         </button>
-        <!-- TODO 芋艿：拼团接入 -->
         <button
           class="check-btn ss-reset-button"
           v-if="payResult === 'success' && state.tradeOrder.type === 3"
diff --git a/pages/public/faq.vue b/pages/public/faq.vue
index af811c90..ebfeaf85 100644
--- a/pages/public/faq.vue
+++ b/pages/public/faq.vue
@@ -49,7 +49,7 @@
     }
   }
   onLoad(() => {
-    // TODO 芋艿：目前简单做，使用营销文章，作为 faq
+    // TODO 芋艿：【文章】目前简单做，使用营销文章，作为 faq
     if (true) {
       sheep.$router.go('/pages/public/richtext', {
         title: '常见问题',
diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue
index f3bc6869..58b62147 100644
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@@ -64,7 +64,6 @@
   };
 
   // 导入微信地址
-  // TODO 芋艿：未测试
   function importWechatAddress() {
     let wechatAddress = {};
     // #ifdef MP
diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue
index be76de86..8e48b026 100644
--- a/pages/user/wallet/score.vue
+++ b/pages/user/wallet/score.vue
@@ -36,7 +36,7 @@
           </button>
         </uni-datetime-picker>
 
-        <!-- TODO 芋艿：优化 -->
+        <!-- TODO 芋艿：【钱包】可优化 -->
         <!--				<view class="total-box">-->
         <!--					<view class="ss-m-b-10">总收入￥{{ state.pagination.income }}</view>-->
         <!--					<view>总支出￥{{ -state.pagination.expense }}</view>-->

From 2c4ad9f78a0d5ee3aedfdf467b410c3e40f8e2df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 25 Aug 2024 19:42:04 +0800
Subject: [PATCH 51/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=9C=8D=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E5=88=97=E8=A1=A8=E9=A1=B5=E7=82=B9=E5=87=BB=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=8D=A1=E7=89=87=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/chat/components/messageListItem.vue | 65 ++++++++++++-----------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/pages/chat/components/messageListItem.vue b/pages/chat/components/messageListItem.vue
index 0634878b..06a718de 100644
--- a/pages/chat/components/messageListItem.vue
+++ b/pages/chat/components/messageListItem.vue
@@ -4,12 +4,20 @@
     <view class="message-item ss-flex-col scroll-item">
       <view class="ss-flex ss-row-center ss-col-center">
         <!-- 日期 -->
-        <view v-if="message.contentType !== KeFuMessageContentTypeEnum.SYSTEM && showTime(message, messageIndex)"
-              class="date-message">
+        <view
+          v-if="
+            message.contentType !== KeFuMessageContentTypeEnum.SYSTEM &&
+            showTime(message, messageIndex)
+          "
+          class="date-message"
+        >
           {{ formatDate(message.createTime) }}
         </view>
         <!-- 系统消息 -->
-        <view v-if="message.contentType === KeFuMessageContentTypeEnum.SYSTEM" class="system-message">
+        <view
+          v-if="message.contentType === KeFuMessageContentTypeEnum.SYSTEM"
+          class="system-message"
+        >
           {{ message.content }}
         </view>
       </view>
@@ -18,32 +26,35 @@
         v-if="message.contentType !== KeFuMessageContentTypeEnum.SYSTEM"
         class="ss-flex ss-col-top"
         :class="[
-              message.senderType === UserTypeEnum.ADMIN
-                ? `ss-row-left`
-                : message.senderType === UserTypeEnum.MEMBER
-                ? `ss-row-right`
-                : '',
-            ]"
+          message.senderType === UserTypeEnum.ADMIN
+            ? `ss-row-left`
+            : message.senderType === UserTypeEnum.MEMBER
+            ? `ss-row-right`
+            : '',
+        ]"
       >
         <!-- 客服头像 -->
         <image
           v-show="message.senderType === UserTypeEnum.ADMIN"
           class="chat-avatar ss-m-r-24"
           :src="
-                sheep.$url.cdn(message.senderAvatar) ||
-                sheep.$url.static('/static/img/shop/chat/default.png')
-              "
+            sheep.$url.cdn(message.senderAvatar) ||
+            sheep.$url.static('/static/img/shop/chat/default.png')
+          "
           mode="aspectFill"
         ></image>
         <!-- 内容 -->
         <template v-if="message.contentType === KeFuMessageContentTypeEnum.TEXT">
-          <view class="message-box" :class="{'admin': message.senderType === UserTypeEnum.ADMIN}">
+          <view class="message-box" :class="{ admin: message.senderType === UserTypeEnum.ADMIN }">
             <mp-html :content="replaceEmoji(message.content)" />
           </view>
         </template>
         <template v-if="message.contentType === KeFuMessageContentTypeEnum.IMAGE">
-          <view class="message-box" :class="{'admin': message.senderType === UserTypeEnum.ADMIN}"
-                :style="{ width: '200rpx' }">
+          <view
+            class="message-box"
+            :class="{ admin: message.senderType === UserTypeEnum.ADMIN }"
+            :style="{ width: '200rpx' }"
+          >
             <su-image
               class="message-img"
               isPreview
@@ -59,29 +70,23 @@
         <template v-if="message.contentType === KeFuMessageContentTypeEnum.PRODUCT">
           <GoodsItem
             :goodsData="getMessageContent(message)"
-            @tap="
-                    sheep.$router.go('/pages/goods/index', {
-                      id: getMessageContent(message).id,
-                    })
-                  "
+            @tap="sheep.$router.go('/pages/goods/index', { id: getMessageContent(message).spuId })"
           />
         </template>
         <template v-if="message.contentType === KeFuMessageContentTypeEnum.ORDER">
           <OrderItem
             :orderData="getMessageContent(message)"
-            @tap="
-                  sheep.$router.go('/pages/order/detail', {
-                    id: getMessageContent(message).id,
-                  })
-                "
+            @tap="sheep.$router.go('/pages/order/detail', { id: getMessageContent(message).id })"
           />
         </template>
         <!-- user头像 -->
         <image
           v-if="message.senderType === UserTypeEnum.MEMBER"
           class="chat-avatar ss-m-l-24"
-          :src="sheep.$url.cdn(message.senderAvatar) ||
-                sheep.$url.static('/static/img/shop/chat/default.png')"
+          :src="
+            sheep.$url.cdn(message.senderAvatar) ||
+            sheep.$url.static('/static/img/shop/chat/default.png')
+          "
           mode="aspectFill"
         >
         </image>
@@ -104,7 +109,7 @@
     // 消息
     message: {
       type: Object,
-      default: ()=>({}),
+      default: () => ({}),
     },
     // 消息索引
     messageIndex: {
@@ -112,10 +117,10 @@
       default: 0,
     },
     // 消息列表
-    messageList:{
+    messageList: {
       type: Array,
       default: () => [],
-    }
+    },
   });
   const getMessageContent = computed(() => (item) => JSON.parse(item.content)); // 解析消息内容
 

From 1bff364d3835c7acb06dc9fb088ee766c660b6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 26 Aug 2024 16:56:48 +0800
Subject: [PATCH 52/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=95=86=E5=9F=8E=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=84=E8=AE=BA=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/comment/add.vue  | 47 +++++++++++++++++++++++++++++++-----
 pages/goods/comment/list.vue |  1 +
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/pages/goods/comment/add.vue b/pages/goods/comment/add.vue
index 912d424c..f1e7b68e 100644
--- a/pages/goods/comment/add.vue
+++ b/pages/goods/comment/add.vue
@@ -33,15 +33,21 @@
               <!-- TODO 卢越：【评论】文件上传 -->
 							<view class="img-box">
 								<s-uploader v-model:url="state.commentList[index].images" fileMediatype="image"
-									limit="9" mode="grid" :imageStyles="{ width: '168rpx', height: '168rpx' }" />
+									limit="9" mode="grid" :imageStyles="{ width: '168rpx', height: '168rpx' }" @success="(payload) => uploadSuccess(payload, index)" />
 							</view>
 						</view>
+            <view class="checkbox-container">
+              <checkbox-group @change="(event) => toggleAnonymous(index, event)">
+                <label>
+                  <checkbox value="anonymousChecked" />
+                  匿名评论
+                </label>
+              </checkbox-group>
+            </view>
 					</view>
 				</view>
 			</view>
 		</view>
-    <!-- TODO 卢越：【评论】是否匿名 -->
-
 		<su-fixed bottom placeholder>
 			<view class="foot_box ss-flex ss-row-center ss-col-center">
 				<button class="ss-reset-button post-btn ui-BG-Main-Gradient ui-Shadow-Main" @tap="onSubmit">
@@ -55,7 +61,7 @@
 <script setup>
 	import sheep from '@/sheep';
 	import { onLoad } from '@dcloudio/uni-app';
-	import { reactive } from 'vue';
+  import { reactive, ref } from 'vue';
   import OrderApi from '@/sheep/api/trade/order';
 
 	const state = reactive({
@@ -64,14 +70,39 @@
 		id: null
 	});
 
-	async function onSubmit() {
+  /**
+   * 切换是否匿名
+   *
+   * @param commentIndex  当前评论下标
+   * @param event 复选框事件
+   */
+  function toggleAnonymous(commentIndex, event) {
+    state.commentList[commentIndex].anonymous = event.detail.value[0] === 'anonymousChecked';
+  }
+
+  /**
+   * 发布评论
+   *
+   * @returns {Promise<void>}
+   */
+  async function onSubmit() {
     // 顺序提交评论
     for (const comment of state.commentList) {
       await OrderApi.createOrderItemComment(comment);
     }
     // 都评论好，返回
     sheep.$router.back();
-	}
+  }
+
+  /**
+   * 图片添加到表单
+   *
+   * @param payload 上传成功后的回调数据
+   * @param commentIndex  当前评论的下标
+   */
+  function uploadSuccess(payload, commentIndex) {
+    state.commentList[commentIndex].picUrls = state.commentList[commentIndex].images;
+  }
 
 	onLoad(async (options) => {
     if (!options.id) {
@@ -135,6 +166,10 @@
 		}
 	}
 
+  .checkbox-container{
+    padding: 10rpx;
+  }
+
 	.post-btn {
 		width: 690rpx;
 		line-height: 80rpx;
diff --git a/pages/goods/comment/list.vue b/pages/goods/comment/list.vue
index 8d4184e7..3113b653 100644
--- a/pages/goods/comment/list.vue
+++ b/pages/goods/comment/list.vue
@@ -16,6 +16,7 @@
     <s-empty v-if="state.pagination.total === 0" text="暂无数据" icon="/static/data-empty.png" />
     <!-- 下拉 -->
     <uni-load-more
+      icon-type="auto"
       v-if="state.pagination.total > 0"
       :status="state.loadStatus"
       :content-text="{

From 4fef5c5f0e2d6bf0e9ada5ecb8ce075cf17bdae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 26 Aug 2024 17:00:29 +0800
Subject: [PATCH 53/84] =?UTF-8?q?=E6=B8=85=E7=90=86TODO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/comment/add.vue  | 196 ++++++++++++++++++-----------------
 pages/goods/comment/list.vue |   2 +-
 2 files changed, 104 insertions(+), 94 deletions(-)

diff --git a/pages/goods/comment/add.vue b/pages/goods/comment/add.vue
index f1e7b68e..bfbc8001 100644
--- a/pages/goods/comment/add.vue
+++ b/pages/goods/comment/add.vue
@@ -1,41 +1,51 @@
 <!-- 评价  -->
 <template>
-	<s-layout title="评价">
-		<view>
-			<view v-for="(item, index) in state.orderInfo.items" :key="item.id">
-				<view>
-					<view class="commont-from-wrap">
-						<!-- 评价商品 -->
-						<s-goods-item
+  <s-layout title="评价">
+    <view>
+      <view v-for="(item, index) in state.orderInfo.items" :key="item.id">
+        <view>
+          <view class="commont-from-wrap">
+            <!-- 评价商品 -->
+            <s-goods-item
               :img="item.picUrl"
               :title="item.spuName"
               :skuText="item.properties.map((property) => property.valueName).join(' ')"
-							:price="item.payPrice"
+              :price="item.payPrice"
               :num="item.count"
             />
-					</view>
+          </view>
 
-					<view class="form-item">
-						<!-- 评分 -->
-						<view class="star-box ss-flex ss-col-center">
-							<view class="star-title ss-m-r-40">商品质量</view>
-							<uni-rate v-model="state.commentList[index].descriptionScores" />
-						</view>
-						<view class="star-box ss-flex ss-col-center">
-							<view class="star-title ss-m-r-40">服务态度</view>
-							<uni-rate v-model="state.commentList[index].benefitScores" />
-						</view>
-						<!-- 评价 -->
-						<view class="area-box">
-							<uni-easyinput :inputBorder="false" type="textarea" maxlength="120" autoHeight
-								v-model="state.commentList[index].content"
-								placeholder="宝贝满足你的期待吗？说说你的使用心得，分享给想买的他们吧~" />
-              <!-- TODO 卢越：【评论】文件上传 -->
-							<view class="img-box">
-								<s-uploader v-model:url="state.commentList[index].images" fileMediatype="image"
-									limit="9" mode="grid" :imageStyles="{ width: '168rpx', height: '168rpx' }" @success="(payload) => uploadSuccess(payload, index)" />
-							</view>
-						</view>
+          <view class="form-item">
+            <!-- 评分 -->
+            <view class="star-box ss-flex ss-col-center">
+              <view class="star-title ss-m-r-40">商品质量</view>
+              <uni-rate v-model="state.commentList[index].descriptionScores" />
+            </view>
+            <view class="star-box ss-flex ss-col-center">
+              <view class="star-title ss-m-r-40">服务态度</view>
+              <uni-rate v-model="state.commentList[index].benefitScores" />
+            </view>
+            <!-- 评价 -->
+            <view class="area-box">
+              <uni-easyinput
+                :inputBorder="false"
+                type="textarea"
+                maxlength="120"
+                autoHeight
+                v-model="state.commentList[index].content"
+                placeholder="宝贝满足你的期待吗？说说你的使用心得，分享给想买的他们吧~"
+              />
+              <view class="img-box">
+                <s-uploader
+                  v-model:url="state.commentList[index].images"
+                  fileMediatype="image"
+                  limit="9"
+                  mode="grid"
+                  :imageStyles="{ width: '168rpx', height: '168rpx' }"
+                  @success="(payload) => uploadSuccess(payload, index)"
+                />
+              </view>
+            </view>
             <view class="checkbox-container">
               <checkbox-group @change="(event) => toggleAnonymous(index, event)">
                 <label>
@@ -44,31 +54,31 @@
                 </label>
               </checkbox-group>
             </view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<su-fixed bottom placeholder>
-			<view class="foot_box ss-flex ss-row-center ss-col-center">
-				<button class="ss-reset-button post-btn ui-BG-Main-Gradient ui-Shadow-Main" @tap="onSubmit">
-					发布
-				</button>
-			</view>
-		</su-fixed>
-	</s-layout>
+          </view>
+        </view>
+      </view>
+    </view>
+    <su-fixed bottom placeholder>
+      <view class="foot_box ss-flex ss-row-center ss-col-center">
+        <button class="ss-reset-button post-btn ui-BG-Main-Gradient ui-Shadow-Main" @tap="onSubmit">
+          发布
+        </button>
+      </view>
+    </su-fixed>
+  </s-layout>
 </template>
 
 <script setup>
-	import sheep from '@/sheep';
-	import { onLoad } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
   import { reactive, ref } from 'vue';
   import OrderApi from '@/sheep/api/trade/order';
 
-	const state = reactive({
-		orderInfo: {},
-		commentList: [],
-		id: null
-	});
+  const state = reactive({
+    orderInfo: {},
+    commentList: [],
+    id: null,
+  });
 
   /**
    * 切换是否匿名
@@ -104,17 +114,17 @@
     state.commentList[commentIndex].picUrls = state.commentList[commentIndex].images;
   }
 
-	onLoad(async (options) => {
+  onLoad(async (options) => {
     if (!options.id) {
       sheep.$helper.toast(`缺少订单信息，请检查`);
-      return
+      return;
     }
-		state.id = options.id;
+    state.id = options.id;
 
-		const { code, data } = await OrderApi.getOrder(state.id);
+    const { code, data } = await OrderApi.getOrder(state.id);
     if (code !== 0) {
       sheep.$helper.toast('无待评价订单');
-      return
+      return;
     }
     // 处理评论
     data.items.forEach((item) => {
@@ -124,57 +134,57 @@
         descriptionScores: 5,
         benefitScores: 5,
         content: '',
-        picUrls: []
+        picUrls: [],
       });
     });
     state.orderInfo = data;
-	});
+  });
 </script>
 
 <style lang="scss" scoped>
-	// 评价商品
-	.goods-card {
-		margin: 10rpx 0;
-		padding: 20rpx;
-		background: #fff;
-	}
+  // 评价商品
+  .goods-card {
+    margin: 10rpx 0;
+    padding: 20rpx;
+    background: #fff;
+  }
 
-	// 评论，选择图片
-	.form-item {
-		background: #fff;
+  // 评论，选择图片
+  .form-item {
+    background: #fff;
 
-		.star-box {
-			height: 100rpx;
-			padding: 0 25rpx;
-		}
+    .star-box {
+      height: 100rpx;
+      padding: 0 25rpx;
+    }
 
-		.star-title {
-			font-weight: 600;
-		}
-	}
+    .star-title {
+      font-weight: 600;
+    }
+  }
 
-	.area-box {
-		width: 690rpx;
-		min-height: 306rpx;
-		background: rgba(249, 250, 251, 1);
-		border-radius: 20rpx;
-		padding: 28rpx;
-		margin: auto;
+  .area-box {
+    width: 690rpx;
+    min-height: 306rpx;
+    background: rgba(249, 250, 251, 1);
+    border-radius: 20rpx;
+    padding: 28rpx;
+    margin: auto;
 
-		.img-box {
-			margin-top: 20rpx;
-		}
-	}
+    .img-box {
+      margin-top: 20rpx;
+    }
+  }
 
-  .checkbox-container{
+  .checkbox-container {
     padding: 10rpx;
   }
 
-	.post-btn {
-		width: 690rpx;
-		line-height: 80rpx;
-		border-radius: 40rpx;
-		color: rgba(#fff, 0.9);
-		margin-bottom: 20rpx;
-	}
-</style>
\ No newline at end of file
+  .post-btn {
+    width: 690rpx;
+    line-height: 80rpx;
+    border-radius: 40rpx;
+    color: rgba(#fff, 0.9);
+    margin-bottom: 20rpx;
+  }
+</style>
diff --git a/pages/goods/comment/list.vue b/pages/goods/comment/list.vue
index 3113b653..ed43e1b7 100644
--- a/pages/goods/comment/list.vue
+++ b/pages/goods/comment/list.vue
@@ -1,6 +1,6 @@
 <!-- 商品评论的分页 -->
 <template>
-  <s-layout title="全部评价">
+  <s-layout title="全部评论">
     <su-tabs
       :list="state.type"
       :scrollable="false"

From 5e6adced128172ff456db0fcf45367ab26a7eb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 26 Aug 2024 17:44:37 +0800
Subject: [PATCH 54/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E7=A7=92?=
 =?UTF-8?q?=E6=9D=80=E4=B8=8D=E9=80=89=E6=8B=A9=E8=A7=84=E6=A0=BC=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=BA=93=E5=AD=98=E4=B8=8D=E8=B6=B3=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-select-seckill-sku/s-select-seckill-sku.vue           | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
index e8273884..99b28a50 100644
--- a/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
+++ b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
@@ -5,7 +5,7 @@
     <!-- SKU 信息 -->
     <view class="ss-modal-box bg-white ss-flex-col">
       <view class="modal-header ss-flex ss-col-center">
-        <!-- 规格图 -->
+        <!-- 规格图片 -->
         <view class="header-left ss-m-r-30">
           <image
             class="sku-image"
@@ -125,10 +125,6 @@
     return skuPrices;
   });
 
-  if (!state.goodsInfo.is_sku) {
-    state.selectedSku = state.goodsInfo.skus[0];
-  }
-
   watch(
     () => state.selectedSku,
     (newVal) => {

From 89e86b84fe338159bc22f6d8f28bb9957fe3da0b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 31 Aug 2024 09:06:47 +0800
Subject: [PATCH 55/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=8A=B5=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/coupon/detail.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/coupon/detail.vue b/pages/coupon/detail.vue
index 65496eaa..53cc4352 100644
--- a/pages/coupon/detail.vue
+++ b/pages/coupon/detail.vue
@@ -57,7 +57,6 @@
               <view>优惠券类型</view>
               <view>{{ state.coupon.discountType === 1 ? '满减券' : '折扣券' }}</view>
             </view>
-            <!-- TODO 芋艿：【优惠劵】可优化，增加优惠劵的描述 -->
             <uni-collapse>
               <uni-collapse-item title="优惠券说明" v-if="state.coupon.description">
                 <view class="content ss-p-b-20">

From b1d6e1d6874594a1044821eaf452c30df3f15b55 Mon Sep 17 00:00:00 2001
From: PonyHu <3697820@qq.com>
Date: Sun, 1 Sep 2024 17:37:26 +0800
Subject: [PATCH 56/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=9C=A8=E7=BA=BF=E5=AE=A2=E6=9C=8D=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E7=AA=97=E4=BD=93=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E7=9A=84=E9=AB=98=E5=BA=A6=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=85=B6?=
 =?UTF-8?q?=E8=A2=AB=E9=A1=B5=E9=9D=A2=E9=A1=B6=E9=83=A8=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=A0=8F=E9=81=AE=E4=BD=8F=E4=BA=86=E4=B8=80=E5=B0=8F=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=EF=BC=9B=20=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=9C=A8=E7=BA=BF=E5=AE=A2=E6=9C=8D=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=94=B6=E5=88=B0=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=8F=91?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=E6=9C=80=E6=96=B0=E6=B6=88=E6=81=AF=EF=BC=88?=
 =?UTF-8?q?=E8=A2=AB=E5=88=A4=E6=96=AD=E4=B8=BA=E9=87=8D=E7=BD=AE=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E4=BA=86=EF=BC=89=EF=BC=9B=20?=
 =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E3=80=91=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E5=AE=A2=E6=9C=8D=E4=B8=8D=E9=9C=80=E8=A6=81=E5=9C=A8?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E5=88=B0=E5=BA=95=E9=83=A8=E6=97=B6=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=EF=BC=8C=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E6=B2=A1=E6=9C=89=E5=BF=85=E8=A6=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/chat/components/messageList.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/chat/components/messageList.vue b/pages/chat/components/messageList.vue
index d08fd838..95a19e9e 100644
--- a/pages/chat/components/messageList.vue
+++ b/pages/chat/components/messageList.vue
@@ -7,7 +7,7 @@
             @scrolltoupper="onScrollToUpper" @query="queryList">
     <template #top>
       <!-- 撑一下顶部导航 -->
-      <view style="height: 45px"></view>
+      <view :style="{ height: sys_navBar + 'px' }"></view>
     </template>
     <!-- style="transform: scaleY(-1)"必须写，否则会导致列表倒置！！！ -->
     <!-- 注意不要直接在chat-item组件标签上设置style，因为在微信小程序中是无效的，请包一层view -->
@@ -33,7 +33,9 @@
   import { reactive, ref } from 'vue';
   import KeFuApi from '@/sheep/api/promotion/kefu';
   import { isEmpty } from '@/sheep/helper/utils';
-
+  import sheep from '@/sheep';
+  
+  const sys_navBar = sheep.$platform.navbar;
   const messageList = ref([]); // 消息列表
   const showNewMessageTip = ref(false); // 显示有新消息提示
   const backToTopStyle = reactive({
@@ -67,7 +69,7 @@
   };
   /** 刷新消息列表 */
   const refreshMessageList = (message = undefined) => {
-    if (queryParams.pageNo != 1 && message !== undefined) {
+    if (message !== undefined) {
       showNewMessageTip.value = true;
       // 追加数据
       pagingRef.value.addChatRecordData([message], false);
@@ -87,8 +89,6 @@
       return;
     }
     showNewMessageTip.value = false;
-    // 到底重置消息列表
-    refreshMessageList();
   };
   defineExpose({ getMessageList, refreshMessageList });
 </script>

From 7268659193a92efcb5b721333cc9d53e4a86fe3b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 3 Sep 2024 10:18:30 +0800
Subject: [PATCH 57/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E6=8B=BC=E5=9B=A2=E7=9A=84=E5=8D=95=E4=B9=B0?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/groupon.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index ae333cfb..503d9c98 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -265,7 +265,7 @@
     state.goodsId = spu.id;
     // 默认显示最低价
     activity.products.forEach((product) => {
-      spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
+      state.activity.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
     });
     // 价格、库存使用活动的
     spu.skus.forEach((sku) => {

From 36289d526cb6030260db9741fce7dbdfa75ab843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Tue, 3 Sep 2024 15:36:18 +0800
Subject: [PATCH 58/84] =?UTF-8?q?=E3=80=90=E7=BB=BC=E5=90=88=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E6=94=B9=E9=80=A0=E6=8B=BC=E5=9B=A2=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=EF=BC=88=E4=BB=8D=E9=9C=80=E4=BC=98=E5=8C=96=EF=BC=89?=
 =?UTF-8?q?=EF=BC=9B=E5=A4=84=E7=90=86=E6=97=A0=E6=B3=95=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=88=B0=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |   7 +-
 pages/user/goods_details_store/index.vue      |   6 +-
 sheep/api/promotion/combination.js            |  11 +
 .../components/s-goods-card/s-goods-card.vue  |  15 +-
 .../s-goods-column/s-goods-column.vue         |  63 ++-
 .../s-groupon-block/s-groupon-block.vue       | 449 ++++++++++++------
 .../components/s-live-block/s-live-block.vue  |   4 +-
 sheep/helper/index.js                         |   2 +-
 sheep/platform/share.js                       |   3 +-
 9 files changed, 366 insertions(+), 194 deletions(-)

diff --git a/manifest.json b/manifest.json
index 4732b6d3..ac575dbe 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
   "appid": "__UNI__460BC4C",
   "description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
   "versionName": "2.1.0",
-  "versionCode": 183,
+  "versionCode": "183",
   "transformPx": false,
   "app-plus": {
     "usingComponents": true,
@@ -188,7 +188,8 @@
     "setting": {
       "urlCheck": false,
       "minified": true,
-      "postcss": true
+      "postcss": false,
+      "es6": false
     },
     "optimization": {
       "subPackages": true
@@ -236,4 +237,4 @@
   "_spaceID": "192b4892-5452-4e1d-9f09-eee1ece40639",
   "locale": "zh-Hans",
   "fallbackLocale": "zh-Hans"
-}
+}
\ No newline at end of file
diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
index 07b68508..92ef2d0b 100644
--- a/pages/user/goods_details_store/index.vue
+++ b/pages/user/goods_details_store/index.vue
@@ -75,7 +75,6 @@
     const jsWxSdk = sheep.$platform.useProvider('wechat').jsWxSdk;
     if (jsWxSdk.isWechat()) {
       jsWxSdk.getLocation((res) => {
-        console.log(res);
         state.user_latitude = res.latitude;
         state.user_longitude = res.longitude;
         uni.setStorageSync(LATITUDE, res.latitude);
@@ -92,7 +91,8 @@
             state.user_longitude = res.longitude;
             uni.setStorageSync(LATITUDE, res.latitude);
             uni.setStorageSync(LONGITUDE, res.longitude);
-          } catch {
+          } catch (e) {
+            console.error(e);
           }
           getList();
         },
@@ -172,7 +172,7 @@
       state.user_latitude = uni.getStorageSync(LATITUDE);
       state.user_longitude = uni.getStorageSync(LONGITUDE);
     } catch (e) {
-      // error
+      console.error(e)
     }
   });
 </script>
diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
index 44f61e9d..49931102 100644
--- a/sheep/api/promotion/combination.js
+++ b/sheep/api/promotion/combination.js
@@ -31,6 +31,17 @@ const CombinationApi = {
     });
   },
 
+  // 获得拼团活动明细列表
+  getCombinationActivityDetailList: (combinationActivityIds) => {
+    return request({
+      url: '/promotion/combination-activity/get-detail-list',
+      method: 'GET',
+      params: {
+        combinationActivityIds
+      },
+    });
+  },
+
   // 获得最近 n 条拼团记录（团长发起的）
   getHeadCombinationRecordList: (activityId, status, count) => {
     return request({
diff --git a/sheep/components/s-goods-card/s-goods-card.vue b/sheep/components/s-goods-card/s-goods-card.vue
index 59f2bf10..21df6ad1 100644
--- a/sheep/components/s-goods-card/s-goods-card.vue
+++ b/sheep/components/s-goods-card/s-goods-card.vue
@@ -147,7 +147,7 @@
     TWO_COL: 'twoCol',
     // 单列小图
     ONE_COL_SMALL_IMG: 'oneColSmallImg',
-  }
+  };
 
   const state = reactive({
     goodsList: [],
@@ -157,16 +157,16 @@
   const props = defineProps({
     data: {
       type: Object,
-      default() {},
+      default: () => ({})
     },
     styles: {
       type: Object,
-      default() {},
+      default: () => ({})
     },
   });
 
-  const { layoutType, btnBuy, spuIds } = props.data ?? {};
-  const { marginLeft, marginRight } = props.styles ?? {};
+  const { layoutType, btnBuy, spuIds } = props.data || {};
+  const { marginLeft, marginRight } = props.styles || {};
 
   // 购买按钮样式
   const buyStyle = computed(() => {
@@ -215,6 +215,7 @@
     // 计数
     count++;
   }
+
   //endregion
 
   /**
@@ -232,7 +233,7 @@
     // 加载商品列表
     state.goodsList = await getGoodsListByIds(spuIds.join(','));
     // 只有双列布局时需要
-    if (layoutType === LayoutTypeEnum.TWO_COL){
+    if (layoutType === LayoutTypeEnum.TWO_COL) {
       // 分列
       calculateGoodsColumn();
     }
@@ -247,11 +248,13 @@
   .goods-list-box {
     width: 50%;
     box-sizing: border-box;
+
     .left-list {
       &:nth-last-child(1) {
         margin-bottom: 0 !important;
       }
     }
+
     .right-list {
       &:nth-last-child(1) {
         margin-bottom: 0 !important;
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 228c64e1..7e81a16e 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -155,7 +155,7 @@
       <view v-if="tagStyle.show" class="tag-icon-box">
         <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
       </view>
-      <view v-if="seckillTag" class="seckill-tag ss-flex ss-row-center"> 秒杀 </view>
+      <view v-if="seckillTag" class="seckill-tag ss-flex ss-row-center">秒杀</view>
       <view v-if="grouponTag" class="groupon-tag ss-flex ss-row-center">
         <view class="tag-icon">拼团</view>
       </view>
@@ -285,9 +285,9 @@
         </view>
       </view>
 
-      <slot name="cart"
-        ><view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view></slot
-      >
+      <slot name="cart">
+        <view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view>
+      </slot>
     </view>
   </view>
 </template>
@@ -297,35 +297,34 @@
    * 商品卡片
    *
    * @property {Array} size = [xs | sm | md | lg | sl ] 			 	- 列表数据
-   * @property {String} tag 											- md及以上才有
-   * @property {String} img 											- 图片
-   * @property {String} background 									- 背景色
-   * @property {String} topRadius 									- 上圆角
-   * @property {String} bottomRadius 									- 下圆角
-   * @property {String} title 										- 标题
-   * @property {String} titleColor 									- 标题颜色
+   * @property {String} tag                      - md及以上才有
+   * @property {String} img                      - 图片
+   * @property {String} background                  - 背景色
+   * @property {String} topRadius                  - 上圆角
+   * @property {String} bottomRadius                  - 下圆角
+   * @property {String} title                    - 标题
+   * @property {String} titleColor                  - 标题颜色
    * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
-   * @property {String} subTitle 										- 副标题
-   * @property {String} subTitleColor									- 副标题颜色
-   * @property {String} subTitleBackground 							- 副标题背景
-   * @property {String | Number} price 								- 价格
-   * @property {String} priceColor 									- 价格颜色
-   * @property {String | Number} originPrice 							- 原价/划线价
-   * @property {String} originPriceColor 								- 原价颜色
-   * @property {String | Number} sales 								- 销售数量
-   * @property {String} salesColor									- 销售数量颜色
+   * @property {String} subTitle                    - 副标题
+   * @property {String} subTitleColor                  - 副标题颜色
+   * @property {String} subTitleBackground              - 副标题背景
+   * @property {String | Number} price                - 价格
+   * @property {String} priceColor                  - 价格颜色
+   * @property {String | Number} originPrice              - 原价/划线价
+   * @property {String} originPriceColor                - 原价颜色
+   * @property {String | Number} sales                - 销售数量
+   * @property {String} salesColor                  - 销售数量颜色
    *
    * @slots activity												 	- 活动插槽
    * @slots cart														- 购物车插槽，默认包含文字，背景色，文字颜色 || 图片 || 行为
    *
-   * @event {Function()} click 										- 点击卡片
+   * @event {Function()} click                    - 点击卡片
    *
    */
   import { computed, reactive, getCurrentInstance, onMounted, nextTick } from 'vue';
   import sheep from '@/sheep';
   import { fen2yuan, formatSales } from '@/sheep/hooks/useGoods';
   import { formatStock } from '@/sheep/hooks/useGoods';
-  import goodsCollectVue from '@/pages/user/goods-collect.vue';
   import { isArray } from 'lodash-es';
 
   // 数据
@@ -354,11 +353,11 @@
     },
     tagStyle: {
       type: Object,
-      default: {},
+      default: () => ({}),
     },
     data: {
       type: Object,
-      default: {},
+      default: () => ({}),
     },
     size: {
       type: String,
@@ -451,6 +450,7 @@
   // 获取卡片实时高度
   const { proxy } = getCurrentInstance();
   const elId = `sheep_${Math.ceil(Math.random() * 10e5).toString(36)}`;
+
   function getGoodsPriceCardWH() {
     if (props.size === 'md') {
       const view = uni.createSelectorQuery().in(proxy);
@@ -469,6 +469,7 @@
       });
     }
   }
+
   onMounted(() => {
     nextTick(() => {
       getGoodsPriceCardWH();
@@ -482,11 +483,13 @@
     left: 0;
     top: 0;
     z-index: 2;
+
     .tag-icon {
       width: 72rpx;
       height: 44rpx;
     }
   }
+
   .seckill-tag {
     position: absolute;
     left: 0;
@@ -501,6 +504,7 @@
     color: #ffffff;
     line-height: 32rpx;
   }
+
   .groupon-tag {
     position: absolute;
     left: 0;
@@ -515,14 +519,17 @@
     color: #ffffff;
     line-height: 32rpx;
   }
+
   .goods-img {
     width: 100%;
     height: 100%;
     background-color: #f5f5f5;
   }
+
   .price-unit {
     margin-right: -4px;
   }
+
   .sales-text {
     display: table;
     font-size: 24rpx;
@@ -586,10 +593,12 @@
       width: 100%;
       height: 208rpx;
     }
+
     .sm-goods-content {
       padding: 20rpx 16rpx;
       box-sizing: border-box;
     }
+
     .sm-goods-title {
       font-size: 26rpx;
       color: #333;
@@ -619,6 +628,7 @@
       color: #333;
       width: 100%;
     }
+
     .md-goods-subtitle {
       font-size: 24rpx;
       font-weight: 400;
@@ -669,6 +679,7 @@
       // line-height: 36rpx;
       // width: 410rpx;
     }
+
     .lg-goods-subtitle {
       font-size: 24rpx;
       font-weight: 400;
@@ -695,6 +706,7 @@
       font-size: 24rpx;
       color: #ffffff;
     }
+
     .tag-box {
       width: 100%;
     }
@@ -708,10 +720,12 @@
     z-index: 1;
     width: 100%;
     background-color: $white;
+
     .sl-goods-content {
       padding: 20rpx 20rpx;
       box-sizing: border-box;
     }
+
     .sl-img-box {
       width: 100%;
       height: 360rpx;
@@ -722,6 +736,7 @@
       color: #333;
       font-weight: 500;
     }
+
     .sl-goods-subtitle {
       font-size: 24rpx;
       font-weight: 400;
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index d7e6fcf5..be3e6508 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -1,171 +1,312 @@
-<!-- 装修组件 - 拼团 -->
+<!-- 装修商品组件：商品卡片 -->
 <template>
-	<view>
-		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap" :style="[{ margin: '-' + data.space + 'rpx' }]">
-			<view v-for="product in productList" class="goods-card-box" :key="product.id" :style="[{padding: data.space + 'rpx',},]">
-				<s-goods-column
-					class="goods-card"
-					size="sm"
-					:goodsFields="goodsFields"
-					:tagStyle="badge"
-					:data="product"
-					:titleColor="data.fields.name?.color"
-					:topRadius="data.borderRadiusTop"
-					:bottomRadius="data.borderRadiusBottom"
-					@click="sheep.$router.go('/pages/goods/groupon', { id: props.data.activityId, })">
-				</s-goods-column>
-			</view>
-		</view>
-		<!-- 样式2 一行一个 图片左 文案右 -->
-		<view class="goods-box" v-if="layoutType === 'oneCol'">
-			<view class="goods-list" v-for="(product, index) in productList" :key="index" :style="[{ marginBottom: space + 'px' }]">
-				<s-goods-column
-					class="goods-card" size="lg"
-					:grouponTag="true"
-					:goodsFields="goodsFields"
-					:tagStyle="badge"
-					:data="product"
-					:titleColor="data.fields.name?.color"
-					:subTitleColor="data.fields.introduction?.color"
-					:topRadius="data.borderRadiusTop"
-					:bottomRadius="data.borderRadiusBottom"
-					@click="sheep.$router.go('/pages/goods/groupon', { id: props.data.activityId, })">
-					<template v-slot:cart>
-						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
-							{{ btnBuy?.type === 'text' ? btnBuy.text : '去拼团' }}
-						</button>
-					</template>
-				</s-goods-column>
-			</view>
-		</view>
-	</view>
+  <!-- 商品卡片 -->
+  <view>
+    <!-- 布局1. 单列大图（上图，下内容）-->
+    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.spuList.length" class="goods-sl-box">
+      <view
+        class="goods-box"
+        v-for="item in state.spuList"
+        :key="item.id"
+        :style="[{ marginBottom: data.space * 2 + 'rpx' }]"
+      >
+        <s-goods-column
+          class=""
+          size="sl"
+          :goodsFields="data.fields"
+          :tagStyle="data.badge"
+          :data="item"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+        >
+          <!-- 购买按钮 -->
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+            </button>
+          </template>
+        </s-goods-column>
+      </view>
+    </view>
+
+    <!-- 布局2. 双列（每一列：上图，下内容）-->
+    <view
+      v-if="layoutType === LayoutTypeEnum.TWO_COL && state.spuList.length"
+      class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
+    >
+      <view class="goods-list-box">
+        <view
+          class="left-list"
+          :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+          v-for="item in state.leftSpuList"
+          :key="item.id"
+        >
+          <s-goods-column
+            class="goods-md-box"
+            size="md"
+            :goodsFields="data.fields"
+            :tagStyle="data.badge"
+            :data="item"
+            :titleColor="data.fields.name?.color"
+            :subTitleColor="data.fields.introduction.color"
+            :topRadius="data.borderRadiusTop"
+            :bottomRadius="data.borderRadiusBottom"
+            :titleWidth="330 - marginLeft - marginRight"
+            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            @getHeight="calculateGoodsColumn($event, 'left')"
+          >
+            <!-- 购买按钮 -->
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+              </button>
+            </template>
+          </s-goods-column>
+        </view>
+      </view>
+      <view class="goods-list-box">
+        <view
+          class="right-list"
+          :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+          v-for="item in state.rightSpuList"
+          :key="item.id"
+        >
+          <s-goods-column
+            class="goods-md-box"
+            size="md"
+            :goodsFields="data.fields"
+            :tagStyle="data.badge"
+            :data="item"
+            :titleColor="data.fields.name?.color"
+            :subTitleColor="data.fields.introduction.color"
+            :topRadius="data.borderRadiusTop"
+            :bottomRadius="data.borderRadiusBottom"
+            :titleWidth="330 - marginLeft - marginRight"
+            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            @getHeight="calculateGoodsColumn($event, 'right')"
+          >
+            <!-- 购买按钮 -->
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+              </button>
+            </template>
+          </s-goods-column>
+        </view>
+      </view>
+    </view>
+
+    <!-- 布局3. 单列小图（左图，右内容） -->
+    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length" class="goods-lg-box">
+      <view
+        class="goods-box"
+        :style="[{ marginBottom: data.space + 'px' }]"
+        v-for="item in state.spuList"
+        :key="item.id"
+      >
+        <s-goods-column
+          class="goods-card"
+          size="lg"
+          :goodsFields="data.fields"
+          :data="item"
+          :tagStyle="data.badge"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @tap="sheep.$router.go('/pages/goods/index', { id: item.id })"
+        >
+          <!-- 购买按钮 -->
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+            </button>
+          </template>
+        </s-goods-column>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	/**
-	 * 拼团
-	 */
-	import {
-		computed,
-		onMounted,
-		reactive,
-		ref
-	} from 'vue';
-	import sheep from '@/sheep';
-	import SpuApi from "@/sheep/api/product/spu";
-	import CombinationApi from "@/sheep/api/promotion/combination";
+  /**
+   * 商品卡片
+   */
+  import {
+    computed,
+    onMounted,
+    reactive,
+    ref,
+  } from 'vue';
+  import sheep from '@/sheep';
+  import CombinationApi from '@/sheep/api/promotion/combination';
+  import SpuApi from '@/sheep/api/product/spu';
 
-	// 接收参数
-	const props = defineProps({
-		// 装修数据
-		data: {
-			type: Object,
-			default: () => ({}),
-		},
-		// 装修样式
-		styles: {
-			type: Object,
-			default: () => ({}),
-		},
-	});
-	
-	// 设置相关信息是否显示
-	const goodsFields = reactive({
-	  // 商品价格
-	  price: { show: true },
-	  // 库存
-	  stock: { show: true },
-	  // 商品名称
-	  name: { show: true },
-	  // 商品介绍
-	  introduction: { show: true },
-	  // 市场价
-	  marketPrice: { show: true },
-	  // 销量
-	  salesCount: { show: true },
-	});
+  // 布局类型
+  const LayoutTypeEnum = {
+    // 单列大图
+    ONE_COL_BIG_IMG: 'oneColBigImg',
+    // 双列
+    TWO_COL: 'twoCol',
+    // 单列小图
+    ONE_COL_SMALL_IMG: 'oneColSmallImg',
+  };
 
-	let {
-		layoutType,
-		badge,
-		btnBuy,
-		space,
-	} = props.data;
-	let {
-		marginLeft,
-		marginRight
-	} = props.styles;
+  const state = reactive({
+    spuList: [],
+    leftSpuList: [],
+    rightSpuList: [],
+  });
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {
+      },
+    },
+    styles: {
+      type: Object,
+      default() {
+      },
+    },
+  });
 
-	// 购买按钮样式（暂未实现）
-	const buyStyle = computed(() => {
-		let btnBuy = props.data.btnBuy;
-		if (btnBuy?.type === 'text') {
-			return {
-				background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
-			};
-		}
+  const { layoutType, btnBuy, activityIds } = props.data || {};
+  const { marginLeft, marginRight } = props.styles || {};
 
-		if (btnBuy?.type === 'img') {
-			return {
-				width: '54rpx',
-				height: '54rpx',
-				background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
-				backgroundSize: '100% 100%',
-			};
-		}
-	});
+  // 购买按钮样式
+  const buyStyle = computed(() => {
+    if (btnBuy.type === 'text') {
+      // 文字按钮：线性渐变背景颜色
+      return {
+        background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
+      };
+    }
+    if (btnBuy.type === 'img') {
+      // 图片按钮
+      return {
+        width: '54rpx',
+        height: '54rpx',
+        background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
+        backgroundSize: '100% 100%',
+      };
+    }
+  });
 
-	const productList = ref([]);
-	onMounted(async () => {
-		// todo：@owen 与Yudao结构不一致，待重构
-		const {
-			data: activity
-		} = await CombinationApi.getCombinationActivity(props.data.activityId);
-		const {
-			data: spu
-		} = await SpuApi.getSpuDetail(activity.spuId)
-		// 循环活动信息，赋值拼团最低价格
-		activity.products.forEach((product) => {
-			spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
-		});
-		productList.value = [spu];
-	});
+  //region 商品瀑布流布局
+  // 下一个要处理的商品索引
+  let count = 0;
+  // 左列的高度
+  let leftHeight = 0;
+  // 右列的高度
+  let rightHeight = 0;
+
+  /**
+   * 计算商品在左列还是右列
+   * @param height 商品的高度
+   * @param where 添加到哪一列
+   */
+  function calculateGoodsColumn(height = 0, where = 'left') {
+    // 处理完
+    if (!state.spuList[count]) return;
+    // 增加列的高度
+    if (where === 'left') leftHeight += height;
+    if (where === 'right') rightHeight += height;
+    // 添加到矮的一列
+    if (leftHeight <= rightHeight) {
+      state.leftSpuList.push(state.spuList[count]);
+    } else {
+      state.rightSpuList.push(state.spuList[count]);
+    }
+    // 计数
+    count++;
+  }
+
+  //endregion
+
+  /**
+   * 根据商品编号列表，获取商品列表
+   * @param ids 商品编号列表
+   * @return {Promise<undefined>} 商品列表
+   */
+  async function getCombinationActivityDetailList(ids) {
+    const { data } = await CombinationApi.getCombinationActivityDetailList(ids);
+    return data;
+  }
+
+  /**
+   * 根据商品编号，获取商品详情
+   * @param ids 商品编号列表
+   * @return {Promise<undefined>} 商品列表
+   */
+  async function getSpuDetail(spuId) {
+    const { data: spu } = await SpuApi.getSpuDetail(spuId)
+    return spu;
+  }
+
+
+  // 初始化
+  onMounted(async () => {
+    // 加载商品列表
+    const activityList = await getCombinationActivityDetailList(activityIds.join(','));
+    // 创建 SPU 请求的 Promise 数组
+    const spuPromises = activityList.map(activity => getSpuDetail(activity.spuId));
+    // 等待所有 SPU 请求完成
+    // 处理 spuList
+    state.spuList = await Promise.all(spuPromises);
+
+    // 只有双列布局时需要
+    if (layoutType === LayoutTypeEnum.TWO_COL) {
+      // 分列
+      calculateGoodsColumn();
+    }
+  });
 </script>
 
 <style lang="scss" scoped>
-	.goods-list {
-		position: relative;
+  .goods-md-wrap {
+    width: 100%;
+  }
 
-		.cart-btn {
-			position: absolute;
-			bottom: 10rpx;
-			right: 20rpx;
-			z-index: 11;
-			height: 50rpx;
-			line-height: 50rpx;
-			padding: 0 20rpx;
-			border-radius: 25rpx;
-			font-size: 24rpx;
-			color: #fff;
-			background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
-		}
-	}
+  .goods-list-box {
+    width: 50%;
+    box-sizing: border-box;
+    .left-list {
+      &:nth-last-child(1) {
+        margin-bottom: 0 !important;
+      }
+    }
+    .right-list {
+      &:nth-last-child(1) {
+        margin-bottom: 0 !important;
+      }
+    }
+  }
 
-	.goods-list {
-		&:nth-last-of-type(1) {
-			margin-bottom: 0 !important;
-		}
-	}
+  .goods-box {
+    &:nth-last-of-type(1) {
+      margin-bottom: 0 !important;
+    }
+  }
 
-	.goods-sm-box {
-		margin: 0 auto;
-		box-sizing: border-box;
+  .goods-md-box,
+  .goods-sl-box,
+  .goods-lg-box {
+    position: relative;
 
-		.goods-card-box {
-			flex-shrink: 0;
-			overflow: hidden;
-			width: 33.3%;
-			box-sizing: border-box;
-		}
-	}
+    .cart-btn {
+      position: absolute;
+      bottom: 18rpx;
+      right: 20rpx;
+      z-index: 11;
+      height: 50rpx;
+      line-height: 50rpx;
+      padding: 0 20rpx;
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      color: #fff;
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/sheep/components/s-live-block/s-live-block.vue b/sheep/components/s-live-block/s-live-block.vue
index 9d1ad032..6e0b6c95 100644
--- a/sheep/components/s-live-block/s-live-block.vue
+++ b/sheep/components/s-live-block/s-live-block.vue
@@ -70,8 +70,8 @@
       default() {},
     },
   });
-  const { mode, goodsFields, mpliveIds } = props.data ?? {};
-  const { marginLeft, marginRight } = props.styles ?? {};
+  const { mode, goodsFields, mpliveIds } = props.data || {};
+  const { marginLeft, marginRight } = props.styles || {};
 
   async function getLiveListByIds(ids) {
     const { data } = await sheep.$api.app.mplive.getRoomList(ids);
diff --git a/sheep/helper/index.js b/sheep/helper/index.js
index 38e6afeb..59272f5d 100644
--- a/sheep/helper/index.js
+++ b/sheep/helper/index.js
@@ -621,7 +621,7 @@ function setProperty(obj, key, value) {
 function page() {
   const pages = getCurrentPages();
   // 某些特殊情况下(比如页面进行redirectTo时的一些时机)，pages可能为空数组
-  return `/${pages[pages.length - 1]?.route ?? ''}`;
+  return `/${pages[pages.length - 1]?.route || ''}`;
 }
 
 /**
diff --git a/sheep/platform/share.js b/sheep/platform/share.js
index 9ab2a3a6..53fe1968 100644
--- a/sheep/platform/share.js
+++ b/sheep/platform/share.js
@@ -186,7 +186,8 @@ const bindBrokerageUser = async (val= undefined) => {
     }
     await BrokerageApi.bindBrokerageUser({ bindUserId: shareId });
     uni.removeStorageSync('shareId');
-  } catch {
+  } catch (e) {
+    console.error(e);
   }
 };
 

From ed3d370de25d134f4a5df804785568be6543337f Mon Sep 17 00:00:00 2001
From: heyho <heywsk@qq.com>
Date: Wed, 4 Sep 2024 09:14:33 +0000
Subject: [PATCH 59/84] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E3=80=91=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: heyho <heywsk@qq.com>
---
 sheep/api/system/dict.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 sheep/api/system/dict.js

diff --git a/sheep/api/system/dict.js b/sheep/api/system/dict.js
new file mode 100644
index 00000000..9ee4ca68
--- /dev/null
+++ b/sheep/api/system/dict.js
@@ -0,0 +1,16 @@
+import request from '@/sheep/request';
+
+const DictApi = {
+  // 根据字典类型查询字典数据信息
+  getDictDataListByType: (type) => {
+    return request({
+      url: `/system/dict-data/type`,
+      method: 'GET',
+	  params: {
+	    type,
+	  },
+    });
+  },
+};
+
+export default DictApi;
\ No newline at end of file

From 9f33e44db097c9bb72f9a71489a1aaaf3b69fce3 Mon Sep 17 00:00:00 2001
From: heyho <heywsk@qq.com>
Date: Wed, 4 Sep 2024 09:22:18 +0000
Subject: [PATCH 60/84] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E9=93=B6=E8=A1=8C=E5=8D=A1?=
 =?UTF-8?q?=E6=8F=90=E7=8E=B0=EF=BC=8C=E9=93=B6=E8=A1=8C=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E3=80=82?=
 =?UTF-8?q?=20=E7=94=B1=E4=BA=8E=E5=90=8E=E7=AB=AF=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E9=93=B6=E8=A1=8C=E5=90=8D=E7=A7=B0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BC=9A=E7=94=B1=E9=85=8D=E7=BD=AE=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=A7=A3=E6=9E=90=EF=BC=8C=E6=89=80=E4=BB=A5?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E9=93=B6=E8=A1=8C=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=98=AF=E4=B8=8D=E8=83=BD=E8=AE=A9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E5=AD=97=E5=85=B8=E9=85=8D=E7=BD=AE=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8C=E9=80=89=E6=8B=A9=E3=80=82=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=9A=84=E5=80=BC=E6=98=AF=E9=93=B6=E8=A1=8C=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=AF=B9=E5=BA=94=E7=9A=84value=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: heyho <heywsk@qq.com>
---
 pages/commission/withdraw.vue | 49 ++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/pages/commission/withdraw.vue b/pages/commission/withdraw.vue
index 73f96904..f75e6ad1 100644
--- a/pages/commission/withdraw.vue
+++ b/pages/commission/withdraw.vue
@@ -98,12 +98,17 @@
         v-show="state.accountInfo.type === '2'"
       >
         <view class="unit" />
-        <uni-easyinput
-          :inputBorder="false"
-          class="ss-flex-1 ss-p-l-10"
-          v-model="state.accountInfo.bankName"
-          placeholder="请输入提现银行"
-        />
+        <!--银入输入改为下拉-->
+        <picker @change="bankChange" :value="state.accountInfo.bankName" :range="state.bankList" range-key="label" style="width:100%">
+			<uni-easyinput
+				:inputBorder="false"																   
+				:value="state.selectedBankName"
+				placeholder="请选择银行"
+				suffixIcon="right"
+				disabled
+				:styles="{disableColor:'#fff',borderColor:'#fff',color:'#333!important'}"
+				 />
+		</picker>
       </view>
       <!-- 开户地址 -->
       <view class="card-title" v-show="state.accountInfo.type === '2'">开户地址</view>
@@ -152,6 +157,7 @@
   import { fen2yuan } from '@/sheep/hooks/useGoods';
   import TradeConfigApi from '@/sheep/api/trade/config';
   import BrokerageApi from '@/sheep/api/trade/brokerage';
+  import DictApi from '@/sheep/api/system/dict';
 
   const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
@@ -176,6 +182,8 @@
     frozenDays: 0, // 冻结天数
     minPrice: 0, // 最低提现金额
     withdrawTypes: [], // 提现方式
+    bankList:[], //银行字典数据
+	selectedBankName:"",//选中的银行名称
   });
 
   // 打开提现方式的弹窗
@@ -245,9 +253,36 @@
     }
   }
 
+  //获取提现银行配置字典	
+  async function getDictDataListByType(){	   
+	  let { code, data } = await DictApi.getDictDataListByType('brokerage_bank_name');	  
+	  if (code !== 0) {
+	    return;
+	  } 
+	  if(data && data.length > 0) {
+		data.map(item=>{
+			item.text = item.label;
+		})
+	  	state.bankList = data;
+	  }
+  }
+
+  //银行下拉选择
+   function bankChange(e){
+	  console.log(e);
+	  let value = e.target.value;
+	  state.accountInfo.bankName = value;
+	  let curr = state.bankList?.filter(item=>{		 
+		  return item.value == value
+	  })[0];
+	  console.log(curr);
+	  state.selectedBankName = curr.label;
+  }
+
   onBeforeMount(() => {
     getWithdrawRules();
-    getBrokerageUser()
+    getBrokerageUser();
+    getDictDataListByType();//获取银行配置字典
   })
 </script>
 

From 089191e95d08f5018331eedb5e72a2d8359b8007 Mon Sep 17 00:00:00 2001
From: heyho <heywsk@qq.com>
Date: Wed, 4 Sep 2024 09:31:55 +0000
Subject: [PATCH 61/84] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E9=93=B6=E8=A1=8C=E5=8D=A1?=
 =?UTF-8?q?=E6=8F=90=E7=8E=B0=EF=BC=8C=E9=93=B6=E8=A1=8C=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E3=80=82?=
 =?UTF-8?q?=20=E7=94=B1=E4=BA=8E=E5=90=8E=E7=AB=AF=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E9=93=B6=E8=A1=8C=E5=90=8D=E7=A7=B0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BC=9A=E7=94=B1=E9=85=8D=E7=BD=AE=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=A7=A3=E6=9E=90=EF=BC=8C=E6=89=80=E4=BB=A5?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E9=93=B6=E8=A1=8C=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=98=AF=E4=B8=8D=E8=83=BD=E8=AE=A9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E5=AD=97=E5=85=B8=E9=85=8D=E7=BD=AE=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8C=E9=80=89=E6=8B=A9=E3=80=82=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=9A=84=E5=80=BC=E6=98=AF=E9=93=B6=E8=A1=8C=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=AF=B9=E5=BA=94=E7=9A=84value=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: heyho <heywsk@qq.com>
---
 pages/commission/withdraw.vue | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/pages/commission/withdraw.vue b/pages/commission/withdraw.vue
index f75e6ad1..7c721654 100644
--- a/pages/commission/withdraw.vue
+++ b/pages/commission/withdraw.vue
@@ -98,8 +98,14 @@
         v-show="state.accountInfo.type === '2'"
       >
         <view class="unit" />
-        <!--银入输入改为下拉-->
-        <picker @change="bankChange" :value="state.accountInfo.bankName" :range="state.bankList" range-key="label" style="width:100%">
+        <!-- <uni-easyinput
+          :inputBorder="false"
+          class="ss-flex-1 ss-p-l-10"
+          v-model="state.accountInfo.bankName"
+          placeholder="请输入提现银行"
+        /> -->
+		<!--银行改为下拉选择-->
+		<picker @change="bankChange" :value="state.accountInfo.bankName" :range="state.bankList" range-key="label" style="width:100%">
 			<uni-easyinput
 				:inputBorder="false"																   
 				:value="state.selectedBankName"
@@ -109,6 +115,7 @@
 				:styles="{disableColor:'#fff',borderColor:'#fff',color:'#333!important'}"
 				 />
 		</picker>
+	
       </view>
       <!-- 开户地址 -->
       <view class="card-title" v-show="state.accountInfo.type === '2'">开户地址</view>
@@ -182,19 +189,19 @@
     frozenDays: 0, // 冻结天数
     minPrice: 0, // 最低提现金额
     withdrawTypes: [], // 提现方式
-    bankList:[], //银行字典数据
-	selectedBankName:"",//选中的银行名称
+	bankList:[], //银行字典数据
+	selectedBankName:"",//选中的银行名称	
   });
 
   // 打开提现方式的弹窗
   const onAccountSelect = (e) => {
-    state.accountSelect = e;
+    state.accountSelect = e;	
   };
 
   // 提交提现
   const onConfirm = async () => {
     // 参数校验
-    debugger;
+    //debugger;
     if (
       !state.accountInfo.price ||
       state.accountInfo.price > state.brokerageInfo.price ||
@@ -241,7 +248,7 @@
     if (data) {
       state.minPrice = data.brokerageWithdrawMinPrice || 0;
       state.frozenDays = data.brokerageFrozenDays || 0;
-      state.withdrawTypes = data.brokerageWithdrawTypes;
+      state.withdrawTypes = data.brokerageWithdrawTypes;	
     }
   }
 
@@ -252,23 +259,19 @@
       state.brokerageInfo = data;
     }
   }
-
+  
   //获取提现银行配置字典	
   async function getDictDataListByType(){	   
 	  let { code, data } = await DictApi.getDictDataListByType('brokerage_bank_name');	  
 	  if (code !== 0) {
 	    return;
 	  } 
-	  if(data && data.length > 0) {
-		data.map(item=>{
-			item.text = item.label;
-		})
+	  if(data && data.length > 0) {		
 	  	state.bankList = data;
 	  }
   }
-
-  //银行下拉选择
-   function bankChange(e){
+  
+  function bankChange(e){
 	  console.log(e);
 	  let value = e.target.value;
 	  state.accountInfo.bankName = value;
@@ -282,7 +285,7 @@
   onBeforeMount(() => {
     getWithdrawRules();
     getBrokerageUser();
-    getDictDataListByType();//获取银行配置字典
+	getDictDataListByType();//获取银行字典数据
   })
 </script>
 

From 85441704cb5d7d81d1ead342375a88d094876f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Wed, 4 Sep 2024 23:01:16 +0800
Subject: [PATCH 62/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/api/promotion/combination.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
index 49931102..bf1d6c6a 100644
--- a/sheep/api/promotion/combination.js
+++ b/sheep/api/promotion/combination.js
@@ -32,12 +32,12 @@ const CombinationApi = {
   },
 
   // 获得拼团活动明细列表
-  getCombinationActivityDetailList: (combinationActivityIds) => {
+  getCombinationActivityDetailList: (ids) => {
     return request({
-      url: '/promotion/combination-activity/get-detail-list',
+      url: '/promotion/combination-activity/detail-list',
       method: 'GET',
       params: {
-        combinationActivityIds
+        ids,
       },
     });
   },
@@ -58,9 +58,9 @@ const CombinationApi = {
   // 获得我的拼团记录分页
   getCombinationRecordPage: (params) => {
     return request({
-      url: "/promotion/combination-record/page",
+      url: '/promotion/combination-record/page',
       method: 'GET',
-      params
+      params,
     });
   },
 

From b6dd2ae1ebbd18d400275a98ae2bc2fa91e1ea87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 5 Sep 2024 11:32:30 +0800
Subject: [PATCH 63/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=8B=BC=E5=9B=A2=E6=B4=BB=E5=8A=A8=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/api/promotion/combination.js            |  6 ++--
 .../s-groupon-block/s-groupon-block.vue       | 33 ++++++++++++++-----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
index bf1d6c6a..62791f07 100644
--- a/sheep/api/promotion/combination.js
+++ b/sheep/api/promotion/combination.js
@@ -37,7 +37,7 @@ const CombinationApi = {
       url: '/promotion/combination-activity/detail-list',
       method: 'GET',
       params: {
-        ids,
+        ids
       },
     });
   },
@@ -58,9 +58,9 @@ const CombinationApi = {
   // 获得我的拼团记录分页
   getCombinationRecordPage: (params) => {
     return request({
-      url: '/promotion/combination-record/page',
+      url: "/promotion/combination-record/page",
       method: 'GET',
-      params,
+      params
     });
   },
 
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index be3e6508..14f3204f 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -144,6 +144,7 @@
   import sheep from '@/sheep';
   import CombinationApi from '@/sheep/api/promotion/combination';
   import SpuApi from '@/sheep/api/product/spu';
+  import spu from '@/sheep/api/product/spu';
 
   // 布局类型
   const LayoutTypeEnum = {
@@ -241,21 +242,35 @@
    * @param ids 商品编号列表
    * @return {Promise<undefined>} 商品列表
    */
-  async function getSpuDetail(spuId) {
-    const { data: spu } = await SpuApi.getSpuDetail(spuId)
+  async function getSpuDetail(ids) {
+    const { data: spu } = await SpuApi.getSpuDetail(ids);
     return spu;
   }
 
 
   // 初始化
   onMounted(async () => {
-    // 加载商品列表
+    // 加载活动列表
     const activityList = await getCombinationActivityDetailList(activityIds.join(','));
-    // 创建 SPU 请求的 Promise 数组
-    const spuPromises = activityList.map(activity => getSpuDetail(activity.spuId));
-    // 等待所有 SPU 请求完成
-    // 处理 spuList
-    state.spuList = await Promise.all(spuPromises);
+    // 循环获取活动商品SPU详情并添加到spuList
+    for (const activity of activityList) {
+      state.spuList.push(await getSpuDetail(activity.spuId));
+    }
+
+
+    // 循环活动列表
+    activityList.forEach(activity => {
+      // 获取活动商品的最低价格
+      activity.products.forEach(product => {
+        const combinationPrice = product.combinationPrice || Infinity;
+
+        // 找到对应的 spu 并更新价格
+        const spu = state.spuList.find(spu => activity.spuId === spu.id);
+        if (spu) {
+          spu.price = Math.min(combinationPrice, spu.price || Infinity);
+        }
+      });
+    });
 
     // 只有双列布局时需要
     if (layoutType === LayoutTypeEnum.TWO_COL) {
@@ -273,11 +288,13 @@
   .goods-list-box {
     width: 50%;
     box-sizing: border-box;
+
     .left-list {
       &:nth-last-child(1) {
         margin-bottom: 0 !important;
       }
     }
+
     .right-list {
       &:nth-last-child(1) {
         margin-bottom: 0 !important;

From 75e7e58b8dbb7611009bed3d646f654e82f0f2a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 5 Sep 2024 12:40:53 +0800
Subject: [PATCH 64/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/goods_details_store/index.vue      | 19 +++++++----
 sheep/api/promotion/combination.js            |  6 ++--
 .../components/s-goods-card/s-goods-card.vue  | 14 +++++---
 .../s-groupon-block/s-groupon-block.vue       | 33 +++++++++----------
 sheep/platform/share.js                       |  2 +-
 5 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
index 92ef2d0b..3df0435d 100644
--- a/pages/user/goods_details_store/index.vue
+++ b/pages/user/goods_details_store/index.vue
@@ -1,7 +1,12 @@
 <template>
   <s-layout title="选择自提门店" :bgStyle="{ color: '#FFF' }">
     <view class="storeBox" ref="container">
-      <view class="storeBox-box" v-for="(item, index) in state.storeList" :key="index" @tap="checked(item)">
+      <view
+        class="storeBox-box"
+        v-for="(item, index) in state.storeList"
+        :key="index"
+        @tap="checked(item)"
+      >
         <view class="store-img">
           <image :src="item.logo" class="img" />
         </view>
@@ -33,7 +38,9 @@
             <!-- #endif -->
           </view>
           <view class="store-distance ss-flex ss-row-center" @tap.stop="showMaoLocation(item)">
-            <text class="addressTxt" v-if="item.distance">距离{{ item.distance.toFixed(2) }}千米</text>
+            <text class="addressTxt" v-if="item.distance"
+              >距离{{ item.distance.toFixed(2) }}千米</text
+            >
             <text class="addressTxt" v-else>查看地图</text>
             <view class="iconfont">
               <view class="ss-rest-button">
@@ -112,7 +119,7 @@
         latitude: Number(e.latitude),
         longitude: Number(e.longitude),
         name: e.name,
-        address: `${e.areaName}-${e.detailAddress}`
+        address: `${e.areaName}-${e.detailAddress}`,
       });
     } else {
       // #endif
@@ -121,7 +128,7 @@
         longitude: Number(e.longitude),
         name: e.name,
         address: `${e.areaName}-${e.detailAddress}`,
-        success: function() {
+        success: function () {
           console.log('success');
         },
       });
@@ -172,7 +179,7 @@
       state.user_latitude = uni.getStorageSync(LATITUDE);
       state.user_longitude = uni.getStorageSync(LONGITUDE);
     } catch (e) {
-      console.error(e)
+      console.error(e);
     }
   });
 </script>
@@ -180,7 +187,7 @@
   .line1 {
     overflow: hidden;
     text-overflow: ellipsis;
-    white-space: nowrap
+    white-space: nowrap;
   }
 
   .geoPage {
diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
index 62791f07..bf1d6c6a 100644
--- a/sheep/api/promotion/combination.js
+++ b/sheep/api/promotion/combination.js
@@ -37,7 +37,7 @@ const CombinationApi = {
       url: '/promotion/combination-activity/detail-list',
       method: 'GET',
       params: {
-        ids
+        ids,
       },
     });
   },
@@ -58,9 +58,9 @@ const CombinationApi = {
   // 获得我的拼团记录分页
   getCombinationRecordPage: (params) => {
     return request({
-      url: "/promotion/combination-record/page",
+      url: '/promotion/combination-record/page',
       method: 'GET',
-      params
+      params,
     });
   },
 
diff --git a/sheep/components/s-goods-card/s-goods-card.vue b/sheep/components/s-goods-card/s-goods-card.vue
index 21df6ad1..00339dda 100644
--- a/sheep/components/s-goods-card/s-goods-card.vue
+++ b/sheep/components/s-goods-card/s-goods-card.vue
@@ -3,7 +3,10 @@
   <!-- 商品卡片 -->
   <view>
     <!-- 布局1. 单列大图（上图，下内容）-->
-    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.goodsList.length" class="goods-sl-box">
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.goodsList.length"
+      class="goods-sl-box"
+    >
       <view
         class="goods-box"
         v-for="item in state.goodsList"
@@ -100,7 +103,10 @@
     </view>
 
     <!-- 布局3. 单列小图（左图，右内容） -->
-    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.goodsList.length" class="goods-lg-box">
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.goodsList.length"
+      class="goods-lg-box"
+    >
       <view
         class="goods-box"
         :style="[{ marginBottom: data.space + 'px' }]"
@@ -157,11 +163,11 @@
   const props = defineProps({
     data: {
       type: Object,
-      default: () => ({})
+      default: () => ({}),
     },
     styles: {
       type: Object,
-      default: () => ({})
+      default: () => ({}),
     },
   });
 
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 14f3204f..862b70f3 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -3,7 +3,10 @@
   <!-- 商品卡片 -->
   <view>
     <!-- 布局1. 单列大图（上图，下内容）-->
-    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.spuList.length" class="goods-sl-box">
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.spuList.length"
+      class="goods-sl-box"
+    >
       <view
         class="goods-box"
         v-for="item in state.spuList"
@@ -100,7 +103,10 @@
     </view>
 
     <!-- 布局3. 单列小图（左图，右内容） -->
-    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length" class="goods-lg-box">
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length"
+      class="goods-lg-box"
+    >
       <view
         class="goods-box"
         :style="[{ marginBottom: data.space + 'px' }]"
@@ -135,12 +141,7 @@
   /**
    * 商品卡片
    */
-  import {
-    computed,
-    onMounted,
-    reactive,
-    ref,
-  } from 'vue';
+  import { computed, onMounted, reactive, ref } from 'vue';
   import sheep from '@/sheep';
   import CombinationApi from '@/sheep/api/promotion/combination';
   import SpuApi from '@/sheep/api/product/spu';
@@ -164,13 +165,11 @@
   const props = defineProps({
     data: {
       type: Object,
-      default() {
-      },
+      default() {},
     },
     styles: {
       type: Object,
-      default() {
-      },
+      default() {},
     },
   });
 
@@ -247,7 +246,6 @@
     return spu;
   }
 
-
   // 初始化
   onMounted(async () => {
     // 加载活动列表
@@ -257,15 +255,14 @@
       state.spuList.push(await getSpuDetail(activity.spuId));
     }
 
-
     // 循环活动列表
-    activityList.forEach(activity => {
+    activityList.forEach((activity) => {
       // 获取活动商品的最低价格
-      activity.products.forEach(product => {
+      activity.products.forEach((product) => {
         const combinationPrice = product.combinationPrice || Infinity;
 
         // 找到对应的 spu 并更新价格
-        const spu = state.spuList.find(spu => activity.spuId === spu.id);
+        const spu = state.spuList.find((spu) => activity.spuId === spu.id);
         if (spu) {
           spu.price = Math.min(combinationPrice, spu.price || Infinity);
         }
@@ -326,4 +323,4 @@
       color: #fff;
     }
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/sheep/platform/share.js b/sheep/platform/share.js
index 53fe1968..d200f671 100644
--- a/sheep/platform/share.js
+++ b/sheep/platform/share.js
@@ -178,7 +178,7 @@ const decryptSpm = (spm) => {
 };
 
 // 绑定推广员
-const bindBrokerageUser = async (val= undefined) => {
+const bindBrokerageUser = async (val = undefined) => {
   try {
     const shareId = val || uni.getStorageSync('shareId');
     if (!shareId) {

From 82a82a4beddc587b7e2cbda1805b6f9427d204bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 5 Sep 2024 17:11:39 +0800
Subject: [PATCH 65/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/api/promotion/combination.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
index bf1d6c6a..3e2cee6b 100644
--- a/sheep/api/promotion/combination.js
+++ b/sheep/api/promotion/combination.js
@@ -34,7 +34,7 @@ const CombinationApi = {
   // 获得拼团活动明细列表
   getCombinationActivityDetailList: (ids) => {
     return request({
-      url: '/promotion/combination-activity/detail-list',
+      url: '/promotion/combination-activity/list-by-ids',
       method: 'GET',
       params: {
         ids,

From 81cd02bbee3fae59aa0ee6a988cc19cfec264fd7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 5 Sep 2024 20:08:48 +0800
Subject: [PATCH 66/84] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E9=93=B6=E8=A1=8C=E5=8D=A1?=
 =?UTF-8?q?=E6=8F=90=E7=8E=B0=EF=BC=8C=E9=93=B6=E8=A1=8C=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/commission/withdraw.vue      | 92 +++++++++++++++---------------
 sheep/api/promotion/combination.js |  8 ---
 sheep/api/system/dict.js           |  8 +--
 3 files changed, 49 insertions(+), 59 deletions(-)

diff --git a/pages/commission/withdraw.vue b/pages/commission/withdraw.vue
index 7c721654..4ce3ad40 100644
--- a/pages/commission/withdraw.vue
+++ b/pages/commission/withdraw.vue
@@ -15,7 +15,10 @@
         <view class="num-title">可提现金额（元）</view>
         <view class="wallet-num">{{ fen2yuan(state.brokerageInfo.brokeragePrice) }}</view>
       </view>
-      <button class="ss-reset-button log-btn" @tap="sheep.$router.go('/pages/commission/wallet', { type: 2 })">
+      <button
+        class="ss-reset-button log-btn"
+        @tap="sheep.$router.go('/pages/commission/wallet', { type: 2 })"
+      >
         提现记录
       </button>
     </view>
@@ -98,24 +101,23 @@
         v-show="state.accountInfo.type === '2'"
       >
         <view class="unit" />
-        <!-- <uni-easyinput
-          :inputBorder="false"
-          class="ss-flex-1 ss-p-l-10"
-          v-model="state.accountInfo.bankName"
-          placeholder="请输入提现银行"
-        /> -->
-		<!--银行改为下拉选择-->
-		<picker @change="bankChange" :value="state.accountInfo.bankName" :range="state.bankList" range-key="label" style="width:100%">
-			<uni-easyinput
-				:inputBorder="false"																   
-				:value="state.selectedBankName"
-				placeholder="请选择银行"
-				suffixIcon="right"
-				disabled
-				:styles="{disableColor:'#fff',borderColor:'#fff',color:'#333!important'}"
-				 />
-		</picker>
-	
+        <!--银行改为下拉选择-->
+        <picker
+          @change="bankChange"
+          :value="state.bankListSelectedIndex"
+          :range="state.bankList"
+          range-key="label"
+          style="width: 100%"
+        >
+          <uni-easyinput
+            :inputBorder="false"
+            :value="state.accountInfo.bankName"
+            placeholder="请选择银行"
+            suffixIcon="right"
+            disabled
+            :styles="{ disableColor: '#fff', borderColor: '#fff', color: '#333!important' }"
+          />
+        </picker>
       </view>
       <!-- 开户地址 -->
       <view class="card-title" v-show="state.accountInfo.type === '2'">开户地址</view>
@@ -189,13 +191,13 @@
     frozenDays: 0, // 冻结天数
     minPrice: 0, // 最低提现金额
     withdrawTypes: [], // 提现方式
-	bankList:[], //银行字典数据
-	selectedBankName:"",//选中的银行名称	
+    bankList: [], // 银行字典数据
+    bankListSelectedIndex: '', // 选中银行 bankList 的 index
   });
 
   // 打开提现方式的弹窗
   const onAccountSelect = (e) => {
-    state.accountSelect = e;	
+    state.accountSelect = e;
   };
 
   // 提交提现
@@ -230,12 +232,12 @@
       confirmText: '查看记录',
       success: (res) => {
         if (res.confirm) {
-          sheep.$router.go('/pages/commission/wallet', { type: 2 })
+          sheep.$router.go('/pages/commission/wallet', { type: 2 });
           return;
         }
         getBrokerageUser();
         state.accountInfo = {};
-      }
+      },
     });
   };
 
@@ -248,7 +250,7 @@
     if (data) {
       state.minPrice = data.brokerageWithdrawMinPrice || 0;
       state.frozenDays = data.brokerageFrozenDays || 0;
-      state.withdrawTypes = data.brokerageWithdrawTypes;	
+      state.withdrawTypes = data.brokerageWithdrawTypes;
     }
   }
 
@@ -259,34 +261,30 @@
       state.brokerageInfo = data;
     }
   }
-  
-  //获取提现银行配置字典	
-  async function getDictDataListByType(){	   
-	  let { code, data } = await DictApi.getDictDataListByType('brokerage_bank_name');	  
-	  if (code !== 0) {
-	    return;
-	  } 
-	  if(data && data.length > 0) {		
-	  	state.bankList = data;
-	  }
+
+  // 获取提现银行配置字典
+  async function getDictDataListByType() {
+    let { code, data } = await DictApi.getDictDataListByType('brokerage_bank_name');
+    if (code !== 0) {
+      return;
+    }
+    if (data && data.length > 0) {
+      state.bankList = data;
+    }
   }
-  
-  function bankChange(e){
-	  console.log(e);
-	  let value = e.target.value;
-	  state.accountInfo.bankName = value;
-	  let curr = state.bankList?.filter(item=>{		 
-		  return item.value == value
-	  })[0];
-	  console.log(curr);
-	  state.selectedBankName = curr.label;
+
+  // 银行选择
+  function bankChange(e) {
+    const value = e.detail.value;
+    state.bankListSelectedIndex = value;
+    state.accountInfo.bankName = state.bankList[value].label;
   }
 
   onBeforeMount(() => {
     getWithdrawRules();
     getBrokerageUser();
-	getDictDataListByType();//获取银行字典数据
-  })
+    getDictDataListByType(); //获取银行字典数据
+  });
 </script>
 
 <style lang="scss" scoped>
diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
index 44f61e9d..8dfa0c22 100644
--- a/sheep/api/promotion/combination.js
+++ b/sheep/api/promotion/combination.js
@@ -2,14 +2,6 @@ import request from '@/sheep/request';
 
 // 拼团 API
 const CombinationApi = {
-  // 获得拼团活动列表
-  getCombinationActivityList: (count) => {
-    return request({
-      url: '/promotion/combination-activity/list',
-      method: 'GET',
-      params: { count },
-    });
-  },
 
   // 获得拼团活动分页
   getCombinationActivityPage: (params) => {
diff --git a/sheep/api/system/dict.js b/sheep/api/system/dict.js
index 9ee4ca68..83b6d952 100644
--- a/sheep/api/system/dict.js
+++ b/sheep/api/system/dict.js
@@ -6,11 +6,11 @@ const DictApi = {
     return request({
       url: `/system/dict-data/type`,
       method: 'GET',
-	  params: {
-	    type,
-	  },
+      params: {
+        type,
+      },
     });
   },
 };
 
-export default DictApi;
\ No newline at end of file
+export default DictApi;

From 089e0197cd17184981a5784e8551c2284411b816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 5 Sep 2024 22:34:59 +0800
Subject: [PATCH 67/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=8B=BC=E5=9B=A2=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/groupon.vue                       | 17 +++-
 sheep/api/promotion/combination.js            |  6 +-
 .../s-groupon-block/s-groupon-block.vue       | 94 +++++++++----------
 3 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 503d9c98..9c9669c2 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -90,7 +90,7 @@
         <s-select-groupon-sku
           :show="state.showSelectSku"
           :goodsInfo="state.goodsInfo"
-		  :selectedSku="state.selectedSku"
+          :selectedSku="state.selectedSku"
           :grouponAction="state.grouponAction"
           :grouponNum="state.grouponNum"
           @buy="onBuy"
@@ -126,7 +126,12 @@
             :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0"
           >
             <view class="btn-price">{{
-              fen2yuan(state.selectedSku.price * state.selectedSku.count || state.activity.price * state.selectedSku.count || state.goodsInfo.price * state.selectedSku.count || state.goodsInfo.price)
+              fen2yuan(
+                state.selectedSku.price * state.selectedSku.count ||
+                  state.activity.price * state.selectedSku.count ||
+                  state.goodsInfo.price * state.selectedSku.count ||
+                  state.goodsInfo.price,
+              )
             }}</view>
             <view v-if="state.activity.startTime > new Date().getTime()">未开始</view>
             <view v-else-if="state.activity.endTime <= new Date().getTime()">已结束</view>
@@ -263,10 +268,12 @@
     // 加载商品信息
     const { data: spu } = await SpuApi.getSpuDetail(activity.spuId);
     state.goodsId = spu.id;
+
     // 默认显示最低价
-    activity.products.forEach((product) => {
-      state.activity.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
-    });
+    spu.price = activity.products.reduce((min, product) => {
+      return Math.min(min, product.combinationPrice || Infinity);
+    }, Infinity);
+
     // 价格、库存使用活动的
     spu.skus.forEach((sku) => {
       const product = activity.products.find((product) => product.skuId === sku.id);
diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
index 3e2cee6b..feb1ed8a 100644
--- a/sheep/api/promotion/combination.js
+++ b/sheep/api/promotion/combination.js
@@ -37,7 +37,7 @@ const CombinationApi = {
       url: '/promotion/combination-activity/list-by-ids',
       method: 'GET',
       params: {
-        ids,
+        ids
       },
     });
   },
@@ -58,9 +58,9 @@ const CombinationApi = {
   // 获得我的拼团记录分页
   getCombinationRecordPage: (params) => {
     return request({
-      url: '/promotion/combination-record/page',
+      url: "/promotion/combination-record/page",
       method: 'GET',
-      params,
+      params
     });
   },
 
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 862b70f3..6c9d6544 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -23,7 +23,7 @@
           :subTitleColor="data.fields.introduction.color"
           :topRadius="data.borderRadiusTop"
           :bottomRadius="data.borderRadiusBottom"
-          @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+          @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
         >
           <!-- 购买按钮 -->
           <template v-slot:cart>
@@ -35,7 +35,40 @@
       </view>
     </view>
 
-    <!-- 布局2. 双列（每一列：上图，下内容）-->
+    <!-- 布局2. 单列小图（左图，右内容） -->
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length"
+      class="goods-lg-box"
+    >
+      <view
+        class="goods-box"
+        :style="[{ marginBottom: data.space + 'px' }]"
+        v-for="item in state.spuList"
+        :key="item.id"
+      >
+        <s-goods-column
+          class="goods-card"
+          size="lg"
+          :goodsFields="data.fields"
+          :data="item"
+          :tagStyle="data.badge"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @tap="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+        >
+          <!-- 购买按钮 -->
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+            </button>
+          </template>
+        </s-goods-column>
+      </view>
+    </view>
+
+    <!-- 布局3. 双列（每一列：上图，下内容）-->
     <view
       v-if="layoutType === LayoutTypeEnum.TWO_COL && state.spuList.length"
       class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
@@ -58,7 +91,7 @@
             :topRadius="data.borderRadiusTop"
             :bottomRadius="data.borderRadiusBottom"
             :titleWidth="330 - marginLeft - marginRight"
-            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
             @getHeight="calculateGoodsColumn($event, 'left')"
           >
             <!-- 购买按钮 -->
@@ -88,7 +121,7 @@
             :topRadius="data.borderRadiusTop"
             :bottomRadius="data.borderRadiusBottom"
             :titleWidth="330 - marginLeft - marginRight"
-            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
             @getHeight="calculateGoodsColumn($event, 'right')"
           >
             <!-- 购买按钮 -->
@@ -101,39 +134,6 @@
         </view>
       </view>
     </view>
-
-    <!-- 布局3. 单列小图（左图，右内容） -->
-    <view
-      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length"
-      class="goods-lg-box"
-    >
-      <view
-        class="goods-box"
-        :style="[{ marginBottom: data.space + 'px' }]"
-        v-for="item in state.spuList"
-        :key="item.id"
-      >
-        <s-goods-column
-          class="goods-card"
-          size="lg"
-          :goodsFields="data.fields"
-          :data="item"
-          :tagStyle="data.badge"
-          :titleColor="data.fields.name?.color"
-          :subTitleColor="data.fields.introduction.color"
-          :topRadius="data.borderRadiusTop"
-          :bottomRadius="data.borderRadiusBottom"
-          @tap="sheep.$router.go('/pages/goods/index', { id: item.id })"
-        >
-          <!-- 购买按钮 -->
-          <template v-slot:cart>
-            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
-            </button>
-          </template>
-        </s-goods-column>
-      </view>
-    </view>
   </view>
 </template>
 
@@ -257,16 +257,16 @@
 
     // 循环活动列表
     activityList.forEach((activity) => {
-      // 获取活动商品的最低价格
-      activity.products.forEach((product) => {
-        const combinationPrice = product.combinationPrice || Infinity;
-
-        // 找到对应的 spu 并更新价格
-        const spu = state.spuList.find((spu) => activity.spuId === spu.id);
-        if (spu) {
-          spu.price = Math.min(combinationPrice, spu.price || Infinity);
-        }
-      });
+      // 提取活动价格
+      const combinationPrice = activity.combinationPrice || Infinity;
+      // 查找对应的 spu 并更新价格
+      const spu = state.spuList.find((spu) => activity.spuId === spu.id);
+      if (spu) {
+        // 赋值最低价格
+        spu.price = Math.min(combinationPrice, spu.price);
+        // 赋值活动ID，为了点击跳转详情页
+        spu.activityId = activity.id;
+      }
     });
 
     // 只有双列布局时需要

From 9f5f4816d321c7c7323018b91b1c2b7ae244ee87 Mon Sep 17 00:00:00 2001
From: heyho <heywsk@qq.com>
Date: Fri, 6 Sep 2024 01:25:25 +0000
Subject: [PATCH 68/84] =?UTF-8?q?=E3=80=90BUG=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=AF=8F=E6=AC=A1=E9=83=BD=E8=A6=81=E5=A1=AB=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E5=92=8C=E9=87=8D=E6=96=B0=E4=B8=8A=E4=BC=A0=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E3=80=82=20=E5=A6=82=E6=9E=9C=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=9C=89=E5=A4=B4=E5=83=8F=E5=92=8C=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E5=88=99=E4=B8=8D=E8=A6=81=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F=E5=92=8C=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E7=9A=84=E4=BF=A1=E6=81=AF=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: heyho <heywsk@qq.com>
---
 sheep/components/s-auth-modal/s-auth-modal.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
index cf6a6ff9..204f703f 100644
--- a/sheep/components/s-auth-modal/s-auth-modal.vue
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -152,7 +152,11 @@
     }
     const loginRes = await sheep.$platform.useProvider(provider).login();
     if (loginRes) {
+      const userInfo = await sheep.$store('user').getInfo();
       closeAuthModal();
+      // 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。	   
+	  if(userInfo.avatar && userInfo.nickname) return;
+      
       // 触发小程序授权信息弹框
       // #ifdef MP-WEIXIN
       showAuthModal('mpAuthorization');

From fd8f9a6857fa46f8201bd96ab605a3993b151242 Mon Sep 17 00:00:00 2001
From: heyho <heywsk@qq.com>
Date: Fri, 6 Sep 2024 08:32:42 +0000
Subject: [PATCH 69/84] =?UTF-8?q?=E5=88=86=E9=94=80=E4=B8=AD=E5=BF=83=20?=
 =?UTF-8?q?=3D>=20=E6=88=91=E7=9A=84=E5=9B=A2=E9=98=9F=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=B8=83=E5=B1=80=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=81=E7=BE=8E=E5=8C=96=20=E5=8E=9F=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=A4=B4=E9=83=A8=E7=BB=93=E6=9E=84=E9=94=99=E4=B9=B1?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=9C=89=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: heyho <heywsk@qq.com>
---
 pages/commission/team.vue | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/pages/commission/team.vue b/pages/commission/team.vue
index eb58abb9..926c3bda 100644
--- a/pages/commission/team.vue
+++ b/pages/commission/team.vue
@@ -1,8 +1,29 @@
 <!-- 页面 TODO 芋艿：该页面的实现代码需要优化，包括 js 和 css，以及相关的样式设计 -->
 <template>
   <s-layout title="我的团队" :class="state.scrollTop ? 'team-wrap' : ''" navbar="inner">
+  <view
+	    class="header-box"
+	    :style="[
+	      {
+	        marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
+	        paddingTop: Number(statusBarHeight + 108) + 'rpx',
+	      },
+	    ]"
+	  >
+	    <!-- 推广数据总览 -->
+	    <view class="team-data-box ss-flex ss-col-center ss-row-between" style="width: 100%">
+	      <view class="data-card" style="width: 100%">
+	        <view class="total-item" style="width: 100%">
+	          <view class="item-title" style="text-align: center">推广人数</view>
+	          <view class="total-num" style="text-align: center">
+	            {{ state.summary.firstBrokerageUserCount + state.summary.secondBrokerageUserCount || 0 }}
+	          </view>
+	        </view>
+	      </view>
+	    </view>
+	  </view>
     <view class="promoter-list">
-      <view
+      <!--<view
         class="promoterHeader bg-color"
         style="backgroundcolor: #e93323 !important; height: 218rpx; color: #fff"
       >
@@ -21,9 +42,9 @@
           </view>
           <view class="iconfont icon-tuandui" />
         </view>
-      </view>
-      <view style="padding: 0 30rpx">
-        <view class="nav acea-row row-around l1">
+      </view>-->
+      <view style="padding: 0 20rpx">
+        <view class="nav acea-row row-around l1" style="margin-top:20rpx;">
           <view :class="state.level == 1 ? 'item on' : 'item'" @click="setType(1)">
             一级({{ state.summary.firstBrokerageUserCount || 0 }})
           </view>
@@ -152,7 +173,7 @@
             </view>
           </block>
           <block v-if="state.pagination.list.length === 0">
-            <view style="text-align: center">暂无推广人数</view>
+            <view style="text-align: center;margin-top:30rpx;">暂无推广人数</view>
           </block>
         </view>
       </view>
@@ -456,7 +477,7 @@
   .promoter-list .nav .item.on {
     border-bottom: 5rpx solid;
     // $theme-color
-    color: red;
+    color: var(--ui-BG-Main);
     // $theme-color
   }
 

From 735dc8c373c0c12d9a0f4636e5a87e6398215ae6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 6 Sep 2024 21:02:59 +0800
Subject: [PATCH 70/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E6=8B=BC=E5=9B=A2?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AE=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/groupon.vue                              |  1 -
 pages/user/goods_details_store/index.vue             |  6 +++---
 sheep/api/promotion/combination.js                   | 11 +++++------
 sheep/components/s-groupon-block/s-groupon-block.vue |  4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 9c9669c2..96119148 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -105,7 +105,6 @@
       <detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
 
       <!-- 商品tabbar -->
-      <!-- TODO: 已售罄、预热 判断 设计-->
       <detail-tabbar v-model="state.goodsInfo">
         <view class="buy-box ss-flex ss-col-center ss-p-r-20">
           <button
diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
index 3df0435d..86c2d4aa 100644
--- a/pages/user/goods_details_store/index.vue
+++ b/pages/user/goods_details_store/index.vue
@@ -38,9 +38,9 @@
             <!-- #endif -->
           </view>
           <view class="store-distance ss-flex ss-row-center" @tap.stop="showMaoLocation(item)">
-            <text class="addressTxt" v-if="item.distance"
-              >距离{{ item.distance.toFixed(2) }}千米</text
-            >
+            <text class="addressTxt" v-if="item.distance">
+              距离{{ item.distance.toFixed(2) }}千米
+            </text>
             <text class="addressTxt" v-else>查看地图</text>
             <view class="iconfont">
               <view class="ss-rest-button">
diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
index eb3639c5..8e8436cb 100644
--- a/sheep/api/promotion/combination.js
+++ b/sheep/api/promotion/combination.js
@@ -2,7 +2,6 @@ import request from '@/sheep/request';
 
 // 拼团 API
 const CombinationApi = {
-
   // 获得拼团活动分页
   getCombinationActivityPage: (params) => {
     return request({
@@ -23,13 +22,13 @@ const CombinationApi = {
     });
   },
 
-  // 获得拼团活动明细列表
-  getCombinationActivityDetailList: (ids) => {
+  // 获得拼团活动列表，基于活动编号数组
+  getCombinationActivityListByIds: (ids) => {
     return request({
       url: '/promotion/combination-activity/list-by-ids',
       method: 'GET',
       params: {
-        ids
+        ids,
       },
     });
   },
@@ -50,9 +49,9 @@ const CombinationApi = {
   // 获得我的拼团记录分页
   getCombinationRecordPage: (params) => {
     return request({
-      url: "/promotion/combination-record/page",
+      url: '/promotion/combination-record/page',
       method: 'GET',
-      params
+      params,
     });
   },
 
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 6c9d6544..59b63c17 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -1,4 +1,4 @@
-<!-- 装修商品组件：商品卡片 -->
+<!-- 装修商品组件：【拼团】商品卡片 -->
 <template>
   <!-- 商品卡片 -->
   <view>
@@ -232,7 +232,7 @@
    * @return {Promise<undefined>} 商品列表
    */
   async function getCombinationActivityDetailList(ids) {
-    const { data } = await CombinationApi.getCombinationActivityDetailList(ids);
+    const { data } = await CombinationApi.getCombinationActivityListByIds(ids);
     return data;
   }
 

From 9b6d1a9a97ba8ead560bcc6ba70abb946984cce8 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 7 Sep 2024 12:06:10 +0800
Subject: [PATCH 71/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=97=B6=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=8F=AF?=
 =?UTF-8?q?=E7=94=A8=20+=20=E4=B8=8D=E5=8F=AF=E7=94=A8=E7=9A=84=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue                       | 61 ++++++++++---------
 sheep/api/promotion/coupon.js                 | 17 ------
 .../s-coupon-list/s-coupon-list.vue           | 20 ++----
 .../s-coupon-select/s-coupon-select.vue       | 37 ++++++-----
 4 files changed, 61 insertions(+), 74 deletions(-)

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index b18df4f7..6c49bb1e 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -52,25 +52,38 @@
               class="score-img"
             />
             <text class="item-value ss-m-r-24">
-              {{ state.pointStatus ? state.orderInfo.totalPoint - state.orderInfo.usePoint : (state.orderInfo.totalPoint || 0) }}
+              {{
+                state.pointStatus
+                  ? state.orderInfo.totalPoint - state.orderInfo.usePoint
+                  : state.orderInfo.totalPoint || 0
+              }}
             </text>
             <checkbox-group @change="changeIntegral">
-              <checkbox :checked='state.pointStatus' :disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0" />
+              <checkbox
+                :checked="state.pointStatus"
+                :disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0"
+              />
             </checkbox-group>
           </view>
         </view>
         <!-- 快递配置时，信息的展示 -->
-        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 1'>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="addressState.deliveryType === 1"
+        >
           <view class="item-title">运费</view>
           <view class="ss-flex ss-col-center">
             <text class="item-value ss-m-r-24" v-if="state.orderInfo.price.deliveryPrice > 0">
               +￥{{ fen2yuan(state.orderInfo.price.deliveryPrice) }}
             </text>
-            <view class='item-value ss-m-r-24' v-else>免运费</view>
+            <view class="item-value ss-m-r-24" v-else>免运费</view>
           </view>
         </view>
         <!-- 门店自提时，需要填写姓名和手机号 -->
-        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 2'>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="addressState.deliveryType === 2"
+        >
           <view class="item-title">联系人</view>
           <view class="ss-flex ss-col-center">
             <uni-easyinput
@@ -82,7 +95,10 @@
             />
           </view>
         </view>
-        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 2'>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="addressState.deliveryType === 2"
+        >
           <view class="item-title">联系电话</view>
           <view class="ss-flex ss-col-center">
             <uni-easyinput
@@ -190,7 +206,6 @@
   import AddressSelection from '@/pages/order/addressSelection.vue';
   import sheep from '@/sheep';
   import OrderApi from '@/sheep/api/trade/order';
-  import CouponApi from '@/sheep/api/promotion/coupon';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
 
   const state = reactive({
@@ -266,9 +281,9 @@
       remark: state.orderPayload.remark,
       deliveryType: addressState.value.deliveryType,
       addressId: addressState.value.addressInfo.id, // 收件地址编号
-      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
-      receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
-      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pickUpStoreId: addressState.value.pickUpInfo.id, //自提门店编号
+      receiverName: addressState.value.receiverName, // 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile, // 选择门店自提时，该字段为联系人手机
       pointStatus: state.pointStatus,
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
@@ -296,9 +311,9 @@
       couponId: state.orderPayload.couponId,
       deliveryType: addressState.value.deliveryType,
       addressId: addressState.value.addressInfo.id, // 收件地址编号
-      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
-      receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
-      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pickUpStoreId: addressState.value.pickUpInfo.id, //自提门店编号
+      receiverName: addressState.value.receiverName, // 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile, // 选择门店自提时，该字段为联系人手机
       pointStatus: state.pointStatus,
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
@@ -308,25 +323,13 @@
       return;
     }
     state.orderInfo = data;
+    state.couponInfo = data.coupons;
     // 设置收货地址
     if (state.orderInfo.address) {
       addressState.value.addressInfo = state.orderInfo.address;
     }
   }
 
-  // 获取可用优惠券
-  async function getCoupons() {
-    const { code, data } = await CouponApi.getMatchCouponList(
-      state.orderInfo.price.payPrice,
-      state.orderInfo.items.map((item) => item.spuId),
-      state.orderPayload.items.map((item) => item.skuId),
-      state.orderPayload.items.map((item) => item.categoryId),
-    );
-    if (code === 0) {
-      state.couponInfo = data;
-    }
-  }
-
   onLoad(async (options) => {
     if (!options.data) {
       sheep.$helper.toast('参数不正确，请检查！');
@@ -334,13 +337,15 @@
     }
     state.orderPayload = JSON.parse(options.data);
     await getOrderInfo();
-    await getCoupons();
   });
 
   // 使用 watch 监听地址和配送方式的变化
   watch(addressState, async (newAddress, oldAddress) => {
     // 如果收货地址或配送方式有变化，则重新计算价格
-    if (newAddress.addressInfo.id !== oldAddress.addressInfo.id || newAddress.deliveryType !== oldAddress.deliveryType) {
+    if (
+      newAddress.addressInfo.id !== oldAddress.addressInfo.id ||
+      newAddress.deliveryType !== oldAddress.deliveryType
+    ) {
       await getOrderInfo();
     }
   });
diff --git a/sheep/api/promotion/coupon.js b/sheep/api/promotion/coupon.js
index c9dfa524..f0382ee0 100644
--- a/sheep/api/promotion/coupon.js
+++ b/sheep/api/promotion/coupon.js
@@ -79,23 +79,6 @@ const CouponApi = {
       },
     });
   },
-  // 获得匹配指定商品的优惠劵列表
-  getMatchCouponList: (price, spuIds, skuIds, categoryIds) => {
-    return request({
-      url: '/promotion/coupon/match-list',
-      method: 'GET',
-      params: {
-        price,
-        spuIds: spuIds.join(','),
-        skuIds: skuIds.join(','),
-        categoryIds: categoryIds.join(','),
-      },
-      custom: {
-        showError: false,
-        showLoading: false, // 避免影响 settlementOrder 结算的结果
-      },
-    });
-  }
 };
 
 export default CouponApi;
diff --git a/sheep/components/s-coupon-list/s-coupon-list.vue b/sheep/components/s-coupon-list/s-coupon-list.vue
index 411a4c0e..1c76e701 100644
--- a/sheep/components/s-coupon-list/s-coupon-list.vue
+++ b/sheep/components/s-coupon-list/s-coupon-list.vue
@@ -37,30 +37,22 @@
         <view class="ss-flex ss-row-between ss-m-t-16">
           <view
             class="sellby-text"
-            :class=" isDisable ? 'disabled-color' : 'subtitle-color'"
+            :class="isDisable ? 'disabled-color' : 'subtitle-color'"
             v-if="data.validityType === 2"
           >
             有效期：领取后 {{ data.fixedEndTerm }} 天内可用
           </view>
-          <view
-            class="sellby-text"
-            :class=" isDisable ? 'disabled-color' : 'subtitle-color'"
-            v-else
-          >
+          <view class="sellby-text" :class="isDisable ? 'disabled-color' : 'subtitle-color'" v-else>
             有效期: {{ sheep.$helper.timeFormat(data.validStartTime, 'yyyy-mm-dd') }} 至
             {{ sheep.$helper.timeFormat(data.validEndTime, 'yyyy-mm-dd') }}
           </view>
-          <view
-            class="value-enough"
-            :class="isDisable ? 'disabled-color' : 'subtitle-color'"
-          >
+          <view class="value-enough" :class="isDisable ? 'disabled-color' : 'subtitle-color'">
             满 {{ fen2yuan(data.usePrice) }} 可用
           </view>
         </view>
       </view>
     </view>
 
-    <!-- TODO 芋艿：可优化，增加优惠劵的描述 -->
     <view class="desc ss-flex ss-row-between">
       <view>
         <view class="desc-title">{{ data.description }}</view>
@@ -76,12 +68,10 @@
 </template>
 
 <script setup>
-  import { computed, reactive } from 'vue';
+  import { computed } from 'vue';
   import { fen2yuan } from '../../hooks/useGoods';
   import sheep from '../../index';
 
-  const state = reactive({});
-
   const isDisable = computed(() => {
     if (props.type === 'coupon') {
       return false;
@@ -202,4 +192,4 @@
   .price-text {
     color: #ff0000;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/sheep/components/s-coupon-select/s-coupon-select.vue b/sheep/components/s-coupon-select/s-coupon-select.vue
index ecca7762..d0711f86 100644
--- a/sheep/components/s-coupon-select/s-coupon-select.vue
+++ b/sheep/components/s-coupon-select/s-coupon-select.vue
@@ -1,19 +1,28 @@
 <!-- 订单确认的优惠劵选择弹窗 -->
 <template>
-  <su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose backgroundColor="#f2f2f2">
+  <su-popup
+    :show="show"
+    type="bottom"
+    round="20"
+    @close="emits('close')"
+    showClose
+    backgroundColor="#f2f2f2"
+  >
     <view class="model-box">
       <view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠券</view>
-      <scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
+      <scroll-view
+        class="model-content"
+        scroll-y
+        :scroll-with-animation="false"
+        :enable-back-to-top="true"
+      >
         <!--可使用的优惠券区域-->
         <view class="subtitle ss-m-l-20">可使用优惠券</view>
-        <view v-for="(item, index) in state.couponInfo.filter(coupon => coupon.match)" :key="index">
+        <view
+          v-for="(item, index) in state.couponInfo.filter((coupon) => coupon.match)"
+          :key="index"
+        >
           <s-coupon-list :data="item" type="user" :disabled="false">
-            <template v-slot:reason>
-              <view class="ss-flex ss-m-t-24">
-                <view class="reason-title">可用原因：</view>
-                <view class="reason-desc">{{ item.description || '已达到使用门槛' }}</view>
-              </view>
-            </template>
             <template #default>
               <label class="ss-flex ss-col-center" @tap="radioChange(item.id)">
                 <radio
@@ -28,12 +37,12 @@
         </view>
         <!--不可使用的优惠券区域-->
         <view class="subtitle ss-m-t-40 ss-m-l-20">不可使用优惠券</view>
-        <view v-for="item in state.couponInfo.filter(coupon => !coupon.match)" :key="item.id">
+        <view v-for="item in state.couponInfo.filter((coupon) => !coupon.match)" :key="item.id">
           <s-coupon-list :data="item" type="user" :disabled="true">
             <template v-slot:reason>
               <view class="ss-flex ss-m-t-24">
                 <view class="reason-title"> 不可用原因：</view>
-                <view class="reason-desc">{{ item.description || '未达到使用门槛' }}</view>
+                <view class="reason-desc">{{ item.mismatchReason || '未达到使用门槛' }}</view>
               </view>
             </template>
           </s-coupon-list>
@@ -49,10 +58,10 @@
   import { computed, reactive } from 'vue';
 
   const props = defineProps({
-    modelValue: { // 优惠劵列表
+    modelValue: {
+      // 优惠劵列表
       type: Object,
-      default() {
-      },
+      default() {},
     },
     show: {
       type: Boolean,

From 80b2bb6f5efa31241f436eb16688e0c36f39562d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 7 Sep 2024 14:22:44 +0800
Subject: [PATCH 72/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=8B=BC=E5=9B=A2=20SKU=20=E6=97=B6=EF=BC=8C=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E9=81=AE=E7=BD=A9=E7=9A=84=E9=97=AE=E9=A2=98=20https://gitee.c?=
 =?UTF-8?q?om/yudaocode/yudao-mall-uniapp/issues/IAMK4A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/groupon.vue                       |  1 -
 .../s-select-groupon-sku.vue                  | 62 +++++++++++++++----
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 96119148..7f4128ba 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -90,7 +90,6 @@
         <s-select-groupon-sku
           :show="state.showSelectSku"
           :goodsInfo="state.goodsInfo"
-          :selectedSku="state.selectedSku"
           :grouponAction="state.grouponAction"
           :grouponNum="state.grouponNum"
           @buy="onBuy"
diff --git a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
index 6259a088..1325ddc2 100644
--- a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
+++ b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
@@ -5,7 +5,11 @@
     <view class="ss-modal-box bg-white ss-flex-col">
       <view class="modal-header ss-flex ss-col-center">
         <view class="header-left ss-m-r-30">
-          <image class="sku-image" :src="sheep.$url.cdn(state.selectedSku.picUrl || goodsInfo.picUrl)" mode="aspectFill" />
+          <image
+            class="sku-image"
+            :src="sheep.$url.cdn(state.selectedSku.picUrl || goodsInfo.picUrl)"
+            mode="aspectFill"
+          />
         </view>
         <view class="header-right ss-flex-col ss-row-between ss-flex-1">
           <view class="goods-title ss-line-2">
@@ -22,7 +26,13 @@
             </view>
           </view>
           <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
-            <view class="price-text"> {{ fen2yuan(state.selectedSku.price || goodsInfo.price || state.selectedSku.marketPrice) }}</view>
+            <view class="price-text">
+              {{
+                fen2yuan(
+                  state.selectedSku.price || goodsInfo.price || state.selectedSku.marketPrice,
+                )
+              }}</view
+            >
 
             <view class="stock-text ss-m-l-20">
               库存{{ state.selectedSku.stock || goodsInfo.stock }}件
@@ -35,22 +45,35 @@
           <view class="sku-item ss-m-b-20" v-for="property in propertyList" :key="property.id">
             <view class="label-text ss-m-b-20">{{ property.name }}</view>
             <view class="ss-flex ss-col-center ss-flex-wrap">
-              <button class="ss-reset-button spec-btn" v-for="value in property.values" :class="[
+              <button
+                class="ss-reset-button spec-btn"
+                v-for="value in property.values"
+                :class="[
                   {
                     'checked-btn': state.currentPropertyArray[property.id] === value.id,
                   },
                   {
                     'disabled-btn': value.disabled === true,
                   },
-                ]" :key="value.id" :disabled="value.disabled === true" @tap="onSelectSku(property.id, value.id)">
+                ]"
+                :key="value.id"
+                :disabled="value.disabled === true"
+                @tap="onSelectSku(property.id, value.id)"
+              >
                 {{ value.name }}
               </button>
             </view>
           </view>
           <view class="buy-num-box ss-flex ss-col-center ss-row-between">
             <view class="label-text">购买数量</view>
-            <su-number-box :min="1" :max="state.selectedSku.stock" :step="1"
-                           v-model="state.selectedSku.count" @change="onNumberChange($event)" activity="groupon" />
+            <su-number-box
+              :min="1"
+              :max="state.selectedSku.stock"
+              :step="1"
+              v-model="state.selectedSku.count"
+              @change="onNumberChange($event)"
+              activity="groupon"
+            />
           </view>
         </scroll-view>
       </view>
@@ -63,7 +86,16 @@
               <view class="btn-title">{{ grouponNum + '人团' }}</view>
             </button>
             <button class="ss-reset-button btn-tox ss-flex-col" @tap="onBuy">
-              <view class="btn-price">{{ fen2yuan(state.selectedSku.price * state.selectedSku.count || goodsInfo.price * state.selectedSku.count || state.selectedSku.marketPrice * state.selectedSku.count || goodsInfo.price) }}</view>
+              <view class="btn-price">
+                {{
+                  fen2yuan(
+                    state.selectedSku.price * state.selectedSku.count ||
+                      goodsInfo.price * state.selectedSku.count ||
+                      state.selectedSku.marketPrice * state.selectedSku.count ||
+                      goodsInfo.price,
+                  )
+                }}
+              </view>
               <view v-if="grouponAction === 'create'">立即开团</view>
               <view v-else-if="grouponAction === 'join'">参与拼团</view>
             </button>
@@ -77,7 +109,7 @@
 <script setup>
   import { computed, reactive, watch } from 'vue';
   import sheep from '@/sheep';
-  import {convertProductPropertyList, fen2yuan} from '@/sheep/hooks/useGoods';
+  import { convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
 
   const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-btn-long.png');
   const emits = defineEmits(['change', 'addCart', 'buy', 'close', 'ladder']);
@@ -88,7 +120,7 @@
     },
     goodsInfo: {
       type: Object,
-      default () {},
+      default() {},
     },
     grouponAction: {
       type: String,
@@ -111,7 +143,7 @@
   const skuList = computed(() => {
     let skuPrices = props.goodsInfo.skus;
     for (let price of skuPrices) {
-      price.value_id_array = price.properties.map((item) => item.valueId)
+      price.value_id_array = price.properties.map((item) => item.valueId);
     }
     return skuPrices;
   });
@@ -120,7 +152,8 @@
     () => state.selectedSku,
     (newVal) => {
       emits('change', newVal);
-    }, {
+    },
+    {
       immediate: true, // 立即执行
       deep: true, // 深度监听
     },
@@ -215,7 +248,7 @@
       // 如果当前 property id 不存在于有库存的 SKU 中，则禁用
       for (let valueIndex in propertyList[propertyIndex]['values']) {
         propertyList[propertyIndex]['values'][valueIndex]['disabled'] =
-            noChooseValueIds.indexOf(propertyList[propertyIndex]['values'][valueIndex]['id']) < 0; // true 禁用 or false 不禁用
+          noChooseValueIds.indexOf(propertyList[propertyIndex]['values'][valueIndex]['id']) < 0; // true 禁用 or false 不禁用
       }
     }
   }
@@ -245,7 +278,10 @@
   function onSelectSku(propertyId, valueId) {
     // 清空已选择
     let isChecked = true; // 选中 or 取消选中
-    if (state.currentPropertyArray[propertyId] !== undefined && state.currentPropertyArray[propertyId] === valueId) {
+    if (
+      state.currentPropertyArray[propertyId] !== undefined &&
+      state.currentPropertyArray[propertyId] === valueId
+    ) {
       // 点击已被选中的，删除并填充 ''
       isChecked = false;
       state.currentPropertyArray.splice(propertyId, 1, '');

From cb29c2c0aa14475d0dab9b35a117ca158edb76f6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 7 Sep 2024 14:28:02 +0800
Subject: [PATCH 73/84] =?UTF-8?q?=E3=80=90BUG=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=AF=8F=E6=AC=A1=E9=83=BD=E8=A6=81=E5=A1=AB=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E5=92=8C=E9=87=8D=E6=96=B0=E4=B8=8A=E4=BC=A0=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E3=80=82=C2=A0=C2=A0=C2=A0=C2=A0=20=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=B7=B2=E7=BB=8F=E6=9C=89=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E5=92=8C=E6=98=B5=E7=A7=B0=EF=BC=8C=E5=88=99=E4=B8=8D=E8=A6=81?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F=E5=92=8C?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=98=B5=E7=A7=B0=E7=9A=84=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-auth-modal/s-auth-modal.vue  | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
index 204f703f..41a7dbbb 100644
--- a/sheep/components/s-auth-modal/s-auth-modal.vue
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -10,7 +10,11 @@
       />
 
       <!-- 2. 短信登录  smsLogin -->
-      <sms-login v-if="authType === 'smsLogin'" :agreeStatus="state.protocol" @onConfirm="onConfirm" />
+      <sms-login
+        v-if="authType === 'smsLogin'"
+        :agreeStatus="state.protocol"
+        @onConfirm="onConfirm"
+      />
 
       <!-- 3. 忘记密码 resetPassword-->
       <reset-password v-if="authType === 'resetPassword'" />
@@ -32,7 +36,11 @@
         <!-- 7.1 微信小程序的快捷登录 -->
         <view v-if="sheep.$platform.name === 'WechatMiniProgram'" class="ss-flex register-box">
           <view class="register-title">还没有账号?</view>
-          <button class="ss-reset-button login-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+          <button
+            class="ss-reset-button login-btn"
+            open-type="getPhoneNumber"
+            @getphonenumber="getPhoneNumber"
+          >
             快捷登录
           </button>
           <view class="circle" />
@@ -81,17 +89,13 @@
           />
           <view class="agreement-text ss-flex ss-col-center ss-m-l-8">
             我已阅读并遵守
-            <view class="tcp-text" @tap.stop="onProtocol('用户协议')">
-              《用户协议》
-            </view>
+            <view class="tcp-text" @tap.stop="onProtocol('用户协议')"> 《用户协议》 </view>
             <view class="agreement-text">与</view>
-            <view class="tcp-text" @tap.stop="onProtocol('隐私协议')">
-              《隐私协议》
-            </view>
+            <view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
           </view>
         </label>
       </view>
-      <view class="safe-box"/>
+      <view class="safe-box" />
     </view>
   </su-popup>
 </template>
@@ -107,8 +111,6 @@
   import mpAuthorization from './components/mp-authorization.vue';
   import { closeAuthModal, showAuthModal } from '@/sheep/hooks/useModal';
 
-  const appInfo = computed(() => sheep.$store('app').info);
-
   const modalStore = sheep.$store('modal');
   // 授权弹窗类型
   const authType = computed(() => modalStore.auth);
@@ -154,9 +156,11 @@
     if (loginRes) {
       const userInfo = await sheep.$store('user').getInfo();
       closeAuthModal();
-      // 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。	   
-	  if(userInfo.avatar && userInfo.nickname) return;
-      
+      // 如果用户已经有头像和昵称，不需要再次授权
+      if (userInfo.avatar && userInfo.nickname) {
+        return;
+      }
+
       // 触发小程序授权信息弹框
       // #ifdef MP-WEIXIN
       showAuthModal('mpAuthorization');

From 3e2749672e792954996b04ad93ca3f5b2daa59c9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 7 Sep 2024 16:15:43 +0800
Subject: [PATCH 74/84] =?UTF-8?q?CDN=20=E4=BD=BF=E7=94=A8=20yudao=20?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=AE=9A?=
 =?UTF-8?q?=E6=9C=9F=E7=9A=84=20https=20=E9=97=AE=E9=A2=98=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |   3 +-
 .../commission/components/commission-menu.vue | 243 +++++++++---------
 2 files changed, 127 insertions(+), 119 deletions(-)

diff --git a/.env b/.env
index adcc17dd..6172fd55 100644
--- a/.env
+++ b/.env
@@ -18,7 +18,8 @@ SHOPRO_WEBSOCKET_PATH = /infra/ws
 SHOPRO_DEV_PORT = 3000
 
 # 客户端静态资源地址 空=默认使用服务端指定的CDN资源地址前缀 | local=本地  |  http(s)://xxx.xxx=自定义静态资源地址前缀
-SHOPRO_STATIC_URL = https://file.sheepjs.com
+SHOPRO_STATIC_URL = http://test.yudao.iocoder.cn
+### SHOPRO_STATIC_URL = https://file.sheepjs.com
 
 # 是否开启直播  1 开启直播 | 0 关闭直播 (小程序官方后台未审核开通直播权限时请勿开启)
 SHOPRO_MPLIVE_ON = 0
diff --git a/pages/commission/components/commission-menu.vue b/pages/commission/components/commission-menu.vue
index 5655ca74..42498f5e 100644
--- a/pages/commission/components/commission-menu.vue
+++ b/pages/commission/components/commission-menu.vue
@@ -1,138 +1,145 @@
 <!-- 分销：商菜单栏 -->
 <template>
-	<view class="menu-box ss-flex-col">
-		<view class="header-box">
-			<image class="header-bg" :src="sheep.$url.static('/static/img/shop/commission/title1.png')" />
-			<view class="ss-flex header-title">
-				<view class="title">功能专区</view>
-				<text class="cicon-forward"></text>
-			</view>
-		</view>
-		<view class="menu-list ss-flex ss-flex-wrap">
-			<view v-for="(item, index) in state.menuList" :key="index" class="item-box ss-flex-col ss-col-center"
-				@tap="sheep.$router.go(item.path)">
-				<image class="menu-icon ss-m-b-10" :src="sheep.$url.static(item.img)" mode="aspectFill"></image>
-				<view>{{ item.title }}</view>
-			</view>
-		</view>
-	</view>
+  <view class="menu-box ss-flex-col">
+    <view class="header-box">
+      <image class="header-bg" :src="sheep.$url.static('/static/img/shop/commission/title1.png')" />
+      <view class="ss-flex header-title">
+        <view class="title">功能专区</view>
+        <text class="cicon-forward"></text>
+      </view>
+    </view>
+    <view class="menu-list ss-flex ss-flex-wrap">
+      <view
+        v-for="(item, index) in state.menuList"
+        :key="index"
+        class="item-box ss-flex-col ss-col-center"
+        @tap="sheep.$router.go(item.path)"
+      >
+        <image
+          class="menu-icon ss-m-b-10"
+          :src="sheep.$url.static(item.img)"
+          mode="aspectFill"
+        ></image>
+        <view>{{ item.title }}</view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import sheep from '@/sheep';
-	import { reactive } from 'vue';
+  import sheep from '@/sheep';
+  import { reactive } from 'vue';
 
-	const state = reactive({
-		menuList: [{
-				img: '/static/img/shop/commission/commission_icon1.png',
-				title: '我的团队',
-				path: '/pages/commission/team',
-			},
-			{
-				img: '/static/img/shop/commission/commission_icon2.png',
-				title: '佣金明细',
-				path: '/pages/commission/wallet',
-			},
-			{
-				img: '/static/img/shop/commission/commission_icon3.png',
-				title: '分销订单',
-				path: '/pages/commission/order',
-			},
-			{
-				img: '/static/img/shop/commission/commission_icon4.png',
-				title: '推广商品',
-				path: '/pages/commission/goods',
-			},
-			// {
-			//   img: '/static/img/shop/commission/commission_icon5.png',
-			//   title: '我的资料',
-			//   path: '/pages/commission/apply',
-			//   isAgentFrom: true,
-			// },
-			// todo @芋艿：邀请海报需要登录后的个人数据
-			{
-				img: '/static/img/shop/commission/commission_icon7.png',
-				title: '邀请海报',
-				path: 'action:showShareModal',
-			},
-      // TODO @芋艿：缺少 icon
+  const state = reactive({
+    menuList: [
       {
-				// img: '/static/img/shop/commission/commission_icon7.png',
-				title: '推广排行',
-				path: '/pages/commission/promoter',
-			},
+        img: '/static/img/shop/commission/commission_icon1.png',
+        title: '我的团队',
+        path: '/pages/commission/team',
+      },
       {
-				// img: '/static/img/shop/commission/commission_icon7.png',
-				title: '佣金排行',
-				path: '/pages/commission/commission-ranking',
-			}
-		],
-	});
+        img: '/static/img/shop/commission/commission_icon2.png',
+        title: '佣金明细',
+        path: '/pages/commission/wallet',
+      },
+      {
+        img: '/static/img/shop/commission/commission_icon3.png',
+        title: '分销订单',
+        path: '/pages/commission/order',
+      },
+      {
+        img: '/static/img/shop/commission/commission_icon4.png',
+        title: '推广商品',
+        path: '/pages/commission/goods',
+      },
+      // {
+      //   img: '/static/img/shop/commission/commission_icon5.png',
+      //   title: '我的资料',
+      //   path: '/pages/commission/apply',
+      //   isAgentFrom: true,
+      // },
+      {
+        img: '/static/img/shop/commission/commission_icon7.png',
+        title: '邀请海报',
+        path: 'action:showShareModal',
+      },
+      {
+        img: '/static/img/shop/commission/commission_icon8.png',
+        title: '推广排行',
+        path: '/pages/commission/promoter',
+      },
+      {
+        img: '/static/img/shop/commission/commission_icon9.png',
+        title: '佣金排行',
+        path: '/pages/commission/commission-ranking',
+      },
+    ],
+  });
 </script>
 
 <style lang="scss" scoped>
-	.menu-box {
-		margin: 0 auto;
-		width: 690rpx;
-		margin-bottom: 20rpx;
-		margin-top: 20rpx;
-		border-radius: 12rpx;
-		z-index: 3;
-		position: relative;
-	}
+  .menu-box {
+    margin: 0 auto;
+    width: 690rpx;
+    margin-bottom: 20rpx;
+    margin-top: 20rpx;
+    border-radius: 12rpx;
+    z-index: 3;
+    position: relative;
+  }
 
-	.header-box {
-		width: 690rpx;
-		height: 76rpx;
-		position: relative;
+  .header-box {
+    width: 690rpx;
+    height: 76rpx;
+    position: relative;
 
-		.header-bg {
-			width: 690rpx;
-			height: 76rpx;
-		}
+    .header-bg {
+      width: 690rpx;
+      height: 76rpx;
+    }
 
-		.header-title {
-			position: absolute;
-			left: 20rpx;
-			top: 24rpx;
-		}
+    .header-title {
+      position: absolute;
+      left: 20rpx;
+      top: 24rpx;
+    }
 
-		.title {
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #ffffff;
-			line-height: 30rpx;
-		}
+    .title {
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #ffffff;
+      line-height: 30rpx;
+    }
 
-		.cicon-forward {
-			font-size: 30rpx;
-			font-weight: 400;
-			color: #ffffff;
-			line-height: 30rpx;
-		}
-	}
+    .cicon-forward {
+      font-size: 30rpx;
+      font-weight: 400;
+      color: #ffffff;
+      line-height: 30rpx;
+    }
+  }
 
-	.menu-list {
-		padding: 50rpx 0 10rpx 0;
-		background: #fdfae9;
-		border-radius: 0 0 12rpx 12rpx;
-	}
+  .menu-list {
+    padding: 50rpx 0 10rpx 0;
+    background: #fdfae9;
+    border-radius: 0 0 12rpx 12rpx;
+  }
 
-	.item-box {
-		width: 25%;
-		margin-bottom: 40rpx;
-	}
+  .item-box {
+    width: 25%;
+    margin-bottom: 40rpx;
+  }
 
-	.menu-icon {
-		width: 68rpx;
-		height: 68rpx;
-		background: #ffffff;
-		border-radius: 50%;
-	}
+  .menu-icon {
+    width: 68rpx;
+    height: 68rpx;
+    background: #ffffff;
+    border-radius: 50%;
+  }
 
-	.menu-title {
-		font-size: 26rpx;
-		font-weight: 500;
-		color: #ffffff;
-	}
-</style>
\ No newline at end of file
+  .menu-title {
+    font-size: 26rpx;
+    font-weight: 500;
+    color: #ffffff;
+  }
+</style>

From b42c15158552cc34e1034ea096243ad83270e48b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 8 Sep 2024 09:55:34 +0800
Subject: [PATCH 75/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E5=8F=AF=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 6c49bb1e..b7e814f8 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -126,7 +126,9 @@
               v-else
             >
               {{
-                state.couponInfo.length > 0 ? state.couponInfo.length + ' 张可用' : '暂无可用优惠券'
+                state.couponInfo.length > 0
+                  ? state.couponInfo.filter((coupon) => coupon.match).length + ' 张可用'
+                  : '暂无可用优惠券'
               }}
             </text>
             <text class="_icon-forward item-icon" />

From 5f8ed35521d141d1036643fdfe3711ba382acef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 8 Sep 2024 09:56:21 +0800
Subject: [PATCH 76/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E5=8F=AF=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index b7e814f8..7b264fcf 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -126,7 +126,7 @@
               v-else
             >
               {{
-                state.couponInfo.length > 0
+                state.couponInfo.filter((coupon) => coupon.match).length > 0
                   ? state.couponInfo.filter((coupon) => coupon.match).length + ' 张可用'
                   : '暂无可用优惠券'
               }}

From dbc192faa75dd28c18e883e450844c725f22f997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 8 Sep 2024 10:06:15 +0800
Subject: [PATCH 77/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E6=AD=A3=E2=80=9C=E6=9A=82=E6=97=A0?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8=E2=80=9D=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 7b264fcf..32bf1513 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -122,7 +122,11 @@
             </text>
             <text
               class="item-value"
-              :class="state.couponInfo.length > 0 ? 'text-red' : 'text-disabled'"
+              :class="
+                state.couponInfo.filter((coupon) => coupon.match).length > 0
+                  ? 'text-red'
+                  : 'text-disabled'
+              "
               v-else
             >
               {{

From 27af994667d87e0be0e8185600c1c15a9ac0a7de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 8 Sep 2024 10:27:46 +0800
Subject: [PATCH 78/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E9=80=89=E6=8B=A9=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E7=94=A8=E5=92=8C=E4=B8=8D=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=9A=84=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-coupon-list/s-coupon-list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sheep/components/s-coupon-list/s-coupon-list.vue b/sheep/components/s-coupon-list/s-coupon-list.vue
index 1c76e701..17b083e1 100644
--- a/sheep/components/s-coupon-list/s-coupon-list.vue
+++ b/sheep/components/s-coupon-list/s-coupon-list.vue
@@ -76,7 +76,7 @@
     if (props.type === 'coupon') {
       return false;
     }
-    return props.data.status !== 1;
+    return props.disabled;
   });
 
   // 接受参数

From 9521d4b5570ab13897ed74c2c5023f91f86e76c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Sun, 8 Sep 2024 11:39:28 +0800
Subject: [PATCH 79/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E7=A7=92=E6=9D=80=E8=A3=85=E4=BF=AE=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/api/promotion/seckill.js                |  19 +-
 .../s-groupon-block/s-groupon-block.vue       |   1 -
 .../s-seckill-block/s-seckill-block.vue       | 477 ++++++++++++------
 3 files changed, 325 insertions(+), 172 deletions(-)

diff --git a/sheep/api/promotion/seckill.js b/sheep/api/promotion/seckill.js
index 4d41e8b7..f57e054d 100644
--- a/sheep/api/promotion/seckill.js
+++ b/sheep/api/promotion/seckill.js
@@ -1,4 +1,4 @@
-import request from "@/sheep/request";
+import request from '@/sheep/request';
 
 const SeckillApi = {
   // 获得秒杀时间段列表
@@ -16,6 +16,17 @@ const SeckillApi = {
     return request({ url: 'promotion/seckill-activity/page', method: 'GET', params });
   },
 
+  // 获得秒杀活动列表，基于活动编号数组
+  getSeckillActivityListByIds: (ids) => {
+    return request({
+      url: '/promotion/seckill-activity/list-by-ids',
+      method: 'GET',
+      params: {
+        ids,
+      },
+    });
+  },
+
   /**
    * 获得秒杀活动明细
    * @param {number} id 秒杀活动编号
@@ -25,9 +36,9 @@ const SeckillApi = {
     return request({
       url: 'promotion/seckill-activity/get-detail',
       method: 'GET',
-      params: { id }
+      params: { id },
     });
-  }
-}
+  },
+};
 
 export default SeckillApi;
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 59b63c17..1a5a5918 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -145,7 +145,6 @@
   import sheep from '@/sheep';
   import CombinationApi from '@/sheep/api/promotion/combination';
   import SpuApi from '@/sheep/api/product/spu';
-  import spu from '@/sheep/api/product/spu';
 
   // 布局类型
   const LayoutTypeEnum = {
diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index bfc61be0..68f58075 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -1,182 +1,325 @@
-<!-- 装修组件 - 秒杀 -->
+<!-- 装修商品组件：【拼团】商品卡片 -->
 <template>
-	<view>
-		<!-- 样式一：三列 - 上图下文 -->
-		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap" :style="[{ margin: '-' + data.space + 'rpx' }]">
-			<view v-for="product in productList" :key="product.id" class="goods-card-box" :style="[{padding: data.space + 'rpx',},]">
-				<s-goods-column
-					class="goods-card" size="sm"
-					:goodsFields="goodsFields"
-					:tagStyle="badge"
-					:data="product"
-					:titleColor="data.fields.name?.color"
-					:topRadius="data.borderRadiusTop"
-					:bottomRadius="data.borderRadiusBottom"
-					@click="sheep.$router.go('/pages/goods/seckill', { id: props.data.activityId, })">
-				</s-goods-column>
-			</view>
-		</view>
-		<!-- 样式二：一列 - 左图右文 -->
-		<view class="goods-box" v-if="layoutType === 'oneCol'">
-			<view class="goods-list" v-for="(product, index) in productList" :key="index"
-				:style="[{ marginBottom: space + 'px' }]">
-				<s-goods-column
-					class="goods-card"
-					size="lg"
-					:goodsFields="goodsFields"
-					:seckillTag="true"
-					:tagStyle="badge"
-					:data="product"
-					:titleColor="data.fields.name?.color"
-					:subTitleColor="data.fields.introduction?.color"
-					:topRadius="data.borderRadiusTop"
-					:bottomRadius="data.borderRadiusBottom"
-					@click="sheep.$router.go('/pages/goods/seckill', { id: props.data.activityId, })">
-					<template v-slot:cart>
-						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
-							{{ btnBuy?.type === 'text' ? btnBuy.text : '立即秒杀' }}
-						</button>
-					</template>
-				</s-goods-column>
-			</view>
-		</view>
-	</view>
+  <!-- 商品卡片 -->
+  <view>
+    <!-- 布局1. 单列大图（上图，下内容）-->
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.spuList.length"
+      class="goods-sl-box"
+    >
+      <view
+        class="goods-box"
+        v-for="item in state.spuList"
+        :key="item.id"
+        :style="[{ marginBottom: data.space * 2 + 'rpx' }]"
+      >
+        <s-goods-column
+          class=""
+          size="sl"
+          :goodsFields="data.fields"
+          :tagStyle="data.badge"
+          :data="item"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+        >
+          <!-- 购买按钮 -->
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+            </button>
+          </template>
+        </s-goods-column>
+      </view>
+    </view>
+
+    <!-- 布局2. 单列小图（左图，右内容） -->
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length"
+      class="goods-lg-box"
+    >
+      <view
+        class="goods-box"
+        :style="[{ marginBottom: data.space + 'px' }]"
+        v-for="item in state.spuList"
+        :key="item.id"
+      >
+        <s-goods-column
+          class="goods-card"
+          size="lg"
+          :goodsFields="data.fields"
+          :data="item"
+          :tagStyle="data.badge"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @tap="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+        >
+          <!-- 购买按钮 -->
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+            </button>
+          </template>
+        </s-goods-column>
+      </view>
+    </view>
+
+    <!-- 布局3. 双列（每一列：上图，下内容）-->
+    <view
+      v-if="layoutType === LayoutTypeEnum.TWO_COL && state.spuList.length"
+      class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
+    >
+      <view class="goods-list-box">
+        <view
+          class="left-list"
+          :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+          v-for="item in state.leftSpuList"
+          :key="item.id"
+        >
+          <s-goods-column
+            class="goods-md-box"
+            size="md"
+            :goodsFields="data.fields"
+            :tagStyle="data.badge"
+            :data="item"
+            :titleColor="data.fields.name?.color"
+            :subTitleColor="data.fields.introduction.color"
+            :topRadius="data.borderRadiusTop"
+            :bottomRadius="data.borderRadiusBottom"
+            :titleWidth="330 - marginLeft - marginRight"
+            @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+            @getHeight="calculateGoodsColumn($event, 'left')"
+          >
+            <!-- 购买按钮 -->
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+              </button>
+            </template>
+          </s-goods-column>
+        </view>
+      </view>
+      <view class="goods-list-box">
+        <view
+          class="right-list"
+          :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+          v-for="item in state.rightSpuList"
+          :key="item.id"
+        >
+          <s-goods-column
+            class="goods-md-box"
+            size="md"
+            :goodsFields="data.fields"
+            :tagStyle="data.badge"
+            :data="item"
+            :titleColor="data.fields.name?.color"
+            :subTitleColor="data.fields.introduction.color"
+            :topRadius="data.borderRadiusTop"
+            :bottomRadius="data.borderRadiusBottom"
+            :titleWidth="330 - marginLeft - marginRight"
+            @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+            @getHeight="calculateGoodsColumn($event, 'right')"
+          >
+            <!-- 购买按钮 -->
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+              </button>
+            </template>
+          </s-goods-column>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	/**
-	 * 秒杀商品列表
-	 *
-	 * @property {Array} list 商品列表
-	 */
-	import {
-		computed,
-		onMounted,
-		reactive,
-		ref
-	} from 'vue';
-	import sheep from '@/sheep';
-	import SeckillApi from "@/sheep/api/promotion/seckill";
-	import SpuApi from "@/sheep/api/product/spu";
+  /**
+   * 商品卡片
+   */
+  import { computed, onMounted, reactive, ref } from 'vue';
+  import sheep from '@/sheep';
+  import SeckillApi from '@/sheep/api/promotion/seckill';
+  import SpuApi from '@/sheep/api/product/spu';
 
-	// 接收参数
-	const props = defineProps({
-		// 装修数据
-		data: {
-			type: Object,
-			default: () => ({}),
-		},
-		// 装修样式
-		styles: {
-			type: Object,
-			default: () => ({}),
-		},
-	});
-	
-	// 设置相关信息是否显示
-	const goodsFields = reactive({
-	  // 商品价格
-	  price: { show: true },
-	  // 库存
-	  stock: { show: true },
-	  // 商品名称
-	  name: { show: true },
-	  // 商品介绍
-	  introduction: { show: true },
-	  // 市场价
-	  marketPrice: { show: true },
-	  // 销量
-	  salesCount: { show: true },
-	});
-	
-	let {
-		layoutType,
-		badge,
-		btnBuy,
-		space,
-	} = props.data;
-	let {
-		marginLeft,
-		marginRight
-	} = props.styles;
+  // 布局类型
+  const LayoutTypeEnum = {
+    // 单列大图
+    ONE_COL_BIG_IMG: 'oneColBigImg',
+    // 双列
+    TWO_COL: 'twoCol',
+    // 单列小图
+    ONE_COL_SMALL_IMG: 'oneColSmallImg',
+  };
 
-	// 购买按钮样式
-	const buyStyle = computed(() => {
-		let btnBuy = props.data.btnBuy;
-		if (btnBuy?.type === 'text') {
-			return {
-				background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
-			};
-		}
-		if (btnBuy?.type === 'img') {
-			return {
-				width: '54rpx',
-				height: '54rpx',
-				background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
-				backgroundSize: '100% 100%',
-			};
-		}
-	});
+  const state = reactive({
+    spuList: [],
+    leftSpuList: [],
+    rightSpuList: [],
+  });
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    },
+    styles: {
+      type: Object,
+      default() {},
+    },
+  });
 
-	// 商品列表
-	const productList = ref([]);
-	// 查询秒杀活动商品
-	onMounted(async () => {
-		// todo：@owen 与Yudao结构不一致，待重构
-		const {
-			data: activity
-		} = await SeckillApi.getSeckillActivity(props.data.activityId);
-		const {
-			data: spu
-		} = await SpuApi.getSpuDetail(activity.spuId)
-		// 循环活动信息，赋值秒杀最低价格
-		activity.products.forEach((product) => {
-			spu.price = Math.min(spu.price, product.seckillPrice); // 设置 SPU 的最低价格
-		});
-    // 将活动库存赋值给商品库存
-    spu.stock = activity.stock
-    // 活动总库存 - 活动库存 = 销量
-    spu.salesCount = activity.totalStock - activity.stock
-		productList.value = [spu];
-	});
+  const { layoutType, btnBuy, activityIds } = props.data || {};
+  const { marginLeft, marginRight } = props.styles || {};
+
+  // 购买按钮样式
+  const buyStyle = computed(() => {
+    if (btnBuy.type === 'text') {
+      // 文字按钮：线性渐变背景颜色
+      return {
+        background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
+      };
+    }
+    if (btnBuy.type === 'img') {
+      // 图片按钮
+      return {
+        width: '54rpx',
+        height: '54rpx',
+        background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
+        backgroundSize: '100% 100%',
+      };
+    }
+  });
+
+  //region 商品瀑布流布局
+  // 下一个要处理的商品索引
+  let count = 0;
+  // 左列的高度
+  let leftHeight = 0;
+  // 右列的高度
+  let rightHeight = 0;
+
+  /**
+   * 计算商品在左列还是右列
+   * @param height 商品的高度
+   * @param where 添加到哪一列
+   */
+  function calculateGoodsColumn(height = 0, where = 'left') {
+    // 处理完
+    if (!state.spuList[count]) return;
+    // 增加列的高度
+    if (where === 'left') leftHeight += height;
+    if (where === 'right') rightHeight += height;
+    // 添加到矮的一列
+    if (leftHeight <= rightHeight) {
+      state.leftSpuList.push(state.spuList[count]);
+    } else {
+      state.rightSpuList.push(state.spuList[count]);
+    }
+    // 计数
+    count++;
+  }
+
+  //endregion
+
+  /**
+   * 根据商品编号列表，获取商品列表
+   * @param ids 商品编号列表
+   * @return {Promise<undefined>} 商品列表
+   */
+  async function getSeckillActivityDetailList(ids) {
+    const { data } = await SeckillApi.getSeckillActivityListByIds(ids);
+    return data;
+  }
+
+  /**
+   * 根据商品编号，获取商品详情
+   * @param ids 商品编号列表
+   * @return {Promise<undefined>} 商品列表
+   */
+  async function getSpuDetail(ids) {
+    const { data: spu } = await SpuApi.getSpuDetail(ids);
+    return spu;
+  }
+
+  // 初始化
+  onMounted(async () => {
+    // 加载活动列表
+    const activityList = await getSeckillActivityDetailList(activityIds.join(','));
+    // 循环获取活动商品SPU详情并添加到spuList
+    for (const activity of activityList) {
+      state.spuList.push(await getSpuDetail(activity.spuId));
+    }
+
+    // 循环活动列表
+    activityList.forEach((activity) => {
+      // 提取活动价格
+      const seckillPrice = activity.seckillPrice || Infinity;
+      // 查找对应的 spu 并更新价格
+      const spu = state.spuList.find((spu) => activity.spuId === spu.id);
+      if (spu) {
+        // 赋值最低价格
+        spu.price = Math.min(seckillPrice, spu.price);
+        // 赋值活动ID，为了点击跳转详情页
+        spu.activityId = activity.id;
+      }
+    });
+
+    // 只有双列布局时需要
+    if (layoutType === LayoutTypeEnum.TWO_COL) {
+      // 分列
+      calculateGoodsColumn();
+    }
+  });
 </script>
 
 <style lang="scss" scoped>
-	.header-box {
-		height: 100rpx;
-	}
+  .goods-md-wrap {
+    width: 100%;
+  }
 
-	.goods-list {
-		position: relative;
+  .goods-list-box {
+    width: 50%;
+    box-sizing: border-box;
 
-		&:nth-last-child(1) {
-			margin-bottom: 0 !important;
-		}
+    .left-list {
+      &:nth-last-child(1) {
+        margin-bottom: 0 !important;
+      }
+    }
 
-		.cart-btn {
-			position: absolute;
-			bottom: 10rpx;
-			right: 20rpx;
-			z-index: 11;
-			height: 50rpx;
-			line-height: 50rpx;
-			padding: 0 20rpx;
-			border-radius: 25rpx;
-			font-size: 24rpx;
-			color: #fff;
-			background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
-		}
-	}
+    .right-list {
+      &:nth-last-child(1) {
+        margin-bottom: 0 !important;
+      }
+    }
+  }
 
-	.goods-sm-box {
-		margin: 0 auto;
-		box-sizing: border-box;
+  .goods-box {
+    &:nth-last-of-type(1) {
+      margin-bottom: 0 !important;
+    }
+  }
 
-		.goods-card-box {
-			flex-shrink: 0;
-			overflow: hidden;
-			width: 33.3%;
-			box-sizing: border-box;
-		}
-	}
-</style>
\ No newline at end of file
+  .goods-md-box,
+  .goods-sl-box,
+  .goods-lg-box {
+    position: relative;
+
+    .cart-btn {
+      position: absolute;
+      bottom: 18rpx;
+      right: 20rpx;
+      z-index: 11;
+      height: 50rpx;
+      line-height: 50rpx;
+      padding: 0 20rpx;
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      color: #fff;
+    }
+  }
+</style>

From 29584a108b2f92161d9b481692a7cb51e8e00eb1 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 9 Sep 2024 09:22:06 +0800
Subject: [PATCH 80/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E7=A7=92=E6=9D=80=E8=A3=85=E4=BF=AE=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-seckill-block/s-seckill-block.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index 68f58075..d4bbcafe 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -1,4 +1,4 @@
-<!-- 装修商品组件：【拼团】商品卡片 -->
+<!-- 装修商品组件：【秒杀】商品卡片 -->
 <template>
   <!-- 商品卡片 -->
   <view>

From 97711bad3e26a0326655361408536db51dd29cd9 Mon Sep 17 00:00:00 2001
From: Lcp <2767378157@qq.com>
Date: Mon, 9 Sep 2024 12:17:12 +0800
Subject: [PATCH 81/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E9=A6=96=E4=B8=AA=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pay/index.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index 46e3eafd..103e9e4d 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -174,6 +174,12 @@
       return
     }
     state.payMethods = getPayMethods(data)
+    state.payMethods.find(item => {
+      if (item.value && !item.disabled) {
+        state.payment = item.value;
+        return true;
+      }
+    });
   }
 
   onLoad((options) => {

From b2d030f96bc4085172c7f91440e2eae347a3bd0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Mon, 9 Sep 2024 22:46:24 +0800
Subject: [PATCH 82/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=9B=A2=E7=9A=84?=
 =?UTF-8?q?=E5=8D=95=E4=B9=B0=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/groupon.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 7f4128ba..b24b1614 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -54,7 +54,7 @@
                 <view class="origin-price ss-flex ss-col-center" v-if="state.goodsInfo.price">
                   单买价：
                   <view class="origin-price-text">
-                    {{ fen2yuan(state.goodsInfo.price) }}
+                    {{ fen2yuan(state.goodsInfo.marketPrice) }}
                   </view>
                 </view>
               </view>

From 49e8b9f5c3a2aacfd60e44b6edb1e43a96c336fb Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 13 Sep 2024 19:21:22 +0800
Subject: [PATCH 83/84] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91=E4=B8=8B=E5=8D=95=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=E9=97=A8=E5=BA=97=E8=87=AA=E6=8F=90=E7=9A=84?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/addressSelection.vue | 119 ++++++++++++++++++-------------
 pages/order/confirm.vue          |   8 ++-
 2 files changed, 75 insertions(+), 52 deletions(-)

diff --git a/pages/order/addressSelection.vue b/pages/order/addressSelection.vue
index 2432d413..d54c68d3 100644
--- a/pages/order/addressSelection.vue
+++ b/pages/order/addressSelection.vue
@@ -1,52 +1,69 @@
 <!-- 下单界面，收货地址 or 自提门店的选择组件 -->
 <template>
-  <view class="allAddress" :style="state.isPickUp ? '':'padding-top:10rpx;'">
+  <view class="allAddress" :style="state.isPickUp ? '' : 'padding-top:10rpx;'">
     <view class="nav flex flex-wrap">
-      <view class="item font-color" :class="state.deliveryType === 1 ? 'on' : 'on2'"
-            @tap="switchDeliveryType(1)" v-if='state.isPickUp' />
-      <view class="item font-color" :class="state.deliveryType === 2 ? 'on' : 'on2'"
-            @tap="switchDeliveryType(2)" v-if='state.isPickUp' />
+      <view
+        class="item font-color"
+        :class="state.deliveryType === 1 ? 'on' : 'on2'"
+        @tap="switchDeliveryType(1)"
+        v-if="state.isPickUp"
+      />
+      <view
+        class="item font-color"
+        :class="state.deliveryType === 2 ? 'on' : 'on2'"
+        @tap="switchDeliveryType(2)"
+        v-if="state.isPickUp"
+      />
     </view>
     <!-- 情况一：收货地址的选择 -->
-    <view class='address flex flex-wrap flex-center ss-row-between' @tap='onSelectAddress' v-if='state.deliveryType === 1'
-          :style="state.isPickUp ? '':'border-top-left-radius: 14rpx;border-top-right-radius: 14rpx;'">
-      <view class='addressCon' v-if="state.addressInfo.name">
-        <view class='name'>{{ state.addressInfo.name }}
-          <text class='phone'>{{ state.addressInfo.mobile }}</text>
+    <view
+      class="address flex flex-wrap flex-center ss-row-between"
+      @tap="onSelectAddress"
+      v-if="state.deliveryType === 1"
+      :style="state.isPickUp ? '' : 'border-top-left-radius: 14rpx;border-top-right-radius: 14rpx;'"
+    >
+      <view class="addressCon" v-if="state.addressInfo.name">
+        <view class="name"
+          >{{ state.addressInfo.name }}
+          <text class="phone">{{ state.addressInfo.mobile }}</text>
         </view>
         <view class="flex flex-wrap">
-          <text class='default font-color' v-if="state.addressInfo.defaultStatus">[默认]</text>
-          <text class="line2">{{ state.addressInfo.areaName }} {{ state.addressInfo.detailAddress }}</text>
+          <text class="default font-color" v-if="state.addressInfo.defaultStatus">[默认]</text>
+          <text class="line2"
+            >{{ state.addressInfo.areaName }} {{ state.addressInfo.detailAddress }}</text
+          >
         </view>
       </view>
-      <view class='addressCon' v-else>
-        <view class='setaddress'>设置收货地址</view>
+      <view class="addressCon" v-else>
+        <view class="setaddress">设置收货地址</view>
       </view>
-      <view class='iconfont'>
+      <view class="iconfont">
         <view class="ss-rest-button">
           <text class="_icon-forward" />
         </view>
       </view>
     </view>
     <!-- 情况二：门店的选择 -->
-    <view class='address flex flex-wrap flex-center ss-row-between' v-else @tap="onSelectAddress">
-        <view class='addressCon' v-if="state.pickUpInfo.name">
-          <view class='name'>{{ state.pickUpInfo.name }}
-            <text class='phone'>{{ state.pickUpInfo.phone }}</text>
-          </view>
-          <view class="line1"> {{ state.pickUpInfo.areaName }}{{ ', ' + state.pickUpInfo.detailAddress }}
-          </view>
+    <view class="address flex flex-wrap flex-center ss-row-between" v-else @tap="onSelectAddress">
+      <view class="addressCon" v-if="state.pickUpInfo.name">
+        <view class="name"
+          >{{ state.pickUpInfo.name }}
+          <text class="phone">{{ state.pickUpInfo.phone }}</text>
         </view>
-        <view class='addressCon' v-else>
-          <view class='setaddress'>选择自提门店</view>
+        <view class="line1">
+          {{ state.pickUpInfo.areaName }}{{ ', ' + state.pickUpInfo.detailAddress }}
         </view>
-        <view class='iconfont'>
-          <view class="ss-rest-button">
-            <text class="_icon-forward" />
-          </view>
+      </view>
+      <view class="addressCon" v-else>
+        <view class="setaddress">选择自提门店</view>
+      </view>
+      <view class="iconfont">
+        <view class="ss-rest-button">
+          <text class="_icon-forward" />
         </view>
+      </view>
     </view>
-    <view class='line'>
+    <view class="line">
       <image :src="sheep.$url.static('/static/images/line.png', 'local')" />
     </view>
   </view>
@@ -61,13 +78,13 @@
     modelValue: {
       type: Object,
       default() {},
-    }
+    },
   });
   const emits = defineEmits(['update:modelValue']);
 
   // computed 解决父子组件双向数据同步
   const state = computed({
-    get(){
+    get() {
       return new Proxy(props.modelValue, {
         set(obj, name, val) {
           emits('update:modelValue', {
@@ -75,21 +92,21 @@
             [name]: val,
           });
           return true;
-        }
-      })
+        },
+      });
     },
-    set(val){
+    set(val) {
       emits('update:modelValue', val);
-    }
-  })
+    },
+  });
 
   // 选择地址
   function onSelectAddress() {
-    let emitName = 'SELECT_ADDRESS'
+    let emitName = 'SELECT_ADDRESS';
     let addressPage = '/pages/user/address/list?type=select';
-    if (state.value.deliveryType === 2){
-      emitName = 'SELECT_PICK_UP_INFO'
-      addressPage = '/pages/user/goods_details_store/index'
+    if (state.value.deliveryType === 2) {
+      emitName = 'SELECT_PICK_UP_INFO';
+      addressPage = '/pages/user/goods_details_store/index';
     }
     uni.$once(emitName, (e) => {
       changeConsignee(e.addressInfo);
@@ -100,26 +117,26 @@
   // 更改收货人地址&计算订单信息
   async function changeConsignee(addressInfo = {}) {
     if (!isEmpty(addressInfo)) {
-      if (state.value.deliveryType === 1){
+      if (state.value.deliveryType === 1) {
         state.value.addressInfo = addressInfo;
       }
-      if (state.value.deliveryType === 2){
+      if (state.value.deliveryType === 2) {
         state.value.pickUpInfo = addressInfo;
       }
     }
   }
 
   // 收货方式切换
-  const switchDeliveryType = (type) =>{
+  const switchDeliveryType = (type) => {
     state.value.deliveryType = type;
-  }
+  };
 </script>
 
 <style scoped lang="scss">
-  .allAddress .font-color{
-    color: #E93323!important
+  .allAddress .font-color {
+    color: #e93323 !important;
   }
-  .line2{
+  .line2 {
     width: 504rpx;
   }
   .textR {
@@ -202,7 +219,7 @@
   .allAddress .nav .item.on::before {
     position: absolute;
     bottom: 0;
-    content: "快递配送";
+    content: '快递配送';
     font-size: 28rpx;
     display: block;
     height: 0;
@@ -217,7 +234,7 @@
   }
 
   .allAddress .nav .item:nth-of-type(2).on::before {
-    content: "到店自提";
+    content: '到店自提';
     border-width: 0 0 80rpx 20rpx;
     border-radius: 36rpx 14rpx 0 0;
   }
@@ -229,7 +246,7 @@
   .allAddress .nav .item.on2::before {
     position: absolute;
     bottom: 0;
-    content: "到店自提";
+    content: '到店自提';
     font-size: 28rpx;
     display: block;
     height: 0;
@@ -243,7 +260,7 @@
   }
 
   .allAddress .nav .item:nth-of-type(1).on2::before {
-    content: "快递配送";
+    content: '快递配送';
     border-width: 0 60rpx 60rpx 0;
     border-radius: 14rpx 36rpx 0 0;
   }
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 32bf1513..70393b2e 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -212,6 +212,7 @@
   import AddressSelection from '@/pages/order/addressSelection.vue';
   import sheep from '@/sheep';
   import OrderApi from '@/sheep/api/trade/order';
+  import TradeConfigApi from '@/sheep/api/trade/config';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
 
   const state = reactive({
@@ -230,7 +231,7 @@
   const addressState = ref({
     addressInfo: {}, // 选择的收货地址
     deliveryType: 1, // 收货方式：1-快递配送，2-门店自提
-    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
+    isPickUp: true, // 门店自提是否开启
     pickUpInfo: {}, // 选择的自提门店信息
     receiverName: '', // 收件人名称
     receiverMobile: '', // 收件人手机
@@ -343,6 +344,11 @@
     }
     state.orderPayload = JSON.parse(options.data);
     await getOrderInfo();
+    // 获取交易配置
+    const { data, code } = await TradeConfigApi.getTradeConfig();
+    if (code === 0) {
+      addressState.value.isPickUp = data.deliveryPickUpEnabled;
+    }
   });
 
   // 使用 watch 监听地址和配送方式的变化

From eb3d0ff6b0421d8a8e0e0693882057d98b583e66 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 15 Sep 2024 17:59:42 +0800
Subject: [PATCH 84/84] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20/promotion/activity/list-by-spu-id=20=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/index.vue                         | 669 ++++++++++--------
 sheep/api/promotion/activity.js               |   2 +-
 .../s-seckill-block/s-seckill-block.vue       |   8 +-
 3 files changed, 362 insertions(+), 317 deletions(-)

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 5d4d7a1f..978448ac 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -1,175 +1,225 @@
 <template>
-	<view>
-		<s-layout :onShareAppMessage="shareInfo" navbar="goods">
-			<!-- 标题栏 -->
-			<detailNavbar />
+  <view>
+    <s-layout :onShareAppMessage="shareInfo" navbar="goods">
+      <!-- 标题栏 -->
+      <detailNavbar />
 
-			<!-- 骨架屏 -->
-			<detailSkeleton v-if="state.skeletonLoading" />
-			<!-- 下架/售罄提醒 -->
-			<s-empty v-else-if="state.goodsInfo === null" text="商品不存在或已下架" icon="/static/soldout-empty.png" showAction
-               actionText="再逛逛" actionUrl="/pages/goods/list" />
-			<block v-else>
-				<view class="detail-swiper-selector">
-					<!-- 商品轮播图  -->
-					<su-swiper class="ss-m-b-14" isPreview :list="formatGoodsSwiper(state.goodsInfo.sliderPicUrls)"
-                     otStyle="tag" imageMode="widthFix" dotCur="bg-mask-40" :seizeHeight="750" />
+      <!-- 骨架屏 -->
+      <detailSkeleton v-if="state.skeletonLoading" />
+      <!-- 下架/售罄提醒 -->
+      <s-empty
+        v-else-if="state.goodsInfo === null"
+        text="商品不存在或已下架"
+        icon="/static/soldout-empty.png"
+        showAction
+        actionText="再逛逛"
+        actionUrl="/pages/goods/list"
+      />
+      <block v-else>
+        <view class="detail-swiper-selector">
+          <!-- 商品轮播图  -->
+          <su-swiper
+            class="ss-m-b-14"
+            isPreview
+            :list="formatGoodsSwiper(state.goodsInfo.sliderPicUrls)"
+            otStyle="tag"
+            imageMode="widthFix"
+            dotCur="bg-mask-40"
+            :seizeHeight="750"
+          />
 
-					<!-- 价格+标题 -->
-					<view class="title-card detail-card ss-p-y-40 ss-p-x-20">
-						<view class="ss-flex ss-row-between ss-col-center ss-m-b-26">
-							<view class="price-box ss-flex ss-col-bottom">
-								<view class="price-text ss-m-r-16">
-									{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
-								</view>
-								<view class="origin-price-text" v-if="state.goodsInfo.marketPrice > 0">
-									{{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
-								</view>
-							</view>
-							<view class="sales-text">
-								{{ formatSales('exact', state.goodsInfo.salesCount) }}
-							</view>
-						</view>
-						<view class="discounts-box ss-flex ss-row-between ss-m-b-28">
-							<!-- 满减送/限时折扣活动的提示 -->
-							<div class="tag-content">
-								<view class="tag-box ss-flex">
-									<view class="tag ss-m-r-10" v-for="promos in state.activityInfo"
-                        :key="promos.id" @tap="onActivity">
-										{{ promos.name }}
-									</view>
-								</view>
-							</div>
+          <!-- 价格+标题 -->
+          <view class="title-card detail-card ss-p-y-40 ss-p-x-20">
+            <view class="ss-flex ss-row-between ss-col-center ss-m-b-26">
+              <view class="price-box ss-flex ss-col-bottom">
+                <view class="price-text ss-m-r-16">
+                  {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
+                </view>
+                <view class="origin-price-text" v-if="state.goodsInfo.marketPrice > 0">
+                  {{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
+                </view>
+              </view>
+              <view class="sales-text">
+                {{ formatSales('exact', state.goodsInfo.salesCount) }}
+              </view>
+            </view>
+            <view class="discounts-box ss-flex ss-row-between ss-m-b-28">
+              <!-- 满减送/限时折扣活动的提示 -->
+              <div class="tag-content">
+                <view class="tag-box ss-flex">
+                  <view
+                    class="tag ss-m-r-10"
+                    v-for="promos in state.activityInfo"
+                    :key="promos.id"
+                    @tap="onActivity"
+                  >
+                    {{ promos.name }}
+                  </view>
+                </view>
+              </div>
 
-							<!-- 优惠劵 -->
-							<view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="state.showModel = true"
-								v-if="state.couponInfo.length">
-								<view class="discounts-title ss-m-r-8">领券</view>
-								<text class="cicon-forward"></text>
-							</view>
-						</view>
-						<view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo.name }}</view>
-						<view class="subtitle-text ss-line-1">{{ state.goodsInfo.introduction }}</view>
-					</view>
+              <!-- 优惠劵 -->
+              <view
+                class="get-coupon-box ss-flex ss-col-center ss-m-l-20"
+                @tap="state.showModel = true"
+                v-if="state.couponInfo.length"
+              >
+                <view class="discounts-title ss-m-r-8">领券</view>
+                <text class="cicon-forward"></text>
+              </view>
+            </view>
+            <view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo.name }}</view>
+            <view class="subtitle-text ss-line-1">{{ state.goodsInfo.introduction }}</view>
+          </view>
 
-					<!-- 功能卡片 -->
-					<view class="detail-cell-card detail-card ss-flex-col">
-						<detail-cell-sku v-model="state.selectedSku.goods_sku_text" :sku="state.selectedSku"
-                             @tap="state.showSelectSku = true" />
-					</view>
+          <!-- 功能卡片 -->
+          <view class="detail-cell-card detail-card ss-flex-col">
+            <detail-cell-sku
+              v-model="state.selectedSku.goods_sku_text"
+              :sku="state.selectedSku"
+              @tap="state.showSelectSku = true"
+            />
+          </view>
 
-					<!-- 规格与数量弹框 -->
-					<s-select-sku :goodsInfo="state.goodsInfo" :show="state.showSelectSku" @addCart="onAddCart"
-                        @buy="onBuy" @change="onSkuChange" @close="state.showSelectSku = false" />
-				</view>
+          <!-- 规格与数量弹框 -->
+          <s-select-sku
+            :goodsInfo="state.goodsInfo"
+            :show="state.showSelectSku"
+            @addCart="onAddCart"
+            @buy="onBuy"
+            @change="onSkuChange"
+            @close="state.showSelectSku = false"
+          />
+        </view>
 
-				<!-- 评价 -->
-				<detail-comment-card class="detail-comment-selector" :goodsId="state.goodsId" />
-				<!-- 详情 -->
-				<detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
+        <!-- 评价 -->
+        <detail-comment-card class="detail-comment-selector" :goodsId="state.goodsId" />
+        <!-- 详情 -->
+        <detail-content-card
+          class="detail-content-selector"
+          :content="state.goodsInfo.description"
+        />
 
-				<!-- 活动跳转：拼团/秒杀/砍价活动 -->
-				<detail-activity-tip v-if="state.activityList.length > 0" :activity-list="state.activityList" />
+        <!-- 活动跳转：拼团/秒杀/砍价活动 -->
+        <detail-activity-tip
+          v-if="state.activityList.length > 0"
+          :activity-list="state.activityList"
+        />
 
-				<!-- 详情 tabbar -->
-				<detail-tabbar v-model="state.goodsInfo">
-					<view class="buy-box ss-flex ss-col-center ss-p-r-20" v-if="state.goodsInfo.stock > 0">
-						<button class="ss-reset-button add-btn ui-Shadow-Main" @tap="state.showSelectSku = true">
-							加入购物车
-						</button>
-						<button class="ss-reset-button buy-btn ui-Shadow-Main" @tap="state.showSelectSku = true">
-							立即购买
-						</button>
-					</view>
-					<view class="buy-box ss-flex ss-col-center ss-p-r-20" v-else>
-						<button class="ss-reset-button disabled-btn" disabled> 已售罄 </button>
-					</view>
-				</detail-tabbar>
+        <!-- 详情 tabbar -->
+        <detail-tabbar v-model="state.goodsInfo">
+          <view class="buy-box ss-flex ss-col-center ss-p-r-20" v-if="state.goodsInfo.stock > 0">
+            <button
+              class="ss-reset-button add-btn ui-Shadow-Main"
+              @tap="state.showSelectSku = true"
+            >
+              加入购物车
+            </button>
+            <button
+              class="ss-reset-button buy-btn ui-Shadow-Main"
+              @tap="state.showSelectSku = true"
+            >
+              立即购买
+            </button>
+          </view>
+          <view class="buy-box ss-flex ss-col-center ss-p-r-20" v-else>
+            <button class="ss-reset-button disabled-btn" disabled> 已售罄 </button>
+          </view>
+        </detail-tabbar>
 
-				<!-- 优惠劵弹窗 -->
-				<s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false"
-                      @get="onGet" />
+        <!-- 优惠劵弹窗 -->
+        <s-coupon-get
+          v-model="state.couponInfo"
+          :show="state.showModel"
+          @close="state.showModel = false"
+          @get="onGet"
+        />
 
-				<!-- 满减送/限时折扣活动弹窗 -->
-				<s-activity-pop v-model="state.activityInfo" :show="state.showActivityModel"
-                        @close="state.showActivityModel = false" />
-			</block>
-		</s-layout>
-	</view>
+        <!-- 满减送/限时折扣活动弹窗 -->
+        <s-activity-pop
+          v-model="state.activityInfo"
+          :show="state.showActivityModel"
+          @close="state.showActivityModel = false"
+        />
+      </block>
+    </s-layout>
+  </view>
 </template>
 
 <script setup>
-	import { reactive, computed } from 'vue';
-	import { onLoad, onPageScroll } from '@dcloudio/uni-app';
-	import sheep from '@/sheep';
-	import CouponApi from '@/sheep/api/promotion/coupon';
-	import ActivityApi from '@/sheep/api/promotion/activity';
+  import { reactive, computed } from 'vue';
+  import { onLoad, onPageScroll } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import CouponApi from '@/sheep/api/promotion/coupon';
+  import ActivityApi from '@/sheep/api/promotion/activity';
   import FavoriteApi from '@/sheep/api/product/favorite';
   import { formatSales, formatGoodsSwiper, fen2yuan } from '@/sheep/hooks/useGoods';
-	import detailNavbar from './components/detail/detail-navbar.vue';
-	import detailCellSku from './components/detail/detail-cell-sku.vue';
-	import detailTabbar from './components/detail/detail-tabbar.vue';
-	import detailSkeleton from './components/detail/detail-skeleton.vue';
-	import detailCommentCard from './components/detail/detail-comment-card.vue';
-	import detailContentCard from './components/detail/detail-content-card.vue';
-	import detailActivityTip from './components/detail/detail-activity-tip.vue';
-	import { isEmpty } from 'lodash-es';
+  import detailNavbar from './components/detail/detail-navbar.vue';
+  import detailCellSku from './components/detail/detail-cell-sku.vue';
+  import detailTabbar from './components/detail/detail-tabbar.vue';
+  import detailSkeleton from './components/detail/detail-skeleton.vue';
+  import detailCommentCard from './components/detail/detail-comment-card.vue';
+  import detailContentCard from './components/detail/detail-content-card.vue';
+  import detailActivityTip from './components/detail/detail-activity-tip.vue';
+  import { isEmpty } from 'lodash-es';
   import SpuApi from '@/sheep/api/product/spu';
 
-	onPageScroll(() => {});
+  onPageScroll(() => {});
 
   const isLogin = computed(() => sheep.$store('user').isLogin);
   const state = reactive({
-		goodsId: 0,
-		skeletonLoading: true, // SPU 加载中
-		goodsInfo: {}, // SPU 信息
-		showSelectSku: false, // 是否展示 SKU 选择弹窗
-		selectedSku: {}, // 选中的 SKU
-		showModel: false, // 是否展示 Coupon 优惠劵的弹窗
-		couponInfo: [], // 可领取的 Coupon 优惠劵的列表
-		showActivityModel: false, // 【满减送/限时折扣】是否展示 Activity 营销活动的弹窗
-		activityInfo: [], // 【满减送/限时折扣】可参与的 Activity 营销活动的列表
-		activityList: [], // 【秒杀/拼团/砍价】可参与的 Activity 营销活动的列表
-	});
+    goodsId: 0,
+    skeletonLoading: true, // SPU 加载中
+    goodsInfo: {}, // SPU 信息
+    showSelectSku: false, // 是否展示 SKU 选择弹窗
+    selectedSku: {}, // 选中的 SKU
+    showModel: false, // 是否展示 Coupon 优惠劵的弹窗
+    couponInfo: [], // 可领取的 Coupon 优惠劵的列表
+    showActivityModel: false, // 【满减送/限时折扣】是否展示 Activity 营销活动的弹窗
+    activityInfo: [], // 【满减送/限时折扣】可参与的 Activity 营销活动的列表 TODO 芋艿：正在接入中
+    activityList: [], // 【秒杀/拼团/砍价】可参与的 Activity 营销活动的列表
+  });
 
-	// 规格变更
-	function onSkuChange(e) {
-		state.selectedSku = e;
-	}
+  // 规格变更
+  function onSkuChange(e) {
+    state.selectedSku = e;
+  }
 
-	// 添加购物车
-	function onAddCart(e) {
+  // 添加购物车
+  function onAddCart(e) {
     if (!e.id) {
       sheep.$helper.toast('请选择商品规格');
       return;
     }
-		sheep.$store('cart').add(e);
-	}
+    sheep.$store('cart').add(e);
+  }
 
-	// 立即购买
-	function onBuy(e) {
+  // 立即购买
+  function onBuy(e) {
     if (!state.selectedSku.id) {
       sheep.$helper.toast('请选择商品规格');
       return;
     }
     sheep.$router.go('/pages/order/confirm', {
       data: JSON.stringify({
-        items: [{
-          skuId: e.id,
-          count: e.goods_num,
-		      categoryId: state.goodsInfo.categoryId
-        }]
+        items: [
+          {
+            skuId: e.id,
+            count: e.goods_num,
+            categoryId: state.goodsInfo.categoryId,
+          },
+        ],
       }),
     });
-	}
+  }
 
-	// 营销活动
-	function onActivity() {
-		state.showActivityModel = true;
-	}
+  // 营销活动
+  function onActivity() {
+    state.showActivityModel = true;
+  }
 
-	// 立即领取
-	async function onGet(id) {
+  // 立即领取
+  async function onGet(id) {
     const { code } = await CouponApi.takeCoupon(id);
     if (code !== 0) {
       return;
@@ -180,26 +230,29 @@
     setTimeout(() => {
       getCoupon();
     }, 1000);
-	}
+  }
 
-	const shareInfo = computed(() => {
-		if (isEmpty(state.goodsInfo)) return {};
-		return sheep.$platform.share.getShareInfo({
-			title: state.goodsInfo.name,
-			image: sheep.$url.cdn(state.goodsInfo.picUrl),
-			desc: state.goodsInfo.introduction,
-			params: {
-				page: '2',
-				query: state.goodsInfo.id,
-			},
-		}, {
-			type: 'goods', // 商品海报
-			title: state.goodsInfo.name, // 商品名称
-			image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
-			price: fen2yuan(state.goodsInfo.price), // 商品价格
-			original_price: fen2yuan(state.goodsInfo.marketPrice), // 商品原价
-		});
-	});
+  const shareInfo = computed(() => {
+    if (isEmpty(state.goodsInfo)) return {};
+    return sheep.$platform.share.getShareInfo(
+      {
+        title: state.goodsInfo.name,
+        image: sheep.$url.cdn(state.goodsInfo.picUrl),
+        desc: state.goodsInfo.introduction,
+        params: {
+          page: '2',
+          query: state.goodsInfo.id,
+        },
+      },
+      {
+        type: 'goods', // 商品海报
+        title: state.goodsInfo.name, // 商品名称
+        image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
+        price: fen2yuan(state.goodsInfo.price), // 商品价格
+        original_price: fen2yuan(state.goodsInfo.marketPrice), // 商品原价
+      },
+    );
+  });
 
   async function getCoupon() {
     const { code, data } = await CouponApi.getCouponTemplateList(state.goodsId, 2, 10);
@@ -208,23 +261,23 @@
     }
   }
 
-	onLoad((options) => {
-		// 非法参数
-		if (!options.id) {
-			state.goodsInfo = null;
-			return;
-		}
-		state.goodsId = options.id;
-		// 1. 加载商品信息
-		SpuApi.getSpuDetail(state.goodsId).then((res) => {
-			// 未找到商品
-			if (res.code !== 0 || !res.data) {
-				state.goodsInfo = null;
-				return;
-			}
-			// 加载到商品
-			state.skeletonLoading = false;
-			state.goodsInfo = res.data;
+  onLoad((options) => {
+    // 非法参数
+    if (!options.id) {
+      state.goodsInfo = null;
+      return;
+    }
+    state.goodsId = options.id;
+    // 1. 加载商品信息
+    SpuApi.getSpuDetail(state.goodsId).then((res) => {
+      // 未找到商品
+      if (res.code !== 0 || !res.data) {
+        state.goodsInfo = null;
+        return;
+      }
+      // 加载到商品
+      state.skeletonLoading = false;
+      state.goodsInfo = res.data;
 
       // 加载是否收藏
       if (isLogin.value) {
@@ -235,172 +288,164 @@
           state.goodsInfo.favorite = res.data;
         });
       }
-		});
+    });
 
-		// 2. 加载优惠劵信息
+    // 2. 加载优惠劵信息
     getCoupon();
 
-		// 3. 加载营销活动信息
-		ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
-			if (res.code !== 0) {
-				return;
-			}
-      res.data.forEach(activity => {
-        if ([1, 2, 3].includes(activity.type)) { // 情况一：拼团/秒杀/砍价
-          state.activityList.push(activity);
-        } else if (activity.type === 5) { // 情况二：满减送
-          state.activityInfo.push(activity);
-        } else { // 情况三：限时折扣 TODO puhui999：【折扣】
-          console.log('待实现！优先级不高');
-        }
-      })
-		});
-	});
+    // 3. 获得单个商品，进行中的拼团、秒杀、砍价活动信息
+    ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
+      if (res.code !== 0) {
+        return;
+      }
+      state.activityList = res.data;
+    });
+  });
 </script>
 
 <style lang="scss" scoped>
-	.detail-card {
-		background-color: #ffff;
-		margin: 14rpx 20rpx;
-		border-radius: 10rpx;
-		overflow: hidden;
-	}
+  .detail-card {
+    background-color: #ffff;
+    margin: 14rpx 20rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+  }
 
-	// 价格标题卡片
-	.title-card {
-		.price-box {
-			.price-text {
-				font-size: 42rpx;
-				font-weight: 500;
-				color: #ff3000;
-				line-height: 30rpx;
-				font-family: OPPOSANS;
+  // 价格标题卡片
+  .title-card {
+    .price-box {
+      .price-text {
+        font-size: 42rpx;
+        font-weight: 500;
+        color: #ff3000;
+        line-height: 30rpx;
+        font-family: OPPOSANS;
 
-				&::before {
-					content: '￥';
-					font-size: 30rpx;
-				}
-			}
+        &::before {
+          content: '￥';
+          font-size: 30rpx;
+        }
+      }
 
-			.origin-price-text {
-				font-size: 26rpx;
-				font-weight: 400;
-				text-decoration: line-through;
-				color: $gray-c;
-				font-family: OPPOSANS;
+      .origin-price-text {
+        font-size: 26rpx;
+        font-weight: 400;
+        text-decoration: line-through;
+        color: $gray-c;
+        font-family: OPPOSANS;
 
-				&::before {
-					content: '￥';
-				}
-			}
-		}
+        &::before {
+          content: '￥';
+        }
+      }
+    }
 
-		.sales-text {
-			font-size: 26rpx;
-			font-weight: 500;
-			color: $gray-c;
-		}
+    .sales-text {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: $gray-c;
+    }
 
-		.discounts-box {
-			.tag-content {
-				flex: 1;
-				min-width: 0;
-				white-space: nowrap;
-			}
+    .discounts-box {
+      .tag-content {
+        flex: 1;
+        min-width: 0;
+        white-space: nowrap;
+      }
 
-			.tag-box {
-				overflow: hidden;
-				text-overflow: ellipsis;
-			}
+      .tag-box {
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
 
-			.tag {
-				flex-shrink: 0;
-				padding: 4rpx 10rpx;
-				font-size: 24rpx;
-				font-weight: 500;
-				border-radius: 4rpx;
-				color: var(--ui-BG-Main);
-				background: var(--ui-BG-Main-tag);
-			}
+      .tag {
+        flex-shrink: 0;
+        padding: 4rpx 10rpx;
+        font-size: 24rpx;
+        font-weight: 500;
+        border-radius: 4rpx;
+        color: var(--ui-BG-Main);
+        background: var(--ui-BG-Main-tag);
+      }
 
-			.discounts-title {
-				font-size: 24rpx;
-				font-weight: 500;
-				color: var(--ui-BG-Main);
-				line-height: normal;
-			}
+      .discounts-title {
+        font-size: 24rpx;
+        font-weight: 500;
+        color: var(--ui-BG-Main);
+        line-height: normal;
+      }
 
-			.cicon-forward {
-				color: var(--ui-BG-Main);
-				font-size: 24rpx;
-				line-height: normal;
-				margin-top: 4rpx;
-			}
-		}
+      .cicon-forward {
+        color: var(--ui-BG-Main);
+        font-size: 24rpx;
+        line-height: normal;
+        margin-top: 4rpx;
+      }
+    }
 
-		.title-text {
-			font-size: 30rpx;
-			font-weight: bold;
-			line-height: 42rpx;
-		}
+    .title-text {
+      font-size: 30rpx;
+      font-weight: bold;
+      line-height: 42rpx;
+    }
 
-		.subtitle-text {
-			font-size: 26rpx;
-			font-weight: 400;
-			color: $dark-9;
-			line-height: 42rpx;
-		}
-	}
+    .subtitle-text {
+      font-size: 26rpx;
+      font-weight: 400;
+      color: $dark-9;
+      line-height: 42rpx;
+    }
+  }
 
-	// 购买
-	.buy-box {
-		.add-btn {
-			width: 214rpx;
-			height: 72rpx;
-			font-weight: 500;
-			font-size: 28rpx;
-			border-radius: 40rpx 0 0 40rpx;
-			background-color: var(--ui-BG-Main-light);
-			color: var(--ui-BG-Main);
-		}
+  // 购买
+  .buy-box {
+    .add-btn {
+      width: 214rpx;
+      height: 72rpx;
+      font-weight: 500;
+      font-size: 28rpx;
+      border-radius: 40rpx 0 0 40rpx;
+      background-color: var(--ui-BG-Main-light);
+      color: var(--ui-BG-Main);
+    }
 
-		.buy-btn {
-			width: 214rpx;
-			height: 72rpx;
-			font-weight: 500;
-			font-size: 28rpx;
+    .buy-btn {
+      width: 214rpx;
+      height: 72rpx;
+      font-weight: 500;
+      font-size: 28rpx;
 
-			border-radius: 0 40rpx 40rpx 0;
-			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-			color: $white;
-		}
+      border-radius: 0 40rpx 40rpx 0;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: $white;
+    }
 
-		.disabled-btn {
-			width: 428rpx;
-			height: 72rpx;
-			border-radius: 40rpx;
-			background: #999999;
-			color: $white;
-		}
-	}
+    .disabled-btn {
+      width: 428rpx;
+      height: 72rpx;
+      border-radius: 40rpx;
+      background: #999999;
+      color: $white;
+    }
+  }
 
-	.model-box {
-		height: 60vh;
+  .model-box {
+    height: 60vh;
 
-		.model-content {
-			height: 56vh;
-		}
+    .model-content {
+      height: 56vh;
+    }
 
-		.title {
-			font-size: 36rpx;
-			font-weight: bold;
-			color: #333333;
-		}
+    .title {
+      font-size: 36rpx;
+      font-weight: bold;
+      color: #333333;
+    }
 
-		.subtitle {
-			font-size: 26rpx;
-			font-weight: 500;
-			color: #333333;
-		}
-	}
+    .subtitle {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+    }
+  }
 </style>
diff --git a/sheep/api/promotion/activity.js b/sheep/api/promotion/activity.js
index eb47ce1d..2449ebb0 100644
--- a/sheep/api/promotion/activity.js
+++ b/sheep/api/promotion/activity.js
@@ -1,7 +1,7 @@
 import request from '@/sheep/request';
 
 const ActivityApi = {
-  // 获得单个商品，近期参与的每个活动
+  // 获得单个商品，进行中的拼团、秒杀、砍价活动信息
   getActivityListBySpuId: (spuId) => {
     return request({
       url: '/promotion/activity/list-by-spu-id',
diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index d4bbcafe..4eced427 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -23,7 +23,7 @@
           :subTitleColor="data.fields.introduction.color"
           :topRadius="data.borderRadiusTop"
           :bottomRadius="data.borderRadiusBottom"
-          @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+          @click="sheep.$router.go('/pages/goods/seckill', { id: item.activityId })"
         >
           <!-- 购买按钮 -->
           <template v-slot:cart>
@@ -56,7 +56,7 @@
           :subTitleColor="data.fields.introduction.color"
           :topRadius="data.borderRadiusTop"
           :bottomRadius="data.borderRadiusBottom"
-          @tap="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+          @tap="sheep.$router.go('/pages/goods/seckill', { id: item.activityId })"
         >
           <!-- 购买按钮 -->
           <template v-slot:cart>
@@ -91,7 +91,7 @@
             :topRadius="data.borderRadiusTop"
             :bottomRadius="data.borderRadiusBottom"
             :titleWidth="330 - marginLeft - marginRight"
-            @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+            @click="sheep.$router.go('/pages/goods/seckill', { id: item.activityId })"
             @getHeight="calculateGoodsColumn($event, 'left')"
           >
             <!-- 购买按钮 -->
@@ -121,7 +121,7 @@
             :topRadius="data.borderRadiusTop"
             :bottomRadius="data.borderRadiusBottom"
             :titleWidth="330 - marginLeft - marginRight"
-            @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+            @click="sheep.$router.go('/pages/goods/seckill', { id: item.activityId })"
             @getHeight="calculateGoodsColumn($event, 'right')"
           >
             <!-- 购买按钮 -->