From c9434b9ec9750afcd2de321d1b7fd33d7a89be13 Mon Sep 17 00:00:00 2001
From: Ordinary <holmes_shuai@163.com>
Date: Sat, 3 Aug 2024 10:33:09 +0800
Subject: [PATCH 01/48] =?UTF-8?q?feat(request):=20=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81Terminal=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/request/index.js | 18 +++++++++---------
 sheep/util/const.js    | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/sheep/request/index.js b/sheep/request/index.js
index 700c7dda..50ac2dea 100644
--- a/sheep/request/index.js
+++ b/sheep/request/index.js
@@ -4,13 +4,12 @@
  */
 
 import Request from 'luch-request';
-import { baseUrl, apiPath, tenantId } from '@/sheep/config';
+import { apiPath, baseUrl, tenantId } from '@/sheep/config';
 import $store from '@/sheep/store';
 import $platform from '@/sheep/platform';
-import {
-	showAuthModal
-} from '@/sheep/hooks/useModal';
+import { showAuthModal } from '@/sheep/hooks/useModal';
 import AuthUtil from '@/sheep/api/member/auth';
+import { getTerminalEnumByUniPlatform } from '@/sheep/util/const';
 
 const options = {
 	// 显示操作成功消息 默认不显示
@@ -93,13 +92,14 @@ http.interceptors.request.use(
     // 增加 token 令牌、terminal 终端、tenant 租户的请求头
 		const token = getAccessToken();
 		if (token) {
-      config.header['Authorization'] = token;
-    }
-		// TODO 芋艿：特殊处理
+			config.header['Authorization'] = token;
+		}
+
+		const terminalType = uni.getSystemInfoSync().uniPlatform
+		config.header['terminal'] = getTerminalEnumByUniPlatform(terminalType);
+
     config.header['Accept'] = '*/*';
     config.header['tenant-id'] = tenantId;
-    config.header['terminal'] = '20';
-    // config.header['Authorization'] = 'Bearer test247';
 		return config;
 	},
 	(error) => {
diff --git a/sheep/util/const.js b/sheep/util/const.js
index e1d3ee08..4339ef90 100644
--- a/sheep/util/const.js
+++ b/sheep/util/const.js
@@ -1,3 +1,39 @@
+// ========== COMMON - 公共模块 ==========
+
+/**
+ * 与后端Terminal枚举一一对应
+ */
+export const TerminalEnum = {
+  UNKNOWN: 0, // 未知, 目的：在无法解析到 terminal 时，使用它
+  WECHAT_MINI_PROGRAM: 10, //微信小程序
+  WECHAT_WAP: 11, // 微信公众号
+  H5: 20, // H5 网页
+  APP: 31, // 手机 App
+};
+
+/**
+ * 将Uniapp提供的平台转换为后端所需的Terminal值
+ * @param platformType Uniapp提供的平台类型
+ */
+export const getTerminalEnumByUniPlatform = (platformType) => {
+  let terminal;
+  // 与后端terminal枚举一一对应
+  switch (platformType) {
+    case 'app':
+      terminal = TerminalEnum.APP;
+      break;
+    case 'web':
+      terminal = TerminalEnum.H5;
+      break;
+    case 'mp-weixin':
+      terminal = TerminalEnum.WECHAT_MINI_PROGRAM;
+      break;
+    default:
+      terminal = TerminalEnum.UNKNOWN;
+  }
+  return terminal;
+};
+
 // ========== MALL - 营销模块 ==========
 
 import dayjs from "dayjs";

From ce81110bb3813f597295730834a7ba691ff50228 Mon Sep 17 00:00:00 2001
From: undefined <zihengdie@hestudio.net>
Date: Sun, 4 Aug 2024 17:11:12 +0800
Subject: [PATCH 02/48] =?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=E6=98=BE=E7=A4=BA=EF=BC=88=E4=BB=85?=
 =?UTF-8?q?=E9=99=90=E6=98=BE=E7=A4=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 pages/activity/groupon/detail.vue             |  36 +-
 pages/activity/groupon/order.vue              |  12 +-
 pages/activity/index.vue                      |   4 +-
 pages/chat/components/select-popup.vue        |   2 +-
 .../commission/components/commission-log.vue  | 250 +++---
 pages/commission/goods.vue                    |  14 +-
 pages/commission/order.vue                    |   7 +-
 pages/commission/team.vue                     |   2 +-
 pages/commission/wallet.vue                   | 774 ++++++++++--------
 pages/coupon/detail.vue                       |  33 +-
 pages/coupon/list.vue                         |  27 +-
 pages/goods/comment/list.vue                  |   2 +-
 pages/goods/groupon.vue                       |  62 +-
 pages/goods/index.vue                         | 672 ++++++++-------
 pages/goods/list.vue                          | 562 +++++++------
 pages/goods/seckill.vue                       |  61 +-
 pages/index/category.vue                      |   2 +-
 pages/order/aftersale/apply.vue               |  10 +-
 pages/order/aftersale/detail.vue              | 535 ++++++------
 pages/order/aftersale/list.vue                | 295 ++++---
 pages/order/confirm.vue                       |   6 +-
 pages/order/detail.vue                        |   4 +-
 pages/order/list.vue                          | 750 +++++++++--------
 pages/pay/recharge-log.vue                    |   8 +-
 pages/pay/result.vue                          |  21 +-
 pages/user/address/edit.vue                   | 378 +++++----
 pages/user/address/list.vue                   | 261 +++---
 pages/user/goods-collect.vue                  |  12 +-
 pages/user/goods-log.vue                      |  18 +-
 pages/user/info.vue                           |  17 +-
 pages/user/wallet/money.vue                   |  20 +-
 pages/user/wallet/score.vue                   |  31 +-
 .../s-address-item/s-address-item.vue         |   6 +-
 .../s-goods-column/s-goods-column.vue         |  56 +-
 sheep/components/s-layout/s-layout.vue        |   8 +-
 .../s-select-seckill-sku.vue                  |  67 +-
 sheep/platform/index.js                       |   2 +-
 sheep/router/index.js                         |   2 +-
 sheep/store/user.js                           |  18 +-
 sheep/ui/su-swiper/su-swiper.vue              |   8 +-
 41 files changed, 2729 insertions(+), 2327 deletions(-)

diff --git a/package.json b/package.json
index aafe3011..d2e3bb5f 100644
--- a/package.json
+++ b/package.json
@@ -90,6 +90,7 @@
   "dependencies": {
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "luch-request": "^3.0.8",
     "pinia": "^2.0.33",
     "pinia-plugin-persist-uni": "^1.2.0",
diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue
index 0db9ab3a..86daff20 100644
--- a/pages/activity/groupon/detail.vue
+++ b/pages/activity/groupon/detail.vue
@@ -1,6 +1,11 @@
 <!-- 拼团订单的详情 -->
 <template>
-  <s-layout title="拼团详情" class="detail-wrap" :navbar="state.data && !state.loading ? 'inner': 'normal'" :onShareAppMessage="shareInfo">
+  <s-layout
+    title="拼团详情"
+    class="detail-wrap"
+    :navbar="state.data && !state.loading ? 'inner' : 'normal'"
+    :onShareAppMessage="shareInfo"
+  >
     <view v-if="state.loading"></view>
     <view v-if="state.data && !state.loading">
       <!-- 团长信息 + 活动信息 -->
@@ -22,7 +27,7 @@
           priceColor="#E1212B"
           @tap="
             sheep.$router.go('/pages/goods/groupon', {
-              id: state.data.headRecord.activityId
+              id: state.data.headRecord.activityId,
             })
           "
           :style="[{ top: Number(statusBarHeight + 108) + 'rpx' }]"
@@ -71,7 +76,9 @@
           </view>
           <view class="countdown-title ss-flex" v-else>
             还差
-            <view class="num">{{ state.data.headRecord.userSize - state.data.headRecord.userCount }}人</view>
+            <view class="num"
+              >{{ state.data.headRecord.userSize - state.data.headRecord.userCount }}人</view
+            >
             拼团成功
             <view class="ss-flex countdown-time">
               <view class="countdown-h ss-flex ss-row-center">{{ endTime.h }}</view>
@@ -109,7 +116,11 @@
             </view>
           </view>
           <!-- 还有几个坑位 -->
-          <view class="default-avatar ss-m-r-24 ss-m-b-20" v-for="item in state.remainNumber" :key="item">
+          <view
+            class="default-avatar ss-m-r-24 ss-m-b-20"
+            v-for="item in state.remainNumber"
+            :key="item"
+          >
             <image
               :src="sheep.$url.static('/static/img/shop/avatar/unknown.png')"
               class="avatar-img"
@@ -154,11 +165,7 @@
         </view>
         <view v-else class="ss-flex ss-row-center">
           <view v-if="state.data.orderId">
-            <button
-              class="ss-reset-button join-btn"
-              :disabled="endTime.ms <= 0"
-              @tap="onShare"
-            >
+            <button class="ss-reset-button join-btn" :disabled="endTime.ms <= 0" @tap="onShare">
               邀请好友来拼团
             </button>
           </view>
@@ -198,8 +205,8 @@
   import { onLoad } from '@dcloudio/uni-app';
   import { useDurationTime } from '@/sheep/hooks/useGoods';
   import { showShareModal } from '@/sheep/hooks/useModal';
-  import { isEmpty } from 'lodash';
-  import CombinationApi from "@/sheep/api/promotion/combination";
+  import { isEmpty } from 'lodash-es';
+  import CombinationApi from '@/sheep/api/promotion/combination';
 
   const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
@@ -295,7 +302,9 @@
       state.remainNumber = remainNumber > 0 ? remainNumber : 0;
 
       // 获取活动信息
-      const { data: activity } = await CombinationApi.getCombinationActivity(data.headRecord.activityId);
+      const { data: activity } = await CombinationApi.getCombinationActivity(
+        data.headRecord.activityId,
+      );
       state.activity = activity;
     } else {
       state.data = null;
@@ -316,8 +325,7 @@
   .recharge-box {
     position: relative;
     margin-bottom: 120rpx;
-    background: v-bind(headerBg) center/750rpx 100%
-        no-repeat,
+    background: v-bind(headerBg) center/750rpx 100% no-repeat,
       linear-gradient(115deg, #f44739 0%, #ff6600 100%);
     border-radius: 0 0 5% 5%;
     height: 100rpx;
diff --git a/pages/activity/groupon/order.vue b/pages/activity/groupon/order.vue
index fc2a38a2..72e03475 100644
--- a/pages/activity/groupon/order.vue
+++ b/pages/activity/groupon/order.vue
@@ -24,9 +24,9 @@
         </view>
         <view class="border-bottom">
           <s-goods-item
-              :img="record.picUrl"
-              :title="record.spuName"
-              :price="record.combinationPrice"
+            :img="record.picUrl"
+            :title="record.spuName"
+            :price="record.combinationPrice"
           >
             <template #groupon>
               <view class="ss-flex">
@@ -67,8 +67,8 @@
   import { reactive } from 'vue';
   import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import _ from 'lodash';
-  import {formatOrderColor} from "@/sheep/hooks/useGoods";
+  import _ from 'lodash-es';
+  import { formatOrderColor } from '@/sheep/hooks/useGoods';
   import { resetPagination } from '@/sheep/util';
   import CombinationApi from '@/sheep/api/promotion/combination';
 
@@ -121,7 +121,7 @@
     if (code !== 0) {
       return;
     }
-    state.pagination.list = _.concat(state.pagination.list, data.list)
+    state.pagination.list = _.concat(state.pagination.list, data.list);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
   }
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index f36a0e5a..56417ed9 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -63,7 +63,7 @@
   import { reactive } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import RewardActivityApi from '@/sheep/api/promotion/rewardActivity';
   import { formatRewardActivityRule } from '@/sheep/hooks/useGoods';
   import SpuApi from '@/sheep/api/product/spu';
@@ -118,7 +118,7 @@
     const { code, data } = await SpuApi.getSpuPage({
       pageNo: state.pagination.pageNo,
       pageSize: state.pagination.pageSize,
-      ...params
+      ...params,
     });
     if (code !== 0) {
       return;
diff --git a/pages/chat/components/select-popup.vue b/pages/chat/components/select-popup.vue
index 6c701441..60711af2 100644
--- a/pages/chat/components/select-popup.vue
+++ b/pages/chat/components/select-popup.vue
@@ -32,7 +32,7 @@
 
 <script setup>
   import { reactive, watch } from 'vue';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import GoodsItem from './goods.vue';
   import OrderItem from './order.vue';
   import OrderApi from '@/sheep/api/trade/order';
diff --git a/pages/commission/components/commission-log.vue b/pages/commission/components/commission-log.vue
index d6e3e8cc..809d747e 100644
--- a/pages/commission/components/commission-log.vue
+++ b/pages/commission/components/commission-log.vue
@@ -1,74 +1,90 @@
 <!-- 分销首页：明细列表  -->
 <template>
-	<view class="distribution-log-wrap">
-		<view class="header-box">
-			<image class="header-bg" :src="sheep.$url.static('/static/img/shop/commission/title2.png')" />
-			<view class="ss-flex header-title">
-				<view class="title">实时动态</view>
-				<text class="cicon-forward" />
-			</view>
-		</view>
-		<scroll-view scroll-y="true" @scrolltolower="loadmore" class="scroll-box log-scroll"
-			scroll-with-animation="true">
-			<view v-if="state.pagination.list">
-				<view class="log-item-box ss-flex ss-row-between" v-for="item in state.pagination.list" :key="item.id">
-					<view class="log-item-wrap">
-						<view class="log-item ss-flex ss-ellipsis-1 ss-col-center">
-							<view class="ss-flex ss-col-center">
-								<image class="log-img" :src="sheep.$url.static('/static/img/shop/avatar/notice.png')" mode="aspectFill" />
-							</view>
-							<view class="log-text ss-ellipsis-1">
+  <view class="distribution-log-wrap">
+    <view class="header-box">
+      <image class="header-bg" :src="sheep.$url.static('/static/img/shop/commission/title2.png')" />
+      <view class="ss-flex header-title">
+        <view class="title">实时动态</view>
+        <text class="cicon-forward" />
+      </view>
+    </view>
+    <scroll-view
+      scroll-y="true"
+      @scrolltolower="loadmore"
+      class="scroll-box log-scroll"
+      scroll-with-animation="true"
+    >
+      <view v-if="state.pagination.list">
+        <view
+          class="log-item-box ss-flex ss-row-between"
+          v-for="item in state.pagination.list"
+          :key="item.id"
+        >
+          <view class="log-item-wrap">
+            <view class="log-item ss-flex ss-ellipsis-1 ss-col-center">
+              <view class="ss-flex ss-col-center">
+                <image
+                  class="log-img"
+                  :src="sheep.$url.static('/static/img/shop/avatar/notice.png')"
+                  mode="aspectFill"
+                />
+              </view>
+              <view class="log-text ss-ellipsis-1">
                 {{ item.title }} {{ fen2yuan(item.price) }} 元
               </view>
-						</view>
-					</view>
-					<text class="log-time">{{ dayjs(item.createTime).fromNow() }}</text>
-				</view>
-			</view>
+            </view>
+          </view>
+          <text class="log-time">{{ dayjs(item.createTime).fromNow() }}</text>
+        </view>
+      </view>
 
-			<!-- 加载更多 -->
-			<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" color="#333333"
-				@tap="loadmore" />
-		</scroll-view>
-	</view>
+      <!-- 加载更多 -->
+      <uni-load-more
+        v-if="state.pagination.total > 0"
+        :status="state.loadStatus"
+        color="#333333"
+        @tap="loadmore"
+      />
+    </scroll-view>
+  </view>
 </template>
 
 <script setup>
-	import sheep from '@/sheep';
-	import { reactive } from 'vue';
-	import _ from 'lodash';
-	import dayjs from 'dayjs';
+  import sheep from '@/sheep';
+  import { reactive } from 'vue';
+  import _ from 'lodash-es';
+  import dayjs from 'dayjs';
   import BrokerageApi from '@/sheep/api/trade/brokerage';
   import { fen2yuan } from '../../../sheep/hooks/useGoods';
 
-	const state = reactive({
-		loadStatus: '',
-		pagination: {
+  const state = reactive({
+    loadStatus: '',
+    pagination: {
       list: [],
       total: 0,
       pageNo: 1,
       pageSize: 1,
-		},
-	});
+    },
+  });
 
-	async function getLog() {
+  async function getLog() {
     state.loadStatus = 'loading';
     const { code, data } = await BrokerageApi.getBrokerageRecordPage({
       pageNo: state.pagination.pageNo,
-      pageSize: state.pagination.pageSize
-		});
+      pageSize: state.pagination.pageSize,
+    });
     if (code !== 0) {
       return;
     }
     state.pagination.list = _.concat(state.pagination.list, data.list);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
-	}
+  }
 
-	getLog();
+  getLog();
 
-	// 加载更多
-	function loadmore() {
+  // 加载更多
+  function loadmore() {
     if (state.loadStatus === 'noMore') {
       return;
     }
@@ -78,88 +94,88 @@
 </script>
 
 <style lang="scss" scoped>
-	.distribution-log-wrap {
-		width: 690rpx;
-		margin: 0 auto;
-		margin-bottom: 20rpx;
-		border-radius: 12rpx;
-		z-index: 3;
-		position: relative;
+  .distribution-log-wrap {
+    width: 690rpx;
+    margin: 0 auto;
+    margin-bottom: 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;
+      }
+    }
 
-		.log-scroll {
-			height: 600rpx;
-			background: #fdfae9;
-			padding: 10rpx 20rpx 0;
-			box-sizing: border-box;
-			border-radius: 0 0 12rpx 12rpx;
+    .log-scroll {
+      height: 600rpx;
+      background: #fdfae9;
+      padding: 10rpx 20rpx 0;
+      box-sizing: border-box;
+      border-radius: 0 0 12rpx 12rpx;
 
-			.log-item-box {
-				margin-bottom: 20rpx;
+      .log-item-box {
+        margin-bottom: 20rpx;
 
-				.log-time {
-					// margin-left: 30rpx;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: OPPOSANS;
-					font-weight: 400;
-					color: #c4c4c4;
-				}
-			}
+        .log-time {
+          // margin-left: 30rpx;
+          text-align: right;
+          font-size: 24rpx;
+          font-family: OPPOSANS;
+          font-weight: 400;
+          color: #c4c4c4;
+        }
+      }
 
-			.loadmore-wrap {
-				// line-height: 80rpx;
-			}
+      .loadmore-wrap {
+        // line-height: 80rpx;
+      }
 
-			.log-item {
-				// background: rgba(#ffffff, 0.2);
-				border-radius: 24rpx;
-				padding: 6rpx 20rpx 6rpx 12rpx;
+      .log-item {
+        // background: rgba(#ffffff, 0.2);
+        border-radius: 24rpx;
+        padding: 6rpx 20rpx 6rpx 12rpx;
 
-				.log-img {
-					width: 40rpx;
-					height: 40rpx;
-					border-radius: 50%;
-					margin-right: 10rpx;
-				}
+        .log-img {
+          width: 40rpx;
+          height: 40rpx;
+          border-radius: 50%;
+          margin-right: 10rpx;
+        }
 
-				.log-text {
-					max-width: 480rpx;
-					font-size: 24rpx;
-					font-weight: 500;
-					color: #333333;
-				}
-			}
-		}
-	}
-</style>
\ No newline at end of file
+        .log-text {
+          max-width: 480rpx;
+          font-size: 24rpx;
+          font-weight: 500;
+          color: #333333;
+        }
+      }
+    }
+  }
+</style>
diff --git a/pages/commission/goods.vue b/pages/commission/goods.vue
index d4678490..b9df293a 100644
--- a/pages/commission/goods.vue
+++ b/pages/commission/goods.vue
@@ -14,12 +14,18 @@
       >
         <template #rightBottom>
           <view class="ss-flex ss-row-between">
-            <view class="commission-num" v-if="item.brokerageMinPrice === undefined">预计佣金：计算中</view>
-            <view class="commission-num" v-else-if="item.brokerageMinPrice === item.brokerageMaxPrice">
+            <view class="commission-num" v-if="item.brokerageMinPrice === undefined"
+              >预计佣金：计算中</view
+            >
+            <view
+              class="commission-num"
+              v-else-if="item.brokerageMinPrice === item.brokerageMaxPrice"
+            >
               预计佣金：{{ fen2yuan(item.brokerageMinPrice) }}
             </view>
             <view class="commission-num" v-else>
-              预计佣金：{{ fen2yuan(item.brokerageMinPrice) }} ~ {{ fen2yuan(item.brokerageMaxPrice) }}
+              预计佣金：{{ fen2yuan(item.brokerageMinPrice) }} ~
+              {{ fen2yuan(item.brokerageMaxPrice) }}
             </view>
             <button
               class="ss-reset-button share-btn ui-BG-Main-Gradient"
@@ -53,7 +59,7 @@
   import $share from '@/sheep/platform/share';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import { reactive } from 'vue';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import { showShareModal } from '@/sheep/hooks/useModal';
   import SpuApi from '@/sheep/api/product/spu';
   import BrokerageApi from '@/sheep/api/trade/brokerage';
diff --git a/pages/commission/order.vue b/pages/commission/order.vue
index 18b1bf54..c759d2a6 100644
--- a/pages/commission/order.vue
+++ b/pages/commission/order.vue
@@ -41,10 +41,7 @@
           <view class="no-box ss-flex ss-col-center ss-row-between">
             <text class="order-code">订单编号：{{ item.bizId }}</text>
             <text class="order-state">
-              {{
-                item.status === 0 ? '待结算'
-                  : item.status === 1 ? '已结算' : '已取消'
-              }}
+              {{ item.status === 0 ? '待结算' : item.status === 1 ? '已结算' : '已取消' }}
               ( 佣金 {{ fen2yuan(item.price) }} 元 )
             </text>
           </view>
@@ -77,7 +74,7 @@
   import sheep from '@/sheep';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import { reactive } from 'vue';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import { onPageScroll } from '@dcloudio/uni-app';
   import { resetPagination } from '@/sheep/util';
   import BrokerageApi from '@/sheep/api/trade/brokerage';
diff --git a/pages/commission/team.vue b/pages/commission/team.vue
index 82a492e1..eb58abb9 100644
--- a/pages/commission/team.vue
+++ b/pages/commission/team.vue
@@ -235,7 +235,7 @@
   import sheep from '@/sheep';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import { computed, reactive, ref } from 'vue';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import { onPageScroll } from '@dcloudio/uni-app';
   import BrokerageApi from '@/sheep/api/trade/brokerage';
 
diff --git a/pages/commission/wallet.vue b/pages/commission/wallet.vue
index d0ad059b..2181b30c 100644
--- a/pages/commission/wallet.vue
+++ b/pages/commission/wallet.vue
@@ -1,196 +1,243 @@
 <!-- 分销 - 佣金明细 -->
 <template>
-	<s-layout class="wallet-wrap" title="佣金">
-		<!-- 钱包卡片 -->
-		<view class="header-box ss-flex ss-row-center ss-col-center">
-			<view class="card-box ui-BG-Main ui-Shadow-Main">
-				<view class="card-head ss-flex ss-col-center">
-					<view class="card-title ss-m-r-10">当前佣金（元）</view>
-					<view @tap="state.showMoney = !state.showMoney" class="ss-eye-icon"
-						:class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'" />
-				</view>
-				<view class="ss-flex ss-row-between ss-col-center ss-m-t-30">
-					<view class="money-num">{{ state.showMoney ? fen2yuan(state.summary.withdrawPrice || 0) : '*****' }}</view>
-					<view class="ss-flex">
-						<view class="ss-m-r-20">
-							<button class="ss-reset-button withdraw-btn" @tap="sheep.$router.go('/pages/commission/withdraw')">
-								提现
-							</button>
-						</view>
-						<button class="ss-reset-button balance-btn ss-m-l-20" @tap="state.showModal = true">
-							转余额
-						</button>
-					</view>
-				</view>
+  <s-layout class="wallet-wrap" title="佣金">
+    <!-- 钱包卡片 -->
+    <view class="header-box ss-flex ss-row-center ss-col-center">
+      <view class="card-box ui-BG-Main ui-Shadow-Main">
+        <view class="card-head ss-flex ss-col-center">
+          <view class="card-title ss-m-r-10">当前佣金（元）</view>
+          <view
+            @tap="state.showMoney = !state.showMoney"
+            class="ss-eye-icon"
+            :class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"
+          />
+        </view>
+        <view class="ss-flex ss-row-between ss-col-center ss-m-t-30">
+          <view class="money-num">{{
+            state.showMoney ? fen2yuan(state.summary.withdrawPrice || 0) : '*****'
+          }}</view>
+          <view class="ss-flex">
+            <view class="ss-m-r-20">
+              <button
+                class="ss-reset-button withdraw-btn"
+                @tap="sheep.$router.go('/pages/commission/withdraw')"
+              >
+                提现
+              </button>
+            </view>
+            <button class="ss-reset-button balance-btn ss-m-l-20" @tap="state.showModal = true">
+              转余额
+            </button>
+          </view>
+        </view>
 
-				<view class="ss-flex">
-					<view class="loading-money">
-						<view class="loading-money-title">冻结佣金</view>
-						<view class="loading-money-num">
+        <view class="ss-flex">
+          <view class="loading-money">
+            <view class="loading-money-title">冻结佣金</view>
+            <view class="loading-money-num">
               {{ state.showMoney ? fen2yuan(state.summary.frozenPrice || 0) : '*****' }}
             </view>
-					</view>
-					<view class="loading-money ss-m-l-100">
-						<view class="loading-money-title">可提现佣金</view>
-						<view class="loading-money-num">
+          </view>
+          <view class="loading-money ss-m-l-100">
+            <view class="loading-money-title">可提现佣金</view>
+            <view class="loading-money-num">
               {{ state.showMoney ? fen2yuan(state.summary.brokeragePrice || 0) : '*****' }}
             </view>
-					</view>
-				</view>
-			</view>
-		</view>
+          </view>
+        </view>
+      </view>
+    </view>
 
-		<su-sticky>
-			<!-- 统计 -->
-			<view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
-				<uni-datetime-picker v-model="state.date" type="daterange" @change="onChangeTime" :end="state.today">
-					<button class="ss-reset-button date-btn">
-						<text>{{ dateFilterText }}</text>
-						<text class="cicon-drop-down ss-seldate-icon" />
-					</button>
-				</uni-datetime-picker>
+    <su-sticky>
+      <!-- 统计 -->
+      <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
+        <uni-datetime-picker
+          v-model="state.date"
+          type="daterange"
+          @change="onChangeTime"
+          :end="state.today"
+        >
+          <button class="ss-reset-button date-btn">
+            <text>{{ dateFilterText }}</text>
+            <text class="cicon-drop-down ss-seldate-icon" />
+          </button>
+        </uni-datetime-picker>
 
-				<view class="total-box">
+        <view class="total-box">
           <!-- TODO 芋艿：这里暂时不考虑做 -->
-					<!-- <view class="ss-m-b-10">总收入￥{{ state.pagination.income.toFixed(2) }}</view> -->
-					<!-- <view>总支出￥{{ (-state.pagination.expense).toFixed(2) }}</view> -->
-				</view>
-			</view>
-			<su-tabs :list="tabMaps" @change="onChangeTab" :scrollable="false" :current="state.currentTab" />
-		</su-sticky>
-		<s-empty v-if="state.pagination.total === 0" icon="/static/data-empty.png" text="暂无数据"></s-empty>
+          <!-- <view class="ss-m-b-10">总收入￥{{ state.pagination.income.toFixed(2) }}</view> -->
+          <!-- <view>总支出￥{{ (-state.pagination.expense).toFixed(2) }}</view> -->
+        </view>
+      </view>
+      <su-tabs
+        :list="tabMaps"
+        @change="onChangeTab"
+        :scrollable="false"
+        :current="state.currentTab"
+      />
+    </su-sticky>
+    <s-empty
+      v-if="state.pagination.total === 0"
+      icon="/static/data-empty.png"
+      text="暂无数据"
+    ></s-empty>
 
     <!-- 转余额弹框 -->
-		<su-popup :show="state.showModal" type="bottom" round="20" @close="state.showModal = false" showClose>
-			<view class="ss-p-x-20 ss-p-y-30">
-				<view class="model-title ss-m-b-30 ss-m-l-20">转余额</view>
-				<view class="model-subtitle ss-m-b-100 ss-m-l-20">将您的佣金转到余额中继续消费</view>
-				<view class="input-box ss-flex ss-col-center border-bottom ss-m-b-70 ss-m-x-20">
-					<view class="unit">￥</view>
-					<uni-easyinput :inputBorder="false" class="ss-flex-1 ss-p-l-10" v-model="state.price" type="number"
-                         placeholder="请输入金额" />
-				</view>
-				<button class="ss-reset-button model-btn ui-BG-Main-Gradient ui-Shadow-Main" @tap="onConfirm">
-					确定
-				</button>
-			</view>
-		</su-popup>
+    <su-popup
+      :show="state.showModal"
+      type="bottom"
+      round="20"
+      @close="state.showModal = false"
+      showClose
+    >
+      <view class="ss-p-x-20 ss-p-y-30">
+        <view class="model-title ss-m-b-30 ss-m-l-20">转余额</view>
+        <view class="model-subtitle ss-m-b-100 ss-m-l-20">将您的佣金转到余额中继续消费</view>
+        <view class="input-box ss-flex ss-col-center border-bottom ss-m-b-70 ss-m-x-20">
+          <view class="unit">￥</view>
+          <uni-easyinput
+            :inputBorder="false"
+            class="ss-flex-1 ss-p-l-10"
+            v-model="state.price"
+            type="number"
+            placeholder="请输入金额"
+          />
+        </view>
+        <button
+          class="ss-reset-button model-btn ui-BG-Main-Gradient ui-Shadow-Main"
+          @tap="onConfirm"
+        >
+          确定
+        </button>
+      </view>
+    </su-popup>
 
-		<!-- 钱包记录 -->
-		<view v-if="state.pagination.total > 0">
-			<view class="wallet-list ss-flex border-bottom" v-for="item in state.pagination.list" :key="item.id">
-				<view class="list-content">
-					<view class="title-box ss-flex ss-row-between ss-m-b-20">
-						<text class="title ss-line-1">{{ item.title }}</text>
-						<view class="money">
-							<text v-if="item.price >= 0" class="add">+{{ fen2yuan(item.price) }}</text>
-							<text v-else class="minus">{{ fen2yuan(item.price) }}</text>
-						</view>
-					</view>
-					<text class="time">{{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</text>
-				</view>
-			</view>
-		</view>
+    <!-- 钱包记录 -->
+    <view v-if="state.pagination.total > 0">
+      <view
+        class="wallet-list ss-flex border-bottom"
+        v-for="item in state.pagination.list"
+        :key="item.id"
+      >
+        <view class="list-content">
+          <view class="title-box ss-flex ss-row-between ss-m-b-20">
+            <text class="title ss-line-1">{{ item.title }}</text>
+            <view class="money">
+              <text v-if="item.price >= 0" class="add">+{{ fen2yuan(item.price) }}</text>
+              <text v-else class="minus">{{ fen2yuan(item.price) }}</text>
+            </view>
+          </view>
+          <text class="time">{{
+            sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss')
+          }}</text>
+        </view>
+      </view>
+    </view>
 
-		<!-- <u-gap></u-gap> -->
-		<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
+    <!-- <u-gap></u-gap> -->
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
         contentdown: '上拉加载更多',
-      }" />
-	</s-layout>
+      }"
+    />
+  </s-layout>
 </template>
 
 <script setup>
-	import { computed, reactive } from 'vue';
-	import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-	import sheep from '@/sheep';
-	import dayjs from 'dayjs';
-	import _ from 'lodash';
+  import { computed, reactive } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import dayjs from 'dayjs';
+  import _ from 'lodash-es';
   import BrokerageApi from '@/sheep/api/trade/brokerage';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
   import { resetPagination } from '@/sheep/util';
 
-	const headerBg = sheep.$url.css('/static/img/shop/user/wallet_card_bg.png');
+  const headerBg = sheep.$url.css('/static/img/shop/user/wallet_card_bg.png');
 
-	const state = reactive({
+  const state = reactive({
     showMoney: false,
     summary: {}, // 分销信息
 
     today: '',
     date: [],
-		currentTab: 0,
-		pagination: {
+    currentTab: 0,
+    pagination: {
       list: [],
       total: 0,
       pageNo: 1,
       pageSize: 1,
     },
-		loadStatus: '',
+    loadStatus: '',
 
     price: undefined,
-		showModal: false,
-	});
+    showModal: false,
+  });
 
-	const tabMaps = [{
-			name: '分佣',
-			value: '1', // BrokerageRecordBizTypeEnum.ORDER
-		},
-		{
-			name: '提现',
-			value: '2', // BrokerageRecordBizTypeEnum.WITHDRAW
-		}
-	];
+  const tabMaps = [
+    {
+      name: '分佣',
+      value: '1', // BrokerageRecordBizTypeEnum.ORDER
+    },
+    {
+      name: '提现',
+      value: '2', // BrokerageRecordBizTypeEnum.WITHDRAW
+    },
+  ];
 
-	const dateFilterText = computed(() => {
-		if (state.date[0] === state.date[1]) {
-			return state.date[0];
-		} else {
-			return state.date.join('~');
-		}
-	});
+  const dateFilterText = computed(() => {
+    if (state.date[0] === state.date[1]) {
+      return state.date[0];
+    } else {
+      return state.date.join('~');
+    }
+  });
 
-	async function getLogList() {
-		state.loadStatus = 'loading';
-		let { code, data } = await BrokerageApi.getBrokerageRecordPage({
-			pageSize: state.pagination.pageSize,
-			pageNo: state.pagination.pageNo,
+  async function getLogList() {
+    state.loadStatus = 'loading';
+    let { code, data } = await BrokerageApi.getBrokerageRecordPage({
+      pageSize: state.pagination.pageSize,
+      pageNo: state.pagination.pageNo,
       bizType: tabMaps[state.currentTab].value,
       'createTime[0]': state.date[0] + ' 00:00:00',
       'createTime[1]': state.date[1] + ' 23:59:59',
-		});
-		if (code !== 0) {
+    });
+    if (code !== 0) {
       return;
-		}
+    }
     state.pagination.list = _.concat(state.pagination.list, data.list);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
-	}
+  }
 
-	function onChangeTab(e) {
-		resetPagination(state.pagination);
-		state.currentTab = e.index;
-		getLogList();
-	}
-
-	function onChangeTime(e) {
-		state.date[0] = e[0];
-		state.date[1] = e[e.length - 1];
+  function onChangeTab(e) {
     resetPagination(state.pagination);
-		getLogList();
-	}
+    state.currentTab = e.index;
+    getLogList();
+  }
 
-	// 确认操作（转账到余额）
-	async function onConfirm() {
-		if (state.price <= 0) {
-			sheep.$helper.toast('请输入正确的金额');
-			return;
-		}
-		uni.showModal({
-			title: '提示',
-			content: '确认把您的佣金转入到余额钱包中？',
-			success: async function(res) {
-				if (!res.confirm) {
+  function onChangeTime(e) {
+    state.date[0] = e[0];
+    state.date[1] = e[e.length - 1];
+    resetPagination(state.pagination);
+    getLogList();
+  }
+
+  // 确认操作（转账到余额）
+  async function onConfirm() {
+    if (state.price <= 0) {
+      sheep.$helper.toast('请输入正确的金额');
+      return;
+    }
+    uni.showModal({
+      title: '提示',
+      content: '确认把您的佣金转入到余额钱包中？',
+      success: async function (res) {
+        if (!res.confirm) {
           return;
-				}
+        }
         const { code } = await BrokerageApi.createBrokerageWithdraw({
           type: 1, // 钱包
           price: state.price * 100,
@@ -199,272 +246,273 @@
           state.showModal = false;
           await getAgentInfo();
           onChangeTab({
-            index: 1
+            index: 1,
           });
         }
-			}
-		});
-	}
+      },
+    });
+  }
 
-	async function getAgentInfo() {
-		const { code, data } = await BrokerageApi.getBrokerageUserSummary();
+  async function getAgentInfo() {
+    const { code, data } = await BrokerageApi.getBrokerageUserSummary();
     if (code !== 0) {
       return;
     }
     state.summary = data;
-	}
+  }
 
-	onLoad(async (options) => {
-		state.today = dayjs().format('YYYY-MM-DD');
-		state.date = [state.today, state.today];
-    if (options.type === 2) { // 切换到“提现” tab 下
+  onLoad(async (options) => {
+    state.today = dayjs().format('YYYY-MM-DD');
+    state.date = [state.today, state.today];
+    if (options.type === 2) {
+      // 切换到“提现” tab 下
       state.currentTab = 1;
     }
-		getLogList();
-		getAgentInfo();
-	});
+    getLogList();
+    getAgentInfo();
+  });
 
-	onReachBottom(() => {
-		if (state.loadStatus === 'noMore') {
-			return;
-		}
+  onReachBottom(() => {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
     state.pagination.pageNo++;
     getLogList();
-	});
+  });
 </script>
 
 <style lang="scss" scoped>
-	// 钱包
-	.header-box {
-		background-color: $white;
-		padding: 30rpx;
+  // 钱包
+  .header-box {
+    background-color: $white;
+    padding: 30rpx;
 
-		.card-box {
-			width: 100%;
-			min-height: 300rpx;
-			padding: 40rpx;
-			background-size: 100% 100%;
-			border-radius: 30rpx;
-			overflow: hidden;
-			position: relative;
-			z-index: 1;
-			box-sizing: border-box;
+    .card-box {
+      width: 100%;
+      min-height: 300rpx;
+      padding: 40rpx;
+      background-size: 100% 100%;
+      border-radius: 30rpx;
+      overflow: hidden;
+      position: relative;
+      z-index: 1;
+      box-sizing: border-box;
 
-			&::after {
-				content: '';
-				display: block;
-				width: 100%;
-				height: 100%;
-				z-index: 2;
-				position: absolute;
-				top: 0;
-				left: 0;
-				background: v-bind(headerBg) no-repeat;
-				pointer-events: none;
-			}
+      &::after {
+        content: '';
+        display: block;
+        width: 100%;
+        height: 100%;
+        z-index: 2;
+        position: absolute;
+        top: 0;
+        left: 0;
+        background: v-bind(headerBg) no-repeat;
+        pointer-events: none;
+      }
 
-			.card-head {
-				color: $white;
-				font-size: 24rpx;
-			}
+      .card-head {
+        color: $white;
+        font-size: 24rpx;
+      }
 
-			.ss-eye-icon {
-				font-size: 40rpx;
-				color: $white;
-			}
+      .ss-eye-icon {
+        font-size: 40rpx;
+        color: $white;
+      }
 
-			.money-num {
-				font-size: 40rpx;
-				line-height: normal;
-				font-weight: 500;
-				color: $white;
-				font-family: OPPOSANS;
-			}
+      .money-num {
+        font-size: 40rpx;
+        line-height: normal;
+        font-weight: 500;
+        color: $white;
+        font-family: OPPOSANS;
+      }
 
-			.reduce-num {
-				font-size: 26rpx;
-				font-weight: 400;
-				color: $white;
-			}
+      .reduce-num {
+        font-size: 26rpx;
+        font-weight: 400;
+        color: $white;
+      }
 
-			.withdraw-btn {
-				width: 120rpx;
-				height: 60rpx;
-				line-height: 60rpx;
-				border-radius: 30px;
-				font-size: 24rpx;
-				font-weight: 500;
-				background-color: $white;
-				color: var(--ui-BG-Main);
-			}
+      .withdraw-btn {
+        width: 120rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        border-radius: 30px;
+        font-size: 24rpx;
+        font-weight: 500;
+        background-color: $white;
+        color: var(--ui-BG-Main);
+      }
 
-			.balance-btn {
-				width: 120rpx;
-				height: 60rpx;
-				line-height: 60rpx;
-				border-radius: 30px;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: $white;
-				border: 1px solid $white;
-			}
-		}
-	}
+      .balance-btn {
+        width: 120rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        border-radius: 30px;
+        font-size: 24rpx;
+        font-weight: 500;
+        color: $white;
+        border: 1px solid $white;
+      }
+    }
+  }
 
-	.loading-money {
-		margin-top: 56rpx;
+  .loading-money {
+    margin-top: 56rpx;
 
-		.loading-money-title {
-			font-size: 24rpx;
-			font-weight: 400;
-			color: #ffffff;
-			line-height: normal;
-			margin-bottom: 30rpx;
-		}
+    .loading-money-title {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #ffffff;
+      line-height: normal;
+      margin-bottom: 30rpx;
+    }
 
-		.loading-money-num {
-			font-size: 30rpx;
-			font-family: OPPOSANS;
-			font-weight: 500;
-			color: #fefefe;
-		}
-	}
+    .loading-money-num {
+      font-size: 30rpx;
+      font-family: OPPOSANS;
+      font-weight: 500;
+      color: #fefefe;
+    }
+  }
 
-	// 筛选
+  // 筛选
 
-	.filter-box {
-		height: 120rpx;
-		padding: 0 30rpx;
-		background-color: $bg-page;
+  .filter-box {
+    height: 120rpx;
+    padding: 0 30rpx;
+    background-color: $bg-page;
 
-		.total-box {
-			font-size: 24rpx;
-			font-weight: 500;
-			color: $dark-9;
-		}
+    .total-box {
+      font-size: 24rpx;
+      font-weight: 500;
+      color: $dark-9;
+    }
 
-		.date-btn {
-			background-color: $white;
-			line-height: 54rpx;
-			border-radius: 27rpx;
-			padding: 0 20rpx;
-			font-size: 24rpx;
-			font-weight: 500;
-			color: $dark-6;
+    .date-btn {
+      background-color: $white;
+      line-height: 54rpx;
+      border-radius: 27rpx;
+      padding: 0 20rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: $dark-6;
 
-			.ss-seldate-icon {
-				font-size: 50rpx;
-				color: $dark-9;
-			}
-		}
-	}
+      .ss-seldate-icon {
+        font-size: 50rpx;
+        color: $dark-9;
+      }
+    }
+  }
 
-	// tab
-	.wallet-tab-card {
-		.tab-item {
-			height: 80rpx;
-			position: relative;
+  // tab
+  .wallet-tab-card {
+    .tab-item {
+      height: 80rpx;
+      position: relative;
 
-			.tab-title {
-				font-size: 30rpx;
-			}
+      .tab-title {
+        font-size: 30rpx;
+      }
 
-			.cur-tab-title {
-				font-weight: $font-weight-bold;
-			}
+      .cur-tab-title {
+        font-weight: $font-weight-bold;
+      }
 
-			.tab-line {
-				width: 60rpx;
-				height: 6rpx;
-				border-radius: 6rpx;
-				position: absolute;
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: 2rpx;
-				background-color: var(--ui-BG-Main);
-			}
-		}
-	}
+      .tab-line {
+        width: 60rpx;
+        height: 6rpx;
+        border-radius: 6rpx;
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        bottom: 2rpx;
+        background-color: var(--ui-BG-Main);
+      }
+    }
+  }
 
-	// 钱包记录
-	.wallet-list {
-		padding: 30rpx;
-		background-color: #ffff;
+  // 钱包记录
+  .wallet-list {
+    padding: 30rpx;
+    background-color: #ffff;
 
-		.head-img {
-			width: 70rpx;
-			height: 70rpx;
-			border-radius: 50%;
-			background: $gray-c;
-		}
+    .head-img {
+      width: 70rpx;
+      height: 70rpx;
+      border-radius: 50%;
+      background: $gray-c;
+    }
 
-		.list-content {
-			justify-content: space-between;
-			align-items: flex-start;
-			flex: 1;
+    .list-content {
+      justify-content: space-between;
+      align-items: flex-start;
+      flex: 1;
 
-			.title {
-				font-size: 28rpx;
-				color: $dark-3;
-				width: 400rpx;
-			}
+      .title {
+        font-size: 28rpx;
+        color: $dark-3;
+        width: 400rpx;
+      }
 
-			.time {
-				color: $gray-c;
-				font-size: 22rpx;
-			}
-		}
+      .time {
+        color: $gray-c;
+        font-size: 22rpx;
+      }
+    }
 
-		.money {
-			font-size: 28rpx;
-			font-weight: bold;
-			font-family: OPPOSANS;
+    .money {
+      font-size: 28rpx;
+      font-weight: bold;
+      font-family: OPPOSANS;
 
-			.add {
-				color: var(--ui-BG-Main);
-			}
+      .add {
+        color: var(--ui-BG-Main);
+      }
 
-			.minus {
-				color: $dark-3;
-			}
-		}
-	}
+      .minus {
+        color: $dark-3;
+      }
+    }
+  }
 
-	.model-title {
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #333333;
-	}
+  .model-title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333333;
+  }
 
-	.model-subtitle {
-		font-size: 26rpx;
-		color: #c2c7cf;
-	}
+  .model-subtitle {
+    font-size: 26rpx;
+    color: #c2c7cf;
+  }
 
-	.model-btn {
-		width: 100%;
-		height: 80rpx;
-		border-radius: 40rpx;
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #ffffff;
-		line-height: normal;
-	}
+  .model-btn {
+    width: 100%;
+    height: 80rpx;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #ffffff;
+    line-height: normal;
+  }
 
-	.input-box {
-		height: 100rpx;
+  .input-box {
+    height: 100rpx;
 
-		.unit {
-			font-size: 48rpx;
-			color: #333;
-			font-weight: 500;
-			line-height: normal;
-		}
+    .unit {
+      font-size: 48rpx;
+      color: #333;
+      font-weight: 500;
+      line-height: normal;
+    }
 
-		.uni-easyinput__placeholder-class {
-			font-size: 30rpx;
-			height: 40rpx;
-			line-height: normal;
-		}
-	}
-</style>
\ No newline at end of file
+    .uni-easyinput__placeholder-class {
+      font-size: 30rpx;
+      height: 40rpx;
+      line-height: normal;
+    }
+  }
+</style>
diff --git a/pages/coupon/detail.vue b/pages/coupon/detail.vue
index 0a760d27..6ebaa854 100644
--- a/pages/coupon/detail.vue
+++ b/pages/coupon/detail.vue
@@ -16,13 +16,16 @@
             <view class="title ss-m-t-50 ss-m-b-20 ss-m-x-20">{{ state.coupon.name }}</view>
             <view class="subtitle ss-m-b-50">
               满 {{ fen2yuan(state.coupon.usePrice) }} 元，
-              {{ state.coupon.discountType === 1
-                ? '减 ' + fen2yuan(state.coupon.discountPrice) + ' 元'
-                : '打 ' + state.coupon.discountPercent / 10.0 + ' 折' }}
+              {{
+                state.coupon.discountType === 1
+                  ? '减 ' + fen2yuan(state.coupon.discountPrice) + ' 元'
+                  : '打 ' + state.coupon.discountPercent / 10.0 + ' 折'
+              }}
             </view>
             <button
               class="ss-reset-button ss-m-b-30"
-              :class="state.coupon.canTake || state.coupon.status === 1
+              :class="
+                state.coupon.canTake || state.coupon.status === 1
                   ? 'use-btn' // 优惠劵模版（可领取）、优惠劵（可使用）
                   : 'disable-btn'
               "
@@ -31,7 +34,13 @@
             >
               <text v-if="state.id > 0">{{ state.coupon.canTake ? '立即领取' : '已领取' }}</text>
               <text v-else>
-                {{ state.coupon.status === 1 ? '立即使用' : state.coupon.status === 2 ? '已使用' : '已过期' }}
+                {{
+                  state.coupon.status === 1
+                    ? '立即使用'
+                    : state.coupon.status === 2
+                    ? '已使用'
+                    : '已过期'
+                }}
               </text>
             </button>
             <view class="time ss-m-y-30" v-if="state.coupon.validityType === 2">
@@ -140,7 +149,7 @@
   import sheep from '@/sheep';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import { reactive } from 'vue';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import CouponApi from '@/sheep/api/promotion/coupon';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
   import SpuApi from '@/sheep/api/product/spu';
@@ -176,7 +185,7 @@
     const { code, data } = await SpuApi.getSpuPage({
       categoryId: state.categoryId,
       pageNo: state.pagination.pageNo,
-      pageSize: state.pagination.pageSize
+      pageSize: state.pagination.pageSize,
     });
     if (code !== 0) {
       return;
@@ -197,7 +206,9 @@
 
   // 获得分类列表
   async function getCategoryList() {
-    const { data, code } = await CategoryApi.getCategoryListByIds(state.coupon.productScopeValues.join(','));
+    const { data, code } = await CategoryApi.getCategoryListByIds(
+      state.coupon.productScopeValues.join(','),
+    );
     if (code !== 0) {
       return;
     }
@@ -225,8 +236,10 @@
 
   // 加载优惠劵信息
   async function getCouponContent() {
-    const { code, data } = state.id > 0 ? await CouponApi.getCouponTemplate(state.id)
-      : await CouponApi.getCoupon(state.couponId);
+    const { code, data } =
+      state.id > 0
+        ? await CouponApi.getCouponTemplate(state.id)
+        : await CouponApi.getCoupon(state.couponId);
     if (code !== 0) {
       return;
     }
diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
index e7c4394d..08addbd0 100644
--- a/pages/coupon/list.vue
+++ b/pages/coupon/list.vue
@@ -45,7 +45,7 @@
           <template #default>
             <button
               class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center"
-              :class=" item.status !== 1 ? 'disabled-btn': ''"
+              :class="item.status !== 1 ? 'disabled-btn' : ''"
               :disabled="item.status !== 1"
               @click.stop="sheep.$router.go('/pages/coupon/detail', { couponId: item.id })"
             >
@@ -56,9 +56,14 @@
       </view>
     </template>
 
-    <uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
         contentdown: '上拉加载更多',
-      }" @tap="loadMore" />
+      }"
+      @tap="loadMore"
+    />
   </s-layout>
 </template>
 
@@ -66,7 +71,7 @@
   import sheep from '@/sheep';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import { reactive } from 'vue';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import { resetPagination } from '@/sheep/util';
   import CouponApi from '@/sheep/api/promotion/coupon';
 
@@ -78,7 +83,7 @@
       list: [],
       total: 0,
       pageNo: 1,
-      pageSize: 5
+      pageSize: 5,
     },
     loadStatus: '',
   });
@@ -106,9 +111,9 @@
   function onTabsChange(e) {
     state.currentTab = e.index;
     state.type = e.value;
-    resetPagination(state.pagination)
+    resetPagination(state.pagination);
     if (state.currentTab === 0) {
-    	getData();
+      getData();
     } else {
       getCoupon();
     }
@@ -135,7 +140,7 @@
     const { data, code } = await CouponApi.getCouponPage({
       pageNo: state.pagination.pageNo,
       pageSize: state.pagination.pageSize,
-      status: state.type
+      status: state.type,
     });
     if (code !== 0) {
       return;
@@ -177,13 +182,13 @@
     // 领劵中心
     if (Option.type === 'all' || !Option.type) {
       getData();
-    // 我的优惠劵
+      // 我的优惠劵
     } else {
       Option.type === 'geted'
         ? (state.currentTab = 1)
         : Option.type === 'used'
-          ? (state.currentTab = 2)
-          : (state.currentTab = 3);
+        ? (state.currentTab = 2)
+        : (state.currentTab = 3);
       state.type = state.currentTab;
       getCoupon();
     }
diff --git a/pages/goods/comment/list.vue b/pages/goods/comment/list.vue
index 01526b00..8d4184e7 100644
--- a/pages/goods/comment/list.vue
+++ b/pages/goods/comment/list.vue
@@ -30,7 +30,7 @@
   import CommentApi from '@/sheep/api/product/comment';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import { reactive } from 'vue';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import commentItem from '../components/detail/comment-item.vue';
 
   const state = reactive({
diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 50bba1c4..354d6ed9 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -7,12 +7,16 @@
     <detailSkeleton v-if="state.skeletonLoading" />
     <!-- 下架/售罄提醒 -->
     <s-empty
-        v-else-if="state.goodsInfo === null || state.activity.status !== 0 || state.activity.endTime < new Date().getTime()"
-        text="活动不存在或已结束"
-        icon="/static/soldout-empty.png"
-        showAction
-        actionText="返回上一页"
-        @clickAction="sheep.$router.back()"
+      v-else-if="
+        state.goodsInfo === null ||
+        state.activity.status !== 0 ||
+        state.activity.endTime < new Date().getTime()
+      "
+      text="活动不存在或已结束"
+      icon="/static/soldout-empty.png"
+      showAction
+      actionText="返回上一页"
+      @clickAction="sheep.$router.back()"
     />
     <block v-else>
       <view class="detail-swiper-selector">
@@ -47,10 +51,7 @@
                 </view>
               </view>
               <view class="ss-flex ss-row-between">
-                <view
-                  class="origin-price ss-flex ss-col-center"
-                  v-if="state.goodsInfo.price"
-                >
+                <view class="origin-price ss-flex ss-col-center" v-if="state.goodsInfo.price">
                   单买价：
                   <view class="origin-price-text">
                     {{ fen2yuan(state.goodsInfo.price) }}
@@ -123,7 +124,9 @@
             "
             :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0"
           >
-            <view class="btn-price">{{ fen2yuan(state.activity.price || state.goodsInfo.price) }}</view>
+            <view class="btn-price">{{
+              fen2yuan(state.activity.price || 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>
             <view v-else>
@@ -141,7 +144,7 @@
   import { reactive, computed } from 'vue';
   import { onLoad, onPageScroll } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
+  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';
@@ -149,29 +152,27 @@
   import detailCommentCard from './components/detail/detail-comment-card.vue';
   import detailContentCard from './components/detail/detail-content-card.vue';
   import grouponCardList from './components/groupon/groupon-card-list.vue';
-  import {useDurationTime, formatGoodsSwiper, fen2yuan} from '@/sheep/hooks/useGoods';
-  import CombinationApi from "@/sheep/api/promotion/combination";
-  import SpuApi from "@/sheep/api/product/spu";
+  import { useDurationTime, formatGoodsSwiper, fen2yuan } from '@/sheep/hooks/useGoods';
+  import CombinationApi from '@/sheep/api/promotion/combination';
+  import SpuApi from '@/sheep/api/product/spu';
 
   const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-bg.png');
   const btnBg = sheep.$url.css('/static/img/shop/goods/groupon-btn.png');
-  const disabledBtnBg = sheep.$url.css(
-    '/static/img/shop/goods/activity-btn-disabled.png',
-  );
+  const disabledBtnBg = sheep.$url.css('/static/img/shop/goods/activity-btn-disabled.png');
   const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
 
   onPageScroll(() => {});
   const state = reactive({
-    skeletonLoading: true,  // 骨架屏
-    goodsId: 0,             // 商品ID
-    goodsInfo: {},          // 商品信息
-    goodsSwiper: [],        // 商品轮播图
-    showSelectSku: false,   // 显示规格弹框
-    selectedSkuPrice: {},   // 选中的规格价格
-    activity: {},           // 团购活动
-    grouponId: 0,           // 团购ID
-    grouponNum: 0,          // 团购人数
-    grouponAction: 'create',  // 团购操作
+    skeletonLoading: true, // 骨架屏
+    goodsId: 0, // 商品ID
+    goodsInfo: {}, // 商品信息
+    goodsSwiper: [], // 商品轮播图
+    showSelectSku: false, // 显示规格弹框
+    selectedSkuPrice: {}, // 选中的规格价格
+    activity: {}, // 团购活动
+    grouponId: 0, // 团购ID
+    grouponNum: 0, // 团购人数
+    grouponAction: 'create', // 团购操作
     combinationHeadId: null, // 拼团团长编号
   });
 
@@ -261,7 +262,7 @@
     // 加载商品信息
     const { data: spu } = await SpuApi.getSpuDetail(activity.spuId);
     state.goodsId = spu.id;
-    activity.products.forEach(product => {
+    activity.products.forEach((product) => {
       spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
     });
     // 关闭骨架屏
@@ -475,8 +476,7 @@
   }
 
   .groupon-box {
-    background: v-bind(grouponBg)
-      no-repeat;
+    background: v-bind(grouponBg) no-repeat;
     background-size: 100% 100%;
   }
 
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 87408b9a..27ab0894 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -1,177 +1,227 @@
 <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';
+  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 营销活动的列表
+    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
-        }],
+        items: [
+          {
+            skuId: e.id,
+            count: e.goods_num,
+          },
+        ],
         // TODO 芋艿：后续清理掉这 2 参数
         deliveryType: 1,
         pointStatus: false,
       }),
     });
-	}
+  }
 
-	// 营销活动
-	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;
@@ -182,27 +232,30 @@
     setTimeout(() => {
       getCoupon();
     }, 1000);
-	}
+  }
 
-	//  TODO 芋艿：待测试
-	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), // 商品原价
-		});
-	});
+  //  TODO 芋艿：待测试
+  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);
@@ -211,23 +264,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) {
@@ -238,172 +291,175 @@
           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)) { // 情况一：拼团/秒杀/砍价
+    // 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) { // 情况二：满减送
+        } else if (activity.type === 5) {
+          // 情况二：满减送
           state.activityInfo.push(activity);
-        } else { // 情况三：限时折扣 TODO 芋艿
+        } else {
+          // 情况三：限时折扣 TODO 芋艿
           console.log('待实现！优先级不高');
         }
-      })
-		});
-	});
+      });
+    });
+  });
 </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/pages/goods/list.vue b/pages/goods/list.vue
index 36240d50..1fdf5592 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -1,362 +1,398 @@
 <template>
-	<s-layout navbar="normal" :leftWidth="0" :rightWidth="0" tools="search" :defaultSearch="state.keyword"
-		@search="onSearch">
-		<!-- 筛选 -->
-		<su-sticky bgColor="#fff">
-			<view class="ss-flex">
-				<view class="ss-flex-1">
-					<su-tabs :list="state.tabList" :scrollable="false" @change="onTabsChange"
-                   :current="state.currentTab" />
-				</view>
-				<view class="list-icon" @tap="state.iconStatus = !state.iconStatus">
-					<text v-if="state.iconStatus" class="sicon-goods-list" />
-					<text v-else class="sicon-goods-card" />
-				</view>
-			</view>
-		</su-sticky>
+  <s-layout
+    navbar="normal"
+    :leftWidth="0"
+    :rightWidth="0"
+    tools="search"
+    :defaultSearch="state.keyword"
+    @search="onSearch"
+  >
+    <!-- 筛选 -->
+    <su-sticky bgColor="#fff">
+      <view class="ss-flex">
+        <view class="ss-flex-1">
+          <su-tabs
+            :list="state.tabList"
+            :scrollable="false"
+            @change="onTabsChange"
+            :current="state.currentTab"
+          />
+        </view>
+        <view class="list-icon" @tap="state.iconStatus = !state.iconStatus">
+          <text v-if="state.iconStatus" class="sicon-goods-list" />
+          <text v-else class="sicon-goods-card" />
+        </view>
+      </view>
+    </su-sticky>
 
-		<!-- 弹窗 -->
-		<su-popup :show="state.showFilter" type="top" round="10" :space="sys_navBar + 38" backgroundColor="#F6F6F6"
-			:zIndex="10" @close="state.showFilter = false">
-			<view class="filter-list-box">
-				<view class="filter-item" v-for="(item, index) in state.tabList[state.currentTab].list"
-					:key="item.value" :class="[{ 'filter-item-active': index === state.curFilter }]"
-					@tap="onFilterItem(index)">
-					{{ item.label }}
-				</view>
-			</view>
-		</su-popup>
+    <!-- 弹窗 -->
+    <su-popup
+      :show="state.showFilter"
+      type="top"
+      round="10"
+      :space="sys_navBar + 38"
+      backgroundColor="#F6F6F6"
+      :zIndex="10"
+      @close="state.showFilter = false"
+    >
+      <view class="filter-list-box">
+        <view
+          class="filter-item"
+          v-for="(item, index) in state.tabList[state.currentTab].list"
+          :key="item.value"
+          :class="[{ 'filter-item-active': index === state.curFilter }]"
+          @tap="onFilterItem(index)"
+        >
+          {{ item.label }}
+        </view>
+      </view>
+    </su-popup>
 
     <!-- 情况一：单列布局 -->
-		<view v-if="state.iconStatus && state.pagination.total > 0" class="goods-list ss-m-t-20">
-			<view class="ss-p-l-20 ss-p-r-20 ss-m-b-20" v-for="item in state.pagination.list" :key="item.id">
-				<s-goods-column
+    <view v-if="state.iconStatus && state.pagination.total > 0" class="goods-list ss-m-t-20">
+      <view
+        class="ss-p-l-20 ss-p-r-20 ss-m-b-20"
+        v-for="item in state.pagination.list"
+        :key="item.id"
+      >
+        <s-goods-column
           class=""
           size="lg"
           :data="item"
           :topRadius="10"
           :bottomRadius="10"
-					@click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+          @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
         />
-			</view>
-		</view>
+      </view>
+    </view>
     <!-- 情况二：双列布局 -->
-    <view v-if="!state.iconStatus && state.pagination.total > 0"
-			class="ss-flex ss-flex-wrap ss-p-x-20 ss-m-t-20 ss-col-top">
-			<view class="goods-list-box">
-				<view class="left-list" v-for="item in state.leftGoodsList" :key="item.id">
-					<s-goods-column
+    <view
+      v-if="!state.iconStatus && state.pagination.total > 0"
+      class="ss-flex ss-flex-wrap ss-p-x-20 ss-m-t-20 ss-col-top"
+    >
+      <view class="goods-list-box">
+        <view class="left-list" v-for="item in state.leftGoodsList" :key="item.id">
+          <s-goods-column
             class="goods-md-box"
             size="md"
             :data="item"
             :topRadius="10"
             :bottomRadius="10"
-						@click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-						@getHeight="mountMasonry($event, 'left')"
+            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            @getHeight="mountMasonry($event, 'left')"
           >
-						<template v-slot:cart>
-							<button class="ss-reset-button cart-btn" />
-						</template>
-					</s-goods-column>
-				</view>
-			</view>
-			<view class="goods-list-box">
-				<view class="right-list" v-for="item in state.rightGoodsList" :key="item.id">
-					<s-goods-column
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" />
+            </template>
+          </s-goods-column>
+        </view>
+      </view>
+      <view class="goods-list-box">
+        <view class="right-list" v-for="item in state.rightGoodsList" :key="item.id">
+          <s-goods-column
             class="goods-md-box"
             size="md"
             :topRadius="10"
             :bottomRadius="10"
             :data="item"
-						@click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-						@getHeight="mountMasonry($event, 'right')"
+            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            @getHeight="mountMasonry($event, 'right')"
           >
-						<template v-slot:cart>
-							<button class="ss-reset-button cart-btn" />
-						</template>
-					</s-goods-column>
-				</view>
-			</view>
-		</view>
-		<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" />
+            </template>
+          </s-goods-column>
+        </view>
+      </view>
+    </view>
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
         contentdown: '上拉加载更多',
-      }" @tap="loadMore" />
-		<s-empty v-if="state.pagination.total === 0" icon="/static/soldout-empty.png" text="暂无商品" />
-	</s-layout>
+      }"
+      @tap="loadMore"
+    />
+    <s-empty v-if="state.pagination.total === 0" icon="/static/soldout-empty.png" text="暂无商品" />
+  </s-layout>
 </template>
 
 <script setup>
-	import { reactive } from 'vue';
-	import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-	import sheep from '@/sheep';
-	import _ from 'lodash';
+  import { reactive } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import _ from 'lodash-es';
   import { resetPagination } from '@/sheep/util';
   import SpuApi from '@/sheep/api/product/spu';
 
-	const sys_navBar = sheep.$platform.navbar;
-	const emits = defineEmits(['close', 'change']);
+  const sys_navBar = sheep.$platform.navbar;
+  const emits = defineEmits(['close', 'change']);
 
-	const state = reactive({
-		pagination: {
-			list: [],
+  const state = reactive({
+    pagination: {
+      list: [],
       total: 0,
       pageNo: 1,
-			pageSize: 6,
-		},
-		currentSort: undefined,
-		currentOrder: undefined,
-		currentTab: 0, // 当前选中的 tab
-		curFilter: 0, // 当前选中的 list 筛选项
-		showFilter: false,
-		iconStatus: false, // true - 单列布局；false - 双列布局
+      pageSize: 6,
+    },
+    currentSort: undefined,
+    currentOrder: undefined,
+    currentTab: 0, // 当前选中的 tab
+    curFilter: 0, // 当前选中的 list 筛选项
+    showFilter: false,
+    iconStatus: false, // true - 单列布局；false - 双列布局
     keyword: '',
     categoryId: 0,
-		tabList: [{
-				name: '综合推荐',
-				list: [{
-						label: '综合推荐'
-					},
-					{
-						label: '价格升序',
-						sort: 'price',
-						order: true,
-					},
-					{
-						label: '价格降序',
-						sort: 'price',
-						order: false,
-					},
-				],
-			},
-			{
-				name: '销量',
-				sort: 'salesCount',
-				order: false
-			},
-			{
-				name: '新品优先',
-				value: 'createTime',
-        order: false
-			},
-		],
-		loadStatus: '',
-		leftGoodsList: [], // 双列布局 - 左侧商品
-		rightGoodsList: [], // 双列布局 - 右侧商品
-	});
+    tabList: [
+      {
+        name: '综合推荐',
+        list: [
+          {
+            label: '综合推荐',
+          },
+          {
+            label: '价格升序',
+            sort: 'price',
+            order: true,
+          },
+          {
+            label: '价格降序',
+            sort: 'price',
+            order: false,
+          },
+        ],
+      },
+      {
+        name: '销量',
+        sort: 'salesCount',
+        order: false,
+      },
+      {
+        name: '新品优先',
+        value: 'createTime',
+        order: false,
+      },
+    ],
+    loadStatus: '',
+    leftGoodsList: [], // 双列布局 - 左侧商品
+    rightGoodsList: [], // 双列布局 - 右侧商品
+  });
 
-	// 加载瀑布流
-	let count = 0;
-	let leftHeight = 0;
-	let rightHeight = 0;
+  // 加载瀑布流
+  let count = 0;
+  let leftHeight = 0;
+  let rightHeight = 0;
 
   // 处理双列布局 leftGoodsList + rightGoodsList
-	function mountMasonry(height = 0, where = 'left') {
-		if (!state.pagination.list[count]) {
+  function mountMasonry(height = 0, where = 'left') {
+    if (!state.pagination.list[count]) {
       return;
     }
 
-		if (where === 'left') {
-			leftHeight += height;
-		} else {
-			rightHeight += height;
-		}
-		if (leftHeight <= rightHeight) {
-			state.leftGoodsList.push(state.pagination.list[count]);
-		} else {
-			state.rightGoodsList.push(state.pagination.list[count]);
-		}
-		count++;
-	}
+    if (where === 'left') {
+      leftHeight += height;
+    } else {
+      rightHeight += height;
+    }
+    if (leftHeight <= rightHeight) {
+      state.leftGoodsList.push(state.pagination.list[count]);
+    } else {
+      state.rightGoodsList.push(state.pagination.list[count]);
+    }
+    count++;
+  }
 
   // 清空列表
-	function emptyList() {
+  function emptyList() {
     resetPagination(state.pagination);
     state.leftGoodsList = [];
-		state.rightGoodsList = [];
-		count = 0;
-		leftHeight = 0;
-		rightHeight = 0;
-	}
+    state.rightGoodsList = [];
+    count = 0;
+    leftHeight = 0;
+    rightHeight = 0;
+  }
 
-	// 搜索
-	function onSearch(e) {
-		state.keyword = e;
-		emptyList();
-		getList(state.currentSort, state.currentOrder);
-	}
+  // 搜索
+  function onSearch(e) {
+    state.keyword = e;
+    emptyList();
+    getList(state.currentSort, state.currentOrder);
+  }
 
-	// 点击
-	function onTabsChange(e) {
+  // 点击
+  function onTabsChange(e) {
     // 如果点击的是【综合推荐】，则直接展开或者收起筛选项
-		if (state.tabList[e.index].list) {
-			state.currentTab = e.index;
-			state.showFilter = !state.showFilter;
-			return;
-		}
+    if (state.tabList[e.index].list) {
+      state.currentTab = e.index;
+      state.showFilter = !state.showFilter;
+      return;
+    }
     state.showFilter = false;
 
     // 如果点击的是【销量】或者【新品优先】，则直接切换 tab
-		if (e.index === state.currentTab) {
-			return;
-		}
+    if (e.index === state.currentTab) {
+      return;
+    }
 
     state.currentTab = e.index;
     state.currentSort = e.sort;
     state.currentOrder = e.order;
-		emptyList();
-		getList(e.sort, e.order);
-	}
+    emptyList();
+    getList(e.sort, e.order);
+  }
 
-	// 点击 tab 的 list 筛选项
-	const onFilterItem = (val) => {
+  // 点击 tab 的 list 筛选项
+  const onFilterItem = (val) => {
     // 如果点击的是当前的筛选项，则直接收起筛选项，不要加载数据
     // 这里选择 tabList[0] 的原因，是目前只有它有 list
-		if (state.currentSort === state.tabList[0].list[val].sort
-      && state.currentOrder === state.tabList[0].list[val].order) {
-			state.showFilter = false;
-			return;
-		}
+    if (
+      state.currentSort === state.tabList[0].list[val].sort &&
+      state.currentOrder === state.tabList[0].list[val].order
+    ) {
+      state.showFilter = false;
+      return;
+    }
     state.showFilter = false;
 
     // 设置筛选条件
-		state.curFilter = val;
-		state.tabList[0].name = state.tabList[0].list[val].label;
-		state.currentSort = state.tabList[0].list[val].sort;
-		state.currentOrder = state.tabList[0].list[val].order;
-		// 清空 + 加载数据
+    state.curFilter = val;
+    state.tabList[0].name = state.tabList[0].list[val].label;
+    state.currentSort = state.tabList[0].list[val].sort;
+    state.currentOrder = state.tabList[0].list[val].order;
+    // 清空 + 加载数据
     emptyList();
-		getList();
-	}
+    getList();
+  };
 
-	async function getList() {
-		state.loadStatus = 'loading';
-		const { code, data } = await SpuApi.getSpuPage({
+  async function getList() {
+    state.loadStatus = 'loading';
+    const { code, data } = await SpuApi.getSpuPage({
       pageNo: state.pagination.pageNo,
       pageSize: state.pagination.pageSize,
-			sortField: state.currentSort,
-			sortAsc: state.currentOrder,
-			categoryId: state.categoryId,
-			keyword: state.keyword,
-		});
+      sortField: state.currentSort,
+      sortAsc: state.currentOrder,
+      categoryId: state.categoryId,
+      keyword: state.keyword,
+    });
     if (code !== 0) {
       return;
     }
-    state.pagination.list = _.concat(state.pagination.list, data.list)
+    state.pagination.list = _.concat(state.pagination.list, data.list);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
     mountMasonry();
-	}
+  }
 
-	// 加载更多
-	function loadMore() {
+  // 加载更多
+  function loadMore() {
     if (state.loadStatus === 'noMore') {
       return;
     }
     state.pagination.pageNo++;
     getList(state.currentSort, state.currentOrder);
-	}
+  }
 
-	onLoad((options) => {
-		state.categoryId = options.categoryId;
-		state.keyword = options.keyword;
-		getList(state.currentSort, state.currentOrder);
-	});
+  onLoad((options) => {
+    state.categoryId = options.categoryId;
+    state.keyword = options.keyword;
+    getList(state.currentSort, state.currentOrder);
+  });
 
-	// 上拉加载更多
-	onReachBottom(() => {
-		loadMore();
-	});
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
 </script>
 
 <style lang="scss" scoped>
-	.goods-list-box {
-		width: 50%;
-		box-sizing: border-box;
+  .goods-list-box {
+    width: 50%;
+    box-sizing: border-box;
 
-		.left-list {
-			margin-right: 10rpx;
-			margin-bottom: 20rpx;
-		}
+    .left-list {
+      margin-right: 10rpx;
+      margin-bottom: 20rpx;
+    }
 
-		.right-list {
-			margin-left: 10rpx;
-			margin-bottom: 20rpx;
-		}
-	}
+    .right-list {
+      margin-left: 10rpx;
+      margin-bottom: 20rpx;
+    }
+  }
 
-	.goods-box {
-		&:nth-last-of-type(1) {
-			margin-bottom: 0 !important;
-		}
+  .goods-box {
+    &:nth-last-of-type(1) {
+      margin-bottom: 0 !important;
+    }
 
-		&:nth-child(2n) {
-			margin-right: 0;
-		}
-	}
+    &:nth-child(2n) {
+      margin-right: 0;
+    }
+  }
 
-	.list-icon {
-		width: 80rpx;
+  .list-icon {
+    width: 80rpx;
 
-		.sicon-goods-card {
-			font-size: 40rpx;
-		}
+    .sicon-goods-card {
+      font-size: 40rpx;
+    }
 
-		.sicon-goods-list {
-			font-size: 40rpx;
-		}
-	}
+    .sicon-goods-list {
+      font-size: 40rpx;
+    }
+  }
 
-	.goods-card {
-		margin-left: 20rpx;
-	}
+  .goods-card {
+    margin-left: 20rpx;
+  }
 
-	.list-filter-tabs {
-		background-color: #fff;
-	}
+  .list-filter-tabs {
+    background-color: #fff;
+  }
 
-	.filter-list-box {
-		padding: 28rpx 52rpx;
+  .filter-list-box {
+    padding: 28rpx 52rpx;
 
-		.filter-item {
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #333333;
-			line-height: normal;
-			margin-bottom: 24rpx;
+    .filter-item {
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: normal;
+      margin-bottom: 24rpx;
 
-			&:nth-last-child(1) {
-				margin-bottom: 0;
-			}
-		}
+      &:nth-last-child(1) {
+        margin-bottom: 0;
+      }
+    }
 
-		.filter-item-active {
-			color: var(--ui-BG-Main);
-		}
-	}
+    .filter-item-active {
+      color: var(--ui-BG-Main);
+    }
+  }
 
-	.tab-item {
-		height: 50px;
-		position: relative;
-		z-index: 11;
+  .tab-item {
+    height: 50px;
+    position: relative;
+    z-index: 11;
 
-		.tab-title {
-			font-size: 30rpx;
-		}
+    .tab-title {
+      font-size: 30rpx;
+    }
 
-		.cur-tab-title {
-			font-weight: $font-weight-bold;
-		}
+    .cur-tab-title {
+      font-weight: $font-weight-bold;
+    }
 
-		.tab-line {
-			width: 60rpx;
-			height: 6rpx;
-			border-radius: 6rpx;
-			position: absolute;
-			left: 50%;
-			transform: translateX(-50%);
-			bottom: 10rpx;
-			background-color: var(--ui-BG-Main);
-			z-index: 12;
-		}
-	}
-</style>
\ No newline at end of file
+    .tab-line {
+      width: 60rpx;
+      height: 6rpx;
+      border-radius: 6rpx;
+      position: absolute;
+      left: 50%;
+      transform: translateX(-50%);
+      bottom: 10rpx;
+      background-color: var(--ui-BG-Main);
+      z-index: 12;
+    }
+  }
+</style>
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 027449a3..aed2cd33 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -69,10 +69,7 @@
 
         <!-- 功能卡片 -->
         <view class="detail-cell-card detail-card ss-flex-col">
-          <detail-cell-sku
-            :sku="state.selectedSku"
-            @tap="state.showSelectSku = true"
-          />
+          <detail-cell-sku :sku="state.selectedSku" @tap="state.showSelectSku = true" />
         </view>
         <!-- 规格与数量弹框 -->
         <s-select-seckill-sku
@@ -107,7 +104,9 @@
           <button v-else class="ss-reset-button origin-price-btn ss-flex-col">
             <view
               class="no-original"
-              :class="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED ? '' : ''"
+              :class="
+                state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED ? '' : ''
+              "
             >
               秒杀价
             </view>
@@ -136,11 +135,11 @@
 </template>
 
 <script setup>
-  import {reactive, computed, ref} from 'vue';
+  import { reactive, computed, ref } from 'vue';
   import { onLoad, onPageScroll } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import {isEmpty, min} from 'lodash';
-  import {useDurationTime, formatGoodsSwiper, fen2yuan} from '@/sheep/hooks/useGoods';
+  import { isEmpty, min } from 'lodash-es';
+  import { useDurationTime, 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';
@@ -148,15 +147,13 @@
   import detailCommentCard from './components/detail/detail-comment-card.vue';
   import detailContentCard from './components/detail/detail-content-card.vue';
   import detailProgress from './components/detail/detail-progress.vue';
-  import SeckillApi from "@/sheep/api/promotion/seckill";
-  import SpuApi from "@/sheep/api/product/spu";
-  import {getTimeStatusEnum, TimeStatusEnum} from "@/sheep/util/const";
+  import SeckillApi from '@/sheep/api/promotion/seckill';
+  import SpuApi from '@/sheep/api/product/spu';
+  import { getTimeStatusEnum, TimeStatusEnum } from '@/sheep/util/const';
 
   const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-bg.png');
   const btnBg = sheep.$url.css('/static/img/shop/goods/seckill-btn.png');
-  const disabledBtnBg = sheep.$url.css(
-    '/static/img/shop/goods/activity-btn-disabled.png',
-  );
+  const disabledBtnBg = sheep.$url.css('/static/img/shop/goods/activity-btn-disabled.png');
   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');
 
@@ -221,36 +218,40 @@
     );
   });
 
-  const activity = ref()
-  const timeStatusEnum = ref('')
+  const activity = ref();
+  const timeStatusEnum = ref('');
   // 查询活动
   const getActivity = async (id) => {
-    const { data } = await SeckillApi.getSeckillActivity(id)
-    activity.value = data
-    timeStatusEnum.value = getTimeStatusEnum(activity.startTime, activity.endTime)
+    const { data } = await SeckillApi.getSeckillActivity(id);
+    activity.value = data;
+    timeStatusEnum.value = getTimeStatusEnum(activity.startTime, activity.endTime);
 
     // 查询商品
-    await getSpu(data.spuId)
-  }
+    await getSpu(data.spuId);
+  };
 
   const getSpu = async (id) => {
-    const { data } = await SpuApi.getSpuDetail(id)
+    const { data } = await SpuApi.getSpuDetail(id);
     // 模拟
-    data.activity_type = 'seckill'
-    state.goodsInfo = data
+    data.activity_type = 'seckill';
+    state.goodsInfo = data;
     // 处理轮播图
     state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.sliderPicUrls);
 
     // 默认显示最低价
-    state.goodsInfo.price = min([state.goodsInfo.price, ...activity.value.products.map(spu => spu.seckillPrice)])
+    state.goodsInfo.price = min([
+      state.goodsInfo.price,
+      ...activity.value.products.map((spu) => spu.seckillPrice),
+    ]);
 
     // 价格、库存使用活动的
-    data.skus.forEach(sku => {
-      const product = activity.value.products.find(product => product.skuId === sku.id);
+    data.skus.forEach((sku) => {
+      const product = activity.value.products.find((product) => product.skuId === sku.id);
       if (product) {
         sku.price = product.seckillPrice;
         sku.stock = Math.min(sku.stock, product.stock);
-      } else { // 找不到可能是没配置，则不能发起秒杀
+      } else {
+        // 找不到可能是没配置，则不能发起秒杀
         sku.stock = 0;
       }
       // 设置限购数量
@@ -264,7 +265,7 @@
     });
 
     state.skeletonLoading = false;
-  }
+  };
 
   onLoad((options) => {
     // 非法参数
@@ -274,7 +275,7 @@
     }
 
     // 查询活动
-    getActivity(options.id)
+    getActivity(options.id);
   });
 </script>
 
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 2317d1d9..cb87b0b5 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -63,7 +63,7 @@
   import SpuApi from '@/sheep/api/product/spu';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import { computed, reactive } from 'vue';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import { handleTree } from '@/sheep/util';
 
   const state = reactive({
diff --git a/pages/order/aftersale/apply.vue b/pages/order/aftersale/apply.vue
index 8c9752ed..805ea944 100644
--- a/pages/order/aftersale/apply.vue
+++ b/pages/order/aftersale/apply.vue
@@ -98,11 +98,7 @@
         </view>
         <view class="modal-content content_box">
           <radio-group @change="onChange">
-            <label
-              class="radio ss-flex ss-col-center"
-              v-for="item in state.reasonList"
-              :key="item"
-            >
+            <label class="radio ss-flex ss-col-center" v-for="item in state.reasonList" :key="item">
               <view class="ss-flex-1 ss-p-20">{{ item }}</view>
               <radio
                 :value="item"
@@ -153,9 +149,9 @@
     ],
     reasonList: [], // 可选的申请原因数组
     showModal: false, // 是否显示申请原因弹窗
-    currentValue: '' // 当前选择的售后原因
+    currentValue: '', // 当前选择的售后原因
   });
-  const formData = reactive({
+  let formData = reactive({
     way: '',
     applyReason: '',
     applyDescription: '',
diff --git a/pages/order/aftersale/detail.vue b/pages/order/aftersale/detail.vue
index 7bff82b2..6b7bfcce 100644
--- a/pages/order/aftersale/detail.vue
+++ b/pages/order/aftersale/detail.vue
@@ -1,156 +1,193 @@
 <!-- 售后详情 -->
 <template>
-	<s-layout title="售后详情" :navbar="!isEmpty(state.info) && state.loading ? 'inner' : 'normal'">
-		<view class="content_box" v-if="!isEmpty(state.info) && state.loading">
-			<!-- 步骤条 -->
-			<view class="steps-box ss-flex" :style="[
+  <s-layout title="售后详情" :navbar="!isEmpty(state.info) && state.loading ? 'inner' : 'normal'">
+    <view class="content_box" v-if="!isEmpty(state.info) && state.loading">
+      <!-- 步骤条 -->
+      <view
+        class="steps-box ss-flex"
+        :style="[
           {
             marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
             paddingTop: Number(statusBarHeight + 88) + 'rpx',
           },
-        ]">
-				<view class="ss-flex">
-					<view class="steps-item" v-for="(item, index) in state.list" :key="index">
-						<view class="ss-flex">
-							<text class="sicon-circleclose"
-                    v-if="state.list.length - 1 === index && [61, 62, 63].includes(state.info.status)" />
-							<text class="sicon-circlecheck" v-else
-                    :class="state.active >= index ? 'activity-color' : 'info-color'" />
+        ]"
+      >
+        <view class="ss-flex">
+          <view class="steps-item" v-for="(item, index) in state.list" :key="index">
+            <view class="ss-flex">
+              <text
+                class="sicon-circleclose"
+                v-if="state.list.length - 1 === index && [61, 62, 63].includes(state.info.status)"
+              />
+              <text
+                class="sicon-circlecheck"
+                v-else
+                :class="state.active >= index ? 'activity-color' : 'info-color'"
+              />
 
-							<view v-if="state.list.length - 1 !== index" class="line"
-                    :class="state.active >= index ? 'activity-bg' : 'info-bg'" />
-						</view>
-						<view class="steps-item-title" :class="state.active >= index ? 'activity-color' : 'info-color'">
-							{{ item.title }}
-						</view>
-					</view>
-				</view>
-			</view>
+              <view
+                v-if="state.list.length - 1 !== index"
+                class="line"
+                :class="state.active >= index ? 'activity-bg' : 'info-bg'"
+              />
+            </view>
+            <view
+              class="steps-item-title"
+              :class="state.active >= index ? 'activity-color' : 'info-color'"
+            >
+              {{ item.title }}
+            </view>
+          </view>
+        </view>
+      </view>
 
-			<!-- 服务状态 -->
-			<view class="status-box ss-flex ss-col-center ss-row-between ss-m-x-20"
-            @tap="sheep.$router.go('/pages/order/aftersale/log', { id: state.id })">
-				<view class="">
-					<view class="status-text">
+      <!-- 服务状态 -->
+      <view
+        class="status-box ss-flex ss-col-center ss-row-between ss-m-x-20"
+        @tap="sheep.$router.go('/pages/order/aftersale/log', { id: state.id })"
+      >
+        <view class="">
+          <view class="status-text">
             {{ formatAfterSaleStatusDescription(state.info) }}
           </view>
-					<view class="status-time">
+          <view class="status-time">
             {{ sheep.$helper.timeFormat(state.info.updateTime, 'yyyy-mm-dd hh:MM:ss') }}
           </view>
-				</view>
-				<text class="ss-iconfont _icon-forward" style="color: #666" />
-			</view>
+        </view>
+        <text class="ss-iconfont _icon-forward" style="color: #666" />
+      </view>
 
-			<!-- 退款金额 -->
-			<view class="aftersale-money ss-flex ss-col-center ss-row-between">
-				<view class="aftersale-money--title">退款总额</view>
-				<view class="aftersale-money--num">￥{{ fen2yuan(state.info.refundPrice) }}</view>
-			</view>
-			<!-- 服务商品 -->
-			<view class="order-shop">
-				<s-goods-item
-          :img=" state.info.picUrl"
-          :title=" state.info.spuName"
-					:titleWidth="480"
+      <!-- 退款金额 -->
+      <view class="aftersale-money ss-flex ss-col-center ss-row-between">
+        <view class="aftersale-money--title">退款总额</view>
+        <view class="aftersale-money--num">￥{{ fen2yuan(state.info.refundPrice) }}</view>
+      </view>
+      <!-- 服务商品 -->
+      <view class="order-shop">
+        <s-goods-item
+          :img="state.info.picUrl"
+          :title="state.info.spuName"
+          :titleWidth="480"
           :skuText="state.info.properties.map((property) => property.valueName).join(' ')"
-          :num=" state.info.count"
+          :num="state.info.count"
         />
-			</view>
+      </view>
 
-			<!-- 服务内容 -->
-			<view class="aftersale-content">
-				<view class="aftersale-item ss-flex ss-col-center">
-					<view class="item-title">服务单号：</view>
-					<view class="item-content ss-m-r-16">{{ state.info.no }}</view>
-					<button class="ss-reset-button copy-btn" @tap="onCopy">复制</button>
-				</view>
-				<view class="aftersale-item ss-flex ss-col-center">
-					<view class="item-title">申请时间：</view>
-					<view class="item-content">
-						{{ sheep.$helper.timeFormat(state.info.createTime, 'yyyy-mm-dd hh:MM:ss') }}
-					</view>
-				</view>
-				<view class="aftersale-item ss-flex ss-col-center">
-					<view class="item-title">售后类型：</view>
-					<view class="item-content">{{ state.info.way === 10 ? '仅退款' : '退款退货' }}</view>
-				</view>
-				<view class="aftersale-item ss-flex ss-col-center">
-					<view class="item-title">申请原因：</view>
-					<view class="item-content">{{ state.info.applyReason }}</view>
-				</view>
-				<view class="aftersale-item ss-flex ss-col-center">
-					<view class="item-title">相关描述：</view>
-					<view class="item-content">{{ state.info.applyDescription }}</view>
-				</view>
-			</view>
-		</view>
+      <!-- 服务内容 -->
+      <view class="aftersale-content">
+        <view class="aftersale-item ss-flex ss-col-center">
+          <view class="item-title">服务单号：</view>
+          <view class="item-content ss-m-r-16">{{ state.info.no }}</view>
+          <button class="ss-reset-button copy-btn" @tap="onCopy">复制</button>
+        </view>
+        <view class="aftersale-item ss-flex ss-col-center">
+          <view class="item-title">申请时间：</view>
+          <view class="item-content">
+            {{ sheep.$helper.timeFormat(state.info.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </view>
+        </view>
+        <view class="aftersale-item ss-flex ss-col-center">
+          <view class="item-title">售后类型：</view>
+          <view class="item-content">{{ state.info.way === 10 ? '仅退款' : '退款退货' }}</view>
+        </view>
+        <view class="aftersale-item ss-flex ss-col-center">
+          <view class="item-title">申请原因：</view>
+          <view class="item-content">{{ state.info.applyReason }}</view>
+        </view>
+        <view class="aftersale-item ss-flex ss-col-center">
+          <view class="item-title">相关描述：</view>
+          <view class="item-content">{{ state.info.applyDescription }}</view>
+        </view>
+      </view>
+    </view>
 
     <!-- 操作区 -->
-		<s-empty v-if="isEmpty(state.info) && state.loading" icon="/static/order-empty.png" text="暂无该订单售后详情" />
-		<su-fixed bottom placeholder bg="bg-white" v-if="!isEmpty(state.info)">
-			<view class="foot_box">
-        <button class="ss-reset-button btn" v-if="state.info.buttons?.includes('cancel')"
-                @tap="onApply(state.info.id)">
+    <s-empty
+      v-if="isEmpty(state.info) && state.loading"
+      icon="/static/order-empty.png"
+      text="暂无该订单售后详情"
+    />
+    <su-fixed bottom placeholder bg="bg-white" v-if="!isEmpty(state.info)">
+      <view class="foot_box">
+        <button
+          class="ss-reset-button btn"
+          v-if="state.info.buttons?.includes('cancel')"
+          @tap="onApply(state.info.id)"
+        >
           取消申请
         </button>
-        <button class="ss-reset-button btn" v-if="state.info.buttons?.includes('delivery')"
-                @tap="sheep.$router.go('/pages/order/aftersale/return-delivery', { id: state.info.id })">
+        <button
+          class="ss-reset-button btn"
+          v-if="state.info.buttons?.includes('delivery')"
+          @tap="sheep.$router.go('/pages/order/aftersale/return-delivery', { id: state.info.id })"
+        >
           填写退货
         </button>
-				<button class="ss-reset-button contcat-btn btn" @tap="sheep.$router.go('/pages/chat/index')">
+        <button
+          class="ss-reset-button contcat-btn btn"
+          @tap="sheep.$router.go('/pages/chat/index')"
+        >
           联系客服
         </button>
-			</view>
-		</su-fixed>
-	</s-layout>
+      </view>
+    </su-fixed>
+  </s-layout>
 </template>
 
 <script setup>
-	import sheep from '@/sheep';
-	import { onLoad } from '@dcloudio/uni-app';
-	import { reactive } from 'vue';
-	import { isEmpty } from 'lodash';
-  import { fen2yuan, formatAfterSaleStatusDescription, handleAfterSaleButtons } from '@/sheep/hooks/useGoods';
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import { isEmpty } from 'lodash-es';
+  import {
+    fen2yuan,
+    formatAfterSaleStatusDescription,
+    handleAfterSaleButtons,
+  } from '@/sheep/hooks/useGoods';
   import AfterSaleApi from '@/sheep/api/trade/afterSale';
 
-	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
-	const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
-	const state = reactive({
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
+  const state = reactive({
     id: 0, // 售后编号
     info: {}, // 收货信息
-		loading: false,
+    loading: false,
     active: 0, // 在 list 的激活位置
-    list: [{
-      title: '提交申请',
-    }, {
-      title: '处理中',
-    }, {
-      title: '完成'
-    }], // 时间轴
-	});
+    list: [
+      {
+        title: '提交申请',
+      },
+      {
+        title: '处理中',
+      },
+      {
+        title: '完成',
+      },
+    ], // 时间轴
+  });
 
-	function onApply(id) {
-		uni.showModal({
-			title: '提示',
-			content: '确定要取消此申请吗？',
-			success: async function(res) {
-				if (!res.confirm) {
-					return;
-				}
+  function onApply(id) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消此申请吗？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
         const { code } = await AfterSaleApi.cancelAfterSale(id);
         if (code === 0) {
           await getDetail(id);
         }
-			},
-		});
-	}
+      },
+    });
+  }
 
   // 复制
   const onCopy = () => {
-		sheep.$helper.copyText(state.info.no);
-	};
+    sheep.$helper.copyText(state.info.no);
+  };
 
-	async function getDetail(id) {
+  async function getDetail(id) {
     state.loading = true;
     const { code, data } = await AfterSaleApi.getAfterSale(id);
     if (code !== 0) {
@@ -170,173 +207,173 @@
     } else if ([61, 62, 63].includes(state.info.status)) {
       state.active = 2;
     }
-	}
+  }
 
-	onLoad((options) => {
+  onLoad((options) => {
     if (!options.id) {
       sheep.$helper.toast(`缺少订单信息，请检查`);
-      return
+      return;
     }
-		state.id = options.id;
-		getDetail(options.id);
-	});
+    state.id = options.id;
+    getDetail(options.id);
+  });
 </script>
 
 <style lang="scss" scoped>
-	// 步骤条
-	.steps-box {
-		width: 100%;
-		height: 190rpx;
-		background: v-bind(headerBg) no-repeat,
-			linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-		background-size: 750rpx 100%;
-		padding-left: 72rpx;
+  // 步骤条
+  .steps-box {
+    width: 100%;
+    height: 190rpx;
+    background: v-bind(headerBg) no-repeat,
+      linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    background-size: 750rpx 100%;
+    padding-left: 72rpx;
 
-		.steps-item {
-			.sicon-circleclose {
-				font-size: 24rpx;
-				color: #fff;
-			}
+    .steps-item {
+      .sicon-circleclose {
+        font-size: 24rpx;
+        color: #fff;
+      }
 
-			.sicon-circlecheck {
-				font-size: 24rpx;
-			}
+      .sicon-circlecheck {
+        font-size: 24rpx;
+      }
 
-			.steps-item-title {
-				font-size: 24rpx;
-				font-weight: 400;
-				margin-top: 16rpx;
-				margin-left: -36rpx;
-				width: 100rpx;
-				text-align: center;
-			}
-		}
-	}
+      .steps-item-title {
+        font-size: 24rpx;
+        font-weight: 400;
+        margin-top: 16rpx;
+        margin-left: -36rpx;
+        width: 100rpx;
+        text-align: center;
+      }
+    }
+  }
 
-	.activity-color {
-		color: #fff;
-	}
+  .activity-color {
+    color: #fff;
+  }
 
-	.info-color {
-		color: rgba(#fff, 0.4);
-	}
+  .info-color {
+    color: rgba(#fff, 0.4);
+  }
 
-	.activity-bg {
-		background: #fff;
-	}
+  .activity-bg {
+    background: #fff;
+  }
 
-	.info-bg {
-		background: rgba(#fff, 0.4);
-	}
+  .info-bg {
+    background: rgba(#fff, 0.4);
+  }
 
-	.line {
-		width: 270rpx;
-		height: 4rpx;
-	}
+  .line {
+    width: 270rpx;
+    height: 4rpx;
+  }
 
-	// 服务状态
-	.status-box {
-		position: relative;
-		z-index: 3;
-		background-color: #fff;
-		border-radius: 20rpx 20rpx 0px 0px;
-		padding: 20rpx;
-		margin-top: -20rpx;
+  // 服务状态
+  .status-box {
+    position: relative;
+    z-index: 3;
+    background-color: #fff;
+    border-radius: 20rpx 20rpx 0px 0px;
+    padding: 20rpx;
+    margin-top: -20rpx;
 
-		.status-text {
-			font-size: 28rpx;
+    .status-text {
+      font-size: 28rpx;
 
-			font-weight: 500;
-			color: rgba(51, 51, 51, 1);
-			margin-bottom: 20rpx;
-		}
+      font-weight: 500;
+      color: rgba(51, 51, 51, 1);
+      margin-bottom: 20rpx;
+    }
 
-		.status-time {
-			font-size: 24rpx;
+    .status-time {
+      font-size: 24rpx;
 
-			font-weight: 400;
-			color: rgba(153, 153, 153, 1);
-		}
-	}
+      font-weight: 400;
+      color: rgba(153, 153, 153, 1);
+    }
+  }
 
-	// 退款金额
-	.aftersale-money {
-		background-color: #fff;
-		height: 98rpx;
-		padding: 0 20rpx;
-		margin: 20rpx;
+  // 退款金额
+  .aftersale-money {
+    background-color: #fff;
+    height: 98rpx;
+    padding: 0 20rpx;
+    margin: 20rpx;
 
-		.aftersale-money--title {
-			font-size: 28rpx;
+    .aftersale-money--title {
+      font-size: 28rpx;
 
-			font-weight: 500;
-			color: rgba(51, 51, 51, 1);
-		}
+      font-weight: 500;
+      color: rgba(51, 51, 51, 1);
+    }
 
-		.aftersale-money--num {
-			font-size: 28rpx;
-			font-family: OPPOSANS;
-			font-weight: 500;
-			color: #ff3000;
-		}
-	}
+    .aftersale-money--num {
+      font-size: 28rpx;
+      font-family: OPPOSANS;
+      font-weight: 500;
+      color: #ff3000;
+    }
+  }
 
-	// order-shop
-	.order-shop {
-		padding: 20rpx;
-		background-color: #fff;
-		margin: 0 20rpx 20rpx 20rpx;
-	}
+  // order-shop
+  .order-shop {
+    padding: 20rpx;
+    background-color: #fff;
+    margin: 0 20rpx 20rpx 20rpx;
+  }
 
-	// 服务内容
-	.aftersale-content {
-		background-color: #fff;
-		padding: 20rpx;
-		margin: 0 20rpx;
+  // 服务内容
+  .aftersale-content {
+    background-color: #fff;
+    padding: 20rpx;
+    margin: 0 20rpx;
 
-		.aftersale-item {
-			height: 60rpx;
+    .aftersale-item {
+      height: 60rpx;
 
-			.copy-btn {
-				background: #eeeeee;
-				color: #333;
-				border-radius: 20rpx;
-				width: 75rpx;
-				height: 40rpx;
-				font-size: 22rpx;
-			}
+      .copy-btn {
+        background: #eeeeee;
+        color: #333;
+        border-radius: 20rpx;
+        width: 75rpx;
+        height: 40rpx;
+        font-size: 22rpx;
+      }
 
-			.item-title {
-				color: #999;
-				font-size: 28rpx;
-			}
+      .item-title {
+        color: #999;
+        font-size: 28rpx;
+      }
 
-			.item-content {
-				color: #333;
-				font-size: 28rpx;
-			}
-		}
-	}
+      .item-content {
+        color: #333;
+        font-size: 28rpx;
+      }
+    }
+  }
 
-	// 底部功能
-	.foot_box {
-		height: 100rpx;
-		background-color: #fff;
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
+  // 底部功能
+  .foot_box {
+    height: 100rpx;
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
 
-		.btn {
-			width: 160rpx;
-			line-height: 60rpx;
-			background: rgba(238, 238, 238, 1);
-			border-radius: 30rpx;
-			padding: 0;
-			margin-right: 20rpx;
-			font-size: 26rpx;
+    .btn {
+      width: 160rpx;
+      line-height: 60rpx;
+      background: rgba(238, 238, 238, 1);
+      border-radius: 30rpx;
+      padding: 0;
+      margin-right: 20rpx;
+      font-size: 26rpx;
 
-			font-weight: 400;
-			color: rgba(51, 51, 51, 1);
-		}
-	}
-</style>
\ No newline at end of file
+      font-weight: 400;
+      color: rgba(51, 51, 51, 1);
+    }
+  }
+</style>
diff --git a/pages/order/aftersale/list.vue b/pages/order/aftersale/list.vue
index 64624960..5ec22b4a 100644
--- a/pages/order/aftersale/list.vue
+++ b/pages/order/aftersale/list.vue
@@ -1,187 +1,210 @@
 <!-- 售后列表 -->
 <template>
-	<s-layout title="售后列表">
-		<!-- tab -->
-		<su-sticky bgColor="#fff">
-			<su-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab" />
-		</su-sticky>
-		<s-empty v-if="state.pagination.total === 0" icon="/static/data-empty.png" text="暂无数据" />
-		<!-- 列表 -->
-		<view v-if="state.pagination.total > 0">
-			<view class="list-box ss-m-y-20" v-for="order in state.pagination.list" :key="order.id"
-				@tap="sheep.$router.go('/pages/order/aftersale/detail', { id: order.id })">
-				<view class="order-head ss-flex ss-col-center ss-row-between">
-					<text class="no">服务单号：{{ order.no }}</text>
-					<text class="state">{{ formatAfterSaleStatus(order) }}</text>
-				</view>
-				<s-goods-item
+  <s-layout title="售后列表">
+    <!-- tab -->
+    <su-sticky bgColor="#fff">
+      <su-tabs
+        :list="tabMaps"
+        :scrollable="false"
+        @change="onTabsChange"
+        :current="state.currentTab"
+      />
+    </su-sticky>
+    <s-empty v-if="state.pagination.total === 0" icon="/static/data-empty.png" text="暂无数据" />
+    <!-- 列表 -->
+    <view v-if="state.pagination.total > 0">
+      <view
+        class="list-box ss-m-y-20"
+        v-for="order in state.pagination.list"
+        :key="order.id"
+        @tap="sheep.$router.go('/pages/order/aftersale/detail', { id: order.id })"
+      >
+        <view class="order-head ss-flex ss-col-center ss-row-between">
+          <text class="no">服务单号：{{ order.no }}</text>
+          <text class="state">{{ formatAfterSaleStatus(order) }}</text>
+        </view>
+        <s-goods-item
           :img="order.picUrl"
           :title="order.spuName"
-					:skuText="order.properties.map((property) => property.valueName).join(' ')"
+          :skuText="order.properties.map((property) => property.valueName).join(' ')"
           :price="order.refundPrice"
         />
-				<view class="apply-box ss-flex ss-col-center ss-row-between border-bottom ss-p-x-20">
-					<view class="ss-flex ss-col-center">
-						<view class="title ss-m-r-20">{{ order.way === 10 ? '仅退款' : '退款退货' }}</view>
-						 <view class="value">{{ formatAfterSaleStatusDescription(order) }}</view>
-					</view>
-					<text class="_icon-forward"></text>
-				</view>
-				<view class="tool-btn-box ss-flex ss-col-center ss-row-right ss-p-r-20">
+        <view class="apply-box ss-flex ss-col-center ss-row-between border-bottom ss-p-x-20">
+          <view class="ss-flex ss-col-center">
+            <view class="title ss-m-r-20">{{ order.way === 10 ? '仅退款' : '退款退货' }}</view>
+            <view class="value">{{ formatAfterSaleStatusDescription(order) }}</view>
+          </view>
+          <text class="_icon-forward"></text>
+        </view>
+        <view class="tool-btn-box ss-flex ss-col-center ss-row-right ss-p-r-20">
           <!-- TODO 功能缺失：填写退货信息 -->
-					<view>
-						<button class="ss-reset-button tool-btn" @tap.stop="onApply(order.id)"
-							v-if="order?.buttons.includes('cancel')">取消申请</button>
-					</view>
-				</view>
-			</view>
-		</view>
-		<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
+          <view>
+            <button
+              class="ss-reset-button tool-btn"
+              @tap.stop="onApply(order.id)"
+              v-if="order?.buttons.includes('cancel')"
+              >取消申请</button
+            >
+          </view>
+        </view>
+      </view>
+    </view>
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
         contentdown: '上拉加载更多',
-      }" @tap="loadMore" />
-	</s-layout>
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
 </template>
 
 <script setup>
-	import sheep from '@/sheep';
-	import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-	import { reactive } from 'vue';
-	import _ from 'lodash';
-  import { formatAfterSaleStatus, formatAfterSaleStatusDescription, handleAfterSaleButtons } from '@/sheep/hooks/useGoods';
+  import sheep from '@/sheep';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import _ from 'lodash-es';
+  import {
+    formatAfterSaleStatus,
+    formatAfterSaleStatusDescription,
+    handleAfterSaleButtons,
+  } from '@/sheep/hooks/useGoods';
   import AfterSaleApi from '@/sheep/api/trade/afterSale';
   import { resetPagination } from '@/sheep/util';
 
-	const state = reactive({
-		currentTab: 0,
-		showApply: false,
-		pagination: {
+  const state = reactive({
+    currentTab: 0,
+    showApply: false,
+    pagination: {
       list: [],
       total: 0,
       pageNo: 1,
-      pageSize: 10
-		},
-		loadStatus: '',
-	});
+      pageSize: 10,
+    },
+    loadStatus: '',
+  });
 
   // TODO 芋艿：优化点，增加筛选
-	const tabMaps = [{
-			name: '全部',
-			value: 'all',
-		},
-		// {
-		//   name: '申请中',
-		//   value: 'nooper',
-		// },
-		// {
-		//   name: '处理中',
-		//   value: 'ing',
-		// },
-		// {
-		//   name: '已完成',
-		//   value: 'completed',
-		// },
-		// {
-		//   name: '已拒绝',
-		//   value: 'refuse',
-		// },
-	];
+  const tabMaps = [
+    {
+      name: '全部',
+      value: 'all',
+    },
+    // {
+    //   name: '申请中',
+    //   value: 'nooper',
+    // },
+    // {
+    //   name: '处理中',
+    //   value: 'ing',
+    // },
+    // {
+    //   name: '已完成',
+    //   value: 'completed',
+    // },
+    // {
+    //   name: '已拒绝',
+    //   value: 'refuse',
+    // },
+  ];
 
-	// 切换选项卡
-	function onTabsChange(e) {
+  // 切换选项卡
+  function onTabsChange(e) {
     resetPagination(state.pagination);
-		state.currentTab = e.index;
-		getOrderList();
-	}
+    state.currentTab = e.index;
+    getOrderList();
+  }
 
-	// 获取售后列表
-	async function getOrderList() {
-		state.loadStatus = 'loading';
-		let { data, code } = await AfterSaleApi.getAfterSalePage({
-			// type: tabMaps[state.currentTab].value,
+  // 获取售后列表
+  async function getOrderList() {
+    state.loadStatus = 'loading';
+    let { data, code } = await AfterSaleApi.getAfterSalePage({
+      // type: tabMaps[state.currentTab].value,
       pageNo: state.pagination.pageNo,
       pageSize: state.pagination.pageSize,
-		});
-		if (code !== 0) {
+    });
+    if (code !== 0) {
       return;
-		}
-    data.list.forEach(order => handleAfterSaleButtons(order));
+    }
+    data.list.forEach((order) => handleAfterSaleButtons(order));
     state.pagination.list = _.concat(state.pagination.list, data.list);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
-	}
+  }
 
-	function onApply(orderId) {
-		uni.showModal({
-			title: '提示',
-			content: '确定要取消此申请吗？',
-			success: async function(res) {
-				if (!res.confirm) {
+  function onApply(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消此申请吗？',
+      success: async function (res) {
+        if (!res.confirm) {
           return;
-				}
+        }
         const { code } = await AfterSaleApi.cancelAfterSale(orderId);
         if (code === 0) {
           resetPagination(state.pagination);
           await getOrderList();
         }
-			},
-		});
-	}
+      },
+    });
+  }
 
-	onLoad(async (options) => {
-		if (options.type) {
-			state.currentTab = options.type;
-		}
-		await getOrderList();
-	});
+  onLoad(async (options) => {
+    if (options.type) {
+      state.currentTab = options.type;
+    }
+    await getOrderList();
+  });
 
-	// 加载更多
-	function loadMore() {
+  // 加载更多
+  function loadMore() {
     if (state.loadStatus === 'noMore') {
-      return
+      return;
     }
     state.pagination.pageNo++;
     getOrderList();
-	}
+  }
 
-	// 上拉加载更多
-	onReachBottom(() => {
-		loadMore();
-	});
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
 </script>
 
 <style lang="scss" scoped>
-	.list-box {
-		background-color: #fff;
+  .list-box {
+    background-color: #fff;
 
-		.order-head {
-			padding: 0 25rpx;
-			height: 77rpx;
-		}
+    .order-head {
+      padding: 0 25rpx;
+      height: 77rpx;
+    }
 
-		.apply-box {
-			height: 82rpx;
+    .apply-box {
+      height: 82rpx;
 
-			.title {
-				font-size: 24rpx;
-			}
+      .title {
+        font-size: 24rpx;
+      }
 
-			.value {
-				font-size: 22rpx;
-				color: $dark-6;
-			}
-		}
+      .value {
+        font-size: 22rpx;
+        color: $dark-6;
+      }
+    }
 
-		.tool-btn-box {
-			height: 100rpx;
+    .tool-btn-box {
+      height: 100rpx;
 
-			.tool-btn {
-				width: 160rpx;
-				height: 60rpx;
-				background: #f6f6f6;
-				border-radius: 30rpx;
-				font-size: 26rpx;
-				font-weight: 400;
-			}
-		}
-	}
-</style>
\ No newline at end of file
+      .tool-btn {
+        width: 160rpx;
+        height: 60rpx;
+        background: #f6f6f6;
+        border-radius: 30rpx;
+        font-size: 26rpx;
+        font-weight: 400;
+      }
+    }
+  }
+</style>
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 834ad04a..94d78d73 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -162,7 +162,7 @@
   import { reactive } from 'vue';
   import { onLoad } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
+  import { isEmpty } from 'lodash-es';
   import OrderApi from '@/sheep/api/trade/order';
   import CouponApi from '@/sheep/api/promotion/coupon';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
@@ -223,7 +223,7 @@
       pointStatus: false, // TODO 芋艿：需要支持【积分选择】
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
-      seckillActivityId: state.orderPayload.seckillActivityId
+      seckillActivityId: state.orderPayload.seckillActivityId,
     });
     if (code !== 0) {
       return;
@@ -250,7 +250,7 @@
       pointStatus: false, // TODO 芋艿：需要支持【积分选择】
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
-      seckillActivityId: state.orderPayload.seckillActivityId
+      seckillActivityId: state.orderPayload.seckillActivityId,
     });
     if (code !== 0) {
       return;
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index b9527e76..8ab02713 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -252,7 +252,7 @@
   import sheep from '@/sheep';
   import { onLoad } from '@dcloudio/uni-app';
   import { reactive } from 'vue';
-  import { isEmpty } from 'lodash';
+  import { isEmpty } from 'lodash-es';
   import {
     fen2yuan,
     formatOrderStatus,
@@ -371,7 +371,7 @@
   // 评价
   function onComment(id) {
     sheep.$router.go('/pages/goods/comment/add', {
-      id
+      id,
     });
   }
 
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 323d7ae7..926ecfde 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -1,243 +1,284 @@
 <!-- 订单列表 -->
 <template>
-	<s-layout title="我的订单">
-		<su-sticky bgColor="#fff">
-			<su-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab" />
-		</su-sticky>
-		<s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单" />
-		<view v-if="state.pagination.total > 0">
-			<view class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20" v-for="order in state.pagination.list"
-            :key="order.id" @tap="onOrderDetail(order.id)">
-				<view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
-					<view class="order-no">订单号：{{ order.no }}</view>
-					<view class="order-state ss-font-26" :class="formatOrderColor(order)">
+  <s-layout title="我的订单">
+    <su-sticky bgColor="#fff">
+      <su-tabs
+        :list="tabMaps"
+        :scrollable="false"
+        @change="onTabsChange"
+        :current="state.currentTab"
+      />
+    </su-sticky>
+    <s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单" />
+    <view v-if="state.pagination.total > 0">
+      <view
+        class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20"
+        v-for="order in state.pagination.list"
+        :key="order.id"
+        @tap="onOrderDetail(order.id)"
+      >
+        <view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
+          <view class="order-no">订单号：{{ order.no }}</view>
+          <view class="order-state ss-font-26" :class="formatOrderColor(order)">
             {{ formatOrderStatus(order) }}
           </view>
-				</view>
-				<view class="border-bottom" v-for="item in order.items" :key="item.id">
-					<s-goods-item
+        </view>
+        <view class="border-bottom" v-for="item in order.items" :key="item.id">
+          <s-goods-item
             :img="item.picUrl"
             :title="item.spuName"
-						:skuText="item.properties.map((property) => property.valueName).join(' ')"
-						:price="item.price"
+            :skuText="item.properties.map((property) => property.valueName).join(' ')"
+            :price="item.price"
             :num="item.count"
           />
-				</view>
-				<view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
-					<view class="ss-flex ss-col-center">
-						<view class="discounts-title pay-color">共 {{ order.productCount }} 件商品,总金额:</view>
-						<view class="discounts-money pay-color">
-							￥{{ fen2yuan(order.payPrice) }}
-            </view>
-					</view>
-				</view>
-				<view class="order-card-footer ss-flex ss-col-center ss-p-x-20"
-              :class="order.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'">
-					<view class="ss-flex ss-col-center">
-						<button v-if="order.buttons.includes('combination')" class="tool-btn ss-reset-button"
-							@tap.stop="onOrderGroupon(order)">
+        </view>
+        <view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
+          <view class="ss-flex ss-col-center">
+            <view class="discounts-title pay-color"
+              >共 {{ order.productCount }} 件商品,总金额:</view
+            >
+            <view class="discounts-money pay-color"> ￥{{ fen2yuan(order.payPrice) }} </view>
+          </view>
+        </view>
+        <view
+          class="order-card-footer ss-flex ss-col-center ss-p-x-20"
+          :class="order.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'"
+        >
+          <view class="ss-flex ss-col-center">
+            <button
+              v-if="order.buttons.includes('combination')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onOrderGroupon(order)"
+            >
               拼团详情
-						</button>
-						<button v-if="order.buttons.length === 0" class="tool-btn ss-reset-button"
-                    @tap.stop="onOrderDetail(order.id)">
+            </button>
+            <button
+              v-if="order.buttons.length === 0"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onOrderDetail(order.id)"
+            >
               查看详情
-						</button>
-						<button v-if="order.buttons.includes('confirm')" class="tool-btn ss-reset-button"
-                    @tap.stop="onConfirm(order)">
+            </button>
+            <button
+              v-if="order.buttons.includes('confirm')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onConfirm(order)"
+            >
               确认收货
-						</button>
-						<button v-if="order.buttons.includes('express')" class="tool-btn ss-reset-button"
-                    @tap.stop="onExpress(order.id)">
-							查看物流
-						</button>
-						<button v-if="order.buttons.includes('cancel')" class="tool-btn ss-reset-button"
-                    @tap.stop="onCancel(order.id)">
-							取消订单
-						</button>
-						<button v-if="order.buttons.includes('comment')" class="tool-btn ss-reset-button"
-                    @tap.stop="onComment(order.id)">
-							评价
-						</button>
-						<button v-if="order.buttons.includes('delete')" class="delete-btn ss-reset-button"
-                    @tap.stop="onDelete(order.id)">
-							删除订单
-						</button>
-						<button v-if="order.buttons.includes('pay')" class="tool-btn ss-reset-button ui-BG-Main-Gradient"
-                    @tap.stop="onPay(order.payOrderId)">
-							继续支付
-						</button>
-					</view>
-				</view>
-			</view>
-		</view>
+            </button>
+            <button
+              v-if="order.buttons.includes('express')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onExpress(order.id)"
+            >
+              查看物流
+            </button>
+            <button
+              v-if="order.buttons.includes('cancel')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onCancel(order.id)"
+            >
+              取消订单
+            </button>
+            <button
+              v-if="order.buttons.includes('comment')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onComment(order.id)"
+            >
+              评价
+            </button>
+            <button
+              v-if="order.buttons.includes('delete')"
+              class="delete-btn ss-reset-button"
+              @tap.stop="onDelete(order.id)"
+            >
+              删除订单
+            </button>
+            <button
+              v-if="order.buttons.includes('pay')"
+              class="tool-btn ss-reset-button ui-BG-Main-Gradient"
+              @tap.stop="onPay(order.payOrderId)"
+            >
+              继续支付
+            </button>
+          </view>
+        </view>
+      </view>
+    </view>
 
-		<!-- 加载更多 -->
-		<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
+    <!-- 加载更多 -->
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
         contentdown: '上拉加载更多',
-      }" @tap="loadMore" />
-	</s-layout>
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
 </template>
 
 <script setup>
-	import { reactive } from 'vue';
-	import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
   import {
     fen2yuan,
-    formatOrderColor, formatOrderStatus, handleOrderButtons,
+    formatOrderColor,
+    formatOrderStatus,
+    handleOrderButtons,
   } from '@/sheep/hooks/useGoods';
-	import sheep from '@/sheep';
-	import _ from 'lodash';
-	import {
-		isEmpty
-	} from 'lodash';
+  import sheep from '@/sheep';
+  import _ from 'lodash-es';
+  import { isEmpty } from 'lodash-es';
   import OrderApi from '@/sheep/api/trade/order';
   import { resetPagination } from '@/sheep/util';
 
-	// 数据
-	const state = reactive({
-		currentTab: 0, // 选中的 tabMaps 下标
-		pagination: {
+  // 数据
+  const state = reactive({
+    currentTab: 0, // 选中的 tabMaps 下标
+    pagination: {
       list: [],
       total: 0,
       pageNo: 1,
       pageSize: 5,
-		},
-		loadStatus: ''
-	});
+    },
+    loadStatus: '',
+  });
 
-	const tabMaps = [{
-			name: '全部'
-		},
-		{
-			name: '待付款',
-			value: 0,
-		},
-		{
-			name: '待发货',
-			value: 10,
-		},
-		{
-			name: '待收货',
-			value: 20,
-		},
-		{
-			name: '待评价',
-			value: 30,
-		},
-	];
+  const tabMaps = [
+    {
+      name: '全部',
+    },
+    {
+      name: '待付款',
+      value: 0,
+    },
+    {
+      name: '待发货',
+      value: 10,
+    },
+    {
+      name: '待收货',
+      value: 20,
+    },
+    {
+      name: '待评价',
+      value: 30,
+    },
+  ];
 
-	// 切换选项卡
-	function onTabsChange(e) {
-		if (state.currentTab === e.index) {
+  // 切换选项卡
+  function onTabsChange(e) {
+    if (state.currentTab === e.index) {
       return;
     }
     // 重头加载代码
-		resetPagination(state.pagination);
-		state.currentTab = e.index;
-		getOrderList();
-	}
+    resetPagination(state.pagination);
+    state.currentTab = e.index;
+    getOrderList();
+  }
 
-	// 订单详情
-	function onOrderDetail(id) {
-		sheep.$router.go('/pages/order/detail', {
-			id,
-		});
-	}
+  // 订单详情
+  function onOrderDetail(id) {
+    sheep.$router.go('/pages/order/detail', {
+      id,
+    });
+  }
 
-	// 跳转拼团记录的详情
-	function onOrderGroupon(order) {
-		sheep.$router.go('/pages/activity/groupon/detail', {
-			id: order.combinationRecordId,
-		});
-	}
+  // 跳转拼团记录的详情
+  function onOrderGroupon(order) {
+    sheep.$router.go('/pages/activity/groupon/detail', {
+      id: order.combinationRecordId,
+    });
+  }
 
-	// 继续支付
-	function onPay(payOrderId) {
-		sheep.$router.go('/pages/pay/index', {
-			id: payOrderId,
-		});
-	}
+  // 继续支付
+  function onPay(payOrderId) {
+    sheep.$router.go('/pages/pay/index', {
+      id: payOrderId,
+    });
+  }
 
-	// 评价
-	function onComment(id) {
-		sheep.$router.go('/pages/goods/comment/add', {
-			id,
-		});
-	}
+  // 评价
+  function onComment(id) {
+    sheep.$router.go('/pages/goods/comment/add', {
+      id,
+    });
+  }
 
-	// 确认收货 TODO 芋艿：待测试
-	async function onConfirm(order, ignore = false) {
-		// 需开启确认收货组件
-		// todo: 芋艿：需要后续接入微信收货组件
-		// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
-		// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
-		let isOpenBusinessView = true;
-		if (
-			sheep.$platform.name === 'WechatMiniProgram' &&
-			!isEmpty(order.wechat_extra_data) &&
-			isOpenBusinessView &&
-			!ignore
-		) {
-			mpConfirm(order);
-			return;
-		}
+  // 确认收货 TODO 芋艿：待测试
+  async function onConfirm(order, ignore = false) {
+    // 需开启确认收货组件
+    // todo: 芋艿：需要后续接入微信收货组件
+    // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+    // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+    let isOpenBusinessView = true;
+    if (
+      sheep.$platform.name === 'WechatMiniProgram' &&
+      !isEmpty(order.wechat_extra_data) &&
+      isOpenBusinessView &&
+      !ignore
+    ) {
+      mpConfirm(order);
+      return;
+    }
 
-		// 正常的确认收货流程
-		const { code } = await OrderApi.receiveOrder(order.id);
-		if (code === 0) {
+    // 正常的确认收货流程
+    const { code } = await OrderApi.receiveOrder(order.id);
+    if (code === 0) {
       resetPagination(state.pagination);
       await getOrderList();
-		}
-	}
+    }
+  }
 
-	// #ifdef MP-WEIXIN
-	// 小程序确认收货组件 TODO 芋艿：后续再接入
-	function mpConfirm(order) {
-		if (!wx.openBusinessView) {
-			sheep.$helper.toast(`请升级微信版本`);
-			return;
-		}
-		wx.openBusinessView({
-			businessType: 'weappOrderConfirm',
-			extraData: {
-				merchant_id: '1481069012',
-				merchant_trade_no: order.wechat_extra_data.merchant_trade_no,
-				transaction_id: order.wechat_extra_data.transaction_id,
-			},
-			success(response) {
-				console.log('success:', response);
-				if (response.errMsg === 'openBusinessView:ok') {
-					if (response.extraData.status === 'success') {
-						onConfirm(order, true);
-					}
-				}
-			},
-			fail(error) {
-				console.log('error:', error);
-			},
-			complete(result) {
-				console.log('result:', result);
-			},
-		});
-	}
-	// #endif
+  // #ifdef MP-WEIXIN
+  // 小程序确认收货组件 TODO 芋艿：后续再接入
+  function mpConfirm(order) {
+    if (!wx.openBusinessView) {
+      sheep.$helper.toast(`请升级微信版本`);
+      return;
+    }
+    wx.openBusinessView({
+      businessType: 'weappOrderConfirm',
+      extraData: {
+        merchant_id: '1481069012',
+        merchant_trade_no: order.wechat_extra_data.merchant_trade_no,
+        transaction_id: order.wechat_extra_data.transaction_id,
+      },
+      success(response) {
+        console.log('success:', response);
+        if (response.errMsg === 'openBusinessView:ok') {
+          if (response.extraData.status === 'success') {
+            onConfirm(order, true);
+          }
+        }
+      },
+      fail(error) {
+        console.log('error:', error);
+      },
+      complete(result) {
+        console.log('result:', result);
+      },
+    });
+  }
+  // #endif
 
-	// 查看物流
-	async function onExpress(id) {
-		sheep.$router.go('/pages/order/express/log', {
+  // 查看物流
+  async function onExpress(id) {
+    sheep.$router.go('/pages/order/express/log', {
       id,
-		});
-	}
+    });
+  }
 
-	// 取消订单
-	async function onCancel(orderId) {
-		uni.showModal({
-			title: '提示',
-			content: '确定要取消订单吗?',
-			success: async function(res) {
-				if (!res.confirm) {
+  // 取消订单
+  async function onCancel(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消订单吗?',
+      success: async function (res) {
+        if (!res.confirm) {
           return;
-				}
+        }
         const { code } = await OrderApi.cancelOrder(orderId);
         if (code === 0) {
           // 修改数据的状态
@@ -246,208 +287,209 @@
           orderInfo.status = 40;
           handleOrderButtons(orderInfo);
         }
-			},
-		});
-	}
+      },
+    });
+  }
 
-	// 删除订单
-	function onDelete(orderId) {
-		uni.showModal({
-			title: '提示',
-			content: '确定要删除订单吗?',
-			success: async function(res) {
-				if (res.confirm) {
-					const { code } = await OrderApi.deleteOrder(orderId);
-					if (code === 0) {
+  // 删除订单
+  function onDelete(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要删除订单吗?',
+      success: async function (res) {
+        if (res.confirm) {
+          const { code } = await OrderApi.deleteOrder(orderId);
+          if (code === 0) {
             // 删除数据
-						let index = state.pagination.list.findIndex((order) => order.id === orderId);
-						state.pagination.list.splice(index, 1);
-					}
-				}
-			},
-		});
-	}
+            let index = state.pagination.list.findIndex((order) => order.id === orderId);
+            state.pagination.list.splice(index, 1);
+          }
+        }
+      },
+    });
+  }
 
-	// 获取订单列表
-	async function getOrderList() {
-		state.loadStatus = 'loading';
-		let { code, data } = await OrderApi.getOrderPage({
+  // 获取订单列表
+  async function getOrderList() {
+    state.loadStatus = 'loading';
+    let { code, data } = await OrderApi.getOrderPage({
       pageNo: state.pagination.pageNo,
       pageSize: state.pagination.pageSize,
       status: tabMaps[state.currentTab].value,
-			commentStatus: tabMaps[state.currentTab].value === 30 ? false : null
-		});
+      commentStatus: tabMaps[state.currentTab].value === 30 ? false : null,
+    });
     if (code !== 0) {
       return;
     }
-    data.list.forEach(order => handleOrderButtons(order));
-    state.pagination.list = _.concat(state.pagination.list, data.list)
+    data.list.forEach((order) => handleOrderButtons(order));
+    state.pagination.list = _.concat(state.pagination.list, data.list);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
   }
 
-	onLoad(async (options) => {
-		if (options.type) {
-			state.currentTab = options.type;
-		}
-		await getOrderList();
-	});
+  onLoad(async (options) => {
+    if (options.type) {
+      state.currentTab = options.type;
+    }
+    await getOrderList();
+  });
 
-	// 加载更多
-	function loadMore() {
-		if (state.loadStatus === 'noMore') {
-      return
-		}
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
     state.pagination.pageNo++;
     getOrderList();
   }
 
-	// 上拉加载更多
-	onReachBottom(() => {
-		loadMore();
-	});
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
 
-	// 下拉刷新
-	onPullDownRefresh(() => {
+  // 下拉刷新
+  onPullDownRefresh(() => {
     resetPagination(state.pagination);
-		getOrderList();
-		setTimeout(function() {
-			uni.stopPullDownRefresh();
-		}, 800);
-	});
+    getOrderList();
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 800);
+  });
 </script>
 
 <style lang="scss" scoped>
-	.score-img {
-		width: 36rpx;
-		height: 36rpx;
-		margin: 0 4rpx;
-	}
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
 
-	.tool-btn {
-		width: 160rpx;
-		height: 60rpx;
-		background: #f6f6f6;
-		font-size: 26rpx;
-		border-radius: 30rpx;
-		margin-right: 10rpx;
+  .tool-btn {
+    width: 160rpx;
+    height: 60rpx;
+    background: #f6f6f6;
+    font-size: 26rpx;
+    border-radius: 30rpx;
+    margin-right: 10rpx;
 
-		&:last-of-type {
-			margin-right: 0;
-		}
-	}
+    &:last-of-type {
+      margin-right: 0;
+    }
+  }
 
-	.delete-btn {
-		width: 160rpx;
-		height: 56rpx;
-		color: #ff3000;
-		background: #fee;
-		border-radius: 28rpx;
-		font-size: 26rpx;
-		margin-right: 10rpx;
-		line-height: normal;
+  .delete-btn {
+    width: 160rpx;
+    height: 56rpx;
+    color: #ff3000;
+    background: #fee;
+    border-radius: 28rpx;
+    font-size: 26rpx;
+    margin-right: 10rpx;
+    line-height: normal;
 
-		&:last-of-type {
-			margin-right: 0;
-		}
-	}
+    &:last-of-type {
+      margin-right: 0;
+    }
+  }
 
-	.apply-btn {
-		width: 140rpx;
-		height: 50rpx;
-		border-radius: 25rpx;
-		font-size: 24rpx;
-		border: 2rpx solid #dcdcdc;
-		line-height: normal;
-		margin-left: 16rpx;
-	}
+  .apply-btn {
+    width: 140rpx;
+    height: 50rpx;
+    border-radius: 25rpx;
+    font-size: 24rpx;
+    border: 2rpx solid #dcdcdc;
+    line-height: normal;
+    margin-left: 16rpx;
+  }
 
-	.swiper-box {
-		flex: 1;
+  .swiper-box {
+    flex: 1;
 
-		.swiper-item {
-			height: 100%;
-			width: 100%;
-		}
-	}
+    .swiper-item {
+      height: 100%;
+      width: 100%;
+    }
+  }
 
-	.order-list-card-box {
-		.order-card-header {
-			height: 80rpx;
+  .order-list-card-box {
+    .order-card-header {
+      height: 80rpx;
 
-			.order-no {
-				font-size: 26rpx;
-				font-weight: 500;
-			}
+      .order-no {
+        font-size: 26rpx;
+        font-weight: 500;
+      }
 
-			.order-state {}
-		}
+      .order-state {
+      }
+    }
 
-		.pay-box {
-			.discounts-title {
-				font-size: 24rpx;
-				line-height: normal;
-				color: #999999;
-			}
+    .pay-box {
+      .discounts-title {
+        font-size: 24rpx;
+        line-height: normal;
+        color: #999999;
+      }
 
-			.discounts-money {
-				font-size: 24rpx;
-				line-height: normal;
-				color: #999;
-				font-family: OPPOSANS;
-			}
+      .discounts-money {
+        font-size: 24rpx;
+        line-height: normal;
+        color: #999;
+        font-family: OPPOSANS;
+      }
 
-			.pay-color {
-				color: #333;
-			}
-		}
+      .pay-color {
+        color: #333;
+      }
+    }
 
-		.order-card-footer {
-			height: 100rpx;
+    .order-card-footer {
+      height: 100rpx;
 
-			.more-item-box {
-				padding: 20rpx;
+      .more-item-box {
+        padding: 20rpx;
 
-				.more-item {
-					height: 60rpx;
+        .more-item {
+          height: 60rpx;
 
-					.title {
-						font-size: 26rpx;
-					}
-				}
-			}
+          .title {
+            font-size: 26rpx;
+          }
+        }
+      }
 
-			.more-btn {
-				color: $dark-9;
-				font-size: 24rpx;
-			}
+      .more-btn {
+        color: $dark-9;
+        font-size: 24rpx;
+      }
 
-			.content {
-				width: 154rpx;
-				color: #333333;
-				font-size: 26rpx;
-				font-weight: 500;
-			}
-		}
-	}
+      .content {
+        width: 154rpx;
+        color: #333333;
+        font-size: 26rpx;
+        font-weight: 500;
+      }
+    }
+  }
 
-	:deep(.uni-tooltip-popup) {
-		background: var(--ui-BG);
-	}
+  :deep(.uni-tooltip-popup) {
+    background: var(--ui-BG);
+  }
 
-	.warning-color {
-		color: #faad14;
-	}
+  .warning-color {
+    color: #faad14;
+  }
 
-	.danger-color {
-		color: #ff3000;
-	}
+  .danger-color {
+    color: #ff3000;
+  }
 
-	.success-color {
-		color: #52c41a;
-	}
+  .success-color {
+    color: #52c41a;
+  }
 
-	.info-color {
-		color: #999999;
-	}
-</style>
\ No newline at end of file
+  .info-color {
+    color: #999999;
+  }
+</style>
diff --git a/pages/pay/recharge-log.vue b/pages/pay/recharge-log.vue
index 67e46881..8de792ac 100644
--- a/pages/pay/recharge-log.vue
+++ b/pages/pay/recharge-log.vue
@@ -8,7 +8,7 @@
           <view class="title">充值金额</view>
           <view class="num" :class="item.refundStatus === 10 ? 'danger-color' : 'success-color'">
             {{ fen2yuan(item.payPrice) }} 元
-            <text v-if="item.bonusPrice > 0">（赠送 {{ fen2yuan(item.bonusPrice)}} 元）</text>
+            <text v-if="item.bonusPrice > 0">（赠送 {{ fen2yuan(item.bonusPrice) }} 元）</text>
           </view>
         </view>
         <view class="status-box item ss-flex ss-col-center ss-row-between">
@@ -30,7 +30,9 @@
         </view>
         <view class="time-box item ss-flex ss-col-center ss-row-between">
           <text class="item-title">充值时间</text>
-          <view class="time"> {{ sheep.$helper.timeFormat(item.payTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
+          <view class="time">
+            {{ sheep.$helper.timeFormat(item.payTime, 'yyyy-mm-dd hh:MM:ss') }}</view
+          >
         </view>
       </view>
     </view>
@@ -53,7 +55,7 @@
 <script setup>
   import { reactive } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import PayWalletApi from '@/sheep/api/pay/wallet';
   import sheep from '@/sheep';
   import { fen2yuan } from '../../sheep/hooks/useGoods';
diff --git a/pages/pay/result.vue b/pages/pay/result.vue
index d680a95c..49a65f4f 100644
--- a/pages/pay/result.vue
+++ b/pages/pay/result.vue
@@ -50,7 +50,10 @@
       </view>
 
       <!-- #ifdef MP -->
-      <view class="subscribe-box ss-flex ss-m-t-44" v-if="showSubscribeBtn && state.orderType === 'goods'">
+      <view
+        class="subscribe-box ss-flex ss-m-t-44"
+        v-if="showSubscribeBtn && state.orderType === 'goods'"
+      >
         <image class="subscribe-img" :src="sheep.$url.static('/static/img/shop/order/cargo.png')" />
         <view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时发货信息与订单状态</view>
         <view class="subscribe-start" @tap="subscribeMessage">立即订阅</view>
@@ -63,7 +66,7 @@
 <script setup>
   import { onLoad, onHide, onShow } from '@dcloudio/uni-app';
   import { reactive, computed, ref } from 'vue';
-  import { isEmpty } from 'lodash';
+  import { isEmpty } from 'lodash-es';
   import sheep from '@/sheep';
   import PayOrderApi from '@/sheep/api/pay/order';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
@@ -114,12 +117,12 @@
         uni.showModal({
           title: '支付结果',
           showCancel: false, // 不要取消按钮
-          content: "支付成功",
+          content: '支付成功',
           success: () => {
             // 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
             autoSubscribeMessage();
-          }
-        })
+          },
+        });
 
         // #endif
         // 特殊：获得商品订单信息
@@ -153,8 +156,8 @@
   }
 
   // #ifdef MP
-  const showSubscribeBtn = ref(false) // 默认隐藏
-  const SUBSCRIBE_BTN_STATUS_STORAGE_KEY = "subscribe_btn_status"
+  const showSubscribeBtn = ref(false); // 默认隐藏
+  const SUBSCRIBE_BTN_STATUS_STORAGE_KEY = 'subscribe_btn_status';
   function subscribeMessage() {
     if (state.orderType !== 'goods') {
       return;
@@ -176,11 +179,11 @@
     const subscribeBtnStatus = uni.getStorageSync(SUBSCRIBE_BTN_STATUS_STORAGE_KEY);
     if (!subscribeBtnStatus) {
       showSubscribeBtn.value = true;
-      return
+      return;
     }
 
     // 2. 订阅消息
-    subscribeMessage()
+    subscribeMessage();
   }
   // #endif
 
diff --git a/pages/user/address/edit.vue b/pages/user/address/edit.vue
index a1e36d7f..b88ee079 100644
--- a/pages/user/address/edit.vue
+++ b/pages/user/address/edit.vue
@@ -1,78 +1,118 @@
 <!-- 收货地址的新增/编辑 -->
 <template>
-	<s-layout :title="state.model.id ? '编辑地址' : '新增地址'">
-		<uni-forms ref="addressFormRef" v-model="state.model" :rules="rules" validateTrigger="bind"
-			labelWidth="160" labelAlign="left" border :labelStyle="{ fontWeight: 'bold' }">
-			<view class="bg-white form-box ss-p-x-30">
-				<uni-forms-item name="name" label="收货人" class="form-item">
-					<uni-easyinput v-model="state.model.name" placeholder="请填写收货人姓名" :inputBorder="false"
-						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal" />
-				</uni-forms-item>
+  <s-layout :title="state.model.id ? '编辑地址' : '新增地址'">
+    <uni-forms
+      ref="addressFormRef"
+      v-model="state.model"
+      :rules="rules"
+      validateTrigger="bind"
+      labelWidth="160"
+      labelAlign="left"
+      border
+      :labelStyle="{ fontWeight: 'bold' }"
+    >
+      <view class="bg-white form-box ss-p-x-30">
+        <uni-forms-item name="name" label="收货人" class="form-item">
+          <uni-easyinput
+            v-model="state.model.name"
+            placeholder="请填写收货人姓名"
+            :inputBorder="false"
+            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+          />
+        </uni-forms-item>
 
-				<uni-forms-item name="mobile" label="手机号" class="form-item">
-					<uni-easyinput v-model="state.model.mobile" type="number" placeholder="请输入手机号" :inputBorder="false"
-						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal">
-					</uni-easyinput>
-				</uni-forms-item>
-				<uni-forms-item name="areaName" label="省市区" @tap="state.showRegion = true" class="form-item">
-					<uni-easyinput v-model="state.model.areaName" disabled :inputBorder="false"
-						:styles="{ disableColor: '#fff', color: '#333' }"
-						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
-						placeholder="请选择省市区">
-						<template v-slot:right>
-							<uni-icons type="right" />
-						</template>
-					</uni-easyinput>
-				</uni-forms-item>
-				<uni-forms-item name="detailAddress" label="详细地址" :formItemStyle="{ alignItems: 'flex-start' }"
-					:labelStyle="{ lineHeight: '5em' }" class="textarea-item">
-					<uni-easyinput :inputBorder="false" type="textarea" v-model="state.model.detailAddress"
-						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
-						placeholder="请输入详细地址" clearable />
-				</uni-forms-item>
-			</view>
-			<view class="ss-m-y-20 bg-white ss-p-x-30 ss-flex ss-row-between ss-col-center default-box">
-				<view class="default-box-title"> 设为默认地址 </view>
-				<su-switch style="transform: scale(0.8)" v-model="state.model.defaultStatus" />
-			</view>
-		</uni-forms>
-		<su-fixed bottom :opacity="false" bg="" placeholder :noFixed="false" :index="10">
-			<view class="footer-box ss-flex-col ss-row-between ss-p-20">
-				<view class="ss-m-b-20">
+        <uni-forms-item name="mobile" label="手机号" class="form-item">
+          <uni-easyinput
+            v-model="state.model.mobile"
+            type="number"
+            placeholder="请输入手机号"
+            :inputBorder="false"
+            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+          >
+          </uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item
+          name="areaName"
+          label="省市区"
+          @tap="state.showRegion = true"
+          class="form-item"
+        >
+          <uni-easyinput
+            v-model="state.model.areaName"
+            disabled
+            :inputBorder="false"
+            :styles="{ disableColor: '#fff', color: '#333' }"
+            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+            placeholder="请选择省市区"
+          >
+            <template v-slot:right>
+              <uni-icons type="right" />
+            </template>
+          </uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item
+          name="detailAddress"
+          label="详细地址"
+          :formItemStyle="{ alignItems: 'flex-start' }"
+          :labelStyle="{ lineHeight: '5em' }"
+          class="textarea-item"
+        >
+          <uni-easyinput
+            :inputBorder="false"
+            type="textarea"
+            v-model="state.model.detailAddress"
+            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+            placeholder="请输入详细地址"
+            clearable
+          />
+        </uni-forms-item>
+      </view>
+      <view class="ss-m-y-20 bg-white ss-p-x-30 ss-flex ss-row-between ss-col-center default-box">
+        <view class="default-box-title"> 设为默认地址 </view>
+        <su-switch style="transform: scale(0.8)" v-model="state.model.defaultStatus" />
+      </view>
+    </uni-forms>
+    <su-fixed bottom :opacity="false" bg="" placeholder :noFixed="false" :index="10">
+      <view class="footer-box ss-flex-col ss-row-between ss-p-20">
+        <view class="ss-m-b-20">
           <button class="ss-reset-button save-btn ui-Shadow-Main" @tap="onSave">保存</button>
         </view>
-				<button v-if="state.model.id" class="ss-reset-button cancel-btn" @tap="onDelete">
-					删除
-				</button>
-			</view>
-		</su-fixed>
+        <button v-if="state.model.id" class="ss-reset-button cancel-btn" @tap="onDelete">
+          删除
+        </button>
+      </view>
+    </su-fixed>
 
-		<!-- 省市区弹窗 -->
-		<su-region-picker :show="state.showRegion" @cancel="state.showRegion = false" @confirm="onRegionConfirm" />
-	</s-layout>
+    <!-- 省市区弹窗 -->
+    <su-region-picker
+      :show="state.showRegion"
+      @cancel="state.showRegion = false"
+      @confirm="onRegionConfirm"
+    />
+  </s-layout>
 </template>
 
 <script setup>
-	import { ref, reactive, unref } from 'vue';
-	import sheep from '@/sheep';
-	import { onLoad } from '@dcloudio/uni-app';
-	import _ from 'lodash';
-	import { mobile } from '@/sheep/validate/form';
+  import { ref, reactive, unref } from 'vue';
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import _ from 'lodash-es';
+  import { mobile } from '@/sheep/validate/form';
   import AreaApi from '@/sheep/api/system/area';
   import AddressApi from '@/sheep/api/member/address';
 
-	const addressFormRef = ref(null);
-	const state = reactive({
-		showRegion: false,
-		model: {
-			name: '',
-			mobile: '',
+  const addressFormRef = ref(null);
+  const state = reactive({
+    showRegion: false,
+    model: {
+      name: '',
+      mobile: '',
       detailAddress: '',
-			defaultStatus: false,
+      defaultStatus: false,
       areaName: '',
-		},
+    },
     rules: {},
-	});
+  });
 
   const rules = {
     name: {
@@ -85,93 +125,99 @@
     },
     mobile,
     detailAddress: {
-      rules: [{
-        required: true,
-        errorMessage: '请输入详细地址',
-      }]
+      rules: [
+        {
+          required: true,
+          errorMessage: '请输入详细地址',
+        },
+      ],
     },
     areaName: {
-      rules: [{
-        required: true,
-        errorMessage: '请选择您的位置'
-      }]
+      rules: [
+        {
+          required: true,
+          errorMessage: '请选择您的位置',
+        },
+      ],
     },
   };
 
   // 确认选择地区
-	const onRegionConfirm = (e) => {
-    state.model.areaName = `${e.province_name} ${e.city_name} ${e.district_name}`
+  const onRegionConfirm = (e) => {
+    state.model.areaName = `${e.province_name} ${e.city_name} ${e.district_name}`;
     state.model.areaId = e.district_id;
-		state.showRegion = false;
-	};
+    state.showRegion = false;
+  };
 
   // 获得地区数据
-	const getAreaData = () => {
-		if (_.isEmpty(uni.getStorageSync('areaData'))) {
+  const getAreaData = () => {
+    if (_.isEmpty(uni.getStorageSync('areaData'))) {
       AreaApi.getAreaTree().then((res) => {
         if (res.code === 0) {
           uni.setStorageSync('areaData', res.data);
         }
       });
-		}
-	};
+    }
+  };
 
   // 保存收货地址
-	const onSave = async () => {
+  const onSave = async () => {
     // 参数校验
-		const validate = await unref(addressFormRef)
-			.validate()
-			.catch((error) => {
-				console.log('error: ', error);
-			});
-		if (!validate) {
+    const validate = await unref(addressFormRef)
+      .validate()
+      .catch((error) => {
+        console.log('error: ', error);
+      });
+    if (!validate) {
       return;
     }
 
     // 提交请求
     const formData = {
-      ...state.model
+      ...state.model,
+    };
+    const { code } =
+      state.model.id > 0
+        ? await AddressApi.updateAddress(formData)
+        : await AddressApi.createAddress(formData);
+    if (code === 0) {
+      sheep.$router.back();
     }
-    const {code } = state.model.id > 0 ? await AddressApi.updateAddress(formData)
-      : await AddressApi.createAddress(formData);
-		if (code === 0) {
-			sheep.$router.back();
-		}
-	};
+  };
 
   // 删除收货地址
-	const onDelete = () => {
-		uni.showModal({
-			title: '提示',
-			content: '确认删除此收货地址吗？',
-			success: async function(res) {
-				if (!res.confirm) {
-					return;
-				}
+  const onDelete = () => {
+    uni.showModal({
+      title: '提示',
+      content: '确认删除此收货地址吗？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
         const { code } = await AddressApi.deleteAddress(state.model.id);
         if (code === 0) {
           sheep.$router.back();
         }
-			},
-		});
-	};
+      },
+    });
+  };
 
-	onLoad(async (options) => {
+  onLoad(async (options) => {
     // 获得地区数据
-		getAreaData();
+    getAreaData();
     // 情况一：基于 id 获得收件地址
-		if (options.id) {
-			let { code, data} = await AddressApi.getAddress(options.id);
+    if (options.id) {
+      let { code, data } = await AddressApi.getAddress(options.id);
       if (code !== 0) {
         return;
       }
       state.model = data;
-		}
-     // 情况二：微信导入
+    }
+    // 情况二：微信导入
     if (options.data) {
       let data = JSON.parse(options.data);
       const areaData = uni.getStorageSync('areaData');
-      const findAreaByName = (areas, name) => areas.find(item => item.name === name);
+      const findAreaByName = (areas, name) => areas.find((item) => item.name === name);
 
       let provinceObj = findAreaByName(areaData, data.province_name);
       let cityObj = provinceObj ? findAreaByName(provinceObj.children, data.city_name) : undefined;
@@ -181,77 +227,79 @@
       state.model = {
         ...state.model,
         areaId,
-        areaName: [data.province_name, data.city_name, data.district_name].filter(Boolean).join(" "),
+        areaName: [data.province_name, data.city_name, data.district_name]
+          .filter(Boolean)
+          .join(' '),
         defaultStatus: false,
         detailAddress: data.address,
         mobile: data.mobile,
         name: data.consignee,
       };
-		}
-	});
+    }
+  });
 </script>
 
 <style lang="scss" scoped>
-	:deep() {
-		.uni-forms-item__label .label-text {
-			font-size: 28rpx !important;
-			color: #333333 !important;
-			line-height: normal !important;
-		}
+  :deep() {
+    .uni-forms-item__label .label-text {
+      font-size: 28rpx !important;
+      color: #333333 !important;
+      line-height: normal !important;
+    }
 
-		.uni-easyinput__content-input {
-			font-size: 28rpx !important;
-			color: #333333 !important;
-			line-height: normal !important;
-			padding-left: 0 !important;
-		}
+    .uni-easyinput__content-input {
+      font-size: 28rpx !important;
+      color: #333333 !important;
+      line-height: normal !important;
+      padding-left: 0 !important;
+    }
 
-		.uni-easyinput__content-textarea {
-			font-size: 28rpx !important;
-			color: #333333 !important;
-			line-height: normal !important;
-			margin-top: 8rpx !important;
-		}
+    .uni-easyinput__content-textarea {
+      font-size: 28rpx !important;
+      color: #333333 !important;
+      line-height: normal !important;
+      margin-top: 8rpx !important;
+    }
 
-		.uni-icons {
-			font-size: 40rpx !important;
-		}
+    .uni-icons {
+      font-size: 40rpx !important;
+    }
 
-		.is-textarea-icon {
-			margin-top: 22rpx;
-		}
+    .is-textarea-icon {
+      margin-top: 22rpx;
+    }
 
-		.is-disabled {
-			color: #333333;
-		}
-	}
+    .is-disabled {
+      color: #333333;
+    }
+  }
 
-	.default-box {
-		width: 100%;
-		box-sizing: border-box;
-		height: 100rpx;
+  .default-box {
+    width: 100%;
+    box-sizing: border-box;
+    height: 100rpx;
 
-		.default-box-title {
-			font-size: 28rpx;
-			color: #333333;
-			line-height: normal;
-		}
-	}
+    .default-box-title {
+      font-size: 28rpx;
+      color: #333333;
+      line-height: normal;
+    }
+  }
 
-	.footer-box {
-		.save-btn {
-			width: 710rpx;
-			height: 80rpx;
-			border-radius: 40rpx;
-			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-			color: $white;
-		}
+  .footer-box {
+    .save-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: $white;
+    }
 
-		.cancel-btn {
-			width: 710rpx;
-			height: 80rpx;
-			border-radius: 40rpx;
-			background: var(--ui-BG);
-		}
-	}
-</style>
\ No newline at end of file
+    .cancel-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: var(--ui-BG);
+    }
+  }
+</style>
diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue
index a812afc7..47b0b1a3 100644
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@@ -1,143 +1,156 @@
 <!-- 收件地址列表 -->
 <template>
-	<s-layout title="收货地址" :bgStyle="{ color: '#FFF' }">
-		<view v-if="state.list.length">
-			<s-address-item hasBorderBottom v-for="item in state.list" :key="item.id" :item="item"
-                      @tap="onSelect(item)" />
-		</view>
+  <s-layout title="收货地址" :bgStyle="{ color: '#FFF' }">
+    <view v-if="state.list.length">
+      <s-address-item
+        hasBorderBottom
+        v-for="item in state.list"
+        :key="item.id"
+        :item="item"
+        @tap="onSelect(item)"
+      />
+    </view>
 
-		<su-fixed bottom placeholder>
-			<view class="footer-box ss-flex ss-row-between ss-p-20">
-				<!-- 微信小程序和微信H5 -->
-				<button v-if="['WechatMiniProgram', 'WechatOfficialAccount'].includes(sheep.$platform.name)"
-					@tap="importWechatAddress"
-					class="border ss-reset-button sync-wxaddress ss-m-20 ss-flex ss-row-center ss-col-center">
-					<text class="cicon-weixin ss-p-r-10" style="color: #09bb07; font-size: 40rpx"></text>
-					导入微信地址
-				</button>
-				<button class="add-btn ss-reset-button ui-Shadow-Main"
-					@tap="sheep.$router.go('/pages/user/address/edit')">
-					新增收货地址
-				</button>
-			</view>
-		</su-fixed>
-		<s-empty v-if="state.list.length === 0 && !state.loading" text="暂无收货地址" icon="/static/data-empty.png" />
-	</s-layout>
+    <su-fixed bottom placeholder>
+      <view class="footer-box ss-flex ss-row-between ss-p-20">
+        <!-- 微信小程序和微信H5 -->
+        <button
+          v-if="['WechatMiniProgram', 'WechatOfficialAccount'].includes(sheep.$platform.name)"
+          @tap="importWechatAddress"
+          class="border ss-reset-button sync-wxaddress ss-m-20 ss-flex ss-row-center ss-col-center"
+        >
+          <text class="cicon-weixin ss-p-r-10" style="color: #09bb07; font-size: 40rpx"></text>
+          导入微信地址
+        </button>
+        <button
+          class="add-btn ss-reset-button ui-Shadow-Main"
+          @tap="sheep.$router.go('/pages/user/address/edit')"
+        >
+          新增收货地址
+        </button>
+      </view>
+    </su-fixed>
+    <s-empty
+      v-if="state.list.length === 0 && !state.loading"
+      text="暂无收货地址"
+      icon="/static/data-empty.png"
+    />
+  </s-layout>
 </template>
 
 <script setup>
-	import { reactive, onBeforeMount } from 'vue';
-	import { onShow } from '@dcloudio/uni-app';
-	import sheep from '@/sheep';
-	import { isEmpty } from 'lodash';
+  import { reactive, onBeforeMount } from 'vue';
+  import { onShow } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { isEmpty } from 'lodash-es';
   import AreaApi from '@/sheep/api/system/area';
   import AddressApi from '@/sheep/api/member/address';
 
-	const state = reactive({
-		list: [], // 地址列表
-		loading: true,
-	});
+  const state = reactive({
+    list: [], // 地址列表
+    loading: true,
+  });
 
-	// 选择收货地址
-	const onSelect = (addressInfo) => {
-		uni.$emit('SELECT_ADDRESS', {
-			addressInfo,
-		});
-		sheep.$router.back();
-	};
+  // 选择收货地址
+  const onSelect = (addressInfo) => {
+    uni.$emit('SELECT_ADDRESS', {
+      addressInfo,
+    });
+    sheep.$router.back();
+  };
 
-	// 导入微信地址
+  // 导入微信地址
   // TODO 芋艿：未测试
-	function importWechatAddress() {
-		let wechatAddress = {};
-		// #ifdef MP
-		uni.chooseAddress({
-			success: (res) => {
-				wechatAddress = {
-					consignee: res.userName,
-					mobile: res.telNumber,
-					province_name: res.provinceName,
-					city_name: res.cityName,
-					district_name: res.countyName,
-					address: res.detailInfo,
-					region: '',
-					is_default: false,
-				};
-				if (!isEmpty(wechatAddress)) {
-					sheep.$router.go('/pages/user/address/edit', {
-						data: JSON.stringify(wechatAddress),
-					});
-				}
-			},
-			fail: (err) => {
-				console.log('%cuni.chooseAddress,调用失败', 'color:green;background:yellow');
-			},
-		});
-		// #endif
-		// #ifdef H5
-		sheep.$platform.useProvider('wechat').jssdk.openAddress({
-			success: (res) => {
-				wechatAddress = {
-					consignee: res.userName,
-					mobile: res.telNumber,
-					province_name: res.provinceName,
-					city_name: res.cityName,
-					district_name: res.countryName,
-					address: res.detailInfo,
-					region: '',
-					is_default: false,
-				};
-				if (!isEmpty(wechatAddress)) {
-					sheep.$router.go('/pages/user/address/edit', {
-						data: JSON.stringify(wechatAddress),
-					});
-				}
-			},
-		});
-		// #endif
-	}
+  function importWechatAddress() {
+    let wechatAddress = {};
+    // #ifdef MP
+    uni.chooseAddress({
+      success: (res) => {
+        wechatAddress = {
+          consignee: res.userName,
+          mobile: res.telNumber,
+          province_name: res.provinceName,
+          city_name: res.cityName,
+          district_name: res.countyName,
+          address: res.detailInfo,
+          region: '',
+          is_default: false,
+        };
+        if (!isEmpty(wechatAddress)) {
+          sheep.$router.go('/pages/user/address/edit', {
+            data: JSON.stringify(wechatAddress),
+          });
+        }
+      },
+      fail: (err) => {
+        console.log('%cuni.chooseAddress,调用失败', 'color:green;background:yellow');
+      },
+    });
+    // #endif
+    // #ifdef H5
+    sheep.$platform.useProvider('wechat').jssdk.openAddress({
+      success: (res) => {
+        wechatAddress = {
+          consignee: res.userName,
+          mobile: res.telNumber,
+          province_name: res.provinceName,
+          city_name: res.cityName,
+          district_name: res.countryName,
+          address: res.detailInfo,
+          region: '',
+          is_default: false,
+        };
+        if (!isEmpty(wechatAddress)) {
+          sheep.$router.go('/pages/user/address/edit', {
+            data: JSON.stringify(wechatAddress),
+          });
+        }
+      },
+    });
+    // #endif
+  }
 
-	onShow(async () => {
-		state.list = (await AddressApi.getAddressList()).data;
-		state.loading = false;
-	});
+  onShow(async () => {
+    state.list = (await AddressApi.getAddressList()).data;
+    state.loading = false;
+  });
 
-	onBeforeMount(() => {
-		if (!!uni.getStorageSync('areaData')) {
-			return;
-		}
-		// 提前加载省市区数据
+  onBeforeMount(() => {
+    if (!!uni.getStorageSync('areaData')) {
+      return;
+    }
+    // 提前加载省市区数据
     AreaApi.getAreaTree().then((res) => {
-			if (res.code === 0) {
-				uni.setStorageSync('areaData', res.data);
-			}
-		});
-	});
+      if (res.code === 0) {
+        uni.setStorageSync('areaData', res.data);
+      }
+    });
+  });
 </script>
 
 <style lang="scss" scoped>
-	.footer-box {
-		.add-btn {
-			flex: 1;
-			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-			border-radius: 80rpx;
-			font-size: 30rpx;
-			font-weight: 500;
-			line-height: 80rpx;
-			color: $white;
-			position: relative;
-			z-index: 1;
-		}
+  .footer-box {
+    .add-btn {
+      flex: 1;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      border-radius: 80rpx;
+      font-size: 30rpx;
+      font-weight: 500;
+      line-height: 80rpx;
+      color: $white;
+      position: relative;
+      z-index: 1;
+    }
 
-		.sync-wxaddress {
-			flex: 1;
-			line-height: 80rpx;
-			background: $white;
-			border-radius: 80rpx;
-			font-size: 30rpx;
-			font-weight: 500;
-			color: $dark-6;
-			margin-right: 18rpx;
-		}
-	}
-</style>
\ No newline at end of file
+    .sync-wxaddress {
+      flex: 1;
+      line-height: 80rpx;
+      background: $white;
+      border-radius: 80rpx;
+      font-size: 30rpx;
+      font-weight: 500;
+      color: $dark-6;
+      margin-right: 18rpx;
+    }
+  }
+</style>
diff --git a/pages/user/goods-collect.vue b/pages/user/goods-collect.vue
index 03099bce..af5e64a1 100644
--- a/pages/user/goods-collect.vue
+++ b/pages/user/goods-collect.vue
@@ -5,7 +5,8 @@
       <!-- 头部 -->
       <view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
         <view class="header-left ss-flex ss-col-center ss-font-26">
-          共 <text class="goods-number ui-TC-Main ss-flex">{{ state.pagination.total }}</text> 件商品
+          共
+          <text class="goods-number ui-TC-Main ss-flex">{{ state.pagination.total }}</text> 件商品
         </view>
         <view class="header-right">
           <button
@@ -77,7 +78,8 @@
           <view class="footer-right">
             <button
               class="ss-reset-button ui-BG-Main-Gradient pay-btn ss-font-28 ui-Shadow-Main"
-              @tap="onCancel">
+              @tap="onCancel"
+            >
               取消收藏
             </button>
           </view>
@@ -100,7 +102,7 @@
   import sheep from '@/sheep';
   import { reactive } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import FavoriteApi from '@/sheep/api/product/favorite';
   import { resetPagination } from '@/sheep/util';
 
@@ -129,7 +131,7 @@
     if (code !== 0) {
       return;
     }
-    state.pagination.list = _.concat(state.pagination.list, data.list)
+    state.pagination.list = _.concat(state.pagination.list, data.list);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
   }
@@ -174,7 +176,7 @@
   // 加载更多
   function loadMore() {
     if (state.loadStatus === 'noMore') {
-      return
+      return;
     }
     state.pagination.pageNo++;
     getData();
diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue
index 630f7c5a..b52efe3c 100644
--- a/pages/user/goods-log.vue
+++ b/pages/user/goods-log.vue
@@ -81,11 +81,13 @@
           </view>
           <view class="footer-right ss-flex">
             <button
-              :class="['ss-reset-button  pay-btn ss-font-28 ',
-                  {
-                    'ui-BG-Main-Gradient': state.selectedSpuIdList.length > 0,
-                    'ui-Shadow-Main': state.selectedSpuIdList.length > 0
-                  }]"
+              :class="[
+                'ss-reset-button  pay-btn ss-font-28 ',
+                {
+                  'ui-BG-Main-Gradient': state.selectedSpuIdList.length > 0,
+                  'ui-Shadow-Main': state.selectedSpuIdList.length > 0,
+                },
+              ]"
               @tap="onDelete"
             >
               删除足迹
@@ -120,9 +122,9 @@
   import sheep from '@/sheep';
   import { reactive } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-  import _ from 'lodash';
-  import SpuHistoryApi from "@/sheep/api/product/history";
-  import {cloneDeep} from "@/sheep/helper/utils";
+  import _ from 'lodash-es';
+  import SpuHistoryApi from '@/sheep/api/product/history';
+  import { cloneDeep } from '@/sheep/helper/utils';
 
   const sys_navBar = sheep.$platform.navbar;
   const pagination = {
diff --git a/pages/user/info.vue b/pages/user/info.vue
index 1b668c5d..c1da23c2 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -26,7 +26,8 @@
             <button
               class="ss-reset-button avatar-action-btn"
               open-type="chooseAvatar"
-              @chooseavatar="onChooseAvatar">
+              @chooseavatar="onChooseAvatar"
+            >
               修改
             </button>
             <!-- #endif -->
@@ -154,10 +155,7 @@
         </view>
         <view class="ss-flex ss-col-center">
           <view class="info ss-flex ss-col-center" v-if="state.thirdInfo">
-            <image
-              class="avatar ss-m-r-20"
-              :src="sheep.$url.cdn(state.thirdInfo.avatar)"
-            />
+            <image class="avatar ss-m-r-20" :src="sheep.$url.cdn(state.thirdInfo.avatar)" />
             <text class="name">{{ state.thirdInfo.nickname }}</text>
           </view>
           <view class="bind-box ss-m-l-20">
@@ -185,7 +183,7 @@
 <script setup>
   import { computed, reactive, onBeforeMount } from 'vue';
   import sheep from '@/sheep';
-  import { clone } from 'lodash';
+  import { clone } from 'lodash-es';
   import { showAuthModal } from '@/sheep/hooks/useModal';
   import FileApi from '@/sheep/api/infra/file';
   import UserApi from '@/sheep/api/member/user';
@@ -198,14 +196,15 @@
 
   const placeholderStyle = 'color:#BBBBBB;font-size:28rpx;line-height:normal';
 
-  const sexRadioMap = [{
+  const sexRadioMap = [
+    {
       name: '男',
       value: '1',
     },
     {
       name: '女',
       value: '2',
-    }
+    },
   ];
 
   const userInfo = computed(() => sheep.$store('user').userInfo);
@@ -279,7 +278,7 @@
 
   // 保存信息
   async function onSubmit() {
-	 const { code } = await UserApi.updateUser({
+    const { code } = await UserApi.updateUser({
       avatar: state.model.avatar,
       nickname: state.model.nickname,
       sex: state.model.sex,
diff --git a/pages/user/wallet/money.vue b/pages/user/wallet/money.vue
index 149eb303..f25d62cd 100644
--- a/pages/user/wallet/money.vue
+++ b/pages/user/wallet/money.vue
@@ -13,7 +13,9 @@
           />
         </view>
         <view class="ss-flex ss-row-between ss-col-center ss-m-t-64">
-          <view class="money-num">{{ state.showMoney ? fen2yuan(userWallet.balance) : '*****' }}</view>
+          <view class="money-num">{{
+            state.showMoney ? fen2yuan(userWallet.balance) : '*****'
+          }}</view>
           <button class="ss-reset-button topup-btn" @tap="sheep.$router.go('/pages/pay/recharge')">
             充值
           </button>
@@ -24,7 +26,12 @@
     <su-sticky>
       <!-- 统计 -->
       <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
-        <uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime" :end="state.today">
+        <uni-datetime-picker
+          v-model="state.data"
+          type="daterange"
+          @change="onChangeTime"
+          :end="state.today"
+        >
           <button class="ss-reset-button date-btn">
             <text>{{ dateFilterText }}</text>
             <text class="cicon-drop-down ss-seldate-icon"></text>
@@ -82,7 +89,7 @@
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import dayjs from 'dayjs';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import PayWalletApi from '@/sheep/api/pay/wallet';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
   import { resetPagination } from '@/sheep/util';
@@ -98,7 +105,7 @@
       list: [],
       total: 0,
       pageNo: 1,
-      pageSize: 8
+      pageSize: 8,
     },
     summary: {
       totalIncome: 0,
@@ -155,7 +162,7 @@
   // 获得钱包统计
   async function getSummary() {
     const { data, code } = await PayWalletApi.getWalletTransactionSummary({
-      'createTime': [state.date[0] + ' 00:00:00', state.date[1] + ' 23:59:59'],
+      createTime: [state.date[0] + ' 00:00:00', state.date[1] + ' 23:59:59'],
     });
     if (code !== 0) {
       return;
@@ -226,8 +233,7 @@
         position: absolute;
         top: 0;
         left: 0;
-        background: v-bind(headerBg)
-          no-repeat;
+        background: v-bind(headerBg) no-repeat;
         pointer-events: none;
       }
 
diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue
index c1a5dca4..be76de86 100644
--- a/pages/user/wallet/score.vue
+++ b/pages/user/wallet/score.vue
@@ -24,19 +24,24 @@
     <su-sticky :customNavHeight="sys_navBar">
       <!-- 统计 -->
       <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
-				<uni-datetime-picker v-model="state.date" type="daterange" @change="onChangeTime" :end="state.today">
-					<button class="ss-reset-button date-btn">
-						<text>{{ dateFilterText }}</text>
-						<text class="cicon-drop-down ss-seldate-icon"></text>
-					</button>
-				</uni-datetime-picker>
+        <uni-datetime-picker
+          v-model="state.date"
+          type="daterange"
+          @change="onChangeTime"
+          :end="state.today"
+        >
+          <button class="ss-reset-button date-btn">
+            <text>{{ dateFilterText }}</text>
+            <text class="cicon-drop-down ss-seldate-icon"></text>
+          </button>
+        </uni-datetime-picker>
 
         <!-- TODO 芋艿：优化 -->
-<!--				<view class="total-box">-->
-<!--					<view class="ss-m-b-10">总收入￥{{ state.pagination.income }}</view>-->
-<!--					<view>总支出￥{{ -state.pagination.expense }}</view>-->
-<!--				</view>-->
-			</view>
+        <!--				<view class="total-box">-->
+        <!--					<view class="ss-m-b-10">总收入￥{{ state.pagination.income }}</view>-->
+        <!--					<view>总支出￥{{ -state.pagination.expense }}</view>-->
+        <!--				</view>-->
+      </view>
       <su-tabs
         :list="tabMaps"
         @change="onChange"
@@ -83,7 +88,7 @@
   import sheep from '@/sheep';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import { computed, reactive } from 'vue';
-  import _ from 'lodash';
+  import _ from 'lodash-es';
   import dayjs from 'dayjs';
   import PointApi from '@/sheep/api/member/point';
   import { resetPagination } from '@/sheep/util';
@@ -274,4 +279,4 @@
       }
     }
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/sheep/components/s-address-item/s-address-item.vue b/sheep/components/s-address-item/s-address-item.vue
index f1b54b39..45e361ff 100644
--- a/sheep/components/s-address-item/s-address-item.vue
+++ b/sheep/components/s-address-item/s-address-item.vue
@@ -18,9 +18,7 @@
       <view class="address-text">
         {{ props.item.detailAddress }}
       </view>
-      <view class="person-text">
-        {{ props.item.name }} {{ props.item.mobile }}
-      </view>
+      <view class="person-text"> {{ props.item.name }} {{ props.item.mobile }} </view>
     </view>
     <view v-else>
       <view class="address-text ss-m-b-10">请选择收货地址</view>
@@ -47,7 +45,7 @@
    * @slot 								 - 默认插槽
    */
   import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
+  import { isEmpty } from 'lodash-es';
   const props = defineProps({
     item: {
       type: Object,
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 8939254b..228c64e1 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -11,7 +11,11 @@
       <view v-if="tagStyle.show" class="tag-icon-box">
         <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
       </view>
-      <image class="xs-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFit"></image>
+      <image
+        class="xs-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="aspectFit"
+      ></image>
       <view
         v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
         class="xs-goods-content ss-flex-col ss-row-around"
@@ -39,14 +43,21 @@
       <view v-if="tagStyle.show" class="tag-icon-box">
         <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
       </view>
-      <image class="sm-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFill"></image>
+      <image
+        class="sm-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="aspectFill"
+      ></image>
 
       <view
         v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
         class="sm-goods-content"
         :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
       >
-        <view v-if="goodsFields.title?.show || goodsFields.name?.show" class="sm-goods-title ss-line-1 ss-m-b-16">
+        <view
+          v-if="goodsFields.title?.show || goodsFields.name?.show"
+          class="sm-goods-title ss-line-1 ss-m-b-16"
+        >
           {{ data.title || data.name }}
         </view>
         <view
@@ -65,7 +76,11 @@
       <view v-if="tagStyle.show" class="tag-icon-box">
         <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
       </view>
-      <image class="md-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="widthFix"></image>
+      <image
+        class="md-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="widthFix"
+      ></image>
       <view
         class="md-goods-content ss-flex-col ss-row-around ss-p-b-20 ss-p-t-20 ss-p-x-16"
         :id="elId"
@@ -106,7 +121,10 @@
           </view>
 
           <view
-            v-if="(goodsFields.original_price?.show||goodsFields.marketPrice?.show) &&( data.original_price > 0|| data.marketPrice > 0)"
+            v-if="
+              (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
+              (data.original_price > 0 || data.marketPrice > 0)
+            "
             class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
             :style="[{ color: originPriceColor }]"
           >
@@ -141,7 +159,11 @@
       <view v-if="grouponTag" class="groupon-tag ss-flex ss-row-center">
         <view class="tag-icon">拼团</view>
       </view>
-      <image class="lg-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFill"></image>
+      <image
+        class="lg-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="aspectFill"
+      ></image>
       <view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
         <view>
           <view
@@ -177,7 +199,10 @@
               {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
             </view>
             <view
-              v-if="(goodsFields.original_price?.show||goodsFields.marketPrice?.show) &&( data.original_price > 0|| data.marketPrice > 0)"
+              v-if="
+                (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
+                (data.original_price > 0 || data.marketPrice > 0)
+              "
               class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
               :style="[{ color: originPriceColor }]"
             >
@@ -192,9 +217,7 @@
       </view>
 
       <slot name="cart">
-        <view class="buy-box ss-flex ss-col-center ss-row-center" v-if="buttonShow">
-          去购买
-        </view>
+        <view class="buy-box ss-flex ss-col-center ss-row-center" v-if="buttonShow"> 去购买 </view>
       </slot>
     </view>
 
@@ -204,7 +227,11 @@
         <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
       </view>
 
-      <image class="sl-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFill"></image>
+      <image
+        class="sl-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="aspectFill"
+      ></image>
 
       <view class="sl-goods-content">
         <view>
@@ -241,7 +268,10 @@
               {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
             </view>
             <view
-              v-if="(goodsFields.original_price?.show||goodsFields.marketPrice?.show) &&( data.original_price > 0|| data.marketPrice > 0)"
+              v-if="
+                (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
+                (data.original_price > 0 || data.marketPrice > 0)
+              "
               class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
               :style="[{ color: originPriceColor }]"
             >
@@ -296,7 +326,7 @@
   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';
+  import { isArray } from 'lodash-es';
 
   // 数据
   const state = reactive({});
diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
index 541abea4..3fc666fa 100644
--- a/sheep/components/s-layout/s-layout.vue
+++ b/sheep/components/s-layout/s-layout.vue
@@ -31,7 +31,11 @@
         ></view>
 
         <!-- 顶部导航栏-情况4：装修组件导航栏-沉浸式 -->
-        <s-custom-navbar v-if="navbar === 'custom' && navbarMode === 'inner'" :data="navbarStyle" :showLeftButton="showLeftButton" />
+        <s-custom-navbar
+          v-if="navbar === 'custom' && navbarMode === 'inner'"
+          :data="navbarStyle"
+          :showLeftButton="showLeftButton"
+        />
 
         <!-- 页面内容插槽 -->
         <slot />
@@ -58,7 +62,7 @@
    */
   import { computed, reactive, ref } from 'vue';
   import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
+  import { isEmpty } from 'lodash-es';
   import { onShow } from '@dcloudio/uni-app';
   // #ifdef MP-WEIXIN
   import { onShareAppMessage } from '@dcloudio/uni-app';
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 1764035f..e8273884 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
@@ -1,31 +1,31 @@
 <!-- 秒杀商品的 SKU 选择，和 s-select-sku.vue 类似 -->
 <template>
-	<!-- 规格弹窗 -->
-	<su-popup :show="show" round="10" @close="emits('close')">
-		<!-- 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"
-						:src="sheep.$url.cdn(state.selectedSku.picUrl || state.goodsInfo.picUrl)"
-						mode="aspectFill"
-					>
-					</image>
-				</view>
-				<view class="header-right ss-flex-col ss-row-between ss-flex-1">
-					<!-- 名称 -->
-					<view class="goods-title ss-line-2">{{ state.goodsInfo.name }}</view>
-					<view class="header-right-bottom ss-flex ss-col-center ss-row-between">
-						<!-- 价格 -->
-						<view class="price-text">
-							{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
-						</view>
-						<!-- 秒杀价格标签 -->
-						<view class="tig ss-flex ss-col-center">
-							<view class="tig-icon ss-flex ss-col-center ss-row-center">
-	              <text class="cicon-alarm"></text>
+  <!-- 规格弹窗 -->
+  <su-popup :show="show" round="10" @close="emits('close')">
+    <!-- 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"
+            :src="sheep.$url.cdn(state.selectedSku.picUrl || state.goodsInfo.picUrl)"
+            mode="aspectFill"
+          >
+          </image>
+        </view>
+        <view class="header-right ss-flex-col ss-row-between ss-flex-1">
+          <!-- 名称 -->
+          <view class="goods-title ss-line-2">{{ state.goodsInfo.name }}</view>
+          <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
+            <!-- 价格 -->
+            <view class="price-text">
+              {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
+            </view>
+            <!-- 秒杀价格标签 -->
+            <view class="tig ss-flex ss-col-center">
+              <view class="tig-icon ss-flex ss-col-center ss-row-center">
+                <text class="cicon-alarm"></text>
               </view>
               <view class="tig-title">秒杀价</view>
             </view>
@@ -91,8 +91,8 @@
   // 按钮状态： active,nostock
   import { computed, reactive, watch } from 'vue';
   import sheep from '@/sheep';
-  import {convertProductPropertyList, fen2yuan} from "@/sheep/hooks/useGoods";
-  import {min} from "lodash";
+  import { convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
+  import { min } from 'lodash-es';
   const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
   const props = defineProps({
     modelValue: {
@@ -107,7 +107,7 @@
     singleLimitCount: {
       type: Number,
       default: 1,
-    }
+    },
   });
   const state = reactive({
     goodsInfo: computed(() => props.modelValue),
@@ -120,7 +120,7 @@
   const skuList = computed(() => {
     let skuPrices = state.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;
   });
@@ -228,7 +228,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 不禁用
       }
     }
   };
@@ -258,7 +258,10 @@
   const 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, '');
diff --git a/sheep/platform/index.js b/sheep/platform/index.js
index 36a54fc6..0956bb03 100644
--- a/sheep/platform/index.js
+++ b/sheep/platform/index.js
@@ -9,7 +9,7 @@
  * @param {Object} device - 设备信息
  */
 
-import { isEmpty } from 'lodash';
+import { isEmpty } from 'lodash-es';
 // #ifdef H5
 import { isWxBrowser } from '@/sheep/helper/utils';
 // #endif
diff --git a/sheep/router/index.js b/sheep/router/index.js
index 86796e5a..0a4ecc30 100644
--- a/sheep/router/index.js
+++ b/sheep/router/index.js
@@ -1,6 +1,6 @@
 import $store from '@/sheep/store';
 import { showAuthModal, showShareModal } from '@/sheep/hooks/useModal';
-import { isNumber, isString, isEmpty, startsWith, isObject, isNil, clone } from 'lodash';
+import { isNumber, isString, isEmpty, startsWith, isObject, isNil, clone } from 'lodash-es';
 import throttle from '@/sheep/helper/throttle';
 
 const _go = (
diff --git a/sheep/store/user.js b/sheep/store/user.js
index a4c1a7f9..27ed88dd 100644
--- a/sheep/store/user.js
+++ b/sheep/store/user.js
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import $share from '@/sheep/platform/share';
-import { clone, cloneDeep } from 'lodash';
+import { clone, cloneDeep } from 'lodash-es';
 import cart from './cart';
 import app from './app';
 import { showAuthModal } from '@/sheep/hooks/useModal';
@@ -68,12 +68,12 @@ const user = defineStore({
 
     // 获取订单、优惠券等其他资产信息
     getNumData() {
-      OrderApi.getOrderCount().then(res => {
+      OrderApi.getOrderCount().then((res) => {
         if (res.code === 0) {
           this.numData.orderCount = res.data;
         }
       });
-      CouponApi.getUnusedCouponCount().then(res => {
+      CouponApi.getUnusedCouponCount().then((res) => {
         if (res.code === 0) {
           this.numData.unusedCouponCount = res.data;
         }
@@ -143,20 +143,22 @@ const user = defineStore({
       }
 
       // 绑定推广员
-      $share.bindBrokerageUser()
+      $share.bindBrokerageUser();
     },
 
     // 登出系统
     async logout() {
       this.resetUserData();
       return !this.isLogin;
-    }
+    },
   },
   persist: {
     enabled: true,
-    strategies: [{
-      key: 'user-store',
-    }]
+    strategies: [
+      {
+        key: 'user-store',
+      },
+    ],
   },
 });
 
diff --git a/sheep/ui/su-swiper/su-swiper.vue b/sheep/ui/su-swiper/su-swiper.vue
index cff1c4b3..7465db11 100644
--- a/sheep/ui/su-swiper/su-swiper.vue
+++ b/sheep/ui/su-swiper/su-swiper.vue
@@ -88,7 +88,7 @@
 
   import { reactive, computed } from 'vue';
   import sheep from '@/sheep';
-  import { clone } from 'lodash';
+  import { clone } from 'lodash-es';
 
   // 数据
   const state = reactive({
@@ -196,11 +196,11 @@
   const onPreview = () => {
     if (!props.isPreview) return;
     let previewImage = clone(props.list);
-    previewImage.forEach((item,index) => {
-      if(item.type === 'video') {
+    previewImage.forEach((item, index) => {
+      if (item.type === 'video') {
         previewImage.splice(index, 1);
       }
-    })
+    });
     uni.previewImage({
       urls:
         previewImage.length < 1

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 03/48] =?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 04/48] =?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 05/48] =?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 06/48] =?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 07/48] =?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 08/48] =?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 09/48] =?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 10/48] =?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 11/48] =?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 12/48] =?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 13/48] =?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 14/48] =?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 15/48] =?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 16/48] =?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 17/48] =?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 18/48] =?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 19/48] =?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 20/48] =?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 21/48] =?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 22/48] =?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 23/48] =?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 24/48] =?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 25/48] =?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 26/48] =?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 27/48] =?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 28/48] =?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 29/48] =?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 30/48] =?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 31/48] =?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 32/48] =?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 33/48] =?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 34/48] =?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 35/48] =?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 36/48] =?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 37/48] =?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 38/48] =?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 39/48] =?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 40/48] =?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 41/48] =?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 42/48] =?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 43/48] =?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 44/48] =?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 45/48] =?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 46/48] =?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 47/48] =?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 48/48] =?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"
 }