From aa571f25f9757eb47c760dba2ed9388943620749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=97=B4=E8=B4=A7?= <252048765@qq.com>
Date: Sun, 15 Sep 2024 17:32:29 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E3=80=91?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9bug=E5=92=8C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/index.vue                      | 195 ++++--
 pages/activity/seckill/list.vue               | 146 ++--
 pages/coupon/detail.vue                       |  16 +-
 pages/goods/index.vue                         | 373 ++++++----
 pages/goods/list.vue                          |  61 +-
 pages/goods/seckill.vue                       | 150 ++--
 pages/order/addressSelection.vue              | 263 ++++++++
 pages/order/confirm.vue                       | 234 ++++---
 sheep/api/product/spu.js                      |  12 +
 .../s-activity-pop/s-activity-pop.vue         | 254 ++++++-
 .../s-discount-list/s-discount-list.vue       |  69 +-
 .../components/s-goods-card/s-goods-card.vue  |  55 +-
 .../s-goods-column/s-goods-column.vue         | 361 +++++-----
 .../components/s-select-sku/s-select-sku.vue  | 638 +++++++++---------
 sheep/hooks/useGoods.js                       | 108 ++-
 static/images/dis.png                         | Bin 0 -> 16936 bytes
 16 files changed, 1995 insertions(+), 940 deletions(-)
 create mode 100644 pages/order/addressSelection.vue
 create mode 100644 static/images/dis.png

diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 56417ed9..591d004c 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -19,13 +19,9 @@
     <view 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"
-            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-            @getHeight="mountMasonry($event, 'left')"
-          >
+          <s-goods-column class="goods-md-box" size="md" :data="item"
+                          @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"> </button>
             </template>
@@ -34,13 +30,9 @@
       </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"
-            :data="item"
-            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-            @getHeight="mountMasonry($event, 'right')"
-          >
+          <s-goods-column class="goods-md-box" size="md" :data="item"
+                          @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>
@@ -49,23 +41,27 @@
       </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"
-    />
+      }" @tap="loadMore" />
   </s-layout>
 </template>
 <script setup>
-  import { reactive } from 'vue';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import {
+    reactive,
+    toRaw,
+    ref
+  } from 'vue';
+  import {
+    onLoad,
+    onReachBottom
+  } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import _ from 'lodash-es';
   import RewardActivityApi from '@/sheep/api/promotion/rewardActivity';
-  import { formatRewardActivityRule } from '@/sheep/hooks/useGoods';
+  import {
+    formatRewardActivityRule
+  } from '@/sheep/hooks/useGoods';
   import SpuApi from '@/sheep/api/product/spu';
 
   const state = reactive({
@@ -106,32 +102,138 @@
 
   // 加载商品信息
   async function getList() {
+    // state.loadStatus = 'loading';
     // 处理拓展参数
-    const params = {};
+    const params = {}
     if (state.activityInfo.productScope === 2) {
-      params.ids = state.activityInfo.productSpuIds.join(',');
+      // const params = toRaw(state.activityInfo.productScopeValues)
+      // 请求数据
+      const {
+        code,
+        data
+      } = await SpuApi.getSpuListByIds(state.activityInfo.productScopeValues.join(','));
+      if (code !== 0) {
+        return;
+      }
+      // 使用 map 提取每个对象的 id 属性
+      const ids = data.map(item => item.id);
+      // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
+      const idsString = ids.join(',');
+      // 获取结算信息
+      settleData.value = await getSettlementByIds(idsString)
+      // 处理获得的数据
+      const ms = enrichDataWithSkus(data, settleData.value)
+      state.pagination.list = ms;
+      // state.pagination.total = data.total;
+      // state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
     } else if (state.activityInfo.productScope === 3) {
-      params.categoryIds = state.activityInfo.productSpuIds.join(',');
+      params.categoryIds = state.activityInfo.productScopeValues.join(',');
+      state.loadStatus = 'loading';
+      const {
+        code,
+        data
+      } = await SpuApi.getSpuPage({
+        pageNo: state.pagination.pageNo,
+        pageSize: state.pagination.pageSize,
+        ...params,
+      });
+      if (code !== 0) {
+        return;
+      }
+      // 使用 map 提取每个对象的 id 属性
+      const ids = data.list.map(item => item.id);
+      // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
+      const idsString = ids.join(',');
+      // 获取结算信息
+      settleData.value = await getSettlementByIds(idsString)
+      // 处理获得的数据
+      const ms = enrichDataWithSkus(data.list, settleData.value)
+      state.pagination.list = _.concat(state.pagination.list, ms);
+      state.pagination.total = data.total;
+      state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+    } else {
+      state.loadStatus = 'loading';
+      const {
+        code,
+        data
+      } = await SpuApi.getSpuPage({
+        pageNo: state.pagination.pageNo,
+        pageSize: state.pagination.pageSize,
+      });
+      if (code !== 0) {
+        return;
+      }
+      // 使用 map 提取每个对象的 id 属性
+      const ids = data.list.map(item => item.id);
+      // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
+      const idsString = ids.join(',');
+      // 获取结算信息
+      settleData.value = await getSettlementByIds(idsString)
+      // 处理获得的数据
+      const ms = enrichDataWithSkus(data.list, settleData.value)
+      state.pagination.list = _.concat(state.pagination.list, ms);
+      state.pagination.total = data.total;
+      state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
     }
-    // 请求数据
-    state.loadStatus = 'loading';
-    const { code, data } = await SpuApi.getSpuPage({
-      pageNo: state.pagination.pageNo,
-      pageSize: state.pagination.pageSize,
-      ...params,
-    });
-    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';
     mountMasonry();
   }
+  //获取结算信息
+  const settleData = ref()
+  async function getSettlementByIds(ids) {
+    const {
+      data
+    } = await SpuApi.getSettlementProduct(ids);
+    return data;
+  }
+  //计算展示价格的函数
+  function enrichDataWithSkus(data, array) {
+    // 创建一个映射，以 id 为键，存储 data 数组中的对象
+    const dataMap = new Map(data.map(item => [item.id, {
+      ...item
+    }]));
 
+    // 遍历 array 数组
+    array.forEach(item => {
+      // 初始化 discountPrice 和 vipPrice 为 null
+      let discountPrice = null;
+      let vipPrice = null;
+      let foundType4 = false;
+      let foundType6 = false;
+
+      // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
+      item.skus.forEach(sku => {
+        if (!foundType4 && sku.type === 4) {
+          discountPrice = sku.price;
+          foundType4 = true;
+        }
+        if (!foundType6 && sku.type === 6) {
+          vipPrice = sku.price;
+          foundType6 = true;
+        }
+
+        // 如果已经找到 type 为 4 和 6 的条目，则不需要继续遍历
+        if (foundType4 && foundType6) {
+          return;
+        }
+      });
+
+      // 更新 dataMap 中对应的对象
+      if (dataMap.has(item.id)) {
+        dataMap.get(item.id).discountPrice = discountPrice;
+        dataMap.get(item.id).vipPrice = vipPrice;
+        dataMap.get(item.id).reward = item.reward;
+      }
+    });
+
+    // 返回更新后的数据数组
+    return Array.from(dataMap.values());
+  }
   // 加载活动信息
   async function getActivity(id) {
-    const { code, data } = await RewardActivityApi.getRewardActivity(id);
+    const {
+      code,
+      data
+    } = await RewardActivityApi.getRewardActivity(id);
     if (code === 0) {
       state.activityInfo = data;
     }
@@ -154,28 +256,32 @@
   onLoad(async (options) => {
     state.activityId = options.activityId;
     await getActivity(state.activityId);
-    await getList(state.activityId);
+    await getList();
   });
 </script>
 <style lang="scss" scoped>
   .goods-list-box {
     width: 50%;
     box-sizing: border-box;
+
     .left-list {
       margin-right: 10rpx;
       margin-bottom: 20rpx;
     }
+
     .right-list {
       margin-left: 10rpx;
       margin-bottom: 20rpx;
     }
   }
+
   .tip-box {
     background: #fff0e7;
     padding: 20rpx;
     width: 100%;
     position: relative;
     box-sizing: border-box;
+
     .activity-left-image {
       position: absolute;
       bottom: 0;
@@ -183,6 +289,7 @@
       width: 58rpx;
       height: 36rpx;
     }
+
     .activity-right-image {
       position: absolute;
       top: 0;
@@ -190,12 +297,14 @@
       width: 72rpx;
       height: 50rpx;
     }
+
     .type-text {
       font-size: 26rpx;
       font-weight: 500;
       color: #ff6000;
       line-height: 42rpx;
     }
+
     .tip-content {
       font-size: 26rpx;
       font-weight: 500;
@@ -203,4 +312,4 @@
       line-height: 42rpx;
     }
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue
index a1714bba..a6a07d14 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -2,10 +2,7 @@
 <template>
   <s-layout navbar="inner" :bgStyle="{ color: 'rgb(245,28,19)' }">
     <!--顶部背景图-->
-    <view
-        class="page-bg"
-        :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]"
-    ></view>
+    <view class="page-bg" :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]"></view>
     <!-- 时间段轮播图 -->
     <view class="header" v-if="activeTimeConfig?.sliderPicUrls?.length > 0">
       <swiper indicator-dots="true" autoplay="true" :circular="true" interval="3000" duration="1500"
@@ -26,13 +23,12 @@
       </view>
       <scroll-view class="time-list" :scroll-into-view="activeTimeElId" scroll-x scroll-with-animation>
         <view v-for="(config, index) in timeConfigList" :key="index"
-              :class="['item', { active: activeTimeIndex === index}]"
-              :id="`timeItem${index}`"
-              @tap="handleChangeTimeConfig(index)">
+              :class="['item', { active: activeTimeIndex === index}]" :id="`timeItem${index}`"
+              @tap="handleChangeTimeConfig(index,config.id)">
           <!-- 活动起始时间 -->
           <view class="time">{{ config.startTime }}</view>
           <!-- 活动状态 -->
-          <view class="status">{{ config.status }}</view>
+          <view class="status">{{ config?.status }}</view>
         </view>
       </scroll-view>
     </view>
@@ -57,69 +53,89 @@
       </view>
 
       <!-- 活动列表 -->
-      <scroll-view
-        class="scroll-box"
-        :style="{ height: pageHeight + 'rpx' }"
-        scroll-y="true"
-        :scroll-with-animation="false"
-        :enable-back-to-top="true"
-      >
+      <scroll-view class="scroll-box" :style="{ height: pageHeight + 'rpx' }" scroll-y="true"
+                   :scroll-with-animation="false" :enable-back-to-top="true">
         <view class="goods-box ss-m-b-20" v-for="activity in activityList" :key="activity.id">
-          <s-goods-column
-            size="lg"
-            :data="{ ...activity, price: activity.seckillPrice }"
-            :goodsFields="goodsFields"
-            :seckillTag="true"
-            @click="sheep.$router.go('/pages/goods/seckill', { id: activity.id })"
-          >
+          <s-goods-column size="lg" :data="{ ...activity, price: activity.seckillPrice }"
+                          :goodsFields="goodsFields" :seckillTag="true">
             <!-- 抢购进度 -->
             <template #activity>
-              <view class="limit">限量 <text class="ss-m-l-5">{{ activity.stock}} {{activity.unitName}}</text></view>
+              <view class="limit">限量 <text class="ss-m-l-5">{{ activity.stock}}
+                {{activity.unitName}}</text></view>
               <su-progress :percentage="activity.percent" strokeWidth="10" textInside isAnimate />
             </template>
             <!-- 抢购按钮 -->
             <template #cart>
-              <button :class="['ss-reset-button cart-btn', { disabled: activeTimeConfig.status === TimeStatusEnum.END }]">
-                <span v-if="activeTimeConfig?.status === TimeStatusEnum.WAIT_START">未开始</span>
-                <span v-else-if="activeTimeConfig?.status === TimeStatusEnum.STARTED">马上抢</span>
-                <span v-else>已结束</span>
+              <button
+                :class="['ss-reset-button cart-btn', { disabled: activeTimeConfig?.status === TimeStatusEnum.END}]"
+                v-if="activeTimeConfig?.status === TimeStatusEnum.WAIT_START">
+                <span>未开始</span>
+              </button>
+              <button
+                :class="['ss-reset-button cart-btn', { disabled: activeTimeConfig?.status === TimeStatusEnum.END}]"
+                @click="sheep.$router.go('/pages/goods/seckill', { id: activity.id })"
+                v-else-if='activeTimeConfig?.status === TimeStatusEnum.STARTED'>
+                <span>马上抢</span>
+              </button>
+              <button
+                :class="['ss-reset-button cart-btn', { disabled: activeTimeConfig?.status === TimeStatusEnum.END}]"
+                v-else>
+                <span>已结束</span>
               </button>
             </template>
           </s-goods-column>
         </view>
-        <uni-load-more
-          v-if="activityTotal > 0"
-          :status="loadStatus"
-          :content-text="{
+        <uni-load-more v-if="activityTotal > 0" :status="loadStatus" :content-text="{
             contentdown: '上拉加载更多',
-          }"
-          @tap="loadMore"
-        />
+          }" @tap="loadMore" />
       </scroll-view>
     </view>
   </s-layout>
 </template>
 <script setup>
-  import {reactive, computed, ref, nextTick} from 'vue';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import {
+    reactive,
+    computed,
+    ref,
+    nextTick
+  } from 'vue';
+  import {
+    onLoad,
+    onReachBottom
+  } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import { useDurationTime } from '@/sheep/hooks/useGoods';
+  import {
+    useDurationTime
+  } from '@/sheep/hooks/useGoods';
   import SeckillApi from "@/sheep/api/promotion/seckill";
   import dayjs from "dayjs";
-  import {TimeStatusEnum} from "@/sheep/util/const";
+  import {
+    TimeStatusEnum
+  } from "@/sheep/util/const";
 
   // 计算页面高度
-  const { safeAreaInsets, safeArea } = sheep.$platform.device;
+  const {
+    safeAreaInsets,
+    safeArea
+  } = sheep.$platform.device;
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
   const pageHeight = (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sheep.$platform.navbar - 350;
   const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-header.png');
 
   // 商品控件显示的字段（不显示库存、销量。改为显示自定义的进度条）
   const goodsFields = {
-    name: { show: true },
-    introduction: { show: true },
-    price: { show: true },
-    marketPrice: { show: true },
+    name: {
+      show: true
+    },
+    introduction: {
+      show: true
+    },
+    price: {
+      show: true
+    },
+    marketPrice: {
+      show: true
+    },
   };
 
   //#region 时间段
@@ -127,25 +143,32 @@
   const timeConfigList = ref([])
   // 查询时间段
   const getSeckillConfigList = async () => {
-    const { data } = await SeckillApi.getSeckillConfigList()
+    const {
+      data
+    } = await SeckillApi.getSeckillConfigList()
     const now = dayjs();
     const today = now.format('YYYY-MM-DD')
+    const select = ref([])
     // 判断时间段的状态
     data.forEach((config, index) => {
       const startTime = dayjs(`${today} ${config.startTime}`)
       const endTime = dayjs(`${today} ${config.endTime}`)
+      select.value[index] = config.id;
       if (now.isBefore(startTime)) {
         config.status = TimeStatusEnum.WAIT_START;
+        // select.value[index] = config.id;
       } else if (now.isAfter(endTime)) {
         config.status = TimeStatusEnum.END;
+        // select.value[index] = config.id;
       } else {
         config.status = TimeStatusEnum.STARTED;
-        activeTimeIndex.value = index;
+        // select.value[index] = config.id;
+        activeTimeIndex.value = index
       }
     })
     timeConfigList.value = data
     // 默认选中进行中的活动
-    handleChangeTimeConfig(activeTimeIndex.value);
+    handleChangeTimeConfig(activeTimeIndex.value, select.value[activeTimeIndex.value]);
     // 滚动到进行中的时间段
     scrollToTimeConfig(activeTimeIndex.value)
   }
@@ -159,11 +182,12 @@
   // 切换时间段
   const activeTimeIndex = ref(0) // 当前选中的时间段的索引
   const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]) // 当前选中的时间段
-  const handleChangeTimeConfig = (index) => {
+  const handleChangeTimeConfig = (index, id) => {
     activeTimeIndex.value = index
 
     // 查询活动列表
     activityPageParams.pageNo = 1
+    activityPageParams.configId = id;
     activityList.value = []
     getActivityList();
   }
@@ -182,7 +206,7 @@
 
   // 查询活动列表
   const activityPageParams = reactive({
-    id: 0, // 时间段 ID
+    configId: 0, // 时间段 ID
     pageNo: 1, // 页码
     pageSize: 5, // 每页数量
   })
@@ -191,7 +215,9 @@
   const loadStatus = ref('') // 页面加载状态
   async function getActivityList() {
     loadStatus.value = 'loading';
-    const { data } = await SeckillApi.getSeckillActivityPage(activityPageParams)
+    const {
+      data
+    } = await SeckillApi.getSeckillActivityPage(activityPageParams)
     data.list.forEach(activity => {
       // 计算抢购进度
       activity.percent = parseInt(100 * (activity.totalStock - activity.stock) / activity.totalStock);
@@ -235,7 +261,8 @@
     margin: -276rpx auto 0 auto;
     border-radius: 14rpx;
     overflow: hidden;
-    swiper{
+
+    swiper {
       height: 330rpx !important;
       border-radius: 14rpx;
       overflow: hidden;
@@ -246,7 +273,8 @@
       height: 100%;
       border-radius: 14rpx;
       overflow: hidden;
-      img{
+
+      img {
         border-radius: 14rpx;
       }
     }
@@ -257,10 +285,12 @@
     width: 75rpx;
     height: 70rpx;
   }
+
   // 时间段列表
   .time-list {
     width: 596rpx;
     white-space: nowrap;
+
     // 时间段
     .item {
       display: inline-block;
@@ -270,17 +300,20 @@
       box-sizing: border-box;
       margin-right: 30rpx;
       width: 130rpx;
+
       // 开始时间
       .time {
         font-size: 36rpx;
         font-weight: 600;
         color: #333;
       }
+
       // 选中的时间段
       &.active {
         .time {
           color: var(--ui-BG-Main);
         }
+
         // 状态
         .status {
           height: 30rpx;
@@ -301,6 +334,7 @@
     margin: 0 20rpx 0 20rpx;
     background: #fff;
     border-radius: 20rpx 20rpx 0 0;
+
     .content-header {
       width: 100%;
       border-radius: 20rpx 20rpx 0 0;
@@ -312,6 +346,7 @@
         height: 64rpx;
         background: rgba($color: #fff, $alpha: 0.66);
         border-radius: 32px;
+
         // 场次倒计时内容
         .countdown-title {
           font-size: 28rpx;
@@ -319,10 +354,12 @@
           color: #333333;
           line-height: 28rpx;
         }
+
         // 场次倒计时
         .countdown-time {
           font-size: 28rpx;
           color: rgba(#ed3c30, 0.23);
+
           // 场次倒计时：小时部分
           .countdown-h {
             font-size: 24rpx;
@@ -334,6 +371,7 @@
             background: rgba(#ed3c30, 0.23);
             border-radius: 6rpx;
           }
+
           // 场次倒计时：分钟、秒
           .countdown-num {
             font-size: 24rpx;
@@ -348,12 +386,15 @@
         }
       }
     }
+
     // 活动列表
     .scroll-box {
       height: 900rpx;
+
       // 活动
       .goods-box {
         position: relative;
+
         // 抢购按钮
         .cart-btn {
           position: absolute;
@@ -373,6 +414,7 @@
             color: #fff;
           }
         }
+
         // 秒杀限量商品数
         .limit {
           font-size: 22rpx;
@@ -382,4 +424,4 @@
       }
     }
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/coupon/detail.vue b/pages/coupon/detail.vue
index 6ebaa854..d7f53c31 100644
--- a/pages/coupon/detail.vue
+++ b/pages/coupon/detail.vue
@@ -36,10 +36,10 @@
               <text v-else>
                 {{
                   state.coupon.status === 1
-                    ? '立即使用'
+                    ? '可使用'
                     : state.coupon.status === 2
-                    ? '已使用'
-                    : '已过期'
+                      ? '已使用'
+                      : '已过期'
                 }}
               </text>
             </button>
@@ -282,11 +282,11 @@
 
   .detail-wrap {
     background: linear-gradient(
-      180deg,
-      var(--ui-BG-Main),
-      var(--ui-BG-Main-gradient),
-      var(--ui-BG-Main),
-      #fff
+        180deg,
+        var(--ui-BG-Main),
+        var(--ui-BG-Main-gradient),
+        var(--ui-BG-Main),
+        #fff
     );
   }
 
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 27ab0894..062a0f2c 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -7,30 +7,47 @@
       <!-- 骨架屏 -->
       <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"
-      />
+      <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"
-          />
-
+          <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="discount" v-if="setShow">
+            <image class="disImg" src="../../static/images/dis.png"></image>
+            <view class="discountCont">
+              <view class="disContT">
+                <view class="disContT1">
+                  <view class="disContT1P">
+                    ￥{{fen2yuan(settleData.price)}}
+                  </view>
+                  <view class="disContT1End">
+                    直降￥{{fen2yuan( state.goodsInfo.price - settleData.price)}}
+                  </view>
+                </view>
+                <view class="disContT2">
+                  限时折扣
+                </view>
+              </view>
+              <view class="disContB">
+                <view class="disContB1">
+                  价格：￥{{fen2yuan(state.goodsInfo.price)}} 丨 剩余：{{settleData.stock}}
+                </view>
+                <view class="disContB2">
+                  距结束仅剩
+                  <countDown :tipText="' '" :bgColor="bgColor" :dayText="':'" :hourText="':'"
+                             :minuteText="':'" :secondText="' '" :datatime="settleData.endTime / 1000"
+                             :isDay="false" />
+                </view>
+              </view>
+            </view>
+          </view>
+          <!-- 限时折扣 -->
           <!-- 价格+标题 -->
           <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="ss-flex ss-row-between ss-col-center ss-m-b-26" v-if="!setShow">
               <view class="price-box ss-flex ss-col-bottom">
                 <view class="price-text ss-m-r-16">
                   {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
@@ -47,23 +64,16 @@
               <!-- 满减送/限时折扣活动的提示 -->
               <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"
-                  >
+                  <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"
-              >
+              <!-- 优惠劵@tap="state.showModel = true" -->
+              <view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="onActivity"
+                    v-if="state.couponInfo.length">
                 <view class="discounts-title ss-m-r-8">领券</view>
                 <text class="cicon-forward"></text>
               </view>
@@ -74,51 +84,30 @@
 
           <!-- 功能卡片 -->
           <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"
-            />
+            <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"
-          />
+          <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-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 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 class="ss-reset-button buy-btn ui-Shadow-Main" @tap="state.showSelectSku = true">
               立即购买
             </button>
           </view>
@@ -128,32 +117,38 @@
         </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"
-        />
+        <s-activity-pop v-model="state" :show="state.showActivityModel"
+                        @close="state.showActivityModel = false" @get="onGet" />
       </block>
     </s-layout>
   </view>
 </template>
 
 <script setup>
-  import { reactive, computed } from 'vue';
-  import { onLoad, onPageScroll } from '@dcloudio/uni-app';
+  import {
+    reactive,
+    computed,
+    ref
+  } 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 {
+    formatSales,
+    formatGoodsSwiper,
+    fen2yuan,
+    handList,
+    handListPrice
+  } 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';
@@ -161,11 +156,22 @@
   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 {
+    isEmpty
+  } from 'lodash-es';
   import SpuApi from '@/sheep/api/product/spu';
 
-  onPageScroll(() => {});
+  onPageScroll(() => {
+  });
+  import countDown from '@/sheep/components/countDown/index.vue'
 
+  const bgColor = {
+    'bgColor': '#E93323',
+    'Color': '#fff',
+    'width': '44rpx',
+    'timeTxtwidth': '16rpx',
+    'isDay': true
+  }
   const isLogin = computed(() => sheep.$store('user').isLogin);
   const state = reactive({
     goodsId: 0,
@@ -182,7 +188,13 @@
 
   // 规格变更
   function onSkuChange(e) {
-    state.selectedSku = e;
+    if (e.type == 4) {
+      settleData.value = e
+      setShow.value = true
+    } else {
+      state.selectedSku = e;
+      setShow.value = false
+    }
   }
 
   // 添加购物车
@@ -196,21 +208,17 @@
 
   // 立即购买
   function onBuy(e) {
-    if (!state.selectedSku.id) {
+    if (!e.id) {
       sheep.$helper.toast('请选择商品规格');
       return;
     }
     sheep.$router.go('/pages/order/confirm', {
       data: JSON.stringify({
-        items: [
-          {
-            skuId: e.id,
-            count: e.goods_num,
-          },
-        ],
-        // TODO 芋艿：后续清理掉这 2 参数
-        deliveryType: 1,
-        pointStatus: false,
+        items: [{
+          skuId: e.id,
+          count: e.goods_num,
+          categoryId: state.goodsInfo.categoryId
+        }]
       }),
     });
   }
@@ -222,7 +230,9 @@
 
   // 立即领取
   async function onGet(id) {
-    const { code } = await CouponApi.takeCoupon(id);
+    const {
+      code
+    } = await CouponApi.takeCoupon(id);
     if (code !== 0) {
       return;
     }
@@ -237,33 +247,66 @@
   //  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,
-        },
+    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), // 商品原价
-      },
-    );
+    }, {
+      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);
+    const {
+      code,
+      data
+    } = await CouponApi.getCouponTemplateList(state.goodsId, 2, 10);
     if (code === 0) {
       state.couponInfo = data;
     }
   }
 
+  //获取结算信息
+  const setShow = ref(false)
+  const settleData = ref()
+
+  async function getSettlementByIds(ids) {
+    const { data } = await SpuApi.getSettlementProduct(ids);
+    settleData.value = handle(data)
+    state.goodsInfo.skus = handListPrice(state.goodsInfo.skus, data[0].skus)
+  }
+
+  //判断是否有限时折扣信息
+  function handle(array) {
+    let setList = {}
+    array.some(item => {
+      return item.skus.some(items => {
+        if (items.type === 4) {
+          setShow.value = true;
+          setList = items;
+          return true; // 返回true以结束some循环
+        }
+        return false; // 继续遍历
+      });
+    });
+    // 将库存信息加入
+    state.goodsInfo.skus.forEach(item => {
+      if (item.id == setList.skuId) {
+        setList.stock = item.stock
+      }
+    })
+
+    return setList
+  }
+
   onLoad((options) => {
     // 非法参数
     if (!options.id) {
@@ -281,7 +324,6 @@
       // 加载到商品
       state.skeletonLoading = false;
       state.goodsInfo = res.data;
-
       // 加载是否收藏
       if (isLogin.value) {
         FavoriteApi.isFavoriteExists(state.goodsId, 'goods').then((res) => {
@@ -301,19 +343,19 @@
       if (res.code !== 0) {
         return;
       }
-      res.data.forEach((activity) => {
-        if ([1, 2, 3].includes(activity.type)) {
-          // 情况一：拼团/秒杀/砍价
+      let activData = handList(res.data)
+      activData.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 芋艿
-          console.log('待实现！优先级不高');
+        } else { // 情况三：限时折扣 TODO 芋艿
+          // console.log('待实现！优先级不高');
         }
-      });
+      })
     });
+    //获取结算信息
+    getSettlementByIds(state.goodsId)
   });
 </script>
 
@@ -462,4 +504,101 @@
       color: #333333;
     }
   }
-</style>
+
+  // 限时折扣
+  .discount {
+    width: 750rpx;
+    height: 100rpx;
+    // background-color: red;
+    overflow: hidden;
+    position: relative;
+  }
+
+  .disImg {
+    width: 750rpx;
+    height: 100rpx;
+    position: absolute;
+    top: 0;
+    z-index: -1;
+  }
+
+  .discountCont {
+    width: 680rpx;
+    height: 90rpx;
+    margin: 10rpx auto 0 auto;
+    // background-color: gold;
+  }
+
+  .disContT {
+    width: 680rpx;
+    height: 50rpx;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .disContT1 {
+    width: 400rpx;
+    height: 50rpx;
+    // background-color: green;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+
+  .disContT2 {
+    width: 200rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    // background-color: gold;
+    font-size: 30rpx;
+    text-align: end;
+    color: white;
+    font-weight: bolder;
+    font-style: oblique 20deg;
+    letter-spacing: .1rem;
+  }
+
+  .disContT1P {
+    color: white;
+    font-weight: bold;
+    font-size: 28rpx;
+  }
+
+  .disContT1End {
+    // width: 180rpx;
+    padding: 0 10rpx;
+    height: 30rpx;
+    line-height: 28rpx;
+    text-align: center;
+    font-weight: bold;
+    background-color: white;
+    color: #ff3000;
+    font-size: 23rpx;
+    border-radius: 20rpx;
+    margin-left: 10rpx;
+  }
+
+  .disContB {
+    width: 680rpx;
+    height: 40rpx;
+    display: flex;
+    justify-content: space-between;
+    font-size: 20rpx;
+    color: white;
+    align-items: center;
+  }
+
+  .disContB1 {
+    width: 300rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+  }
+
+  .disContB2 {
+    width: 300rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    display: flex;
+    justify-content: flex-end;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 1fdf5592..1db8b708 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -118,7 +118,7 @@
 </template>
 
 <script setup>
-  import { reactive } from 'vue';
+  import { reactive,ref } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import _ from 'lodash-es';
@@ -277,7 +277,15 @@
     if (code !== 0) {
       return;
     }
-    state.pagination.list = _.concat(state.pagination.list, data.list);
+    // 使用 map 提取每个对象的 id 属性
+    const ids = data.list.map(item => item.id);
+    // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
+    const idsString = ids.join(',');
+    // 获取结算信息
+    settleData.value = await getSettlementByIds(idsString)
+    // 处理获得的数据
+    const ms = enrichDataWithSkus(data.list,settleData.value)
+    state.pagination.list = _.concat(state.pagination.list, ms);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
     mountMasonry();
@@ -292,6 +300,55 @@
     getList(state.currentSort, state.currentOrder);
   }
 
+  //获取结算信息
+  const settleData = ref()
+  async function getSettlementByIds(ids) {
+    const { data } = await SpuApi.getSettlementProduct(ids);
+    return data;
+  }
+
+  //计算展示价格的函数
+  function enrichDataWithSkus(data, array) {
+    // 创建一个映射，以 id 为键，存储 data 数组中的对象
+    const dataMap = new Map(data.map(item => [item.id, { ...item }]));
+
+    // 遍历 array 数组
+    array.forEach(item => {
+      // 初始化 discountPrice 和 vipPrice 为 null
+      let discountPrice = null;
+      let vipPrice = null;
+      let foundType4 = false;
+      let foundType6 = false;
+
+      // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
+      item.skus.forEach(sku => {
+        if (!foundType4 && sku.type === 4) {
+          discountPrice = sku.price;
+          foundType4 = true;
+        }
+        if (!foundType6 && sku.type === 6) {
+          vipPrice = sku.price;
+          foundType6 = true;
+        }
+
+        // 如果已经找到 type 为 4 和 6 的条目，则不需要继续遍历
+        if (foundType4 && foundType6) {
+          return;
+        }
+      });
+
+      // 更新 dataMap 中对应的对象
+      if (dataMap.has(item.id)) {
+        dataMap.get(item.id).discountPrice = discountPrice;
+        dataMap.get(item.id).vipPrice = vipPrice;
+        dataMap.get(item.id).reward = item.reward;
+      }
+    });
+
+    // 返回更新后的数据数组
+    return Array.from(dataMap.values());
+  }
+
   onLoad((options) => {
     state.categoryId = options.categoryId;
     state.keyword = options.keyword;
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index aed2cd33..2e4118ed 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -6,26 +6,13 @@
     <!-- 骨架屏 -->
     <detailSkeleton v-if="state.skeletonLoading" />
     <!-- 下架/售罄提醒 -->
-    <s-empty
-      v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== 'seckill'"
-      text="活动不存在或已结束"
-      icon="/static/soldout-empty.png"
-      showAction
-      actionText="再逛逛"
-      actionUrl="/pages/goods/list"
-    />
+    <s-empty v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== 'seckill'" 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="state.goodsSwiper"
-          dotStyle="tag"
-          imageMode="widthFix"
-          dotCur="bg-mask-40"
-          :seizeHeight="750"
-        />
+        <su-swiper class="ss-m-b-14" isPreview :list="state.goodsSwiper" dotStyle="tag" imageMode="widthFix"
+                   dotCur="bg-mask-40" :seizeHeight="750" />
 
         <!-- 价格+标题 -->
         <view class="title-card ss-m-y-14 ss-m-x-20 ss-p-x-20 ss-p-y-34">
@@ -63,7 +50,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>
 
@@ -72,14 +59,9 @@
           <detail-cell-sku :sku="state.selectedSku" @tap="state.showSelectSku = true" />
         </view>
         <!-- 规格与数量弹框 -->
-        <s-select-seckill-sku
-          v-model="state.goodsInfo"
-          :show="state.showSelectSku"
-          :single-limit-count="activity.singleLimitCount"
-          @buy="onBuy"
-          @change="onSkuChange"
-          @close="state.showSelectSku = false"
-        />
+        <s-select-seckill-sku v-model="state.goodsInfo" :show="state.showSelectSku"
+                              :single-limit-count="activity.singleLimitCount" @buy="onBuy" @change="onSkuChange"
+                              @close="state.showSelectSku = false" />
       </view>
 
       <!-- 评价 -->
@@ -91,36 +73,25 @@
       <detail-tabbar v-model="state.goodsInfo">
         <!-- TODO: 缺货中 已售罄 判断 设计-->
         <view class="buy-box ss-flex ss-col-center ss-p-r-20">
-          <button
-            class="ss-reset-button origin-price-btn ss-flex-col"
-            v-if="state.goodsInfo.marketPrice"
-            @tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })"
-          >
+          <button class="ss-reset-button origin-price-btn ss-flex-col" v-if="state.goodsInfo.marketPrice"
+                  @tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })">
             <view>
               <view class="btn-price">{{ fen2yuan(state.goodsInfo.marketPrice) }}</view>
               <view>原价购买</view>
             </view>
           </button>
           <button v-else class="ss-reset-button origin-price-btn ss-flex-col">
-            <view
-              class="no-original"
-              :class="
+            <view class="no-original" :class="
                 state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED ? '' : ''
-              "
-            >
+              ">
               秒杀价
             </view>
           </button>
-          <button
-            class="ss-reset-button btn-box ss-flex-col"
-            @tap="state.showSelectSku = true"
-            :class="
+          <button class="ss-reset-button btn-box ss-flex-col" @tap="state.showSelectSku = true" :class="
               timeStatusEnum === TimeStatusEnum.STARTED && state.goodsInfo.stock != 0
                 ? 'check-btn-box'
                 : 'disabled-btn-box'
-            "
-            :disabled="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED"
-          >
+            " :disabled="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED">
             <view class="btn-price">{{ fen2yuan(state.goodsInfo.price) }}</view>
             <view v-if="timeStatusEnum === TimeStatusEnum.STARTED">
               <view v-if="state.goodsInfo.stock === 0">已售罄</view>
@@ -135,11 +106,26 @@
 </template>
 
 <script setup>
-  import { reactive, computed, ref } from 'vue';
-  import { onLoad, onPageScroll } from '@dcloudio/uni-app';
+  import {
+    reactive,
+    computed,
+    ref,
+    unref
+  } from 'vue';
+  import {
+    onLoad,
+    onPageScroll
+  } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import { isEmpty, min } from 'lodash-es';
-  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';
@@ -149,7 +135,10 @@
   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 {
+    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');
@@ -186,53 +175,53 @@
         order_type: 'goods',
         buy_type: 'seckill',
         seckillActivityId: activity.value.id,
-        items: [
-          {
-            skuId: sku.id,
-            count: sku.count,
-          },
-        ],
+        items: [{
+          skuId: sku.id,
+          count: sku.count,
+        }, ],
       }),
     });
   }
 
-  // 分享信息 TODO 芋艿：待接入
+  // 分享信息
   const shareInfo = computed(() => {
-    if (isEmpty(activity)) return {};
-    return sheep.$platform.share.getShareInfo(
-      {
-        title: activity.value.name,
-        image: sheep.$url.cdn(state.goodsInfo.picUrl),
-        params: {
-          page: '4',
-          query: activity.value.id,
-        },
+    if (isEmpty(unref(activity))) return {};
+    return sheep.$platform.share.getShareInfo({
+      title: activity.value.name,
+      image: sheep.$url.cdn(state.goodsInfo.picUrl),
+      params: {
+        page: '4',
+        query: activity.value.id,
       },
-      {
-        type: 'goods', // 商品海报
-        title: activity.value.name, // 商品标题
-        image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
-        price: state.goodsInfo.price, // 商品价格
-        marketPrice: state.goodsInfo.marketPrice, // 商品原价
-      },
-    );
+    }, {
+      type: 'goods', // 商品海报
+      title: activity.value.name, // 商品标题
+      image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
+      price: state.goodsInfo.price, // 商品价格
+      marketPrice: state.goodsInfo.marketPrice, // 商品原价
+    }, );
   });
 
   const activity = ref();
   const timeStatusEnum = ref('');
+
   // 查询活动
   const getActivity = async (id) => {
-    const { data } = await SeckillApi.getSeckillActivity(id);
+    const {
+      data
+    } = await SeckillApi.getSeckillActivity(id);
     activity.value = data;
-    timeStatusEnum.value = getTimeStatusEnum(activity.startTime, activity.endTime);
-
+    timeStatusEnum.value = getTimeStatusEnum(activity.value.startTime, activity.value.endTime);
+    state.percent = 100 - data.stock / data.totalStock * 100;
     // 查询商品
     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;
     // 处理轮播图
@@ -283,6 +272,7 @@
   .disabled-btn-box[disabled] {
     background-color: transparent;
   }
+
   .detail-card {
     background-color: $white;
     margin: 14rpx 20rpx;
@@ -373,6 +363,7 @@
       font-size: 26rpx;
       font-weight: 500;
       color: #ffffff;
+
       .countdown-h {
         font-size: 24rpx;
         font-family: OPPOSANS;
@@ -383,6 +374,7 @@
         background: rgba(#000000, 0.1);
         border-radius: 6rpx;
       }
+
       .countdown-num {
         font-size: 24rpx;
         font-family: OPPOSANS;
@@ -466,6 +458,7 @@
       line-height: normal;
       border-radius: 0px 40rpx 40rpx 0px;
     }
+
     .btn-price {
       font-family: OPPOSANS;
 
@@ -483,6 +476,7 @@
       line-height: normal;
       font-size: 24rpx;
       font-weight: 500;
+
       .no-original {
         font-size: 28rpx;
       }
@@ -553,4 +547,4 @@
     width: 100%;
     height: 100%;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/order/addressSelection.vue b/pages/order/addressSelection.vue
new file mode 100644
index 00000000..d041f079
--- /dev/null
+++ b/pages/order/addressSelection.vue
@@ -0,0 +1,263 @@
+<!-- 下单界面，收货地址 or 自提门店的选择组件 -->
+<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')" />
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { computed } from 'vue';
+  import sheep from '@/sheep';
+  import { isEmpty } from 'lodash-es';
+
+  const props = defineProps({
+    modelValue: {
+      type: Object,
+      default() {},
+    }
+  });
+  const emits = defineEmits(['update:modelValue','change']);
+
+  // 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?type=select';
+    if (state.value.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.value.deliveryType === 1){
+        state.value.addressInfo = addressInfo;
+      }
+      if (state.value.deliveryType === 2){
+        state.value.pickUpInfo = addressInfo;
+      }
+      emits('change')
+    }
+  }
+
+  // 收货方式切换
+  const switchDeliveryType = (type) =>{
+    state.value.deliveryType = type;
+    emits('change')
+  }
+</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 94d78d73..260ba1e6 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -1,36 +1,18 @@
 <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 v-model="addressState" @change="getOrderInfo()" />
 
     <!-- 商品信息 -->
     <view class="order-card-box ss-m-b-14">
-      <s-goods-item
-        v-for="item in state.orderInfo.items"
-        :key="item.skuId"
-        :img="item.picUrl"
-        :title="item.spuName"
-        :skuText="item.properties.map((property) => property.valueName).join(' ')"
-        :price="item.price"
-        :num="item.count"
-        marginBottom="10"
-      />
+      <s-goods-item v-for="item in state.orderInfo.items" :key="item.skuId" :img="item.picUrl"
+                    :title="item.spuName" :skuText="item.properties.map((property) => property.valueName).join(' ')"
+                    :price="item.price" :num="item.count" marginBottom="10" />
       <view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
         <view class="item-title">订单备注</view>
         <view class="ss-flex ss-col-center">
-          <uni-easyinput
-            maxlength="20"
-            placeholder="建议留言前先与商家沟通"
-            v-model="state.orderPayload.remark"
-            :inputBorder="false"
-            :clearable="false"
-          />
+          <uni-easyinput maxlength="20" placeholder="建议留言前先与商家沟通" v-model="state.orderPayload.remark"
+                         :inputBorder="false" :clearable="false" />
         </view>
       </view>
     </view>
@@ -46,67 +28,71 @@
             </text>
           </view>
         </view>
-        <!-- TODO 芋艿：接入积分 -->
-        <view
-          class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="state.orderPayload.order_type === 'score'"
-        >
-          <view class="item-title">扣除积分</view>
+        <view class="order-item ss-flex ss-col-center ss-row-between" v-if="state.orderInfo.type === 0">
+          <view class="item-title">积分抵扣</view>
           <view class="ss-flex ss-col-center">
-            <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>
+            {{ 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.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">
+        <!-- 快递配置时，信息的展示 -->
+        <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 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
-        <view
-          class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="state.orderInfo.type === 0"
-        >
+        <view class="order-item ss-flex ss-col-center ss-row-between" v-if="state.orderInfo.type === 0">
           <view class="item-title">优惠券</view>
           <view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
             <text class="item-value text-red" v-if="state.orderPayload.couponId > 0">
               -￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
             </text>
-            <text
-              class="item-value"
-              :class="state.couponInfo.length > 0 ? 'text-red' : 'text-disabled'"
-              v-else
-            >
+            <text class="item-value" :class="couponNumber > 0 ? 'text-red' : 'text-disabled'" v-else>
               {{
-                state.couponInfo.length > 0 ? state.couponInfo.length + ' 张可用' : '暂无可用优惠券'
+                couponNumber > 0 ? couponNumber + ' 张可用' : '暂无可用优惠券'
               }}
             </text>
             <text class="_icon-forward item-icon" />
           </view>
         </view>
-        <view
-          class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="state.orderInfo.price.discountPrice > 0"
-        >
+        <view class="order-item ss-flex ss-col-center ss-row-between"
+              v-if="state.orderInfo.price.discountPrice > 0">
           <view class="item-title">活动优惠</view>
-          <view class="ss-flex ss-col-center">
-            <!--                @tap="state.showDiscount = true" TODO 芋艿：后续要把优惠信息打进去 -->
+          <view class="ss-flex ss-col-center" @tap="state.showDiscount = true">
             <text class="item-value text-red">
               -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
             </text>
             <text class="_icon-forward item-icon" />
           </view>
         </view>
-        <view
-          class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="state.orderInfo.price.vipPrice > 0"
-        >
+        <view class="order-item ss-flex ss-col-center ss-row-between" v-if="state.orderInfo.price.vipPrice > 0">
           <view class="item-title">会员优惠</view>
           <view class="ss-flex ss-col-center">
             <text class="item-value text-red">
@@ -120,24 +106,16 @@
           共{{ 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>
 
     <!-- 选择优惠券弹框 -->
-    <s-coupon-select
-      v-model="state.couponInfo"
-      :show="state.showCoupon"
-      @confirm="onSelectCoupon"
-      @close="state.showCoupon = false"
-    />
+    <s-coupon-select v-model="state.couponInfo" :show="state.showCoupon" @confirm="onSelectCoupon"
+                     @close="state.showCoupon = false" />
 
     <!-- 满额折扣弹框 TODO 芋艿：后续要把优惠信息打进去 -->
-    <s-discount-list
-      v-model="state.orderInfo"
-      :show="state.showDiscount"
-      @close="state.showDiscount = false"
-    />
+    <s-discount-list v-model="state.orderInfo" :show="state.showDiscount" @close="state.showDiscount = false" />
 
     <!-- 底部 -->
     <su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
@@ -147,10 +125,7 @@
             ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
           </view>
         </view>
-        <button
-          class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
-          @tap="onConfirm"
-        >
+        <button class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main" @tap="onConfirm">
           提交订单
         </button>
       </view>
@@ -159,14 +134,20 @@
 </template>
 
 <script setup>
-  import { reactive } from 'vue';
-  import { onLoad } from '@dcloudio/uni-app';
+  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-es';
   import OrderApi from '@/sheep/api/trade/order';
   import CouponApi from '@/sheep/api/promotion/coupon';
-  import { fen2yuan } from '@/sheep/hooks/useGoods';
-  import { WxaSubscribeTemplate } from '@/sheep/util/const';
+  import {
+    fen2yuan
+  } from '@/sheep/hooks/useGoods';
 
   const state = reactive({
     orderPayload: {},
@@ -174,27 +155,30 @@
       items: [], // 商品项列表
       price: {}, // 价格信息
     },
-    addressInfo: {}, // 选择的收货地址
     showCoupon: false, // 是否展示优惠劵
     couponInfo: [], // 优惠劵列表
     showDiscount: false, // 是否展示营销活动
+    // ========== 积分 ==========
+    pointStatus: false, //是否使用积分
   });
 
-  // 选择地址
-  function onSelectAddress() {
-    uni.$once('SELECT_ADDRESS', (e) => {
-      changeConsignee(e.addressInfo);
-    });
-    sheep.$router.go('/pages/user/address/list');
-  }
+  const addressState = ref({
+    addressInfo: {}, // 选择的收货地址
+    deliveryType: 1, // 收货方式 1 - 快递配送；2 - 门店自提
+    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
+    pickUpInfo: {}, // 选择的自提门店信息
+    receiverName: '', // 收件人名称
+    receiverMobile: '', // 收件人手机
+  });
 
-  // 更改收货人地址&计算订单信息
-  async function changeConsignee(addressInfo = {}) {
-    if (!isEmpty(addressInfo)) {
-      state.addressInfo = addressInfo;
-    }
+  // ========== 积分 ==========
+  /**
+   * 使用积分抵扣
+   */
+  const changeIntegral = async () => {
+    state.pointStatus = !state.pointStatus;
     await getOrderInfo();
-  }
+  };
 
   // 选择优惠券
   async function onSelectCoupon(couponId) {
@@ -205,22 +189,46 @@
 
   // 提交订单
   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();
   }
 
   // 创建订单&跳转
   async function submitOrder() {
-    const { code, data } = await OrderApi.createOrder({
+    const {
+      code,
+      data
+    } = await OrderApi.createOrder({
       items: state.orderPayload.items,
       couponId: state.orderPayload.couponId,
       remark: state.orderPayload.remark,
-      addressId: state.addressInfo.id,
-      deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
-      pointStatus: false, // TODO 芋艿：需要支持【积分选择】
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id, //自提门店编号
+      receiverName: addressState.value.receiverName, // 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile, // 选择门店自提时，该字段为联系人手机
+      pointStatus: state.pointStatus,
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
       seckillActivityId: state.orderPayload.seckillActivityId,
@@ -242,29 +250,44 @@
   // 检查库存 & 计算订单价格
   async function getOrderInfo() {
     // 计算价格
-    const { data, code } = await OrderApi.settlementOrder({
+    const {
+      data,
+      code
+    } = await OrderApi.settlementOrder({
       items: state.orderPayload.items,
       couponId: state.orderPayload.couponId,
-      addressId: state.addressInfo.id,
-      deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
-      pointStatus: false, // TODO 芋艿：需要支持【积分选择】
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id, //自提门店编号
+      receiverName: addressState.value.receiverName, // 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile, // 选择门店自提时，该字段为联系人手机
+      pointStatus: state.pointStatus,
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
       seckillActivityId: state.orderPayload.seckillActivityId,
     });
     if (code !== 0) {
+      setTimeout(() => {
+        uni.navigateBack({
+          delta: 1
+        })
+      }, 1500)
       return;
     }
     state.orderInfo = data;
     // 设置收货地址
     if (state.orderInfo.address) {
-      state.addressInfo = state.orderInfo.address;
+      addressState.value.addressInfo = state.orderInfo.address;
     }
   }
 
   // 获取可用优惠券
+  let couponNumber = ref(0)
   async function getCoupons() {
-    const { code, data } = await CouponApi.getMatchCouponList(
+    const {
+      code,
+      data
+    } = await CouponApi.getMatchCouponList(
       state.orderInfo.price.payPrice,
       state.orderInfo.items.map((item) => item.spuId),
       state.orderPayload.items.map((item) => item.skuId),
@@ -272,6 +295,7 @@
     );
     if (code === 0) {
       state.couponInfo = data;
+      couponNumber.value = state.couponInfo.filter(item => item.match).length;
     }
   }
 
@@ -405,4 +429,4 @@
     font-size: 36rpx;
     color: #999999;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/sheep/api/product/spu.js b/sheep/api/product/spu.js
index 3b84c1dc..f15a87c9 100644
--- a/sheep/api/product/spu.js
+++ b/sheep/api/product/spu.js
@@ -13,6 +13,18 @@ const SpuApi = {
       },
     });
   },
+  // 获得商品结算信息
+  getSettlementProduct: (ids) => {
+    return request({
+      url: '/trade/order/settlementProduct',
+      method: 'GET',
+      params: { ids },
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    });
+  },
   // 获得商品 SPU 分页
   getSpuPage: (params) => {
     return request({
diff --git a/sheep/components/s-activity-pop/s-activity-pop.vue b/sheep/components/s-activity-pop/s-activity-pop.vue
index 432dc457..4c000e58 100644
--- a/sheep/components/s-activity-pop/s-activity-pop.vue
+++ b/sheep/components/s-activity-pop/s-activity-pop.vue
@@ -2,22 +2,100 @@
 <template>
   <su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose>
     <view class="model-box">
-      <view class="title ss-m-t-16 ss-m-l-20 ss-flex">营销活动</view>
-      <scroll-view
-        class="model-content ss-m-t-50"
-        scroll-y
-        :scroll-with-animation="false"
-        :enable-back-to-top="true"
-      >
-        <view v-for="item in state.activityInfo" :key="item.id">
-          <view class="ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(item)">
-            <view class="model-content-tag ss-flex ss-row-center">满减</view>
-            <view class="ss-m-l-20 model-content-title ss-flex-1">
-              <view class="ss-m-b-24" v-for="rule in state.activityMap[item.id]?.rules" :key="rule">
-                {{ formatRewardActivityRule(state.activityMap[item.id], rule) }}
+      <view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠</view>
+      <view v-if="state.activityMap[state.activityInfo[0]?.id]?.reduc">
+        <view class="titleLi">促销</view>
+        <scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
+          <view class="actBox">
+            <view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(state.activityInfo[0])">
+              <view class="model-content-tag ss-flex ss-row-center">满减</view>
+              <view class="model-content-title">
+                <view class="contBu">
+                  <text v-for="(item,index) in state.activityMap[state.activityInfo[0]?.id]?.reduc"
+                        :key="index">满{{fen2yuan(item.discountPrice)}}元减{{fen2yuan(item.limit)}}元;</text>
+                </view>
+                <view class="ss-m-b-24 cotBu-txt">
+                  {{formatDateRange(state.activityInfo[0]?.startTime,state.activityInfo[0]?.endTime)}}
+                </view>
+              </view>
+              <text class="cicon-forward" />
+            </view>
+          </view>
+          <view class="actBox">
+            <view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(state.activityInfo[0])">
+              <view class="model-content-tag ss-flex ss-row-center">包邮</view>
+              <view class="model-content-title">
+                <view class="contBu">
+                  <text v-for="(item,index) in state.activityMap[state.activityInfo[0]?.id]?.ship"
+                        :key="index" v-show="item.bull">满{{fen2yuan(item.discountPrice)}}元包邮;</text>
+                </view>
+                <view class="ss-m-b-24 cotBu-txt">
+                  {{formatDateRange(state.activityInfo[0]?.startTime,state.activityInfo[0]?.endTime)}}
+                </view>
+              </view>
+              <text class="cicon-forward" />
+            </view>
+          </view>
+          <view class="actBox">
+            <view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(state.activityInfo[0])">
+              <view class="model-content-tag ss-flex ss-row-center">送积分</view>
+              <view class="model-content-title">
+                <view class="contBu">
+                  <text v-for="(item,index) in state.activityMap[state.activityInfo[0]?.id]?.scor"
+                        :key="index"
+                        v-show="item.bull">满{{fen2yuan(item.discountPrice)}}元送{{item.value}}积分;</text>
+                </view>
+                <view class="ss-m-b-24 cotBu-txt">
+                  {{formatDateRange(state.activityInfo[0]?.startTime,state.activityInfo[0]?.endTime)}}
+                </view>
+              </view>
+              <text class="cicon-forward" />
+            </view>
+          </view>
+          <view class="actBox">
+            <view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(state.activityInfo[0])">
+              <view class="model-content-tag ss-flex ss-row-center">送优惠券</view>
+              <view class="model-content-title">
+                <view class="contBu">
+                  <text v-for="(item,index) in state.activityMap[state.activityInfo[0]?.id]?.cou"
+                        :key="index"
+                        v-show="item.bull">满{{fen2yuan(item.discountPrice)}}元送{{item.value}}张优惠券;</text>
+                </view>
+                <view class="ss-m-b-24 cotBu-txt">
+                  {{formatDateRange(state.activityInfo[0]?.startTime,state.activityInfo[0]?.endTime)}}
+                </view>
+              </view>
+              <text class="cicon-forward" />
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <view class="titleLi">可领优惠券</view>
+      <scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
+        <view class="actBox" v-for="item in state.couponInfo" :key="item.id">
+          <view class="boxCont ss-flex ss-col-top ss-m-b-40">
+            <view class="model-content-tag2">
+              <view class="usePrice">
+                ￥{{fen2yuan(item.discountPrice)}}
+              </view>
+              <view class="impose">
+                满￥{{fen2yuan(item.usePrice)}}可用
               </view>
             </view>
-            <text class="cicon-forward" />
+            <view class="model-content-title2">
+              <view class="contBu">
+                {{item.name}}
+              </view>
+              <view class="ss-m-b-24 cotBu-txt">
+                {{item.validityType==1?formatDateRange(item.validStartTime,item.validEndTime) : '领取后'+item.fixedStartTerm+'-'+item.fixedEndTerm +'天可用'}}
+              </view>
+            </view>
+            <view class="coupon" @click.stop="getBuy(item.id)" v-if="item.canTake">
+              立即领取
+            </view>
+            <view class="coupon2" v-else>
+              已领取
+            </view>
           </view>
         </view>
       </scroll-view>
@@ -26,14 +104,21 @@
 </template>
 <script setup>
   import sheep from '@/sheep';
-  import { computed, reactive, watch } from 'vue';
+  import {
+    computed,
+    reactive,
+    watch
+  } from 'vue';
   import RewardActivityApi from '@/sheep/api/promotion/rewardActivity';
-  import { formatRewardActivityRule } from '@/sheep/hooks/useGoods';
-
+  import {
+    fen2yuan,
+    formatDateRange,
+    handActitList
+  } from '@/sheep/hooks/useGoods';
   const props = defineProps({
     modelValue: {
       type: Object,
-      default() {},
+      default () {},
     },
     show: {
       type: Boolean,
@@ -42,10 +127,10 @@
   });
   const emits = defineEmits(['close']);
   const state = reactive({
-    activityInfo: computed(() => props.modelValue),
-    activityMap: {}
+    activityInfo: computed(() => props.modelValue.activityInfo),
+    activityMap: {},
+    couponInfo: computed(() => props.modelValue.couponInfo)
   });
-
   watch(
     () => props.show,
     () => {
@@ -56,12 +141,16 @@
             if (res.code !== 0) {
               return;
             }
-            state.activityMap[activity.id] = res.data;
+            state.activityMap[activity.id] = handActitList(res.data.rules);
           })
         });
       }
     },
   );
+  // 领取优惠劵
+  const getBuy = (id) => {
+    emits('get', id);
+  };
 
   function onGoodsList(e) {
     sheep.$router.go('/pages/activity/index', {
@@ -72,34 +161,141 @@
 <style lang="scss" scoped>
   .model-box {
     height: 60vh;
+
     .title {
+      justify-content: center;
       font-size: 36rpx;
       height: 80rpx;
       font-weight: bold;
       color: #333333;
     }
   }
+
   .model-content {
+    height: fit-content;
+    max-height: 350rpx;
     padding: 0 20rpx;
     box-sizing: border-box;
+    margin-top: 20rpx;
+
     .model-content-tag {
-      background: rgba(#ff6911, 0.1);
-      font-size: 24rpx;
+      // background: rgba(#ff6911, 0.1);
+      font-size: 35rpx;
       font-weight: 500;
       color: #ff6911;
-      line-height: 42rpx;
-      width: 68rpx;
-      height: 32rpx;
-      border-radius: 5rpx;
+      line-height: 150rpx;
+      width: 200rpx;
+      height: 150rpx;
+      text-align: center;
+
+      // border-radius: 5rpx;
     }
+
     .model-content-title {
+      width: 450rpx;
+      height: 150rpx;
       font-size: 26rpx;
       font-weight: 500;
       color: #333333;
+      overflow: hidden;
     }
+
     .cicon-forward {
       font-size: 28rpx;
       color: #999999;
+      margin: 0 auto;
     }
   }
-</style>
+
+  // 新增的
+  .titleLi {
+    margin: 10rpx 0 10rpx 20rpx;
+    font-size: 26rpx;
+  }
+
+  .actBox {
+    width: 700rpx;
+    height: 150rpx;
+    background-color: #fff2f2;
+    margin: 10rpx auto;
+    border-radius: 10rpx;
+  }
+
+  .boxCont {
+    width: 700rpx;
+    height: 150rpx;
+    align-items: center;
+  }
+
+  .contBu {
+    height: 80rpx;
+    line-height: 80rpx;
+    overflow: hidden;
+    font-size: 30rpx;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
+
+  .cotBu-txt {
+    height: 70rpx;
+    line-height: 70rpx;
+    font-size: 25rpx;
+    color: #999999;
+  }
+
+  .model-content-tag2 {
+    font-size: 35rpx;
+    font-weight: 500;
+    color: #ff6911;
+    width: 200rpx;
+    height: 150rpx;
+    text-align: center;
+  }
+
+  .usePrice {
+    width: 200rpx;
+    height: 90rpx;
+    line-height: 100rpx;
+    // background-color: red;
+  }
+
+  .impose {
+    width: 200rpx;
+    height: 50rpx;
+    // line-height: 75rpx;
+    font-size: 23rpx;
+    // background-color: gold;
+  }
+
+  .model-content-title2 {
+    width: 330rpx;
+    height: 150rpx;
+    font-size: 26rpx;
+    font-weight: 500;
+    color: #333333;
+    overflow: hidden;
+  }
+
+  .coupon {
+    width: 150rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    background-color: rgb(255, 68, 68);
+    color: white;
+    border-radius: 30rpx;
+    text-align: center;
+    font-size: 25rpx;
+  }
+
+  .coupon2 {
+    width: 150rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    background-color: rgb(203, 192, 191);
+    color: white;
+    border-radius: 30rpx;
+    text-align: center;
+    font-size: 25rpx;
+  }
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-discount-list/s-discount-list.vue b/sheep/components/s-discount-list/s-discount-list.vue
index 22fbd43c..25e42dde 100644
--- a/sheep/components/s-discount-list/s-discount-list.vue
+++ b/sheep/components/s-discount-list/s-discount-list.vue
@@ -1,23 +1,12 @@
 <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-38 ss-m-l-20 ss-m-b-40">活动优惠</view>
-      <scroll-view
-        class="model-content ss-m-l-20"
-        scroll-y
-        :scroll-with-animation="false"
-        :enable-back-to-top="true"
-      >
-        <view v-for="(item, index) in state.orderInfo.promo_infos" :key="index">
+      <scroll-view class="model-content ss-m-l-20" scroll-y :scroll-with-animation="false"
+                   :enable-back-to-top="true">
+        <view v-for="(item, index) in state.orderInfo.promotions" :key="index">
           <view class="ss-flex ss-m-b-40 subtitle">
-            <view>共{{ item.goods_ids.length }}件，</view>
+            <!-- <view>共{{ item.goods_ids.length }}件，</view>
             <view v-if="item.activity_type === 'full_discount'">
               满{{ item.discount_rule.full }}打{{ item.discount_rule.discount }}折,已减
             </view>
@@ -25,15 +14,11 @@
             <view v-if="item.activity_type === 'full_reduce'">
               满{{ item.discount_rule.full }}减{{ item.discount_rule.discount }},已减
             </view>
-            <view class="price-text">￥{{ item.promo_discount_money || '0.00' }}</view>
-          </view>
-          <scroll-view class="scroll-box" scroll-x scroll-anchoring>
-            <view class="ss-flex">
-              <view v-for="i in item.goods_ids" :key="i">
-                <image class="content-img" :src="sheep.$url.cdn(getGoodsImg(i))" />
-              </view>
+            <view class="price-text">￥{{ item.promo_discount_money || '0.00' }}</view> -->
+            <view>
+              {{item.description}}
             </view>
-          </scroll-view>
+          </view>
         </view>
       </scroll-view>
     </view>
@@ -43,8 +28,14 @@
   </su-popup>
 </template>
 <script setup>
-  import { computed, reactive } from 'vue';
+  import {
+    computed,
+    reactive
+  } from 'vue';
   import sheep from '@/sheep';
+  import {
+    fen2yuan
+  } from '@/sheep/hooks/useGoods';
   const props = defineProps({
     promoInfo: {
       type: Array,
@@ -56,7 +47,7 @@
     },
     modelValue: {
       type: Object,
-      default() {},
+      default () {},
     },
     show: {
       type: Boolean,
@@ -67,28 +58,31 @@
   const state = reactive({
     orderInfo: computed(() => props.modelValue),
   });
-  const getGoodsImg = (e) => {
-    let goodsImg = '';
-    state.orderInfo.goods_list.forEach((i) => {
-      if (e == i.goods_id) {
-        goodsImg = i.goods.image;
-      }
-    });
-    return goodsImg;
-  };
+  // const getGoodsImg = (e) => {
+  //   let goodsImg = '';
+  //   state.orderInfo.goods_list.forEach((i) => {
+  //     if (e == i.goods_id) {
+  //       goodsImg = i.goods.image;
+  //     }
+  //   });
+  //   return goodsImg;
+  // };
 </script>
 <style lang="scss" scoped>
   .model-box {
     height: 60vh;
   }
+
   .model-content {
     height: 54vh;
   }
+
   .modal-footer {
     width: 100%;
     height: 120rpx;
     background: #fff;
   }
+
   .confirm-btn {
     width: 710rpx;
     margin-left: 20rpx;
@@ -97,18 +91,21 @@
     border-radius: 40rpx;
     color: #fff;
   }
+
   .content-img {
     width: 140rpx;
     height: 140rpx;
     margin-right: 20rpx;
     margin-bottom: 20rpx;
   }
+
   .subtitle {
     font-size: 28rpx;
     font-weight: 500;
     color: #333333;
   }
+
   .price-text {
     color: #ff3000;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-goods-card/s-goods-card.vue b/sheep/components/s-goods-card/s-goods-card.vue
index 59f2bf10..a4d7d9c1 100644
--- a/sheep/components/s-goods-card/s-goods-card.vue
+++ b/sheep/components/s-goods-card/s-goods-card.vue
@@ -135,7 +135,7 @@
   /**
    * 商品卡片
    */
-  import { computed, reactive, onMounted } from 'vue';
+  import { computed, reactive, onMounted, ref } from 'vue';
   import sheep from '@/sheep';
   import SpuApi from '@/sheep/api/product/spu';
 
@@ -227,10 +227,61 @@
     return data;
   }
 
+  //获取结算信息
+  const settleData = ref()
+  async function getSettlementByIds(ids) {
+    const { data } = await SpuApi.getSettlementProduct(ids);
+    return data;
+  }
+
+  //计算展示价格的函数
+  async function enrichDataWithSkus(data, array) {
+    // 创建一个映射，以 id 为键，存储 data 数组中的对象
+    const dataMap = new Map(data.map(item => [item.id, { ...item }]));
+
+    // 遍历 array 数组
+    array.forEach(item => {
+      // 初始化 discountPrice 和 vipPrice 为 null
+      let discountPrice = null;
+      let vipPrice = null;
+      let foundType4 = false;
+      let foundType6 = false;
+
+      // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
+      item.skus.forEach(sku => {
+        if (!foundType4 && sku.type === 4) {
+          discountPrice = sku.price;
+          foundType4 = true;
+        }
+        if (!foundType6 && sku.type === 6) {
+          vipPrice = sku.price;
+          foundType6 = true;
+        }
+
+        // 如果已经找到 type 为 4 和 6 的条目，则不需要继续遍历
+        if (foundType4 && foundType6) {
+          return;
+        }
+      });
+
+      // 更新 dataMap 中对应的对象
+      if (dataMap.has(item.id)) {
+        dataMap.get(item.id).discountPrice = discountPrice;
+        dataMap.get(item.id).vipPrice = vipPrice;
+        dataMap.get(item.id).reward = item.reward;
+      }
+    });
+
+    // 返回更新后的数据数组
+    return Array.from(dataMap.values());
+  }
+
   // 初始化
   onMounted(async () => {
     // 加载商品列表
-    state.goodsList = await getGoodsListByIds(spuIds.join(','));
+    const ms = await getGoodsListByIds(spuIds.join(','));
+    settleData.value = await getSettlementByIds(spuIds.join(','))
+    state.goodsList = await enrichDataWithSkus(ms,settleData.value)
     // 只有双列布局时需要
     if (layoutType === LayoutTypeEnum.TWO_COL){
       // 分列
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 228c64e1..45f3487b 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -2,38 +2,29 @@
 <template>
   <view class="ss-goods-wrap">
     <!-- xs卡片：横向紧凑型，一行放两个，图片左内容右边  -->
-    <view
-      v-if="size === 'xs'"
-      class="xs-goods-card ss-flex ss-col-stretch"
-      :style="[elStyles]"
-      @tap="onClick"
-    >
+    <view v-if="size === 'xs'" class="xs-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @tap="onClick">
       <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>
-      <view
-        v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
-        class="xs-goods-content ss-flex-col ss-row-around"
-      >
-        <view
-          v-if="goodsFields.title?.show || goodsFields.name?.show"
-          class="xs-goods-title ss-line-1"
-          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
-        >
+      <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">
+        <view v-if="goodsFields.title?.show || goodsFields.name?.show" class="xs-goods-title ss-line-1"
+              :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]">
           {{ data.title || data.name }}
         </view>
-        <view
-          v-if="goodsFields.price?.show"
-          class="xs-goods-price font-OPPOSANS"
-          :style="[{ color: goodsFields.price.color }]"
-        >
+        <!-- 这里是新加的会员价和限时优惠 -->
+        <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+          <view class="card" v-if="iconShow">{{iconShow}}</view>
+          <view class="card2" v-if="data.reward">{{data.reward.rewardActivity}}</view>
+        </view>
+        <!-- 这里是新加的会员价和限时优惠结束 -->
+        <view v-if="goodsFields.price?.show" class="xs-goods-price font-OPPOSANS"
+              :style="[{ color: goodsFields.price.color }]">
           <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          <text v-if="iconShow=='限时优惠'">{{fen2yuan(data.discountPrice)}}</text>
+          <text v-else-if="iconShow=='会员价'">{{fen2yuan(data.vipPrice)}}</text>
+          <text v-else>{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}</text>
         </view>
       </view>
     </view>
@@ -43,30 +34,26 @@
       <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 || 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">
           {{ data.title || data.name }}
         </view>
-        <view
-          v-if="goodsFields.price?.show"
-          class="sm-goods-price font-OPPOSANS"
-          :style="[{ color: goodsFields.price.color }]"
-        >
+        <!-- 这里是新加的会员价和限时优惠 -->
+        <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+          <view class="card" v-if="iconShow">{{iconShow}}</view>
+          <view class="card2" v-if="data.reward">{{data.reward.rewardActivity}}</view>
+        </view>
+        <!-- 这里是新加的会员价和限时优惠结束 -->
+        <view v-if="goodsFields.price?.show" class="sm-goods-price font-OPPOSANS"
+              :style="[{ color: goodsFields.price.color }]">
           <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          <text v-if="iconShow=='限时优惠'">{{fen2yuan(data.discountPrice)}}</text>
+          <text v-else-if="iconShow=='会员价'">{{fen2yuan(data.vipPrice)}}</text>
+          <text v-else>{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}</text>
         </view>
       </view>
     </view>
@@ -76,58 +63,43 @@
       <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>
-      <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"
-      >
-        <view
-          v-if="goodsFields.title?.show || goodsFields.name?.show"
-          class="md-goods-title ss-line-1"
-          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
-        >
+      <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">
+        <view v-if="goodsFields.title?.show || goodsFields.name?.show" class="md-goods-title ss-line-1"
+              :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]">
           {{ data.title || data.name }}
         </view>
-        <view
-          v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-          class="md-goods-subtitle ss-m-t-16 ss-line-1"
-          :style="[{ color: subTitleColor, background: subTitleBackground }]"
-        >
+        <view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+              class="md-goods-subtitle ss-m-t-16 ss-line-1"
+              :style="[{ color: subTitleColor, background: subTitleBackground }]">
           {{ data.subtitle || data.introduction }}
         </view>
         <slot name="activity">
           <view v-if="data.promos?.length" class="tag-box ss-flex-wrap ss-flex ss-col-center">
-            <view
-              class="activity-tag ss-m-r-10 ss-m-t-16"
-              v-for="item in data.promos"
-              :key="item.id"
-            >
+            <view class="activity-tag ss-m-r-10 ss-m-t-16" v-for="item in data.promos" :key="item.id">
               {{ item.title }}
             </view>
           </view>
         </slot>
+        <!-- 这里是新加的会员价和限时优惠 -->
+        <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+          <view class="card" v-if="iconShow">{{iconShow}}</view>
+          <view class="card2" v-if="data.reward">{{data.reward.rewardActivity}}</view>
+        </view>
+        <!-- 这里是新加的会员价和限时优惠结束 -->
         <view class="ss-flex ss-col-bottom">
-          <view
-            v-if="goodsFields.price?.show"
-            class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10"
-            :style="[{ color: goodsFields.price.color }]"
-          >
+          <view v-if="goodsFields.price?.show" class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10"
+                :style="[{ color: goodsFields.price.color }]">
             <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+            <text v-if="iconShow=='限时优惠'">{{fen2yuan(data.discountPrice)}}</text>
+            <text v-else-if="iconShow=='会员价'">{{fen2yuan(data.vipPrice)}}</text>
+            <text v-else>{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}</text>
           </view>
 
-          <view
-            v-if="
+          <view 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 }]"
-          >
+            " class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex" :style="[{ color: originPriceColor }]">
             <text class="price-unit ss-font-20">{{ priceUnit }}</text>
             <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
           </view>
@@ -146,12 +118,7 @@
     </view>
 
     <!-- lg卡片：横向型，一行放一个，图片左内容右边  -->
-    <view
-      v-if="size === 'lg'"
-      class="lg-goods-card ss-flex ss-col-stretch"
-      :style="[elStyles]"
-      @tap="onClick"
-    >
+    <view v-if="size === 'lg'" class="lg-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @tap="onClick">
       <view v-if="tagStyle.show" class="tag-icon-box">
         <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
       </view>
@@ -159,25 +126,16 @@
       <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
-            v-if="goodsFields.title?.show || goodsFields.name?.show"
-            class="lg-goods-title ss-line-2"
-            :style="[{ color: titleColor }]"
-          >
+          <view v-if="goodsFields.title?.show || goodsFields.name?.show" class="lg-goods-title ss-line-2"
+                :style="[{ color: titleColor }]">
             {{ data.title || data.name }}
           </view>
-          <view
-            v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-            class="lg-goods-subtitle ss-m-t-10 ss-line-1"
-            :style="[{ color: subTitleColor, background: subTitleBackground }]"
-          >
+          <view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+                class="lg-goods-subtitle ss-m-t-10 ss-line-1"
+                :style="[{ color: subTitleColor, background: subTitleBackground }]">
             {{ data.subtitle || data.introduction }}
           </view>
         </view>
@@ -189,25 +147,27 @@
               </view>
             </view>
           </slot>
+          <!-- 这里是新加的会员价和限时优惠 -->
+          <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+            <view class="card" v-if="iconShow">{{iconShow}}</view>
+            <view class="card2" v-if="data.reward">{{data.reward.rewardActivity}}</view>
+          </view>
+          <!-- 这里是新加的会员价和限时优惠结束 -->
           <view class="ss-flex ss-col-bottom ss-m-t-10">
-            <view
-              v-if="goodsFields.price?.show"
-              class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
-              :style="[{ color: goodsFields.price.color }]"
-            >
+            <view v-if="goodsFields.price?.show"
+                  class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
+                  :style="[{ color: goodsFields.price.color }]">
               <text class="ss-font-24">{{ priceUnit }}</text>
               {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
             </view>
-            <view
-              v-if="
+            <view 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 }]"
-            >
+              " class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS" :style="[{ color: originPriceColor }]">
               <text class="price-unit ss-font-20">{{ priceUnit }}</text>
-              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+              <text v-if="iconShow=='限时优惠'">{{fen2yuan(data.discountPrice)}}</text>
+              <text v-else-if="iconShow=='会员价'">{{fen2yuan(data.vipPrice)}}</text>
+              <text v-else>{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}</text>
             </view>
           </view>
           <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
@@ -227,54 +187,45 @@
         <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>
-          <view
-            v-if="goodsFields.title?.show || goodsFields.name?.show"
-            class="sl-goods-title ss-line-1"
-            :style="[{ color: titleColor }]"
-          >
+          <view v-if="goodsFields.title?.show || goodsFields.name?.show" class="sl-goods-title ss-line-1"
+                :style="[{ color: titleColor }]">
             {{ data.title || data.name }}
           </view>
-          <view
-            v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-            class="sl-goods-subtitle ss-m-t-16"
-            :style="[{ color: subTitleColor, background: subTitleBackground }]"
-          >
+          <view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+                class="sl-goods-subtitle ss-m-t-16"
+                :style="[{ color: subTitleColor, background: subTitleBackground }]">
             {{ data.subtitle || data.introduction }}
           </view>
         </view>
         <view>
           <slot name="activity">
             <view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center ss-flex-wrap">
-              <view
-                class="activity-tag ss-m-r-10 ss-m-t-16"
-                v-for="item in data.promos"
-                :key="item.id"
-              >
+              <view class="activity-tag ss-m-r-10 ss-m-t-16" v-for="item in data.promos" :key="item.id">
                 {{ item.title }}
               </view>
             </view>
           </slot>
+          <!-- 这里是新加的会员价和限时优惠 -->
+          <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+            <view class="card" v-if="iconShow">{{iconShow}}</view>
+            <view class="card2" v-if="data.reward">{{data.reward.rewardActivity}}</view>
+          </view>
+          <!-- 这里是新加的会员价和限时优惠结束 -->
           <view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
             <view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
               <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              <text v-if="iconShow=='限时优惠'">{{fen2yuan(data.discountPrice)}}</text>
+              <text v-else-if="iconShow=='会员价'">{{fen2yuan(data.vipPrice)}}</text>
+              <text v-else>{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}</text>
             </view>
-            <view
-              v-if="
+            <view 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 }]"
-            >
+              " class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex" :style="[{ color: originPriceColor }]">
               <text class="price-unit ss-font-20">{{ priceUnit }}</text>
               <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
             </view>
@@ -285,9 +236,9 @@
         </view>
       </view>
 
-      <slot name="cart"
-        ><view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view></slot
-      >
+      <slot name="cart">
+        <view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view>
+      </slot>
     </view>
   </view>
 </template>
@@ -321,13 +272,26 @@
    * @event {Function()} click 										- 点击卡片
    *
    */
-  import { computed, reactive, getCurrentInstance, onMounted, nextTick } from 'vue';
+  import {
+    computed,
+    reactive,
+    getCurrentInstance,
+    onMounted,
+    nextTick,
+    ref
+  } from 'vue';
   import sheep from '@/sheep';
-  import { fen2yuan, formatSales } from '@/sheep/hooks/useGoods';
-  import { formatStock } from '@/sheep/hooks/useGoods';
+  import {
+    fen2yuan,
+    formatSales
+  } from '@/sheep/hooks/useGoods';
+  import {
+    formatStock
+  } from '@/sheep/hooks/useGoods';
   import goodsCollectVue from '@/pages/user/goods-collect.vue';
-  import { isArray } from 'lodash-es';
-
+  import {
+    isArray
+  } from 'lodash-es';
   // 数据
   const state = reactive({});
 
@@ -335,20 +299,32 @@
   const props = defineProps({
     goodsFields: {
       type: [Array, Object],
-      default() {
+      default () {
         return {
           // 商品价格
-          price: { show: true },
+          price: {
+            show: true
+          },
           // 库存
-          stock: { show: true },
+          stock: {
+            show: true
+          },
           // 商品名称
-          name: { show: true },
+          name: {
+            show: true
+          },
           // 商品介绍
-          introduction: { show: true },
+          introduction: {
+            show: true
+          },
           // 市场价
-          marketPrice: { show: true },
+          marketPrice: {
+            show: true
+          },
           // 销量
-          salesCount: { show: true },
+          salesCount: {
+            show: true
+          },
         };
       },
     },
@@ -417,7 +393,25 @@
       default: false,
     },
   });
+  //判断限时优惠和会员价标签内容暂时导致页面出错，又舍不得丢，等着把新的数据整合到商品信息中，也用起来
+  const iconShow = handle()
 
+  function handle() {
+    if (props.data.discountPrice === null && props.data.vipPrice === null) {
+      // 如果两个值都为 null，则不展示任何内容
+      return '';
+    } else if (props.data.discountPrice === null) {
+      // 如果 discountPrice 为 null，展示 vipPrice
+      return '会员价';
+    } else if (props.data.vipPrice === null) {
+      // 如果 vipPrice 为 null，展示 discountPrice
+      return '限时优惠';
+    } else if (props.data.discountPrice < props.data.vipPrice) {
+      return '限时优惠';
+    } else if (props.data.discountPrice > props.data.vipPrice) {
+      return '会员价';
+    }
+  }
   // 组件样式
   const elStyles = computed(() => {
     return {
@@ -449,12 +443,18 @@
   };
 
   // 获取卡片实时高度
-  const { proxy } = getCurrentInstance();
+  const {
+    proxy
+  } = getCurrentInstance();
   const elId = `sheep_${Math.ceil(Math.random() * 10e5).toString(36)}`;
+
   function getGoodsPriceCardWH() {
     if (props.size === 'md') {
       const view = uni.createSelectorQuery().in(proxy);
-      view.select(`#${elId}`).fields({ size: true, scrollOffset: true });
+      view.select(`#${elId}`).fields({
+        size: true,
+        scrollOffset: true
+      });
       view.exec((data) => {
         let totalHeight = 0;
         const goodsPriceCard = data[0];
@@ -482,11 +482,13 @@
     left: 0;
     top: 0;
     z-index: 2;
+
     .tag-icon {
       width: 72rpx;
       height: 44rpx;
     }
   }
+
   .seckill-tag {
     position: absolute;
     left: 0;
@@ -501,6 +503,7 @@
     color: #ffffff;
     line-height: 32rpx;
   }
+
   .groupon-tag {
     position: absolute;
     left: 0;
@@ -515,14 +518,17 @@
     color: #ffffff;
     line-height: 32rpx;
   }
+
   .goods-img {
     width: 100%;
     height: 100%;
     background-color: #f5f5f5;
   }
+
   .price-unit {
     margin-right: -4px;
   }
+
   .sales-text {
     display: table;
     font-size: 24rpx;
@@ -586,10 +592,12 @@
       width: 100%;
       height: 208rpx;
     }
+
     .sm-goods-content {
       padding: 20rpx 16rpx;
       box-sizing: border-box;
     }
+
     .sm-goods-title {
       font-size: 26rpx;
       color: #333;
@@ -619,6 +627,7 @@
       color: #333;
       width: 100%;
     }
+
     .md-goods-subtitle {
       font-size: 24rpx;
       font-weight: 400;
@@ -669,6 +678,7 @@
       // line-height: 36rpx;
       // width: 410rpx;
     }
+
     .lg-goods-subtitle {
       font-size: 24rpx;
       font-weight: 400;
@@ -695,6 +705,7 @@
       font-size: 24rpx;
       color: #ffffff;
     }
+
     .tag-box {
       width: 100%;
     }
@@ -708,10 +719,12 @@
     z-index: 1;
     width: 100%;
     background-color: $white;
+
     .sl-goods-content {
       padding: 20rpx 20rpx;
       box-sizing: border-box;
     }
+
     .sl-img-box {
       width: 100%;
       height: 360rpx;
@@ -722,6 +735,7 @@
       color: #333;
       font-weight: 500;
     }
+
     .sl-goods-subtitle {
       font-size: 24rpx;
       font-weight: 400;
@@ -748,4 +762,31 @@
       color: #ffffff;
     }
   }
-</style>
+
+  .card {
+    width: fit-content;
+    height: fit-content;
+    padding: 2rpx 10rpx;
+    background-color: red;
+    color: #ffffff;
+    font-size: 24rpx;
+  }
+
+  .card2 {
+    width: fit-content;
+    height: fit-content;
+    padding: 2rpx 10rpx;
+    background-color: rgb(255, 242, 241);
+    color: #ff2621;
+    font-size: 24rpx;
+    margin-left: 5rpx;
+  }
+
+  .iconBox {
+    width: 100%;
+    height: fit-content;
+    margin-top: 10rpx;
+    display: flex;
+    justify-content: flex-start;
+  }
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-select-sku/s-select-sku.vue b/sheep/components/s-select-sku/s-select-sku.vue
index b339d4a1..08e0b287 100644
--- a/sheep/components/s-select-sku/s-select-sku.vue
+++ b/sheep/components/s-select-sku/s-select-sku.vue
@@ -1,34 +1,38 @@
 <template>
-	<!-- 规格弹窗 -->
-	<su-popup :show="show" round="10" @close="emits('close')">
+  <!-- 规格弹窗 -->
+  <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="state.selectedSku.picUrl || goodsInfo.picUrl" mode="aspectFill" />
-				</view>
-				<view class="header-right ss-flex-col ss-row-between ss-flex-1">
-					<view class="goods-title ss-line-2">{{ goodsInfo.name }}</view>
-					<view class="header-right-bottom ss-flex ss-col-center ss-row-between">
-						<view class="ss-flex">
-							<view class="price-text">
-								{{ fen2yuan( state.selectedSku.price || goodsInfo.price) }}
-							</view>
-						</view>
-						<view class="stock-text ss-m-l-20">
-							{{ formatStock('exact', state.selectedSku.stock || goodsInfo.stock) }}
-						</view>
-					</view>
-				</view>
-			</view>
+    <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="state.selectedSku.picUrl || goodsInfo.picUrl" mode="aspectFill" />
+        </view>
+        <view class="header-right ss-flex-col ss-row-between ss-flex-1">
+          <view class="goods-title ss-line-2">{{ goodsInfo.name }}</view>
+          <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
+            <view class="ss-flex">
+              <view class="price-text">
+                {{ fen2yuan( state.selectedSku.price || goodsInfo.price) }}
+                <text v-if="state.selectedSku.type == 6"><text class="iconBox">会员价</text><text
+                  class="origin-price-text">{{fen2yuan(state.selectedSku.oldPrice)}}</text></text>
+                <text v-if="state.selectedSku.type == 4"><text class="iconBox">限时优惠</text><text
+                  class="origin-price-text">{{fen2yuan(state.selectedSku.oldPrice)}}</text></text>
+              </view>
+            </view>
+            <view class="stock-text ss-m-l-20">
+              {{ formatStock('exact', state.selectedSku.stock || goodsInfo.stock) }}
+            </view>
+          </view>
+        </view>
+      </view>
 
       <!-- 属性选择 -->
-			<view class="modal-content ss-flex-1">
-				<scroll-view scroll-y="true" class="modal-content-scroll" @touchmove.stop>
-					<view class="sku-item ss-m-b-20" v-for="property in propertyList" :key="property.id">
-						<view class="label-text ss-m-b-20">{{ property.name }}</view>
-						<view class="ss-flex ss-col-center ss-flex-wrap">
-							<button class="ss-reset-button spec-btn" v-for="value in property.values" :class="[
+      <view class="modal-content ss-flex-1">
+        <scroll-view scroll-y="true" class="modal-content-scroll" @touchmove.stop>
+          <view class="sku-item ss-m-b-20" v-for="property in propertyList" :key="property.id">
+            <view class="label-text ss-m-b-20">{{ property.name }}</view>
+            <view class="ss-flex ss-col-center ss-flex-wrap">
+              <button class="ss-reset-button spec-btn" v-for="value in property.values" :class="[
                   {
                     'ui-BG-Main-Gradient': state.currentPropertyArray[property.id] === value.id,
                   },
@@ -36,71 +40,78 @@
                     'disabled-btn': value.disabled === true,
                   },
                 ]" :key="value.id" :disabled="value.disabled === true" @tap="onSelectSku(property.id, value.id)">
-								{{ value.name }}
-							</button>
-						</view>
-					</view>
-					<view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40">
-						<view class="label-text">购买数量</view>
-						<su-number-box :min="1" :max="state.selectedSku.stock" :step="1"
+                {{ value.name }}
+              </button>
+            </view>
+          </view>
+          <view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40">
+            <view class="label-text">购买数量</view>
+            <su-number-box :min="1" :max="state.selectedSku.stock" :step="1"
                            v-model="state.selectedSku.goods_num" @change="onNumberChange($event)" />
-					</view>
-				</scroll-view>
-			</view>
+          </view>
+        </scroll-view>
+      </view>
 
       <!-- 操作区 -->
-			<view class="modal-footer border-top">
-				<view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center">
-					<button class="ss-reset-button add-btn ui-Shadow-Main" @tap="onAddCart">加入购物车</button>
-					<button class="ss-reset-button buy-btn ui-Shadow-Main" @tap="onBuy">立即购买</button>
-				</view>
-			</view>
-		</view>
-	</su-popup>
+      <view class="modal-footer border-top">
+        <view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center">
+          <button class="ss-reset-button add-btn ui-Shadow-Main" @tap="onAddCart">加入购物车</button>
+          <button class="ss-reset-button buy-btn ui-Shadow-Main" @tap="onBuy">立即购买</button>
+        </view>
+      </view>
+    </view>
+  </su-popup>
 </template>
 
 <script setup>
-	import { computed, reactive, watch } from 'vue';
-	import sheep from '@/sheep';
-  import { formatStock, convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
+  import {
+    computed,
+    reactive,
+    watch
+  } from 'vue';
+  import sheep from '@/sheep';
+  import {
+    formatStock,
+    convertProductPropertyList,
+    fen2yuan
+  } from '@/sheep/hooks/useGoods';
 
-	const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
-	const props = defineProps({
-		goodsInfo: {
-			type: Object,
-			default () {},
-		},
-		show: {
-			type: Boolean,
-			default: false,
-		}
-	});
+  const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
+  const props = defineProps({
+    goodsInfo: {
+      type: Object,
+      default () {},
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    }
+  });
 
-	const state = reactive({
-		selectedSku: {}, // 选中的 SKU
-		currentPropertyArray: [], // 当前选中的属性，实际是个 Map。key 是 property 编号，value 是 value 编号
-	});
+  const state = reactive({
+    selectedSku: {}, // 选中的 SKU
+    currentPropertyArray: [], // 当前选中的属性，实际是个 Map。key 是 property 编号，value 是 value 编号
+  });
 
-	const propertyList = convertProductPropertyList(props.goodsInfo.skus);
-
-	// SKU 列表
-	const skuList = computed(() => {
-		let skuPrices = props.goodsInfo.skus;
+  const propertyList = convertProductPropertyList(props.goodsInfo.skus);
+  // SKU 列表
+  const skuList = computed(() => {
+    let skuPrices = props.goodsInfo.skus;
     for (let price of skuPrices) {
       price.value_id_array = price.properties.map((item) => item.valueId)
     }
-		return skuPrices;
-	});
+    return skuPrices;
+  });
 
-	watch(
-		() => state.selectedSku,
-		(newVal) => {
-			emits('change', newVal);
-		}, {
-			immediate: true, // 立即执行
-			deep: true, // 深度监听
-		},
-	);
+  watch(
+    () => state.selectedSku,
+    (newVal) => {
+      emits('change', newVal);
+    }, {
+      immediate: true, // 立即执行
+      deep: true, // 深度监听
+    },
+  );
 
   // 输入框改变数量
   function onNumberChange(e) {
@@ -110,21 +121,21 @@
   }
 
   // 加入购物车
-	function onAddCart() {
-		if (state.selectedSku.id <= 0) {
+  function onAddCart() {
+    if (state.selectedSku.id <= 0) {
       sheep.$helper.toast('请选择规格');
       return;
-		}
+    }
     if (state.selectedSku.stock <= 0) {
       sheep.$helper.toast('库存不足');
       return;
     }
 
     emits('addCart', state.selectedSku);
-	}
+  }
 
   // 立即购买
-	function onBuy() {
+  function onBuy() {
     if (state.selectedSku.id <= 0) {
       sheep.$helper.toast('请选择规格');
       return;
@@ -134,273 +145,296 @@
       return;
     }
     emits('buy', state.selectedSku);
-	}
+  }
 
-	// 改变禁用状态：计算每个 property 属性值的按钮，是否禁用
-	function changeDisabled(isChecked = false, propertyId = 0, valueId = 0) {
+  // 改变禁用状态：计算每个 property 属性值的按钮，是否禁用
+  function changeDisabled(isChecked = false, propertyId = 0, valueId = 0) {
     let newSkus = []; // 所有可以选择的 sku 数组
-		if (isChecked) {
-			// 情况一：选中 property
-			// 获得当前点击选中 property 的、所有可用 SKU
-			for (let price of skuList.value) {
-				if (price.stock <= 0) {
-					continue;
-				}
-				if (price.value_id_array.indexOf(valueId) >= 0) {
-					newSkus.push(price);
-				}
-			}
-		} else {
-			// 情况二：取消选中 property
-			// 当前所选 property 下，所有可以选择的 SKU
-			newSkus = getCanUseSkuList();
-		}
+    if (isChecked) {
+      // 情况一：选中 property
+      // 获得当前点击选中 property 的、所有可用 SKU
+      for (let price of skuList.value) {
+        if (price.stock <= 0) {
+          continue;
+        }
+        if (price.value_id_array.indexOf(valueId) >= 0) {
+          newSkus.push(price);
+        }
+      }
+    } else {
+      // 情况二：取消选中 property
+      // 当前所选 property 下，所有可以选择的 SKU
+      newSkus = getCanUseSkuList();
+    }
 
-		// 所有存在并且有库存未选择的 SKU 的 value 属性值 id
-		let noChooseValueIds = [];
-		for (let price of newSkus) {
-			noChooseValueIds = noChooseValueIds.concat(price.value_id_array);
-		}
-		noChooseValueIds = Array.from(new Set(noChooseValueIds)); // 去重
+    // 所有存在并且有库存未选择的 SKU 的 value 属性值 id
+    let noChooseValueIds = [];
+    for (let price of newSkus) {
+      noChooseValueIds = noChooseValueIds.concat(price.value_id_array);
+    }
+    noChooseValueIds = Array.from(new Set(noChooseValueIds)); // 去重
 
-		if (isChecked) {
-			// 去除当前选中的 value 属性值 id
-			let index = noChooseValueIds.indexOf(valueId);
-			noChooseValueIds.splice(index, 1);
-		} else {
-			// 循环去除当前已选择的 value 属性值 id
-			state.currentPropertyArray.forEach((currentPropertyId) => {
-				if (currentPropertyId.toString() !== '') {
+    if (isChecked) {
+      // 去除当前选中的 value 属性值 id
+      let index = noChooseValueIds.indexOf(valueId);
+      noChooseValueIds.splice(index, 1);
+    } else {
+      // 循环去除当前已选择的 value 属性值 id
+      state.currentPropertyArray.forEach((currentPropertyId) => {
+        if (currentPropertyId.toString() !== '') {
           return;
-				}
+        }
         // currentPropertyId 为空是反选 填充的
         let index = noChooseValueIds.indexOf(currentPropertyId);
         if (index >= 0) {
           // currentPropertyId 存在于 noChooseValueIds
           noChooseValueIds.splice(index, 1);
         }
-			});
-		}
+      });
+    }
 
     // 当前已选择的 property 数组
-		let choosePropertyIds = [];
-		if (!isChecked) {
-			// 当前已选择的 property
-			state.currentPropertyArray.forEach((currentPropertyId, currentValueId) => {
-				if (currentPropertyId !== '') {
-					// currentPropertyId 为空是反选 填充的
-					choosePropertyIds.push(currentValueId);
-				}
-			});
-		} else {
-			// 当前点击选择的 property
-			choosePropertyIds = [propertyId];
-		}
+    let choosePropertyIds = [];
+    if (!isChecked) {
+      // 当前已选择的 property
+      state.currentPropertyArray.forEach((currentPropertyId, currentValueId) => {
+        if (currentPropertyId !== '') {
+          // currentPropertyId 为空是反选 填充的
+          choosePropertyIds.push(currentValueId);
+        }
+      });
+    } else {
+      // 当前点击选择的 property
+      choosePropertyIds = [propertyId];
+    }
 
     for (let propertyIndex in propertyList) {
-			// 当前点击的 property、或者取消选择时候，已选中的 property 不进行处理
-			if (choosePropertyIds.indexOf(propertyList[propertyIndex]['id']) >= 0) {
-				continue;
-			}
+      // 当前点击的 property、或者取消选择时候，已选中的 property 不进行处理
+      if (choosePropertyIds.indexOf(propertyList[propertyIndex]['id']) >= 0) {
+        continue;
+      }
       // 如果当前 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 不禁用
-			}
-		}
-	}
+        propertyList[propertyIndex]['values'][valueIndex]['disabled'] =
+          noChooseValueIds.indexOf(propertyList[propertyIndex]['values'][valueIndex]['id']) <
+          0; // true 禁用 or false 不禁用
+      }
+    }
+  }
 
-	// 当前所选属性下，获取所有有库存的 SKU 们
-	function getCanUseSkuList() {
-		let newSkus = [];
-		for (let sku of skuList.value) {
-			if (sku.stock <= 0) {
-				continue;
-			}
+  // 当前所选属性下，获取所有有库存的 SKU 们
+  function getCanUseSkuList() {
+    let newSkus = [];
+    for (let sku of skuList.value) {
+      if (sku.stock <= 0) {
+        continue;
+      }
       let isOk = true;
       state.currentPropertyArray.forEach((propertyId) => {
-				// propertyId 不为空，并且，这个 条 sku 没有被选中，则排除
-				if (propertyId.toString() !== '' && sku.value_id_array.indexOf(propertyId) < 0) {
-					isOk = false;
-				}
-			});
-			if (isOk) {
-				newSkus.push(sku);
-			}
-		}
-		return newSkus;
-	}
+        // propertyId 不为空，并且，这个 条 sku 没有被选中，则排除
+        if (propertyId.toString() !== '' && sku.value_id_array.indexOf(propertyId) < 0) {
+          isOk = false;
+        }
+      });
+      if (isOk) {
+        newSkus.push(sku);
+      }
+    }
+    return newSkus;
+  }
 
-	// 选择规格
-	function onSelectSku(propertyId, valueId) {
-		// 清空已选择
-		let isChecked = true; // 选中 or 取消选中
-		if (state.currentPropertyArray[propertyId] !== undefined && state.currentPropertyArray[propertyId] === valueId) {
-			// 点击已被选中的，删除并填充 ''
-			isChecked = false;
-			state.currentPropertyArray.splice(propertyId, 1, '');
-		} else {
-			// 选中
-			state.currentPropertyArray[propertyId] = valueId;
-		}
+  // 选择规格
+  function onSelectSku(propertyId, valueId) {
+    // 清空已选择
+    let isChecked = true; // 选中 or 取消选中
+    if (state.currentPropertyArray[propertyId] !== undefined && state.currentPropertyArray[propertyId] === valueId) {
+      // 点击已被选中的，删除并填充 ''
+      isChecked = false;
+      state.currentPropertyArray.splice(propertyId, 1, '');
+    } else {
+      // 选中
+      state.currentPropertyArray[propertyId] = valueId;
+    }
 
     // 选中的 property 大类
-		let choosePropertyId = [];
-		state.currentPropertyArray.forEach((currentPropertyId) => {
-			if (currentPropertyId !== '') {
-				// currentPropertyId 为空是反选 填充的
-				choosePropertyId.push(currentPropertyId);
-			}
-		});
+    let choosePropertyId = [];
+    state.currentPropertyArray.forEach((currentPropertyId) => {
+      if (currentPropertyId !== '') {
+        // currentPropertyId 为空是反选 填充的
+        choosePropertyId.push(currentPropertyId);
+      }
+    });
 
-		// 当前所选 property 下，所有可以选择的 SKU 们
-		let newSkuList = getCanUseSkuList();
+    // 当前所选 property 下，所有可以选择的 SKU 们
+    let newSkuList = getCanUseSkuList();
 
-		// 判断所有 property 大类是否选择完成
-		if (choosePropertyId.length === propertyList.length && newSkuList.length) {
-			newSkuList[0].goods_num = state.selectedSku.goods_num || 1;
-			state.selectedSku = newSkuList[0];
-		} else {
-			state.selectedSku = {};
-		}
+    // 判断所有 property 大类是否选择完成
+    if (choosePropertyId.length === propertyList.length && newSkuList.length) {
+      newSkuList[0].goods_num = state.selectedSku.goods_num || 1;
+      state.selectedSku = newSkuList[0];
+    } else {
+      state.selectedSku = {};
+    }
 
-		// 改变 property 禁用状态
-		changeDisabled(isChecked, propertyId, valueId);
-	}
+    // 改变 property 禁用状态
+    changeDisabled(isChecked, propertyId, valueId);
+  }
 
-	changeDisabled(false);
+  changeDisabled(false);
   // TODO 芋艿：待讨论的优化点：1）单规格，要不要默认选中；2）默认要不要选中第一个规格
 </script>
 
 <style lang="scss" scoped>
-	// 购买
-	.buy-box {
-		padding: 10rpx 0;
+  // 购买
+  .buy-box {
+    padding: 10rpx 0;
 
-		.add-btn {
-			width: 356rpx;
-			height: 80rpx;
-			border-radius: 40rpx 0 0 40rpx;
-			background-color: var(--ui-BG-Main-light);
-			color: var(--ui-BG-Main);
-		}
+    .add-btn {
+      width: 356rpx;
+      height: 80rpx;
+      border-radius: 40rpx 0 0 40rpx;
+      background-color: var(--ui-BG-Main-light);
+      color: var(--ui-BG-Main);
+    }
 
-		.buy-btn {
-			width: 356rpx;
-			height: 80rpx;
-			border-radius: 0 40rpx 40rpx 0;
-			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-			color: #fff;
-		}
+    .buy-btn {
+      width: 356rpx;
+      height: 80rpx;
+      border-radius: 0 40rpx 40rpx 0;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: #fff;
+    }
 
-		.score-btn {
-			width: 100%;
-			margin: 0 20rpx;
-			height: 80rpx;
-			border-radius: 40rpx;
-			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-			color: #fff;
-		}
-	}
+    .score-btn {
+      width: 100%;
+      margin: 0 20rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: #fff;
+    }
+  }
 
-	.ss-modal-box {
-		border-radius: 30rpx 30rpx 0 0;
-		max-height: 1000rpx;
+  .ss-modal-box {
+    border-radius: 30rpx 30rpx 0 0;
+    max-height: 1000rpx;
 
-		.modal-header {
-			position: relative;
-			padding: 80rpx 20rpx 40rpx;
+    .modal-header {
+      position: relative;
+      padding: 80rpx 20rpx 40rpx;
 
-			.sku-image {
-				width: 160rpx;
-				height: 160rpx;
-				border-radius: 10rpx;
-			}
+      .sku-image {
+        width: 160rpx;
+        height: 160rpx;
+        border-radius: 10rpx;
+      }
 
-			.header-right {
-				height: 160rpx;
-			}
+      .header-right {
+        height: 160rpx;
+      }
 
-			.close-icon {
-				position: absolute;
-				top: 10rpx;
-				right: 20rpx;
-				font-size: 46rpx;
-				opacity: 0.2;
-			}
+      .close-icon {
+        position: absolute;
+        top: 10rpx;
+        right: 20rpx;
+        font-size: 46rpx;
+        opacity: 0.2;
+      }
 
-			.goods-title {
-				font-size: 28rpx;
-				font-weight: 500;
-				line-height: 42rpx;
-			}
+      .goods-title {
+        font-size: 28rpx;
+        font-weight: 500;
+        line-height: 42rpx;
+      }
 
-			.score-img {
-				width: 36rpx;
-				height: 36rpx;
-				margin: 0 4rpx;
-			}
+      .score-img {
+        width: 36rpx;
+        height: 36rpx;
+        margin: 0 4rpx;
+      }
 
-			.score-text {
-				font-size: 30rpx;
-				font-weight: 500;
-				color: $red;
-				font-family: OPPOSANS;
-			}
+      .score-text {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: $red;
+        font-family: OPPOSANS;
+      }
 
-			.price-text {
-				font-size: 30rpx;
-				font-weight: 500;
-				color: $red;
-				font-family: OPPOSANS;
+      .price-text {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: $red;
+        font-family: OPPOSANS;
 
-				&::before {
-					content: '￥';
-					font-size: 30rpx;
-					font-weight: 500;
-					color: $red;
-				}
-			}
+        &::before {
+          content: '￥';
+          font-size: 30rpx;
+          font-weight: 500;
+          color: $red;
+        }
+      }
 
-			.stock-text {
-				font-size: 26rpx;
-				color: #999999;
-			}
-		}
+      .stock-text {
+        font-size: 26rpx;
+        color: #999999;
+      }
+    }
 
-		.modal-content {
-			padding: 0 20rpx;
+    .modal-content {
+      padding: 0 20rpx;
 
-			.modal-content-scroll {
-				max-height: 600rpx;
+      .modal-content-scroll {
+        max-height: 600rpx;
 
-				.label-text {
-					font-size: 26rpx;
-					font-weight: 500;
-				}
+        .label-text {
+          font-size: 26rpx;
+          font-weight: 500;
+        }
 
-				.buy-num-box {
-					height: 100rpx;
-				}
+        .buy-num-box {
+          height: 100rpx;
+        }
 
-				.spec-btn {
-					height: 60rpx;
-					min-width: 100rpx;
-					padding: 0 30rpx;
-					background: #f4f4f4;
-					border-radius: 30rpx;
-					color: #434343;
-					font-size: 26rpx;
-					margin-right: 10rpx;
-					margin-bottom: 10rpx;
-				}
+        .spec-btn {
+          height: 60rpx;
+          min-width: 100rpx;
+          padding: 0 30rpx;
+          background: #f4f4f4;
+          border-radius: 30rpx;
+          color: #434343;
+          font-size: 26rpx;
+          margin-right: 10rpx;
+          margin-bottom: 10rpx;
+        }
 
-				.disabled-btn {
-					font-weight: 400;
-					color: #c6c6c6;
-					background: #f8f8f8;
-				}
-			}
-		}
-	}
+        .disabled-btn {
+          font-weight: 400;
+          color: #c6c6c6;
+          background: #f8f8f8;
+        }
+      }
+    }
+  }
+
+  .iconBox {
+    width: fit-content;
+    height: fit-content;
+    padding: 2rpx 10rpx;
+    background-color: rgb(255, 242, 241);
+    color: #ff2621;
+    font-size: 24rpx;
+    margin-left: 5rpx;
+  }
+
+  .origin-price-text {
+    font-size: 26rpx;
+    font-weight: 400;
+    text-decoration: line-through;
+    color: $gray-c;
+    font-family: OPPOSANS;
+
+    &::before {
+      content: '￥';
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index 56274470..86caeb7c 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -1,7 +1,11 @@
-import { ref } from 'vue';
+import {
+  ref
+} from 'vue';
 import dayjs from 'dayjs';
 import $url from '@/sheep/url';
-import { formatDate } from '@/sheep/util';
+import {
+  formatDate
+} from '@/sheep/util';
 
 /**
  * 格式化销量
@@ -80,7 +84,10 @@ export function formatGoodsSwiper(urlList) {
     const isVideo = VIDEO_SUFFIX_LIST.some(suffix => url.includes(suffix));
     const type = isVideo ? 'video' : 'image'
     const src = $url.cdn(url);
-    return { type, src }
+    return {
+      type,
+      src
+    }
   }) || [];
 }
 
@@ -94,9 +101,9 @@ export function formatOrderColor(order) {
   if (order.status === 0) {
     return 'info-color';
   }
-  if (order.status === 10
-    || order.status === 20
-    || (order.status === 30 && !order.commentStatus)) {
+  if (order.status === 10 ||
+    order.status === 20 ||
+    (order.status === 30 && !order.commentStatus)) {
     return 'warning-color';
   }
   if (order.status === 30 && order.commentStatus) {
@@ -387,3 +394,92 @@ export function formatRewardActivityRule(activity, rule) {
   }
   return '';
 }
+// 新增将时间搓转换为开始时间-结束时间的格式
+export function formatDateRange(startTimestamp, endTimestamp) {
+  // 定义一个辅助函数来格式化时间戳为 YYYY.MM.DD 格式
+  const formatDate = (timestamp) => {
+    const date = new Date(timestamp);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要+1
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}.${month}.${day}`;
+  };
+
+  // 格式化开始和结束时间
+  const start = formatDate(startTimestamp);
+  const end = formatDate(endTimestamp);
+
+  // 返回格式化的日期范围
+  return `${start}-${end}`;
+}
+
+//处理活动信息
+export function handList(orders) {
+  const typeMap = {
+    '1': '秒杀活动',
+    '2': '砍价活动',
+    '3': '拼团活动',
+    '4': '限时折扣',
+    '5': '满减送',
+    '6': '会员折扣',
+    '7': '优惠券',
+    '8': '积分'
+  };
+
+  // 给每个订单对象添加 typeName 属性
+  let updatedOrders = orders.map(order => {
+    return {
+      ...order, // 展开现有的订单对象属性
+      typeName: typeMap[order.type] // 添加 typeName 属性
+    };
+  });
+  return updatedOrders
+};
+//根据skuid来修改价格并添加时间
+export function handListPrice(array,array2) {
+  // 将 array2 转换为一个以 skuId 为键的对象，以便于快速查找
+  const array2Map = array2.reduce((acc, item) => {
+    acc[item.skuId] = { price: item.price, type: item.type,endTime:item.endTime };
+    return acc;
+  }, {});
+
+  // 遍历 array 数组并更新 price 和 type
+  array.forEach(item => {
+    if (array2Map[item.id]) {
+      item.oldPrice = item.price
+      // 如果在 array2Map 中找到了对应的 skuId（即 id）
+      item.price = array2Map[item.id].price;
+      item.type = array2Map[item.id].type;
+      item.endTime = array2Map[item.id].endTime;
+    }
+  });
+
+  // 返回更新后的 array
+  return array;
+};
+
+//处理活动数据
+export function handActitList(rules) {
+  const rules2 = {
+    reduc: rules.map(item => ({
+      discountPrice: item.discountPrice,
+      limit: item.limit,
+      bull: true // 默认为 true
+    })),
+    cou: rules.map(item => ({
+      discountPrice: item.discountPrice,
+      value: item.couponCounts.reduce((acc, count) => acc + count, 0), // 计算 couponCounts 中各项之和
+      bull: item.givePoint // 对应 givePoint
+    })),
+    ship: rules.map(item => ({
+      discountPrice: item.discountPrice,
+      bull: item.freeDelivery // 对应 freeDelivery
+    })),
+    scor: rules.map(item => ({
+      discountPrice: item.discountPrice,
+      value: item.point, // 直接使用 point
+      bull: item.givePoint // 对应 givePoint
+    }))
+  };
+  return rules2
+};
\ No newline at end of file
diff --git a/static/images/dis.png b/static/images/dis.png
new file mode 100644
index 0000000000000000000000000000000000000000..5deb35c29e961f5c05642b875ec2368a85f67fe5
GIT binary patch
literal 16936
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

literal 0
HcmV?d00001


From e93322959eaad784130c854f543858324b2c7bd9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 16 Sep 2024 08:15:54 +0800
Subject: [PATCH 02/19] =?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=B7=AE=E6=BB=A1=E5=87=8F=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=96=EF=BC=8Cfrom=20=E5=B2=B3=E7=90=B3?=
 =?UTF-8?q?=E7=BA=A2=20https://gitee.com/yudaocode/yudao-mall-uniapp/commi?=
 =?UTF-8?q?t/26a18e7e9a78af4ec49f0d07785a0aead22b00cc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/seckill/list.vue | 212 ++++++++++++++++++--------------
 1 file changed, 123 insertions(+), 89 deletions(-)

diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue
index a6a07d14..8d3e371a 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -2,11 +2,21 @@
 <template>
   <s-layout navbar="inner" :bgStyle="{ color: 'rgb(245,28,19)' }">
     <!--顶部背景图-->
-    <view class="page-bg" :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]"></view>
+    <view
+      class="page-bg"
+      :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]"
+    ></view>
     <!-- 时间段轮播图 -->
     <view class="header" v-if="activeTimeConfig?.sliderPicUrls?.length > 0">
-      <swiper indicator-dots="true" autoplay="true" :circular="true" interval="3000" duration="1500"
-              indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
+      <swiper
+        indicator-dots="true"
+        autoplay="true"
+        :circular="true"
+        interval="3000"
+        duration="1500"
+        indicator-color="rgba(255,255,255,0.6)"
+        indicator-active-color="#fff"
+      >
         <block v-for="(picUrl, index) in activeTimeConfig.sliderPicUrls" :key="index">
           <swiper-item class="borRadius14">
             <image :src="picUrl" class="slide-image borRadius14" lazy-load />
@@ -19,12 +29,24 @@
       <!-- 左侧图标 -->
       <view class="time-icon">
         <!-- TODO 芋艿：图片统一维护 -->
-        <image class="ss-w-100 ss-h-100" src="http://mall.yudao.iocoder.cn/static/images/priceTag.png" />
+        <image
+          class="ss-w-100 ss-h-100"
+          src="http://mall.yudao.iocoder.cn/static/images/priceTag.png"
+        />
       </view>
-      <scroll-view class="time-list" :scroll-into-view="activeTimeElId" scroll-x scroll-with-animation>
-        <view v-for="(config, index) in timeConfigList" :key="index"
-              :class="['item', { active: activeTimeIndex === index}]" :id="`timeItem${index}`"
-              @tap="handleChangeTimeConfig(index,config.id)">
+      <scroll-view
+        class="time-list"
+        :scroll-into-view="activeTimeElId"
+        scroll-x
+        scroll-with-animation
+      >
+        <view
+          v-for="(config, index) in timeConfigList"
+          :key="index"
+          :class="['item', { active: activeTimeIndex === index }]"
+          :id="`timeItem${index}`"
+          @tap="handleChangeTimeConfig(index, config.id)"
+        >
           <!-- 活动起始时间 -->
           <view class="time">{{ config.startTime }}</view>
           <!-- 活动状态 -->
@@ -38,7 +60,10 @@
       <!-- 活动倒计时 -->
       <view class="content-header ss-flex-col ss-col-center ss-row-center">
         <view class="content-header-box ss-flex ss-row-center">
-          <view class="countdown-box ss-flex" v-if="activeTimeConfig?.status === TimeStatusEnum.STARTED">
+          <view
+            class="countdown-box ss-flex"
+            v-if="activeTimeConfig?.status === TimeStatusEnum.STARTED"
+          >
             <view class="countdown-title ss-m-r-12">距结束</view>
             <view class="ss-flex countdown-time">
               <view class="ss-flex countdown-h">{{ countDown.h }}</view>
@@ -53,148 +78,157 @@
       </view>
 
       <!-- 活动列表 -->
-      <scroll-view class="scroll-box" :style="{ height: pageHeight + 'rpx' }" scroll-y="true"
-                   :scroll-with-animation="false" :enable-back-to-top="true">
+      <scroll-view
+        class="scroll-box"
+        :style="{ height: pageHeight + 'rpx' }"
+        scroll-y="true"
+        :scroll-with-animation="false"
+        :enable-back-to-top="true"
+      >
         <view class="goods-box ss-m-b-20" v-for="activity in activityList" :key="activity.id">
-          <s-goods-column size="lg" :data="{ ...activity, price: activity.seckillPrice }"
-                          :goodsFields="goodsFields" :seckillTag="true">
+          <s-goods-column
+            size="lg"
+            :data="{ ...activity, price: activity.seckillPrice }"
+            :goodsFields="goodsFields"
+            :seckillTag="true"
+          >
             <!-- 抢购进度 -->
             <template #activity>
-              <view class="limit">限量 <text class="ss-m-l-5">{{ activity.stock}}
-                {{activity.unitName}}</text></view>
+              <view class="limit">
+                限量
+                <text class="ss-m-l-5">{{ activity.stock }} {{ activity.unitName }}</text>
+              </view>
               <su-progress :percentage="activity.percent" strokeWidth="10" textInside isAnimate />
             </template>
             <!-- 抢购按钮 -->
             <template #cart>
               <button
-                :class="['ss-reset-button cart-btn', { disabled: activeTimeConfig?.status === TimeStatusEnum.END}]"
-                v-if="activeTimeConfig?.status === TimeStatusEnum.WAIT_START">
+                :class="[
+                  'ss-reset-button cart-btn',
+                  { disabled: activeTimeConfig?.status === TimeStatusEnum.END },
+                ]"
+                v-if="activeTimeConfig?.status === TimeStatusEnum.WAIT_START"
+              >
                 <span>未开始</span>
               </button>
               <button
-                :class="['ss-reset-button cart-btn', { disabled: activeTimeConfig?.status === TimeStatusEnum.END}]"
+                :class="[
+                  'ss-reset-button cart-btn',
+                  { disabled: activeTimeConfig?.status === TimeStatusEnum.END },
+                ]"
                 @click="sheep.$router.go('/pages/goods/seckill', { id: activity.id })"
-                v-else-if='activeTimeConfig?.status === TimeStatusEnum.STARTED'>
+                v-else-if="activeTimeConfig?.status === TimeStatusEnum.STARTED"
+              >
                 <span>马上抢</span>
               </button>
               <button
-                :class="['ss-reset-button cart-btn', { disabled: activeTimeConfig?.status === TimeStatusEnum.END}]"
-                v-else>
+                :class="[
+                  'ss-reset-button cart-btn',
+                  { disabled: activeTimeConfig?.status === TimeStatusEnum.END },
+                ]"
+                v-else
+              >
                 <span>已结束</span>
               </button>
             </template>
           </s-goods-column>
         </view>
-        <uni-load-more v-if="activityTotal > 0" :status="loadStatus" :content-text="{
+        <uni-load-more
+          v-if="activityTotal > 0"
+          :status="loadStatus"
+          :content-text="{
             contentdown: '上拉加载更多',
-          }" @tap="loadMore" />
+          }"
+          @tap="loadMore"
+        />
       </scroll-view>
     </view>
   </s-layout>
 </template>
 <script setup>
-  import {
-    reactive,
-    computed,
-    ref,
-    nextTick
-  } from 'vue';
-  import {
-    onLoad,
-    onReachBottom
-  } from '@dcloudio/uni-app';
+  import { reactive, computed, ref, nextTick } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import {
-    useDurationTime
-  } from '@/sheep/hooks/useGoods';
-  import SeckillApi from "@/sheep/api/promotion/seckill";
-  import dayjs from "dayjs";
-  import {
-    TimeStatusEnum
-  } from "@/sheep/util/const";
+  import { useDurationTime } from '@/sheep/hooks/useGoods';
+  import SeckillApi from '@/sheep/api/promotion/seckill';
+  import dayjs from 'dayjs';
+  import { TimeStatusEnum } from '@/sheep/util/const';
 
   // 计算页面高度
-  const {
-    safeAreaInsets,
-    safeArea
-  } = sheep.$platform.device;
+  const { safeAreaInsets, safeArea } = sheep.$platform.device;
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
-  const pageHeight = (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sheep.$platform.navbar - 350;
+  const pageHeight =
+    (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sheep.$platform.navbar - 350;
   const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-header.png');
 
   // 商品控件显示的字段（不显示库存、销量。改为显示自定义的进度条）
   const goodsFields = {
     name: {
-      show: true
+      show: true,
     },
     introduction: {
-      show: true
+      show: true,
     },
     price: {
-      show: true
+      show: true,
     },
     marketPrice: {
-      show: true
+      show: true,
     },
   };
 
   //#region 时间段
   // 时间段列表
-  const timeConfigList = ref([])
+  const timeConfigList = ref([]);
   // 查询时间段
   const getSeckillConfigList = async () => {
-    const {
-      data
-    } = await SeckillApi.getSeckillConfigList()
+    const { data } = await SeckillApi.getSeckillConfigList();
     const now = dayjs();
-    const today = now.format('YYYY-MM-DD')
-    const select = ref([])
+    const today = now.format('YYYY-MM-DD');
+    const select = ref([]);
     // 判断时间段的状态
     data.forEach((config, index) => {
-      const startTime = dayjs(`${today} ${config.startTime}`)
-      const endTime = dayjs(`${today} ${config.endTime}`)
+      const startTime = dayjs(`${today} ${config.startTime}`);
+      const endTime = dayjs(`${today} ${config.endTime}`);
       select.value[index] = config.id;
       if (now.isBefore(startTime)) {
         config.status = TimeStatusEnum.WAIT_START;
-        // select.value[index] = config.id;
       } else if (now.isAfter(endTime)) {
         config.status = TimeStatusEnum.END;
-        // select.value[index] = config.id;
       } else {
         config.status = TimeStatusEnum.STARTED;
-        // select.value[index] = config.id;
-        activeTimeIndex.value = index
+        activeTimeIndex.value = index;
       }
-    })
-    timeConfigList.value = data
+    });
+    timeConfigList.value = data;
     // 默认选中进行中的活动
     handleChangeTimeConfig(activeTimeIndex.value, select.value[activeTimeIndex.value]);
     // 滚动到进行中的时间段
-    scrollToTimeConfig(activeTimeIndex.value)
-  }
+    scrollToTimeConfig(activeTimeIndex.value);
+  };
 
   // 滚动到指定时间段
-  const activeTimeElId = ref('') // 当前选中的时间段的元素ID
+  const activeTimeElId = ref(''); // 当前选中的时间段的元素ID
   const scrollToTimeConfig = (index) => {
-    nextTick(() => activeTimeElId.value = `timeItem${index}`)
-  }
+    nextTick(() => (activeTimeElId.value = `timeItem${index}`));
+  };
 
   // 切换时间段
-  const activeTimeIndex = ref(0) // 当前选中的时间段的索引
-  const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]) // 当前选中的时间段
+  const activeTimeIndex = ref(0); // 当前选中的时间段的索引
+  const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]); // 当前选中的时间段
   const handleChangeTimeConfig = (index, id) => {
-    activeTimeIndex.value = index
+    activeTimeIndex.value = index;
 
     // 查询活动列表
-    activityPageParams.pageNo = 1
+    activityPageParams.pageNo = 1;
     activityPageParams.configId = id;
-    activityList.value = []
+    activityList.value = [];
     getActivityList();
-  }
+  };
 
   // 倒计时
   const countDown = computed(() => {
-    const endTime = activeTimeConfig.value?.endTime
+    const endTime = activeTimeConfig.value?.endTime;
     if (endTime) {
       return useDurationTime(`${dayjs().format('YYYY-MM-DD')} ${endTime}`);
     }
@@ -209,19 +243,19 @@
     configId: 0, // 时间段 ID
     pageNo: 1, // 页码
     pageSize: 5, // 每页数量
-  })
-  const activityTotal = ref(0) // 活动总数
-  const activityList = ref([]) // 活动列表
-  const loadStatus = ref('') // 页面加载状态
+  });
+  const activityTotal = ref(0); // 活动总数
+  const activityList = ref([]); // 活动列表
+  const loadStatus = ref(''); // 页面加载状态
   async function getActivityList() {
     loadStatus.value = 'loading';
-    const {
-      data
-    } = await SeckillApi.getSeckillActivityPage(activityPageParams)
-    data.list.forEach(activity => {
+    const { data } = await SeckillApi.getSeckillActivityPage(activityPageParams);
+    data.list.forEach((activity) => {
       // 计算抢购进度
-      activity.percent = parseInt(100 * (activity.totalStock - activity.stock) / activity.totalStock);
-    })
+      activity.percent = parseInt(
+        (100 * (activity.totalStock - activity.stock)) / activity.totalStock,
+      );
+    });
     activityList.value = activityList.value.concat(...data.list);
     activityTotal.value = data.total;
 
@@ -231,7 +265,7 @@
   // 加载更多
   function loadMore() {
     if (loadStatus.value !== 'noMore') {
-      activityPageParams.pageNo += 1
+      activityPageParams.pageNo += 1;
       getActivityList();
     }
   }
@@ -242,7 +276,7 @@
 
   // 页面初始化
   onLoad(async () => {
-    await getSeckillConfigList()
+    await getSeckillConfigList();
   });
 </script>
 <style lang="scss" scoped>
@@ -424,4 +458,4 @@
       }
     }
   }
-</style>
\ No newline at end of file
+</style>

From 5a66e71809704d50824bfe0fd01ed07e20f28a55 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 16 Sep 2024 08:18:32 +0800
Subject: [PATCH 03/19] =?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=B7=AE=E6=BB=A1=E5=87=8F=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=96=EF=BC=8Cfrom=20=E5=B2=B3=E7=90=B3?=
 =?UTF-8?q?=E7=BA=A2=20https://gitee.com/yudaocode/yudao-mall-uniapp/commi?=
 =?UTF-8?q?t/26a18e7e9a78af4ec49f0d07785a0aead22b00cc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/coupon/detail.vue |  15 +++--
 pages/goods/seckill.vue | 134 ++++++++++++++++++++++------------------
 2 files changed, 80 insertions(+), 69 deletions(-)

diff --git a/pages/coupon/detail.vue b/pages/coupon/detail.vue
index d7f53c31..2fca5257 100644
--- a/pages/coupon/detail.vue
+++ b/pages/coupon/detail.vue
@@ -38,8 +38,8 @@
                   state.coupon.status === 1
                     ? '可使用'
                     : state.coupon.status === 2
-                      ? '已使用'
-                      : '已过期'
+                    ? '已使用'
+                    : '已过期'
                 }}
               </text>
             </button>
@@ -57,7 +57,6 @@
               <view>优惠券类型</view>
               <view>{{ state.coupon.discountType === 1 ? '满减券' : '折扣券' }}</view>
             </view>
-            <!-- TODO 芋艿：可优化，增加优惠劵的描述 -->
             <uni-collapse>
               <uni-collapse-item title="优惠券说明" v-if="state.coupon.description">
                 <view class="content ss-p-b-20">
@@ -282,11 +281,11 @@
 
   .detail-wrap {
     background: linear-gradient(
-        180deg,
-        var(--ui-BG-Main),
-        var(--ui-BG-Main-gradient),
-        var(--ui-BG-Main),
-        #fff
+      180deg,
+      var(--ui-BG-Main),
+      var(--ui-BG-Main-gradient),
+      var(--ui-BG-Main),
+      #fff
     );
   }
 
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 2e4118ed..004efc74 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -6,13 +6,26 @@
     <!-- 骨架屏 -->
     <detailSkeleton v-if="state.skeletonLoading" />
     <!-- 下架/售罄提醒 -->
-    <s-empty v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== 'seckill'" text="活动不存在或已结束"
-             icon="/static/soldout-empty.png" showAction actionText="再逛逛" actionUrl="/pages/goods/list" />
+    <s-empty
+      v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== 'seckill'"
+      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="state.goodsSwiper" dotStyle="tag" imageMode="widthFix"
-                   dotCur="bg-mask-40" :seizeHeight="750" />
+        <su-swiper
+          class="ss-m-b-14"
+          isPreview
+          :list="state.goodsSwiper"
+          dotStyle="tag"
+          imageMode="widthFix"
+          dotCur="bg-mask-40"
+          :seizeHeight="750"
+        />
 
         <!-- 价格+标题 -->
         <view class="title-card ss-m-y-14 ss-m-x-20 ss-p-x-20 ss-p-y-34">
@@ -59,9 +72,14 @@
           <detail-cell-sku :sku="state.selectedSku" @tap="state.showSelectSku = true" />
         </view>
         <!-- 规格与数量弹框 -->
-        <s-select-seckill-sku v-model="state.goodsInfo" :show="state.showSelectSku"
-                              :single-limit-count="activity.singleLimitCount" @buy="onBuy" @change="onSkuChange"
-                              @close="state.showSelectSku = false" />
+        <s-select-seckill-sku
+          v-model="state.goodsInfo"
+          :show="state.showSelectSku"
+          :single-limit-count="activity.singleLimitCount"
+          @buy="onBuy"
+          @change="onSkuChange"
+          @close="state.showSelectSku = false"
+        />
       </view>
 
       <!-- 评价 -->
@@ -73,25 +91,36 @@
       <detail-tabbar v-model="state.goodsInfo">
         <!-- TODO: 缺货中 已售罄 判断 设计-->
         <view class="buy-box ss-flex ss-col-center ss-p-r-20">
-          <button class="ss-reset-button origin-price-btn ss-flex-col" v-if="state.goodsInfo.marketPrice"
-                  @tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })">
+          <button
+            class="ss-reset-button origin-price-btn ss-flex-col"
+            v-if="state.goodsInfo.marketPrice"
+            @tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })"
+          >
             <view>
               <view class="btn-price">{{ fen2yuan(state.goodsInfo.marketPrice) }}</view>
               <view>原价购买</view>
             </view>
           </button>
           <button v-else class="ss-reset-button origin-price-btn ss-flex-col">
-            <view class="no-original" :class="
+            <view
+              class="no-original"
+              :class="
                 state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED ? '' : ''
-              ">
+              "
+            >
               秒杀价
             </view>
           </button>
-          <button class="ss-reset-button btn-box ss-flex-col" @tap="state.showSelectSku = true" :class="
+          <button
+            class="ss-reset-button btn-box ss-flex-col"
+            @tap="state.showSelectSku = true"
+            :class="
               timeStatusEnum === TimeStatusEnum.STARTED && state.goodsInfo.stock != 0
                 ? 'check-btn-box'
                 : 'disabled-btn-box'
-            " :disabled="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED">
+            "
+            :disabled="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED"
+          >
             <view class="btn-price">{{ fen2yuan(state.goodsInfo.price) }}</view>
             <view v-if="timeStatusEnum === TimeStatusEnum.STARTED">
               <view v-if="state.goodsInfo.stock === 0">已售罄</view>
@@ -106,26 +135,11 @@
 </template>
 
 <script setup>
-  import {
-    reactive,
-    computed,
-    ref,
-    unref
-  } from 'vue';
-  import {
-    onLoad,
-    onPageScroll
-  } from '@dcloudio/uni-app';
+  import { reactive, computed, ref, unref } from 'vue';
+  import { onLoad, onPageScroll } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import {
-    isEmpty,
-    min
-  } from 'lodash-es';
-  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';
@@ -135,10 +149,7 @@
   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 { 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');
@@ -175,10 +186,12 @@
         order_type: 'goods',
         buy_type: 'seckill',
         seckillActivityId: activity.value.id,
-        items: [{
-          skuId: sku.id,
-          count: sku.count,
-        }, ],
+        items: [
+          {
+            skuId: sku.id,
+            count: sku.count,
+          },
+        ],
       }),
     });
   }
@@ -186,20 +199,23 @@
   // 分享信息
   const shareInfo = computed(() => {
     if (isEmpty(unref(activity))) return {};
-    return sheep.$platform.share.getShareInfo({
-      title: activity.value.name,
-      image: sheep.$url.cdn(state.goodsInfo.picUrl),
-      params: {
-        page: '4',
-        query: activity.value.id,
+    return sheep.$platform.share.getShareInfo(
+      {
+        title: activity.value.name,
+        image: sheep.$url.cdn(state.goodsInfo.picUrl),
+        params: {
+          page: '4',
+          query: activity.value.id,
+        },
       },
-    }, {
-      type: 'goods', // 商品海报
-      title: activity.value.name, // 商品标题
-      image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
-      price: state.goodsInfo.price, // 商品价格
-      marketPrice: state.goodsInfo.marketPrice, // 商品原价
-    }, );
+      {
+        type: 'goods', // 商品海报
+        title: activity.value.name, // 商品标题
+        image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
+        price: state.goodsInfo.price, // 商品价格
+        marketPrice: state.goodsInfo.marketPrice, // 商品原价
+      },
+    );
   });
 
   const activity = ref();
@@ -207,21 +223,17 @@
 
   // 查询活动
   const getActivity = async (id) => {
-    const {
-      data
-    } = await SeckillApi.getSeckillActivity(id);
+    const { data } = await SeckillApi.getSeckillActivity(id);
     activity.value = data;
     timeStatusEnum.value = getTimeStatusEnum(activity.value.startTime, activity.value.endTime);
-    state.percent = 100 - data.stock / data.totalStock * 100;
+    state.percent = 100 - (data.stock / data.totalStock) * 100;
     // 查询商品
     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;
     // 处理轮播图
@@ -547,4 +559,4 @@
     width: 100%;
     height: 100%;
   }
-</style>
\ No newline at end of file
+</style>

From b741a1d148c65c9e9220410844be099115bb6d69 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 16 Sep 2024 09:16:16 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=BB=A1=E5=87=8F=E9=80=81=E3=80=81=E9=99=90?=
 =?UTF-8?q?=E6=97=B6=E6=8A=98=E6=89=A3=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/list.vue                          |  34 ++--
 sheep/api/product/spu.js                      |   6 +-
 .../s-goods-column/s-goods-column.vue         | 174 ++++++++++++++----
 3 files changed, 163 insertions(+), 51 deletions(-)

diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 1db8b708..92024a97 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -118,7 +118,7 @@
 </template>
 
 <script setup>
-  import { reactive,ref } from 'vue';
+  import { reactive, ref } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import _ from 'lodash-es';
@@ -278,13 +278,13 @@
       return;
     }
     // 使用 map 提取每个对象的 id 属性
-    const ids = data.list.map(item => item.id);
+    const ids = data.list.map((item) => item.id);
     // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
     const idsString = ids.join(',');
     // 获取结算信息
-    settleData.value = await getSettlementByIds(idsString)
+    settleData.value = await getSettlementByIds(idsString);
     // 处理获得的数据
-    const ms = enrichDataWithSkus(data.list,settleData.value)
+    const ms = enrichDataWithSkus(data.list, settleData.value);
     state.pagination.list = _.concat(state.pagination.list, ms);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
@@ -301,7 +301,7 @@
   }
 
   //获取结算信息
-  const settleData = ref()
+  const settleData = ref();
   async function getSettlementByIds(ids) {
     const { data } = await SpuApi.getSettlementProduct(ids);
     return data;
@@ -310,10 +310,10 @@
   //计算展示价格的函数
   function enrichDataWithSkus(data, array) {
     // 创建一个映射，以 id 为键，存储 data 数组中的对象
-    const dataMap = new Map(data.map(item => [item.id, { ...item }]));
+    const dataMap = new Map(data.map((item) => [item.id, { ...item }]));
 
     // 遍历 array 数组
-    array.forEach(item => {
+    array.forEach((item) => {
       // 初始化 discountPrice 和 vipPrice 为 null
       let discountPrice = null;
       let vipPrice = null;
@@ -321,13 +321,14 @@
       let foundType6 = false;
 
       // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
-      item.skus.forEach(sku => {
-        if (!foundType4 && sku.type === 4) {
-          discountPrice = sku.price;
+      item.skus.forEach((sku) => {
+        debugger;
+        if (!foundType4 && sku.promotionType === 4) {
+          discountPrice = sku.payPrice;
           foundType4 = true;
         }
-        if (!foundType6 && sku.type === 6) {
-          vipPrice = sku.price;
+        if (!foundType6 && sku.promotionType === 6) {
+          vipPrice = sku.payPrice;
           foundType6 = true;
         }
 
@@ -338,10 +339,11 @@
       });
 
       // 更新 dataMap 中对应的对象
-      if (dataMap.has(item.id)) {
-        dataMap.get(item.id).discountPrice = discountPrice;
-        dataMap.get(item.id).vipPrice = vipPrice;
-        dataMap.get(item.id).reward = item.reward;
+      if (dataMap.has(item.spuId)) {
+        debugger;
+        dataMap.get(item.spuId).discountPrice = discountPrice;
+        dataMap.get(item.spuId).vipPrice = vipPrice;
+        dataMap.get(item.spuId).reward = item.rewardActivity;
       }
     });
 
diff --git a/sheep/api/product/spu.js b/sheep/api/product/spu.js
index f15a87c9..65a62e91 100644
--- a/sheep/api/product/spu.js
+++ b/sheep/api/product/spu.js
@@ -14,11 +14,11 @@ const SpuApi = {
     });
   },
   // 获得商品结算信息
-  getSettlementProduct: (ids) => {
+  getSettlementProduct: (spuIds) => {
     return request({
-      url: '/trade/order/settlementProduct',
+      url: '/trade/order/settlement-product',
       method: 'GET',
-      params: { ids },
+      params: { spuIds },
       custom: {
         showLoading: false,
         showError: false,
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 7e81a16e..fa14a61a 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -27,13 +27,23 @@
         >
           {{ data.title || data.name }}
         </view>
+        <!-- 这里是新加的会员价和限时优惠 -->
+        <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+          <view class="card" v-if="iconShow">{{ iconShow }}</view>
+          <view class="card2" v-if="data.reward">{{ data.reward.ruleDescriptions[0] }}</view>
+        </view>
+        <!-- 这里是新加的会员价和限时优惠结束 -->
         <view
           v-if="goodsFields.price?.show"
           class="xs-goods-price font-OPPOSANS"
           :style="[{ color: goodsFields.price.color }]"
         >
           <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          <text v-if="iconShow == '限时优惠'">{{ fen2yuan(data.discountPrice) }}</text>
+          <text v-else-if="iconShow == '会员价'">{{ fen2yuan(data.vipPrice) }}</text>
+          <text v-else>{{
+            isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price)
+          }}</text>
         </view>
       </view>
     </view>
@@ -60,13 +70,23 @@
         >
           {{ data.title || data.name }}
         </view>
+        <!-- 这里是新加的会员价和限时优惠 -->
+        <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+          <view class="card" v-if="iconShow">{{ iconShow }}</view>
+          <view class="card2" v-if="data.reward">{{ data.reward.ruleDescriptions[0] }}</view>
+        </view>
+        <!-- 这里是新加的会员价和限时优惠结束 -->
         <view
           v-if="goodsFields.price?.show"
           class="sm-goods-price font-OPPOSANS"
           :style="[{ color: goodsFields.price.color }]"
         >
           <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          <text v-if="iconShow == '限时优惠'">{{ fen2yuan(data.discountPrice) }}</text>
+          <text v-else-if="iconShow == '会员价'">{{ fen2yuan(data.vipPrice) }}</text>
+          <text v-else>{{
+            isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price)
+          }}</text>
         </view>
       </view>
     </view>
@@ -110,6 +130,12 @@
             </view>
           </view>
         </slot>
+        <!-- 这里是新加的会员价和限时优惠 -->
+        <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+          <view class="card" v-if="iconShow">{{ iconShow }}</view>
+          <view class="card2" v-if="data.reward">{{ data.reward.ruleDescriptions[0] }}</view>
+        </view>
+        <!-- 这里是新加的会员价和限时优惠结束 -->
         <view class="ss-flex ss-col-bottom">
           <view
             v-if="goodsFields.price?.show"
@@ -117,7 +143,11 @@
             :style="[{ color: goodsFields.price.color }]"
           >
             <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+            <text v-if="iconShow == '限时优惠'">{{ fen2yuan(data.discountPrice) }}</text>
+            <text v-else-if="iconShow == '会员价'">{{ fen2yuan(data.vipPrice) }}</text>
+            <text v-else>{{
+              isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price)
+            }}</text>
           </view>
 
           <view
@@ -189,6 +219,12 @@
               </view>
             </view>
           </slot>
+          <!-- 这里是新加的会员价和限时优惠 -->
+          <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+            <view class="card" v-if="iconShow">{{ iconShow }}</view>
+            <view class="card2" v-if="data.reward">{{ data.reward.ruleDescriptions[0] }}</view>
+          </view>
+          <!-- 这里是新加的会员价和限时优惠结束 -->
           <view class="ss-flex ss-col-bottom ss-m-t-10">
             <view
               v-if="goodsFields.price?.show"
@@ -207,7 +243,11 @@
               :style="[{ color: originPriceColor }]"
             >
               <text class="price-unit ss-font-20">{{ priceUnit }}</text>
-              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+              <text v-if="iconShow == '限时优惠'">{{ fen2yuan(data.discountPrice) }}</text>
+              <text v-else-if="iconShow == '会员价'">{{ fen2yuan(data.vipPrice) }}</text>
+              <text v-else>{{
+                isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price)
+              }}</text>
             </view>
           </view>
           <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
@@ -262,10 +302,20 @@
               </view>
             </view>
           </slot>
+          <!-- 这里是新加的会员价和限时优惠 -->
+          <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+            <view class="card" v-if="iconShow">{{ iconShow }}</view>
+            <view class="card2" v-if="data.reward">{{ data.reward.ruleDescriptions[0] }}</view>
+          </view>
+          <!-- 这里是新加的会员价和限时优惠结束 -->
           <view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
             <view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
               <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              <text v-if="iconShow == '限时优惠'">{{ fen2yuan(data.discountPrice) }}</text>
+              <text v-else-if="iconShow == '会员价'">{{ fen2yuan(data.vipPrice) }}</text>
+              <text v-else>{{
+                isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price)
+              }}</text>
             </view>
             <view
               v-if="
@@ -297,36 +347,36 @@
    * 商品卡片
    *
    * @property {Array} size = [xs | sm | md | lg | sl ] 			 	- 列表数据
-   * @property {String} tag                      - md及以上才有
-   * @property {String} img                      - 图片
-   * @property {String} background                  - 背景色
-   * @property {String} topRadius                  - 上圆角
-   * @property {String} bottomRadius                  - 下圆角
-   * @property {String} title                    - 标题
-   * @property {String} titleColor                  - 标题颜色
+   * @property {String} tag 											- md及以上才有
+   * @property {String} img 											- 图片
+   * @property {String} background 									- 背景色
+   * @property {String} topRadius 									- 上圆角
+   * @property {String} bottomRadius 									- 下圆角
+   * @property {String} title 										- 标题
+   * @property {String} titleColor 									- 标题颜色
    * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
-   * @property {String} subTitle                    - 副标题
-   * @property {String} subTitleColor                  - 副标题颜色
-   * @property {String} subTitleBackground              - 副标题背景
-   * @property {String | Number} price                - 价格
-   * @property {String} priceColor                  - 价格颜色
-   * @property {String | Number} originPrice              - 原价/划线价
-   * @property {String} originPriceColor                - 原价颜色
-   * @property {String | Number} sales                - 销售数量
-   * @property {String} salesColor                  - 销售数量颜色
+   * @property {String} subTitle 										- 副标题
+   * @property {String} subTitleColor									- 副标题颜色
+   * @property {String} subTitleBackground 							- 副标题背景
+   * @property {String | Number} price 								- 价格
+   * @property {String} priceColor 									- 价格颜色
+   * @property {String | Number} originPrice 							- 原价/划线价
+   * @property {String} originPriceColor 								- 原价颜色
+   * @property {String | Number} sales 								- 销售数量
+   * @property {String} salesColor									- 销售数量颜色
    *
    * @slots activity												 	- 活动插槽
    * @slots cart														- 购物车插槽，默认包含文字，背景色，文字颜色 || 图片 || 行为
    *
-   * @event {Function()} click                    - 点击卡片
+   * @event {Function()} click 										- 点击卡片
    *
    */
-  import { computed, reactive, getCurrentInstance, onMounted, nextTick } from 'vue';
+  import { computed, reactive, getCurrentInstance, onMounted, nextTick, ref } from 'vue';
   import sheep from '@/sheep';
   import { fen2yuan, formatSales } from '@/sheep/hooks/useGoods';
   import { formatStock } from '@/sheep/hooks/useGoods';
+  import goodsCollectVue from '@/pages/user/goods-collect.vue';
   import { isArray } from 'lodash-es';
-
   // 数据
   const state = reactive({});
 
@@ -337,17 +387,29 @@
       default() {
         return {
           // 商品价格
-          price: { show: true },
+          price: {
+            show: true,
+          },
           // 库存
-          stock: { show: true },
+          stock: {
+            show: true,
+          },
           // 商品名称
-          name: { show: true },
+          name: {
+            show: true,
+          },
           // 商品介绍
-          introduction: { show: true },
+          introduction: {
+            show: true,
+          },
           // 市场价
-          marketPrice: { show: true },
+          marketPrice: {
+            show: true,
+          },
           // 销量
-          salesCount: { show: true },
+          salesCount: {
+            show: true,
+          },
         };
       },
     },
@@ -416,7 +478,26 @@
       default: false,
     },
   });
+  //判断限时优惠和会员价标签内容暂时导致页面出错，又舍不得丢，等着把新的数据整合到商品信息中，也用起来
+  const iconShow = handle();
 
+  function handle() {
+    debugger;
+    if (props.data.discountPrice === null && props.data.vipPrice === null) {
+      // 如果两个值都为 null，则不展示任何内容
+      return '';
+    } else if (props.data.discountPrice === null) {
+      // 如果 discountPrice 为 null，展示 vipPrice
+      return '会员价';
+    } else if (props.data.vipPrice === null) {
+      // 如果 vipPrice 为 null，展示 discountPrice
+      return '限时优惠';
+    } else if (props.data.discountPrice < props.data.vipPrice) {
+      return '限时优惠';
+    } else if (props.data.discountPrice > props.data.vipPrice) {
+      return '会员价';
+    }
+  }
   // 组件样式
   const elStyles = computed(() => {
     return {
@@ -454,7 +535,10 @@
   function getGoodsPriceCardWH() {
     if (props.size === 'md') {
       const view = uni.createSelectorQuery().in(proxy);
-      view.select(`#${elId}`).fields({ size: true, scrollOffset: true });
+      view.select(`#${elId}`).fields({
+        size: true,
+        scrollOffset: true,
+      });
       view.exec((data) => {
         let totalHeight = 0;
         const goodsPriceCard = data[0];
@@ -469,7 +553,6 @@
       });
     }
   }
-
   onMounted(() => {
     nextTick(() => {
       getGoodsPriceCardWH();
@@ -763,4 +846,31 @@
       color: #ffffff;
     }
   }
+
+  .card {
+    width: fit-content;
+    height: fit-content;
+    padding: 2rpx 10rpx;
+    background-color: red;
+    color: #ffffff;
+    font-size: 24rpx;
+  }
+
+  .card2 {
+    width: fit-content;
+    height: fit-content;
+    padding: 2rpx 10rpx;
+    background-color: rgb(255, 242, 241);
+    color: #ff2621;
+    font-size: 24rpx;
+    margin-left: 5rpx;
+  }
+
+  .iconBox {
+    width: 100%;
+    height: fit-content;
+    margin-top: 10rpx;
+    display: flex;
+    justify-content: flex-start;
+  }
 </style>

From 9df0194aeb18e478e76ff6a9a97cd8c4855e697b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 16 Sep 2024 18:15:13 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=BB=A1=E5=87=8F=E9=80=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/index.vue                      | 110 ++++----
 pages/goods/index.vue                         | 247 ++++++++++++++++--
 sheep/components/countDown/index.vue          | 196 ++++++++++++++
 .../s-activity-pop/s-activity-pop.vue         | 145 ++++------
 .../s-goods-column/s-goods-column.vue         |   1 -
 .../components/s-select-sku/s-select-sku.vue  |  82 ++++--
 sheep/hooks/useGoods.js                       | 197 ++++----------
 static/images/dis.png                         | Bin 16936 -> 0 bytes
 8 files changed, 612 insertions(+), 366 deletions(-)
 create mode 100644 sheep/components/countDown/index.vue
 delete mode 100644 static/images/dis.png

diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 591d004c..0e89b303 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -7,7 +7,7 @@
         <view class="type-text ss-flex ss-row-center">满减：</view>
         <view class="ss-flex-1">
           <view class="tip-content" v-for="item in state.activityInfo.rules" :key="item">
-            {{ formatRewardActivityRule(state.activityInfo, item) }}
+            {{ item.description }}
           </view>
         </view>
         <image class="activity-left-image" src="/static/activity-left.png" />
@@ -19,9 +19,13 @@
     <view 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"
-                          @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-                          @getHeight="mountMasonry($event, 'left')">
+          <s-goods-column
+            class="goods-md-box"
+            size="md"
+            :data="item"
+            @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"> </button>
             </template>
@@ -30,9 +34,13 @@
       </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" :data="item"
-                          @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-                          @getHeight="mountMasonry($event, 'right')">
+          <s-goods-column
+            class="goods-md-box"
+            size="md"
+            :data="item"
+            @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>
@@ -41,27 +49,22 @@
       </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" />
+      }"
+      @tap="loadMore"
+    />
   </s-layout>
 </template>
 <script setup>
-  import {
-    reactive,
-    toRaw,
-    ref
-  } from 'vue';
-  import {
-    onLoad,
-    onReachBottom
-  } from '@dcloudio/uni-app';
+  import { reactive, toRaw, ref } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import _ from 'lodash-es';
   import RewardActivityApi from '@/sheep/api/promotion/rewardActivity';
-  import {
-    formatRewardActivityRule
-  } from '@/sheep/hooks/useGoods';
   import SpuApi from '@/sheep/api/product/spu';
 
   const state = reactive({
@@ -104,35 +107,31 @@
   async function getList() {
     // state.loadStatus = 'loading';
     // 处理拓展参数
-    const params = {}
+    const params = {};
     if (state.activityInfo.productScope === 2) {
       // const params = toRaw(state.activityInfo.productScopeValues)
       // 请求数据
-      const {
-        code,
-        data
-      } = await SpuApi.getSpuListByIds(state.activityInfo.productScopeValues.join(','));
+      const { code, data } = await SpuApi.getSpuListByIds(
+        state.activityInfo.productScopeValues.join(','),
+      );
       if (code !== 0) {
         return;
       }
       // 使用 map 提取每个对象的 id 属性
-      const ids = data.map(item => item.id);
+      const ids = data.map((item) => item.id);
       // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
       const idsString = ids.join(',');
       // 获取结算信息
-      settleData.value = await getSettlementByIds(idsString)
+      settleData.value = await getSettlementByIds(idsString);
       // 处理获得的数据
-      const ms = enrichDataWithSkus(data, settleData.value)
+      const ms = enrichDataWithSkus(data, settleData.value);
       state.pagination.list = ms;
       // state.pagination.total = data.total;
       // state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
     } else if (state.activityInfo.productScope === 3) {
       params.categoryIds = state.activityInfo.productScopeValues.join(',');
       state.loadStatus = 'loading';
-      const {
-        code,
-        data
-      } = await SpuApi.getSpuPage({
+      const { code, data } = await SpuApi.getSpuPage({
         pageNo: state.pagination.pageNo,
         pageSize: state.pagination.pageSize,
         ...params,
@@ -141,22 +140,19 @@
         return;
       }
       // 使用 map 提取每个对象的 id 属性
-      const ids = data.list.map(item => item.id);
+      const ids = data.list.map((item) => item.id);
       // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
       const idsString = ids.join(',');
       // 获取结算信息
-      settleData.value = await getSettlementByIds(idsString)
+      settleData.value = await getSettlementByIds(idsString);
       // 处理获得的数据
-      const ms = enrichDataWithSkus(data.list, settleData.value)
+      const ms = enrichDataWithSkus(data.list, settleData.value);
       state.pagination.list = _.concat(state.pagination.list, ms);
       state.pagination.total = data.total;
       state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
     } else {
       state.loadStatus = 'loading';
-      const {
-        code,
-        data
-      } = await SpuApi.getSpuPage({
+      const { code, data } = await SpuApi.getSpuPage({
         pageNo: state.pagination.pageNo,
         pageSize: state.pagination.pageSize,
       });
@@ -164,13 +160,13 @@
         return;
       }
       // 使用 map 提取每个对象的 id 属性
-      const ids = data.list.map(item => item.id);
+      const ids = data.list.map((item) => item.id);
       // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
       const idsString = ids.join(',');
       // 获取结算信息
-      settleData.value = await getSettlementByIds(idsString)
+      settleData.value = await getSettlementByIds(idsString);
       // 处理获得的数据
-      const ms = enrichDataWithSkus(data.list, settleData.value)
+      const ms = enrichDataWithSkus(data.list, settleData.value);
       state.pagination.list = _.concat(state.pagination.list, ms);
       state.pagination.total = data.total;
       state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
@@ -178,22 +174,25 @@
     mountMasonry();
   }
   //获取结算信息
-  const settleData = ref()
+  const settleData = ref();
   async function getSettlementByIds(ids) {
-    const {
-      data
-    } = await SpuApi.getSettlementProduct(ids);
+    const { data } = await SpuApi.getSettlementProduct(ids);
     return data;
   }
   //计算展示价格的函数
   function enrichDataWithSkus(data, array) {
     // 创建一个映射，以 id 为键，存储 data 数组中的对象
-    const dataMap = new Map(data.map(item => [item.id, {
-      ...item
-    }]));
+    const dataMap = new Map(
+      data.map((item) => [
+        item.id,
+        {
+          ...item,
+        },
+      ]),
+    );
 
     // 遍历 array 数组
-    array.forEach(item => {
+    array.forEach((item) => {
       // 初始化 discountPrice 和 vipPrice 为 null
       let discountPrice = null;
       let vipPrice = null;
@@ -201,7 +200,7 @@
       let foundType6 = false;
 
       // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
-      item.skus.forEach(sku => {
+      item.skus.forEach((sku) => {
         if (!foundType4 && sku.type === 4) {
           discountPrice = sku.price;
           foundType4 = true;
@@ -230,10 +229,7 @@
   }
   // 加载活动信息
   async function getActivity(id) {
-    const {
-      code,
-      data
-    } = await RewardActivityApi.getRewardActivity(id);
+    const { code, data } = await RewardActivityApi.getRewardActivity(id);
     if (code === 0) {
       state.activityInfo = data;
     }
@@ -312,4 +308,4 @@
       line-height: 42rpx;
     }
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 978448ac..13f71da3 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -27,10 +27,55 @@
             dotCur="bg-mask-40"
             :seizeHeight="750"
           />
-
+          <!-- 限时折扣/会员价的优惠信息 -->
+          <view class="discount" v-if="state.settlementSku && state.settlementSku.id">
+            <image class="disImg" :src="sheep.$url.static('/static/img/shop/goods/dis.png')" />
+            <view class="discountCont">
+              <view class="disContT">
+                <view class="disContT1">
+                  <view class="disContT1P">
+                    ￥{{ fen2yuan(state.settlementSku.promotionPrice) }}
+                  </view>
+                  <view class="disContT1End">
+                    直降￥
+                    {{ fen2yuan(state.settlementSku.price - state.settlementSku.promotionPrice) }}
+                  </view>
+                </view>
+                <view class="disContT2" v-if="state.settlementSku.promotionType === 4">
+                  限时折扣
+                </view>
+                <view class="disContT2" v-else-if="state.settlementSku.promotionType === 6">
+                  会员折扣
+                </view>
+              </view>
+              <view class="disContB">
+                <view class="disContB1">
+                  价格：￥{{ fen2yuan(state.settlementSku.price) }} 丨 剩余：
+                  {{ state.settlementSku.stock }}
+                </view>
+                <view class="disContB2" v-if="state.settlementSku.promotionEndTime > 0">
+                  距结束仅剩
+                  <countDown
+                    :tipText="' '"
+                    :bgColor="bgColor"
+                    :dayText="':'"
+                    :hourText="':'"
+                    :minuteText="':'"
+                    :secondText="' '"
+                    :datatime="state.settlementSku.promotionEndTime / 1000"
+                    :isDay="false"
+                  />
+                </view>
+              </view>
+            </view>
+          </view>
           <!-- 价格+标题 -->
-          <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="title-card detail-card ss-p-y-30 ss-p-x-20">
+            <!-- 没有限时折扣/会员价的优惠信息时，展示的价格信息 -->
+            <view
+              class="ss-flex ss-row-between ss-col-center ss-m-b-26"
+              v-if="!(state.settlementSku && state.settlementSku.id)"
+            >
               <view class="price-box ss-flex ss-col-bottom">
                 <view class="price-text ss-m-r-16">
                   {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
@@ -44,24 +89,37 @@
               </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"
+                    v-for="coupon in state.couponInfo.slice(0, 1)"
+                    :key="coupon.id"
+                    @tap="onOpenActivity"
                   >
-                    {{ promos.name }}
+                    [劵]满 {{ fen2yuan(coupon.usePrice) }} 元
+                    {{
+                      coupon.discountType === 1
+                        ? '减 ' + fen2yuan(coupon.discountPrice) + ' 元'
+                        : '打 ' + coupon.discountPercent / 10.0 + ' 折'
+                    }}
+                  </view>
+                  <view
+                    v-if="state.rewardActivity && state.rewardActivity.id > 0"
+                    class="tag ss-m-r-10"
+                    v-for="promos in state.rewardActivity.ruleDescriptions.slice(0, 1)"
+                    :key="promos.id"
+                    @tap="onOpenActivity"
+                  >
+                    {{ promos }}
                   </view>
                 </view>
               </div>
-
-              <!-- 优惠劵 -->
+              <!-- 领取优惠劵的按钮 -->
               <view
                 class="get-coupon-box ss-flex ss-col-center ss-m-l-20"
-                @tap="state.showModel = true"
+                @tap="onOpenActivity"
                 v-if="state.couponInfo.length"
               >
                 <view class="discounts-title ss-m-r-8">领券</view>
@@ -127,19 +185,12 @@
           </view>
         </detail-tabbar>
 
-        <!-- 优惠劵弹窗 -->
-        <s-coupon-get
-          v-model="state.couponInfo"
-          :show="state.showModel"
-          @close="state.showModel = false"
-          @get="onGet"
-        />
-
         <!-- 满减送/限时折扣活动弹窗 -->
         <s-activity-pop
-          v-model="state.activityInfo"
+          v-model="state"
           :show="state.showActivityModel"
           @close="state.showActivityModel = false"
+          @get="onTakeCoupon"
         />
       </block>
     </s-layout>
@@ -147,7 +198,7 @@
 </template>
 
 <script setup>
-  import { reactive, computed } from 'vue';
+  import { reactive, computed, ref } from 'vue';
   import { onLoad, onPageScroll } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import CouponApi from '@/sheep/api/promotion/coupon';
@@ -165,7 +216,15 @@
   import SpuApi from '@/sheep/api/product/spu';
 
   onPageScroll(() => {});
+  import countDown from '@/sheep/components/countDown/index.vue';
 
+  const bgColor = {
+    bgColor: '#E93323',
+    Color: '#fff',
+    width: '44rpx',
+    timeTxtwidth: '16rpx',
+    isDay: true,
+  };
   const isLogin = computed(() => sheep.$store('user').isLogin);
   const state = reactive({
     goodsId: 0,
@@ -173,16 +232,18 @@
     goodsInfo: {}, // SPU 信息
     showSelectSku: false, // 是否展示 SKU 选择弹窗
     selectedSku: {}, // 选中的 SKU
+    settlementSku: {}, // 结算的 SKU：由于 selectedSku 不进行默认选中，所以初始使用结算价格最低的 SKU 作为基础展示
     showModel: false, // 是否展示 Coupon 优惠劵的弹窗
     couponInfo: [], // 可领取的 Coupon 优惠劵的列表
     showActivityModel: false, // 【满减送/限时折扣】是否展示 Activity 营销活动的弹窗
-    activityInfo: [], // 【满减送/限时折扣】可参与的 Activity 营销活动的列表 TODO 芋艿：正在接入中
+    rewardActivity: {}, // 【满减送】活动
     activityList: [], // 【秒杀/拼团/砍价】可参与的 Activity 营销活动的列表
   });
 
   // 规格变更
   function onSkuChange(e) {
     state.selectedSku = e;
+    state.settlementSku = e;
   }
 
   // 添加购物车
@@ -196,7 +257,7 @@
 
   // 立即购买
   function onBuy(e) {
-    if (!state.selectedSku.id) {
+    if (!e.id) {
       sheep.$helper.toast('请选择商品规格');
       return;
     }
@@ -213,13 +274,13 @@
     });
   }
 
-  // 营销活动
-  function onActivity() {
+  // 打开营销弹窗
+  function onOpenActivity() {
     state.showActivityModel = true;
   }
 
-  // 立即领取
-  async function onGet(id) {
+  // 立即领取优惠劵
+  async function onTakeCoupon(id) {
     const { code } = await CouponApi.takeCoupon(id);
     if (code !== 0) {
       return;
@@ -261,6 +322,36 @@
     }
   }
 
+  async function getSettlementByIds(ids) {
+    let { data, code } = await SpuApi.getSettlementProduct(ids);
+    if (code !== 0 || data.length !== 1) {
+      return;
+    }
+    data = data[0];
+
+    // 补充 SKU 的价格信息
+    state.goodsInfo.skus.forEach((sku) => {
+      data.skus.forEach((item) => {
+        if (sku.id === item.id) {
+          sku.promotionType = item.promotionType;
+          sku.promotionPrice = item.promotionPrice;
+          sku.promotionId = item.promotionId;
+          sku.promotionEndTime = item.promotionEndTime;
+        }
+      });
+    });
+
+    // 选择有 promotionPrice 且最小的
+    state.settlementSku = state.goodsInfo.skus
+      .filter((sku) => sku.stock > 0 && sku.promotionPrice > 0)
+      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
+
+    // 设置满减送活动
+    if (data.rewardActivity) {
+      state.rewardActivity = data.rewardActivity;
+    }
+  }
+
   onLoad((options) => {
     // 非法参数
     if (!options.id) {
@@ -278,7 +369,6 @@
       // 加载到商品
       state.skeletonLoading = false;
       state.goodsInfo = res.data;
-
       // 加载是否收藏
       if (isLogin.value) {
         FavoriteApi.isFavoriteExists(state.goodsId, 'goods').then((res) => {
@@ -293,13 +383,15 @@
     // 2. 加载优惠劵信息
     getCoupon();
 
-    // 3. 获得单个商品，进行中的拼团、秒杀、砍价活动信息
+    // 3. 加载营销活动信息
     ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
       if (res.code !== 0) {
         return;
       }
       state.activityList = res.data;
     });
+    //获取结算信息
+    getSettlementByIds(state.goodsId);
   });
 </script>
 
@@ -448,4 +540,101 @@
       color: #333333;
     }
   }
+
+  // 限时折扣
+  .discount {
+    width: 750rpx;
+    height: 100rpx;
+    // background-color: red;
+    overflow: hidden;
+    position: relative;
+  }
+
+  .disImg {
+    width: 750rpx;
+    height: 100rpx;
+    position: absolute;
+    top: 0;
+    z-index: -1;
+  }
+
+  .discountCont {
+    width: 680rpx;
+    height: 90rpx;
+    margin: 10rpx auto 0 auto;
+    // background-color: gold;
+  }
+
+  .disContT {
+    width: 680rpx;
+    height: 50rpx;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .disContT1 {
+    width: 400rpx;
+    height: 50rpx;
+    // background-color: green;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+
+  .disContT2 {
+    width: 200rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    // background-color: gold;
+    font-size: 30rpx;
+    text-align: end;
+    color: white;
+    font-weight: bolder;
+    font-style: oblique 20deg;
+    letter-spacing: 0.1rem;
+  }
+
+  .disContT1P {
+    color: white;
+    font-weight: bold;
+    font-size: 28rpx;
+  }
+
+  .disContT1End {
+    // width: 180rpx;
+    padding: 0 10rpx;
+    height: 30rpx;
+    line-height: 28rpx;
+    text-align: center;
+    font-weight: bold;
+    background-color: white;
+    color: #ff3000;
+    font-size: 23rpx;
+    border-radius: 20rpx;
+    margin-left: 10rpx;
+  }
+
+  .disContB {
+    width: 680rpx;
+    height: 40rpx;
+    display: flex;
+    justify-content: space-between;
+    font-size: 20rpx;
+    color: white;
+    align-items: center;
+  }
+
+  .disContB1 {
+    width: 300rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+  }
+
+  .disContB2 {
+    width: 300rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    display: flex;
+    justify-content: flex-end;
+  }
 </style>
diff --git a/sheep/components/countDown/index.vue b/sheep/components/countDown/index.vue
new file mode 100644
index 00000000..d7b88deb
--- /dev/null
+++ b/sheep/components/countDown/index.vue
@@ -0,0 +1,196 @@
+<!-- TODO 霖：是不是怎么复用 s-count-down 组件 -->
+<template>
+  <view class="time" :style="justifyLeft">
+    <text class="" v-if="tipText">{{ tipText }}</text>
+    <text
+      class="styleAll p6"
+      v-if="isDay === true"
+      :style="{ background: bgColor.bgColor, color: bgColor.Color }"
+      >{{ day }}{{ bgColor.isDay ? '天' : '' }}</text
+    >
+    <text
+      class="timeTxt"
+      v-if="dayText"
+      :style="{ width: bgColor.timeTxtwidth, color: bgColor.bgColor }"
+      >{{ dayText }}</text
+    >
+    <text
+      class="styleAll"
+      :class="isCol ? 'timeCol' : ''"
+      :style="{ background: bgColor.bgColor, color: bgColor.Color, width: bgColor.width }"
+      >{{ hour }}</text
+    >
+    <text
+      class="timeTxt"
+      v-if="hourText"
+      :class="isCol ? 'whit' : ''"
+      :style="{ width: bgColor.timeTxtwidth, color: bgColor.bgColor }"
+      >{{ hourText }}</text
+    >
+    <text
+      class="styleAll"
+      :class="isCol ? 'timeCol' : ''"
+      :style="{ background: bgColor.bgColor, color: bgColor.Color, width: bgColor.width }"
+      >{{ minute }}</text
+    >
+    <text
+      class="timeTxt"
+      v-if="minuteText"
+      :class="isCol ? 'whit' : ''"
+      :style="{ width: bgColor.timeTxtwidth, color: bgColor.bgColor }"
+      >{{ minuteText }}</text
+    >
+    <text
+      class="styleAll"
+      :class="isCol ? 'timeCol' : ''"
+      :style="{ background: bgColor.bgColor, color: bgColor.Color, width: bgColor.width }"
+      >{{ second }}</text
+    >
+    <text class="timeTxt" v-if="secondText">{{ secondText }}</text>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'countDown',
+    props: {
+      justifyLeft: {
+        type: String,
+        default: '',
+      },
+      //距离开始提示文字
+      tipText: {
+        type: String,
+        default: '倒计时',
+      },
+      dayText: {
+        type: String,
+        default: '天',
+      },
+      hourText: {
+        type: String,
+        default: '时',
+      },
+      minuteText: {
+        type: String,
+        default: '分',
+      },
+      secondText: {
+        type: String,
+        default: '秒',
+      },
+      datatime: {
+        type: Number,
+        default: 0,
+      },
+      isDay: {
+        type: Boolean,
+        default: true,
+      },
+      isCol: {
+        type: Boolean,
+        default: false,
+      },
+      bgColor: {
+        type: Object,
+        default: null,
+      },
+    },
+    data: function () {
+      return {
+        day: '00',
+        hour: '00',
+        minute: '00',
+        second: '00',
+      };
+    },
+    created: function () {
+      this.show_time();
+    },
+    mounted: function () {},
+    methods: {
+      show_time: function () {
+        let that = this;
+
+        function runTime() {
+          //时间函数
+          let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差；
+          let day = 0,
+            hour = 0,
+            minute = 0,
+            second = 0;
+          if (intDiff > 0) {
+            //转换时间
+            if (that.isDay === true) {
+              day = Math.floor(intDiff / (60 * 60 * 24));
+            } else {
+              day = 0;
+            }
+            hour = Math.floor(intDiff / (60 * 60)) - day * 24;
+            minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60;
+            second = Math.floor(intDiff) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60;
+            if (hour <= 9) hour = '0' + hour;
+            if (minute <= 9) minute = '0' + minute;
+            if (second <= 9) second = '0' + second;
+            that.day = day;
+            that.hour = hour;
+            that.minute = minute;
+            that.second = second;
+          } else {
+            that.day = '00';
+            that.hour = '00';
+            that.minute = '00';
+            that.second = '00';
+          }
+        }
+        runTime();
+        setInterval(runTime, 1000);
+      },
+    },
+  };
+</script>
+
+<style scoped>
+  .p6 {
+    padding: 0 8rpx;
+  }
+  .styleAll {
+    /* color: #fff; */
+    font-size: 24rpx;
+    height: 36rpx;
+    line-height: 36rpx;
+    border-radius: 6rpx;
+    text-align: center;
+    /* padding: 0 6rpx; */
+  }
+  .timeTxt {
+    text-align: center;
+    /* width: 16rpx; */
+    height: 36rpx;
+    line-height: 36rpx;
+    display: inline-block;
+  }
+  .whit {
+    color: #fff !important;
+  }
+  .time {
+    display: flex;
+    justify-content: center;
+  }
+
+  .red {
+    color: #fc4141;
+    margin: 0 4rpx;
+  }
+
+  .timeCol {
+    /* width: 40rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    text-align:center;
+    border-radius: 6px;
+    background: #fff;
+    font-size: 24rpx; */
+    color: #e93323;
+  }
+</style>
diff --git a/sheep/components/s-activity-pop/s-activity-pop.vue b/sheep/components/s-activity-pop/s-activity-pop.vue
index 4c000e58..460ccf76 100644
--- a/sheep/components/s-activity-pop/s-activity-pop.vue
+++ b/sheep/components/s-activity-pop/s-activity-pop.vue
@@ -3,66 +3,32 @@
   <su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose>
     <view class="model-box">
       <view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠</view>
-      <view v-if="state.activityMap[state.activityInfo[0]?.id]?.reduc">
+      <view v-if="state.rewardActivity && state.rewardActivity.id > 0">
         <view class="titleLi">促销</view>
-        <scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
-          <view class="actBox">
-            <view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(state.activityInfo[0])">
+        <scroll-view
+          class="model-content"
+          scroll-y
+          :scroll-with-animation="false"
+          :enable-back-to-top="true"
+        >
+          <view
+            class="actBox"
+            v-for="(item, index) in state.rewardActivity.ruleDescriptions"
+            :key="index"
+          >
+            <view
+              class="boxCont ss-flex ss-col-top ss-m-b-40"
+              @tap="onGoodsList(state.rewardActivity)"
+            >
               <view class="model-content-tag ss-flex ss-row-center">满减</view>
               <view class="model-content-title">
                 <view class="contBu">
-                  <text v-for="(item,index) in state.activityMap[state.activityInfo[0]?.id]?.reduc"
-                        :key="index">满{{fen2yuan(item.discountPrice)}}元减{{fen2yuan(item.limit)}}元;</text>
+                  <text>{{ item }}</text>
                 </view>
                 <view class="ss-m-b-24 cotBu-txt">
-                  {{formatDateRange(state.activityInfo[0]?.startTime,state.activityInfo[0]?.endTime)}}
-                </view>
-              </view>
-              <text class="cicon-forward" />
-            </view>
-          </view>
-          <view class="actBox">
-            <view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(state.activityInfo[0])">
-              <view class="model-content-tag ss-flex ss-row-center">包邮</view>
-              <view class="model-content-title">
-                <view class="contBu">
-                  <text v-for="(item,index) in state.activityMap[state.activityInfo[0]?.id]?.ship"
-                        :key="index" v-show="item.bull">满{{fen2yuan(item.discountPrice)}}元包邮;</text>
-                </view>
-                <view class="ss-m-b-24 cotBu-txt">
-                  {{formatDateRange(state.activityInfo[0]?.startTime,state.activityInfo[0]?.endTime)}}
-                </view>
-              </view>
-              <text class="cicon-forward" />
-            </view>
-          </view>
-          <view class="actBox">
-            <view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(state.activityInfo[0])">
-              <view class="model-content-tag ss-flex ss-row-center">送积分</view>
-              <view class="model-content-title">
-                <view class="contBu">
-                  <text v-for="(item,index) in state.activityMap[state.activityInfo[0]?.id]?.scor"
-                        :key="index"
-                        v-show="item.bull">满{{fen2yuan(item.discountPrice)}}元送{{item.value}}积分;</text>
-                </view>
-                <view class="ss-m-b-24 cotBu-txt">
-                  {{formatDateRange(state.activityInfo[0]?.startTime,state.activityInfo[0]?.endTime)}}
-                </view>
-              </view>
-              <text class="cicon-forward" />
-            </view>
-          </view>
-          <view class="actBox">
-            <view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(state.activityInfo[0])">
-              <view class="model-content-tag ss-flex ss-row-center">送优惠券</view>
-              <view class="model-content-title">
-                <view class="contBu">
-                  <text v-for="(item,index) in state.activityMap[state.activityInfo[0]?.id]?.cou"
-                        :key="index"
-                        v-show="item.bull">满{{fen2yuan(item.discountPrice)}}元送{{item.value}}张优惠券;</text>
-                </view>
-                <view class="ss-m-b-24 cotBu-txt">
-                  {{formatDateRange(state.activityInfo[0]?.startTime,state.activityInfo[0]?.endTime)}}
+                  {{ sheep.$helper.timeFormat(state.rewardActivity.startTime, 'yyyy.mm.dd') }}
+                  -
+                  {{ sheep.$helper.timeFormat(state.rewardActivity.endTime, 'yyyy.mm.dd') }}
                 </view>
               </view>
               <text class="cicon-forward" />
@@ -71,31 +37,33 @@
         </scroll-view>
       </view>
       <view class="titleLi">可领优惠券</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="actBox" v-for="item in state.couponInfo" :key="item.id">
           <view class="boxCont ss-flex ss-col-top ss-m-b-40">
             <view class="model-content-tag2">
-              <view class="usePrice">
-                ￥{{fen2yuan(item.discountPrice)}}
-              </view>
-              <view class="impose">
-                满￥{{fen2yuan(item.usePrice)}}可用
-              </view>
+              <view class="usePrice"> ￥{{ fen2yuan(item.discountPrice) }} </view>
+              <view class="impose"> 满￥{{ fen2yuan(item.usePrice) }}可用 </view>
             </view>
             <view class="model-content-title2">
               <view class="contBu">
-                {{item.name}}
+                {{ item.name }}
               </view>
               <view class="ss-m-b-24 cotBu-txt">
-                {{item.validityType==1?formatDateRange(item.validStartTime,item.validEndTime) : '领取后'+item.fixedStartTerm+'-'+item.fixedEndTerm +'天可用'}}
+                {{
+                  item.validityType == 1
+                    ? sheep.$helper.timeFormat(item.validStartTime, 'yyyy.mm.dd') -
+                      sheep.$helper.timeFormat(item.validEndTime, 'yyyy.mm.dd')
+                    : '领取后' + item.fixedStartTerm + '-' + item.fixedEndTerm + '天可用'
+                }}
               </view>
             </view>
-            <view class="coupon" @click.stop="getBuy(item.id)" v-if="item.canTake">
-              立即领取
-            </view>
-            <view class="coupon2" v-else>
-              已领取
-            </view>
+            <view class="coupon" @click.stop="getBuy(item.id)" v-if="item.canTake"> 立即领取 </view>
+            <view class="coupon2" v-else> 已领取 </view>
           </view>
         </view>
       </scroll-view>
@@ -104,21 +72,12 @@
 </template>
 <script setup>
   import sheep from '@/sheep';
-  import {
-    computed,
-    reactive,
-    watch
-  } from 'vue';
-  import RewardActivityApi from '@/sheep/api/promotion/rewardActivity';
-  import {
-    fen2yuan,
-    formatDateRange,
-    handActitList
-  } from '@/sheep/hooks/useGoods';
+  import { computed, reactive } from 'vue';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
   const props = defineProps({
     modelValue: {
       type: Object,
-      default () {},
+      default() {},
     },
     show: {
       type: Boolean,
@@ -127,26 +86,10 @@
   });
   const emits = defineEmits(['close']);
   const state = reactive({
-    activityInfo: computed(() => props.modelValue.activityInfo),
-    activityMap: {},
-    couponInfo: computed(() => props.modelValue.couponInfo)
+    rewardActivity: computed(() => props.modelValue.rewardActivity),
+    couponInfo: computed(() => props.modelValue.couponInfo),
   });
-  watch(
-    () => props.show,
-    () => {
-      // 展示的情况下，加载每个活动的详细信息
-      if (props.show) {
-        state.activityInfo?.forEach(activity => {
-          RewardActivityApi.getRewardActivity(activity.id).then(res => {
-            if (res.code !== 0) {
-              return;
-            }
-            state.activityMap[activity.id] = handActitList(res.data.rules);
-          })
-        });
-      }
-    },
-  );
+
   // 领取优惠劵
   const getBuy = (id) => {
     emits('get', id);
@@ -298,4 +241,4 @@
     text-align: center;
     font-size: 25rpx;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index fa14a61a..720f5998 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -482,7 +482,6 @@
   const iconShow = handle();
 
   function handle() {
-    debugger;
     if (props.data.discountPrice === null && props.data.vipPrice === null) {
       // 如果两个值都为 null，则不展示任何内容
       return '';
diff --git a/sheep/components/s-select-sku/s-select-sku.vue b/sheep/components/s-select-sku/s-select-sku.vue
index 08e0b287..23b1b43a 100644
--- a/sheep/components/s-select-sku/s-select-sku.vue
+++ b/sheep/components/s-select-sku/s-select-sku.vue
@@ -5,18 +5,33 @@
     <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="state.selectedSku.picUrl || goodsInfo.picUrl" mode="aspectFill" />
+          <image
+            class="sku-image"
+            :src="state.selectedSku.picUrl || goodsInfo.picUrl"
+            mode="aspectFill"
+          />
         </view>
         <view class="header-right ss-flex-col ss-row-between ss-flex-1">
           <view class="goods-title ss-line-2">{{ goodsInfo.name }}</view>
           <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
             <view class="ss-flex">
               <view class="price-text">
-                {{ fen2yuan( state.selectedSku.price || goodsInfo.price) }}
-                <text v-if="state.selectedSku.type == 6"><text class="iconBox">会员价</text><text
-                  class="origin-price-text">{{fen2yuan(state.selectedSku.oldPrice)}}</text></text>
-                <text v-if="state.selectedSku.type == 4"><text class="iconBox">限时优惠</text><text
-                  class="origin-price-text">{{fen2yuan(state.selectedSku.oldPrice)}}</text></text>
+                {{
+                  fen2yuan(
+                    state.selectedSku.promotionPrice || state.selectedSku.price || goodsInfo.price,
+                  )
+                }}
+                <text v-if="state.selectedSku.promotionType > 0">
+                  <text class="iconBox" v-if="state.selectedSku.promotionType === 4">
+                    限时优惠
+                  </text>
+                  <text class="iconBox" v-else-if="state.selectedSku.promotionType === 6">
+                    会员价
+                  </text>
+                  <text class="origin-price-text">
+                    {{ fen2yuan(state.selectedSku.price) }}
+                  </text>
+                </text>
               </view>
             </view>
             <view class="stock-text ss-m-l-20">
@@ -32,22 +47,34 @@
           <view class="sku-item ss-m-b-20" v-for="property in propertyList" :key="property.id">
             <view class="label-text ss-m-b-20">{{ property.name }}</view>
             <view class="ss-flex ss-col-center ss-flex-wrap">
-              <button class="ss-reset-button spec-btn" v-for="value in property.values" :class="[
+              <button
+                class="ss-reset-button spec-btn"
+                v-for="value in property.values"
+                :class="[
                   {
                     'ui-BG-Main-Gradient': state.currentPropertyArray[property.id] === value.id,
                   },
                   {
                     'disabled-btn': value.disabled === true,
                   },
-                ]" :key="value.id" :disabled="value.disabled === true" @tap="onSelectSku(property.id, value.id)">
+                ]"
+                :key="value.id"
+                :disabled="value.disabled === true"
+                @tap="onSelectSku(property.id, value.id)"
+              >
                 {{ value.name }}
               </button>
             </view>
           </view>
           <view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40">
             <view class="label-text">购买数量</view>
-            <su-number-box :min="1" :max="state.selectedSku.stock" :step="1"
-                           v-model="state.selectedSku.goods_num" @change="onNumberChange($event)" />
+            <su-number-box
+              :min="1"
+              :max="state.selectedSku.stock"
+              :step="1"
+              v-model="state.selectedSku.goods_num"
+              @change="onNumberChange($event)"
+            />
           </view>
         </scroll-view>
       </view>
@@ -55,7 +82,9 @@
       <!-- 操作区 -->
       <view class="modal-footer border-top">
         <view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center">
-          <button class="ss-reset-button add-btn ui-Shadow-Main" @tap="onAddCart">加入购物车</button>
+          <button class="ss-reset-button add-btn ui-Shadow-Main" @tap="onAddCart"
+            >加入购物车</button
+          >
           <button class="ss-reset-button buy-btn ui-Shadow-Main" @tap="onBuy">立即购买</button>
         </view>
       </view>
@@ -64,28 +93,20 @@
 </template>
 
 <script setup>
-  import {
-    computed,
-    reactive,
-    watch
-  } from 'vue';
+  import { computed, reactive, watch } from 'vue';
   import sheep from '@/sheep';
-  import {
-    formatStock,
-    convertProductPropertyList,
-    fen2yuan
-  } from '@/sheep/hooks/useGoods';
+  import { formatStock, convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
 
   const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
   const props = defineProps({
     goodsInfo: {
       type: Object,
-      default () {},
+      default() {},
     },
     show: {
       type: Boolean,
       default: false,
-    }
+    },
   });
 
   const state = reactive({
@@ -98,7 +119,7 @@
   const skuList = computed(() => {
     let skuPrices = props.goodsInfo.skus;
     for (let price of skuPrices) {
-      price.value_id_array = price.properties.map((item) => item.valueId)
+      price.value_id_array = price.properties.map((item) => item.valueId);
     }
     return skuPrices;
   });
@@ -107,7 +128,8 @@
     () => state.selectedSku,
     (newVal) => {
       emits('change', newVal);
-    }, {
+    },
+    {
       immediate: true, // 立即执行
       deep: true, // 深度监听
     },
@@ -216,8 +238,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 不禁用
       }
     }
   }
@@ -247,7 +268,10 @@
   function onSelectSku(propertyId, valueId) {
     // 清空已选择
     let isChecked = true; // 选中 or 取消选中
-    if (state.currentPropertyArray[propertyId] !== undefined && state.currentPropertyArray[propertyId] === valueId) {
+    if (
+      state.currentPropertyArray[propertyId] !== undefined &&
+      state.currentPropertyArray[propertyId] === valueId
+    ) {
       // 点击已被选中的，删除并填充 ''
       isChecked = false;
       state.currentPropertyArray.splice(propertyId, 1, '');
@@ -437,4 +461,4 @@
       content: '￥';
     }
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index 86caeb7c..153afc2c 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -1,11 +1,7 @@
-import {
-  ref
-} from 'vue';
+import { ref } from 'vue';
 import dayjs from 'dayjs';
 import $url from '@/sheep/url';
-import {
-  formatDate
-} from '@/sheep/util';
+import { formatDate } from '@/sheep/util';
 
 /**
  * 格式化销量
@@ -15,7 +11,7 @@ import {
  */
 export function formatSales(type, num) {
   let prefix = type !== 'exact' && num < 10 ? '销量' : '已售';
-  return formatNum(prefix, type, num)
+  return formatNum(prefix, type, num);
 }
 
 /**
@@ -25,10 +21,9 @@ export function formatSales(type, num) {
  * @return {string} 格式化后的销量字符串
  */
 export function formatExchange(type, num) {
-  return formatNum('已兑换', type, num)
+  return formatNum('已兑换', type, num);
 }
 
-
 /**
  * 格式化库存
  * @param {'exact' | any} type 格式类型：exact=精确值，其它=大致数量
@@ -36,7 +31,7 @@ export function formatExchange(type, num) {
  * @return {string} 格式化后的销量字符串
  */
 export function formatStock(type, num) {
-  return formatNum('库存', type, num)
+  return formatNum('库存', type, num);
 }
 
 /**
@@ -47,7 +42,7 @@ export function formatStock(type, num) {
  * @return {string} 格式化后的销量字符串
  */
 export function formatNum(prefix, type, num) {
-  num = (num || 0);
+  num = num || 0;
   // 情况一：精确数值
   if (type === 'exact') {
     return prefix + num;
@@ -71,7 +66,7 @@ export function formatPrice(e) {
 }
 
 // 视频格式后缀列表
-const VIDEO_SUFFIX_LIST = ['.avi', '.mp4']
+const VIDEO_SUFFIX_LIST = ['.avi', '.mp4'];
 
 /**
  * 转换商品轮播的链接列表：根据链接的后缀，判断是视频链接还是图片链接
@@ -80,15 +75,19 @@ const VIDEO_SUFFIX_LIST = ['.avi', '.mp4']
  * @return {{src: string, type: 'video' | 'image' }[]}  转换后的链接列表
  */
 export function formatGoodsSwiper(urlList) {
-  return urlList?.filter(url => url).map((url, key) => {
-    const isVideo = VIDEO_SUFFIX_LIST.some(suffix => url.includes(suffix));
-    const type = isVideo ? 'video' : 'image'
-    const src = $url.cdn(url);
-    return {
-      type,
-      src
-    }
-  }) || [];
+  return (
+    urlList
+      ?.filter((url) => url)
+      .map((url, key) => {
+        const isVideo = VIDEO_SUFFIX_LIST.some((suffix) => url.includes(suffix));
+        const type = isVideo ? 'video' : 'image';
+        const src = $url.cdn(url);
+        return {
+          type,
+          src,
+        };
+      }) || []
+  );
 }
 
 /**
@@ -101,9 +100,7 @@ export function formatOrderColor(order) {
   if (order.status === 0) {
     return 'info-color';
   }
-  if (order.status === 10 ||
-    order.status === 20 ||
-    (order.status === 30 && !order.commentStatus)) {
+  if (order.status === 10 || order.status === 20 || (order.status === 30 && !order.commentStatus)) {
     return 'warning-color';
   }
   if (order.status === 30 && order.commentStatus) {
@@ -146,7 +143,7 @@ export function formatOrderStatus(order) {
  */
 export function formatOrderStatusDescription(order) {
   if (order.status === 0) {
-    return `请在 ${ formatDate(order.payExpireTime) } 前完成支付`;
+    return `请在 ${formatDate(order.payExpireTime)} 前完成支付`;
   }
   if (order.status === 10) {
     return '商家未发货，请耐心等待';
@@ -169,24 +166,30 @@ export function formatOrderStatusDescription(order) {
  * @param order 订单
  */
 export function handleOrderButtons(order) {
-  order.buttons = []
-  if (order.type === 3) { // 查看拼团
+  order.buttons = [];
+  if (order.type === 3) {
+    // 查看拼团
     order.buttons.push('combination');
   }
-  if (order.status === 20) { // 确认收货
+  if (order.status === 20) {
+    // 确认收货
     order.buttons.push('confirm');
   }
-  if (order.logisticsId > 0) { // 查看物流
+  if (order.logisticsId > 0) {
+    // 查看物流
     order.buttons.push('express');
   }
-  if (order.status === 0) { // 取消订单 / 发起支付
+  if (order.status === 0) {
+    // 取消订单 / 发起支付
     order.buttons.push('cancel');
     order.buttons.push('pay');
   }
-  if (order.status === 30 && !order.commentStatus) { // 发起评价
+  if (order.status === 30 && !order.commentStatus) {
+    // 发起评价
     order.buttons.push('comment');
   }
-  if (order.status === 40) { // 删除订单
+  if (order.status === 40) {
+    // 删除订单
     order.buttons.push('delete');
   }
 }
@@ -264,10 +267,12 @@ export function formatAfterSaleStatusDescription(afterSale) {
  */
 export function handleAfterSaleButtons(afterSale) {
   afterSale.buttons = [];
-  if ([10, 20, 30].includes(afterSale.status)) { // 取消订单
+  if ([10, 20, 30].includes(afterSale.status)) {
+    // 取消订单
     afterSale.buttons.push('cancel');
   }
-  if (afterSale.status === 20) { // 退货信息
+  if (afterSale.status === 20) {
+    // 退货信息
     afterSale.buttons.push('delivery');
   }
 }
@@ -331,7 +336,7 @@ function getDayjsTime(time) {
  * @returns {string} 元，例如说 1.00 元
  */
 export function fen2yuan(price) {
-  return (price / 100.0).toFixed(2)
+  return (price / 100.0).toFixed(2);
 }
 
 /**
@@ -352,134 +357,28 @@ export function convertProductPropertyList(skus) {
   let result = [];
   for (const sku of skus) {
     if (!sku.properties) {
-      continue
+      continue;
     }
     for (const property of sku.properties) {
       // ① 先处理属性
-      let resultProperty = result.find(item => item.id === property.propertyId)
+      let resultProperty = result.find((item) => item.id === property.propertyId);
       if (!resultProperty) {
         resultProperty = {
           id: property.propertyId,
           name: property.propertyName,
-          values: []
-        }
-        result.push(resultProperty)
+          values: [],
+        };
+        result.push(resultProperty);
       }
       // ② 再处理属性值
-      let resultValue = resultProperty.values.find(item => item.id === property.valueId)
+      let resultValue = resultProperty.values.find((item) => item.id === property.valueId);
       if (!resultValue) {
         resultProperty.values.push({
           id: property.valueId,
-          name: property.valueName
-        })
+          name: property.valueName,
+        });
       }
     }
   }
   return result;
 }
-
-/**
- * 格式化满减送活动的规则
- *
- * @param activity 活动信息
- * @param rule 优惠规格
- * @returns {string} 规格字符串
- */
-export function formatRewardActivityRule(activity, rule) {
-  if (activity.conditionType === 10) {
-    return `满 ${fen2yuan(rule.limit)} 元减 ${fen2yuan(rule.discountPrice)} 元`;
-  }
-  if (activity.conditionType === 20) {
-    return `满 ${rule.limit} 件减 ${fen2yuan(rule.discountPrice)} 元`;
-  }
-  return '';
-}
-// 新增将时间搓转换为开始时间-结束时间的格式
-export function formatDateRange(startTimestamp, endTimestamp) {
-  // 定义一个辅助函数来格式化时间戳为 YYYY.MM.DD 格式
-  const formatDate = (timestamp) => {
-    const date = new Date(timestamp);
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要+1
-    const day = String(date.getDate()).padStart(2, '0');
-    return `${year}.${month}.${day}`;
-  };
-
-  // 格式化开始和结束时间
-  const start = formatDate(startTimestamp);
-  const end = formatDate(endTimestamp);
-
-  // 返回格式化的日期范围
-  return `${start}-${end}`;
-}
-
-//处理活动信息
-export function handList(orders) {
-  const typeMap = {
-    '1': '秒杀活动',
-    '2': '砍价活动',
-    '3': '拼团活动',
-    '4': '限时折扣',
-    '5': '满减送',
-    '6': '会员折扣',
-    '7': '优惠券',
-    '8': '积分'
-  };
-
-  // 给每个订单对象添加 typeName 属性
-  let updatedOrders = orders.map(order => {
-    return {
-      ...order, // 展开现有的订单对象属性
-      typeName: typeMap[order.type] // 添加 typeName 属性
-    };
-  });
-  return updatedOrders
-};
-//根据skuid来修改价格并添加时间
-export function handListPrice(array,array2) {
-  // 将 array2 转换为一个以 skuId 为键的对象，以便于快速查找
-  const array2Map = array2.reduce((acc, item) => {
-    acc[item.skuId] = { price: item.price, type: item.type,endTime:item.endTime };
-    return acc;
-  }, {});
-
-  // 遍历 array 数组并更新 price 和 type
-  array.forEach(item => {
-    if (array2Map[item.id]) {
-      item.oldPrice = item.price
-      // 如果在 array2Map 中找到了对应的 skuId（即 id）
-      item.price = array2Map[item.id].price;
-      item.type = array2Map[item.id].type;
-      item.endTime = array2Map[item.id].endTime;
-    }
-  });
-
-  // 返回更新后的 array
-  return array;
-};
-
-//处理活动数据
-export function handActitList(rules) {
-  const rules2 = {
-    reduc: rules.map(item => ({
-      discountPrice: item.discountPrice,
-      limit: item.limit,
-      bull: true // 默认为 true
-    })),
-    cou: rules.map(item => ({
-      discountPrice: item.discountPrice,
-      value: item.couponCounts.reduce((acc, count) => acc + count, 0), // 计算 couponCounts 中各项之和
-      bull: item.givePoint // 对应 givePoint
-    })),
-    ship: rules.map(item => ({
-      discountPrice: item.discountPrice,
-      bull: item.freeDelivery // 对应 freeDelivery
-    })),
-    scor: rules.map(item => ({
-      discountPrice: item.discountPrice,
-      value: item.point, // 直接使用 point
-      bull: item.givePoint // 对应 givePoint
-    }))
-  };
-  return rules2
-};
\ No newline at end of file
diff --git a/static/images/dis.png b/static/images/dis.png
deleted file mode 100644
index 5deb35c29e961f5c05642b875ec2368a85f67fe5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16936
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


From ff6769001d33325512fb8f275e15718f00b4f935 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 16 Sep 2024 19:30:56 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=BB=A1=E5=87=8F=E9=80=81=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=88=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/index.vue                      | 149 +++--------------
 pages/goods/index.vue                         |   3 +-
 pages/goods/list.vue                          |  70 ++------
 sheep/api/trade/order.js                      |  12 ++
 .../components/s-goods-card/s-goods-card.vue  |  66 ++------
 .../s-goods-column/s-goods-column.vue         | 156 ++++++++----------
 sheep/hooks/useGoods.js                       |  24 +++
 7 files changed, 157 insertions(+), 323 deletions(-)

diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 0e89b303..95739155 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -60,12 +60,14 @@
   </s-layout>
 </template>
 <script setup>
-  import { reactive, toRaw, ref } from 'vue';
+  import { reactive } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import _ from 'lodash-es';
   import RewardActivityApi from '@/sheep/api/promotion/rewardActivity';
   import SpuApi from '@/sheep/api/product/spu';
+  import { appendSettlementProduct } from '@/sheep/hooks/useGoods';
+  import OrderApi from '@/sheep/api/trade/order';
 
   const state = reactive({
     activityId: 0, // 获得编号
@@ -105,128 +107,36 @@
 
   // 加载商品信息
   async function getList() {
-    // state.loadStatus = 'loading';
     // 处理拓展参数
     const params = {};
     if (state.activityInfo.productScope === 2) {
-      // const params = toRaw(state.activityInfo.productScopeValues)
-      // 请求数据
-      const { code, data } = await SpuApi.getSpuListByIds(
-        state.activityInfo.productScopeValues.join(','),
-      );
-      if (code !== 0) {
-        return;
-      }
-      // 使用 map 提取每个对象的 id 属性
-      const ids = data.map((item) => item.id);
-      // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
-      const idsString = ids.join(',');
-      // 获取结算信息
-      settleData.value = await getSettlementByIds(idsString);
-      // 处理获得的数据
-      const ms = enrichDataWithSkus(data, settleData.value);
-      state.pagination.list = ms;
-      // state.pagination.total = data.total;
-      // state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+      params.ids = state.activityInfo.productSpuIds.join(',');
     } else if (state.activityInfo.productScope === 3) {
-      params.categoryIds = state.activityInfo.productScopeValues.join(',');
-      state.loadStatus = 'loading';
-      const { code, data } = await SpuApi.getSpuPage({
-        pageNo: state.pagination.pageNo,
-        pageSize: state.pagination.pageSize,
-        ...params,
-      });
-      if (code !== 0) {
-        return;
-      }
-      // 使用 map 提取每个对象的 id 属性
-      const ids = data.list.map((item) => item.id);
-      // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
-      const idsString = ids.join(',');
-      // 获取结算信息
-      settleData.value = await getSettlementByIds(idsString);
-      // 处理获得的数据
-      const ms = enrichDataWithSkus(data.list, settleData.value);
-      state.pagination.list = _.concat(state.pagination.list, ms);
-      state.pagination.total = data.total;
-      state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
-    } else {
-      state.loadStatus = 'loading';
-      const { code, data } = await SpuApi.getSpuPage({
-        pageNo: state.pagination.pageNo,
-        pageSize: state.pagination.pageSize,
-      });
-      if (code !== 0) {
-        return;
-      }
-      // 使用 map 提取每个对象的 id 属性
-      const ids = data.list.map((item) => item.id);
-      // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
-      const idsString = ids.join(',');
-      // 获取结算信息
-      settleData.value = await getSettlementByIds(idsString);
-      // 处理获得的数据
-      const ms = enrichDataWithSkus(data.list, settleData.value);
-      state.pagination.list = _.concat(state.pagination.list, ms);
-      state.pagination.total = data.total;
-      state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+      params.categoryIds = state.activityInfo.productSpuIds.join(',');
     }
+    // 请求数据
+    state.loadStatus = 'loading';
+    const { code, data } = await SpuApi.getSpuPage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+      ...params,
+    });
+    if (code !== 0) {
+      return;
+    }
+    // 拼接结算信息（营销）
+    await OrderApi.getSettlementProduct(data.list.map((item) => item.id).join(',')).then((res) => {
+      if (res.code !== 0) {
+        return;
+      }
+      appendSettlementProduct(data.list, res.data);
+    });
+    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();
   }
-  //获取结算信息
-  const settleData = ref();
-  async function getSettlementByIds(ids) {
-    const { data } = await SpuApi.getSettlementProduct(ids);
-    return data;
-  }
-  //计算展示价格的函数
-  function enrichDataWithSkus(data, array) {
-    // 创建一个映射，以 id 为键，存储 data 数组中的对象
-    const dataMap = new Map(
-      data.map((item) => [
-        item.id,
-        {
-          ...item,
-        },
-      ]),
-    );
 
-    // 遍历 array 数组
-    array.forEach((item) => {
-      // 初始化 discountPrice 和 vipPrice 为 null
-      let discountPrice = null;
-      let vipPrice = null;
-      let foundType4 = false;
-      let foundType6 = false;
-
-      // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
-      item.skus.forEach((sku) => {
-        if (!foundType4 && sku.type === 4) {
-          discountPrice = sku.price;
-          foundType4 = true;
-        }
-        if (!foundType6 && sku.type === 6) {
-          vipPrice = sku.price;
-          foundType6 = true;
-        }
-
-        // 如果已经找到 type 为 4 和 6 的条目，则不需要继续遍历
-        if (foundType4 && foundType6) {
-          return;
-        }
-      });
-
-      // 更新 dataMap 中对应的对象
-      if (dataMap.has(item.id)) {
-        dataMap.get(item.id).discountPrice = discountPrice;
-        dataMap.get(item.id).vipPrice = vipPrice;
-        dataMap.get(item.id).reward = item.reward;
-      }
-    });
-
-    // 返回更新后的数据数组
-    return Array.from(dataMap.values());
-  }
   // 加载活动信息
   async function getActivity(id) {
     const { code, data } = await RewardActivityApi.getRewardActivity(id);
@@ -252,32 +162,28 @@
   onLoad(async (options) => {
     state.activityId = options.activityId;
     await getActivity(state.activityId);
-    await getList();
+    await getList(state.activityId);
   });
 </script>
 <style lang="scss" scoped>
   .goods-list-box {
     width: 50%;
     box-sizing: border-box;
-
     .left-list {
       margin-right: 10rpx;
       margin-bottom: 20rpx;
     }
-
     .right-list {
       margin-left: 10rpx;
       margin-bottom: 20rpx;
     }
   }
-
   .tip-box {
     background: #fff0e7;
     padding: 20rpx;
     width: 100%;
     position: relative;
     box-sizing: border-box;
-
     .activity-left-image {
       position: absolute;
       bottom: 0;
@@ -285,7 +191,6 @@
       width: 58rpx;
       height: 36rpx;
     }
-
     .activity-right-image {
       position: absolute;
       top: 0;
@@ -293,14 +198,12 @@
       width: 72rpx;
       height: 50rpx;
     }
-
     .type-text {
       font-size: 26rpx;
       font-weight: 500;
       color: #ff6000;
       line-height: 42rpx;
     }
-
     .tip-content {
       font-size: 26rpx;
       font-weight: 500;
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 13f71da3..ea010250 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -217,6 +217,7 @@
 
   onPageScroll(() => {});
   import countDown from '@/sheep/components/countDown/index.vue';
+  import OrderApi from '@/sheep/api/trade/order';
 
   const bgColor = {
     bgColor: '#E93323',
@@ -323,7 +324,7 @@
   }
 
   async function getSettlementByIds(ids) {
-    let { data, code } = await SpuApi.getSettlementProduct(ids);
+    let { data, code } = await OrderApi.getSettlementProduct(ids);
     if (code !== 0 || data.length !== 1) {
       return;
     }
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 92024a97..dd5754b6 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -124,6 +124,8 @@
   import _ from 'lodash-es';
   import { resetPagination } from '@/sheep/util';
   import SpuApi from '@/sheep/api/product/spu';
+  import OrderApi from '@/sheep/api/trade/order';
+  import { appendSettlementProduct } from '@/sheep/hooks/useGoods';
 
   const sys_navBar = sheep.$platform.navbar;
   const emits = defineEmits(['close', 'change']);
@@ -277,15 +279,14 @@
     if (code !== 0) {
       return;
     }
-    // 使用 map 提取每个对象的 id 属性
-    const ids = data.list.map((item) => item.id);
-    // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
-    const idsString = ids.join(',');
-    // 获取结算信息
-    settleData.value = await getSettlementByIds(idsString);
-    // 处理获得的数据
-    const ms = enrichDataWithSkus(data.list, settleData.value);
-    state.pagination.list = _.concat(state.pagination.list, ms);
+    // 拼接结算信息（营销）
+    await OrderApi.getSettlementProduct(data.list.map((item) => item.id).join(',')).then((res) => {
+      if (res.code !== 0) {
+        return;
+      }
+      appendSettlementProduct(data.list, res.data);
+    });
+    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();
@@ -300,57 +301,6 @@
     getList(state.currentSort, state.currentOrder);
   }
 
-  //获取结算信息
-  const settleData = ref();
-  async function getSettlementByIds(ids) {
-    const { data } = await SpuApi.getSettlementProduct(ids);
-    return data;
-  }
-
-  //计算展示价格的函数
-  function enrichDataWithSkus(data, array) {
-    // 创建一个映射，以 id 为键，存储 data 数组中的对象
-    const dataMap = new Map(data.map((item) => [item.id, { ...item }]));
-
-    // 遍历 array 数组
-    array.forEach((item) => {
-      // 初始化 discountPrice 和 vipPrice 为 null
-      let discountPrice = null;
-      let vipPrice = null;
-      let foundType4 = false;
-      let foundType6 = false;
-
-      // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
-      item.skus.forEach((sku) => {
-        debugger;
-        if (!foundType4 && sku.promotionType === 4) {
-          discountPrice = sku.payPrice;
-          foundType4 = true;
-        }
-        if (!foundType6 && sku.promotionType === 6) {
-          vipPrice = sku.payPrice;
-          foundType6 = true;
-        }
-
-        // 如果已经找到 type 为 4 和 6 的条目，则不需要继续遍历
-        if (foundType4 && foundType6) {
-          return;
-        }
-      });
-
-      // 更新 dataMap 中对应的对象
-      if (dataMap.has(item.spuId)) {
-        debugger;
-        dataMap.get(item.spuId).discountPrice = discountPrice;
-        dataMap.get(item.spuId).vipPrice = vipPrice;
-        dataMap.get(item.spuId).reward = item.rewardActivity;
-      }
-    });
-
-    // 返回更新后的数据数组
-    return Array.from(dataMap.values());
-  }
-
   onLoad((options) => {
     state.categoryId = options.categoryId;
     state.keyword = options.keyword;
diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js
index 49661c79..9e5883e5 100644
--- a/sheep/api/trade/order.js
+++ b/sheep/api/trade/order.js
@@ -53,6 +53,18 @@ const OrderApi = {
       },
     });
   },
+  // 获得商品结算信息
+  getSettlementProduct: (spuIds) => {
+    return request({
+      url: '/trade/order/settlement-product',
+      method: 'GET',
+      params: { spuIds },
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    });
+  },
   // 创建订单
   createOrder: (data) => {
     return request({
diff --git a/sheep/components/s-goods-card/s-goods-card.vue b/sheep/components/s-goods-card/s-goods-card.vue
index 9408afb0..ca9b64f6 100644
--- a/sheep/components/s-goods-card/s-goods-card.vue
+++ b/sheep/components/s-goods-card/s-goods-card.vue
@@ -141,9 +141,11 @@
   /**
    * 商品卡片
    */
-  import { computed, reactive, onMounted, ref } from 'vue';
+  import { computed, reactive, onMounted } from 'vue';
   import sheep from '@/sheep';
   import SpuApi from '@/sheep/api/product/spu';
+  import OrderApi from '@/sheep/api/trade/order';
+  import { appendSettlementProduct } from '@/sheep/hooks/useGoods';
 
   // 布局类型
   const LayoutTypeEnum = {
@@ -234,61 +236,19 @@
     return data;
   }
 
-  //获取结算信息
-  const settleData = ref()
-  async function getSettlementByIds(ids) {
-    const { data } = await SpuApi.getSettlementProduct(ids);
-    return data;
-  }
-
-  //计算展示价格的函数
-  async function enrichDataWithSkus(data, array) {
-    // 创建一个映射，以 id 为键，存储 data 数组中的对象
-    const dataMap = new Map(data.map(item => [item.id, { ...item }]));
-
-    // 遍历 array 数组
-    array.forEach(item => {
-      // 初始化 discountPrice 和 vipPrice 为 null
-      let discountPrice = null;
-      let vipPrice = null;
-      let foundType4 = false;
-      let foundType6 = false;
-
-      // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
-      item.skus.forEach(sku => {
-        if (!foundType4 && sku.type === 4) {
-          discountPrice = sku.price;
-          foundType4 = true;
-        }
-        if (!foundType6 && sku.type === 6) {
-          vipPrice = sku.price;
-          foundType6 = true;
-        }
-
-        // 如果已经找到 type 为 4 和 6 的条目，则不需要继续遍历
-        if (foundType4 && foundType6) {
-          return;
-        }
-      });
-
-      // 更新 dataMap 中对应的对象
-      if (dataMap.has(item.id)) {
-        dataMap.get(item.id).discountPrice = discountPrice;
-        dataMap.get(item.id).vipPrice = vipPrice;
-        dataMap.get(item.id).reward = item.reward;
-      }
-    });
-
-    // 返回更新后的数据数组
-    return Array.from(dataMap.values());
-  }
-
   // 初始化
   onMounted(async () => {
     // 加载商品列表
-    const ms = await getGoodsListByIds(spuIds.join(','));
-    settleData.value = await getSettlementByIds(spuIds.join(','))
-    state.goodsList = await enrichDataWithSkus(ms,settleData.value)
+    state.goodsList = await getGoodsListByIds(spuIds.join(','));
+    // 拼接结算信息（营销）
+    await OrderApi.getSettlementProduct(state.goodsList.map((item) => item.id).join(',')).then(
+      (res) => {
+        if (res.code !== 0) {
+          return;
+        }
+        appendSettlementProduct(state.goodsList, res.data);
+      },
+    );
     // 只有双列布局时需要
     if (layoutType === LayoutTypeEnum.TWO_COL) {
       // 分列
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 720f5998..a4fc3247 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -11,11 +11,7 @@
       <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" />
       <view
         v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
         class="xs-goods-content ss-flex-col ss-row-around"
@@ -27,23 +23,24 @@
         >
           {{ data.title || data.name }}
         </view>
-        <!-- 这里是新加的会员价和限时优惠 -->
-        <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
-          <view class="card" v-if="iconShow">{{ iconShow }}</view>
-          <view class="card2" v-if="data.reward">{{ data.reward.ruleDescriptions[0] }}</view>
+        <!-- 活动信息 -->
+        <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+          <view class="card" v-if="discountText">{{ discountText }}</view>
+          <view class="card2" v-if="data.rewardActivity">
+            {{ data.rewardActivity.ruleDescriptions[0] }}
+          </view>
         </view>
-        <!-- 这里是新加的会员价和限时优惠结束 -->
         <view
           v-if="goodsFields.price?.show"
           class="xs-goods-price font-OPPOSANS"
           :style="[{ color: goodsFields.price.color }]"
         >
           <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          <text v-if="iconShow == '限时优惠'">{{ fen2yuan(data.discountPrice) }}</text>
-          <text v-else-if="iconShow == '会员价'">{{ fen2yuan(data.vipPrice) }}</text>
-          <text v-else>{{
-            isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price)
-          }}</text>
+          <!-- 活动价格 -->
+          <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+          <text v-else>
+            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          </text>
         </view>
       </view>
     </view>
@@ -70,23 +67,24 @@
         >
           {{ data.title || data.name }}
         </view>
-        <!-- 这里是新加的会员价和限时优惠 -->
-        <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
-          <view class="card" v-if="iconShow">{{ iconShow }}</view>
-          <view class="card2" v-if="data.reward">{{ data.reward.ruleDescriptions[0] }}</view>
+        <!-- 活动信息 -->
+        <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+          <view class="card" v-if="discountText">{{ discountText }}</view>
+          <view class="card2" v-if="data.rewardActivity">
+            {{ data.rewardActivity.ruleDescriptions[0] }}
+          </view>
         </view>
-        <!-- 这里是新加的会员价和限时优惠结束 -->
         <view
           v-if="goodsFields.price?.show"
           class="sm-goods-price font-OPPOSANS"
           :style="[{ color: goodsFields.price.color }]"
         >
           <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          <text v-if="iconShow == '限时优惠'">{{ fen2yuan(data.discountPrice) }}</text>
-          <text v-else-if="iconShow == '会员价'">{{ fen2yuan(data.vipPrice) }}</text>
-          <text v-else>{{
-            isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price)
-          }}</text>
+          <!-- 活动价格 -->
+          <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+          <text v-else>
+            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          </text>
         </view>
       </view>
     </view>
@@ -94,13 +92,9 @@
     <!-- md卡片：竖向，一行放两个，图上内容下 -->
     <view v-if="size === 'md'" class="md-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
       <view v-if="tagStyle.show" class="tag-icon-box">
-        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)" />
       </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" />
       <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"
@@ -130,12 +124,13 @@
             </view>
           </view>
         </slot>
-        <!-- 这里是新加的会员价和限时优惠 -->
-        <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
-          <view class="card" v-if="iconShow">{{ iconShow }}</view>
-          <view class="card2" v-if="data.reward">{{ data.reward.ruleDescriptions[0] }}</view>
+        <!-- 活动信息 -->
+        <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+          <view class="card" v-if="discountText">{{ discountText }}</view>
+          <view class="card2" v-if="data.rewardActivity">
+            {{ data.rewardActivity.ruleDescriptions[0] }}
+          </view>
         </view>
-        <!-- 这里是新加的会员价和限时优惠结束 -->
         <view class="ss-flex ss-col-bottom">
           <view
             v-if="goodsFields.price?.show"
@@ -143,13 +138,12 @@
             :style="[{ color: goodsFields.price.color }]"
           >
             <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-            <text v-if="iconShow == '限时优惠'">{{ fen2yuan(data.discountPrice) }}</text>
-            <text v-else-if="iconShow == '会员价'">{{ fen2yuan(data.vipPrice) }}</text>
-            <text v-else>{{
-              isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price)
-            }}</text>
+            <!-- 活动价格 -->
+            <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+            <text v-else>
+              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+            </text>
           </view>
-
           <view
             v-if="
               (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
@@ -193,7 +187,7 @@
         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
@@ -219,12 +213,13 @@
               </view>
             </view>
           </slot>
-          <!-- 这里是新加的会员价和限时优惠 -->
-          <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
-            <view class="card" v-if="iconShow">{{ iconShow }}</view>
-            <view class="card2" v-if="data.reward">{{ data.reward.ruleDescriptions[0] }}</view>
+          <!-- 活动信息 -->
+          <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+            <view class="card" v-if="discountText">{{ discountText }}</view>
+            <view class="card2" v-if="data.rewardActivity">
+              {{ data.rewardActivity.ruleDescriptions[0] }}
+            </view>
           </view>
-          <!-- 这里是新加的会员价和限时优惠结束 -->
           <view class="ss-flex ss-col-bottom ss-m-t-10">
             <view
               v-if="goodsFields.price?.show"
@@ -243,11 +238,11 @@
               :style="[{ color: originPriceColor }]"
             >
               <text class="price-unit ss-font-20">{{ priceUnit }}</text>
-              <text v-if="iconShow == '限时优惠'">{{ fen2yuan(data.discountPrice) }}</text>
-              <text v-else-if="iconShow == '会员价'">{{ fen2yuan(data.vipPrice) }}</text>
-              <text v-else>{{
-                isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price)
-              }}</text>
+              <!-- 活动价格 -->
+              <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+              <text v-else>
+                {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              </text>
             </view>
           </view>
           <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
@@ -264,15 +259,13 @@
     <!-- sl卡片：竖向型，一行放一个，图片上内容下边 -->
     <view v-if="size === 'sl'" class="sl-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
       <view v-if="tagStyle.show" class="tag-icon-box">
-        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)" />
       </view>
-
       <image
         class="sl-img-box"
         :src="sheep.$url.cdn(data.image || data.picUrl)"
         mode="aspectFill"
-      ></image>
-
+      />
       <view class="sl-goods-content">
         <view>
           <view
@@ -302,20 +295,21 @@
               </view>
             </view>
           </slot>
-          <!-- 这里是新加的会员价和限时优惠 -->
-          <view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
-            <view class="card" v-if="iconShow">{{ iconShow }}</view>
-            <view class="card2" v-if="data.reward">{{ data.reward.ruleDescriptions[0] }}</view>
+          <!-- 活动信息 -->
+          <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+            <view class="card" v-if="discountText">{{ discountText }}</view>
+            <view class="card2" v-if="data.rewardActivity">
+              {{ data.rewardActivity.ruleDescriptions[0] }}
+            </view>
           </view>
-          <!-- 这里是新加的会员价和限时优惠结束 -->
           <view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
             <view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
               <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-              <text v-if="iconShow == '限时优惠'">{{ fen2yuan(data.discountPrice) }}</text>
-              <text v-else-if="iconShow == '会员价'">{{ fen2yuan(data.vipPrice) }}</text>
-              <text v-else>{{
-                isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price)
-              }}</text>
+              <!-- 活动价格 -->
+              <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+              <text v-else>
+                {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              </text>
             </view>
             <view
               v-if="
@@ -371,14 +365,11 @@
    * @event {Function()} click 										- 点击卡片
    *
    */
-  import { computed, reactive, getCurrentInstance, onMounted, nextTick, ref } from 'vue';
+  import { computed, getCurrentInstance, onMounted, nextTick } from 'vue';
   import sheep from '@/sheep';
   import { fen2yuan, formatSales } from '@/sheep/hooks/useGoods';
   import { formatStock } from '@/sheep/hooks/useGoods';
-  import goodsCollectVue from '@/pages/user/goods-collect.vue';
   import { isArray } from 'lodash-es';
-  // 数据
-  const state = reactive({});
 
   // 接收参数
   const props = defineProps({
@@ -478,25 +469,18 @@
       default: false,
     },
   });
-  //判断限时优惠和会员价标签内容暂时导致页面出错，又舍不得丢，等着把新的数据整合到商品信息中，也用起来
-  const iconShow = handle();
 
-  function handle() {
-    if (props.data.discountPrice === null && props.data.vipPrice === null) {
-      // 如果两个值都为 null，则不展示任何内容
-      return '';
-    } else if (props.data.discountPrice === null) {
-      // 如果 discountPrice 为 null，展示 vipPrice
-      return '会员价';
-    } else if (props.data.vipPrice === null) {
-      // 如果 vipPrice 为 null，展示 discountPrice
+  // 优惠文案
+  const discountText = computed(() => {
+    const promotionType = props.data.promotionType;
+    if (promotionType === 4) {
       return '限时优惠';
-    } else if (props.data.discountPrice < props.data.vipPrice) {
-      return '限时优惠';
-    } else if (props.data.discountPrice > props.data.vipPrice) {
+    } else if (promotionType === 6) {
       return '会员价';
     }
-  }
+    return undefined;
+  });
+
   // 组件样式
   const elStyles = computed(() => {
     return {
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index 153afc2c..41402704 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -382,3 +382,27 @@ export function convertProductPropertyList(skus) {
   }
   return result;
 }
+
+export function appendSettlementProduct(spus, settlementInfos) {
+  if (!settlementInfos || settlementInfos.length === 0) {
+    return;
+  }
+  for (const spu of spus) {
+    const settlementInfo = settlementInfos.find((info) => info.spuId === spu.id);
+    if (!settlementInfo) {
+      return;
+    }
+    // 选择价格最小的 SKU 设置到 SPU 上
+    const settlementSku = settlementInfo.skus
+      .filter((sku) => sku.promotionPrice > 0)
+      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
+    if (settlementSku) {
+      spu.promotionType = settlementSku.promotionType;
+      spu.promotionPrice = settlementSku.promotionPrice;
+    }
+    // 设置【满减送】活动
+    if (settlementInfo.rewardActivity) {
+      spu.rewardActivity = settlementInfo.rewardActivity;
+    }
+  }
+}

From 6b6fa0c25715df9e8c4d67561fc6b61d2ad692ae Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 16 Sep 2024 19:38:48 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E6=97=B6=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=85=B7=E4=BD=93?=
 =?UTF-8?q?=E7=9A=84=E4=BC=98=E6=83=A0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue                       |  3 +-
 .../s-discount-list/s-discount-list.vue       | 55 +++++++------------
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 70393b2e..d090aecd 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -143,8 +143,7 @@
           v-if="state.orderInfo.price.discountPrice > 0"
         >
           <view class="item-title">活动优惠</view>
-          <view class="ss-flex ss-col-center">
-            <!--                @tap="state.showDiscount = true" TODO puhui999：【折扣】后续要把优惠信息打进去 -->
+          <view class="ss-flex ss-col-center" @tap="state.showDiscount = true">
             <text class="item-value text-red">
               -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
             </text>
diff --git a/sheep/components/s-discount-list/s-discount-list.vue b/sheep/components/s-discount-list/s-discount-list.vue
index 25e42dde..652cd600 100644
--- a/sheep/components/s-discount-list/s-discount-list.vue
+++ b/sheep/components/s-discount-list/s-discount-list.vue
@@ -1,23 +1,24 @@
 <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-38 ss-m-l-20 ss-m-b-40">活动优惠</view>
-      <scroll-view class="model-content ss-m-l-20" scroll-y :scroll-with-animation="false"
-                   :enable-back-to-top="true">
+      <scroll-view
+        class="model-content ss-m-l-20"
+        scroll-y
+        :scroll-with-animation="false"
+        :enable-back-to-top="true"
+      >
         <view v-for="(item, index) in state.orderInfo.promotions" :key="index">
-          <view class="ss-flex ss-m-b-40 subtitle">
-            <!-- <view>共{{ item.goods_ids.length }}件，</view>
-            <view v-if="item.activity_type === 'full_discount'">
-              满{{ item.discount_rule.full }}打{{ item.discount_rule.discount }}折,已减
-            </view>
-            <view v-if="item.activity_type === 'full_gift'">满赠</view>
-            <view v-if="item.activity_type === 'full_reduce'">
-              满{{ item.discount_rule.full }}减{{ item.discount_rule.discount }},已减
-            </view>
-            <view class="price-text">￥{{ item.promo_discount_money || '0.00' }}</view> -->
-            <view>
-              {{item.description}}
-            </view>
+          <!-- 不展示积分、优惠劵、会员折扣，因为它们已经单独展示了 -->
+          <view class="ss-flex ss-m-b-40 subtitle" v-if="[1, 2, 3, 4, 5, 6].includes(item.type)">
+            <view> {{ item.description }} </view>
           </view>
         </view>
       </scroll-view>
@@ -28,14 +29,7 @@
   </su-popup>
 </template>
 <script setup>
-  import {
-    computed,
-    reactive
-  } from 'vue';
-  import sheep from '@/sheep';
-  import {
-    fen2yuan
-  } from '@/sheep/hooks/useGoods';
+  import { computed, reactive } from 'vue';
   const props = defineProps({
     promoInfo: {
       type: Array,
@@ -47,7 +41,7 @@
     },
     modelValue: {
       type: Object,
-      default () {},
+      default() {},
     },
     show: {
       type: Boolean,
@@ -58,15 +52,6 @@
   const state = reactive({
     orderInfo: computed(() => props.modelValue),
   });
-  // const getGoodsImg = (e) => {
-  //   let goodsImg = '';
-  //   state.orderInfo.goods_list.forEach((i) => {
-  //     if (e == i.goods_id) {
-  //       goodsImg = i.goods.image;
-  //     }
-  //   });
-  //   return goodsImg;
-  // };
 </script>
 <style lang="scss" scoped>
   .model-box {
@@ -108,4 +93,4 @@
   .price-text {
     color: #ff3000;
   }
-</style>
\ No newline at end of file
+</style>

From 51cd8908ecf2fb4cdab99cdbabb0cd6da621720a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E7=90=B3=E7=BA=A2?= <1921957171@qq.com>
Date: Wed, 18 Sep 2024 17:04:23 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/index.vue                      |    2 +-
 pages/goods/index.vue                         | 1123 ++++++------
 .../s-activity-pop/s-activity-pop.vue         |  455 ++---
 .../s-goods-column/s-goods-column.vue         | 1522 ++++++++---------
 sheep/hooks/useGoods.js                       |  546 +++---
 5 files changed, 1817 insertions(+), 1831 deletions(-)

diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 95739155..d414ebd8 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -7,7 +7,7 @@
         <view class="type-text ss-flex ss-row-center">满减：</view>
         <view class="ss-flex-1">
           <view class="tip-content" v-for="item in state.activityInfo.rules" :key="item">
-            {{ item.description }}
+            {{ item.description[1] }}
           </view>
         </view>
         <image class="activity-left-image" src="/static/activity-left.png" />
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index ea010250..c78ae242 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -1,641 +1,614 @@
 <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"
-          />
-          <!-- 限时折扣/会员价的优惠信息 -->
-          <view class="discount" v-if="state.settlementSku && state.settlementSku.id">
-            <image class="disImg" :src="sheep.$url.static('/static/img/shop/goods/dis.png')" />
-            <view class="discountCont">
-              <view class="disContT">
-                <view class="disContT1">
-                  <view class="disContT1P">
-                    ￥{{ fen2yuan(state.settlementSku.promotionPrice) }}
-                  </view>
-                  <view class="disContT1End">
-                    直降￥
-                    {{ fen2yuan(state.settlementSku.price - state.settlementSku.promotionPrice) }}
-                  </view>
-                </view>
-                <view class="disContT2" v-if="state.settlementSku.promotionType === 4">
-                  限时折扣
-                </view>
-                <view class="disContT2" v-else-if="state.settlementSku.promotionType === 6">
-                  会员折扣
-                </view>
-              </view>
-              <view class="disContB">
-                <view class="disContB1">
-                  价格：￥{{ fen2yuan(state.settlementSku.price) }} 丨 剩余：
-                  {{ state.settlementSku.stock }}
-                </view>
-                <view class="disContB2" v-if="state.settlementSku.promotionEndTime > 0">
-                  距结束仅剩
-                  <countDown
-                    :tipText="' '"
-                    :bgColor="bgColor"
-                    :dayText="':'"
-                    :hourText="':'"
-                    :minuteText="':'"
-                    :secondText="' '"
-                    :datatime="state.settlementSku.promotionEndTime / 1000"
-                    :isDay="false"
-                  />
-                </view>
-              </view>
-            </view>
-          </view>
-          <!-- 价格+标题 -->
-          <view class="title-card detail-card ss-p-y-30 ss-p-x-20">
-            <!-- 没有限时折扣/会员价的优惠信息时，展示的价格信息 -->
-            <view
-              class="ss-flex ss-row-between ss-col-center ss-m-b-26"
-              v-if="!(state.settlementSku && state.settlementSku.id)"
-            >
-              <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
+			<!-- 骨架屏 -->
+			<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="discount" v-if="state.settlementSku && state.settlementSku.id && state.settlementSku.promotionPrice">
+						<image class="disImg" :src="sheep.$url.static('/static/img/shop/goods/dis.png')" />
+						<view class="discountCont">
+							<view class="disContT">
+								<view class="disContT1">
+									<view class="disContT1P">
+										￥{{ fen2yuan(state.settlementSku.promotionPrice) }}
+									</view>
+									<view class="disContT1End">
+										直降￥
+										{{ fen2yuan(state.settlementSku.price - state.settlementSku.promotionPrice) }}
+									</view>
+								</view>
+								<view class="disContT2" v-if="state.settlementSku.promotionType === 4">
+									限时折扣
+								</view>
+								<view class="disContT2" v-else-if="state.settlementSku.promotionType === 6">
+									会员折扣
+								</view>
+							</view>
+							<view class="disContB">
+								<view class="disContB1">
+									价格：￥{{ fen2yuan(state.settlementSku.price) }} 丨 剩余：
+									{{ state.settlementSku.stock }}
+								</view>
+								<view class="disContB2" v-if="state.settlementSku.promotionEndTime > 0">
+									距结束仅剩
+									<countDown :tipText="' '" :bgColor="bgColor" :dayText="':'" :hourText="':'"
+										:minuteText="':'" :secondText="' '"
+										:datatime="state.settlementSku.promotionEndTime / 1000" :isDay="false" />
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 价格+标题 -->
+					<view class="title-card detail-card ss-p-y-30 ss-p-x-20">
+						<!-- 没有限时折扣/会员价的优惠信息时，展示的价格信息 -->
+						<view class="ss-flex ss-row-between ss-col-center ss-m-b-26"
+							v-if="!(state.settlementSku.promotionPrice)">
+							<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="coupon in state.couponInfo.slice(0, 1)"
                     :key="coupon.id"
                     @tap="onOpenActivity"
                   >
-                    [劵]满 {{ fen2yuan(coupon.usePrice) }} 元
-                    {{
-                      coupon.discountType === 1
-                        ? '减 ' + fen2yuan(coupon.discountPrice) + ' 元'
-                        : '打 ' + coupon.discountPercent / 10.0 + ' 折'
-                    }}
-                  </view>
-                  <view
-                    v-if="state.rewardActivity && state.rewardActivity.id > 0"
-                    class="tag ss-m-r-10"
-                    v-for="promos in state.rewardActivity.ruleDescriptions.slice(0, 1)"
-                    :key="promos.id"
-                    @tap="onOpenActivity"
-                  >
-                    {{ promos }}
-                  </view>
-                </view>
-              </div>
-              <!-- 领取优惠劵的按钮 -->
-              <view
-                class="get-coupon-box ss-flex ss-col-center ss-m-l-20"
-                @tap="onOpenActivity"
-                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>
+                    222
+                  </view> -->
+									<view v-if="state.rewardActivity && state.rewardActivity.id > 0"
+										class="tag ss-m-r-10" @tap="onOpenActivity">
+										<text v-if="(state.rewardActivity.ruleDescriptions[0])[4]">券 </text>
+										{{(state.rewardActivity.ruleDescriptions[0])[1]}}
+									</view>
+								</view>
+							</div>
+							<!-- 领取优惠劵的按钮 -->
+							<view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="onOpenActivity"
+								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-activity-pop
-          v-model="state"
-          :show="state.showActivityModel"
-          @close="state.showActivityModel = false"
-          @get="onTakeCoupon"
-        />
-      </block>
-    </s-layout>
-  </view>
+				<!-- 满减送/限时折扣活动弹窗 -->
+				<s-activity-pop v-model="state" :show="state.showActivityModel" @close="state.showActivityModel = false"
+					@get="onTakeCoupon" />
+			</block>
+		</s-layout>
+	</view>
 </template>
 
 <script setup>
-  import { reactive, computed, ref } from 'vue';
-  import { onLoad, onPageScroll } from '@dcloudio/uni-app';
-  import sheep from '@/sheep';
-  import CouponApi from '@/sheep/api/promotion/coupon';
-  import ActivityApi from '@/sheep/api/promotion/activity';
-  import FavoriteApi from '@/sheep/api/product/favorite';
-  import { formatSales, formatGoodsSwiper, fen2yuan } from '@/sheep/hooks/useGoods';
-  import detailNavbar from './components/detail/detail-navbar.vue';
-  import detailCellSku from './components/detail/detail-cell-sku.vue';
-  import detailTabbar from './components/detail/detail-tabbar.vue';
-  import detailSkeleton from './components/detail/detail-skeleton.vue';
-  import detailCommentCard from './components/detail/detail-comment-card.vue';
-  import detailContentCard from './components/detail/detail-content-card.vue';
-  import detailActivityTip from './components/detail/detail-activity-tip.vue';
-  import { isEmpty } from 'lodash-es';
-  import SpuApi from '@/sheep/api/product/spu';
+	import {
+		reactive,
+		computed,
+		ref,
+		toRaw
+	} 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 RewardActivityApi from '@/sheep/api/promotion/rewardActivity';
+	import {
+		formatSales,
+		formatGoodsSwiper,
+		fen2yuan
+	} from '@/sheep/hooks/useGoods';
+	import detailNavbar from './components/detail/detail-navbar.vue';
+	import detailCellSku from './components/detail/detail-cell-sku.vue';
+	import detailTabbar from './components/detail/detail-tabbar.vue';
+	import detailSkeleton from './components/detail/detail-skeleton.vue';
+	import detailCommentCard from './components/detail/detail-comment-card.vue';
+	import detailContentCard from './components/detail/detail-content-card.vue';
+	import detailActivityTip from './components/detail/detail-activity-tip.vue';
+	import {
+		isEmpty
+	} from 'lodash-es';
+	import SpuApi from '@/sheep/api/product/spu';
 
-  onPageScroll(() => {});
-  import countDown from '@/sheep/components/countDown/index.vue';
-  import OrderApi from '@/sheep/api/trade/order';
+	onPageScroll(() => {});
+	import countDown from '@/sheep/components/countDown/index.vue';
+	import OrderApi from '@/sheep/api/trade/order';
 
-  const bgColor = {
-    bgColor: '#E93323',
-    Color: '#fff',
-    width: '44rpx',
-    timeTxtwidth: '16rpx',
-    isDay: true,
-  };
-  const isLogin = computed(() => sheep.$store('user').isLogin);
-  const state = reactive({
-    goodsId: 0,
-    skeletonLoading: true, // SPU 加载中
-    goodsInfo: {}, // SPU 信息
-    showSelectSku: false, // 是否展示 SKU 选择弹窗
-    selectedSku: {}, // 选中的 SKU
-    settlementSku: {}, // 结算的 SKU：由于 selectedSku 不进行默认选中，所以初始使用结算价格最低的 SKU 作为基础展示
-    showModel: false, // 是否展示 Coupon 优惠劵的弹窗
-    couponInfo: [], // 可领取的 Coupon 优惠劵的列表
-    showActivityModel: false, // 【满减送/限时折扣】是否展示 Activity 营销活动的弹窗
-    rewardActivity: {}, // 【满减送】活动
-    activityList: [], // 【秒杀/拼团/砍价】可参与的 Activity 营销活动的列表
-  });
+	const bgColor = {
+		bgColor: '#E93323',
+		Color: '#fff',
+		width: '44rpx',
+		timeTxtwidth: '16rpx',
+		isDay: true,
+	};
+	const isLogin = computed(() => sheep.$store('user').isLogin);
+	const state = reactive({
+		goodsId: 0,
+		skeletonLoading: true, // SPU 加载中
+		goodsInfo: {}, // SPU 信息
+		showSelectSku: false, // 是否展示 SKU 选择弹窗
+		selectedSku: {}, // 选中的 SKU
+		settlementSku: {}, // 结算的 SKU：由于 selectedSku 不进行默认选中，所以初始使用结算价格最低的 SKU 作为基础展示
+		showModel: false, // 是否展示 Coupon 优惠劵的弹窗
+		couponInfo: [], // 可领取的 Coupon 优惠劵的列表
+		showActivityModel: false, // 【满减送/限时折扣】是否展示 Activity 营销活动的弹窗
+		rewardActivity: {}, // 【满减送】活动
+		activityList: [], // 【秒杀/拼团/砍价】可参与的 Activity 营销活动的列表
+	});
 
-  // 规格变更
-  function onSkuChange(e) {
-    state.selectedSku = e;
-    state.settlementSku = e;
-  }
+	// 规格变更
+	function onSkuChange(e) {
+		state.selectedSku = e;
+		state.settlementSku = e;
+	}
 
-  // 添加购物车
-  function onAddCart(e) {
-    if (!e.id) {
-      sheep.$helper.toast('请选择商品规格');
-      return;
-    }
-    sheep.$store('cart').add(e);
-  }
+	// 添加购物车
+	function onAddCart(e) {
+		if (!e.id) {
+			sheep.$helper.toast('请选择商品规格');
+			return;
+		}
+		sheep.$store('cart').add(e);
+	}
 
-  // 立即购买
-  function onBuy(e) {
-    if (!e.id) {
-      sheep.$helper.toast('请选择商品规格');
-      return;
-    }
-    sheep.$router.go('/pages/order/confirm', {
-      data: JSON.stringify({
-        items: [
-          {
-            skuId: e.id,
-            count: e.goods_num,
-            categoryId: state.goodsInfo.categoryId,
-          },
-        ],
-      }),
-    });
-  }
+	// 立即购买
+	function onBuy(e) {
+		if (!e.id) {
+			sheep.$helper.toast('请选择商品规格');
+			return;
+		}
+		sheep.$router.go('/pages/order/confirm', {
+			data: JSON.stringify({
+				items: [{
+					skuId: e.id,
+					count: e.goods_num,
+					categoryId: state.goodsInfo.categoryId,
+				}, ],
+			}),
+		});
+	}
 
-  // 打开营销弹窗
-  function onOpenActivity() {
-    state.showActivityModel = true;
-  }
+	// 打开营销弹窗
+	function onOpenActivity() {
+		state.showActivityModel = true;
+	}
 
-  // 立即领取优惠劵
-  async function onTakeCoupon(id) {
-    const { code } = await CouponApi.takeCoupon(id);
-    if (code !== 0) {
-      return;
-    }
-    uni.showToast({
-      title: '领取成功',
-    });
-    setTimeout(() => {
-      getCoupon();
-    }, 1000);
-  }
+	// 立即领取优惠劵
+	async function onTakeCoupon(id) {
+		const {
+			code
+		} = await CouponApi.takeCoupon(id);
+		if (code !== 0) {
+			return;
+		}
+		uni.showToast({
+			title: '领取成功',
+		});
+		setTimeout(() => {
+			getCoupon();
+		}, 1000);
+	}
 
-  const shareInfo = computed(() => {
-    if (isEmpty(state.goodsInfo)) return {};
-    return sheep.$platform.share.getShareInfo(
-      {
-        title: state.goodsInfo.name,
-        image: sheep.$url.cdn(state.goodsInfo.picUrl),
-        desc: state.goodsInfo.introduction,
-        params: {
-          page: '2',
-          query: state.goodsInfo.id,
-        },
-      },
-      {
-        type: 'goods', // 商品海报
-        title: state.goodsInfo.name, // 商品名称
-        image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
-        price: fen2yuan(state.goodsInfo.price), // 商品价格
-        original_price: fen2yuan(state.goodsInfo.marketPrice), // 商品原价
-      },
-    );
-  });
+	const shareInfo = computed(() => {
+		if (isEmpty(state.goodsInfo)) return {};
+		return sheep.$platform.share.getShareInfo({
+			title: state.goodsInfo.name,
+			image: sheep.$url.cdn(state.goodsInfo.picUrl),
+			desc: state.goodsInfo.introduction,
+			params: {
+				page: '2',
+				query: state.goodsInfo.id,
+			},
+		}, {
+			type: 'goods', // 商品海报
+			title: state.goodsInfo.name, // 商品名称
+			image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
+			price: fen2yuan(state.goodsInfo.price), // 商品价格
+			original_price: fen2yuan(state.goodsInfo.marketPrice), // 商品原价
+		}, );
+	});
 
-  async function getCoupon() {
-    const { code, data } = await CouponApi.getCouponTemplateList(state.goodsId, 2, 10);
-    if (code === 0) {
-      state.couponInfo = data;
-    }
-  }
+	async function getCoupon() {
+		const {
+			code,
+			data
+		} = await CouponApi.getCouponTemplateList(state.goodsId, 2, 10);
+		if (code === 0) {
+			state.couponInfo = data;
+		}
+	}
 
-  async function getSettlementByIds(ids) {
-    let { data, code } = await OrderApi.getSettlementProduct(ids);
-    if (code !== 0 || data.length !== 1) {
-      return;
-    }
-    data = data[0];
+	async function getSettlementByIds(ids) {
+		let {
+			data,
+			code
+		} = await OrderApi.getSettlementProduct(ids);
+		if (code !== 0 || data.length !== 1) {
+			return;
+		}
+		data = data[0];
 
-    // 补充 SKU 的价格信息
-    state.goodsInfo.skus.forEach((sku) => {
-      data.skus.forEach((item) => {
-        if (sku.id === item.id) {
-          sku.promotionType = item.promotionType;
-          sku.promotionPrice = item.promotionPrice;
-          sku.promotionId = item.promotionId;
-          sku.promotionEndTime = item.promotionEndTime;
-        }
-      });
-    });
+		// 补充 SKU 的价格信息
+		state.goodsInfo.skus.forEach((sku) => {
+			data.skus.forEach((item) => {
+				if (sku.id === item.id) {
+					sku.promotionType = item.promotionType;
+					sku.promotionPrice = item.promotionPrice;
+					sku.promotionId = item.promotionId;
+					sku.promotionEndTime = item.promotionEndTime;
+				}
+			});
+		});
 
-    // 选择有 promotionPrice 且最小的
-    state.settlementSku = state.goodsInfo.skus
-      .filter((sku) => sku.stock > 0 && sku.promotionPrice > 0)
-      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
+		// 选择有 promotionPrice 且最小的
+		state.settlementSku = state.goodsInfo.skus
+			.filter((sku) => sku.stock > 0 && sku.promotionPrice > 0)
+			.reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
 
-    // 设置满减送活动
-    if (data.rewardActivity) {
-      state.rewardActivity = data.rewardActivity;
-    }
-  }
+		// 设置满减送活动
+		if (data.rewardActivity) {
+			state.rewardActivity = data.rewardActivity;
+			//获取活动时间
+			getActivityTime(state.rewardActivity.id)
+		}
+	}
 
-  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) {
-        FavoriteApi.isFavoriteExists(state.goodsId, 'goods').then((res) => {
-          if (res.code !== 0) {
-            return;
-          }
-          state.goodsInfo.favorite = res.data;
-        });
-      }
-    });
+	//获取活动时间
+	async function getActivityTime(id) {
+		const {
+			code,
+			data
+		} = await RewardActivityApi.getRewardActivity(id);
+		if (code === 0) {
+			// console.log('获取到的活动 数据', data)
+			state.rewardActivity.startTime = data.startTime
+			state.rewardActivity.endTime = data.endTime
+		}
+	}
+	 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) {
+				FavoriteApi.isFavoriteExists(state.goodsId, 'goods').then((res) => {
+					if (res.code !== 0) {
+						return;
+					}
+					state.goodsInfo.favorite = res.data;
+				});
+			}
+		});
 
-    // 2. 加载优惠劵信息
-    getCoupon();
+		// 2. 加载优惠劵信息
+		getCoupon();
 
-    // 3. 加载营销活动信息
-    ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
-      if (res.code !== 0) {
-        return;
-      }
-      state.activityList = res.data;
-    });
-    //获取结算信息
-    getSettlementByIds(state.goodsId);
-  });
+		// 3. 加载营销活动信息
+		ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
+			if (res.code !== 0) {
+				return;
+			}
+			state.activityList = res.data;
+		});
+		//获取结算信息
+		getSettlementByIds(state.goodsId);
+	});
 </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;
+		}
+	}
 
-  // 限时折扣
-  .discount {
-    width: 750rpx;
-    height: 100rpx;
-    // background-color: red;
-    overflow: hidden;
-    position: relative;
-  }
+	// 限时折扣
+	.discount {
+		width: 750rpx;
+		height: 100rpx;
+		// background-color: red;
+		overflow: hidden;
+		position: relative;
+	}
 
-  .disImg {
-    width: 750rpx;
-    height: 100rpx;
-    position: absolute;
-    top: 0;
-    z-index: -1;
-  }
+	.disImg {
+		width: 750rpx;
+		height: 100rpx;
+		position: absolute;
+		top: 0;
+		z-index: -1;
+	}
 
-  .discountCont {
-    width: 680rpx;
-    height: 90rpx;
-    margin: 10rpx auto 0 auto;
-    // background-color: gold;
-  }
+	.discountCont {
+		width: 680rpx;
+		height: 90rpx;
+		margin: 10rpx auto 0 auto;
+		// background-color: gold;
+	}
 
-  .disContT {
-    width: 680rpx;
-    height: 50rpx;
-    display: flex;
-    justify-content: space-between;
-  }
+	.disContT {
+		width: 680rpx;
+		height: 50rpx;
+		display: flex;
+		justify-content: space-between;
+	}
 
-  .disContT1 {
-    width: 400rpx;
-    height: 50rpx;
-    // background-color: green;
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-  }
+	.disContT1 {
+		width: 400rpx;
+		height: 50rpx;
+		// background-color: green;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+	}
 
-  .disContT2 {
-    width: 200rpx;
-    height: 50rpx;
-    line-height: 50rpx;
-    // background-color: gold;
-    font-size: 30rpx;
-    text-align: end;
-    color: white;
-    font-weight: bolder;
-    font-style: oblique 20deg;
-    letter-spacing: 0.1rem;
-  }
+	.disContT2 {
+		width: 200rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		// background-color: gold;
+		font-size: 30rpx;
+		text-align: end;
+		color: white;
+		font-weight: bolder;
+		font-style: oblique 20deg;
+		letter-spacing: 0.1rem;
+	}
 
-  .disContT1P {
-    color: white;
-    font-weight: bold;
-    font-size: 28rpx;
-  }
+	.disContT1P {
+		color: white;
+		font-weight: bold;
+		font-size: 28rpx;
+	}
 
-  .disContT1End {
-    // width: 180rpx;
-    padding: 0 10rpx;
-    height: 30rpx;
-    line-height: 28rpx;
-    text-align: center;
-    font-weight: bold;
-    background-color: white;
-    color: #ff3000;
-    font-size: 23rpx;
-    border-radius: 20rpx;
-    margin-left: 10rpx;
-  }
+	.disContT1End {
+		// width: 180rpx;
+		padding: 0 10rpx;
+		height: 30rpx;
+		line-height: 28rpx;
+		text-align: center;
+		font-weight: bold;
+		background-color: white;
+		color: #ff3000;
+		font-size: 23rpx;
+		border-radius: 20rpx;
+		margin-left: 10rpx;
+	}
 
-  .disContB {
-    width: 680rpx;
-    height: 40rpx;
-    display: flex;
-    justify-content: space-between;
-    font-size: 20rpx;
-    color: white;
-    align-items: center;
-  }
+	.disContB {
+		width: 680rpx;
+		height: 40rpx;
+		display: flex;
+		justify-content: space-between;
+		font-size: 20rpx;
+		color: white;
+		align-items: center;
+	}
 
-  .disContB1 {
-    width: 300rpx;
-    height: 40rpx;
-    line-height: 40rpx;
-  }
+	.disContB1 {
+		width: 300rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+	}
 
-  .disContB2 {
-    width: 300rpx;
-    height: 40rpx;
-    line-height: 40rpx;
-    display: flex;
-    justify-content: flex-end;
-  }
-</style>
+	.disContB2 {
+		width: 300rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		display: flex;
+		justify-content: flex-end;
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-activity-pop/s-activity-pop.vue b/sheep/components/s-activity-pop/s-activity-pop.vue
index 460ccf76..25cf3b94 100644
--- a/sheep/components/s-activity-pop/s-activity-pop.vue
+++ b/sheep/components/s-activity-pop/s-activity-pop.vue
@@ -1,244 +1,259 @@
 <!-- 商品信息：满减送等营销活动的弹窗 -->
 <template>
-  <su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose>
-    <view class="model-box">
-      <view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠</view>
-      <view v-if="state.rewardActivity && state.rewardActivity.id > 0">
-        <view class="titleLi">促销</view>
-        <scroll-view
-          class="model-content"
-          scroll-y
-          :scroll-with-animation="false"
-          :enable-back-to-top="true"
-        >
-          <view
-            class="actBox"
-            v-for="(item, index) in state.rewardActivity.ruleDescriptions"
-            :key="index"
-          >
-            <view
-              class="boxCont ss-flex ss-col-top ss-m-b-40"
-              @tap="onGoodsList(state.rewardActivity)"
-            >
-              <view class="model-content-tag ss-flex ss-row-center">满减</view>
-              <view class="model-content-title">
-                <view class="contBu">
-                  <text>{{ item }}</text>
-                </view>
-                <view class="ss-m-b-24 cotBu-txt">
-                  {{ sheep.$helper.timeFormat(state.rewardActivity.startTime, 'yyyy.mm.dd') }}
-                  -
-                  {{ sheep.$helper.timeFormat(state.rewardActivity.endTime, 'yyyy.mm.dd') }}
-                </view>
-              </view>
-              <text class="cicon-forward" />
-            </view>
-          </view>
-        </scroll-view>
-      </view>
-      <view class="titleLi">可领优惠券</view>
-      <scroll-view
-        class="model-content"
-        scroll-y
-        :scroll-with-animation="false"
-        :enable-back-to-top="true"
-      >
-        <view class="actBox" v-for="item in state.couponInfo" :key="item.id">
-          <view class="boxCont ss-flex ss-col-top ss-m-b-40">
-            <view class="model-content-tag2">
-              <view class="usePrice"> ￥{{ fen2yuan(item.discountPrice) }} </view>
-              <view class="impose"> 满￥{{ fen2yuan(item.usePrice) }}可用 </view>
-            </view>
-            <view class="model-content-title2">
-              <view class="contBu">
-                {{ item.name }}
-              </view>
-              <view class="ss-m-b-24 cotBu-txt">
-                {{
-                  item.validityType == 1
-                    ? sheep.$helper.timeFormat(item.validStartTime, 'yyyy.mm.dd') -
-                      sheep.$helper.timeFormat(item.validEndTime, 'yyyy.mm.dd')
-                    : '领取后' + item.fixedStartTerm + '-' + item.fixedEndTerm + '天可用'
-                }}
-              </view>
-            </view>
-            <view class="coupon" @click.stop="getBuy(item.id)" v-if="item.canTake"> 立即领取 </view>
-            <view class="coupon2" v-else> 已领取 </view>
-          </view>
-        </view>
-      </scroll-view>
-    </view>
-  </su-popup>
+	<su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose>
+		<view class="model-box">
+			<view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠</view>
+			<view v-if="state.rewardActivity && state.rewardActivity.id > 0">
+				<view class="titleLi">促销</view>
+				<scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
+					<view class="actBox" v-for="(item, index) in state.handeActivity" :key="index">
+						<view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(state.rewardActivity)">
+							<view class="model-content-tag ss-flex ss-row-center">{{item.name}}</view>
+							<view class="model-content-title">
+								<view class="contBu">
+									<text v-for="(items,indexs) in item.value" :key="indexs">{{ items }};</text>
+								</view>
+								<view class="ss-m-b-24 cotBu-txt">
+									{{ sheep.$helper.timeFormat(state.rewardActivity.startTime, 'yyyy.mm.dd') }}
+									-
+									{{ sheep.$helper.timeFormat(state.rewardActivity.endTime, 'yyyy.mm.dd') }}
+								</view>
+							</view>
+							<text class="cicon-forward" />
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="titleLi">可领优惠券</view>
+			<scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true" v-if="state.couponInfo.length">
+				<view class="actBox" v-for="item in state.couponInfo" :key="item.id">
+					<view class="boxCont ss-flex ss-col-top ss-m-b-40">
+						<view class="model-content-tag2">
+							<view class="usePrice"> ￥{{ fen2yuan(item.discountPrice) }} </view>
+							<view class="impose"> 满￥{{ fen2yuan(item.usePrice) }}可用 </view>
+						</view>
+						<view class="model-content-title2">
+							<view class="contBu">
+								{{ item.name }}
+							</view>
+							<view class="ss-m-b-24 cotBu-txt">
+								{{
+		              item.validityType == 1
+		                ? sheep.$helper.timeFormat(item.validStartTime, 'yyyy.mm.dd') -
+		                  sheep.$helper.timeFormat(item.validEndTime, 'yyyy.mm.dd')
+		                : '领取后' + item.fixedStartTerm + '-' + item.fixedEndTerm + '天可用'
+		            }}
+							</view>
+						</view>
+						<view class="coupon" @click.stop="getBuy(item.id)" v-if="item.canTake"> 立即领取 </view>
+						<view class="coupon2" v-else> 已领取 </view>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="nullBox" v-else>
+				暂无可领优惠券
+			</view>
+		</view>
+	</su-popup>
 </template>
 <script setup>
-  import sheep from '@/sheep';
-  import { computed, reactive } from 'vue';
-  import { fen2yuan } from '@/sheep/hooks/useGoods';
-  const props = defineProps({
-    modelValue: {
-      type: Object,
-      default() {},
-    },
-    show: {
-      type: Boolean,
-      default: false,
-    },
-  });
-  const emits = defineEmits(['close']);
-  const state = reactive({
-    rewardActivity: computed(() => props.modelValue.rewardActivity),
-    couponInfo: computed(() => props.modelValue.couponInfo),
-  });
+	import sheep from '@/sheep';
+	import {
+		handeleData
+	} from '@/sheep/hooks/useGoods';
+	import {
+		computed,
+		reactive,
+		watch,
+		ref
+	} from 'vue';
+	import {
+		fen2yuan
+	} from '@/sheep/hooks/useGoods';
+	const props = defineProps({
+		modelValue: {
+			type: Object,
+			default () {},
+		},
+		show: {
+			type: Boolean,
+			default: false,
+		},
+	});
+	const emits = defineEmits(['close']);
+	const state = reactive({
+		rewardActivity: computed(() => props.modelValue.rewardActivity),
+		couponInfo: computed(() => props.modelValue.couponInfo),
+	});
+	// setTimeout(()=>{
+	// 	 console.log('历程数据',state.rewardActivity.ruleDescriptions)
+	// 	 console.log('处理数据',handeleData(props.modelValue.rewardActivity.ruleDescriptions))
+	// },5000)
+	// 领取优惠劵
+	const getBuy = (id) => {
+		emits('get', id);
+	};
 
-  // 领取优惠劵
-  const getBuy = (id) => {
-    emits('get', id);
-  };
-
-  function onGoodsList(e) {
-    sheep.$router.go('/pages/activity/index', {
-      activityId: e.id,
-    });
-  }
+	function onGoodsList(e) {
+		sheep.$router.go('/pages/activity/index', {
+			activityId: e.id,
+		});
+	}
+	//监听获取到数据后再执行且只执行一次
+	let flag = ref(true)
+	watch(state, (newValue, oldValue) => {
+		if (flag.value) {
+			flag.value = false
+			state.handeActivity = handeleData(state.rewardActivity.ruleDescriptions)
+		}
+	});
 </script>
 <style lang="scss" scoped>
-  .model-box {
-    height: 60vh;
+	.model-box {
+		height: 60vh;
 
-    .title {
-      justify-content: center;
-      font-size: 36rpx;
-      height: 80rpx;
-      font-weight: bold;
-      color: #333333;
-    }
-  }
+		.title {
+			justify-content: center;
+			font-size: 36rpx;
+			height: 80rpx;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
 
-  .model-content {
-    height: fit-content;
-    max-height: 350rpx;
-    padding: 0 20rpx;
-    box-sizing: border-box;
-    margin-top: 20rpx;
+	.model-content {
+		height: fit-content;
+		max-height: 380rpx;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+		margin-top: 20rpx;
 
-    .model-content-tag {
-      // background: rgba(#ff6911, 0.1);
-      font-size: 35rpx;
-      font-weight: 500;
-      color: #ff6911;
-      line-height: 150rpx;
-      width: 200rpx;
-      height: 150rpx;
-      text-align: center;
+		.model-content-tag {
+			// background: rgba(#ff6911, 0.1);
+			font-size: 35rpx;
+			font-weight: 500;
+			color: #ff6911;
+			line-height: 150rpx;
+			width: 200rpx;
+			height: 150rpx;
+			text-align: center;
 
-      // border-radius: 5rpx;
-    }
+			// border-radius: 5rpx;
+		}
 
-    .model-content-title {
-      width: 450rpx;
-      height: 150rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      color: #333333;
-      overflow: hidden;
-    }
+		.model-content-title {
+			width: 450rpx;
+			height: 150rpx;
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #333333;
+			overflow: hidden;
+		}
 
-    .cicon-forward {
-      font-size: 28rpx;
-      color: #999999;
-      margin: 0 auto;
-    }
-  }
+		.cicon-forward {
+			font-size: 28rpx;
+			color: #999999;
+			margin: 0 auto;
+		}
+	}
 
-  // 新增的
-  .titleLi {
-    margin: 10rpx 0 10rpx 20rpx;
-    font-size: 26rpx;
-  }
+	// 新增的
+	.titleLi {
+		margin: 10rpx 0 10rpx 20rpx;
+		font-size: 26rpx;
+	}
 
-  .actBox {
-    width: 700rpx;
-    height: 150rpx;
-    background-color: #fff2f2;
-    margin: 10rpx auto;
-    border-radius: 10rpx;
-  }
+	.actBox {
+		width: 700rpx;
+		height: 150rpx;
+		background-color: #fff2f2;
+		margin: 10rpx auto;
+		border-radius: 10rpx;
+	}
 
-  .boxCont {
-    width: 700rpx;
-    height: 150rpx;
-    align-items: center;
-  }
+	.boxCont {
+		width: 700rpx;
+		height: 150rpx;
+		align-items: center;
+	}
 
-  .contBu {
-    height: 80rpx;
-    line-height: 80rpx;
-    overflow: hidden;
-    font-size: 30rpx;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    -o-text-overflow: ellipsis;
-  }
+	.contBu {
+		height: 80rpx;
+		line-height: 80rpx;
+		overflow: hidden;
+		font-size: 30rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+	}
 
-  .cotBu-txt {
-    height: 70rpx;
-    line-height: 70rpx;
-    font-size: 25rpx;
-    color: #999999;
-  }
+	.cotBu-txt {
+		height: 70rpx;
+		line-height: 70rpx;
+		font-size: 25rpx;
+		color: #999999;
+	}
 
-  .model-content-tag2 {
-    font-size: 35rpx;
-    font-weight: 500;
-    color: #ff6911;
-    width: 200rpx;
-    height: 150rpx;
-    text-align: center;
-  }
+	.model-content-tag2 {
+		font-size: 35rpx;
+		font-weight: 500;
+		color: #ff6911;
+		width: 200rpx;
+		height: 150rpx;
+		text-align: center;
+	}
 
-  .usePrice {
-    width: 200rpx;
-    height: 90rpx;
-    line-height: 100rpx;
-    // background-color: red;
-  }
+	.usePrice {
+		width: 200rpx;
+		height: 90rpx;
+		line-height: 100rpx;
+		// background-color: red;
+	}
 
-  .impose {
-    width: 200rpx;
-    height: 50rpx;
-    // line-height: 75rpx;
-    font-size: 23rpx;
-    // background-color: gold;
-  }
+	.impose {
+		width: 200rpx;
+		height: 50rpx;
+		// line-height: 75rpx;
+		font-size: 23rpx;
+		// background-color: gold;
+	}
 
-  .model-content-title2 {
-    width: 330rpx;
-    height: 150rpx;
-    font-size: 26rpx;
-    font-weight: 500;
-    color: #333333;
-    overflow: hidden;
-  }
+	.model-content-title2 {
+		width: 330rpx;
+		height: 150rpx;
+		font-size: 26rpx;
+		font-weight: 500;
+		color: #333333;
+		overflow: hidden;
+	}
 
-  .coupon {
-    width: 150rpx;
-    height: 50rpx;
-    line-height: 50rpx;
-    background-color: rgb(255, 68, 68);
-    color: white;
-    border-radius: 30rpx;
-    text-align: center;
-    font-size: 25rpx;
-  }
+	.coupon {
+		width: 150rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background-color: rgb(255, 68, 68);
+		color: white;
+		border-radius: 30rpx;
+		text-align: center;
+		font-size: 25rpx;
+	}
 
-  .coupon2 {
-    width: 150rpx;
-    height: 50rpx;
-    line-height: 50rpx;
-    background-color: rgb(203, 192, 191);
-    color: white;
-    border-radius: 30rpx;
-    text-align: center;
-    font-size: 25rpx;
-  }
-</style>
+	.coupon2 {
+		width: 150rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background-color: rgb(203, 192, 191);
+		color: white;
+		border-radius: 30rpx;
+		text-align: center;
+		font-size: 25rpx;
+	}
+	.nullBox{
+		width: 100%;
+		height: 300rpx;
+		font-size: 25rpx;
+		line-height: 300rpx;
+		text-align: center;
+		color: #999999;
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index a4fc3247..6dce5b1a 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -1,859 +1,809 @@
 <!-- 页面 -->
 <template>
-  <view class="ss-goods-wrap">
-    <!-- xs卡片：横向紧凑型，一行放两个，图片左内容右边  -->
-    <view
-      v-if="size === 'xs'"
-      class="xs-goods-card ss-flex ss-col-stretch"
-      :style="[elStyles]"
-      @tap="onClick"
-    >
-      <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" />
-      <view
-        v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
-        class="xs-goods-content ss-flex-col ss-row-around"
-      >
-        <view
-          v-if="goodsFields.title?.show || goodsFields.name?.show"
-          class="xs-goods-title ss-line-1"
-          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
-        >
-          {{ data.title || data.name }}
-        </view>
-        <!-- 活动信息 -->
-        <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-          <view class="card" v-if="discountText">{{ discountText }}</view>
-          <view class="card2" v-if="data.rewardActivity">
-            {{ data.rewardActivity.ruleDescriptions[0] }}
-          </view>
-        </view>
-        <view
-          v-if="goodsFields.price?.show"
-          class="xs-goods-price font-OPPOSANS"
-          :style="[{ color: goodsFields.price.color }]"
-        >
-          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          <!-- 活动价格 -->
-          <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-          <text v-else>
-            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-          </text>
-        </view>
-      </view>
-    </view>
+	<view class="ss-goods-wrap">
+		<!-- xs卡片：横向紧凑型，一行放两个，图片左内容右边  -->
+		<view v-if="size === 'xs'" class="xs-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @tap="onClick">
+			<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" />
+			<view v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
+				class="xs-goods-content ss-flex-col ss-row-around">
+				<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="xs-goods-title ss-line-1"
+					:style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]">
+					{{ data.title || data.name }}
+				</view>
+				<!-- 活动信息 -->
+				<view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+					<view class="card" v-if="discountText">{{ discountText }}</view>
+					<view class="card2" v-if="data.rewardActivity">
+						{{ (data.rewardActivity.ruleDescriptions[0])[1] }}
+					</view>
+					<view class="card2" v-if="data.rewardActivity && (data.rewardActivity.ruleDescriptions[0])[3]">
+						{{ (data.rewardActivity.ruleDescriptions[0])[3] }}
+					</view>
+				</view>
+				<view v-if="goodsFields.price?.show" class="xs-goods-price font-OPPOSANS"
+					:style="[{ color: goodsFields.price.color }]">
+					<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+					<!-- 活动价格 -->
+					<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+					<text v-else>
+						{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+					</text>
+				</view>
+			</view>
+		</view>
 
-    <!-- sm卡片：竖向紧凑，一行放三个，图上内容下 -->
-    <view v-if="size === 'sm'" class="sm-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
-      <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>
+		<!-- sm卡片：竖向紧凑，一行放三个，图上内容下 -->
+		<view v-if="size === 'sm'" class="sm-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+			<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>
 
-      <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"
-        >
-          {{ data.title || data.name }}
-        </view>
-        <!-- 活动信息 -->
-        <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-          <view class="card" v-if="discountText">{{ discountText }}</view>
-          <view class="card2" v-if="data.rewardActivity">
-            {{ data.rewardActivity.ruleDescriptions[0] }}
-          </view>
-        </view>
-        <view
-          v-if="goodsFields.price?.show"
-          class="sm-goods-price font-OPPOSANS"
-          :style="[{ color: goodsFields.price.color }]"
-        >
-          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          <!-- 活动价格 -->
-          <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-          <text v-else>
-            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-          </text>
-        </view>
-      </view>
-    </view>
+			<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">
+					{{ data.title || data.name }}
+				</view>
+				<!-- 活动信息 -->
+				<view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+					<view class="card" v-if="discountText">{{ discountText }}</view>
+					<view class="card2" v-if="data.rewardActivity">
+						{{ (data.rewardActivity.ruleDescriptions[0])[1] }}
+					</view>
+					<view class="card2" v-if="data.rewardActivity && (data.rewardActivity.ruleDescriptions[0])[3]">
+						{{ (data.rewardActivity.ruleDescriptions[0])[3] }}
+					</view>
+				</view>
+				<view v-if="goodsFields.price?.show" class="sm-goods-price font-OPPOSANS"
+					:style="[{ color: goodsFields.price.color }]">
+					<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+					<!-- 活动价格 -->
+					<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+					<text v-else>
+						{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+					</text>
+				</view>
+			</view>
+		</view>
 
-    <!-- md卡片：竖向，一行放两个，图上内容下 -->
-    <view v-if="size === 'md'" class="md-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
-      <view v-if="tagStyle.show" class="tag-icon-box">
-        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)" />
-      </view>
-      <image class="md-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="widthFix" />
-      <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"
-      >
-        <view
-          v-if="goodsFields.title?.show || goodsFields.name?.show"
-          class="md-goods-title ss-line-1"
-          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
-        >
-          {{ data.title || data.name }}
-        </view>
-        <view
-          v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-          class="md-goods-subtitle ss-m-t-16 ss-line-1"
-          :style="[{ color: subTitleColor, background: subTitleBackground }]"
-        >
-          {{ data.subtitle || data.introduction }}
-        </view>
-        <slot name="activity">
-          <view v-if="data.promos?.length" class="tag-box ss-flex-wrap ss-flex ss-col-center">
-            <view
-              class="activity-tag ss-m-r-10 ss-m-t-16"
-              v-for="item in data.promos"
-              :key="item.id"
-            >
-              {{ item.title }}
-            </view>
-          </view>
-        </slot>
-        <!-- 活动信息 -->
-        <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-          <view class="card" v-if="discountText">{{ discountText }}</view>
-          <view class="card2" v-if="data.rewardActivity">
-            {{ data.rewardActivity.ruleDescriptions[0] }}
-          </view>
-        </view>
-        <view class="ss-flex ss-col-bottom">
-          <view
-            v-if="goodsFields.price?.show"
-            class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10"
-            :style="[{ color: goodsFields.price.color }]"
-          >
-            <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-            <!-- 活动价格 -->
-            <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-            <text v-else>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-            </text>
-          </view>
-          <view
-            v-if="
+		<!-- md卡片：竖向，一行放两个，图上内容下 -->
+		<view v-if="size === 'md'" class="md-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+			<view v-if="tagStyle.show" class="tag-icon-box">
+				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)" />
+			</view>
+			<image class="md-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="widthFix" />
+			<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">
+				<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="md-goods-title ss-line-1"
+					:style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]">
+					{{ data.title || data.name }}
+				</view>
+				<view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+					class="md-goods-subtitle ss-m-t-16 ss-line-1"
+					:style="[{ color: subTitleColor, background: subTitleBackground }]">
+					{{ data.subtitle || data.introduction }}
+				</view>
+				<slot name="activity">
+					<view v-if="data.promos?.length" class="tag-box ss-flex-wrap ss-flex ss-col-center">
+						<view class="activity-tag ss-m-r-10 ss-m-t-16" v-for="item in data.promos" :key="item.id">
+							{{ item.title }}
+						</view>
+					</view>
+				</slot>
+				<!-- 活动信息 -->
+				<view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+					<view class="card" v-if="discountText">{{ discountText }}</view>
+					<view class="card2" v-if="data.rewardActivity">
+						{{ (data.rewardActivity.ruleDescriptions[0])[1] }}
+					</view>
+					<view class="card2" v-if="data.rewardActivity && (data.rewardActivity.ruleDescriptions[0])[3]">
+						{{ (data.rewardActivity.ruleDescriptions[0])[3] }}
+					</view>
+				</view>
+				<view class="ss-flex ss-col-bottom">
+					<view v-if="goodsFields.price?.show" class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10"
+						:style="[{ color: goodsFields.price.color }]">
+						<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+						<!-- 活动价格 -->
+						<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+						<text v-else>
+							{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+						</text>
+					</view>
+					<view 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 }]"
-          >
-            <text class="price-unit ss-font-20">{{ priceUnit }}</text>
-            <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
-          </view>
-        </view>
+            " class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex" :style="[{ color: originPriceColor }]">
+						<text class="price-unit ss-font-20">{{ priceUnit }}</text>
+						<view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+					</view>
+				</view>
 
-        <view class="ss-m-t-16 ss-flex ss-col-center ss-flex-wrap">
-          <view class="sales-text">{{ salesAndStock }}</view>
-        </view>
-      </view>
+				<view class="ss-m-t-16 ss-flex ss-col-center ss-flex-wrap">
+					<view class="sales-text">{{ salesAndStock }}</view>
+				</view>
+			</view>
 
-      <slot name="cart">
-        <view class="cart-box ss-flex ss-col-center ss-row-center">
-          <image class="cart-icon" src="/static/img/shop/tabbar/category2.png" mode="" />
-        </view>
-      </slot>
-    </view>
+			<slot name="cart">
+				<view class="cart-box ss-flex ss-col-center ss-row-center">
+					<image class="cart-icon" src="/static/img/shop/tabbar/category2.png" mode="" />
+				</view>
+			</slot>
+		</view>
 
-    <!-- lg卡片：横向型，一行放一个，图片左内容右边  -->
-    <view
-      v-if="size === 'lg'"
-      class="lg-goods-card ss-flex ss-col-stretch"
-      :style="[elStyles]"
-      @tap="onClick"
-    >
-      <view v-if="tagStyle.show" class="tag-icon-box">
-        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
-      </view>
-      <view v-if="seckillTag" class="seckill-tag ss-flex ss-row-center">秒杀</view>
-      <view v-if="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"
-      />
-      <view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
-        <view>
-          <view
-            v-if="goodsFields.title?.show || goodsFields.name?.show"
-            class="lg-goods-title ss-line-2"
-            :style="[{ color: titleColor }]"
-          >
-            {{ data.title || data.name }}
-          </view>
-          <view
-            v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-            class="lg-goods-subtitle ss-m-t-10 ss-line-1"
-            :style="[{ color: subTitleColor, background: subTitleBackground }]"
-          >
-            {{ data.subtitle || data.introduction }}
-          </view>
-        </view>
-        <view>
-          <slot name="activity">
-            <view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center">
-              <view class="activity-tag ss-m-r-10" v-for="item in data.promos" :key="item.id">
-                {{ item.title }}
-              </view>
-            </view>
-          </slot>
-          <!-- 活动信息 -->
-          <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-            <view class="card" v-if="discountText">{{ discountText }}</view>
-            <view class="card2" v-if="data.rewardActivity">
-              {{ data.rewardActivity.ruleDescriptions[0] }}
-            </view>
-          </view>
-          <view class="ss-flex ss-col-bottom ss-m-t-10">
-            <view
-              v-if="goodsFields.price?.show"
-              class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
-              :style="[{ color: goodsFields.price.color }]"
-            >
-              <text class="ss-font-24">{{ priceUnit }}</text>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-            </view>
-            <view
-              v-if="
+		<!-- lg卡片：横向型，一行放一个，图片左内容右边  -->
+		<view v-if="size === 'lg'" class="lg-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @tap="onClick">
+			<view v-if="tagStyle.show" class="tag-icon-box">
+				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+			</view>
+			<view v-if="seckillTag" class="seckill-tag ss-flex ss-row-center">秒杀</view>
+			<view v-if="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" />
+			<view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
+				<view>
+					<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="lg-goods-title ss-line-2"
+						:style="[{ color: titleColor }]">
+						{{ data.title || data.name }}
+					</view>
+					<view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+						class="lg-goods-subtitle ss-m-t-10 ss-line-1"
+						:style="[{ color: subTitleColor, background: subTitleBackground }]">
+						{{ data.subtitle || data.introduction }}
+					</view>
+				</view>
+				<view>
+					<slot name="activity">
+						<view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center">
+							<view class="activity-tag ss-m-r-10" v-for="item in data.promos" :key="item.id">
+								{{ item.title }}
+							</view>
+						</view>
+					</slot>
+					<!-- 活动信息 -->
+					<view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+						<view class="card" v-if="discountText">{{ discountText }}</view>
+						<view class="card2" v-if="data.rewardActivity">
+							{{ (data.rewardActivity.ruleDescriptions[0])[1] }}
+						</view>
+						<view class="card2" v-if="data.rewardActivity && (data.rewardActivity.ruleDescriptions[0])[3]">
+							{{ (data.rewardActivity.ruleDescriptions[0])[3] }}
+						</view>
+					</view>
+					<view class="ss-flex ss-col-bottom ss-m-t-10">
+						<view v-if="goodsFields.price?.show"
+							class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
+							:style="[{ color: goodsFields.price.color }]">
+							<text class="ss-font-24">{{ priceUnit }}</text>
+							{{ 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)
-              "
-              class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
-              :style="[{ color: originPriceColor }]"
-            >
-              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
-              <!-- 活动价格 -->
-              <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-              <text v-else>
-                {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-              </text>
-            </view>
-          </view>
-          <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
-            <view class="sales-text">{{ salesAndStock }}</view>
-          </view>
-        </view>
-      </view>
+              " class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS" :style="[{ color: originPriceColor }]">
+							<text class="price-unit ss-font-20">{{ priceUnit }}</text>
+							<!-- 活动价格 -->
+							<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+							<text v-else>
+								{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+							</text>
+						</view>
+					</view>
+					<view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
+						<view class="sales-text">{{ salesAndStock }}</view>
+					</view>
+				</view>
+			</view>
 
-      <slot name="cart">
-        <view class="buy-box ss-flex ss-col-center ss-row-center" v-if="buttonShow"> 去购买 </view>
-      </slot>
-    </view>
+			<slot name="cart">
+				<view class="buy-box ss-flex ss-col-center ss-row-center" v-if="buttonShow"> 去购买 </view>
+			</slot>
+		</view>
 
-    <!-- sl卡片：竖向型，一行放一个，图片上内容下边 -->
-    <view v-if="size === 'sl'" class="sl-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
-      <view v-if="tagStyle.show" class="tag-icon-box">
-        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)" />
-      </view>
-      <image
-        class="sl-img-box"
-        :src="sheep.$url.cdn(data.image || data.picUrl)"
-        mode="aspectFill"
-      />
-      <view class="sl-goods-content">
-        <view>
-          <view
-            v-if="goodsFields.title?.show || goodsFields.name?.show"
-            class="sl-goods-title ss-line-1"
-            :style="[{ color: titleColor }]"
-          >
-            {{ data.title || data.name }}
-          </view>
-          <view
-            v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-            class="sl-goods-subtitle ss-m-t-16"
-            :style="[{ color: subTitleColor, background: subTitleBackground }]"
-          >
-            {{ data.subtitle || data.introduction }}
-          </view>
-        </view>
-        <view>
-          <slot name="activity">
-            <view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center ss-flex-wrap">
-              <view
-                class="activity-tag ss-m-r-10 ss-m-t-16"
-                v-for="item in data.promos"
-                :key="item.id"
-              >
-                {{ item.title }}
-              </view>
-            </view>
-          </slot>
-          <!-- 活动信息 -->
-          <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-            <view class="card" v-if="discountText">{{ discountText }}</view>
-            <view class="card2" v-if="data.rewardActivity">
-              {{ data.rewardActivity.ruleDescriptions[0] }}
-            </view>
-          </view>
-          <view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
-            <view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
-              <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-              <!-- 活动价格 -->
-              <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-              <text v-else>
-                {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-              </text>
-            </view>
-            <view
-              v-if="
+		<!-- sl卡片：竖向型，一行放一个，图片上内容下边 -->
+		<view v-if="size === 'sl'" class="sl-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+			<view v-if="tagStyle.show" class="tag-icon-box">
+				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)" />
+			</view>
+			<image class="sl-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFill" />
+			<view class="sl-goods-content">
+				<view>
+					<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="sl-goods-title ss-line-1"
+						:style="[{ color: titleColor }]">
+						{{ data.title || data.name }}
+					</view>
+					<view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+						class="sl-goods-subtitle ss-m-t-16"
+						:style="[{ color: subTitleColor, background: subTitleBackground }]">
+						{{ data.subtitle || data.introduction }}
+					</view>
+				</view>
+				<view>
+					<slot name="activity">
+						<view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center ss-flex-wrap">
+							<view class="activity-tag ss-m-r-10 ss-m-t-16" v-for="item in data.promos" :key="item.id">
+								{{ item.title }}
+							</view>
+						</view>
+					</slot>
+					<!-- 活动信息 -->
+					<view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+						<view class="card" v-if="discountText">{{ discountText }}</view>
+						<view class="card2" v-if="data.rewardActivity">
+							{{ (data.rewardActivity.ruleDescriptions[0])[1] }}
+						</view>
+						<view class="card2" v-if="data.rewardActivity && (data.rewardActivity.ruleDescriptions[0])[3]">
+							{{ (data.rewardActivity.ruleDescriptions[0])[3] }}
+						</view>
+					</view>
+					<view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
+						<view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
+							<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+							<!-- 活动价格 -->
+							<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+							<text v-else>
+								{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+							</text>
+						</view>
+						<view 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 }]"
-            >
-              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
-              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
-            </view>
-          </view>
-          <view class="ss-m-t-16 ss-flex ss-flex-wrap">
-            <view class="sales-text">{{ salesAndStock }}</view>
-          </view>
-        </view>
-      </view>
+              " class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex" :style="[{ color: originPriceColor }]">
+							<text class="price-unit ss-font-20">{{ priceUnit }}</text>
+							<view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+						</view>
+					</view>
+					<view class="ss-m-t-16 ss-flex ss-flex-wrap">
+						<view class="sales-text">{{ salesAndStock }}</view>
+					</view>
+				</view>
+			</view>
 
-      <slot name="cart">
-        <view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view>
-      </slot>
-    </view>
-  </view>
+			<slot name="cart">
+				<view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view>
+			</slot>
+		</view>
+	</view>
 </template>
 
 <script setup>
-  /**
-   * 商品卡片
-   *
-   * @property {Array} size = [xs | sm | md | lg | sl ] 			 	- 列表数据
-   * @property {String} tag 											- md及以上才有
-   * @property {String} img 											- 图片
-   * @property {String} background 									- 背景色
-   * @property {String} topRadius 									- 上圆角
-   * @property {String} bottomRadius 									- 下圆角
-   * @property {String} title 										- 标题
-   * @property {String} titleColor 									- 标题颜色
-   * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
-   * @property {String} subTitle 										- 副标题
-   * @property {String} subTitleColor									- 副标题颜色
-   * @property {String} subTitleBackground 							- 副标题背景
-   * @property {String | Number} price 								- 价格
-   * @property {String} priceColor 									- 价格颜色
-   * @property {String | Number} originPrice 							- 原价/划线价
-   * @property {String} originPriceColor 								- 原价颜色
-   * @property {String | Number} sales 								- 销售数量
-   * @property {String} salesColor									- 销售数量颜色
-   *
-   * @slots activity												 	- 活动插槽
-   * @slots cart														- 购物车插槽，默认包含文字，背景色，文字颜色 || 图片 || 行为
-   *
-   * @event {Function()} click 										- 点击卡片
-   *
-   */
-  import { computed, getCurrentInstance, onMounted, nextTick } from 'vue';
-  import sheep from '@/sheep';
-  import { fen2yuan, formatSales } from '@/sheep/hooks/useGoods';
-  import { formatStock } from '@/sheep/hooks/useGoods';
-  import { isArray } from 'lodash-es';
+	/**
+	 * 商品卡片
+	 *
+	 * @property {Array} size = [xs | sm | md | lg | sl ] 			 	- 列表数据
+	 * @property {String} tag 											- md及以上才有
+	 * @property {String} img 											- 图片
+	 * @property {String} background 									- 背景色
+	 * @property {String} topRadius 									- 上圆角
+	 * @property {String} bottomRadius 									- 下圆角
+	 * @property {String} title 										- 标题
+	 * @property {String} titleColor 									- 标题颜色
+	 * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
+	 * @property {String} subTitle 										- 副标题
+	 * @property {String} subTitleColor									- 副标题颜色
+	 * @property {String} subTitleBackground 							- 副标题背景
+	 * @property {String | Number} price 								- 价格
+	 * @property {String} priceColor 									- 价格颜色
+	 * @property {String | Number} originPrice 							- 原价/划线价
+	 * @property {String} originPriceColor 								- 原价颜色
+	 * @property {String | Number} sales 								- 销售数量
+	 * @property {String} salesColor									- 销售数量颜色
+	 *
+	 * @slots activity												 	- 活动插槽
+	 * @slots cart														- 购物车插槽，默认包含文字，背景色，文字颜色 || 图片 || 行为
+	 *
+	 * @event {Function()} click 										- 点击卡片
+	 *
+	 */
+	import {
+		computed,
+		getCurrentInstance,
+		onMounted,
+		nextTick
+	} from 'vue';
+	import sheep from '@/sheep';
+	import {
+		fen2yuan,
+		formatSales
+	} from '@/sheep/hooks/useGoods';
+	import {
+		formatStock
+	} from '@/sheep/hooks/useGoods';
+	import {
+		isArray
+	} from 'lodash-es';
 
-  // 接收参数
-  const props = defineProps({
-    goodsFields: {
-      type: [Array, Object],
-      default() {
-        return {
-          // 商品价格
-          price: {
-            show: true,
-          },
-          // 库存
-          stock: {
-            show: true,
-          },
-          // 商品名称
-          name: {
-            show: true,
-          },
-          // 商品介绍
-          introduction: {
-            show: true,
-          },
-          // 市场价
-          marketPrice: {
-            show: true,
-          },
-          // 销量
-          salesCount: {
-            show: true,
-          },
-        };
-      },
-    },
-    tagStyle: {
-      type: Object,
-      default: () => ({}),
-    },
-    data: {
-      type: Object,
-      default: () => ({}),
-    },
-    size: {
-      type: String,
-      default: 'sl',
-    },
-    background: {
-      type: String,
-      default: '',
-    },
-    topRadius: {
-      type: Number,
-      default: 0,
-    },
-    bottomRadius: {
-      type: Number,
-      default: 0,
-    },
-    titleWidth: {
-      type: Number,
-      default: 0,
-    },
-    titleColor: {
-      type: String,
-      default: '#333',
-    },
-    priceColor: {
-      type: String,
-      default: '',
-    },
-    originPriceColor: {
-      type: String,
-      default: '#C4C4C4',
-    },
-    priceUnit: {
-      type: String,
-      default: '￥',
-    },
-    subTitleColor: {
-      type: String,
-      default: '#999999',
-    },
-    subTitleBackground: {
-      type: String,
-      default: '',
-    },
-    buttonShow: {
-      type: Boolean,
-      default: true,
-    },
-    seckillTag: {
-      type: Boolean,
-      default: false,
-    },
-    grouponTag: {
-      type: Boolean,
-      default: false,
-    },
-  });
+	// 接收参数
+	const props = defineProps({
+		goodsFields: {
+			type: [Array, Object],
+			default () {
+				return {
+					// 商品价格
+					price: {
+						show: true,
+					},
+					// 库存
+					stock: {
+						show: true,
+					},
+					// 商品名称
+					name: {
+						show: true,
+					},
+					// 商品介绍
+					introduction: {
+						show: true,
+					},
+					// 市场价
+					marketPrice: {
+						show: true,
+					},
+					// 销量
+					salesCount: {
+						show: true,
+					},
+				};
+			},
+		},
+		tagStyle: {
+			type: Object,
+			default: () => ({}),
+		},
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		size: {
+			type: String,
+			default: 'sl',
+		},
+		background: {
+			type: String,
+			default: '',
+		},
+		topRadius: {
+			type: Number,
+			default: 0,
+		},
+		bottomRadius: {
+			type: Number,
+			default: 0,
+		},
+		titleWidth: {
+			type: Number,
+			default: 0,
+		},
+		titleColor: {
+			type: String,
+			default: '#333',
+		},
+		priceColor: {
+			type: String,
+			default: '',
+		},
+		originPriceColor: {
+			type: String,
+			default: '#C4C4C4',
+		},
+		priceUnit: {
+			type: String,
+			default: '￥',
+		},
+		subTitleColor: {
+			type: String,
+			default: '#999999',
+		},
+		subTitleBackground: {
+			type: String,
+			default: '',
+		},
+		buttonShow: {
+			type: Boolean,
+			default: true,
+		},
+		seckillTag: {
+			type: Boolean,
+			default: false,
+		},
+		grouponTag: {
+			type: Boolean,
+			default: false,
+		},
+	});
 
-  // 优惠文案
-  const discountText = computed(() => {
-    const promotionType = props.data.promotionType;
-    if (promotionType === 4) {
-      return '限时优惠';
-    } else if (promotionType === 6) {
-      return '会员价';
-    }
-    return undefined;
-  });
+	// 优惠文案
+	const discountText = computed(() => {
+		const promotionType = props.data.promotionType;
+		if (promotionType === 4) {
+			return '限时优惠';
+		} else if (promotionType === 6) {
+			return '会员价';
+		}
+		return undefined;
+	});
 
-  // 组件样式
-  const elStyles = computed(() => {
-    return {
-      background: props.background,
-      'border-top-left-radius': props.topRadius + 'px',
-      'border-top-right-radius': props.topRadius + 'px',
-      'border-bottom-left-radius': props.bottomRadius + 'px',
-      'border-bottom-right-radius': props.bottomRadius + 'px',
-    };
-  });
+	// 组件样式
+	const elStyles = computed(() => {
+		return {
+			background: props.background,
+			'border-top-left-radius': props.topRadius + 'px',
+			'border-top-right-radius': props.topRadius + 'px',
+			'border-bottom-left-radius': props.bottomRadius + 'px',
+			'border-bottom-right-radius': props.bottomRadius + 'px',
+		};
+	});
 
-  // 格式化销量、库存信息
-  const salesAndStock = computed(() => {
-    let text = [];
-    if (props.goodsFields.salesCount?.show) {
-      text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
-    }
-    if (props.goodsFields.stock?.show) {
-      text.push(formatStock(props.data.stock_show_type, props.data.stock));
-    }
-    return text.join(' | ');
-  });
+	// 格式化销量、库存信息
+	const salesAndStock = computed(() => {
+		let text = [];
+		if (props.goodsFields.salesCount?.show) {
+			text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
+		}
+		if (props.goodsFields.stock?.show) {
+			text.push(formatStock(props.data.stock_show_type, props.data.stock));
+		}
+		return text.join(' | ');
+	});
 
-  // 返回事件
-  const emits = defineEmits(['click', 'getHeight']);
+	// 返回事件
+	const emits = defineEmits(['click', 'getHeight']);
 
-  const onClick = () => {
-    emits('click');
-  };
+	const onClick = () => {
+		emits('click');
+	};
 
-  // 获取卡片实时高度
-  const { proxy } = getCurrentInstance();
-  const elId = `sheep_${Math.ceil(Math.random() * 10e5).toString(36)}`;
+	// 获取卡片实时高度
+	const {
+		proxy
+	} = getCurrentInstance();
+	const elId = `sheep_${Math.ceil(Math.random() * 10e5).toString(36)}`;
 
-  function getGoodsPriceCardWH() {
-    if (props.size === 'md') {
-      const view = uni.createSelectorQuery().in(proxy);
-      view.select(`#${elId}`).fields({
-        size: true,
-        scrollOffset: true,
-      });
-      view.exec((data) => {
-        let totalHeight = 0;
-        const goodsPriceCard = data[0];
-        if (props.data.image_wh) {
-          totalHeight =
-            (goodsPriceCard.width / props.data.image_wh.w) * props.data.image_wh.h +
-            goodsPriceCard.height;
-        } else {
-          totalHeight = goodsPriceCard.width;
-        }
-        emits('getHeight', totalHeight);
-      });
-    }
-  }
-  onMounted(() => {
-    nextTick(() => {
-      getGoodsPriceCardWH();
-    });
-  });
+	function getGoodsPriceCardWH() {
+		if (props.size === 'md') {
+			const view = uni.createSelectorQuery().in(proxy);
+			view.select(`#${elId}`).fields({
+				size: true,
+				scrollOffset: true,
+			});
+			view.exec((data) => {
+				let totalHeight = 0;
+				const goodsPriceCard = data[0];
+				if (props.data.image_wh) {
+					totalHeight =
+						(goodsPriceCard.width / props.data.image_wh.w) * props.data.image_wh.h +
+						goodsPriceCard.height;
+				} else {
+					totalHeight = goodsPriceCard.width;
+				}
+				emits('getHeight', totalHeight);
+			});
+		}
+	}
+	onMounted(() => {
+		nextTick(() => {
+			getGoodsPriceCardWH();
+		});
+	});
 </script>
 
 <style lang="scss" scoped>
-  .tag-icon-box {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 2;
+	.tag-icon-box {
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 2;
 
-    .tag-icon {
-      width: 72rpx;
-      height: 44rpx;
-    }
-  }
+		.tag-icon {
+			width: 72rpx;
+			height: 44rpx;
+		}
+	}
 
-  .seckill-tag {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 2;
-    width: 68rpx;
-    height: 38rpx;
-    background: linear-gradient(90deg, #ff5854 0%, #ff2621 100%);
-    border-radius: 10rpx 0px 10rpx 0px;
-    font-size: 24rpx;
-    font-weight: 500;
-    color: #ffffff;
-    line-height: 32rpx;
-  }
+	.seckill-tag {
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 2;
+		width: 68rpx;
+		height: 38rpx;
+		background: linear-gradient(90deg, #ff5854 0%, #ff2621 100%);
+		border-radius: 10rpx 0px 10rpx 0px;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #ffffff;
+		line-height: 32rpx;
+	}
 
-  .groupon-tag {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 2;
-    width: 68rpx;
-    height: 38rpx;
-    background: linear-gradient(90deg, #fe832a 0%, #ff6600 100%);
-    border-radius: 10rpx 0px 10rpx 0px;
-    font-size: 24rpx;
-    font-weight: 500;
-    color: #ffffff;
-    line-height: 32rpx;
-  }
+	.groupon-tag {
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 2;
+		width: 68rpx;
+		height: 38rpx;
+		background: linear-gradient(90deg, #fe832a 0%, #ff6600 100%);
+		border-radius: 10rpx 0px 10rpx 0px;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #ffffff;
+		line-height: 32rpx;
+	}
 
-  .goods-img {
-    width: 100%;
-    height: 100%;
-    background-color: #f5f5f5;
-  }
+	.goods-img {
+		width: 100%;
+		height: 100%;
+		background-color: #f5f5f5;
+	}
 
-  .price-unit {
-    margin-right: -4px;
-  }
+	.price-unit {
+		margin-right: -4px;
+	}
 
-  .sales-text {
-    display: table;
-    font-size: 24rpx;
-    transform: scale(0.8);
-    margin-left: 0rpx;
-    color: #c4c4c4;
-  }
+	.sales-text {
+		display: table;
+		font-size: 24rpx;
+		transform: scale(0.8);
+		margin-left: 0rpx;
+		color: #c4c4c4;
+	}
 
-  .activity-tag {
-    font-size: 20rpx;
-    color: #ff0000;
-    line-height: 30rpx;
-    padding: 0 10rpx;
-    border: 1px solid rgba(#ff0000, 0.25);
-    border-radius: 4px;
-    flex-shrink: 0;
-  }
+	.activity-tag {
+		font-size: 20rpx;
+		color: #ff0000;
+		line-height: 30rpx;
+		padding: 0 10rpx;
+		border: 1px solid rgba(#ff0000, 0.25);
+		border-radius: 4px;
+		flex-shrink: 0;
+	}
 
-  .goods-origin-price {
-    font-size: 20rpx;
-    color: #c4c4c4;
-    line-height: 36rpx;
-    text-decoration: line-through;
-  }
+	.goods-origin-price {
+		font-size: 20rpx;
+		color: #c4c4c4;
+		line-height: 36rpx;
+		text-decoration: line-through;
+	}
 
-  // xs
-  .xs-goods-card {
-    overflow: hidden;
-    // max-width: 375rpx;
-    background-color: $white;
-    position: relative;
+	// xs
+	.xs-goods-card {
+		overflow: hidden;
+		// max-width: 375rpx;
+		background-color: $white;
+		position: relative;
 
-    .xs-img-box {
-      width: 128rpx;
-      height: 128rpx;
-      margin-right: 20rpx;
-    }
+		.xs-img-box {
+			width: 128rpx;
+			height: 128rpx;
+			margin-right: 20rpx;
+		}
 
-    .xs-goods-title {
-      font-size: 26rpx;
-      color: #333;
-      font-weight: 500;
-    }
+		.xs-goods-title {
+			font-size: 26rpx;
+			color: #333;
+			font-weight: 500;
+		}
 
-    .xs-goods-price {
-      font-size: 30rpx;
-      color: $red;
-    }
-  }
+		.xs-goods-price {
+			font-size: 30rpx;
+			color: $red;
+		}
+	}
 
-  // sm
-  .sm-goods-card {
-    overflow: hidden;
-    // width: 223rpx;
-    // width: 100%;
-    background-color: $white;
-    position: relative;
+	// sm
+	.sm-goods-card {
+		overflow: hidden;
+		// width: 223rpx;
+		// width: 100%;
+		background-color: $white;
+		position: relative;
 
-    .sm-img-box {
-      // width: 228rpx;
-      width: 100%;
-      height: 208rpx;
-    }
+		.sm-img-box {
+			// width: 228rpx;
+			width: 100%;
+			height: 208rpx;
+		}
 
-    .sm-goods-content {
-      padding: 20rpx 16rpx;
-      box-sizing: border-box;
-    }
+		.sm-goods-content {
+			padding: 20rpx 16rpx;
+			box-sizing: border-box;
+		}
 
-    .sm-goods-title {
-      font-size: 26rpx;
-      color: #333;
-    }
+		.sm-goods-title {
+			font-size: 26rpx;
+			color: #333;
+		}
 
-    .sm-goods-price {
-      font-size: 30rpx;
-      color: $red;
-    }
-  }
+		.sm-goods-price {
+			font-size: 30rpx;
+			color: $red;
+		}
+	}
 
-  // md
-  .md-goods-card {
-    overflow: hidden;
-    width: 100%;
-    position: relative;
-    z-index: 1;
-    background-color: $white;
-    position: relative;
+	// md
+	.md-goods-card {
+		overflow: hidden;
+		width: 100%;
+		position: relative;
+		z-index: 1;
+		background-color: $white;
+		position: relative;
 
-    .md-img-box {
-      width: 100%;
-    }
+		.md-img-box {
+			width: 100%;
+		}
 
-    .md-goods-title {
-      font-size: 26rpx;
-      color: #333;
-      width: 100%;
-    }
+		.md-goods-title {
+			font-size: 26rpx;
+			color: #333;
+			width: 100%;
+		}
 
-    .md-goods-subtitle {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-    }
+		.md-goods-subtitle {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+		}
 
-    .md-goods-price {
-      font-size: 30rpx;
-      color: $red;
-      line-height: 36rpx;
-    }
+		.md-goods-price {
+			font-size: 30rpx;
+			color: $red;
+			line-height: 36rpx;
+		}
 
-    .cart-box {
-      width: 54rpx;
-      height: 54rpx;
-      background: linear-gradient(90deg, #fe8900, #ff5e00);
-      border-radius: 50%;
-      position: absolute;
-      bottom: 50rpx;
-      right: 20rpx;
-      z-index: 2;
+		.cart-box {
+			width: 54rpx;
+			height: 54rpx;
+			background: linear-gradient(90deg, #fe8900, #ff5e00);
+			border-radius: 50%;
+			position: absolute;
+			bottom: 50rpx;
+			right: 20rpx;
+			z-index: 2;
 
-      .cart-icon {
-        width: 30rpx;
-        height: 30rpx;
-      }
-    }
-  }
+			.cart-icon {
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+	}
 
-  // lg
-  .lg-goods-card {
-    overflow: hidden;
-    position: relative;
-    z-index: 1;
-    background-color: $white;
-    height: 280rpx;
+	// lg
+	.lg-goods-card {
+		overflow: hidden;
+		position: relative;
+		z-index: 1;
+		background-color: $white;
+		height: 280rpx;
 
-    .lg-img-box {
-      width: 280rpx;
-      height: 280rpx;
-      margin-right: 20rpx;
-    }
+		.lg-img-box {
+			width: 280rpx;
+			height: 280rpx;
+			margin-right: 20rpx;
+		}
 
-    .lg-goods-title {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #333333;
-      // line-height: 36rpx;
-      // width: 410rpx;
-    }
+		.lg-goods-title {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #333333;
+			// line-height: 36rpx;
+			// width: 410rpx;
+		}
 
-    .lg-goods-subtitle {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-      // line-height: 30rpx;
-      // width: 410rpx;
-    }
+		.lg-goods-subtitle {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+			// line-height: 30rpx;
+			// width: 410rpx;
+		}
 
-    .lg-goods-price {
-      font-size: 30rpx;
-      color: $red;
-      line-height: 36rpx;
-    }
+		.lg-goods-price {
+			font-size: 30rpx;
+			color: $red;
+			line-height: 36rpx;
+		}
 
-    .buy-box {
-      position: absolute;
-      bottom: 20rpx;
-      right: 20rpx;
-      z-index: 2;
-      width: 120rpx;
-      height: 50rpx;
-      background: linear-gradient(90deg, #fe8900, #ff5e00);
-      border-radius: 25rpx;
-      font-size: 24rpx;
-      color: #ffffff;
-    }
+		.buy-box {
+			position: absolute;
+			bottom: 20rpx;
+			right: 20rpx;
+			z-index: 2;
+			width: 120rpx;
+			height: 50rpx;
+			background: linear-gradient(90deg, #fe8900, #ff5e00);
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			color: #ffffff;
+		}
 
-    .tag-box {
-      width: 100%;
-    }
-  }
+		.tag-box {
+			width: 100%;
+		}
+	}
 
-  // sl
+	// sl
 
-  .sl-goods-card {
-    overflow: hidden;
-    position: relative;
-    z-index: 1;
-    width: 100%;
-    background-color: $white;
+	.sl-goods-card {
+		overflow: hidden;
+		position: relative;
+		z-index: 1;
+		width: 100%;
+		background-color: $white;
 
-    .sl-goods-content {
-      padding: 20rpx 20rpx;
-      box-sizing: border-box;
-    }
+		.sl-goods-content {
+			padding: 20rpx 20rpx;
+			box-sizing: border-box;
+		}
 
-    .sl-img-box {
-      width: 100%;
-      height: 360rpx;
-    }
+		.sl-img-box {
+			width: 100%;
+			height: 360rpx;
+		}
 
-    .sl-goods-title {
-      font-size: 26rpx;
-      color: #333;
-      font-weight: 500;
-    }
+		.sl-goods-title {
+			font-size: 26rpx;
+			color: #333;
+			font-weight: 500;
+		}
 
-    .sl-goods-subtitle {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-      line-height: 30rpx;
-    }
+		.sl-goods-subtitle {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+			line-height: 30rpx;
+		}
 
-    .sl-goods-price {
-      font-size: 30rpx;
-      color: $red;
-      line-height: 36rpx;
-    }
+		.sl-goods-price {
+			font-size: 30rpx;
+			color: $red;
+			line-height: 36rpx;
+		}
 
-    .buy-box {
-      position: absolute;
-      bottom: 20rpx;
-      right: 20rpx;
-      z-index: 2;
-      width: 148rpx;
-      height: 50rpx;
-      background: linear-gradient(90deg, #fe8900, #ff5e00);
-      border-radius: 25rpx;
-      font-size: 24rpx;
-      color: #ffffff;
-    }
-  }
+		.buy-box {
+			position: absolute;
+			bottom: 20rpx;
+			right: 20rpx;
+			z-index: 2;
+			width: 148rpx;
+			height: 50rpx;
+			background: linear-gradient(90deg, #fe8900, #ff5e00);
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			color: #ffffff;
+		}
+	}
 
-  .card {
-    width: fit-content;
-    height: fit-content;
-    padding: 2rpx 10rpx;
-    background-color: red;
-    color: #ffffff;
-    font-size: 24rpx;
-  }
+	.card {
+		width: fit-content;
+		height: fit-content;
+		padding: 2rpx 10rpx;
+		background-color: red;
+		color: #ffffff;
+		font-size: 24rpx;
+		margin-top: 5rpx;
+	}
 
-  .card2 {
-    width: fit-content;
-    height: fit-content;
-    padding: 2rpx 10rpx;
-    background-color: rgb(255, 242, 241);
-    color: #ff2621;
-    font-size: 24rpx;
-    margin-left: 5rpx;
-  }
+	.card2 {
+		width: fit-content;
+		height: fit-content;
+		padding: 2rpx 10rpx;
+		background-color: rgb(255, 242, 241);
+		color: #ff2621;
+		font-size: 24rpx;
+		margin: 5rpx 0 5rpx 5rpx;
+	}
 
-  .iconBox {
-    width: 100%;
-    height: fit-content;
-    margin-top: 10rpx;
-    display: flex;
-    justify-content: flex-start;
-  }
-</style>
+	.iconBox {
+		width: 100%;
+		height: fit-content;
+		margin-top: 10rpx;
+		display: flex;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index 41402704..5c12f26a 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -1,7 +1,11 @@
-import { ref } from 'vue';
+import {
+	ref
+} from 'vue';
 import dayjs from 'dayjs';
 import $url from '@/sheep/url';
-import { formatDate } from '@/sheep/util';
+import {
+	formatDate
+} from '@/sheep/util';
 
 /**
  * 格式化销量
@@ -10,8 +14,8 @@ import { formatDate } from '@/sheep/util';
  * @return {string} 格式化后的销量字符串
  */
 export function formatSales(type, num) {
-  let prefix = type !== 'exact' && num < 10 ? '销量' : '已售';
-  return formatNum(prefix, type, num);
+	let prefix = type !== 'exact' && num < 10 ? '销量' : '已售';
+	return formatNum(prefix, type, num);
 }
 
 /**
@@ -21,7 +25,7 @@ export function formatSales(type, num) {
  * @return {string} 格式化后的销量字符串
  */
 export function formatExchange(type, num) {
-  return formatNum('已兑换', type, num);
+	return formatNum('已兑换', type, num);
 }
 
 /**
@@ -31,7 +35,7 @@ export function formatExchange(type, num) {
  * @return {string} 格式化后的销量字符串
  */
 export function formatStock(type, num) {
-  return formatNum('库存', type, num);
+	return formatNum('库存', type, num);
 }
 
 /**
@@ -42,27 +46,27 @@ export function formatStock(type, num) {
  * @return {string} 格式化后的销量字符串
  */
 export function formatNum(prefix, type, num) {
-  num = num || 0;
-  // 情况一：精确数值
-  if (type === 'exact') {
-    return prefix + num;
-  }
-  // 情况二：小于等于 10
-  if (num < 10) {
-    return `${prefix}≤10`;
-  }
-  // 情况三：大于 10，除第一位外，其它位都显示为0
-  // 例如：100  - 199  显示为 100+
-  //      9000 - 9999 显示为 9000+
-  const numStr = num.toString();
-  const first = numStr[0];
-  const other = '0'.repeat(numStr.length - 1);
-  return `${prefix}${first}${other}+`;
+	num = num || 0;
+	// 情况一：精确数值
+	if (type === 'exact') {
+		return prefix + num;
+	}
+	// 情况二：小于等于 10
+	if (num < 10) {
+		return `${prefix}≤10`;
+	}
+	// 情况三：大于 10，除第一位外，其它位都显示为0
+	// 例如：100  - 199  显示为 100+
+	//      9000 - 9999 显示为 9000+
+	const numStr = num.toString();
+	const first = numStr[0];
+	const other = '0'.repeat(numStr.length - 1);
+	return `${prefix}${first}${other}+`;
 }
 
 // 格式化价格
 export function formatPrice(e) {
-  return e.length === 1 ? e[0] : e.join('~');
+	return e.length === 1 ? e[0] : e.join('~');
 }
 
 // 视频格式后缀列表
@@ -75,19 +79,19 @@ const VIDEO_SUFFIX_LIST = ['.avi', '.mp4'];
  * @return {{src: string, type: 'video' | 'image' }[]}  转换后的链接列表
  */
 export function formatGoodsSwiper(urlList) {
-  return (
-    urlList
-      ?.filter((url) => url)
-      .map((url, key) => {
-        const isVideo = VIDEO_SUFFIX_LIST.some((suffix) => url.includes(suffix));
-        const type = isVideo ? 'video' : 'image';
-        const src = $url.cdn(url);
-        return {
-          type,
-          src,
-        };
-      }) || []
-  );
+	return (
+		urlList
+		?.filter((url) => url)
+		.map((url, key) => {
+			const isVideo = VIDEO_SUFFIX_LIST.some((suffix) => url.includes(suffix));
+			const type = isVideo ? 'video' : 'image';
+			const src = $url.cdn(url);
+			return {
+				type,
+				src,
+			};
+		}) || []
+	);
 }
 
 /**
@@ -97,16 +101,16 @@ export function formatGoodsSwiper(urlList) {
  * @return {string} 颜色的 class 名称
  */
 export function formatOrderColor(order) {
-  if (order.status === 0) {
-    return 'info-color';
-  }
-  if (order.status === 10 || order.status === 20 || (order.status === 30 && !order.commentStatus)) {
-    return 'warning-color';
-  }
-  if (order.status === 30 && order.commentStatus) {
-    return 'success-color';
-  }
-  return 'danger-color';
+	if (order.status === 0) {
+		return 'info-color';
+	}
+	if (order.status === 10 || order.status === 20 || (order.status === 30 && !order.commentStatus)) {
+		return 'warning-color';
+	}
+	if (order.status === 30 && order.commentStatus) {
+		return 'success-color';
+	}
+	return 'danger-color';
 }
 
 /**
@@ -115,25 +119,25 @@ export function formatOrderColor(order) {
  * @param order 订单
  */
 export function formatOrderStatus(order) {
-  if (order.status === 0) {
-    return '待付款';
-  }
-  if (order.status === 10 && order.deliveryType === 1) {
-    return '待发货';
-  }
-  if (order.status === 10 && order.deliveryType === 2) {
-    return '待核销';
-  }
-  if (order.status === 20) {
-    return '待收货';
-  }
-  if (order.status === 30 && !order.commentStatus) {
-    return '待评价';
-  }
-  if (order.status === 30 && order.commentStatus) {
-    return '已完成';
-  }
-  return '已关闭';
+	if (order.status === 0) {
+		return '待付款';
+	}
+	if (order.status === 10 && order.deliveryType === 1) {
+		return '待发货';
+	}
+	if (order.status === 10 && order.deliveryType === 2) {
+		return '待核销';
+	}
+	if (order.status === 20) {
+		return '待收货';
+	}
+	if (order.status === 30 && !order.commentStatus) {
+		return '待评价';
+	}
+	if (order.status === 30 && order.commentStatus) {
+		return '已完成';
+	}
+	return '已关闭';
 }
 
 /**
@@ -142,22 +146,22 @@ export function formatOrderStatus(order) {
  * @param order 订单
  */
 export function formatOrderStatusDescription(order) {
-  if (order.status === 0) {
-    return `请在 ${formatDate(order.payExpireTime)} 前完成支付`;
-  }
-  if (order.status === 10) {
-    return '商家未发货，请耐心等待';
-  }
-  if (order.status === 20) {
-    return '商家已发货，请耐心等待';
-  }
-  if (order.status === 30 && !order.commentStatus) {
-    return '已收货，快去评价一下吧';
-  }
-  if (order.status === 30 && order.commentStatus) {
-    return '交易完成，感谢您的支持';
-  }
-  return '交易关闭';
+	if (order.status === 0) {
+		return `请在 ${formatDate(order.payExpireTime)} 前完成支付`;
+	}
+	if (order.status === 10) {
+		return '商家未发货，请耐心等待';
+	}
+	if (order.status === 20) {
+		return '商家已发货，请耐心等待';
+	}
+	if (order.status === 30 && !order.commentStatus) {
+		return '已收货，快去评价一下吧';
+	}
+	if (order.status === 30 && order.commentStatus) {
+		return '交易完成，感谢您的支持';
+	}
+	return '交易关闭';
 }
 
 /**
@@ -166,32 +170,32 @@ export function formatOrderStatusDescription(order) {
  * @param order 订单
  */
 export function handleOrderButtons(order) {
-  order.buttons = [];
-  if (order.type === 3) {
-    // 查看拼团
-    order.buttons.push('combination');
-  }
-  if (order.status === 20) {
-    // 确认收货
-    order.buttons.push('confirm');
-  }
-  if (order.logisticsId > 0) {
-    // 查看物流
-    order.buttons.push('express');
-  }
-  if (order.status === 0) {
-    // 取消订单 / 发起支付
-    order.buttons.push('cancel');
-    order.buttons.push('pay');
-  }
-  if (order.status === 30 && !order.commentStatus) {
-    // 发起评价
-    order.buttons.push('comment');
-  }
-  if (order.status === 40) {
-    // 删除订单
-    order.buttons.push('delete');
-  }
+	order.buttons = [];
+	if (order.type === 3) {
+		// 查看拼团
+		order.buttons.push('combination');
+	}
+	if (order.status === 20) {
+		// 确认收货
+		order.buttons.push('confirm');
+	}
+	if (order.logisticsId > 0) {
+		// 查看物流
+		order.buttons.push('express');
+	}
+	if (order.status === 0) {
+		// 取消订单 / 发起支付
+		order.buttons.push('cancel');
+		order.buttons.push('pay');
+	}
+	if (order.status === 30 && !order.commentStatus) {
+		// 发起评价
+		order.buttons.push('comment');
+	}
+	if (order.status === 40) {
+		// 删除订单
+		order.buttons.push('delete');
+	}
 }
 
 /**
@@ -200,31 +204,31 @@ export function handleOrderButtons(order) {
  * @param afterSale 售后
  */
 export function formatAfterSaleStatus(afterSale) {
-  if (afterSale.status === 10) {
-    return '申请售后';
-  }
-  if (afterSale.status === 20) {
-    return '商品待退货';
-  }
-  if (afterSale.status === 30) {
-    return '商家待收货';
-  }
-  if (afterSale.status === 40) {
-    return '等待退款';
-  }
-  if (afterSale.status === 50) {
-    return '退款成功';
-  }
-  if (afterSale.status === 61) {
-    return '买家取消';
-  }
-  if (afterSale.status === 62) {
-    return '商家拒绝';
-  }
-  if (afterSale.status === 63) {
-    return '商家拒收货';
-  }
-  return '未知状态';
+	if (afterSale.status === 10) {
+		return '申请售后';
+	}
+	if (afterSale.status === 20) {
+		return '商品待退货';
+	}
+	if (afterSale.status === 30) {
+		return '商家待收货';
+	}
+	if (afterSale.status === 40) {
+		return '等待退款';
+	}
+	if (afterSale.status === 50) {
+		return '退款成功';
+	}
+	if (afterSale.status === 61) {
+		return '买家取消';
+	}
+	if (afterSale.status === 62) {
+		return '商家拒绝';
+	}
+	if (afterSale.status === 63) {
+		return '商家拒收货';
+	}
+	return '未知状态';
 }
 
 /**
@@ -233,31 +237,31 @@ export function formatAfterSaleStatus(afterSale) {
  * @param afterSale 售后
  */
 export function formatAfterSaleStatusDescription(afterSale) {
-  if (afterSale.status === 10) {
-    return '退款申请待商家处理';
-  }
-  if (afterSale.status === 20) {
-    return '请退货并填写物流信息';
-  }
-  if (afterSale.status === 30) {
-    return '退货退款申请待商家处理';
-  }
-  if (afterSale.status === 40) {
-    return '等待退款';
-  }
-  if (afterSale.status === 50) {
-    return '退款成功';
-  }
-  if (afterSale.status === 61) {
-    return '退款关闭';
-  }
-  if (afterSale.status === 62) {
-    return `商家不同意退款申请，拒绝原因：${afterSale.auditReason}`;
-  }
-  if (afterSale.status === 63) {
-    return `商家拒绝收货，不同意退款，拒绝原因：${afterSale.auditReason}`;
-  }
-  return '未知状态';
+	if (afterSale.status === 10) {
+		return '退款申请待商家处理';
+	}
+	if (afterSale.status === 20) {
+		return '请退货并填写物流信息';
+	}
+	if (afterSale.status === 30) {
+		return '退货退款申请待商家处理';
+	}
+	if (afterSale.status === 40) {
+		return '等待退款';
+	}
+	if (afterSale.status === 50) {
+		return '退款成功';
+	}
+	if (afterSale.status === 61) {
+		return '退款关闭';
+	}
+	if (afterSale.status === 62) {
+		return `商家不同意退款申请，拒绝原因：${afterSale.auditReason}`;
+	}
+	if (afterSale.status === 63) {
+		return `商家拒绝收货，不同意退款，拒绝原因：${afterSale.auditReason}`;
+	}
+	return '未知状态';
 }
 
 /**
@@ -266,15 +270,15 @@ export function formatAfterSaleStatusDescription(afterSale) {
  * @param afterSale 售后
  */
 export function handleAfterSaleButtons(afterSale) {
-  afterSale.buttons = [];
-  if ([10, 20, 30].includes(afterSale.status)) {
-    // 取消订单
-    afterSale.buttons.push('cancel');
-  }
-  if (afterSale.status === 20) {
-    // 退货信息
-    afterSale.buttons.push('delivery');
-  }
+	afterSale.buttons = [];
+	if ([10, 20, 30].includes(afterSale.status)) {
+		// 取消订单
+		afterSale.buttons.push('cancel');
+	}
+	if (afterSale.status === 20) {
+		// 退货信息
+		afterSale.buttons.push('delivery');
+	}
 }
 
 /**
@@ -284,28 +288,28 @@ export function handleAfterSaleButtons(afterSale) {
  * @return {{s: string, ms: number, h: string, m: string}} 持续时间
  */
 export function useDurationTime(toTime, fromTime = '') {
-  toTime = getDayjsTime(toTime);
-  if (fromTime === '') {
-    fromTime = dayjs();
-  }
-  let duration = ref(toTime - fromTime);
-  if (duration.value > 0) {
-    setTimeout(() => {
-      if (duration.value > 0) {
-        duration.value -= 1000;
-      }
-    }, 1000);
-  }
+	toTime = getDayjsTime(toTime);
+	if (fromTime === '') {
+		fromTime = dayjs();
+	}
+	let duration = ref(toTime - fromTime);
+	if (duration.value > 0) {
+		setTimeout(() => {
+			if (duration.value > 0) {
+				duration.value -= 1000;
+			}
+		}, 1000);
+	}
 
-  let durationTime = dayjs.duration(duration.value);
-  return {
-    h: (durationTime.months() * 30 * 24 + durationTime.days() * 24 + durationTime.hours())
-      .toString()
-      .padStart(2, '0'),
-    m: durationTime.minutes().toString().padStart(2, '0'),
-    s: durationTime.seconds().toString().padStart(2, '0'),
-    ms: durationTime.$ms,
-  };
+	let durationTime = dayjs.duration(duration.value);
+	return {
+		h: (durationTime.months() * 30 * 24 + durationTime.days() * 24 + durationTime.hours())
+			.toString()
+			.padStart(2, '0'),
+		m: durationTime.minutes().toString().padStart(2, '0'),
+		s: durationTime.seconds().toString().padStart(2, '0'),
+		ms: durationTime.$ms,
+	};
 }
 
 /**
@@ -314,19 +318,19 @@ export function useDurationTime(toTime, fromTime = '') {
  * @return {dayjs.Dayjs}
  */
 function getDayjsTime(time) {
-  time = time.toString();
-  if (time.indexOf('-') > 0) {
-    // 'date'
-    return dayjs(time);
-  }
-  if (time.length > 10) {
-    // 'timestamp'
-    return dayjs(parseInt(time));
-  }
-  if (time.length === 10) {
-    // 'unixTime'
-    return dayjs.unix(parseInt(time));
-  }
+	time = time.toString();
+	if (time.indexOf('-') > 0) {
+		// 'date'
+		return dayjs(time);
+	}
+	if (time.length > 10) {
+		// 'timestamp'
+		return dayjs(parseInt(time));
+	}
+	if (time.length === 10) {
+		// 'unixTime'
+		return dayjs.unix(parseInt(time));
+	}
 }
 
 /**
@@ -336,7 +340,7 @@ function getDayjsTime(time) {
  * @returns {string} 元，例如说 1.00 元
  */
 export function fen2yuan(price) {
-  return (price / 100.0).toFixed(2);
+	return (price / 100.0).toFixed(2);
 }
 
 /**
@@ -354,55 +358,99 @@ export function fen2yuan(price) {
  * @param skus 商品 SKU 数组
  */
 export function convertProductPropertyList(skus) {
-  let result = [];
-  for (const sku of skus) {
-    if (!sku.properties) {
-      continue;
-    }
-    for (const property of sku.properties) {
-      // ① 先处理属性
-      let resultProperty = result.find((item) => item.id === property.propertyId);
-      if (!resultProperty) {
-        resultProperty = {
-          id: property.propertyId,
-          name: property.propertyName,
-          values: [],
-        };
-        result.push(resultProperty);
-      }
-      // ② 再处理属性值
-      let resultValue = resultProperty.values.find((item) => item.id === property.valueId);
-      if (!resultValue) {
-        resultProperty.values.push({
-          id: property.valueId,
-          name: property.valueName,
-        });
-      }
-    }
-  }
-  return result;
+	let result = [];
+	for (const sku of skus) {
+		if (!sku.properties) {
+			continue;
+		}
+		for (const property of sku.properties) {
+			// ① 先处理属性
+			let resultProperty = result.find((item) => item.id === property.propertyId);
+			if (!resultProperty) {
+				resultProperty = {
+					id: property.propertyId,
+					name: property.propertyName,
+					values: [],
+				};
+				result.push(resultProperty);
+			}
+			// ② 再处理属性值
+			let resultValue = resultProperty.values.find((item) => item.id === property.valueId);
+			if (!resultValue) {
+				resultProperty.values.push({
+					id: property.valueId,
+					name: property.valueName,
+				});
+			}
+		}
+	}
+	return result;
 }
 
 export function appendSettlementProduct(spus, settlementInfos) {
-  if (!settlementInfos || settlementInfos.length === 0) {
-    return;
-  }
-  for (const spu of spus) {
-    const settlementInfo = settlementInfos.find((info) => info.spuId === spu.id);
-    if (!settlementInfo) {
-      return;
-    }
-    // 选择价格最小的 SKU 设置到 SPU 上
-    const settlementSku = settlementInfo.skus
-      .filter((sku) => sku.promotionPrice > 0)
-      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
-    if (settlementSku) {
-      spu.promotionType = settlementSku.promotionType;
-      spu.promotionPrice = settlementSku.promotionPrice;
-    }
-    // 设置【满减送】活动
-    if (settlementInfo.rewardActivity) {
-      spu.rewardActivity = settlementInfo.rewardActivity;
-    }
-  }
+	if (!settlementInfos || settlementInfos.length === 0) {
+		return;
+	}
+	for (const spu of spus) {
+		const settlementInfo = settlementInfos.find((info) => info.spuId === spu.id);
+		if (!settlementInfo) {
+			return;
+		}
+		// 选择价格最小的 SKU 设置到 SPU 上
+		const settlementSku = settlementInfo.skus
+			.filter((sku) => sku.promotionPrice > 0)
+			.reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
+		if (settlementSku) {
+			spu.promotionType = settlementSku.promotionType;
+			spu.promotionPrice = settlementSku.promotionPrice;
+		}
+		// 设置【满减送】活动
+		if (settlementInfo.rewardActivity) {
+			spu.rewardActivity = settlementInfo.rewardActivity;
+		}
+	}
 }
+
+//处理促销信息
+export function handeleData(array) {
+	const array2 = ref([{
+			name: '满减',
+			value: []
+		},
+		{
+			name: '满送',
+			value: []
+		},
+		{
+			name: '包邮',
+			value: []
+		},
+		{
+			name: '赠品',
+			value: []
+		}
+	]);
+
+	array.forEach(item => {
+		Object.entries(item).forEach(([key, value]) => {
+			const type = parseInt(key);
+			switch (type) {
+				case 1:
+					array2.value[0].value.push(value); // 满减
+					break;
+				case 2:
+					array2.value[1].value.push(value); // 满送
+					break;
+				case 3:
+					array2.value[2].value.push(value); // 包邮
+					break;
+				case 4:
+					array2.value[3].value.push(value); // 赠品
+					break;
+				default:
+					break;
+			}
+		});
+	});
+	return array2
+}
\ No newline at end of file

From ab709267be58bcd142a031e3882591d9053e071e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=97=B4=E8=B4=A7?= <252048765@qq.com>
Date: Wed, 18 Sep 2024 18:11:54 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=BB=A1=E5=87=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/index.vue   | 5 +++++
 sheep/hooks/useGoods.js | 9 +--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index c78ae242..c6031b1d 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -83,6 +83,11 @@
 										<text v-if="(state.rewardActivity.ruleDescriptions[0])[4]">券 </text>
 										{{(state.rewardActivity.ruleDescriptions[0])[1]}}
 									</view>
+									<view v-if="state.rewardActivity && state.rewardActivity.id > 0"
+										class="tag ss-m-r-10" @tap="onOpenActivity">
+										<text v-if="(state.rewardActivity.ruleDescriptions[0])[1]"></text>
+										{{(state.rewardActivity.ruleDescriptions[0])[1]}}
+									</view>
 								</view>
 							</div>
 							<!-- 领取优惠劵的按钮 -->
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index 5c12f26a..a8bf1b26 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -418,16 +418,12 @@ export function handeleData(array) {
 			value: []
 		},
 		{
-			name: '满送',
+			name: '赠品',
 			value: []
 		},
 		{
 			name: '包邮',
 			value: []
-		},
-		{
-			name: '赠品',
-			value: []
 		}
 	]);
 
@@ -444,9 +440,6 @@ export function handeleData(array) {
 				case 3:
 					array2.value[2].value.push(value); // 包邮
 					break;
-				case 4:
-					array2.value[3].value.push(value); // 赠品
-					break;
 				default:
 					break;
 			}

From 3dad154ca0418aca5f4e331d2375297ab5e18b5a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 21 Sep 2024 14:30:27 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=BB=A1=E5=87=8F=E9=80=81=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/index.vue                      |    2 +-
 pages/goods/index.vue                         | 1160 ++++++------
 .../s-activity-pop/s-activity-pop.vue         |  466 +++--
 .../s-goods-column/s-goods-column.vue         | 1548 +++++++++--------
 sheep/hooks/useGoods.js                       |  626 ++++---
 5 files changed, 1987 insertions(+), 1815 deletions(-)

diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index d414ebd8..95739155 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -7,7 +7,7 @@
         <view class="type-text ss-flex ss-row-center">满减：</view>
         <view class="ss-flex-1">
           <view class="tip-content" v-for="item in state.activityInfo.rules" :key="item">
-            {{ item.description[1] }}
+            {{ item.description }}
           </view>
         </view>
         <image class="activity-left-image" src="/static/activity-left.png" />
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index c6031b1d..03298620 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -1,619 +1,669 @@
 <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" />
-					<!-- 限时折扣/会员价的优惠信息 -->
-					<view class="discount" v-if="state.settlementSku && state.settlementSku.id && state.settlementSku.promotionPrice">
-						<image class="disImg" :src="sheep.$url.static('/static/img/shop/goods/dis.png')" />
-						<view class="discountCont">
-							<view class="disContT">
-								<view class="disContT1">
-									<view class="disContT1P">
-										￥{{ fen2yuan(state.settlementSku.promotionPrice) }}
-									</view>
-									<view class="disContT1End">
-										直降￥
-										{{ fen2yuan(state.settlementSku.price - state.settlementSku.promotionPrice) }}
-									</view>
-								</view>
-								<view class="disContT2" v-if="state.settlementSku.promotionType === 4">
-									限时折扣
-								</view>
-								<view class="disContT2" v-else-if="state.settlementSku.promotionType === 6">
-									会员折扣
-								</view>
-							</view>
-							<view class="disContB">
-								<view class="disContB1">
-									价格：￥{{ fen2yuan(state.settlementSku.price) }} 丨 剩余：
-									{{ state.settlementSku.stock }}
-								</view>
-								<view class="disContB2" v-if="state.settlementSku.promotionEndTime > 0">
-									距结束仅剩
-									<countDown :tipText="' '" :bgColor="bgColor" :dayText="':'" :hourText="':'"
-										:minuteText="':'" :secondText="' '"
-										:datatime="state.settlementSku.promotionEndTime / 1000" :isDay="false" />
-								</view>
-							</view>
-						</view>
-					</view>
-					<!-- 价格+标题 -->
-					<view class="title-card detail-card ss-p-y-30 ss-p-x-20">
-						<!-- 没有限时折扣/会员价的优惠信息时，展示的价格信息 -->
-						<view class="ss-flex ss-row-between ss-col-center ss-m-b-26"
-							v-if="!(state.settlementSku.promotionPrice)">
-							<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
+      <!-- 骨架屏 -->
+      <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="discount"
+            v-if="
+              state.settlementSku && state.settlementSku.id && state.settlementSku.promotionPrice
+            "
+          >
+            <image class="disImg" :src="sheep.$url.static('/static/img/shop/goods/dis.png')" />
+            <view class="discountCont">
+              <view class="disContT">
+                <view class="disContT1">
+                  <view class="disContT1P">
+                    ￥{{ fen2yuan(state.settlementSku.promotionPrice) }}
+                  </view>
+                  <view class="disContT1End">
+                    直降￥
+                    {{ fen2yuan(state.settlementSku.price - state.settlementSku.promotionPrice) }}
+                  </view>
+                </view>
+                <view class="disContT2" v-if="state.settlementSku.promotionType === 4">
+                  限时折扣
+                </view>
+                <view class="disContT2" v-else-if="state.settlementSku.promotionType === 6">
+                  会员折扣
+                </view>
+              </view>
+              <view class="disContB">
+                <view class="disContB1">
+                  价格：￥{{ fen2yuan(state.settlementSku.price) }} 丨 剩余：
+                  {{ state.settlementSku.stock }}
+                </view>
+                <view class="disContB2" v-if="state.settlementSku.promotionEndTime > 0">
+                  距结束仅剩
+                  <countDown
+                    :tipText="' '"
+                    :bgColor="bgColor"
+                    :dayText="':'"
+                    :hourText="':'"
+                    :minuteText="':'"
+                    :secondText="' '"
+                    :datatime="state.settlementSku.promotionEndTime / 1000"
+                    :isDay="false"
+                  />
+                </view>
+              </view>
+            </view>
+          </view>
+          <!-- 价格+标题 -->
+          <view class="title-card detail-card ss-p-y-30 ss-p-x-20">
+            <!-- 没有限时折扣/会员价的优惠信息时，展示的价格信息 -->
+            <view
+              class="ss-flex ss-row-between ss-col-center ss-m-b-26"
+              v-if="!state.settlementSku.promotionPrice"
+            >
+              <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">
+              <!-- 查看优惠劵的描述 -->
+              <view
+                class="tag ss-m-r-10"
+                v-for="coupon in state.couponInfo.slice(0, 1)"
+                :key="coupon.id"
+                @tap="onOpenActivity"
+              >
+                [劵]满{{ fen2yuanSimple(coupon.usePrice) }}元{{
+                  coupon.discountType === 1
+                    ? '减' + fen2yuanSimple(coupon.discountPrice) + '元'
+                    : '打' + formatDiscountPercent(coupon.discountPercent) + '折'
+                }}
+              </view>
+              <!-- 查看满减送的描述 -->
+              <div class="tag-content">
+                <view class="tag-box ss-flex">
+                  <!-- 最多打印 3 条，所以需要扣除优惠劵已打印的 -->
+                  <view
+                    v-for="item in getRewardActivityRuleItemDescriptions(
+                      state.rewardActivity,
+                    ).slice(0, 3 - state.couponInfo.slice(0, 1).length)"
+                    :key="item"
                     class="tag ss-m-r-10"
-                    v-for="coupon in state.couponInfo.slice(0, 1)"
-                    :key="coupon.id"
                     @tap="onOpenActivity"
                   >
-                    222
-                  </view> -->
-									<view v-if="state.rewardActivity && state.rewardActivity.id > 0"
-										class="tag ss-m-r-10" @tap="onOpenActivity">
-										<text v-if="(state.rewardActivity.ruleDescriptions[0])[4]">券 </text>
-										{{(state.rewardActivity.ruleDescriptions[0])[1]}}
-									</view>
-									<view v-if="state.rewardActivity && state.rewardActivity.id > 0"
-										class="tag ss-m-r-10" @tap="onOpenActivity">
-										<text v-if="(state.rewardActivity.ruleDescriptions[0])[1]"></text>
-										{{(state.rewardActivity.ruleDescriptions[0])[1]}}
-									</view>
-								</view>
-							</div>
-							<!-- 领取优惠劵的按钮 -->
-							<view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="onOpenActivity"
-								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>
+                    <text>{{ item }}</text>
+                  </view>
+                </view>
+              </div>
+              <!-- 领取优惠劵的按钮 -->
+              <view
+                class="get-coupon-box ss-flex ss-col-center ss-m-l-20"
+                @tap="onOpenActivity"
+                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-activity-pop v-model="state" :show="state.showActivityModel" @close="state.showActivityModel = false"
-					@get="onTakeCoupon" />
-			</block>
-		</s-layout>
-	</view>
+        <!-- 满减送/限时折扣活动弹窗 -->
+        <s-activity-pop
+          v-model="state"
+          :show="state.showActivityModel"
+          @close="state.showActivityModel = false"
+          @get="onTakeCoupon"
+        />
+      </block>
+    </s-layout>
+  </view>
 </template>
 
 <script setup>
-	import {
-		reactive,
-		computed,
-		ref,
-		toRaw
-	} 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 RewardActivityApi from '@/sheep/api/promotion/rewardActivity';
-	import {
-		formatSales,
-		formatGoodsSwiper,
-		fen2yuan
-	} from '@/sheep/hooks/useGoods';
-	import detailNavbar from './components/detail/detail-navbar.vue';
-	import detailCellSku from './components/detail/detail-cell-sku.vue';
-	import detailTabbar from './components/detail/detail-tabbar.vue';
-	import detailSkeleton from './components/detail/detail-skeleton.vue';
-	import detailCommentCard from './components/detail/detail-comment-card.vue';
-	import detailContentCard from './components/detail/detail-content-card.vue';
-	import detailActivityTip from './components/detail/detail-activity-tip.vue';
-	import {
-		isEmpty
-	} from 'lodash-es';
-	import SpuApi from '@/sheep/api/product/spu';
+  import { reactive, computed, ref, toRaw } 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 RewardActivityApi from '@/sheep/api/promotion/rewardActivity';
+  import {
+    formatSales,
+    formatGoodsSwiper,
+    fen2yuan,
+    fen2yuanSimple,
+    formatDiscountPercent,
+    getRewardActivityRuleItemDescriptions,
+  } from '@/sheep/hooks/useGoods';
+  import detailNavbar from './components/detail/detail-navbar.vue';
+  import detailCellSku from './components/detail/detail-cell-sku.vue';
+  import detailTabbar from './components/detail/detail-tabbar.vue';
+  import detailSkeleton from './components/detail/detail-skeleton.vue';
+  import detailCommentCard from './components/detail/detail-comment-card.vue';
+  import detailContentCard from './components/detail/detail-content-card.vue';
+  import detailActivityTip from './components/detail/detail-activity-tip.vue';
+  import { isEmpty } from 'lodash-es';
+  import SpuApi from '@/sheep/api/product/spu';
 
-	onPageScroll(() => {});
-	import countDown from '@/sheep/components/countDown/index.vue';
-	import OrderApi from '@/sheep/api/trade/order';
+  onPageScroll(() => {});
+  import countDown from '@/sheep/components/countDown/index.vue';
+  import OrderApi from '@/sheep/api/trade/order';
+  import activity from '@/sheep/api/promotion/activity';
 
-	const bgColor = {
-		bgColor: '#E93323',
-		Color: '#fff',
-		width: '44rpx',
-		timeTxtwidth: '16rpx',
-		isDay: true,
-	};
-	const isLogin = computed(() => sheep.$store('user').isLogin);
-	const state = reactive({
-		goodsId: 0,
-		skeletonLoading: true, // SPU 加载中
-		goodsInfo: {}, // SPU 信息
-		showSelectSku: false, // 是否展示 SKU 选择弹窗
-		selectedSku: {}, // 选中的 SKU
-		settlementSku: {}, // 结算的 SKU：由于 selectedSku 不进行默认选中，所以初始使用结算价格最低的 SKU 作为基础展示
-		showModel: false, // 是否展示 Coupon 优惠劵的弹窗
-		couponInfo: [], // 可领取的 Coupon 优惠劵的列表
-		showActivityModel: false, // 【满减送/限时折扣】是否展示 Activity 营销活动的弹窗
-		rewardActivity: {}, // 【满减送】活动
-		activityList: [], // 【秒杀/拼团/砍价】可参与的 Activity 营销活动的列表
-	});
+  const bgColor = {
+    bgColor: '#E93323',
+    Color: '#fff',
+    width: '44rpx',
+    timeTxtwidth: '16rpx',
+    isDay: true,
+  };
+  const isLogin = computed(() => sheep.$store('user').isLogin);
+  const state = reactive({
+    goodsId: 0,
+    skeletonLoading: true, // SPU 加载中
+    goodsInfo: {}, // SPU 信息
+    showSelectSku: false, // 是否展示 SKU 选择弹窗
+    selectedSku: {}, // 选中的 SKU
+    settlementSku: {}, // 结算的 SKU：由于 selectedSku 不进行默认选中，所以初始使用结算价格最低的 SKU 作为基础展示
+    showModel: false, // 是否展示 Coupon 优惠劵的弹窗
+    couponInfo: [], // 可领取的 Coupon 优惠劵的列表
+    showActivityModel: false, // 【满减送/限时折扣】是否展示 Activity 营销活动的弹窗
+    rewardActivity: {}, // 【满减送】活动
+    activityList: [], // 【秒杀/拼团/砍价】可参与的 Activity 营销活动的列表
+  });
 
-	// 规格变更
-	function onSkuChange(e) {
-		state.selectedSku = e;
-		state.settlementSku = e;
-	}
+  // 规格变更
+  function onSkuChange(e) {
+    state.selectedSku = e;
+    state.settlementSku = e;
+  }
 
-	// 添加购物车
-	function onAddCart(e) {
-		if (!e.id) {
-			sheep.$helper.toast('请选择商品规格');
-			return;
-		}
-		sheep.$store('cart').add(e);
-	}
+  // 添加购物车
+  function onAddCart(e) {
+    if (!e.id) {
+      sheep.$helper.toast('请选择商品规格');
+      return;
+    }
+    sheep.$store('cart').add(e);
+  }
 
-	// 立即购买
-	function onBuy(e) {
-		if (!e.id) {
-			sheep.$helper.toast('请选择商品规格');
-			return;
-		}
-		sheep.$router.go('/pages/order/confirm', {
-			data: JSON.stringify({
-				items: [{
-					skuId: e.id,
-					count: e.goods_num,
-					categoryId: state.goodsInfo.categoryId,
-				}, ],
-			}),
-		});
-	}
+  // 立即购买
+  function onBuy(e) {
+    if (!e.id) {
+      sheep.$helper.toast('请选择商品规格');
+      return;
+    }
+    sheep.$router.go('/pages/order/confirm', {
+      data: JSON.stringify({
+        items: [
+          {
+            skuId: e.id,
+            count: e.goods_num,
+            categoryId: state.goodsInfo.categoryId,
+          },
+        ],
+      }),
+    });
+  }
 
-	// 打开营销弹窗
-	function onOpenActivity() {
-		state.showActivityModel = true;
-	}
+  // 打开营销弹窗
+  function onOpenActivity() {
+    state.showActivityModel = true;
+  }
 
-	// 立即领取优惠劵
-	async function onTakeCoupon(id) {
-		const {
-			code
-		} = await CouponApi.takeCoupon(id);
-		if (code !== 0) {
-			return;
-		}
-		uni.showToast({
-			title: '领取成功',
-		});
-		setTimeout(() => {
-			getCoupon();
-		}, 1000);
-	}
+  // 立即领取优惠劵
+  async function onTakeCoupon(id) {
+    const { code } = await CouponApi.takeCoupon(id);
+    if (code !== 0) {
+      return;
+    }
+    uni.showToast({
+      title: '领取成功',
+    });
+    setTimeout(() => {
+      getCoupon();
+    }, 1000);
+  }
 
-	const shareInfo = computed(() => {
-		if (isEmpty(state.goodsInfo)) return {};
-		return sheep.$platform.share.getShareInfo({
-			title: state.goodsInfo.name,
-			image: sheep.$url.cdn(state.goodsInfo.picUrl),
-			desc: state.goodsInfo.introduction,
-			params: {
-				page: '2',
-				query: state.goodsInfo.id,
-			},
-		}, {
-			type: 'goods', // 商品海报
-			title: state.goodsInfo.name, // 商品名称
-			image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
-			price: fen2yuan(state.goodsInfo.price), // 商品价格
-			original_price: fen2yuan(state.goodsInfo.marketPrice), // 商品原价
-		}, );
-	});
+  const shareInfo = computed(() => {
+    if (isEmpty(state.goodsInfo)) return {};
+    return sheep.$platform.share.getShareInfo(
+      {
+        title: state.goodsInfo.name,
+        image: sheep.$url.cdn(state.goodsInfo.picUrl),
+        desc: state.goodsInfo.introduction,
+        params: {
+          page: '2',
+          query: state.goodsInfo.id,
+        },
+      },
+      {
+        type: 'goods', // 商品海报
+        title: state.goodsInfo.name, // 商品名称
+        image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
+        price: fen2yuan(state.goodsInfo.price), // 商品价格
+        original_price: fen2yuan(state.goodsInfo.marketPrice), // 商品原价
+      },
+    );
+  });
 
-	async function getCoupon() {
-		const {
-			code,
-			data
-		} = await CouponApi.getCouponTemplateList(state.goodsId, 2, 10);
-		if (code === 0) {
-			state.couponInfo = data;
-		}
-	}
+  async function getCoupon() {
+    const { code, data } = await CouponApi.getCouponTemplateList(state.goodsId, 2, 10);
+    if (code === 0) {
+      state.couponInfo = data;
+    }
+  }
 
-	async function getSettlementByIds(ids) {
-		let {
-			data,
-			code
-		} = await OrderApi.getSettlementProduct(ids);
-		if (code !== 0 || data.length !== 1) {
-			return;
-		}
-		data = data[0];
+  async function getSettlementByIds(ids) {
+    let { data, code } = await OrderApi.getSettlementProduct(ids);
+    if (code !== 0 || data.length !== 1) {
+      return;
+    }
+    data = data[0];
 
-		// 补充 SKU 的价格信息
-		state.goodsInfo.skus.forEach((sku) => {
-			data.skus.forEach((item) => {
-				if (sku.id === item.id) {
-					sku.promotionType = item.promotionType;
-					sku.promotionPrice = item.promotionPrice;
-					sku.promotionId = item.promotionId;
-					sku.promotionEndTime = item.promotionEndTime;
-				}
-			});
-		});
+    // 补充 SKU 的价格信息
+    state.goodsInfo.skus.forEach((sku) => {
+      data.skus.forEach((item) => {
+        if (sku.id === item.id) {
+          sku.promotionType = item.promotionType;
+          sku.promotionPrice = item.promotionPrice;
+          sku.promotionId = item.promotionId;
+          sku.promotionEndTime = item.promotionEndTime;
+        }
+      });
+    });
 
-		// 选择有 promotionPrice 且最小的
-		state.settlementSku = state.goodsInfo.skus
-			.filter((sku) => sku.stock > 0 && sku.promotionPrice > 0)
-			.reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
+    // 选择有 promotionPrice 且最小的
+    state.settlementSku = state.goodsInfo.skus
+      .filter((sku) => sku.stock > 0 && sku.promotionPrice > 0)
+      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
 
-		// 设置满减送活动
-		if (data.rewardActivity) {
-			state.rewardActivity = data.rewardActivity;
-			//获取活动时间
-			getActivityTime(state.rewardActivity.id)
-		}
-	}
+    // 设置满减送活动
+    if (data.rewardActivity) {
+      state.rewardActivity = data.rewardActivity;
+      //获取活动时间
+      getActivityTime(state.rewardActivity.id);
+    }
+  }
 
-	//获取活动时间
-	async function getActivityTime(id) {
-		const {
-			code,
-			data
-		} = await RewardActivityApi.getRewardActivity(id);
-		if (code === 0) {
-			// console.log('获取到的活动 数据', data)
-			state.rewardActivity.startTime = data.startTime
-			state.rewardActivity.endTime = data.endTime
-		}
-	}
-	 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) {
-				FavoriteApi.isFavoriteExists(state.goodsId, 'goods').then((res) => {
-					if (res.code !== 0) {
-						return;
-					}
-					state.goodsInfo.favorite = res.data;
-				});
-			}
-		});
+  //获取活动时间
+  async function getActivityTime(id) {
+    const { code, data } = await RewardActivityApi.getRewardActivity(id);
+    if (code === 0) {
+      // console.log('获取到的活动 数据', data)
+      state.rewardActivity.startTime = data.startTime;
+      state.rewardActivity.endTime = data.endTime;
+    }
+  }
 
-		// 2. 加载优惠劵信息
-		getCoupon();
+  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) {
+        FavoriteApi.isFavoriteExists(state.goodsId, 'goods').then((res) => {
+          if (res.code !== 0) {
+            return;
+          }
+          state.goodsInfo.favorite = res.data;
+        });
+      }
+    });
 
-		// 3. 加载营销活动信息
-		ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
-			if (res.code !== 0) {
-				return;
-			}
-			state.activityList = res.data;
-		});
-		//获取结算信息
-		getSettlementByIds(state.goodsId);
-	});
+    // 2. 加载优惠劵信息
+    getCoupon();
+
+    // 3. 加载营销活动信息
+    ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
+      if (res.code !== 0) {
+        return;
+      }
+      state.activityList = res.data;
+    });
+    //获取结算信息
+    getSettlementByIds(state.goodsId);
+  });
 </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;
+    }
+  }
 
-	// 限时折扣
-	.discount {
-		width: 750rpx;
-		height: 100rpx;
-		// background-color: red;
-		overflow: hidden;
-		position: relative;
-	}
+  // 限时折扣
+  .discount {
+    width: 750rpx;
+    height: 100rpx;
+    // background-color: red;
+    overflow: hidden;
+    position: relative;
+  }
 
-	.disImg {
-		width: 750rpx;
-		height: 100rpx;
-		position: absolute;
-		top: 0;
-		z-index: -1;
-	}
+  .disImg {
+    width: 750rpx;
+    height: 100rpx;
+    position: absolute;
+    top: 0;
+    z-index: -1;
+  }
 
-	.discountCont {
-		width: 680rpx;
-		height: 90rpx;
-		margin: 10rpx auto 0 auto;
-		// background-color: gold;
-	}
+  .discountCont {
+    width: 680rpx;
+    height: 90rpx;
+    margin: 10rpx auto 0 auto;
+    // background-color: gold;
+  }
 
-	.disContT {
-		width: 680rpx;
-		height: 50rpx;
-		display: flex;
-		justify-content: space-between;
-	}
+  .disContT {
+    width: 680rpx;
+    height: 50rpx;
+    display: flex;
+    justify-content: space-between;
+  }
 
-	.disContT1 {
-		width: 400rpx;
-		height: 50rpx;
-		// background-color: green;
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
-	}
+  .disContT1 {
+    width: 400rpx;
+    height: 50rpx;
+    // background-color: green;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
 
-	.disContT2 {
-		width: 200rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		// background-color: gold;
-		font-size: 30rpx;
-		text-align: end;
-		color: white;
-		font-weight: bolder;
-		font-style: oblique 20deg;
-		letter-spacing: 0.1rem;
-	}
+  .disContT2 {
+    width: 200rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    // background-color: gold;
+    font-size: 30rpx;
+    text-align: end;
+    color: white;
+    font-weight: bolder;
+    font-style: oblique 20deg;
+    letter-spacing: 0.1rem;
+  }
 
-	.disContT1P {
-		color: white;
-		font-weight: bold;
-		font-size: 28rpx;
-	}
+  .disContT1P {
+    color: white;
+    font-weight: bold;
+    font-size: 28rpx;
+  }
 
-	.disContT1End {
-		// width: 180rpx;
-		padding: 0 10rpx;
-		height: 30rpx;
-		line-height: 28rpx;
-		text-align: center;
-		font-weight: bold;
-		background-color: white;
-		color: #ff3000;
-		font-size: 23rpx;
-		border-radius: 20rpx;
-		margin-left: 10rpx;
-	}
+  .disContT1End {
+    // width: 180rpx;
+    padding: 0 10rpx;
+    height: 30rpx;
+    line-height: 28rpx;
+    text-align: center;
+    font-weight: bold;
+    background-color: white;
+    color: #ff3000;
+    font-size: 23rpx;
+    border-radius: 20rpx;
+    margin-left: 10rpx;
+  }
 
-	.disContB {
-		width: 680rpx;
-		height: 40rpx;
-		display: flex;
-		justify-content: space-between;
-		font-size: 20rpx;
-		color: white;
-		align-items: center;
-	}
+  .disContB {
+    width: 680rpx;
+    height: 40rpx;
+    display: flex;
+    justify-content: space-between;
+    font-size: 20rpx;
+    color: white;
+    align-items: center;
+  }
 
-	.disContB1 {
-		width: 300rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-	}
+  .disContB1 {
+    width: 300rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+  }
 
-	.disContB2 {
-		width: 300rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		display: flex;
-		justify-content: flex-end;
-	}
-</style>
\ No newline at end of file
+  .disContB2 {
+    width: 300rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    display: flex;
+    justify-content: flex-end;
+  }
+</style>
diff --git a/sheep/components/s-activity-pop/s-activity-pop.vue b/sheep/components/s-activity-pop/s-activity-pop.vue
index 25cf3b94..44a028ac 100644
--- a/sheep/components/s-activity-pop/s-activity-pop.vue
+++ b/sheep/components/s-activity-pop/s-activity-pop.vue
@@ -1,259 +1,255 @@
 <!-- 商品信息：满减送等营销活动的弹窗 -->
 <template>
-	<su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose>
-		<view class="model-box">
-			<view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠</view>
-			<view v-if="state.rewardActivity && state.rewardActivity.id > 0">
-				<view class="titleLi">促销</view>
-				<scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
-					<view class="actBox" v-for="(item, index) in state.handeActivity" :key="index">
-						<view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(state.rewardActivity)">
-							<view class="model-content-tag ss-flex ss-row-center">{{item.name}}</view>
-							<view class="model-content-title">
-								<view class="contBu">
-									<text v-for="(items,indexs) in item.value" :key="indexs">{{ items }};</text>
-								</view>
-								<view class="ss-m-b-24 cotBu-txt">
-									{{ sheep.$helper.timeFormat(state.rewardActivity.startTime, 'yyyy.mm.dd') }}
-									-
-									{{ sheep.$helper.timeFormat(state.rewardActivity.endTime, 'yyyy.mm.dd') }}
-								</view>
-							</view>
-							<text class="cicon-forward" />
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-			<view class="titleLi">可领优惠券</view>
-			<scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true" v-if="state.couponInfo.length">
-				<view class="actBox" v-for="item in state.couponInfo" :key="item.id">
-					<view class="boxCont ss-flex ss-col-top ss-m-b-40">
-						<view class="model-content-tag2">
-							<view class="usePrice"> ￥{{ fen2yuan(item.discountPrice) }} </view>
-							<view class="impose"> 满￥{{ fen2yuan(item.usePrice) }}可用 </view>
-						</view>
-						<view class="model-content-title2">
-							<view class="contBu">
-								{{ item.name }}
-							</view>
-							<view class="ss-m-b-24 cotBu-txt">
-								{{
-		              item.validityType == 1
-		                ? sheep.$helper.timeFormat(item.validStartTime, 'yyyy.mm.dd') -
-		                  sheep.$helper.timeFormat(item.validEndTime, 'yyyy.mm.dd')
-		                : '领取后' + item.fixedStartTerm + '-' + item.fixedEndTerm + '天可用'
-		            }}
-							</view>
-						</view>
-						<view class="coupon" @click.stop="getBuy(item.id)" v-if="item.canTake"> 立即领取 </view>
-						<view class="coupon2" v-else> 已领取 </view>
-					</view>
-				</view>
-			</scroll-view>
-			<view class="nullBox" v-else>
-				暂无可领优惠券
-			</view>
-		</view>
-	</su-popup>
+  <su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose>
+    <view class="model-box">
+      <view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠</view>
+      <view v-if="state.rewardActivity && state.rewardActivity.id > 0">
+        <view class="titleLi">促销</view>
+        <scroll-view
+          class="model-content"
+          scroll-y
+          :scroll-with-animation="false"
+          :enable-back-to-top="true"
+        >
+          <view
+            class="actBox"
+            v-for="(item, index) in getRewardActivityRuleGroupDescriptions(state.rewardActivity)"
+            :key="index"
+          >
+            <view
+              class="boxCont ss-flex ss-col-top ss-m-b-40"
+              @tap="onGoodsList(state.rewardActivity)"
+            >
+              <view class="model-content-tag ss-flex ss-row-center">{{ item.name }}</view>
+              <view class="model-content-title">
+                <view class="contBu">
+                  {{ item.values.join(';') }}
+                </view>
+                <view class="ss-m-b-24 cotBu-txt">
+                  {{ sheep.$helper.timeFormat(state.rewardActivity.startTime, 'yyyy.mm.dd') }}
+                  -
+                  {{ sheep.$helper.timeFormat(state.rewardActivity.endTime, 'yyyy.mm.dd') }}
+                </view>
+              </view>
+              <text class="cicon-forward" />
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <view class="titleLi">可领优惠券</view>
+      <scroll-view
+        class="model-content"
+        scroll-y
+        :scroll-with-animation="false"
+        :enable-back-to-top="true"
+        v-if="state.couponInfo.length"
+      >
+        <view class="actBox" v-for="item in state.couponInfo" :key="item.id">
+          <view class="boxCont ss-flex ss-col-top ss-m-b-40">
+            <view class="model-content-tag2">
+              <view class="usePrice"> ￥{{ fen2yuan(item.discountPrice) }} </view>
+              <view class="impose"> 满￥{{ fen2yuan(item.usePrice) }}可用 </view>
+            </view>
+            <view class="model-content-title2">
+              <view class="contBu">
+                {{ item.name }}
+              </view>
+              <view class="ss-m-b-24 cotBu-txt">
+                {{
+                  item.validityType == 1
+                    ? sheep.$helper.timeFormat(item.validStartTime, 'yyyy.mm.dd') -
+                      sheep.$helper.timeFormat(item.validEndTime, 'yyyy.mm.dd')
+                    : '领取后' + item.fixedStartTerm + '-' + item.fixedEndTerm + '天可用'
+                }}
+              </view>
+            </view>
+            <view class="coupon" @click.stop="getBuy(item.id)" v-if="item.canTake"> 立即领取 </view>
+            <view class="coupon2" v-else> 已领取 </view>
+          </view>
+        </view>
+      </scroll-view>
+      <view class="nullBox" v-else> 暂无可领优惠券 </view>
+    </view>
+  </su-popup>
 </template>
 <script setup>
-	import sheep from '@/sheep';
-	import {
-		handeleData
-	} from '@/sheep/hooks/useGoods';
-	import {
-		computed,
-		reactive,
-		watch,
-		ref
-	} from 'vue';
-	import {
-		fen2yuan
-	} from '@/sheep/hooks/useGoods';
-	const props = defineProps({
-		modelValue: {
-			type: Object,
-			default () {},
-		},
-		show: {
-			type: Boolean,
-			default: false,
-		},
-	});
-	const emits = defineEmits(['close']);
-	const state = reactive({
-		rewardActivity: computed(() => props.modelValue.rewardActivity),
-		couponInfo: computed(() => props.modelValue.couponInfo),
-	});
-	// setTimeout(()=>{
-	// 	 console.log('历程数据',state.rewardActivity.ruleDescriptions)
-	// 	 console.log('处理数据',handeleData(props.modelValue.rewardActivity.ruleDescriptions))
-	// },5000)
-	// 领取优惠劵
-	const getBuy = (id) => {
-		emits('get', id);
-	};
+  import sheep from '@/sheep';
+  import { getRewardActivityRuleGroupDescriptions } from '@/sheep/hooks/useGoods';
+  import { computed, reactive, watch, ref } from 'vue';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  const props = defineProps({
+    modelValue: {
+      type: Object,
+      default() {},
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    },
+  });
+  const emits = defineEmits(['close']);
+  const state = reactive({
+    rewardActivity: computed(() => props.modelValue.rewardActivity),
+    couponInfo: computed(() => props.modelValue.couponInfo),
+  });
 
-	function onGoodsList(e) {
-		sheep.$router.go('/pages/activity/index', {
-			activityId: e.id,
-		});
-	}
-	//监听获取到数据后再执行且只执行一次
-	let flag = ref(true)
-	watch(state, (newValue, oldValue) => {
-		if (flag.value) {
-			flag.value = false
-			state.handeActivity = handeleData(state.rewardActivity.ruleDescriptions)
-		}
-	});
+  // 领取优惠劵
+  const getBuy = (id) => {
+    emits('get', id);
+  };
+
+  function onGoodsList(e) {
+    sheep.$router.go('/pages/activity/index', {
+      activityId: e.id,
+    });
+  }
 </script>
 <style lang="scss" scoped>
-	.model-box {
-		height: 60vh;
+  .model-box {
+    height: 60vh;
 
-		.title {
-			justify-content: center;
-			font-size: 36rpx;
-			height: 80rpx;
-			font-weight: bold;
-			color: #333333;
-		}
-	}
+    .title {
+      justify-content: center;
+      font-size: 36rpx;
+      height: 80rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+  }
 
-	.model-content {
-		height: fit-content;
-		max-height: 380rpx;
-		padding: 0 20rpx;
-		box-sizing: border-box;
-		margin-top: 20rpx;
+  .model-content {
+    height: fit-content;
+    max-height: 380rpx;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+    margin-top: 20rpx;
 
-		.model-content-tag {
-			// background: rgba(#ff6911, 0.1);
-			font-size: 35rpx;
-			font-weight: 500;
-			color: #ff6911;
-			line-height: 150rpx;
-			width: 200rpx;
-			height: 150rpx;
-			text-align: center;
+    .model-content-tag {
+      // background: rgba(#ff6911, 0.1);
+      font-size: 35rpx;
+      font-weight: 500;
+      color: #ff6911;
+      line-height: 150rpx;
+      width: 200rpx;
+      height: 150rpx;
+      text-align: center;
 
-			// border-radius: 5rpx;
-		}
+      // border-radius: 5rpx;
+    }
 
-		.model-content-title {
-			width: 450rpx;
-			height: 150rpx;
-			font-size: 26rpx;
-			font-weight: 500;
-			color: #333333;
-			overflow: hidden;
-		}
+    .model-content-title {
+      width: 450rpx;
+      height: 150rpx;
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+      overflow: hidden;
+    }
 
-		.cicon-forward {
-			font-size: 28rpx;
-			color: #999999;
-			margin: 0 auto;
-		}
-	}
+    .cicon-forward {
+      font-size: 28rpx;
+      color: #999999;
+      margin: 0 auto;
+    }
+  }
 
-	// 新增的
-	.titleLi {
-		margin: 10rpx 0 10rpx 20rpx;
-		font-size: 26rpx;
-	}
+  // 新增的
+  .titleLi {
+    margin: 10rpx 0 10rpx 20rpx;
+    font-size: 26rpx;
+  }
 
-	.actBox {
-		width: 700rpx;
-		height: 150rpx;
-		background-color: #fff2f2;
-		margin: 10rpx auto;
-		border-radius: 10rpx;
-	}
+  .actBox {
+    width: 700rpx;
+    height: 150rpx;
+    background-color: #fff2f2;
+    margin: 10rpx auto;
+    border-radius: 10rpx;
+  }
 
-	.boxCont {
-		width: 700rpx;
-		height: 150rpx;
-		align-items: center;
-	}
+  .boxCont {
+    width: 700rpx;
+    height: 150rpx;
+    align-items: center;
+  }
 
-	.contBu {
-		height: 80rpx;
-		line-height: 80rpx;
-		overflow: hidden;
-		font-size: 30rpx;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		-o-text-overflow: ellipsis;
-	}
+  .contBu {
+    height: 80rpx;
+    line-height: 80rpx;
+    overflow: hidden;
+    font-size: 30rpx;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
 
-	.cotBu-txt {
-		height: 70rpx;
-		line-height: 70rpx;
-		font-size: 25rpx;
-		color: #999999;
-	}
+  .cotBu-txt {
+    height: 70rpx;
+    line-height: 70rpx;
+    font-size: 25rpx;
+    color: #999999;
+  }
 
-	.model-content-tag2 {
-		font-size: 35rpx;
-		font-weight: 500;
-		color: #ff6911;
-		width: 200rpx;
-		height: 150rpx;
-		text-align: center;
-	}
+  .model-content-tag2 {
+    font-size: 35rpx;
+    font-weight: 500;
+    color: #ff6911;
+    width: 200rpx;
+    height: 150rpx;
+    text-align: center;
+  }
 
-	.usePrice {
-		width: 200rpx;
-		height: 90rpx;
-		line-height: 100rpx;
-		// background-color: red;
-	}
+  .usePrice {
+    width: 200rpx;
+    height: 90rpx;
+    line-height: 100rpx;
+    // background-color: red;
+  }
 
-	.impose {
-		width: 200rpx;
-		height: 50rpx;
-		// line-height: 75rpx;
-		font-size: 23rpx;
-		// background-color: gold;
-	}
+  .impose {
+    width: 200rpx;
+    height: 50rpx;
+    // line-height: 75rpx;
+    font-size: 23rpx;
+    // background-color: gold;
+  }
 
-	.model-content-title2 {
-		width: 330rpx;
-		height: 150rpx;
-		font-size: 26rpx;
-		font-weight: 500;
-		color: #333333;
-		overflow: hidden;
-	}
+  .model-content-title2 {
+    width: 330rpx;
+    height: 150rpx;
+    font-size: 26rpx;
+    font-weight: 500;
+    color: #333333;
+    overflow: hidden;
+  }
 
-	.coupon {
-		width: 150rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		background-color: rgb(255, 68, 68);
-		color: white;
-		border-radius: 30rpx;
-		text-align: center;
-		font-size: 25rpx;
-	}
+  .coupon {
+    width: 150rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    background-color: rgb(255, 68, 68);
+    color: white;
+    border-radius: 30rpx;
+    text-align: center;
+    font-size: 25rpx;
+  }
 
-	.coupon2 {
-		width: 150rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		background-color: rgb(203, 192, 191);
-		color: white;
-		border-radius: 30rpx;
-		text-align: center;
-		font-size: 25rpx;
-	}
-	.nullBox{
-		width: 100%;
-		height: 300rpx;
-		font-size: 25rpx;
-		line-height: 300rpx;
-		text-align: center;
-		color: #999999;
-	}
-</style>
\ No newline at end of file
+  .coupon2 {
+    width: 150rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    background-color: rgb(203, 192, 191);
+    color: white;
+    border-radius: 30rpx;
+    text-align: center;
+    font-size: 25rpx;
+  }
+  .nullBox {
+    width: 100%;
+    height: 300rpx;
+    font-size: 25rpx;
+    line-height: 300rpx;
+    text-align: center;
+    color: #999999;
+  }
+</style>
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 6dce5b1a..41ba4425 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -1,809 +1,885 @@
 <!-- 页面 -->
 <template>
-	<view class="ss-goods-wrap">
-		<!-- xs卡片：横向紧凑型，一行放两个，图片左内容右边  -->
-		<view v-if="size === 'xs'" class="xs-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @tap="onClick">
-			<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" />
-			<view v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
-				class="xs-goods-content ss-flex-col ss-row-around">
-				<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="xs-goods-title ss-line-1"
-					:style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]">
-					{{ data.title || data.name }}
-				</view>
-				<!-- 活动信息 -->
-				<view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-					<view class="card" v-if="discountText">{{ discountText }}</view>
-					<view class="card2" v-if="data.rewardActivity">
-						{{ (data.rewardActivity.ruleDescriptions[0])[1] }}
-					</view>
-					<view class="card2" v-if="data.rewardActivity && (data.rewardActivity.ruleDescriptions[0])[3]">
-						{{ (data.rewardActivity.ruleDescriptions[0])[3] }}
-					</view>
-				</view>
-				<view v-if="goodsFields.price?.show" class="xs-goods-price font-OPPOSANS"
-					:style="[{ color: goodsFields.price.color }]">
-					<text class="price-unit ss-font-24">{{ priceUnit }}</text>
-					<!-- 活动价格 -->
-					<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-					<text v-else>
-						{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-					</text>
-				</view>
-			</view>
-		</view>
+  <view class="ss-goods-wrap">
+    <!-- xs卡片：横向紧凑型，一行放两个，图片左内容右边  -->
+    <view
+      v-if="size === 'xs'"
+      class="xs-goods-card ss-flex ss-col-stretch"
+      :style="[elStyles]"
+      @tap="onClick"
+    >
+      <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" />
+      <view
+        v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
+        class="xs-goods-content ss-flex-col ss-row-around"
+      >
+        <view
+          v-if="goodsFields.title?.show || goodsFields.name?.show"
+          class="xs-goods-title ss-line-1"
+          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
+        >
+          {{ data.title || data.name }}
+        </view>
+        <!-- 活动信息 -->
+        <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+          <view class="card" v-if="discountText">{{ discountText }}</view>
+          <view
+            class="card2"
+            v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+            :key="item"
+          >
+            {{ item }}
+          </view>
+        </view>
+        <view
+          v-if="goodsFields.price?.show"
+          class="xs-goods-price font-OPPOSANS"
+          :style="[{ color: goodsFields.price.color }]"
+        >
+          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+          <!-- 活动价格 -->
+          <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+          <text v-else>
+            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          </text>
+        </view>
+      </view>
+    </view>
 
-		<!-- sm卡片：竖向紧凑，一行放三个，图上内容下 -->
-		<view v-if="size === 'sm'" class="sm-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
-			<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>
+    <!-- sm卡片：竖向紧凑，一行放三个，图上内容下 -->
+    <view v-if="size === 'sm'" class="sm-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+      <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>
 
-			<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">
-					{{ data.title || data.name }}
-				</view>
-				<!-- 活动信息 -->
-				<view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-					<view class="card" v-if="discountText">{{ discountText }}</view>
-					<view class="card2" v-if="data.rewardActivity">
-						{{ (data.rewardActivity.ruleDescriptions[0])[1] }}
-					</view>
-					<view class="card2" v-if="data.rewardActivity && (data.rewardActivity.ruleDescriptions[0])[3]">
-						{{ (data.rewardActivity.ruleDescriptions[0])[3] }}
-					</view>
-				</view>
-				<view v-if="goodsFields.price?.show" class="sm-goods-price font-OPPOSANS"
-					:style="[{ color: goodsFields.price.color }]">
-					<text class="price-unit ss-font-24">{{ priceUnit }}</text>
-					<!-- 活动价格 -->
-					<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-					<text v-else>
-						{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-					</text>
-				</view>
-			</view>
-		</view>
+      <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"
+        >
+          {{ data.title || data.name }}
+        </view>
+        <!-- 活动信息 -->
+        <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+          <view class="card" v-if="discountText">{{ discountText }}</view>
+          <view
+            class="card2"
+            v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+            :key="item"
+          >
+            {{ item }}
+          </view>
+        </view>
+        <view
+          v-if="goodsFields.price?.show"
+          class="sm-goods-price font-OPPOSANS"
+          :style="[{ color: goodsFields.price.color }]"
+        >
+          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+          <!-- 活动价格 -->
+          <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+          <text v-else>
+            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          </text>
+        </view>
+      </view>
+    </view>
 
-		<!-- md卡片：竖向，一行放两个，图上内容下 -->
-		<view v-if="size === 'md'" class="md-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
-			<view v-if="tagStyle.show" class="tag-icon-box">
-				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)" />
-			</view>
-			<image class="md-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="widthFix" />
-			<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">
-				<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="md-goods-title ss-line-1"
-					:style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]">
-					{{ data.title || data.name }}
-				</view>
-				<view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-					class="md-goods-subtitle ss-m-t-16 ss-line-1"
-					:style="[{ color: subTitleColor, background: subTitleBackground }]">
-					{{ data.subtitle || data.introduction }}
-				</view>
-				<slot name="activity">
-					<view v-if="data.promos?.length" class="tag-box ss-flex-wrap ss-flex ss-col-center">
-						<view class="activity-tag ss-m-r-10 ss-m-t-16" v-for="item in data.promos" :key="item.id">
-							{{ item.title }}
-						</view>
-					</view>
-				</slot>
-				<!-- 活动信息 -->
-				<view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-					<view class="card" v-if="discountText">{{ discountText }}</view>
-					<view class="card2" v-if="data.rewardActivity">
-						{{ (data.rewardActivity.ruleDescriptions[0])[1] }}
-					</view>
-					<view class="card2" v-if="data.rewardActivity && (data.rewardActivity.ruleDescriptions[0])[3]">
-						{{ (data.rewardActivity.ruleDescriptions[0])[3] }}
-					</view>
-				</view>
-				<view class="ss-flex ss-col-bottom">
-					<view v-if="goodsFields.price?.show" class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10"
-						:style="[{ color: goodsFields.price.color }]">
-						<text class="price-unit ss-font-24">{{ priceUnit }}</text>
-						<!-- 活动价格 -->
-						<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-						<text v-else>
-							{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-						</text>
-					</view>
-					<view v-if="
+    <!-- md卡片：竖向，一行放两个，图上内容下 -->
+    <view v-if="size === 'md'" class="md-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+      <view v-if="tagStyle.show" class="tag-icon-box">
+        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)" />
+      </view>
+      <image class="md-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="widthFix" />
+      <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"
+      >
+        <view
+          v-if="goodsFields.title?.show || goodsFields.name?.show"
+          class="md-goods-title ss-line-1"
+          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
+        >
+          {{ data.title || data.name }}
+        </view>
+        <view
+          v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+          class="md-goods-subtitle ss-m-t-16 ss-line-1"
+          :style="[{ color: subTitleColor, background: subTitleBackground }]"
+        >
+          {{ data.subtitle || data.introduction }}
+        </view>
+        <slot name="activity">
+          <view v-if="data.promos?.length" class="tag-box ss-flex-wrap ss-flex ss-col-center">
+            <view
+              class="activity-tag ss-m-r-10 ss-m-t-16"
+              v-for="item in data.promos"
+              :key="item.id"
+            >
+              {{ item.title }}
+            </view>
+          </view>
+        </slot>
+        <!-- 活动信息 -->
+        <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+          <view class="card" v-if="discountText">{{ discountText }}</view>
+          <view
+            class="card2"
+            v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+            :key="item"
+          >
+            {{ item }}
+          </view>
+        </view>
+        <view class="ss-flex ss-col-bottom">
+          <view
+            v-if="goodsFields.price?.show"
+            class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10"
+            :style="[{ color: goodsFields.price.color }]"
+          >
+            <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+            <!-- 活动价格 -->
+            <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+            <text v-else>
+              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+            </text>
+          </view>
+          <view
+            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 }]">
-						<text class="price-unit ss-font-20">{{ priceUnit }}</text>
-						<view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
-					</view>
-				</view>
+            "
+            class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
+            :style="[{ color: originPriceColor }]"
+          >
+            <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+            <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+          </view>
+        </view>
 
-				<view class="ss-m-t-16 ss-flex ss-col-center ss-flex-wrap">
-					<view class="sales-text">{{ salesAndStock }}</view>
-				</view>
-			</view>
+        <view class="ss-m-t-16 ss-flex ss-col-center ss-flex-wrap">
+          <view class="sales-text">{{ salesAndStock }}</view>
+        </view>
+      </view>
 
-			<slot name="cart">
-				<view class="cart-box ss-flex ss-col-center ss-row-center">
-					<image class="cart-icon" src="/static/img/shop/tabbar/category2.png" mode="" />
-				</view>
-			</slot>
-		</view>
+      <slot name="cart">
+        <view class="cart-box ss-flex ss-col-center ss-row-center">
+          <image class="cart-icon" src="/static/img/shop/tabbar/category2.png" mode="" />
+        </view>
+      </slot>
+    </view>
 
-		<!-- lg卡片：横向型，一行放一个，图片左内容右边  -->
-		<view v-if="size === 'lg'" class="lg-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @tap="onClick">
-			<view v-if="tagStyle.show" class="tag-icon-box">
-				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
-			</view>
-			<view v-if="seckillTag" class="seckill-tag ss-flex ss-row-center">秒杀</view>
-			<view v-if="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" />
-			<view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
-				<view>
-					<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="lg-goods-title ss-line-2"
-						:style="[{ color: titleColor }]">
-						{{ data.title || data.name }}
-					</view>
-					<view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-						class="lg-goods-subtitle ss-m-t-10 ss-line-1"
-						:style="[{ color: subTitleColor, background: subTitleBackground }]">
-						{{ data.subtitle || data.introduction }}
-					</view>
-				</view>
-				<view>
-					<slot name="activity">
-						<view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center">
-							<view class="activity-tag ss-m-r-10" v-for="item in data.promos" :key="item.id">
-								{{ item.title }}
-							</view>
-						</view>
-					</slot>
-					<!-- 活动信息 -->
-					<view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-						<view class="card" v-if="discountText">{{ discountText }}</view>
-						<view class="card2" v-if="data.rewardActivity">
-							{{ (data.rewardActivity.ruleDescriptions[0])[1] }}
-						</view>
-						<view class="card2" v-if="data.rewardActivity && (data.rewardActivity.ruleDescriptions[0])[3]">
-							{{ (data.rewardActivity.ruleDescriptions[0])[3] }}
-						</view>
-					</view>
-					<view class="ss-flex ss-col-bottom ss-m-t-10">
-						<view v-if="goodsFields.price?.show"
-							class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
-							:style="[{ color: goodsFields.price.color }]">
-							<text class="ss-font-24">{{ priceUnit }}</text>
-							{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-						</view>
-						<view v-if="
+    <!-- lg卡片：横向型，一行放一个，图片左内容右边  -->
+    <view
+      v-if="size === 'lg'"
+      class="lg-goods-card ss-flex ss-col-stretch"
+      :style="[elStyles]"
+      @tap="onClick"
+    >
+      <view v-if="tagStyle.show" class="tag-icon-box">
+        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+      </view>
+      <view v-if="seckillTag" class="seckill-tag ss-flex ss-row-center">秒杀</view>
+      <view v-if="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"
+      />
+      <view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
+        <view>
+          <view
+            v-if="goodsFields.title?.show || goodsFields.name?.show"
+            class="lg-goods-title ss-line-2"
+            :style="[{ color: titleColor }]"
+          >
+            {{ data.title || data.name }}
+          </view>
+          <view
+            v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+            class="lg-goods-subtitle ss-m-t-10 ss-line-1"
+            :style="[{ color: subTitleColor, background: subTitleBackground }]"
+          >
+            {{ data.subtitle || data.introduction }}
+          </view>
+        </view>
+        <view>
+          <slot name="activity">
+            <view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center">
+              <view class="activity-tag ss-m-r-10" v-for="item in data.promos" :key="item.id">
+                {{ item.title }}
+              </view>
+            </view>
+          </slot>
+          <!-- 活动信息 -->
+          <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+            <view class="card" v-if="discountText">{{ discountText }}</view>
+            <view
+              class="card2"
+              v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+              :key="item"
+            >
+              {{ item }}
+            </view>
+          </view>
+          <view class="ss-flex ss-col-bottom ss-m-t-10">
+            <view
+              v-if="goodsFields.price?.show"
+              class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
+              :style="[{ color: goodsFields.price.color }]"
+            >
+              <text class="ss-font-24">{{ priceUnit }}</text>
+              {{ 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)
-              " class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS" :style="[{ color: originPriceColor }]">
-							<text class="price-unit ss-font-20">{{ priceUnit }}</text>
-							<!-- 活动价格 -->
-							<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-							<text v-else>
-								{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-							</text>
-						</view>
-					</view>
-					<view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
-						<view class="sales-text">{{ salesAndStock }}</view>
-					</view>
-				</view>
-			</view>
+              "
+              class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
+              :style="[{ color: originPriceColor }]"
+            >
+              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+              <!-- 活动价格 -->
+              <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+              <text v-else>
+                {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              </text>
+            </view>
+          </view>
+          <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
+            <view class="sales-text">{{ salesAndStock }}</view>
+          </view>
+        </view>
+      </view>
 
-			<slot name="cart">
-				<view class="buy-box ss-flex ss-col-center ss-row-center" v-if="buttonShow"> 去购买 </view>
-			</slot>
-		</view>
+      <slot name="cart">
+        <view class="buy-box ss-flex ss-col-center ss-row-center" v-if="buttonShow"> 去购买 </view>
+      </slot>
+    </view>
 
-		<!-- sl卡片：竖向型，一行放一个，图片上内容下边 -->
-		<view v-if="size === 'sl'" class="sl-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
-			<view v-if="tagStyle.show" class="tag-icon-box">
-				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)" />
-			</view>
-			<image class="sl-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFill" />
-			<view class="sl-goods-content">
-				<view>
-					<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="sl-goods-title ss-line-1"
-						:style="[{ color: titleColor }]">
-						{{ data.title || data.name }}
-					</view>
-					<view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-						class="sl-goods-subtitle ss-m-t-16"
-						:style="[{ color: subTitleColor, background: subTitleBackground }]">
-						{{ data.subtitle || data.introduction }}
-					</view>
-				</view>
-				<view>
-					<slot name="activity">
-						<view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center ss-flex-wrap">
-							<view class="activity-tag ss-m-r-10 ss-m-t-16" v-for="item in data.promos" :key="item.id">
-								{{ item.title }}
-							</view>
-						</view>
-					</slot>
-					<!-- 活动信息 -->
-					<view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-						<view class="card" v-if="discountText">{{ discountText }}</view>
-						<view class="card2" v-if="data.rewardActivity">
-							{{ (data.rewardActivity.ruleDescriptions[0])[1] }}
-						</view>
-						<view class="card2" v-if="data.rewardActivity && (data.rewardActivity.ruleDescriptions[0])[3]">
-							{{ (data.rewardActivity.ruleDescriptions[0])[3] }}
-						</view>
-					</view>
-					<view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
-						<view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
-							<text class="price-unit ss-font-24">{{ priceUnit }}</text>
-							<!-- 活动价格 -->
-							<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-							<text v-else>
-								{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-							</text>
-						</view>
-						<view v-if="
+    <!-- sl卡片：竖向型，一行放一个，图片上内容下边 -->
+    <view v-if="size === 'sl'" class="sl-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+      <view v-if="tagStyle.show" class="tag-icon-box">
+        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)" />
+      </view>
+      <image
+        class="sl-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="aspectFill"
+      />
+      <view class="sl-goods-content">
+        <view>
+          <view
+            v-if="goodsFields.title?.show || goodsFields.name?.show"
+            class="sl-goods-title ss-line-1"
+            :style="[{ color: titleColor }]"
+          >
+            {{ data.title || data.name }}
+          </view>
+          <view
+            v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+            class="sl-goods-subtitle ss-m-t-16"
+            :style="[{ color: subTitleColor, background: subTitleBackground }]"
+          >
+            {{ data.subtitle || data.introduction }}
+          </view>
+        </view>
+        <view>
+          <slot name="activity">
+            <view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center ss-flex-wrap">
+              <view
+                class="activity-tag ss-m-r-10 ss-m-t-16"
+                v-for="item in data.promos"
+                :key="item.id"
+              >
+                {{ item.title }}
+              </view>
+            </view>
+          </slot>
+          <!-- 活动信息 -->
+          <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+            <view class="card" v-if="discountText">{{ discountText }}</view>
+            <view
+              class="card2"
+              v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+              :key="item"
+            >
+              {{ item }}
+            </view>
+          </view>
+          <view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
+            <view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
+              <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+              <!-- 活动价格 -->
+              <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+              <text v-else>
+                {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              </text>
+            </view>
+            <view
+              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 }]">
-							<text class="price-unit ss-font-20">{{ priceUnit }}</text>
-							<view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
-						</view>
-					</view>
-					<view class="ss-m-t-16 ss-flex ss-flex-wrap">
-						<view class="sales-text">{{ salesAndStock }}</view>
-					</view>
-				</view>
-			</view>
+              "
+              class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
+              :style="[{ color: originPriceColor }]"
+            >
+              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+            </view>
+          </view>
+          <view class="ss-m-t-16 ss-flex ss-flex-wrap">
+            <view class="sales-text">{{ salesAndStock }}</view>
+          </view>
+        </view>
+      </view>
 
-			<slot name="cart">
-				<view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view>
-			</slot>
-		</view>
-	</view>
+      <slot name="cart">
+        <view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view>
+      </slot>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	/**
-	 * 商品卡片
-	 *
-	 * @property {Array} size = [xs | sm | md | lg | sl ] 			 	- 列表数据
-	 * @property {String} tag 											- md及以上才有
-	 * @property {String} img 											- 图片
-	 * @property {String} background 									- 背景色
-	 * @property {String} topRadius 									- 上圆角
-	 * @property {String} bottomRadius 									- 下圆角
-	 * @property {String} title 										- 标题
-	 * @property {String} titleColor 									- 标题颜色
-	 * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
-	 * @property {String} subTitle 										- 副标题
-	 * @property {String} subTitleColor									- 副标题颜色
-	 * @property {String} subTitleBackground 							- 副标题背景
-	 * @property {String | Number} price 								- 价格
-	 * @property {String} priceColor 									- 价格颜色
-	 * @property {String | Number} originPrice 							- 原价/划线价
-	 * @property {String} originPriceColor 								- 原价颜色
-	 * @property {String | Number} sales 								- 销售数量
-	 * @property {String} salesColor									- 销售数量颜色
-	 *
-	 * @slots activity												 	- 活动插槽
-	 * @slots cart														- 购物车插槽，默认包含文字，背景色，文字颜色 || 图片 || 行为
-	 *
-	 * @event {Function()} click 										- 点击卡片
-	 *
-	 */
-	import {
-		computed,
-		getCurrentInstance,
-		onMounted,
-		nextTick
-	} from 'vue';
-	import sheep from '@/sheep';
-	import {
-		fen2yuan,
-		formatSales
-	} from '@/sheep/hooks/useGoods';
-	import {
-		formatStock
-	} from '@/sheep/hooks/useGoods';
-	import {
-		isArray
-	} from 'lodash-es';
+  /**
+   * 商品卡片
+   *
+   * @property {Array} size = [xs | sm | md | lg | sl ] 			 	- 列表数据
+   * @property {String} tag 											- md及以上才有
+   * @property {String} img 											- 图片
+   * @property {String} background 									- 背景色
+   * @property {String} topRadius 									- 上圆角
+   * @property {String} bottomRadius 									- 下圆角
+   * @property {String} title 										- 标题
+   * @property {String} titleColor 									- 标题颜色
+   * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
+   * @property {String} subTitle 										- 副标题
+   * @property {String} subTitleColor									- 副标题颜色
+   * @property {String} subTitleBackground 							- 副标题背景
+   * @property {String | Number} price 								- 价格
+   * @property {String} priceColor 									- 价格颜色
+   * @property {String | Number} originPrice 							- 原价/划线价
+   * @property {String} originPriceColor 								- 原价颜色
+   * @property {String | Number} sales 								- 销售数量
+   * @property {String} salesColor									- 销售数量颜色
+   *
+   * @slots activity												 	- 活动插槽
+   * @slots cart														- 购物车插槽，默认包含文字，背景色，文字颜色 || 图片 || 行为
+   *
+   * @event {Function()} click 										- 点击卡片
+   *
+   */
+  import { computed, getCurrentInstance, onMounted, nextTick } from 'vue';
+  import sheep from '@/sheep';
+  import {
+    fen2yuan,
+    formatSales,
+    getRewardActivityRuleItemDescriptions,
+  } from '@/sheep/hooks/useGoods';
+  import { formatStock } from '@/sheep/hooks/useGoods';
+  import { isArray } from 'lodash-es';
 
-	// 接收参数
-	const props = defineProps({
-		goodsFields: {
-			type: [Array, Object],
-			default () {
-				return {
-					// 商品价格
-					price: {
-						show: true,
-					},
-					// 库存
-					stock: {
-						show: true,
-					},
-					// 商品名称
-					name: {
-						show: true,
-					},
-					// 商品介绍
-					introduction: {
-						show: true,
-					},
-					// 市场价
-					marketPrice: {
-						show: true,
-					},
-					// 销量
-					salesCount: {
-						show: true,
-					},
-				};
-			},
-		},
-		tagStyle: {
-			type: Object,
-			default: () => ({}),
-		},
-		data: {
-			type: Object,
-			default: () => ({}),
-		},
-		size: {
-			type: String,
-			default: 'sl',
-		},
-		background: {
-			type: String,
-			default: '',
-		},
-		topRadius: {
-			type: Number,
-			default: 0,
-		},
-		bottomRadius: {
-			type: Number,
-			default: 0,
-		},
-		titleWidth: {
-			type: Number,
-			default: 0,
-		},
-		titleColor: {
-			type: String,
-			default: '#333',
-		},
-		priceColor: {
-			type: String,
-			default: '',
-		},
-		originPriceColor: {
-			type: String,
-			default: '#C4C4C4',
-		},
-		priceUnit: {
-			type: String,
-			default: '￥',
-		},
-		subTitleColor: {
-			type: String,
-			default: '#999999',
-		},
-		subTitleBackground: {
-			type: String,
-			default: '',
-		},
-		buttonShow: {
-			type: Boolean,
-			default: true,
-		},
-		seckillTag: {
-			type: Boolean,
-			default: false,
-		},
-		grouponTag: {
-			type: Boolean,
-			default: false,
-		},
-	});
+  // 接收参数
+  const props = defineProps({
+    goodsFields: {
+      type: [Array, Object],
+      default() {
+        return {
+          // 商品价格
+          price: {
+            show: true,
+          },
+          // 库存
+          stock: {
+            show: true,
+          },
+          // 商品名称
+          name: {
+            show: true,
+          },
+          // 商品介绍
+          introduction: {
+            show: true,
+          },
+          // 市场价
+          marketPrice: {
+            show: true,
+          },
+          // 销量
+          salesCount: {
+            show: true,
+          },
+        };
+      },
+    },
+    tagStyle: {
+      type: Object,
+      default: () => ({}),
+    },
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+    size: {
+      type: String,
+      default: 'sl',
+    },
+    background: {
+      type: String,
+      default: '',
+    },
+    topRadius: {
+      type: Number,
+      default: 0,
+    },
+    bottomRadius: {
+      type: Number,
+      default: 0,
+    },
+    titleWidth: {
+      type: Number,
+      default: 0,
+    },
+    titleColor: {
+      type: String,
+      default: '#333',
+    },
+    priceColor: {
+      type: String,
+      default: '',
+    },
+    originPriceColor: {
+      type: String,
+      default: '#C4C4C4',
+    },
+    priceUnit: {
+      type: String,
+      default: '￥',
+    },
+    subTitleColor: {
+      type: String,
+      default: '#999999',
+    },
+    subTitleBackground: {
+      type: String,
+      default: '',
+    },
+    buttonShow: {
+      type: Boolean,
+      default: true,
+    },
+    seckillTag: {
+      type: Boolean,
+      default: false,
+    },
+    grouponTag: {
+      type: Boolean,
+      default: false,
+    },
+  });
 
-	// 优惠文案
-	const discountText = computed(() => {
-		const promotionType = props.data.promotionType;
-		if (promotionType === 4) {
-			return '限时优惠';
-		} else if (promotionType === 6) {
-			return '会员价';
-		}
-		return undefined;
-	});
+  // 优惠文案
+  const discountText = computed(() => {
+    const promotionType = props.data.promotionType;
+    if (promotionType === 4) {
+      return '限时优惠';
+    } else if (promotionType === 6) {
+      return '会员价';
+    }
+    return undefined;
+  });
 
-	// 组件样式
-	const elStyles = computed(() => {
-		return {
-			background: props.background,
-			'border-top-left-radius': props.topRadius + 'px',
-			'border-top-right-radius': props.topRadius + 'px',
-			'border-bottom-left-radius': props.bottomRadius + 'px',
-			'border-bottom-right-radius': props.bottomRadius + 'px',
-		};
-	});
+  // 组件样式
+  const elStyles = computed(() => {
+    return {
+      background: props.background,
+      'border-top-left-radius': props.topRadius + 'px',
+      'border-top-right-radius': props.topRadius + 'px',
+      'border-bottom-left-radius': props.bottomRadius + 'px',
+      'border-bottom-right-radius': props.bottomRadius + 'px',
+    };
+  });
 
-	// 格式化销量、库存信息
-	const salesAndStock = computed(() => {
-		let text = [];
-		if (props.goodsFields.salesCount?.show) {
-			text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
-		}
-		if (props.goodsFields.stock?.show) {
-			text.push(formatStock(props.data.stock_show_type, props.data.stock));
-		}
-		return text.join(' | ');
-	});
+  // 格式化销量、库存信息
+  const salesAndStock = computed(() => {
+    let text = [];
+    if (props.goodsFields.salesCount?.show) {
+      text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
+    }
+    if (props.goodsFields.stock?.show) {
+      text.push(formatStock(props.data.stock_show_type, props.data.stock));
+    }
+    return text.join(' | ');
+  });
 
-	// 返回事件
-	const emits = defineEmits(['click', 'getHeight']);
+  // 返回事件
+  const emits = defineEmits(['click', 'getHeight']);
 
-	const onClick = () => {
-		emits('click');
-	};
+  const onClick = () => {
+    emits('click');
+  };
 
-	// 获取卡片实时高度
-	const {
-		proxy
-	} = getCurrentInstance();
-	const elId = `sheep_${Math.ceil(Math.random() * 10e5).toString(36)}`;
+  // 获取卡片实时高度
+  const { proxy } = getCurrentInstance();
+  const elId = `sheep_${Math.ceil(Math.random() * 10e5).toString(36)}`;
 
-	function getGoodsPriceCardWH() {
-		if (props.size === 'md') {
-			const view = uni.createSelectorQuery().in(proxy);
-			view.select(`#${elId}`).fields({
-				size: true,
-				scrollOffset: true,
-			});
-			view.exec((data) => {
-				let totalHeight = 0;
-				const goodsPriceCard = data[0];
-				if (props.data.image_wh) {
-					totalHeight =
-						(goodsPriceCard.width / props.data.image_wh.w) * props.data.image_wh.h +
-						goodsPriceCard.height;
-				} else {
-					totalHeight = goodsPriceCard.width;
-				}
-				emits('getHeight', totalHeight);
-			});
-		}
-	}
-	onMounted(() => {
-		nextTick(() => {
-			getGoodsPriceCardWH();
-		});
-	});
+  function getGoodsPriceCardWH() {
+    if (props.size === 'md') {
+      const view = uni.createSelectorQuery().in(proxy);
+      view.select(`#${elId}`).fields({
+        size: true,
+        scrollOffset: true,
+      });
+      view.exec((data) => {
+        let totalHeight = 0;
+        const goodsPriceCard = data[0];
+        if (props.data.image_wh) {
+          totalHeight =
+            (goodsPriceCard.width / props.data.image_wh.w) * props.data.image_wh.h +
+            goodsPriceCard.height;
+        } else {
+          totalHeight = goodsPriceCard.width;
+        }
+        emits('getHeight', totalHeight);
+      });
+    }
+  }
+  onMounted(() => {
+    nextTick(() => {
+      getGoodsPriceCardWH();
+    });
+  });
 </script>
 
 <style lang="scss" scoped>
-	.tag-icon-box {
-		position: absolute;
-		left: 0;
-		top: 0;
-		z-index: 2;
+  .tag-icon-box {
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 2;
 
-		.tag-icon {
-			width: 72rpx;
-			height: 44rpx;
-		}
-	}
+    .tag-icon {
+      width: 72rpx;
+      height: 44rpx;
+    }
+  }
 
-	.seckill-tag {
-		position: absolute;
-		left: 0;
-		top: 0;
-		z-index: 2;
-		width: 68rpx;
-		height: 38rpx;
-		background: linear-gradient(90deg, #ff5854 0%, #ff2621 100%);
-		border-radius: 10rpx 0px 10rpx 0px;
-		font-size: 24rpx;
-		font-weight: 500;
-		color: #ffffff;
-		line-height: 32rpx;
-	}
+  .seckill-tag {
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 2;
+    width: 68rpx;
+    height: 38rpx;
+    background: linear-gradient(90deg, #ff5854 0%, #ff2621 100%);
+    border-radius: 10rpx 0px 10rpx 0px;
+    font-size: 24rpx;
+    font-weight: 500;
+    color: #ffffff;
+    line-height: 32rpx;
+  }
 
-	.groupon-tag {
-		position: absolute;
-		left: 0;
-		top: 0;
-		z-index: 2;
-		width: 68rpx;
-		height: 38rpx;
-		background: linear-gradient(90deg, #fe832a 0%, #ff6600 100%);
-		border-radius: 10rpx 0px 10rpx 0px;
-		font-size: 24rpx;
-		font-weight: 500;
-		color: #ffffff;
-		line-height: 32rpx;
-	}
+  .groupon-tag {
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 2;
+    width: 68rpx;
+    height: 38rpx;
+    background: linear-gradient(90deg, #fe832a 0%, #ff6600 100%);
+    border-radius: 10rpx 0px 10rpx 0px;
+    font-size: 24rpx;
+    font-weight: 500;
+    color: #ffffff;
+    line-height: 32rpx;
+  }
 
-	.goods-img {
-		width: 100%;
-		height: 100%;
-		background-color: #f5f5f5;
-	}
+  .goods-img {
+    width: 100%;
+    height: 100%;
+    background-color: #f5f5f5;
+  }
 
-	.price-unit {
-		margin-right: -4px;
-	}
+  .price-unit {
+    margin-right: -4px;
+  }
 
-	.sales-text {
-		display: table;
-		font-size: 24rpx;
-		transform: scale(0.8);
-		margin-left: 0rpx;
-		color: #c4c4c4;
-	}
+  .sales-text {
+    display: table;
+    font-size: 24rpx;
+    transform: scale(0.8);
+    margin-left: 0rpx;
+    color: #c4c4c4;
+  }
 
-	.activity-tag {
-		font-size: 20rpx;
-		color: #ff0000;
-		line-height: 30rpx;
-		padding: 0 10rpx;
-		border: 1px solid rgba(#ff0000, 0.25);
-		border-radius: 4px;
-		flex-shrink: 0;
-	}
+  .activity-tag {
+    font-size: 20rpx;
+    color: #ff0000;
+    line-height: 30rpx;
+    padding: 0 10rpx;
+    border: 1px solid rgba(#ff0000, 0.25);
+    border-radius: 4px;
+    flex-shrink: 0;
+  }
 
-	.goods-origin-price {
-		font-size: 20rpx;
-		color: #c4c4c4;
-		line-height: 36rpx;
-		text-decoration: line-through;
-	}
+  .goods-origin-price {
+    font-size: 20rpx;
+    color: #c4c4c4;
+    line-height: 36rpx;
+    text-decoration: line-through;
+  }
 
-	// xs
-	.xs-goods-card {
-		overflow: hidden;
-		// max-width: 375rpx;
-		background-color: $white;
-		position: relative;
+  // xs
+  .xs-goods-card {
+    overflow: hidden;
+    // max-width: 375rpx;
+    background-color: $white;
+    position: relative;
 
-		.xs-img-box {
-			width: 128rpx;
-			height: 128rpx;
-			margin-right: 20rpx;
-		}
+    .xs-img-box {
+      width: 128rpx;
+      height: 128rpx;
+      margin-right: 20rpx;
+    }
 
-		.xs-goods-title {
-			font-size: 26rpx;
-			color: #333;
-			font-weight: 500;
-		}
+    .xs-goods-title {
+      font-size: 26rpx;
+      color: #333;
+      font-weight: 500;
+    }
 
-		.xs-goods-price {
-			font-size: 30rpx;
-			color: $red;
-		}
-	}
+    .xs-goods-price {
+      font-size: 30rpx;
+      color: $red;
+    }
+  }
 
-	// sm
-	.sm-goods-card {
-		overflow: hidden;
-		// width: 223rpx;
-		// width: 100%;
-		background-color: $white;
-		position: relative;
+  // sm
+  .sm-goods-card {
+    overflow: hidden;
+    // width: 223rpx;
+    // width: 100%;
+    background-color: $white;
+    position: relative;
 
-		.sm-img-box {
-			// width: 228rpx;
-			width: 100%;
-			height: 208rpx;
-		}
+    .sm-img-box {
+      // width: 228rpx;
+      width: 100%;
+      height: 208rpx;
+    }
 
-		.sm-goods-content {
-			padding: 20rpx 16rpx;
-			box-sizing: border-box;
-		}
+    .sm-goods-content {
+      padding: 20rpx 16rpx;
+      box-sizing: border-box;
+    }
 
-		.sm-goods-title {
-			font-size: 26rpx;
-			color: #333;
-		}
+    .sm-goods-title {
+      font-size: 26rpx;
+      color: #333;
+    }
 
-		.sm-goods-price {
-			font-size: 30rpx;
-			color: $red;
-		}
-	}
+    .sm-goods-price {
+      font-size: 30rpx;
+      color: $red;
+    }
+  }
 
-	// md
-	.md-goods-card {
-		overflow: hidden;
-		width: 100%;
-		position: relative;
-		z-index: 1;
-		background-color: $white;
-		position: relative;
+  // md
+  .md-goods-card {
+    overflow: hidden;
+    width: 100%;
+    position: relative;
+    z-index: 1;
+    background-color: $white;
+    position: relative;
 
-		.md-img-box {
-			width: 100%;
-		}
+    .md-img-box {
+      width: 100%;
+    }
 
-		.md-goods-title {
-			font-size: 26rpx;
-			color: #333;
-			width: 100%;
-		}
+    .md-goods-title {
+      font-size: 26rpx;
+      color: #333;
+      width: 100%;
+    }
 
-		.md-goods-subtitle {
-			font-size: 24rpx;
-			font-weight: 400;
-			color: #999999;
-		}
+    .md-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+    }
 
-		.md-goods-price {
-			font-size: 30rpx;
-			color: $red;
-			line-height: 36rpx;
-		}
+    .md-goods-price {
+      font-size: 30rpx;
+      color: $red;
+      line-height: 36rpx;
+    }
 
-		.cart-box {
-			width: 54rpx;
-			height: 54rpx;
-			background: linear-gradient(90deg, #fe8900, #ff5e00);
-			border-radius: 50%;
-			position: absolute;
-			bottom: 50rpx;
-			right: 20rpx;
-			z-index: 2;
+    .cart-box {
+      width: 54rpx;
+      height: 54rpx;
+      background: linear-gradient(90deg, #fe8900, #ff5e00);
+      border-radius: 50%;
+      position: absolute;
+      bottom: 50rpx;
+      right: 20rpx;
+      z-index: 2;
 
-			.cart-icon {
-				width: 30rpx;
-				height: 30rpx;
-			}
-		}
-	}
+      .cart-icon {
+        width: 30rpx;
+        height: 30rpx;
+      }
+    }
+  }
 
-	// lg
-	.lg-goods-card {
-		overflow: hidden;
-		position: relative;
-		z-index: 1;
-		background-color: $white;
-		height: 280rpx;
+  // lg
+  .lg-goods-card {
+    overflow: hidden;
+    position: relative;
+    z-index: 1;
+    background-color: $white;
+    height: 280rpx;
 
-		.lg-img-box {
-			width: 280rpx;
-			height: 280rpx;
-			margin-right: 20rpx;
-		}
+    .lg-img-box {
+      width: 280rpx;
+      height: 280rpx;
+      margin-right: 20rpx;
+    }
 
-		.lg-goods-title {
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #333333;
-			// line-height: 36rpx;
-			// width: 410rpx;
-		}
+    .lg-goods-title {
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #333333;
+      // line-height: 36rpx;
+      // width: 410rpx;
+    }
 
-		.lg-goods-subtitle {
-			font-size: 24rpx;
-			font-weight: 400;
-			color: #999999;
-			// line-height: 30rpx;
-			// width: 410rpx;
-		}
+    .lg-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+      // line-height: 30rpx;
+      // width: 410rpx;
+    }
 
-		.lg-goods-price {
-			font-size: 30rpx;
-			color: $red;
-			line-height: 36rpx;
-		}
+    .lg-goods-price {
+      font-size: 30rpx;
+      color: $red;
+      line-height: 36rpx;
+    }
 
-		.buy-box {
-			position: absolute;
-			bottom: 20rpx;
-			right: 20rpx;
-			z-index: 2;
-			width: 120rpx;
-			height: 50rpx;
-			background: linear-gradient(90deg, #fe8900, #ff5e00);
-			border-radius: 25rpx;
-			font-size: 24rpx;
-			color: #ffffff;
-		}
+    .buy-box {
+      position: absolute;
+      bottom: 20rpx;
+      right: 20rpx;
+      z-index: 2;
+      width: 120rpx;
+      height: 50rpx;
+      background: linear-gradient(90deg, #fe8900, #ff5e00);
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      color: #ffffff;
+    }
 
-		.tag-box {
-			width: 100%;
-		}
-	}
+    .tag-box {
+      width: 100%;
+    }
+  }
 
-	// sl
+  // sl
 
-	.sl-goods-card {
-		overflow: hidden;
-		position: relative;
-		z-index: 1;
-		width: 100%;
-		background-color: $white;
+  .sl-goods-card {
+    overflow: hidden;
+    position: relative;
+    z-index: 1;
+    width: 100%;
+    background-color: $white;
 
-		.sl-goods-content {
-			padding: 20rpx 20rpx;
-			box-sizing: border-box;
-		}
+    .sl-goods-content {
+      padding: 20rpx 20rpx;
+      box-sizing: border-box;
+    }
 
-		.sl-img-box {
-			width: 100%;
-			height: 360rpx;
-		}
+    .sl-img-box {
+      width: 100%;
+      height: 360rpx;
+    }
 
-		.sl-goods-title {
-			font-size: 26rpx;
-			color: #333;
-			font-weight: 500;
-		}
+    .sl-goods-title {
+      font-size: 26rpx;
+      color: #333;
+      font-weight: 500;
+    }
 
-		.sl-goods-subtitle {
-			font-size: 24rpx;
-			font-weight: 400;
-			color: #999999;
-			line-height: 30rpx;
-		}
+    .sl-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+      line-height: 30rpx;
+    }
 
-		.sl-goods-price {
-			font-size: 30rpx;
-			color: $red;
-			line-height: 36rpx;
-		}
+    .sl-goods-price {
+      font-size: 30rpx;
+      color: $red;
+      line-height: 36rpx;
+    }
 
-		.buy-box {
-			position: absolute;
-			bottom: 20rpx;
-			right: 20rpx;
-			z-index: 2;
-			width: 148rpx;
-			height: 50rpx;
-			background: linear-gradient(90deg, #fe8900, #ff5e00);
-			border-radius: 25rpx;
-			font-size: 24rpx;
-			color: #ffffff;
-		}
-	}
+    .buy-box {
+      position: absolute;
+      bottom: 20rpx;
+      right: 20rpx;
+      z-index: 2;
+      width: 148rpx;
+      height: 50rpx;
+      background: linear-gradient(90deg, #fe8900, #ff5e00);
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      color: #ffffff;
+    }
+  }
 
-	.card {
-		width: fit-content;
-		height: fit-content;
-		padding: 2rpx 10rpx;
-		background-color: red;
-		color: #ffffff;
-		font-size: 24rpx;
-		margin-top: 5rpx;
-	}
+  .card {
+    width: fit-content;
+    height: fit-content;
+    padding: 2rpx 10rpx;
+    background-color: red;
+    color: #ffffff;
+    font-size: 24rpx;
+    margin-top: 5rpx;
+  }
 
-	.card2 {
-		width: fit-content;
-		height: fit-content;
-		padding: 2rpx 10rpx;
-		background-color: rgb(255, 242, 241);
-		color: #ff2621;
-		font-size: 24rpx;
-		margin: 5rpx 0 5rpx 5rpx;
-	}
+  .card2 {
+    width: fit-content;
+    height: fit-content;
+    padding: 2rpx 10rpx;
+    background-color: rgb(255, 242, 241);
+    color: #ff2621;
+    font-size: 24rpx;
+    margin: 5rpx 0 5rpx 5rpx;
+  }
 
-	.iconBox {
-		width: 100%;
-		height: fit-content;
-		margin-top: 10rpx;
-		display: flex;
-		justify-content: flex-start;
-		flex-wrap: wrap;
-	}
-</style>
\ No newline at end of file
+  .iconBox {
+    width: 100%;
+    height: fit-content;
+    margin-top: 10rpx;
+    display: flex;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+  }
+</style>
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index a8bf1b26..9bab54b5 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -1,11 +1,7 @@
-import {
-	ref
-} from 'vue';
+import { ref } from 'vue';
 import dayjs from 'dayjs';
 import $url from '@/sheep/url';
-import {
-	formatDate
-} from '@/sheep/util';
+import { formatDate } from '@/sheep/util';
 
 /**
  * 格式化销量
@@ -14,8 +10,8 @@ import {
  * @return {string} 格式化后的销量字符串
  */
 export function formatSales(type, num) {
-	let prefix = type !== 'exact' && num < 10 ? '销量' : '已售';
-	return formatNum(prefix, type, num);
+  let prefix = type !== 'exact' && num < 10 ? '销量' : '已售';
+  return formatNum(prefix, type, num);
 }
 
 /**
@@ -25,7 +21,7 @@ export function formatSales(type, num) {
  * @return {string} 格式化后的销量字符串
  */
 export function formatExchange(type, num) {
-	return formatNum('已兑换', type, num);
+  return formatNum('已兑换', type, num);
 }
 
 /**
@@ -35,7 +31,7 @@ export function formatExchange(type, num) {
  * @return {string} 格式化后的销量字符串
  */
 export function formatStock(type, num) {
-	return formatNum('库存', type, num);
+  return formatNum('库存', type, num);
 }
 
 /**
@@ -46,27 +42,27 @@ export function formatStock(type, num) {
  * @return {string} 格式化后的销量字符串
  */
 export function formatNum(prefix, type, num) {
-	num = num || 0;
-	// 情况一：精确数值
-	if (type === 'exact') {
-		return prefix + num;
-	}
-	// 情况二：小于等于 10
-	if (num < 10) {
-		return `${prefix}≤10`;
-	}
-	// 情况三：大于 10，除第一位外，其它位都显示为0
-	// 例如：100  - 199  显示为 100+
-	//      9000 - 9999 显示为 9000+
-	const numStr = num.toString();
-	const first = numStr[0];
-	const other = '0'.repeat(numStr.length - 1);
-	return `${prefix}${first}${other}+`;
+  num = num || 0;
+  // 情况一：精确数值
+  if (type === 'exact') {
+    return prefix + num;
+  }
+  // 情况二：小于等于 10
+  if (num < 10) {
+    return `${prefix}≤10`;
+  }
+  // 情况三：大于 10，除第一位外，其它位都显示为0
+  // 例如：100  - 199  显示为 100+
+  //      9000 - 9999 显示为 9000+
+  const numStr = num.toString();
+  const first = numStr[0];
+  const other = '0'.repeat(numStr.length - 1);
+  return `${prefix}${first}${other}+`;
 }
 
 // 格式化价格
 export function formatPrice(e) {
-	return e.length === 1 ? e[0] : e.join('~');
+  return e.length === 1 ? e[0] : e.join('~');
 }
 
 // 视频格式后缀列表
@@ -79,19 +75,19 @@ const VIDEO_SUFFIX_LIST = ['.avi', '.mp4'];
  * @return {{src: string, type: 'video' | 'image' }[]}  转换后的链接列表
  */
 export function formatGoodsSwiper(urlList) {
-	return (
-		urlList
-		?.filter((url) => url)
-		.map((url, key) => {
-			const isVideo = VIDEO_SUFFIX_LIST.some((suffix) => url.includes(suffix));
-			const type = isVideo ? 'video' : 'image';
-			const src = $url.cdn(url);
-			return {
-				type,
-				src,
-			};
-		}) || []
-	);
+  return (
+    urlList
+      ?.filter((url) => url)
+      .map((url, key) => {
+        const isVideo = VIDEO_SUFFIX_LIST.some((suffix) => url.includes(suffix));
+        const type = isVideo ? 'video' : 'image';
+        const src = $url.cdn(url);
+        return {
+          type,
+          src,
+        };
+      }) || []
+  );
 }
 
 /**
@@ -101,16 +97,16 @@ export function formatGoodsSwiper(urlList) {
  * @return {string} 颜色的 class 名称
  */
 export function formatOrderColor(order) {
-	if (order.status === 0) {
-		return 'info-color';
-	}
-	if (order.status === 10 || order.status === 20 || (order.status === 30 && !order.commentStatus)) {
-		return 'warning-color';
-	}
-	if (order.status === 30 && order.commentStatus) {
-		return 'success-color';
-	}
-	return 'danger-color';
+  if (order.status === 0) {
+    return 'info-color';
+  }
+  if (order.status === 10 || order.status === 20 || (order.status === 30 && !order.commentStatus)) {
+    return 'warning-color';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return 'success-color';
+  }
+  return 'danger-color';
 }
 
 /**
@@ -119,25 +115,25 @@ export function formatOrderColor(order) {
  * @param order 订单
  */
 export function formatOrderStatus(order) {
-	if (order.status === 0) {
-		return '待付款';
-	}
-	if (order.status === 10 && order.deliveryType === 1) {
-		return '待发货';
-	}
-	if (order.status === 10 && order.deliveryType === 2) {
-		return '待核销';
-	}
-	if (order.status === 20) {
-		return '待收货';
-	}
-	if (order.status === 30 && !order.commentStatus) {
-		return '待评价';
-	}
-	if (order.status === 30 && order.commentStatus) {
-		return '已完成';
-	}
-	return '已关闭';
+  if (order.status === 0) {
+    return '待付款';
+  }
+  if (order.status === 10 && order.deliveryType === 1) {
+    return '待发货';
+  }
+  if (order.status === 10 && order.deliveryType === 2) {
+    return '待核销';
+  }
+  if (order.status === 20) {
+    return '待收货';
+  }
+  if (order.status === 30 && !order.commentStatus) {
+    return '待评价';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return '已完成';
+  }
+  return '已关闭';
 }
 
 /**
@@ -146,22 +142,22 @@ export function formatOrderStatus(order) {
  * @param order 订单
  */
 export function formatOrderStatusDescription(order) {
-	if (order.status === 0) {
-		return `请在 ${formatDate(order.payExpireTime)} 前完成支付`;
-	}
-	if (order.status === 10) {
-		return '商家未发货，请耐心等待';
-	}
-	if (order.status === 20) {
-		return '商家已发货，请耐心等待';
-	}
-	if (order.status === 30 && !order.commentStatus) {
-		return '已收货，快去评价一下吧';
-	}
-	if (order.status === 30 && order.commentStatus) {
-		return '交易完成，感谢您的支持';
-	}
-	return '交易关闭';
+  if (order.status === 0) {
+    return `请在 ${formatDate(order.payExpireTime)} 前完成支付`;
+  }
+  if (order.status === 10) {
+    return '商家未发货，请耐心等待';
+  }
+  if (order.status === 20) {
+    return '商家已发货，请耐心等待';
+  }
+  if (order.status === 30 && !order.commentStatus) {
+    return '已收货，快去评价一下吧';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return '交易完成，感谢您的支持';
+  }
+  return '交易关闭';
 }
 
 /**
@@ -170,32 +166,32 @@ export function formatOrderStatusDescription(order) {
  * @param order 订单
  */
 export function handleOrderButtons(order) {
-	order.buttons = [];
-	if (order.type === 3) {
-		// 查看拼团
-		order.buttons.push('combination');
-	}
-	if (order.status === 20) {
-		// 确认收货
-		order.buttons.push('confirm');
-	}
-	if (order.logisticsId > 0) {
-		// 查看物流
-		order.buttons.push('express');
-	}
-	if (order.status === 0) {
-		// 取消订单 / 发起支付
-		order.buttons.push('cancel');
-		order.buttons.push('pay');
-	}
-	if (order.status === 30 && !order.commentStatus) {
-		// 发起评价
-		order.buttons.push('comment');
-	}
-	if (order.status === 40) {
-		// 删除订单
-		order.buttons.push('delete');
-	}
+  order.buttons = [];
+  if (order.type === 3) {
+    // 查看拼团
+    order.buttons.push('combination');
+  }
+  if (order.status === 20) {
+    // 确认收货
+    order.buttons.push('confirm');
+  }
+  if (order.logisticsId > 0) {
+    // 查看物流
+    order.buttons.push('express');
+  }
+  if (order.status === 0) {
+    // 取消订单 / 发起支付
+    order.buttons.push('cancel');
+    order.buttons.push('pay');
+  }
+  if (order.status === 30 && !order.commentStatus) {
+    // 发起评价
+    order.buttons.push('comment');
+  }
+  if (order.status === 40) {
+    // 删除订单
+    order.buttons.push('delete');
+  }
 }
 
 /**
@@ -204,31 +200,31 @@ export function handleOrderButtons(order) {
  * @param afterSale 售后
  */
 export function formatAfterSaleStatus(afterSale) {
-	if (afterSale.status === 10) {
-		return '申请售后';
-	}
-	if (afterSale.status === 20) {
-		return '商品待退货';
-	}
-	if (afterSale.status === 30) {
-		return '商家待收货';
-	}
-	if (afterSale.status === 40) {
-		return '等待退款';
-	}
-	if (afterSale.status === 50) {
-		return '退款成功';
-	}
-	if (afterSale.status === 61) {
-		return '买家取消';
-	}
-	if (afterSale.status === 62) {
-		return '商家拒绝';
-	}
-	if (afterSale.status === 63) {
-		return '商家拒收货';
-	}
-	return '未知状态';
+  if (afterSale.status === 10) {
+    return '申请售后';
+  }
+  if (afterSale.status === 20) {
+    return '商品待退货';
+  }
+  if (afterSale.status === 30) {
+    return '商家待收货';
+  }
+  if (afterSale.status === 40) {
+    return '等待退款';
+  }
+  if (afterSale.status === 50) {
+    return '退款成功';
+  }
+  if (afterSale.status === 61) {
+    return '买家取消';
+  }
+  if (afterSale.status === 62) {
+    return '商家拒绝';
+  }
+  if (afterSale.status === 63) {
+    return '商家拒收货';
+  }
+  return '未知状态';
 }
 
 /**
@@ -237,31 +233,31 @@ export function formatAfterSaleStatus(afterSale) {
  * @param afterSale 售后
  */
 export function formatAfterSaleStatusDescription(afterSale) {
-	if (afterSale.status === 10) {
-		return '退款申请待商家处理';
-	}
-	if (afterSale.status === 20) {
-		return '请退货并填写物流信息';
-	}
-	if (afterSale.status === 30) {
-		return '退货退款申请待商家处理';
-	}
-	if (afterSale.status === 40) {
-		return '等待退款';
-	}
-	if (afterSale.status === 50) {
-		return '退款成功';
-	}
-	if (afterSale.status === 61) {
-		return '退款关闭';
-	}
-	if (afterSale.status === 62) {
-		return `商家不同意退款申请，拒绝原因：${afterSale.auditReason}`;
-	}
-	if (afterSale.status === 63) {
-		return `商家拒绝收货，不同意退款，拒绝原因：${afterSale.auditReason}`;
-	}
-	return '未知状态';
+  if (afterSale.status === 10) {
+    return '退款申请待商家处理';
+  }
+  if (afterSale.status === 20) {
+    return '请退货并填写物流信息';
+  }
+  if (afterSale.status === 30) {
+    return '退货退款申请待商家处理';
+  }
+  if (afterSale.status === 40) {
+    return '等待退款';
+  }
+  if (afterSale.status === 50) {
+    return '退款成功';
+  }
+  if (afterSale.status === 61) {
+    return '退款关闭';
+  }
+  if (afterSale.status === 62) {
+    return `商家不同意退款申请，拒绝原因：${afterSale.auditReason}`;
+  }
+  if (afterSale.status === 63) {
+    return `商家拒绝收货，不同意退款，拒绝原因：${afterSale.auditReason}`;
+  }
+  return '未知状态';
 }
 
 /**
@@ -270,15 +266,15 @@ export function formatAfterSaleStatusDescription(afterSale) {
  * @param afterSale 售后
  */
 export function handleAfterSaleButtons(afterSale) {
-	afterSale.buttons = [];
-	if ([10, 20, 30].includes(afterSale.status)) {
-		// 取消订单
-		afterSale.buttons.push('cancel');
-	}
-	if (afterSale.status === 20) {
-		// 退货信息
-		afterSale.buttons.push('delivery');
-	}
+  afterSale.buttons = [];
+  if ([10, 20, 30].includes(afterSale.status)) {
+    // 取消订单
+    afterSale.buttons.push('cancel');
+  }
+  if (afterSale.status === 20) {
+    // 退货信息
+    afterSale.buttons.push('delivery');
+  }
 }
 
 /**
@@ -288,28 +284,28 @@ export function handleAfterSaleButtons(afterSale) {
  * @return {{s: string, ms: number, h: string, m: string}} 持续时间
  */
 export function useDurationTime(toTime, fromTime = '') {
-	toTime = getDayjsTime(toTime);
-	if (fromTime === '') {
-		fromTime = dayjs();
-	}
-	let duration = ref(toTime - fromTime);
-	if (duration.value > 0) {
-		setTimeout(() => {
-			if (duration.value > 0) {
-				duration.value -= 1000;
-			}
-		}, 1000);
-	}
+  toTime = getDayjsTime(toTime);
+  if (fromTime === '') {
+    fromTime = dayjs();
+  }
+  let duration = ref(toTime - fromTime);
+  if (duration.value > 0) {
+    setTimeout(() => {
+      if (duration.value > 0) {
+        duration.value -= 1000;
+      }
+    }, 1000);
+  }
 
-	let durationTime = dayjs.duration(duration.value);
-	return {
-		h: (durationTime.months() * 30 * 24 + durationTime.days() * 24 + durationTime.hours())
-			.toString()
-			.padStart(2, '0'),
-		m: durationTime.minutes().toString().padStart(2, '0'),
-		s: durationTime.seconds().toString().padStart(2, '0'),
-		ms: durationTime.$ms,
-	};
+  let durationTime = dayjs.duration(duration.value);
+  return {
+    h: (durationTime.months() * 30 * 24 + durationTime.days() * 24 + durationTime.hours())
+      .toString()
+      .padStart(2, '0'),
+    m: durationTime.minutes().toString().padStart(2, '0'),
+    s: durationTime.seconds().toString().padStart(2, '0'),
+    ms: durationTime.$ms,
+  };
 }
 
 /**
@@ -318,19 +314,19 @@ export function useDurationTime(toTime, fromTime = '') {
  * @return {dayjs.Dayjs}
  */
 function getDayjsTime(time) {
-	time = time.toString();
-	if (time.indexOf('-') > 0) {
-		// 'date'
-		return dayjs(time);
-	}
-	if (time.length > 10) {
-		// 'timestamp'
-		return dayjs(parseInt(time));
-	}
-	if (time.length === 10) {
-		// 'unixTime'
-		return dayjs.unix(parseInt(time));
-	}
+  time = time.toString();
+  if (time.indexOf('-') > 0) {
+    // 'date'
+    return dayjs(time);
+  }
+  if (time.length > 10) {
+    // 'timestamp'
+    return dayjs(parseInt(time));
+  }
+  if (time.length === 10) {
+    // 'unixTime'
+    return dayjs.unix(parseInt(time));
+  }
 }
 
 /**
@@ -340,7 +336,28 @@ function getDayjsTime(time) {
  * @returns {string} 元，例如说 1.00 元
  */
 export function fen2yuan(price) {
-	return (price / 100.0).toFixed(2);
+  return (price / 100.0).toFixed(2);
+}
+
+/**
+ * 将分转成元
+ *
+ * 如果没有小数点，则不展示小数点部分
+ *
+ * @param price 分，例如说 100 分
+ * @returns {string} 元，例如说 1 元
+ */
+export function fen2yuanSimple(price) {
+  return fen2yuan(price).replace(/\.?0+$/, '');
+}
+
+/**
+ * 将折扣百分比转化为“打x者”的 x 部分
+ *
+ * @param discountPercent
+ */
+export function formatDiscountPercent(discountPercent) {
+  return (discountPercent / 10.0).toFixed(1).replace(/\.?0+$/, '');
 }
 
 /**
@@ -358,92 +375,125 @@ export function fen2yuan(price) {
  * @param skus 商品 SKU 数组
  */
 export function convertProductPropertyList(skus) {
-	let result = [];
-	for (const sku of skus) {
-		if (!sku.properties) {
-			continue;
-		}
-		for (const property of sku.properties) {
-			// ① 先处理属性
-			let resultProperty = result.find((item) => item.id === property.propertyId);
-			if (!resultProperty) {
-				resultProperty = {
-					id: property.propertyId,
-					name: property.propertyName,
-					values: [],
-				};
-				result.push(resultProperty);
-			}
-			// ② 再处理属性值
-			let resultValue = resultProperty.values.find((item) => item.id === property.valueId);
-			if (!resultValue) {
-				resultProperty.values.push({
-					id: property.valueId,
-					name: property.valueName,
-				});
-			}
-		}
-	}
-	return result;
+  let result = [];
+  for (const sku of skus) {
+    if (!sku.properties) {
+      continue;
+    }
+    for (const property of sku.properties) {
+      // ① 先处理属性
+      let resultProperty = result.find((item) => item.id === property.propertyId);
+      if (!resultProperty) {
+        resultProperty = {
+          id: property.propertyId,
+          name: property.propertyName,
+          values: [],
+        };
+        result.push(resultProperty);
+      }
+      // ② 再处理属性值
+      let resultValue = resultProperty.values.find((item) => item.id === property.valueId);
+      if (!resultValue) {
+        resultProperty.values.push({
+          id: property.valueId,
+          name: property.valueName,
+        });
+      }
+    }
+  }
+  return result;
 }
 
 export function appendSettlementProduct(spus, settlementInfos) {
-	if (!settlementInfos || settlementInfos.length === 0) {
-		return;
-	}
-	for (const spu of spus) {
-		const settlementInfo = settlementInfos.find((info) => info.spuId === spu.id);
-		if (!settlementInfo) {
-			return;
-		}
-		// 选择价格最小的 SKU 设置到 SPU 上
-		const settlementSku = settlementInfo.skus
-			.filter((sku) => sku.promotionPrice > 0)
-			.reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
-		if (settlementSku) {
-			spu.promotionType = settlementSku.promotionType;
-			spu.promotionPrice = settlementSku.promotionPrice;
-		}
-		// 设置【满减送】活动
-		if (settlementInfo.rewardActivity) {
-			spu.rewardActivity = settlementInfo.rewardActivity;
-		}
-	}
+  if (!settlementInfos || settlementInfos.length === 0) {
+    return;
+  }
+  for (const spu of spus) {
+    const settlementInfo = settlementInfos.find((info) => info.spuId === spu.id);
+    if (!settlementInfo) {
+      return;
+    }
+    // 选择价格最小的 SKU 设置到 SPU 上
+    const settlementSku = settlementInfo.skus
+      .filter((sku) => sku.promotionPrice > 0)
+      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
+    if (settlementSku) {
+      spu.promotionType = settlementSku.promotionType;
+      spu.promotionPrice = settlementSku.promotionPrice;
+    }
+    // 设置【满减送】活动
+    if (settlementInfo.rewardActivity) {
+      spu.rewardActivity = settlementInfo.rewardActivity;
+    }
+  }
 }
 
-//处理促销信息
-export function handeleData(array) {
-	const array2 = ref([{
-			name: '满减',
-			value: []
-		},
-		{
-			name: '赠品',
-			value: []
-		},
-		{
-			name: '包邮',
-			value: []
-		}
-	]);
+// 获得满减送活动的规则描述（group）
+export function getRewardActivityRuleGroupDescriptions(activity) {
+  if (!activity || !activity.rules || activity.rules.length === 0) {
+    return [];
+  }
+  const result = [
+    { name: '满减', values: [] },
+    { name: '赠品', values: [] },
+    { name: '包邮', values: [] },
+  ];
+  activity.rules.forEach((rule) => {
+    const conditionTypeStr =
+      activity.conditionType === 10 ? `满 ${fen2yuanSimple(rule.limit)} 元` : `满 ${rule.limit} 件`;
+    // 满减
+    if (rule.limit) {
+      result[0].values.push(`${conditionTypeStr} 减 ${fen2yuanSimple(rule.discountPrice)} 元`);
+    }
+    // 赠品
+    if (rule.point || (rule.giveCouponTemplateCounts && rule.giveCouponTemplateCounts.length > 0)) {
+      let tips = [];
+      if (rule.point) {
+        tips.push(`送 ${rule.point} 积分`);
+      }
+      if (rule.giveCouponTemplateCounts && rule.giveCouponTemplateCounts.length > 0) {
+        tips.push(`送 ${rule.giveCouponTemplateCounts.length} 张优惠券`);
+      }
+      result[1].values.push(`${conditionTypeStr} ${tips.join('、')}`);
+    }
+    // 包邮
+    if (rule.freeDelivery) {
+      result[2].values.push(`${conditionTypeStr} 包邮`);
+    }
+  });
+  // 移除 values 为空的元素
+  result.forEach((item) => {
+    if (item.values.length === 0) {
+      result.splice(result.indexOf(item), 1);
+    }
+  });
+  return result;
+}
 
-	array.forEach(item => {
-		Object.entries(item).forEach(([key, value]) => {
-			const type = parseInt(key);
-			switch (type) {
-				case 1:
-					array2.value[0].value.push(value); // 满减
-					break;
-				case 2:
-					array2.value[1].value.push(value); // 满送
-					break;
-				case 3:
-					array2.value[2].value.push(value); // 包邮
-					break;
-				default:
-					break;
-			}
-		});
-	});
-	return array2
-}
\ No newline at end of file
+// 获得满减送活动的规则描述（item）
+export function getRewardActivityRuleItemDescriptions(activity) {
+  if (!activity || !activity.rules || activity.rules.length === 0) {
+    return [];
+  }
+  const result = [];
+  activity.rules.forEach((rule) => {
+    const conditionTypeStr =
+      activity.conditionType === 10 ? `满${fen2yuanSimple(rule.limit)}元` : `满${rule.limit}件`;
+    // 满减
+    if (rule.limit) {
+      result.push(`${conditionTypeStr}减${fen2yuanSimple(rule.discountPrice)}元`);
+    }
+    // 赠品
+    if (rule.point) {
+      result.push(`${conditionTypeStr}送${rule.point}积分`);
+    }
+    if (rule.giveCouponTemplateCounts && rule.giveCouponTemplateCounts.length > 0) {
+      result.push(`${conditionTypeStr}送${rule.giveCouponTemplateCounts.length}张优惠券`);
+    }
+    // 包邮
+    if (rule.freeDelivery) {
+      result.push(`${conditionTypeStr}包邮`);
+    }
+  });
+  return result;
+}

From 27260f4a7508224d54f9cdabb7f976c5ccdbfe66 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 23 Sep 2024 09:55:07 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=9D=20wap=20=E7=9A=84=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/platform/pay.js | 99 ++++++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 44 deletions(-)

diff --git a/sheep/platform/pay.js b/sheep/platform/pay.js
index 89e70d49..d714374d 100644
--- a/sheep/platform/pay.js
+++ b/sheep/platform/pay.js
@@ -35,7 +35,7 @@ export default class SheepPay {
         },
         mock: () => {
           this.mockPay();
-        }
+        },
       },
       WechatMiniProgram: {
         wechat: () => {
@@ -49,7 +49,7 @@ export default class SheepPay {
         },
         mock: () => {
           this.mockPay();
-        }
+        },
       },
       App: {
         wechat: () => {
@@ -63,7 +63,7 @@ export default class SheepPay {
         },
         mock: () => {
           this.mockPay();
-        }
+        },
       },
       H5: {
         wechat: () => {
@@ -77,7 +77,7 @@ export default class SheepPay {
         },
         mock: () => {
           this.mockPay();
-        }
+        },
       },
     };
     return payAction[sheep.$platform.name][this.payment]();
@@ -89,7 +89,7 @@ export default class SheepPay {
       let data = {
         id: this.id,
         channelCode: channel,
-        channelExtras: {}
+        channelExtras: {},
       };
       // 特殊逻辑：微信公众号、小程序支付时，必须传入 openid
       if (['wx_pub', 'wx_lite'].includes(channel)) {
@@ -108,8 +108,11 @@ export default class SheepPay {
         // 失败时
         if (res.code !== 0 && res.msg.indexOf('无效的openid') >= 0) {
           // 特殊逻辑：微信公众号、小程序支付时，必须传入 openid 不正确的情况
-          if (res.msg.indexOf('无效的openid') >= 0 // 获取的 openid 不正确时，或者随便输入了个 openid
-            || res.msg.indexOf('下单账号与支付账号不一致') >= 0) { // https://developers.weixin.qq.com/community/develop/doc/00008c53c347804beec82aed051c00
+          if (
+            res.msg.indexOf('无效的openid') >= 0 || // 获取的 openid 不正确时，或者随便输入了个 openid
+            res.msg.indexOf('下单账号与支付账号不一致') >= 0
+          ) {
+            // https://developers.weixin.qq.com/community/develop/doc/00008c53c347804beec82aed051c00
             this.bindWeixin();
           }
         }
@@ -133,30 +136,34 @@ export default class SheepPay {
       },
       fail: (error) => {
         if (error.errMsg.indexOf('chooseWXPay:没有此SDK或暂不支持此SDK模拟') >= 0) {
-          sheep.$helper.toast('发起微信支付失败，原因：可能是微信开发者工具不支持，建议使用微信打开网页后支付');
-          return
+          sheep.$helper.toast(
+            '发起微信支付失败，原因：可能是微信开发者工具不支持，建议使用微信打开网页后支付',
+          );
+          return;
         }
         this.payResult('fail');
       },
     });
   }
 
-  // 浏览器微信 H5 支付 TODO 芋艿：待接入
+  // 浏览器微信 H5 支付 TODO 芋艿：待接入（注意：H5 支付是给普通浏览器，不是微信公众号的支付，绝大多数人用不到，可以忽略）
   async wechatWapPay() {
     const { error, data } = await this.prepay();
     if (error === 0) {
-      const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${this.payment}&orderType=${this.orderType}`;
+      const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${
+        this.payment
+      }&orderType=${this.orderType}`;
       location.href = `${data.pay_data.h5_url}&redirect_url=${encodeURIComponent(redirect_url)}`;
     }
   }
 
-  // 支付链接  TODO 芋艿：待接入
+  // 支付链接(支付宝 wap 支付)
   async redirectPay() {
-    let { error, data } = await this.prepay();
-    if (error === 0) {
-      const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${this.payment}&orderType=${this.orderType}`;
-      location.href = data.pay_data + encodeURIComponent(redirect_url);
+    let { code, data } = await this.prepay('alipay_wap');
+    if (code !== 0) {
+      return;
     }
+    location.href = data.displayContent;
   }
 
   // #endif
@@ -202,26 +209,26 @@ export default class SheepPay {
     code === 0 && this.payResult('success');
   }
 
-  // 支付宝复制链接支付  TODO 芋艿：待接入
+  // 支付宝复制链接支付（通过支付宝 wap 支付实现）
   async copyPayLink() {
-    let that = this;
-    let { error, data } = await this.prepay();
-    if (error === 0) {
-      // 引入showModal 点击确认 复制链接；
-      uni.showModal({
-        title: '支付宝支付',
-        content: '复制链接到外部浏览器',
-        confirmText: '复制链接',
-        success: (res) => {
-          if (res.confirm) {
-            sheep.$helper.copyText(data.pay_data);
-          }
-        },
-      });
+    let { code, data } = await this.prepay('alipay_wap');
+    if (code !== 0) {
+      return;
     }
+    // 引入 showModal 点击确认：复制链接；
+    uni.showModal({
+      title: '支付宝支付',
+      content: '复制链接到外部浏览器',
+      confirmText: '复制链接',
+      success: (res) => {
+        if (res.confirm) {
+          sheep.$helper.copyText(data.displayContent);
+        }
+      },
+    });
   }
 
-  // 支付宝支付  TODO 芋艿：待接入
+  // 支付宝支付（App） TODO 芋艿：待接入【暂时没打包 app，所以没接入，一般人用不到】
   async alipay() {
     let that = this;
     const { error, data } = await this.prepay();
@@ -243,7 +250,7 @@ export default class SheepPay {
     }
   }
 
-  // 微信支付  TODO 芋艿：待接入
+  // 微信支付（App）  TODO 芋艿：待接入：待接入【暂时没打包 app，所以没接入，一般人用不到】
   async wechatAppPay() {
     let that = this;
     let { error, data } = await this.prepay();
@@ -266,7 +273,7 @@ export default class SheepPay {
     sheep.$router.redirect('/pages/pay/result', {
       id: this.id,
       orderType: this.orderType,
-      payState: resultType
+      payState: resultType,
     });
   }
 
@@ -282,7 +289,6 @@ export default class SheepPay {
       },
     });
   }
-
 }
 
 export function getPayMethods(channels) {
@@ -316,23 +322,28 @@ export function getPayMethods(channels) {
       title: '模拟支付',
       value: 'mock',
       disabled: true,
-    }
+    },
   ];
-  const platform = sheep.$platform.name
+  const platform = sheep.$platform.name;
 
   // 1. 处理【微信支付】
   const wechatMethod = payMethods[0];
-  if ((platform === 'WechatOfficialAccount' && channels.includes('wx_pub'))
-    || (platform === 'WechatMiniProgram' && channels.includes('wx_lite'))
-    || (platform === 'App' && channels.includes('wx_app'))) {
+  if (
+    (platform === 'WechatOfficialAccount' && channels.includes('wx_pub')) ||
+    (platform === 'WechatMiniProgram' && channels.includes('wx_lite')) ||
+    (platform === 'App' && channels.includes('wx_app'))
+  ) {
     wechatMethod.disabled = false;
   }
 
   // 2. 处理【支付宝支付】
   const alipayMethod = payMethods[1];
-  if ((platform === 'WechatOfficialAccount' && channels.includes('alipay_wap'))
-    || platform === 'WechatMiniProgram' && channels.includes('alipay_wap')
-    || platform === 'App' && channels.includes('alipay_app')) {
+  if (
+    (platform === 'H5' && channels.includes('alipay_wap')) ||
+    (platform === 'WechatOfficialAccount' && channels.includes('alipay_wap')) ||
+    (platform === 'WechatMiniProgram' && channels.includes('alipay_wap')) ||
+    (platform === 'App' && channels.includes('alipay_app'))
+  ) {
     alipayMethod.disabled = false;
   }
   // 3. 处理【余额支付】
@@ -347,4 +358,4 @@ export function getPayMethods(channels) {
     mockMethod.disabled = false;
   }
   return payMethods;
-}
\ No newline at end of file
+}

From a1995c88e8fcbabecdc3626e25935187608b247d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 24 Sep 2024 09:04:57 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=94=AF=E4=BB=98=EF=BC=9A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E6=97=B6=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20sync=20=E4=B8=BB=E5=8A=A8=E8=BD=AE=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=94=AF=E4=BB=98=E5=AE=9D=E3=80=81?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=AD=98=E5=9C=A8=E5=BB=B6=E8=BF=9F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pay/index.vue    | 41 ++++++++++++++++++++++++++---------------
 sheep/api/pay/order.js |  8 ++++----
 sheep/platform/pay.js  | 15 ++++++++++-----
 3 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index 103e9e4d..11069038 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -81,7 +81,7 @@
   import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
   import PayOrderApi from '@/sheep/api/pay/order';
   import PayChannelApi from '@/sheep/api/pay/channel';
-  import { getPayMethods } from '@/sheep/platform/pay';
+  import { getPayMethods, goPayResult } from '@/sheep/platform/pay';
 
   const userWallet = computed(() => sheep.$store('user').userWallet);
 
@@ -135,12 +135,22 @@
 
   // 状态转换：payOrder.status => payStatus
   function checkPayStatus() {
-    if (state.orderInfo.status === 10
-      || state.orderInfo.status === 20 ) { // 支付成功
+    if (state.orderInfo.status === 10 || state.orderInfo.status === 20) {
+      // 支付成功
       state.payStatus = 2;
+      // 跳转回支付成功页
+      uni.showModal({
+        title: '提示',
+        content: '订单已支付',
+        showCancel: false,
+        success: function () {
+          goPayResult(state.orderInfo.id, state.orderType);
+        },
+      });
       return;
     }
-    if (state.orderInfo.status === 30) { // 支付关闭
+    if (state.orderInfo.status === 30) {
+      // 支付关闭
       state.payStatus = -1;
       return;
     }
@@ -155,26 +165,26 @@
   // 设置支付订单信息
   async function setOrder(id) {
     // 获得支付订单信息
-    const { data, code } = await PayOrderApi.getOrder(id);
+    const { data, code } = await PayOrderApi.getOrder(id, true);
     if (code !== 0 || !data) {
       state.payStatus = -2;
       return;
     }
     state.orderInfo = data;
-    // 获得支付方式
-    await setPayMethods();
     // 设置支付状态
     checkPayStatus();
+    // 获得支付方式
+    await setPayMethods();
   }
 
   // 获得支付方式
   async function setPayMethods() {
-    const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId)
+    const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId);
     if (code !== 0) {
-      return
+      return;
     }
-    state.payMethods = getPayMethods(data)
-    state.payMethods.find(item => {
+    state.payMethods = getPayMethods(data);
+    state.payMethods.find((item) => {
       if (item.value && !item.disabled) {
         state.payment = item.value;
         return true;
@@ -183,9 +193,11 @@
   }
 
   onLoad((options) => {
-    if (sheep.$platform.name === 'WechatOfficialAccount'
-      && sheep.$platform.os === 'ios'
-      && !sheep.$platform.landingPage.includes('pages/pay/index')) {
+    if (
+      sheep.$platform.name === 'WechatOfficialAccount' &&
+      sheep.$platform.os === 'ios' &&
+      !sheep.$platform.landingPage.includes('pages/pay/index')
+    ) {
       location.reload();
       return;
     }
@@ -214,7 +226,6 @@
       position: relative;
       padding: 60rpx 20rpx 40rpx;
 
-
       .money-text {
         color: $red;
         font-size: 46rpx;
diff --git a/sheep/api/pay/order.js b/sheep/api/pay/order.js
index f9853596..f7bef28f 100644
--- a/sheep/api/pay/order.js
+++ b/sheep/api/pay/order.js
@@ -2,11 +2,11 @@ import request from '@/sheep/request';
 
 const PayOrderApi = {
   // 获得支付订单
-  getOrder: (id) => {
+  getOrder: (id, sync) => {
     return request({
       url: '/pay/order/get',
       method: 'GET',
-      params: { id }
+      params: { id, sync },
     });
   },
   // 提交支付订单
@@ -14,9 +14,9 @@ const PayOrderApi = {
     return request({
       url: '/pay/order/submit',
       method: 'POST',
-      data
+      data,
     });
-  }
+  },
 };
 
 export default PayOrderApi;
diff --git a/sheep/platform/pay.js b/sheep/platform/pay.js
index d714374d..ced3aa07 100644
--- a/sheep/platform/pay.js
+++ b/sheep/platform/pay.js
@@ -270,11 +270,7 @@ export default class SheepPay {
 
   // 支付结果跳转,success:成功，fail:失败
   payResult(resultType) {
-    sheep.$router.redirect('/pages/pay/result', {
-      id: this.id,
-      orderType: this.orderType,
-      payState: resultType,
-    });
+    goPayResult(this.id, this.orderType, resultType);
   }
 
   // 引导绑定微信
@@ -359,3 +355,12 @@ export function getPayMethods(channels) {
   }
   return payMethods;
 }
+
+// 支付结果跳转,success:成功，fail:失败
+export function goPayResult(id, orderType, resultType) {
+  sheep.$router.redirect('/pages/pay/result', {
+    id,
+    orderType,
+    payState: resultType,
+  });
+}

From ca1926a732d1cfa343a885d683c9df60b49ea986 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 24 Sep 2024 13:00:46 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=94=AF=E4=BB=98=EF=BC=9A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E6=97=B6=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20sync=20=E4=B8=BB=E5=8A=A8=E8=BD=AE=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=94=AF=E4=BB=98=E5=AE=9D=E3=80=81?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=AD=98=E5=9C=A8=E5=BB=B6=E8=BF=9F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/comment/add.vue     |  2 +-
 pages/order/aftersale/apply.vue |  2 +-
 pages/order/detail.vue          | 14 +++++++++-----
 pages/order/express/log.vue     | 16 ++++++++--------
 pages/pay/result.vue            |  5 ++++-
 sheep/api/trade/order.js        |  5 +++--
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/pages/goods/comment/add.vue b/pages/goods/comment/add.vue
index bfbc8001..e35eca53 100644
--- a/pages/goods/comment/add.vue
+++ b/pages/goods/comment/add.vue
@@ -121,7 +121,7 @@
     }
     state.id = options.id;
 
-    const { code, data } = await OrderApi.getOrder(state.id);
+    const { code, data } = await OrderApi.getOrderDetail(state.id);
     if (code !== 0) {
       sheep.$helper.toast('无待评价订单');
       return;
diff --git a/pages/order/aftersale/apply.vue b/pages/order/aftersale/apply.vue
index 805ea944..bd69a90c 100644
--- a/pages/order/aftersale/apply.vue
+++ b/pages/order/aftersale/apply.vue
@@ -208,7 +208,7 @@
     state.itemId = parseInt(options.itemId);
 
     // 读取订单信息
-    const { code, data } = await OrderApi.getOrder(state.orderId);
+    const { code, data } = await OrderApi.getOrderDetail(state.orderId);
     if (code !== 0) {
       return;
     }
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index ed0119fa..b276d351 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -127,7 +127,11 @@
     </view>
 
     <!--  自提核销  -->
-    <PickUpVerify :order-info="state.orderInfo" :systemStore="systemStore" ref="pickUpVerifyRef"></PickUpVerify>
+    <PickUpVerify
+      :order-info="state.orderInfo"
+      :systemStore="systemStore"
+      ref="pickUpVerifyRef"
+    ></PickUpVerify>
 
     <!-- 订单信息 -->
     <view class="notice-box">
@@ -305,7 +309,7 @@
     uni.showModal({
       title: '提示',
       content: '确定要取消订单吗?',
-      success: async function(res) {
+      success: async function (res) {
         if (!res.confirm) {
           return;
         }
@@ -394,11 +398,11 @@
     let res;
     if (state.comeinType === 'wechat') {
       // TODO 芋艿：微信场景下
-      res = await OrderApi.getOrder(id, {
+      res = await OrderApi.getOrderDetail(id, {
         merchant_trade_no: state.merchantTradeNo,
       });
     } else {
-      res = await OrderApi.getOrder(id);
+      res = await OrderApi.getOrderDetail(id);
     }
     if (res.code === 0) {
       state.orderInfo = res.data;
@@ -451,7 +455,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/express/log.vue b/pages/order/express/log.vue
index eb992a58..c852edc4 100644
--- a/pages/order/express/log.vue
+++ b/pages/order/express/log.vue
@@ -13,10 +13,10 @@
         </uni-swiper-dot>
         <view class="log-card-msg">
           <!-- TODO 芋艿：【物流】优化点：展示状态 -->
-<!--          <view class="ss-flex ss-m-b-8">-->
-<!--            <view>物流状态：</view>-->
-<!--            <view class="warning-color">{{ state.info.status_text }}</view>-->
-<!--          </view>-->
+          <!--          <view class="ss-flex ss-m-b-8">-->
+          <!--            <view>物流状态：</view>-->
+          <!--            <view class="warning-color">{{ state.info.status_text }}</view>-->
+          <!--          </view>-->
           <view class="ss-m-b-8">快递单号：{{ state.info.logisticsNo }}</view>
           <view>快递公司：{{ state.info.logisticsName }}</view>
         </view>
@@ -35,9 +35,9 @@
           </view>
           <view class="log-content-msg">
             <!-- TODO 芋艿：【物流】优化点：展示状态 -->
-<!--            <view class="log-msg-title ss-m-b-20">-->
-<!--              {{ item.status_text }}-->
-<!--            </view>-->
+            <!--            <view class="log-msg-title ss-m-b-20">-->
+            <!--              {{ item.status_text }}-->
+            <!--            </view>-->
             <view class="log-msg-desc ss-m-b-16">{{ item.content }}</view>
             <view class="log-msg-date ss-m-b-40">
               {{ sheep.$helper.timeFormat(item.time, 'yyyy-mm-dd hh:MM:ss') }}
@@ -78,7 +78,7 @@
   }
 
   async function getOrderDetail(id) {
-    const { data } = await OrderApi.getOrder(id)
+    const { data } = await OrderApi.getOrderDetail(id);
     state.info = data;
   }
 
diff --git a/pages/pay/result.vue b/pages/pay/result.vue
index 53e72b3d..3a8a446d 100644
--- a/pages/pay/result.vue
+++ b/pages/pay/result.vue
@@ -126,7 +126,10 @@
         // #endif
         // 特殊：获得商品订单信息
         if (state.orderType === 'goods') {
-          const { data, code } = await OrderApi.getOrder(state.orderInfo.merchantOrderId);
+          const { data, code } = await OrderApi.getOrderDetail(
+            state.orderInfo.merchantOrderId,
+            true,
+          );
           if (code === 0) {
             state.tradeOrder = data;
           }
diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js
index 9e5883e5..df77aec2 100644
--- a/sheep/api/trade/order.js
+++ b/sheep/api/trade/order.js
@@ -73,13 +73,14 @@ const OrderApi = {
       data,
     });
   },
-  // 获得订单
-  getOrder: (id) => {
+  // 获得订单详细：sync 是可选参数
+  getOrderDetail: (id, sync) => {
     return request({
       url: `/trade/order/get-detail`,
       method: 'GET',
       params: {
         id,
+        sync,
       },
       custom: {
         showLoading: false,

From d2f516e1aef70276b4523a34681942e9be60799b Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 28 Sep 2024 11:37:22 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  11 +
 pages/activity/point/list.vue                 |  77 +++
 pages/goods/point.vue                         | 368 ++++++++++++++
 pages/order/pickUpVerify.vue                  |  19 +-
 sheep/api/promotion/point.js                  |  34 ++
 .../components/s-block-item/s-block-item.vue  |   2 +
 .../components/s-goods-item/s-goods-item.vue  |  12 +-
 .../s-point-block/s-point-block.vue           | 202 ++++++++
 .../components/s-point-card/s-point-card.vue  | 458 ++++++++++++++++++
 9 files changed, 1171 insertions(+), 12 deletions(-)
 create mode 100644 pages/activity/point/list.vue
 create mode 100644 pages/goods/point.vue
 create mode 100644 sheep/api/promotion/point.js
 create mode 100644 sheep/components/s-point-block/s-point-block.vue
 create mode 100644 sheep/components/s-point-card/s-point-card.vue

diff --git a/pages.json b/pages.json
index 78d7c311..88ac0f4a 100644
--- a/pages.json
+++ b/pages.json
@@ -120,6 +120,17 @@
 						"group": "商品"
 					}
 				},
+                {
+                    "path": "point",
+                    "style": {
+                      "navigationBarTitleText": "积分商品"
+                    },
+                    "meta": {
+                      "sync": true,
+                      "title": "积分商品",
+                      "group": "商品"
+                    }
+                },
 				{
 					"path": "list",
 					"style": {
diff --git a/pages/activity/point/list.vue b/pages/activity/point/list.vue
new file mode 100644
index 00000000..8b1e1bf9
--- /dev/null
+++ b/pages/activity/point/list.vue
@@ -0,0 +1,77 @@
+<!-- 页面  -->
+<template>
+  <s-layout title="积分商城">
+    <view class="ss-p-20">
+      <view v-for="item in state.pagination.data" :key="item.id" class="ss-m-b-20">
+        <s-point-card
+          size="sl"
+          :data="item"
+          priceColor="#FF3000"
+          @tap="sheep.$router.go('/pages/goods/point', { id: item.id })"
+        ></s-point-card>
+      </view>
+    </view>
+    <s-empty
+      v-if="state.pagination.total === 0"
+      icon="/static/goods-empty.png"
+      text="暂无积分商品"
+    ></s-empty>
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @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';
+
+  const state = reactive({
+    pagination: {
+      data: [],
+      current_page: 1,
+      total: 1,
+      last_page: 1,
+    },
+    loadStatus: '',
+  });
+  async function getData(page = 1, list_rows = 5) {
+    state.loadStatus = 'loading';
+    let res = await sheep.$api.app.scoreShop.list({
+      list_rows,
+      page,
+    });
+    if (res.error === 0) {
+      let couponlist = _.concat(state.pagination.data, res.data.data);
+      state.pagination = {
+        ...res.data,
+        data: couponlist,
+      };
+      if (state.pagination.current_page < state.pagination.last_page) {
+        state.loadStatus = 'more';
+      } else {
+        state.loadStatus = 'noMore';
+      }
+    }
+  }
+  // 加载更多
+  function loadmore() {
+    if (state.loadStatus !== 'noMore') {
+      getData(state.pagination.current_page + 1);
+    }
+  }
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadmore();
+  });
+  onLoad(() => {
+    getData();
+  });
+</script>
diff --git a/pages/goods/point.vue b/pages/goods/point.vue
new file mode 100644
index 00000000..ee3707c0
--- /dev/null
+++ b/pages/goods/point.vue
@@ -0,0 +1,368 @@
+<template>
+  <view>
+    <s-layout :onShareAppMessage="state.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>
+        <!-- 商品轮播图  -->
+        <su-swiper
+          class="ss-m-b-14 detail-swiper-selector"
+          isPreview
+          :list="state.goodsSwiper"
+          dotStyle="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-18">
+            <view class="price-box ss-flex ss-col-bottom">
+              <view v-if="goodsPrice.price > 0" class="price-text"> ￥{{ goodsPrice.price }} </view>
+              <text v-if="goodsPrice.price > 0 && goodsPrice.score > 0">+</text>
+              <image
+                :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+                class="score-img"
+              ></image>
+              <view class="score-text ss-m-r-16">
+                {{ goodsPrice.score }}
+              </view>
+            </view>
+            <view class="sales-text">
+              {{ formatExchange(state.goodsInfo.sales_show_type, state.goodsInfo.sales) }}
+            </view>
+          </view>
+          <view class="origin-price-text ss-m-b-60" v-if="state.goodsInfo.original_price">
+            原价：￥{{ state.selectedSkuPrice.original_price || state.goodsInfo.original_price }}
+          </view>
+          <view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo.title }}</view>
+          <view class="subtitle-text ss-line-1">{{ state.goodsInfo.subtitle }}</view>
+        </view>
+
+        <!-- 功能卡片 -->
+        <view class="detail-cell-card detail-card ss-flex-col">
+          <detail-cell-sku
+            v-model="state.selectedSkuPrice.goods_sku_text"
+            :skus="state.goodsInfo.skus"
+            @tap="state.showSelectSku = true"
+          />
+          <detail-cell-service v-model="state.goodsInfo.service" />
+          <detail-cell-params v-model="state.goodsInfo.params" />
+        </view>
+        <!-- 规格与数量弹框 -->
+        <s-select-sku
+          :goodsInfo="state.goodsInfo"
+          :show="state.showSelectSku"
+          :isScore="true"
+          @addCart="onAddCart"
+          @buy="onBuy"
+          @change="onSkuChange"
+          @close="state.showSelectSku = false"
+        />
+
+        <!-- 评价 -->
+        <view class="detail-comment-selector">
+          <detail-comment-card :goodsId="state.goodsId" />
+        </view>
+
+        <!-- 详情 -->
+        <view class="detail-content-selector"></view>
+        <detail-content-card :content="state.goodsInfo.content" />
+
+        <!-- 详情tabbar -->
+        <detail-tabbar v-model="state.goodsInfo" :shareIcon="false" :collectIcon="false">
+          <!-- TODO: 缺货中 已售罄 判断 设计-->
+          <view class="buy-box ss-flex ss-col-center ss-p-r-20" v-if="state.goodsInfo.stock > 0">
+            <button class="ss-reset-button buy-btn" @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>
+      </block>
+    </s-layout>
+  </view>
+</template>
+
+<script setup>
+  import { reactive, computed } from 'vue';
+  import { onLoad, onPageScroll } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { isEmpty } from 'lodash';
+  import { formatExchange, formatGoodsSwiper } from '@/sheep/hooks/useGoods';
+  import detailNavbar from './components/detail/detail-navbar.vue';
+  import detailCellSku from './components/detail/detail-cell-sku.vue';
+  import detailCellService from './components/detail/detail-cell-service.vue';
+  import detailCellParams from './components/detail/detail-cell-params.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';
+
+  const headerBg = sheep.$url.css('/static/img/shop/goods/score-bg.png');
+  const seckillBg = sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png');
+  const grouponBg = sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png');
+
+  onPageScroll(() => {});
+
+  const state = reactive({
+    goodsId: 0,
+    skeletonLoading: true,
+    goodsInfo: {},
+    showSelectSku: false,
+    goodsSwiper: [],
+    selectedSkuPrice: {},
+    shareInfo: {},
+    showModel: false,
+    total: 0,
+    couponInfo: [],
+  });
+
+  const goodsPrice = computed(() => {
+    let price, score;
+    if (isEmpty(state.selectedSkuPrice)) {
+      price = state.goodsInfo.price[0];
+      score = state.goodsInfo.score || 0;
+    } else {
+      price = state.selectedSkuPrice.price;
+      score = state.selectedSkuPrice.score || 0;
+    }
+    return { price, score };
+  });
+
+  // 规格变更
+  function onSkuChange(e) {
+    state.selectedSkuPrice = e;
+  }
+  // 格式化价格
+  function formatPrice(e) {
+    if (Number(e[0]) > 0) {
+      return e.length === 1 ? e[0] : e.join('~');
+    } else {
+      return '';
+    }
+  }
+  // 添加购物车
+  function onAddCart(e) {
+    sheep.$store('cart').add(e);
+  }
+  // 立即购买
+  function onBuy(e) {
+    sheep.$router.go('/pages/order/confirm', {
+      data: JSON.stringify({
+        order_type: 'score',
+        goods_list: [
+          {
+            goods_id: e.goods_id,
+            goods_num: e.goods_num,
+            goods_sku_price_id: e.id,
+          },
+        ],
+      }),
+    });
+  }
+
+  onLoad((options) => {
+    // 非法参数
+    if (!options.id) {
+      state.goodsInfo = null;
+      return;
+    }
+    state.goodsId = options.id;
+    // 加载商品信息
+    sheep.$api.app.scoreShop.detail(state.goodsId).then((res) => {
+      state.skeletonLoading = false;
+      if (res.error === 0) {
+        state.goodsInfo = res.data;
+        state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.images);
+      } else {
+        // 未找到商品
+        state.goodsInfo = null;
+      }
+    });
+  });
+</script>
+
+<style lang="scss" scoped>
+  .detail-card {
+    background-color: #ffff;
+    margin: 14rpx 20rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+  }
+
+  // 价格标题卡片
+  .title-card {
+    width: 710rpx;
+    box-sizing: border-box;
+    background-size: 100% 100%;
+    border-radius: 10rpx;
+    background-image: v-bind(headerBg);
+    background-repeat: no-repeat;
+    .price-box {
+      .score-img {
+        width: 36rpx;
+        height: 36rpx;
+        margin: 0 4rpx;
+      }
+      .score-text {
+        font-size: 42rpx;
+        font-weight: 500;
+        color: #ff3000;
+        line-height: 36rpx;
+        font-family: OPPOSANS;
+      }
+      .price-text {
+        font-size: 42rpx;
+        font-weight: 500;
+        color: #ff3000;
+        line-height: 36rpx;
+        font-family: OPPOSANS;
+      }
+    }
+    .origin-price-text {
+      font-size: 26rpx;
+      font-weight: 400;
+      text-decoration: line-through;
+      color: $gray-c;
+      font-family: OPPOSANS;
+    }
+
+    .sales-text {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: $gray-c;
+    }
+
+    .discounts-box {
+      .discounts-tag {
+        padding: 4rpx 10rpx;
+        font-size: 24rpx;
+        font-weight: 500;
+        border-radius: 4rpx;
+        color: var(--ui-BG-Main);
+        // background: rgba(#2aae67, 0.05);
+        background: var(--ui-BG-Main-tag);
+      }
+
+      .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;
+      }
+    }
+
+    .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;
+    }
+  }
+
+  // 购买
+  .buy-box {
+    .buy-btn {
+      width: 630rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: $white;
+    }
+    .disabled-btn {
+      width: 630rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: #999999;
+      color: $white;
+    }
+  }
+
+  //秒杀卡片
+  .seckill-box {
+    background: v-bind(seckillBg) no-repeat;
+    background-size: 100% 100%;
+  }
+
+  .groupon-box {
+    background: v-bind(grouponBg) no-repeat;
+    background-size: 100% 100%;
+  }
+
+  //活动卡片
+  .activity-box {
+    width: 100%;
+    height: 80rpx;
+    box-sizing: border-box;
+    margin-bottom: 10rpx;
+
+    .activity-title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #ffffff;
+      line-height: 42rpx;
+
+      .activity-icon {
+        width: 38rpx;
+        height: 38rpx;
+      }
+    }
+
+    .activity-go {
+      width: 70rpx;
+      height: 32rpx;
+      background: #ffffff;
+      border-radius: 16rpx;
+      font-weight: 500;
+      color: #ff6000;
+      font-size: 24rpx;
+      line-height: normal;
+    }
+  }
+
+  .model-box {
+    height: 60vh;
+    .model-content {
+      height: 56vh;
+    }
+    .title {
+      font-size: 36rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    .subtitle {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+    }
+  }
+</style>
diff --git a/pages/order/pickUpVerify.vue b/pages/order/pickUpVerify.vue
index 1e8bb6e8..4b4db375 100644
--- a/pages/order/pickUpVerify.vue
+++ b/pages/order/pickUpVerify.vue
@@ -19,15 +19,15 @@
       <view class="num">{{ orderInfo.pickUpVerifyCode }}</view>
       <view class="rules">
         <!-- TODO puhui999: 需要后端放回：使用 receiveTime 即可 -->
-<!--        <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">
+            核销时间
+          </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>
@@ -138,7 +138,6 @@
 </script>
 
 <style scoped lang="scss">
-  // TODO puhui999: 样式需要调整有 bug
   .borRadius14 {
     border-radius: 14rpx !important;
   }
diff --git a/sheep/api/promotion/point.js b/sheep/api/promotion/point.js
new file mode 100644
index 00000000..c786fb5f
--- /dev/null
+++ b/sheep/api/promotion/point.js
@@ -0,0 +1,34 @@
+import request from '@/sheep/request';
+
+const PointApi = {
+  // 获得积分商城活动分页
+  getPointActivityPage: (params) => {
+    return request({ url: 'promotion/point-activity/page', method: 'GET', params });
+  },
+
+  // 获得积分商城活动列表，基于活动编号数组
+  getPointActivityListByIds: (ids) => {
+    return request({
+      url: '/promotion/point-activity/list-by-ids',
+      method: 'GET',
+      params: {
+        ids,
+      },
+    });
+  },
+
+  /**
+   * 获得积分商城活动明细
+   * @param {number} id 积分商城活动编号
+   * @return {*}
+   */
+  getPointActivity: (id) => {
+    return request({
+      url: 'promotion/point-activity/get-detail',
+      method: 'GET',
+      params: { id },
+    });
+  },
+};
+
+export default PointApi;
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 5e65b36b..5ce6fa94 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -39,6 +39,8 @@
     <s-groupon-block v-if="type === 'PromotionCombination'" :data="data" :styles="styles" />
     <!-- 营销组件：秒杀 -->
     <s-seckill-block v-if="type === 'PromotionSeckill'" :data="data" :styles="styles" />
+    <!-- 营销组件：积分商城（模式不一样，无法适配） -->
+    <s-point-block v-if="type === 'PromotionPoint'" :data="data" :styles="styles" />
     <!-- 营销组件：小程序直播（暂时没有这个功能） -->
     <s-live-block v-if="type === 'MpLive'" :data="data" :styles="styles" />
     <!-- 营销组件：优惠券 -->
diff --git a/sheep/components/s-goods-item/s-goods-item.vue b/sheep/components/s-goods-item/s-goods-item.vue
index 456bb163..a29bd1a8 100644
--- a/sheep/components/s-goods-item/s-goods-item.vue
+++ b/sheep/components/s-goods-item/s-goods-item.vue
@@ -28,6 +28,14 @@
             >
               ￥{{ fen2yuan(price) }}
             </view>
+            <view v-if="point && Number(price) > 0">+</view>
+            <view class="price-text ss-flex ss-col-center" v-if="point">
+              <image
+                :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+                class="point-img"
+              ></image>
+              <view>{{ point }}</view>
+            </view>
             <view v-if="num" class="total-text ss-flex ss-col-center">x {{ num }}</view>
             <slot name="priceSuffix"></slot>
           </view>
@@ -88,7 +96,7 @@
       type: [String, Number],
       default: 0,
     },
-    score: {
+    point: {
       type: [String, Number],
       default: '',
     },
@@ -113,7 +121,7 @@
 </script>
 
 <style lang="scss" scoped>
-  .score-img {
+  .point-img {
     width: 36rpx;
     height: 36rpx;
     margin: 0 4rpx;
diff --git a/sheep/components/s-point-block/s-point-block.vue b/sheep/components/s-point-block/s-point-block.vue
new file mode 100644
index 00000000..fe22802c
--- /dev/null
+++ b/sheep/components/s-point-block/s-point-block.vue
@@ -0,0 +1,202 @@
+<template>
+  <view>
+    <view
+      v-if="mode === 1 && state.scoreList.length"
+      class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
+    >
+      <view class="goods-list-box">
+        <view
+          class="left-list"
+          :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+          v-for="item in state.leftScoreList"
+          :key="item.id"
+        >
+          <s-point-card
+            class="goods-md-box"
+            size="md"
+            :goodsFields="goodsFields"
+            :data="item"
+            :titleColor="goodsFields.title?.color"
+            :subTitleColor="goodsFields.subtitle.color"
+            :topRadius="data.borderRadiusTop"
+            :bottomRadius="data.borderRadiusBottom"
+            :titleWidth="330 - marginLeft - marginRight"
+            @click="sheep.$router.go('/pages/goods/score', { id: item.id })"
+            @getHeight="mountMasonry($event, 'left')"
+          >
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+                {{ buyNowStyle.mode === 1 ? buyNowStyle.text : '' }}
+              </button>
+            </template>
+          </s-point-card>
+        </view>
+      </view>
+      <view class="goods-list-box">
+        <view
+          class="right-list"
+          :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+          v-for="item in state.rightScoreList"
+          :key="item.id"
+        >
+          <s-score-card
+            class="goods-md-box"
+            size="md"
+            :goodsFields="goodsFields"
+            :data="item"
+            :titleColor="goodsFields.title?.color"
+            :subTitleColor="goodsFields.subtitle.color"
+            :topRadius="data.borderRadiusTop"
+            :bottomRadius="data.borderRadiusBottom"
+            :titleWidth="330 - marginLeft - marginRight"
+            @click="sheep.$router.go('/pages/goods/score', { id: item.id })"
+            @getHeight="mountMasonry($event, 'right')"
+          >
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+                {{ buyNowStyle.mode === 1 ? buyNowStyle.text : '' }}
+              </button>
+            </template>
+          </s-score-card>
+        </view>
+      </view>
+
+      <!-- <view class="goods-hack" v-if="state.scoreList.length % 2 == 1" style="width: 345rpx"></view> -->
+    </view>
+    <view v-if="mode === 2 && state.scoreList.length" class="goods-lg-box">
+      <view
+        class="goods-box"
+        :style="[{ marginBottom: data.space + 'px' }]"
+        v-for="item in state.scoreList"
+        :key="item.id"
+      >
+        <s-score-card
+          class="goods-card"
+          size="lg"
+          :goodsFields="goodsFields"
+          :data="item"
+          :titleColor="goodsFields.title?.color"
+          :subTitleColor="goodsFields.subtitle.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @tap="sheep.$router.go('/pages/goods/score', { id: item.id })"
+        >
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ buyNowStyle.mode === 1 ? buyNowStyle.text : '' }}
+            </button>
+          </template>
+        </s-score-card>
+      </view>
+    </view>
+  </view>
+</template>
+<script setup>
+  import { computed, reactive, onMounted } from 'vue';
+  import sheep from '@/sheep';
+
+  const state = reactive({
+    scoreList: [],
+    leftScoreList: [],
+    rightScoreList: [],
+  });
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    },
+    styles: {
+      type: Object,
+      default() {},
+    },
+  });
+  const { mode, buyNowStyle, goodsFields, goodsIds } = props.data ?? {};
+  const { marginLeft, marginRight } = props.styles ?? {};
+  async function getScoreListByIds(ids) {
+    let { data } = await sheep.$api.app.scoreShop.ids({ ids });
+    return data;
+  }
+
+  onMounted(async () => {
+    state.scoreList = await getScoreListByIds(goodsIds.join(','));
+    if (mode === 1) {
+      mountMasonry();
+    }
+  });
+
+  // 加载瀑布流
+  let count = 0;
+  let leftHeight = 0;
+  let rightHeight = 0;
+
+  function mountMasonry(height = 0, where = 'left') {
+    if (!state.scoreList[count]) return;
+    if (where === 'left') leftHeight += height;
+    if (where === 'right') rightHeight += height;
+    if (leftHeight <= rightHeight) {
+      state.leftScoreList.push(state.scoreList[count]);
+    } else {
+      state.rightScoreList.push(state.scoreList[count]);
+    }
+    count++;
+  }
+  // 购买按钮样式
+  const buyStyle = computed(() => {
+    if (buyNowStyle.mode == 1) {
+      // button
+      return {
+        background: `linear-gradient(to right, ${buyNowStyle.color1}, ${buyNowStyle.color2})`,
+      };
+    }
+
+    if (buyNowStyle.mode == 2) {
+      // image
+      return {
+        width: '54rpx',
+        height: '54rpx',
+        background: `url(${sheep.$url.cdn(buyNowStyle.src)}) no-repeat`,
+        backgroundSize: '100% 100%',
+      };
+    }
+  });
+</script>
+<style lang="scss" scoped>
+  .goods-md-wrap {
+    width: 100%;
+  }
+
+  .goods-list-box {
+    width: 50%;
+    box-sizing: border-box;
+    .left-list {
+      &:nth-last-child(1) {
+        margin-bottom: 0 !important;
+      }
+    }
+  }
+
+  .goods-box {
+    &:nth-last-of-type(1) {
+      margin-bottom: 0 !important;
+    }
+  }
+
+  .goods-md-box,
+  .goods-sl-box,
+  .goods-lg-box {
+    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;
+    }
+  }
+</style>
diff --git a/sheep/components/s-point-card/s-point-card.vue b/sheep/components/s-point-card/s-point-card.vue
new file mode 100644
index 00000000..c7380de5
--- /dev/null
+++ b/sheep/components/s-point-card/s-point-card.vue
@@ -0,0 +1,458 @@
+<template>
+  <view>
+    <!-- md卡片：竖向，一行放两个，图上内容下 -->
+    <view v-if="size === 'md'" class="md-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+      <image
+        class="md-img-box"
+        :src="sheep.$url.cdn(data.image)"
+        mode="widthFix"
+        @load="calculatePanelHeight"
+      ></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"
+      >
+        <view
+          v-if="goodsFields.title?.show"
+          class="md-goods-title ss-line-1"
+          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
+        >
+          {{ data.title }}
+        </view>
+        <view
+          v-if="goodsFields.subtitle?.show"
+          class="md-goods-subtitle ss-m-t-16 ss-line-1"
+          :style="[{ color: subTitleColor }]"
+        >
+          {{ data.subtitle }}
+        </view>
+        <view class="ss-col-bottom">
+          <view
+            v-if="goodsFields.score_price?.show"
+            class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10 ss-flex"
+            :style="[{ color: goodsFields.score_price.color }]"
+          >
+            <view>{{ Number(data.price[0]) > 0 ? '￥' + data.price[0] + '+' : '' }}</view>
+            <image
+              :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+              class="score-img"
+            ></image>
+            {{ data.score }}
+          </view>
+
+          <view
+            v-if="goodsFields.price?.show && data.original_price > 0"
+            class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
+            :style="[{ color: goodsFields.price.color }]"
+          >
+            <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+            <view class="ss-m-l-8">{{ data.original_price }}</view>
+          </view>
+        </view>
+
+        <view class="ss-m-t-16 ss-flex ss-col-center ss-flex-wrap">
+          <view class="sales-text">{{ salesAndStock }}</view>
+        </view>
+      </view>
+
+      <slot name="cart">
+        <view class="cart-box ss-flex ss-col-center ss-row-center">
+          <image class="cart-icon" src="/static/img/shop/tabbar/category2.png" mode=""></image>
+        </view>
+      </slot>
+    </view>
+    <!-- lg卡片：横向型，一行放一个，图片左内容右边  -->
+    <view
+      v-if="size === 'lg'"
+      class="lg-goods-card ss-flex ss-col-stretch"
+      :style="[elStyles]"
+      @tap="onClick"
+    >
+      <image class="lg-img-box" :src="sheep.$url.cdn(data.image)" 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 class="ss-m-r-20">
+          <view
+            v-if="goodsFields.title?.show"
+            class="lg-goods-title ss-line-2"
+            :style="[{ color: titleColor }]"
+          >
+            {{ data.title }}
+          </view>
+          <view
+            v-if="goodsFields.subtitle?.show"
+            class="lg-goods-subtitle ss-m-t-10 ss-line-1"
+            :style="[{ color: subTitleColor }]"
+          >
+            {{ data.subtitle }}
+          </view>
+        </view>
+        <view>
+          <view class="ss-m-t-10">
+            <view
+              v-if="goodsFields.score_price?.show"
+              class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
+              :style="[{ color: goodsFields.score_price.color }]"
+            >
+              <view>{{ Number(data.price[0]) > 0 ? '￥' + data.price[0] + '+' : '' }}</view>
+              <image
+                :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+                class="score-img"
+              ></image>
+              {{ data.score }}
+            </view>
+            <view
+              v-if="goodsFields.price?.show && data.original_price > 0"
+              class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
+              :style="[{ color: goodsFields.price.color }]"
+            >
+              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+              <view class="ss-m-l-8">{{ data.original_price }}</view>
+            </view>
+          </view>
+          <view class="ss-m-t-16 ss-flex ss-col-center ss-flex-wrap">
+            <view class="sales-text">{{ salesAndStock }}</view>
+          </view>
+        </view>
+      </view>
+
+      <slot name="cart"
+      ><view class="buy-box ss-flex ss-col-center ss-row-center">去兑换</view></slot
+      >
+    </view>
+    <!-- sl卡片：竖向型，一行放一个，图片上内容下边 -->
+    <view v-if="size === 'sl'" class="sl-goods-card ss-flex-col" @tap="onClick">
+      <image class="sl-img-box" :src="sheep.$url.cdn(data.image)" mode="aspectFill"></image>
+
+      <view class="sl-goods-content ss-flex-col ss-row-between ss-p-b-20 ss-p-t-20">
+        <view class="ss-m-b-20">
+          <view class="sl-goods-title ss-line-1 ss-p-l-16 ss-p-r-16">
+            {{ data.title }}
+          </view>
+          <view v-if="data.subtitle" class="sl-goods-subtitle ss-p-l-16 ss-p-r-16 ss-m-t-16">
+            {{ data.subtitle }}
+          </view>
+        </view>
+        <view>
+          <slot name="activity">
+            <view
+              v-if="data.promos?.length"
+              class="tag-box ss-flex ss-col-center ss-flex-wrap ss-p-l-16 ss-p-r-16"
+            >
+              <view
+                class="activity-tag ss-m-r-10 ss-m-t-16"
+                v-for="item in data.promos"
+                :key="item.id"
+              >
+                {{ item.title }}
+              </view>
+            </view>
+          </slot>
+          <view class="ss-flex ss-col-bottom ss-p-l-16 ss-p-r-16 font-OPPOSANS">
+            <view class="sl-goods-price ss-m-r-12 ss-flex">
+              <view>{{ Number(data.price[0]) > 0 ? '￥' + data.price[0] + '+' : '' }}</view>
+              <image
+                :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+                class="score-img"
+              ></image>
+              <view>{{ data.score ? data.score : '' }}</view>
+            </view>
+            <view
+              v-if="data.original_price > 0"
+              class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
+            >
+              <text class="price-unit ss-font-20">￥</text>
+              <view class="ss-m-l-8">{{ data.original_price }}</view>
+            </view>
+          </view>
+          <view class="ss-p-l-16 ss-p-r-16 ss-m-t-16 ss-flex ss-flex-wrap">
+            <view class="sales-text">{{ salesAndStock }}</view>
+          </view>
+        </view>
+      </view>
+
+      <slot name="cart"
+      ><view class="buy-box ss-flex ss-col-center ss-row-center">去兑换</view></slot
+      >
+    </view>
+  </view>
+</template>
+<script setup>
+  import { computed, getCurrentInstance } from 'vue';
+  import sheep from '@/sheep';
+  import { formatSales } from '@/sheep/hooks/useGoods';
+  import { formatStock } from '@/sheep/hooks/useGoods';
+  /**
+   * 订单卡片
+   *
+   * @property {String} img 											- 图片
+   * @property {String} title 										- 标题
+   * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
+   * @property {String} skuText 										- 规格
+   * @property {String | Number} score 								- 积分
+   * @property {String | Number} price 								- 价格
+   * @property {String | Number} originalPrice 						- 单购价
+   * @property {String} priceColor 									- 价格颜色
+   * @property {Number | String} num									- 数量
+   *
+   */
+  const props = defineProps({
+    goodsFields: {
+      type: [Array, Object],
+      default() {
+        return {
+          title: { show: true },
+          subtitle: { show: true },
+          price: { show: true },
+          original_price: { show: true },
+          sales: { show: true },
+          stock: { show: true },
+        };
+      },
+    },
+    tagStyle: {
+      type: Object,
+      default: {},
+    },
+    data: {
+      type: Object,
+      default: {},
+    },
+    size: {
+      type: String,
+      default: 'sl',
+    },
+    background: {
+      type: String,
+      default: '',
+    },
+    topRadius: {
+      type: Number,
+      default: 0,
+    },
+    bottomRadius: {
+      type: Number,
+      default: 0,
+    },
+    titleWidth: {
+      type: Number,
+      default: 0,
+    },
+    titleColor: {
+      type: String,
+      default: '#333',
+    },
+    priceUnit: {
+      type: String,
+      default: '￥',
+    },
+    subTitleColor: {
+      type: String,
+      default: '#999999',
+    },
+  });
+  // 组件样式
+  const elStyles = computed(() => {
+    return {
+      background: props.background,
+      'border-top-left-radius': props.topRadius + 'px',
+      'border-top-right-radius': props.topRadius + 'px',
+      'border-bottom-left-radius': props.bottomRadius + 'px',
+      'border-bottom-right-radius': props.bottomRadius + 'px',
+    };
+  });
+  const emits = defineEmits(['click', 'getHeight']);
+  const onClick = () => {
+    emits('click');
+  };
+  // 格式化销量、库存信息
+  const salesAndStock = computed(() => {
+    let text = [];
+    text.push(formatSales(props.data.sales_show_type, props.data.sales));
+    text.push(formatStock(props.data.stock_show_type, props.data.stock));
+    return text.join(' | ');
+  });
+  // 获取实时卡片高度
+  const { proxy } = getCurrentInstance();
+  const elId = `sheep_${Math.ceil(Math.random() * 10e5).toString(36)}`;
+  function calculatePanelHeight(e) {
+    if (props.size === 'md') {
+      const view = uni.createSelectorQuery().in(proxy);
+      view.select(`#${elId}`).fields({ size: true, scrollOffset: true });
+      view.exec((data) => {
+        const goodsPriceCard = data[0];
+        const card = {
+          width: goodsPriceCard.width,
+          height: (goodsPriceCard.width / e.detail.width) * e.detail.height + goodsPriceCard.height,
+        };
+        emits('getHeight', card.height);
+      });
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .price-unit {
+    margin-right: -4px;
+  }
+  .sales-text {
+    display: table;
+    font-size: 24rpx;
+    transform: scale(0.8);
+    margin-left: -16rpx;
+    color: #c4c4c4;
+  }
+
+  // md
+  .md-goods-card {
+    overflow: hidden;
+    width: 100%;
+    position: relative;
+    z-index: 1;
+    background-color: $white;
+    position: relative;
+
+    .md-img-box {
+      width: 100%;
+    }
+
+    .md-goods-title {
+      font-size: 26rpx;
+      color: #333;
+      width: 100%;
+    }
+    .md-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+    }
+
+    .md-goods-price {
+      font-size: 30rpx;
+      color: $red;
+      line-height: 36rpx;
+    }
+
+    .cart-box {
+      width: 54rpx;
+      height: 54rpx;
+      background: linear-gradient(90deg, #fe8900, #ff5e00);
+      border-radius: 50%;
+      position: absolute;
+      bottom: 50rpx;
+      right: 20rpx;
+      z-index: 2;
+
+      .cart-icon {
+        width: 30rpx;
+        height: 30rpx;
+      }
+    }
+  }
+
+  // lg
+  .lg-goods-card {
+    overflow: hidden;
+    position: relative;
+    z-index: 1;
+    background-color: $white;
+    height: 280rpx;
+
+    .lg-img-box {
+      width: 280rpx;
+      height: 280rpx;
+      margin-right: 20rpx;
+    }
+
+    .lg-goods-title {
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #333333;
+      // line-height: 36rpx;
+      // width: 410rpx;
+    }
+    .lg-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+      line-height: 30rpx;
+      // width: 410rpx;
+    }
+
+    .lg-goods-price {
+      font-size: 30rpx;
+      color: $red;
+      line-height: 36rpx;
+    }
+
+    .buy-box {
+      position: absolute;
+      bottom: 20rpx;
+      right: 20rpx;
+      z-index: 2;
+      width: 120rpx;
+      height: 50rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      color: #ffffff;
+    }
+    .tag-box {
+      width: 100%;
+    }
+  }
+  .sl-goods-card {
+    overflow: hidden;
+    position: relative;
+    z-index: 1;
+    width: 100%;
+    background-color: $white;
+
+    .sl-img-box {
+      width: 100%;
+      height: 360rpx;
+    }
+
+    .sl-goods-title {
+      font-size: 26rpx;
+      color: #333;
+      width: 100%;
+      box-sizing: border-box;
+    }
+    .sl-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+      line-height: 30rpx;
+      width: 100%;
+      box-sizing: border-box;
+    }
+
+    .sl-goods-price {
+      font-size: 30rpx;
+      color: $red;
+    }
+
+    .buy-box {
+      position: absolute;
+      bottom: 20rpx;
+      right: 20rpx;
+      z-index: 2;
+      width: 148rpx;
+      height: 50rpx;
+      background: linear-gradient(90deg, #fe8900, #ff5e00);
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      color: #ffffff;
+    }
+  }
+  .goods-origin-price {
+    font-size: 20rpx;
+    color: #c4c4c4;
+    text-decoration: line-through;
+  }
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+</style>

From 5552236952b1b964ea876e3377bd367a137ee271 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 28 Sep 2024 14:43:04 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E:=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B4=BB=E5=8A=A8=E8=A3=85=E4=BF=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-goods-column/s-goods-column.vue         | 125 +++++---
 .../s-point-block/s-point-block.vue           | 300 +++++++++++++-----
 sheep/util/const.js                           | 120 ++++---
 3 files changed, 367 insertions(+), 178 deletions(-)

diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 41ba4425..8163f7a4 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -39,12 +39,18 @@
           class="xs-goods-price font-OPPOSANS"
           :style="[{ color: goodsFields.price.color }]"
         >
-          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
           <!-- 活动价格 -->
-          <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-          <text v-else>
-            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          <text v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
+            {{ data.point }}积分
+            {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${fen2yuan(data.pointPrice)}元` }}
           </text>
+          <template v-else>
+            <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+            <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+            <text v-else>
+              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+            </text>
+          </template>
         </view>
       </view>
     </view>
@@ -87,12 +93,18 @@
           class="sm-goods-price font-OPPOSANS"
           :style="[{ color: goodsFields.price.color }]"
         >
-          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
           <!-- 活动价格 -->
-          <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-          <text v-else>
-            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          <text v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
+            {{ data.point }}积分
+            {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${fen2yuan(data.pointPrice)}元` }}
           </text>
+          <template v-else>
+            <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+            <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+            <text v-else>
+              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+            </text>
+          </template>
         </view>
       </view>
     </view>
@@ -149,12 +161,18 @@
             class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10"
             :style="[{ color: goodsFields.price.color }]"
           >
-            <text class="price-unit ss-font-24">{{ priceUnit }}</text>
             <!-- 活动价格 -->
-            <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-            <text v-else>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+            <text v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
+              {{ data.point }}积分
+              {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${fen2yuan(data.pointPrice)}元` }}
             </text>
+            <template v-else>
+              <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+              <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+              <text v-else>
+                {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              </text>
+            </template>
           </view>
           <view
             v-if="
@@ -253,12 +271,18 @@
               class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
               :style="[{ color: originPriceColor }]"
             >
-              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
               <!-- 活动价格 -->
-              <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-              <text v-else>
-                {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              <text v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
+                {{ data.point }}积分
+                {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${fen2yuan(data.pointPrice)}元` }}
               </text>
+              <template v-else>
+                <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+                <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+                <text v-else>
+                  {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+                </text>
+              </template>
             </view>
           </view>
           <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
@@ -268,7 +292,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>
 
@@ -324,12 +348,18 @@
           </view>
           <view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
             <view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
-              <text class="price-unit ss-font-24">{{ priceUnit }}</text>
               <!-- 活动价格 -->
-              <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-              <text v-else>
-                {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              <text v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
+                {{ data.point }}积分
+                {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${fen2yuan(data.pointPrice)}元` }}
               </text>
+              <template v-else>
+                <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+                <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+                <text v-else>
+                  {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+                </text>
+              </template>
             </view>
             <view
               v-if="
@@ -361,39 +391,41 @@
    * 商品卡片
    *
    * @property {Array} size = [xs | sm | md | lg | sl ] 			 	- 列表数据
-   * @property {String} tag 											- md及以上才有
-   * @property {String} img 											- 图片
-   * @property {String} background 									- 背景色
-   * @property {String} topRadius 									- 上圆角
-   * @property {String} bottomRadius 									- 下圆角
-   * @property {String} title 										- 标题
-   * @property {String} titleColor 									- 标题颜色
+   * @property {String} tag                      - md及以上才有
+   * @property {String} img                      - 图片
+   * @property {String} background                  - 背景色
+   * @property {String} topRadius                  - 上圆角
+   * @property {String} bottomRadius                  - 下圆角
+   * @property {String} title                    - 标题
+   * @property {String} titleColor                  - 标题颜色
    * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
-   * @property {String} subTitle 										- 副标题
-   * @property {String} subTitleColor									- 副标题颜色
-   * @property {String} subTitleBackground 							- 副标题背景
-   * @property {String | Number} price 								- 价格
-   * @property {String} priceColor 									- 价格颜色
-   * @property {String | Number} originPrice 							- 原价/划线价
-   * @property {String} originPriceColor 								- 原价颜色
-   * @property {String | Number} sales 								- 销售数量
-   * @property {String} salesColor									- 销售数量颜色
+   * @property {String} subTitle                    - 副标题
+   * @property {String} subTitleColor                  - 副标题颜色
+   * @property {String} subTitleBackground              - 副标题背景
+   * @property {String | Number} price                - 价格
+   * @property {String} priceColor                  - 价格颜色
+   * @property {String | Number} originPrice              - 原价/划线价
+   * @property {String} originPriceColor                - 原价颜色
+   * @property {String | Number} sales                - 销售数量
+   * @property {String} salesColor                  - 销售数量颜色
    *
    * @slots activity												 	- 活动插槽
    * @slots cart														- 购物车插槽，默认包含文字，背景色，文字颜色 || 图片 || 行为
    *
-   * @event {Function()} click 										- 点击卡片
+   * @event {Function()} click                    - 点击卡片
    *
    */
-  import { computed, getCurrentInstance, onMounted, nextTick } from 'vue';
+  import { computed, getCurrentInstance, nextTick, onMounted } from 'vue';
   import sheep from '@/sheep';
   import {
     fen2yuan,
+    formatExchange,
     formatSales,
+    formatStock,
     getRewardActivityRuleItemDescriptions,
   } from '@/sheep/hooks/useGoods';
-  import { formatStock } from '@/sheep/hooks/useGoods';
   import { isArray } from 'lodash-es';
+  import { PromotionActivityTypeEnum } from '@/sheep/util/const';
 
   // 接收参数
   const props = defineProps({
@@ -520,10 +552,18 @@
   const salesAndStock = computed(() => {
     let text = [];
     if (props.goodsFields.salesCount?.show) {
-      text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
+      if (props.data.activityType && props.data.activityType === PromotionActivityTypeEnum.POINT.type) {
+        text.push(formatExchange(props.data.sales_show_type, (props.data.pointTotalStock || 0) - (props.data.pointStock || 0)));
+      }else {
+        text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
+      }
     }
     if (props.goodsFields.stock?.show) {
-      text.push(formatStock(props.data.stock_show_type, props.data.stock));
+      if (props.data.activityType && props.data.activityType === PromotionActivityTypeEnum.POINT.type) {
+        text.push(formatStock(props.data.stock_show_type, props.data.pointTotalStock));
+      }else {
+        text.push(formatStock(props.data.stock_show_type, props.data.stock));
+      }
     }
     return text.join(' | ');
   });
@@ -560,6 +600,7 @@
       });
     }
   }
+
   onMounted(() => {
     nextTick(() => {
       getGoodsPriceCardWH();
diff --git a/sheep/components/s-point-block/s-point-block.vue b/sheep/components/s-point-block/s-point-block.vue
index fe22802c..dd1ab3b9 100644
--- a/sheep/components/s-point-block/s-point-block.vue
+++ b/sheep/components/s-point-block/s-point-block.vue
@@ -1,104 +1,166 @@
+<!-- 装修商品组件：【积分商城】商品卡片 -->
 <template>
+  <!-- 商品卡片 -->
   <view>
+    <!-- 布局1. 单列大图（上图，下内容）-->
     <view
-      v-if="mode === 1 && state.scoreList.length"
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.spuList.length"
+      class="goods-sl-box"
+    >
+      <view
+        class="goods-box"
+        v-for="item in state.spuList"
+        :key="item.id"
+        :style="[{ marginBottom: data.space * 2 + 'rpx' }]"
+      >
+        <s-goods-column
+          class=""
+          size="sl"
+          :goodsFields="data.fields"
+          :tagStyle="data.badge"
+          :data="item"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @click="sheep.$router.go('/pages/goods/point', { id: item.activityId })"
+        >
+          <!-- 购买按钮 -->
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+            </button>
+          </template>
+        </s-goods-column>
+      </view>
+    </view>
+
+    <!-- 布局2. 单列小图（左图，右内容） -->
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length"
+      class="goods-lg-box"
+    >
+      <view
+        class="goods-box"
+        :style="[{ marginBottom: data.space + 'px' }]"
+        v-for="item in state.spuList"
+        :key="item.id"
+      >
+        <s-goods-column
+          class="goods-card"
+          size="lg"
+          :goodsFields="data.fields"
+          :data="item"
+          :tagStyle="data.badge"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @tap="sheep.$router.go('/pages/goods/point', { id: item.activityId })"
+        >
+          <!-- 购买按钮 -->
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+            </button>
+          </template>
+        </s-goods-column>
+      </view>
+    </view>
+
+    <!-- 布局3. 双列（每一列：上图，下内容）-->
+    <view
+      v-if="layoutType === LayoutTypeEnum.TWO_COL && state.spuList.length"
       class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
     >
       <view class="goods-list-box">
         <view
           class="left-list"
           :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
-          v-for="item in state.leftScoreList"
+          v-for="item in state.leftSpuList"
           :key="item.id"
         >
-          <s-point-card
+          <s-goods-column
             class="goods-md-box"
             size="md"
-            :goodsFields="goodsFields"
+            :goodsFields="data.fields"
+            :tagStyle="data.badge"
             :data="item"
-            :titleColor="goodsFields.title?.color"
-            :subTitleColor="goodsFields.subtitle.color"
+            :titleColor="data.fields.name?.color"
+            :subTitleColor="data.fields.introduction.color"
             :topRadius="data.borderRadiusTop"
             :bottomRadius="data.borderRadiusBottom"
             :titleWidth="330 - marginLeft - marginRight"
-            @click="sheep.$router.go('/pages/goods/score', { id: item.id })"
-            @getHeight="mountMasonry($event, 'left')"
+            @click="sheep.$router.go('/pages/goods/seckill', { id: item.activityId })"
+            @getHeight="calculateGoodsColumn($event, 'left')"
           >
+            <!-- 购买按钮 -->
             <template v-slot:cart>
               <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-                {{ buyNowStyle.mode === 1 ? buyNowStyle.text : '' }}
+                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
               </button>
             </template>
-          </s-point-card>
+          </s-goods-column>
         </view>
       </view>
       <view class="goods-list-box">
         <view
           class="right-list"
           :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
-          v-for="item in state.rightScoreList"
+          v-for="item in state.rightSpuList"
           :key="item.id"
         >
-          <s-score-card
+          <s-goods-column
             class="goods-md-box"
             size="md"
-            :goodsFields="goodsFields"
+            :goodsFields="data.fields"
+            :tagStyle="data.badge"
             :data="item"
-            :titleColor="goodsFields.title?.color"
-            :subTitleColor="goodsFields.subtitle.color"
+            :titleColor="data.fields.name?.color"
+            :subTitleColor="data.fields.introduction.color"
             :topRadius="data.borderRadiusTop"
             :bottomRadius="data.borderRadiusBottom"
             :titleWidth="330 - marginLeft - marginRight"
-            @click="sheep.$router.go('/pages/goods/score', { id: item.id })"
-            @getHeight="mountMasonry($event, 'right')"
+            @click="sheep.$router.go('/pages/goods/seckill', { id: item.activityId })"
+            @getHeight="calculateGoodsColumn($event, 'right')"
           >
+            <!-- 购买按钮 -->
             <template v-slot:cart>
               <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-                {{ buyNowStyle.mode === 1 ? buyNowStyle.text : '' }}
+                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
               </button>
             </template>
-          </s-score-card>
+          </s-goods-column>
         </view>
       </view>
-
-      <!-- <view class="goods-hack" v-if="state.scoreList.length % 2 == 1" style="width: 345rpx"></view> -->
-    </view>
-    <view v-if="mode === 2 && state.scoreList.length" class="goods-lg-box">
-      <view
-        class="goods-box"
-        :style="[{ marginBottom: data.space + 'px' }]"
-        v-for="item in state.scoreList"
-        :key="item.id"
-      >
-        <s-score-card
-          class="goods-card"
-          size="lg"
-          :goodsFields="goodsFields"
-          :data="item"
-          :titleColor="goodsFields.title?.color"
-          :subTitleColor="goodsFields.subtitle.color"
-          :topRadius="data.borderRadiusTop"
-          :bottomRadius="data.borderRadiusBottom"
-          @tap="sheep.$router.go('/pages/goods/score', { id: item.id })"
-        >
-          <template v-slot:cart>
-            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-              {{ buyNowStyle.mode === 1 ? buyNowStyle.text : '' }}
-            </button>
-          </template>
-        </s-score-card>
-      </view>
     </view>
   </view>
 </template>
+
 <script setup>
-  import { computed, reactive, onMounted } from 'vue';
+  /**
+   * 商品卡片
+   */
+  import { computed, onMounted, reactive, ref } from 'vue';
   import sheep from '@/sheep';
+  import SpuApi from '@/sheep/api/product/spu';
+  import PointApi from '@/sheep/api/promotion/point';
+  import { PromotionActivityTypeEnum } from '@/sheep/util/const';
+
+  // 布局类型
+  const LayoutTypeEnum = {
+    // 单列大图
+    ONE_COL_BIG_IMG: 'oneColBigImg',
+    // 双列
+    TWO_COL: 'twoCol',
+    // 单列小图
+    ONE_COL_SMALL_IMG: 'oneColSmallImg',
+  };
 
   const state = reactive({
-    scoreList: [],
-    leftScoreList: [],
-    rightScoreList: [],
+    spuList: [],
+    leftSpuList: [],
+    rightSpuList: [],
   });
   const props = defineProps({
     data: {
@@ -110,56 +172,113 @@
       default() {},
     },
   });
-  const { mode, buyNowStyle, goodsFields, goodsIds } = props.data ?? {};
-  const { marginLeft, marginRight } = props.styles ?? {};
-  async function getScoreListByIds(ids) {
-    let { data } = await sheep.$api.app.scoreShop.ids({ ids });
-    return data;
-  }
 
-  onMounted(async () => {
-    state.scoreList = await getScoreListByIds(goodsIds.join(','));
-    if (mode === 1) {
-      mountMasonry();
-    }
-  });
+  const { layoutType, btnBuy, activityIds } = props.data || {};
+  const { marginLeft, marginRight } = props.styles || {};
 
-  // 加载瀑布流
-  let count = 0;
-  let leftHeight = 0;
-  let rightHeight = 0;
-
-  function mountMasonry(height = 0, where = 'left') {
-    if (!state.scoreList[count]) return;
-    if (where === 'left') leftHeight += height;
-    if (where === 'right') rightHeight += height;
-    if (leftHeight <= rightHeight) {
-      state.leftScoreList.push(state.scoreList[count]);
-    } else {
-      state.rightScoreList.push(state.scoreList[count]);
-    }
-    count++;
-  }
   // 购买按钮样式
   const buyStyle = computed(() => {
-    if (buyNowStyle.mode == 1) {
-      // button
+    if (btnBuy.type === 'text') {
+      // 文字按钮：线性渐变背景颜色
       return {
-        background: `linear-gradient(to right, ${buyNowStyle.color1}, ${buyNowStyle.color2})`,
+        background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
       };
     }
-
-    if (buyNowStyle.mode == 2) {
-      // image
+    if (btnBuy.type === 'img') {
+      // 图片按钮
       return {
         width: '54rpx',
         height: '54rpx',
-        background: `url(${sheep.$url.cdn(buyNowStyle.src)}) no-repeat`,
+        background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
         backgroundSize: '100% 100%',
       };
     }
   });
+
+  //region 商品瀑布流布局
+  // 下一个要处理的商品索引
+  let count = 0;
+  // 左列的高度
+  let leftHeight = 0;
+  // 右列的高度
+  let rightHeight = 0;
+
+  /**
+   * 计算商品在左列还是右列
+   * @param height 商品的高度
+   * @param where 添加到哪一列
+   */
+  function calculateGoodsColumn(height = 0, where = 'left') {
+    // 处理完
+    if (!state.spuList[count]) return;
+    // 增加列的高度
+    if (where === 'left') leftHeight += height;
+    if (where === 'right') rightHeight += height;
+    // 添加到矮的一列
+    if (leftHeight <= rightHeight) {
+      state.leftSpuList.push(state.spuList[count]);
+    } else {
+      state.rightSpuList.push(state.spuList[count]);
+    }
+    // 计数
+    count++;
+  }
+
+  //endregion
+
+  /**
+   * 根据商品编号列表，获取商品列表
+   * @param ids 商品编号列表
+   * @return {Promise<undefined>} 商品列表
+   */
+  async function getPointActivityDetailList(ids) {
+    const { data } = await PointApi.getPointActivityListByIds(ids);
+    return data;
+  }
+
+  /**
+   * 根据商品编号，获取商品详情
+   * @param ids 商品编号列表
+   * @return {Promise<undefined>} 商品列表
+   */
+  async function getSpuDetail(ids) {
+    const { data: spu } = await SpuApi.getSpuDetail(ids);
+    return spu;
+  }
+
+  // 初始化
+  onMounted(async () => {
+    // 加载活动列表
+    const activityList = await getPointActivityDetailList(activityIds.join(','));
+    // 循环获取活动商品SPU详情并添加到spuList
+    for (const activity of activityList) {
+      state.spuList.push(await getSpuDetail(activity.spuId));
+    }
+
+    // 循环活动列表
+    activityList.forEach((activity) => {
+      // 查找对应的 spu 并更新价格
+      const spu = state.spuList.find((spu) => activity.spuId === spu.id);
+      if (spu) {
+        spu.pointStock = activity.stock
+        spu.pointTotalStock = activity.totalStock
+        spu.point = activity.point
+        spu.pointPrice = activity.price
+        // 赋值活动ID，为了点击跳转详情页
+        spu.activityId = activity.id;
+        // 赋值活动类型
+        spu.activityType = PromotionActivityTypeEnum.POINT.type;
+      }
+    });
+
+    // 只有双列布局时需要
+    if (layoutType === LayoutTypeEnum.TWO_COL) {
+      // 分列
+      calculateGoodsColumn();
+    }
+  });
 </script>
+
 <style lang="scss" scoped>
   .goods-md-wrap {
     width: 100%;
@@ -168,11 +287,18 @@
   .goods-list-box {
     width: 50%;
     box-sizing: border-box;
+
     .left-list {
       &:nth-last-child(1) {
         margin-bottom: 0 !important;
       }
     }
+
+    .right-list {
+      &:nth-last-child(1) {
+        margin-bottom: 0 !important;
+      }
+    }
   }
 
   .goods-box {
@@ -188,7 +314,7 @@
 
     .cart-btn {
       position: absolute;
-      bottom: 10rpx;
+      bottom: 18rpx;
       right: 20rpx;
       z-index: 11;
       height: 50rpx;
diff --git a/sheep/util/const.js b/sheep/util/const.js
index 9cf98bf3..9c22807f 100644
--- a/sheep/util/const.js
+++ b/sheep/util/const.js
@@ -33,78 +33,100 @@ export const getTerminal = () => {
 
 // ========== MALL - 营销模块 ==========
 
-import dayjs from "dayjs";
+import dayjs from 'dayjs';
 
 /**
  * 优惠类型枚举
  */
 export const PromotionDiscountTypeEnum = {
-    PRICE: {
-        type: 1,
-        name: '满减'
-    },
-    PERCENT: {
-        type: 2,
-        name: '折扣'
-    }
-}
+  PRICE: {
+    type: 1,
+    name: '满减',
+  },
+  PERCENT: {
+    type: 2,
+    name: '折扣',
+  },
+};
 
 /**
  * 优惠劵模板的有限期类型的枚举
  */
 export const CouponTemplateValidityTypeEnum = {
-    DATE: {
-        type: 1,
-        name: '固定日期可用'
-    },
-    TERM: {
-        type: 2,
-        name: '领取之后可用'
-    }
-}
+  DATE: {
+    type: 1,
+    name: '固定日期可用',
+  },
+  TERM: {
+    type: 2,
+    name: '领取之后可用',
+  },
+};
 
 /**
  * 营销的商品范围枚举
  */
 export const PromotionProductScopeEnum = {
-    ALL: {
-        scope: 1,
-        name: '通用劵'
-    },
-    SPU: {
-        scope: 2,
-        name: '商品劵'
-    },
-    CATEGORY: {
-        scope: 3,
-        name: '品类劵'
-    }
-}
+  ALL: {
+    scope: 1,
+    name: '通用劵',
+  },
+  SPU: {
+    scope: 2,
+    name: '商品劵',
+  },
+  CATEGORY: {
+    scope: 3,
+    name: '品类劵',
+  },
+};
 
 
 // 时间段的状态枚举
 export const TimeStatusEnum = {
-    WAIT_START: '即将开始',
-    STARTED: '进行中',
-    END: '已结束',
-}
+  WAIT_START: '即将开始',
+  STARTED: '进行中',
+  END: '已结束',
+};
 
 /**
  * 微信小程序的订阅模版
  */
 export const WxaSubscribeTemplate = {
-  TRADE_ORDER_DELIVERY: "订单发货通知",
-  PROMOTION_COMBINATION_SUCCESS: "拼团结果通知",
-  PAY_WALLET_RECHARGER_SUCCESS: "充值成功通知",
-}
+  TRADE_ORDER_DELIVERY: '订单发货通知',
+  PROMOTION_COMBINATION_SUCCESS: '拼团结果通知',
+  PAY_WALLET_RECHARGER_SUCCESS: '充值成功通知',
+};
+export const PromotionActivityTypeEnum = {
+  NORMAL: {
+    type: 0,
+    name: '普通',
+  },
+  SECKILL: {
+    type: 1,
+    name: '秒杀',
+  },
+  BARGAIN: {
+    type: 2,
+    name: '砍价',
+  },
+  COMBINATION: {
+    type: 3,
+    name: '拼团',
+  },
+  POINT: {
+    type: 4,
+    name: '',
+  },
+};
 
 export const getTimeStatusEnum = (startTime, endTime) => {
-    const now = dayjs();
-    if (now.isBefore(startTime)) {
-        return TimeStatusEnum.WAIT_START;
-    } else if (now.isAfter(endTime)) {
-        return TimeStatusEnum.END;
-    } else {
-        return TimeStatusEnum.STARTED;
-    }
-}
+  const now = dayjs();
+  if (now.isBefore(startTime)) {
+    return TimeStatusEnum.WAIT_START;
+  } else if (now.isAfter(endTime)) {
+    return TimeStatusEnum.END;
+  } else {
+    return TimeStatusEnum.STARTED;
+  }
+};

From 4cdb595a2a0cfd65c5eb37b3a2246519836df171 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 28 Sep 2024 15:39:03 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=83=E5=B1=80=E4=B8=BA=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E5=B0=8F=E5=9B=BE=E6=97=B6=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-block-item/s-block-item.vue  |  2 +-
 .../s-goods-column/s-goods-column.vue         | 32 ++++++++-----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 5ce6fa94..5272dcdb 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -39,7 +39,7 @@
     <s-groupon-block v-if="type === 'PromotionCombination'" :data="data" :styles="styles" />
     <!-- 营销组件：秒杀 -->
     <s-seckill-block v-if="type === 'PromotionSeckill'" :data="data" :styles="styles" />
-    <!-- 营销组件：积分商城（模式不一样，无法适配） -->
+    <!-- 营销组件：积分商城 -->
     <s-point-block v-if="type === 'PromotionPoint'" :data="data" :styles="styles" />
     <!-- 营销组件：小程序直播（暂时没有这个功能） -->
     <s-live-block v-if="type === 'MpLive'" :data="data" :styles="styles" />
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 8163f7a4..b27cfda4 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -254,36 +254,32 @@
               {{ item }}
             </view>
           </view>
-          <view class="ss-flex ss-col-bottom ss-m-t-10">
-            <view
-              v-if="goodsFields.price?.show"
-              class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
-              :style="[{ color: goodsFields.price.color }]"
-            >
-              <text class="ss-font-24">{{ priceUnit }}</text>
-              {{ 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)
-              "
-              class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
-              :style="[{ color: originPriceColor }]"
-            >
+          <view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
+            <view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
               <!-- 活动价格 -->
               <text v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
                 {{ data.point }}积分
                 {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${fen2yuan(data.pointPrice)}元` }}
               </text>
               <template v-else>
-                <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+                <text class="price-unit ss-font-24">{{ priceUnit }}</text>
                 <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
                 <text v-else>
                   {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
                 </text>
               </template>
             </view>
+            <view
+              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 }]"
+            >
+              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+            </view>
           </view>
           <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
             <view class="sales-text">{{ salesAndStock }}</view>

From 2349faa1bc4b18ddac11503db97d1529888ed456 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 28 Sep 2024 16:24:57 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=EF=BC=9A?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/point.vue   | 493 ++++++++++++++++++++++++++--------------
 pages/order/confirm.vue |   2 +
 sheep/util/const.js     |   2 +-
 3 files changed, 330 insertions(+), 167 deletions(-)

diff --git a/pages/goods/point.vue b/pages/goods/point.vue
index ee3707c0..0360766d 100644
--- a/pages/goods/point.vue
+++ b/pages/goods/point.vue
@@ -1,23 +1,24 @@
+<!-- 秒杀商品详情 -->
 <template>
-  <view>
-    <s-layout :onShareAppMessage="state.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>
-        <!-- 商品轮播图  -->
+  <s-layout :onShareAppMessage="shareInfo" navbar="goods">
+    <!-- 标题栏 -->
+    <detailNavbar />
+    <!-- 骨架屏 -->
+    <detailSkeleton v-if="state.skeletonLoading" />
+    <!-- 下架/售罄提醒 -->
+    <s-empty
+      v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== PromotionActivityTypeEnum.POINT.type"
+      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 detail-swiper-selector"
+          class="ss-m-b-14"
           isPreview
           :list="state.goodsSwiper"
           dotStyle="tag"
@@ -27,179 +28,233 @@
         />
 
         <!-- 价格+标题 -->
-        <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-18">
-            <view class="price-box ss-flex ss-col-bottom">
-              <view v-if="goodsPrice.price > 0" class="price-text"> ￥{{ goodsPrice.price }} </view>
-              <text v-if="goodsPrice.price > 0 && goodsPrice.score > 0">+</text>
-              <image
-                :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
-                class="score-img"
-              ></image>
-              <view class="score-text ss-m-r-16">
-                {{ goodsPrice.score }}
+        <view class="title-card ss-m-y-14 ss-m-x-20 ss-p-x-20 ss-p-y-34">
+          <view class="price-box ss-flex ss-row-between ss-m-b-18">
+            <view class="ss-flex">
+              <view class="price-text ss-m-r-16">
+                {{ getShowPriceText }}
+              </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>
             </view>
-            <view class="sales-text">
-              {{ formatExchange(state.goodsInfo.sales_show_type, state.goodsInfo.sales) }}
+          </view>
+          <view class="ss-flex ss-row-between ss-m-b-60">
+            <view class="origin-price ss-flex ss-col-center" v-if="state.goodsInfo.marketPrice">
+              原价
+              <view class="origin-price-text">
+                {{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
+              </view>
             </view>
           </view>
-          <view class="origin-price-text ss-m-b-60" v-if="state.goodsInfo.original_price">
-            原价：￥{{ state.selectedSkuPrice.original_price || state.goodsInfo.original_price }}
-          </view>
-          <view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo.title }}</view>
-          <view class="subtitle-text ss-line-1">{{ state.goodsInfo.subtitle }}</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.selectedSkuPrice.goods_sku_text"
-            :skus="state.goodsInfo.skus"
-            @tap="state.showSelectSku = true"
-          />
-          <detail-cell-service v-model="state.goodsInfo.service" />
-          <detail-cell-params v-model="state.goodsInfo.params" />
+          <detail-cell-sku :sku="state.selectedSku" @tap="state.showSelectSku = true" />
         </view>
         <!-- 规格与数量弹框 -->
-        <s-select-sku
-          :goodsInfo="state.goodsInfo"
+        <s-select-seckill-sku
+          v-model="state.goodsInfo"
           :show="state.showSelectSku"
-          :isScore="true"
-          @addCart="onAddCart"
+          :single-limit-count="activity.singleLimitCount"
           @buy="onBuy"
           @change="onSkuChange"
           @close="state.showSelectSku = false"
         />
+      </view>
 
-        <!-- 评价 -->
-        <view class="detail-comment-selector">
-          <detail-comment-card :goodsId="state.goodsId" />
+      <!-- 评价 -->
+      <detail-comment-card class="detail-comment-selector" :goodsId="state.goodsInfo.id" />
+      <!-- 详情 -->
+      <detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
+
+      <!-- 详情tabbar -->
+      <detail-tabbar v-model="state.goodsInfo">
+        <view class="buy-box ss-flex ss-col-center ss-p-r-20">
+          <button
+            class="ss-reset-button origin-price-btn ss-flex-col"
+            v-if="state.goodsInfo.marketPrice"
+            @tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })"
+          >
+            <view>
+              <view class="btn-price">{{ fen2yuan(state.goodsInfo.marketPrice) }}</view>
+              <view>原价购买</view>
+            </view>
+          </button>
+          <button
+            class="ss-reset-button btn-box ss-flex-col"
+            @tap="state.showSelectSku = true"
+            :class="
+             state.goodsInfo.stock != 0
+                ? 'check-btn-box'
+                : 'disabled-btn-box'
+            "
+            :disabled="state.goodsInfo.stock === 0"
+          >
+            <view class="price-text">
+              {{getShowPriceText}}
+            </view>
+            <view v-if="state.goodsInfo.stock === 0">已售罄</view>
+            <view v-else>立即兑换</view>
+          </button>
         </view>
-
-        <!-- 详情 -->
-        <view class="detail-content-selector"></view>
-        <detail-content-card :content="state.goodsInfo.content" />
-
-        <!-- 详情tabbar -->
-        <detail-tabbar v-model="state.goodsInfo" :shareIcon="false" :collectIcon="false">
-          <!-- TODO: 缺货中 已售罄 判断 设计-->
-          <view class="buy-box ss-flex ss-col-center ss-p-r-20" v-if="state.goodsInfo.stock > 0">
-            <button class="ss-reset-button buy-btn" @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>
-      </block>
-    </s-layout>
-  </view>
+      </detail-tabbar>
+    </block>
+  </s-layout>
 </template>
 
 <script setup>
-  import { reactive, computed } from 'vue';
+  import { computed, reactive, ref, unref } from 'vue';
   import { onLoad, onPageScroll } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
-  import { formatExchange, formatGoodsSwiper } from '@/sheep/hooks/useGoods';
+  import { isEmpty } from 'lodash-es';
+  import { fen2yuan, formatGoodsSwiper } from '@/sheep/hooks/useGoods';
   import detailNavbar from './components/detail/detail-navbar.vue';
   import detailCellSku from './components/detail/detail-cell-sku.vue';
-  import detailCellService from './components/detail/detail-cell-service.vue';
-  import detailCellParams from './components/detail/detail-cell-params.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 SpuApi from '@/sheep/api/product/spu';
+  import { PromotionActivityTypeEnum } from '@/sheep/util/const';
+  import PointApi from '@/sheep/api/promotion/point';
 
-  const headerBg = sheep.$url.css('/static/img/shop/goods/score-bg.png');
+  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 seckillBg = sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png');
-  const grouponBg = sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png');
-
-  onPageScroll(() => {});
+  const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
 
+  onPageScroll(() => {
+  });
   const state = reactive({
-    goodsId: 0,
     skeletonLoading: true,
     goodsInfo: {},
     showSelectSku: false,
     goodsSwiper: [],
-    selectedSkuPrice: {},
-    shareInfo: {},
+    selectedSku: {},
     showModel: false,
     total: 0,
-    couponInfo: [],
-  });
-
-  const goodsPrice = computed(() => {
-    let price, score;
-    if (isEmpty(state.selectedSkuPrice)) {
-      price = state.goodsInfo.price[0];
-      score = state.goodsInfo.score || 0;
-    } else {
-      price = state.selectedSkuPrice.price;
-      score = state.selectedSkuPrice.score || 0;
-    }
-    return { price, score };
+    price: '',
   });
 
   // 规格变更
   function onSkuChange(e) {
-    state.selectedSkuPrice = e;
-  }
-  // 格式化价格
-  function formatPrice(e) {
-    if (Number(e[0]) > 0) {
-      return e.length === 1 ? e[0] : e.join('~');
-    } else {
-      return '';
-    }
-  }
-  // 添加购物车
-  function onAddCart(e) {
-    sheep.$store('cart').add(e);
+    state.selectedSku = e;
   }
+
   // 立即购买
-  function onBuy(e) {
+  function onBuy(sku) {
     sheep.$router.go('/pages/order/confirm', {
       data: JSON.stringify({
-        order_type: 'score',
-        goods_list: [
+        order_type: 'goods',
+        buy_type: 'point',
+        pointActivityId: activity.value.id,
+        items: [
           {
-            goods_id: e.goods_id,
-            goods_num: e.goods_num,
-            goods_sku_price_id: e.id,
+            skuId: sku.id,
+            count: sku.count,
           },
         ],
       }),
     });
   }
 
+  // 分享信息
+  // TODO puhui999: 下次 fix
+  const shareInfo = computed(() => {
+    if (isEmpty(unref(activity))) return {};
+    return sheep.$platform.share.getShareInfo(
+      {
+        title: activity.value.name,
+        image: sheep.$url.cdn(state.goodsInfo.picUrl),
+        params: {
+          page: '4',
+          query: activity.value.id,
+        },
+      },
+      {
+        type: 'goods', // 商品海报
+        title: activity.value.name, // 商品标题
+        image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
+        price: state.goodsInfo.price, // 商品价格
+        marketPrice: state.goodsInfo.marketPrice, // 商品原价
+      },
+    );
+  });
+
+  const activity = ref();
+
+  const getShowPriceText = computed(() => {
+    let priceText = `${activity.value.point}积分${!activity.value.price ? '' : `+￥${fen2yuan(activity.value.price)}`}`;
+    if (!isEmpty(state.selectedSku)) {
+      const sku = state.selectedSku;
+      priceText = `${sku.point}积分${!sku.pointPrice ? '' : `+￥${fen2yuan(sku.pointPrice)}`}`;
+    }
+    return priceText;
+  });
+
+  // 查询活动
+  const getActivity = async (id) => {
+    const { data } = await PointApi.getPointActivity(id);
+    activity.value = data;
+    // 查询商品
+    await getSpu(data.spuId);
+  };
+
+  // 查询商品
+  const getSpu = async (id) => {
+    const { data } = await SpuApi.getSpuDetail(id);
+    data.activity_type = PromotionActivityTypeEnum.POINT.type;
+    state.goodsInfo = data;
+    state.goodsInfo.stock = Math.min(data.stock, activity.value.stock);
+    // 处理轮播图
+    state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.sliderPicUrls);
+
+    // 价格、库存使用活动的
+    data.skus.forEach((sku) => {
+      const product = activity.value.products.find((product) => product.skuId === sku.id);
+      if (product) {
+        sku.point = product.point;
+        sku.pointPrice = product.price;
+        sku.stock = Math.min(sku.stock, product.stock);
+        // 设置限购数量
+        sku.limitCount = product.count;
+      } else {
+        // 找不到可能是没配置
+        sku.stock = 0;
+      }
+    });
+
+    state.skeletonLoading = false;
+  };
+
   onLoad((options) => {
     // 非法参数
     if (!options.id) {
       state.goodsInfo = null;
       return;
     }
-    state.goodsId = options.id;
-    // 加载商品信息
-    sheep.$api.app.scoreShop.detail(state.goodsId).then((res) => {
-      state.skeletonLoading = false;
-      if (res.error === 0) {
-        state.goodsInfo = res.data;
-        state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.images);
-      } else {
-        // 未找到商品
-        state.goodsInfo = null;
-      }
-    });
+
+    // 查询活动
+    getActivity(options.id);
   });
 </script>
 
 <style lang="scss" scoped>
+  .disabled-btn-box[disabled] {
+    background-color: transparent;
+  }
+
   .detail-card {
-    background-color: #ffff;
+    background-color: $white;
     margin: 14rpx 20rpx;
     border-radius: 10rpx;
     overflow: hidden;
@@ -209,43 +264,106 @@
   .title-card {
     width: 710rpx;
     box-sizing: border-box;
+    // height: 320rpx;
     background-size: 100% 100%;
     border-radius: 10rpx;
     background-image: v-bind(headerBg);
     background-repeat: no-repeat;
+
     .price-box {
-      .score-img {
-        width: 36rpx;
-        height: 36rpx;
-        margin: 0 4rpx;
-      }
-      .score-text {
-        font-size: 42rpx;
-        font-weight: 500;
-        color: #ff3000;
-        line-height: 36rpx;
-        font-family: OPPOSANS;
-      }
       .price-text {
-        font-size: 42rpx;
+        font-size: 30rpx;
         font-weight: 500;
-        color: #ff3000;
-        line-height: 36rpx;
+        color: #fff;
+        line-height: normal;
         font-family: OPPOSANS;
+
+        &::before {
+          font-size: 30rpx;
+        }
       }
     }
-    .origin-price-text {
-      font-size: 26rpx;
-      font-weight: 400;
-      text-decoration: line-through;
-      color: $gray-c;
-      font-family: OPPOSANS;
-    }
 
-    .sales-text {
+    .origin-price {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #fff;
+      opacity: 0.7;
+
+      .origin-price-text {
+        text-decoration: line-through;
+
+        font-family: OPPOSANS;
+
+        &::before {
+          content: '￥';
+        }
+      }
+    }
+
+    .tig {
+      border: 2rpx solid #ffffff;
+      border-radius: 4rpx;
+      width: 126rpx;
+      height: 38rpx;
+
+      .tig-icon {
+        width: 40rpx;
+        height: 40rpx;
+        margin-left: -2rpx;
+        background: #ffffff;
+        border-radius: 4rpx 0 0 4rpx;
+
+        .cicon-alarm {
+          font-size: 32rpx;
+          color: #fc6e6f;
+        }
+      }
+
+      .tig-title {
+        width: 86rpx;
+        font-size: 24rpx;
+        font-weight: 500;
+        line-height: normal;
+        color: #ffffff;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+
+    .countdown-title {
       font-size: 26rpx;
       font-weight: 500;
-      color: $gray-c;
+      color: #ffffff;
+    }
+
+    .countdown-time {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #ffffff;
+
+      .countdown-h {
+        font-size: 24rpx;
+        font-family: OPPOSANS;
+        font-weight: 500;
+        color: #ffffff;
+        padding: 0 4rpx;
+        height: 40rpx;
+        background: rgba(#000000, 0.1);
+        border-radius: 6rpx;
+      }
+
+      .countdown-num {
+        font-size: 24rpx;
+        font-family: OPPOSANS;
+        font-weight: 500;
+        color: #ffffff;
+        width: 40rpx;
+        height: 40rpx;
+        background: rgba(#000000, 0.1);
+        border-radius: 6rpx;
+      }
     }
 
     .discounts-box {
@@ -278,31 +396,73 @@
       font-size: 30rpx;
       font-weight: bold;
       line-height: 42rpx;
+      color: #fff;
     }
 
     .subtitle-text {
       font-size: 26rpx;
       font-weight: 400;
-      color: $dark-9;
+      color: #ffffff;
       line-height: 42rpx;
+      opacity: 0.9;
     }
   }
 
   // 购买
   .buy-box {
-    .buy-btn {
-      width: 630rpx;
+    .check-btn-box {
+      width: 248rpx;
       height: 80rpx;
-      border-radius: 40rpx;
-      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-      color: $white;
+      font-size: 24rpx;
+      font-weight: 600;
+      margin-left: -36rpx;
+      background-image: v-bind(btnBg);
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      color: #ffffff;
+      line-height: normal;
+      border-radius: 0px 40rpx 40rpx 0px;
     }
-    .disabled-btn {
-      width: 630rpx;
+
+    .disabled-btn-box {
+      width: 248rpx;
       height: 80rpx;
-      border-radius: 40rpx;
-      background: #999999;
-      color: $white;
+      font-size: 24rpx;
+      font-weight: 600;
+      margin-left: -36rpx;
+      background-image: v-bind(disabledBtnBg);
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      color: #999999;
+      line-height: normal;
+      border-radius: 0px 40rpx 40rpx 0px;
+    }
+
+    .btn-price {
+      font-family: OPPOSANS;
+
+      &::before {
+        content: '￥';
+      }
+    }
+
+    .origin-price-btn {
+      width: 236rpx;
+      height: 80rpx;
+      background: rgba(#ff5651, 0.1);
+      color: #ff6000;
+      border-radius: 40rpx 0px 0px 40rpx;
+      line-height: normal;
+      font-size: 24rpx;
+      font-weight: 500;
+
+      .no-original {
+        font-size: 28rpx;
+      }
+
+      .btn-title {
+        font-size: 28rpx;
+      }
     }
   }
 
@@ -349,10 +509,6 @@
   }
 
   .model-box {
-    height: 60vh;
-    .model-content {
-      height: 56vh;
-    }
     .title {
       font-size: 36rpx;
       font-weight: bold;
@@ -365,4 +521,9 @@
       color: #333333;
     }
   }
+
+  image {
+    width: 100%;
+    height: 100%;
+  }
 </style>
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index d090aecd..697f6b1d 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -294,6 +294,7 @@
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
       seckillActivityId: state.orderPayload.seckillActivityId,
+      pointActivityId: state.orderPayload.pointActivityId,
     });
     if (code !== 0) {
       return;
@@ -324,6 +325,7 @@
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
       seckillActivityId: state.orderPayload.seckillActivityId,
+      pointActivityId: state.orderPayload.pointActivityId,
     });
     if (code !== 0) {
       return;
diff --git a/sheep/util/const.js b/sheep/util/const.js
index 9c22807f..ec6078db 100644
--- a/sheep/util/const.js
+++ b/sheep/util/const.js
@@ -116,7 +116,7 @@ export const PromotionActivityTypeEnum = {
   },
   POINT: {
     type: 4,
-    name: '',
+    name: '积分商城',
   },
 };
 

From 6d762c5367f683ed2db76fcda4b696d8f7c715f3 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 28 Sep 2024 16:33:26 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=EF=BC=9A?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/point.vue                         |  4 ---
 .../s-select-seckill-sku.vue                  | 28 ++++++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pages/goods/point.vue b/pages/goods/point.vue
index 0360766d..b49f7a21 100644
--- a/pages/goods/point.vue
+++ b/pages/goods/point.vue
@@ -277,10 +277,6 @@
         color: #fff;
         line-height: normal;
         font-family: OPPOSANS;
-
-        &::before {
-          font-size: 30rpx;
-        }
       }
     }
 
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 99b28a50..dfaf875e 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
@@ -19,8 +19,11 @@
           <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 v-if="state.goodsInfo.activity_type === PromotionActivityTypeEnum.POINT.type" class="price-text">
+              {{ getShowPriceText }}
+            </view>
+            <view v-else class="price-text">
+              ￥{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
             </view>
             <!-- 秒杀价格标签 -->
             <view class="tig ss-flex ss-col-center">
@@ -92,12 +95,15 @@
   import { computed, reactive, watch } from 'vue';
   import sheep from '@/sheep';
   import { convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
-  import { min } from 'lodash-es';
+  import { isEmpty, min } from 'lodash-es';
+  import { PromotionActivityTypeEnum } from '@/sheep/util/const';
+
   const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
   const props = defineProps({
     modelValue: {
       type: Object,
-      default() {},
+      default() {
+      },
     },
     show: {
       type: Boolean,
@@ -114,7 +120,14 @@
     selectedSku: {},
     currentPropertyArray: [],
   });
-
+  const getShowPriceText = computed(() => {
+    let priceText = `￥${fen2yuan(state.goodsInfo.price)}`;
+    if (!isEmpty(state.selectedSku)) {
+      const sku = state.selectedSku;
+      priceText = `${sku.point}积分${!sku.pointPrice ? '' : `+￥${fen2yuan(sku.pointPrice)}`}`;
+    }
+    return priceText;
+  });
   const propertyList = convertProductPropertyList(state.goodsInfo.skus);
   // SKU 列表
   const skuList = computed(() => {
@@ -344,11 +357,6 @@
         font-weight: 500;
         color: $red;
         font-family: OPPOSANS;
-
-        &::before {
-          content: '￥';
-          font-size: 24rpx;
-        }
       }
 
       .stock-text {

From 09dc98db16e043296de40e34a84563ee75b19e3d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Sep 2024 09:43:29 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E3=80=91=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                    | 1369 +++++++++++++++++----------------
 pages/activity/point/list.vue |    7 +-
 sheep/api/promotion/point.js  |    6 +-
 3 files changed, 698 insertions(+), 684 deletions(-)

diff --git a/pages.json b/pages.json
index 88ac0f4a..0b90b882 100644
--- a/pages.json
+++ b/pages.json
@@ -1,678 +1,695 @@
 {
-	"easycom": {
-		"autoscan": true,
-		"custom": {
-			"^s-(.*)": "@/sheep/components/s-$1/s-$1.vue",
-			"^su-(.*)": "@/sheep/ui/su-$1/su-$1.vue"
-		}
-	},
-	"pages": [{
-			"path": "pages/index/index",
-			"aliasPath": "/",
-			"style": {
-				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh": true
-			},
-			"meta": {
-				"auth": false,
-				"sync": true,
-				"title": "首页",
-				"group": "商城"
-			}
-		},
-		{
-			"path": "pages/index/user",
-			"style": {
-				"navigationBarTitleText": "个人中心",
-				"enablePullDownRefresh": true
-			},
-			"meta": {
-				"sync": true,
-				"title": "个人中心",
-				"group": "商城"
-			}
-		},
-		{
-			"path": "pages/index/category",
-			"style": {
-				"navigationBarTitleText": "商品分类"
-			},
-			"meta": {
-				"sync": true,
-				"title": "商品分类",
-				"group": "商城"
-			}
-		},
-		{
-			"path": "pages/index/cart",
-			"style": {
-				"navigationBarTitleText": "购物车"
-			},
-			"meta": {
-				"sync": true,
-				"title": "购物车",
-				"group": "商城"
-			}
-		},
-		{
-			"path": "pages/index/login",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		},
-		{
-			"path": "pages/index/search",
-			"style": {
-				"navigationBarTitleText": "搜索"
-			},
-			"meta": {
-				"sync": true,
-				"title": "搜索",
-				"group": "商城"
-			}
-		},
-		{
-			"path": "pages/index/page",
-			"style": {
-				"navigationBarTitleText": ""
-			},
-			"meta": {
-				"auth": false,
-				"sync": true,
-				"title": "自定义页面",
-				"group": "商城"
-			}
-		}
-	],
-	"subPackages": [{
-			"root": "pages/goods",
-			"pages": [{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "商品详情"
-					},
-					"meta": {
-						"sync": true,
-						"title": "普通商品",
-						"group": "商品"
-					}
-				},
-				{
-					"path": "groupon",
-					"style": {
-						"navigationBarTitleText": "拼团商品"
-					},
-					"meta": {
-						"sync": true,
-						"title": "拼团商品",
-						"group": "商品"
-					}
-				},
-
-				{
-					"path": "seckill",
-					"style": {
-						"navigationBarTitleText": "秒杀商品"
-					},
-					"meta": {
-						"sync": true,
-						"title": "秒杀商品",
-						"group": "商品"
-					}
-				},
-                {
-                    "path": "point",
-                    "style": {
-                      "navigationBarTitleText": "积分商品"
-                    },
-                    "meta": {
-                      "sync": true,
-                      "title": "积分商品",
-                      "group": "商品"
-                    }
-                },
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "商品列表"
-					},
-					"meta": {
-						"sync": true,
-						"title": "商品列表",
-						"group": "商品"
-					}
-				},
-				{
-					"path": "comment/add",
-					"style": {
-						"navigationBarTitleText": "评价商品"
-					},
-					"meta": {
-						"auth": true
-					}
-				},
-				{
-					"path": "comment/list",
-					"style": {
-						"navigationBarTitleText": "商品评价"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/order",
-			"pages": [{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "订单详情"
-					},
-					"meta": {
-						"auth": true,
-						"title": "订单详情"
-					}
-				},
-				{
-					"path": "confirm",
-					"style": {
-						"navigationBarTitleText": "确认订单"
-					},
-					"meta": {
-						"auth": true,
-						"title": "确认订单"
-					}
-				},
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "我的订单",
-						"enablePullDownRefresh": true
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "用户订单",
-						"group": "订单中心"
-					}
-				},
-				{
-					"path": "aftersale/apply",
-					"style": {
-						"navigationBarTitleText": "申请售后"
-					},
-					"meta": {
-						"auth": true,
-						"title": "申请售后"
-					}
-				},
-                {
-                  "path": "aftersale/return-delivery",
-                  "style": {
-                    "navigationBarTitleText": "退货物流"
-                  },
-                  "meta": {
-                    "auth": true,
-                    "title": "退货物流"
-                  }
-                },
-				{
-					"path": "aftersale/list",
-					"style": {
-						"navigationBarTitleText": "售后列表"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "售后订单",
-						"group": "订单中心"
-					}
-				},
-				{
-					"path": "aftersale/detail",
-					"style": {
-						"navigationBarTitleText": "售后详情"
-					},
-					"meta": {
-						"auth": true,
-						"title": "售后详情"
-					}
-				},
-				{
-					"path": "aftersale/log",
-					"style": {
-						"navigationBarTitleText": "售后进度"
-					},
-					"meta": {
-						"auth": true,
-						"title": "售后进度"
-					}
-				},
-				{
-					"path": "express/log",
-					"style": {
-						"navigationBarTitleText": "物流轨迹"
-					},
-					"meta": {
-						"auth": true,
-						"title": "物流轨迹"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/user",
-			"pages": [{
-					"path": "info",
-					"style": {
-						"navigationBarTitleText": "我的信息"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "用户信息",
-						"group": "用户中心"
-					}
-				},
-				{
-					"path": "goods-collect",
-					"style": {
-						"navigationBarTitleText": "我的收藏"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "商品收藏",
-						"group": "用户中心"
-					}
-				},
-				{
-					"path": "goods-log",
-					"style": {
-						"navigationBarTitleText": "我的足迹"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "浏览记录",
-						"group": "用户中心"
-					}
-				},
-				{
-					"path": "address/list",
-					"style": {
-						"navigationBarTitleText": "收货地址"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "地址管理",
-						"group": "用户中心"
-					}
-				},
-				{
-					"path": "address/edit",
-					"style": {
-						"navigationBarTitleText": "编辑地址"
-					},
-					"meta": {
-						"auth": true,
-						"title": "编辑地址"
-					}
-				},
-                {
-                  "path": "goods_details_store/index",
-                  "style": {
-                    "navigationBarTitleText": "自提门店"
-                  },
-                  "meta": {
-                    "auth": true,
-                    "sync": true,
-                    "title": "地址管理",
-                    "group": "用户中心"
-                  }
-                },
-				{
-					"path": "wallet/money",
-					"style": {
-						"navigationBarTitleText": "我的余额"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "用户余额",
-						"group": "用户中心"
-					}
-				},
-				{
-					"path": "wallet/score",
-					"style": {
-						"navigationBarTitleText": "我的积分"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "用户积分",
-						"group": "用户中心"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/commission",
-			"pages": [{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "分销"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "分销中心",
-						"group": "分销商城"
-					}
-				},
-				{
-					"path": "wallet",
-					"style": {
-						"navigationBarTitleText": "我的佣金"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "用户佣金",
-						"group": "分销中心"
-					}
-				},
-				{
-					"path": "goods",
-					"style": {
-						"navigationBarTitleText": "推广商品"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "推广商品",
-						"group": "分销商城"
-					}
-				},
-				{
-					"path": "order",
-					"style": {
-						"navigationBarTitleText": "分销订单"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "分销订单",
-						"group": "分销商城"
-					}
-				},
-				{
-					"path": "team",
-					"style": {
-						"navigationBarTitleText": "我的团队"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "我的团队",
-						"group": "分销商城"
-					}
-				}, {
-					"path": "promoter",
-					"style": {
-						"navigationBarTitleText": "推广人排行榜"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "推广人排行榜",
-						"group": "分销商城"
-					}
-				}, {
-					"path": "commission-ranking",
-					"style": {
-						"navigationBarTitleText": "佣金排行榜"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "佣金排行榜",
-						"group": "分销商城"
-					}
-				}, {
-                "path": "withdraw",
-                "style": {
-                  "navigationBarTitleText": "申请提现"
-                },
-                "meta": {
-                  "auth": true,
-                  "sync": true,
-                  "title": "申请提现",
-                  "group": "分销商城"
-                }
-              }
-			]
-		},
-		{
-			"root": "pages/app",
-			"pages": [{
-				"path": "sign",
-				"style": {
-					"navigationBarTitleText": "签到中心"
-				},
-				"meta": {
-					"auth": true,
-					"sync": true,
-					"title": "签到中心",
-					"group": "应用"
-				}
-			}]
-		},
-		{
-			"root": "pages/public",
-			"pages": [{
-					"path": "setting",
-					"style": {
-						"navigationBarTitleText": "系统设置"
-					},
-					"meta": {
-						"sync": true,
-						"title": "系统设置",
-						"group": "通用"
-					}
-				},
-				{
-					"path": "richtext",
-					"style": {
-						"navigationBarTitleText": "富文本"
-					},
-					"meta": {
-						"sync": true,
-						"title": "富文本",
-						"group": "通用"
-					}
-				},
-				{
-					"path": "faq",
-					"style": {
-						"navigationBarTitleText": "常见问题"
-					},
-					"meta": {
-						"sync": true,
-						"title": "常见问题",
-						"group": "通用"
-					}
-				},
-				{
-					"path": "error",
-					"style": {
-						"navigationBarTitleText": "错误页面"
-					}
-				},
-				{
-					"path": "webview",
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/coupon",
-			"pages": [{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "领券中心"
-					},
-					"meta": {
-						"sync": true,
-						"title": "领券中心",
-						"group": "优惠券"
-					}
-				},
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "优惠券"
-					},
-					"meta": {
-						"auth": false,
-						"sync": true,
-						"title": "优惠券详情",
-						"group": "优惠券"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/chat",
-			"pages": [{
-				"path": "index",
-				"style": {
-					"navigationBarTitleText": "客服"
-				},
-				"meta": {
-					"auth": true,
-					"sync": true,
-					"title": "客服",
-					"group": "客服"
-				}
-			}]
-		},
-		{
-			"root": "pages/pay",
-			"pages": [{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "收银台"
-					}
-				},
-				{
-					"path": "result",
-					"style": {
-						"navigationBarTitleText": "支付结果"
-					}
-				},
-				{
-					"path": "recharge",
-					"style": {
-						"navigationBarTitleText": "充值余额"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "充值余额",
-						"group": "支付"
-					}
-				},
-				{
-					"path": "recharge-log",
-					"style": {
-						"navigationBarTitleText": "充值记录"
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "充值记录",
-						"group": "支付"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/activity",
-			"pages": [{
-					"path": "groupon/detail",
-					"style": {
-						"navigationBarTitleText": "拼团详情"
-					}
-				},
-				{
-					"path": "groupon/order",
-					"style": {
-						"navigationBarTitleText": "我的拼团",
-						"enablePullDownRefresh": true
-					},
-					"meta": {
-						"auth": true,
-						"sync": true,
-						"title": "拼团订单",
-						"group": "营销活动"
-					}
-				},
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "营销商品"
-					},
-					"meta": {
-						"sync": true,
-						"title": "营销商品",
-						"group": "营销活动"
-					}
-				},
-				{
-					"path": "groupon/list",
-					"style": {
-						"navigationBarTitleText": "拼团活动"
-					},
-					"meta": {
-						"sync": true,
-						"title": "拼团活动",
-						"group": "营销活动"
-					}
-				},
-				{
-					"path": "seckill/list",
-					"style": {
-						"navigationBarTitleText": "秒杀活动"
-					},
-					"meta": {
-						"sync": true,
-						"title": "秒杀活动",
-						"group": "营销活动"
-					}
-				}
-			]
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "芋道商城",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#FFFFFF",
-		"navigationStyle": "custom"
-	},
-	"tabBar": {
-		"list": [{
-				"pagePath": "pages/index/index"
-			},
-			{
-				"pagePath": "pages/index/cart"
-			},
-			{
-				"pagePath": "pages/index/user"
-			}
-		]
-	}
+  "easycom": {
+    "autoscan": true,
+    "custom": {
+      "^s-(.*)": "@/sheep/components/s-$1/s-$1.vue",
+      "^su-(.*)": "@/sheep/ui/su-$1/su-$1.vue"
+    }
+  },
+  "pages": [
+    {
+      "path": "pages/index/index",
+      "aliasPath": "/",
+      "style": {
+        "navigationBarTitleText": "首页",
+        "enablePullDownRefresh": true
+      },
+      "meta": {
+        "auth": false,
+        "sync": true,
+        "title": "首页",
+        "group": "商城"
+      }
+    },
+    {
+      "path": "pages/index/user",
+      "style": {
+        "navigationBarTitleText": "个人中心",
+        "enablePullDownRefresh": true
+      },
+      "meta": {
+        "sync": true,
+        "title": "个人中心",
+        "group": "商城"
+      }
+    },
+    {
+      "path": "pages/index/category",
+      "style": {
+        "navigationBarTitleText": "商品分类"
+      },
+      "meta": {
+        "sync": true,
+        "title": "商品分类",
+        "group": "商城"
+      }
+    },
+    {
+      "path": "pages/index/cart",
+      "style": {
+        "navigationBarTitleText": "购物车"
+      },
+      "meta": {
+        "sync": true,
+        "title": "购物车",
+        "group": "商城"
+      }
+    },
+    {
+      "path": "pages/index/login",
+      "style": {
+        "navigationBarTitleText": "登录"
+      }
+    },
+    {
+      "path": "pages/index/search",
+      "style": {
+        "navigationBarTitleText": "搜索"
+      },
+      "meta": {
+        "sync": true,
+        "title": "搜索",
+        "group": "商城"
+      }
+    },
+    {
+      "path": "pages/index/page",
+      "style": {
+        "navigationBarTitleText": ""
+      },
+      "meta": {
+        "auth": false,
+        "sync": true,
+        "title": "自定义页面",
+        "group": "商城"
+      }
+    }
+  ],
+  "subPackages": [
+    {
+      "root": "pages/goods",
+      "pages": [
+        {
+          "path": "index",
+          "style": {
+            "navigationBarTitleText": "商品详情"
+          },
+          "meta": {
+            "sync": true,
+            "title": "普通商品",
+            "group": "商品"
+          }
+        },
+        {
+          "path": "groupon",
+          "style": {
+            "navigationBarTitleText": "拼团商品"
+          },
+          "meta": {
+            "sync": true,
+            "title": "拼团商品",
+            "group": "商品"
+          }
+        },
+        {
+          "path": "seckill",
+          "style": {
+            "navigationBarTitleText": "秒杀商品"
+          },
+          "meta": {
+            "sync": true,
+            "title": "秒杀商品",
+            "group": "商品"
+          }
+        },
+        {
+          "path": "point",
+          "style": {
+            "navigationBarTitleText": "积分商品"
+          },
+          "meta": {
+            "sync": true,
+            "title": "积分商品",
+            "group": "商品"
+          }
+        },
+        {
+          "path": "list",
+          "style": {
+            "navigationBarTitleText": "商品列表"
+          },
+          "meta": {
+            "sync": true,
+            "title": "商品列表",
+            "group": "商品"
+          }
+        },
+        {
+          "path": "comment/add",
+          "style": {
+            "navigationBarTitleText": "评价商品"
+          },
+          "meta": {
+            "auth": true
+          }
+        },
+        {
+          "path": "comment/list",
+          "style": {
+            "navigationBarTitleText": "商品评价"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/order",
+      "pages": [
+        {
+          "path": "detail",
+          "style": {
+            "navigationBarTitleText": "订单详情"
+          },
+          "meta": {
+            "auth": true,
+            "title": "订单详情"
+          }
+        },
+        {
+          "path": "confirm",
+          "style": {
+            "navigationBarTitleText": "确认订单"
+          },
+          "meta": {
+            "auth": true,
+            "title": "确认订单"
+          }
+        },
+        {
+          "path": "list",
+          "style": {
+            "navigationBarTitleText": "我的订单",
+            "enablePullDownRefresh": true
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "用户订单",
+            "group": "订单中心"
+          }
+        },
+        {
+          "path": "aftersale/apply",
+          "style": {
+            "navigationBarTitleText": "申请售后"
+          },
+          "meta": {
+            "auth": true,
+            "title": "申请售后"
+          }
+        },
+        {
+          "path": "aftersale/return-delivery",
+          "style": {
+            "navigationBarTitleText": "退货物流"
+          },
+          "meta": {
+            "auth": true,
+            "title": "退货物流"
+          }
+        },
+        {
+          "path": "aftersale/list",
+          "style": {
+            "navigationBarTitleText": "售后列表"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "售后订单",
+            "group": "订单中心"
+          }
+        },
+        {
+          "path": "aftersale/detail",
+          "style": {
+            "navigationBarTitleText": "售后详情"
+          },
+          "meta": {
+            "auth": true,
+            "title": "售后详情"
+          }
+        },
+        {
+          "path": "aftersale/log",
+          "style": {
+            "navigationBarTitleText": "售后进度"
+          },
+          "meta": {
+            "auth": true,
+            "title": "售后进度"
+          }
+        },
+        {
+          "path": "express/log",
+          "style": {
+            "navigationBarTitleText": "物流轨迹"
+          },
+          "meta": {
+            "auth": true,
+            "title": "物流轨迹"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/user",
+      "pages": [
+        {
+          "path": "info",
+          "style": {
+            "navigationBarTitleText": "我的信息"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "用户信息",
+            "group": "用户中心"
+          }
+        },
+        {
+          "path": "goods-collect",
+          "style": {
+            "navigationBarTitleText": "我的收藏"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "商品收藏",
+            "group": "用户中心"
+          }
+        },
+        {
+          "path": "goods-log",
+          "style": {
+            "navigationBarTitleText": "我的足迹"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "浏览记录",
+            "group": "用户中心"
+          }
+        },
+        {
+          "path": "address/list",
+          "style": {
+            "navigationBarTitleText": "收货地址"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "地址管理",
+            "group": "用户中心"
+          }
+        },
+        {
+          "path": "address/edit",
+          "style": {
+            "navigationBarTitleText": "编辑地址"
+          },
+          "meta": {
+            "auth": true,
+            "title": "编辑地址"
+          }
+        },
+        {
+          "path": "goods_details_store/index",
+          "style": {
+            "navigationBarTitleText": "自提门店"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "地址管理",
+            "group": "用户中心"
+          }
+        },
+        {
+          "path": "wallet/money",
+          "style": {
+            "navigationBarTitleText": "我的余额"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "用户余额",
+            "group": "用户中心"
+          }
+        },
+        {
+          "path": "wallet/score",
+          "style": {
+            "navigationBarTitleText": "我的积分"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "用户积分",
+            "group": "用户中心"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/commission",
+      "pages": [
+        {
+          "path": "index",
+          "style": {
+            "navigationBarTitleText": "分销"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "分销中心",
+            "group": "分销商城"
+          }
+        },
+        {
+          "path": "wallet",
+          "style": {
+            "navigationBarTitleText": "我的佣金"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "用户佣金",
+            "group": "分销中心"
+          }
+        },
+        {
+          "path": "goods",
+          "style": {
+            "navigationBarTitleText": "推广商品"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "推广商品",
+            "group": "分销商城"
+          }
+        },
+        {
+          "path": "order",
+          "style": {
+            "navigationBarTitleText": "分销订单"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "分销订单",
+            "group": "分销商城"
+          }
+        },
+        {
+          "path": "team",
+          "style": {
+            "navigationBarTitleText": "我的团队"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "我的团队",
+            "group": "分销商城"
+          }
+        },
+        {
+          "path": "promoter",
+          "style": {
+            "navigationBarTitleText": "推广人排行榜"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "推广人排行榜",
+            "group": "分销商城"
+          }
+        },
+        {
+          "path": "commission-ranking",
+          "style": {
+            "navigationBarTitleText": "佣金排行榜"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "佣金排行榜",
+            "group": "分销商城"
+          }
+        },
+        {
+          "path": "withdraw",
+          "style": {
+            "navigationBarTitleText": "申请提现"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "申请提现",
+            "group": "分销商城"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/app",
+      "pages": [
+        {
+          "path": "sign",
+          "style": {
+            "navigationBarTitleText": "签到中心"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "签到中心",
+            "group": "应用"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/public",
+      "pages": [
+        {
+          "path": "setting",
+          "style": {
+            "navigationBarTitleText": "系统设置"
+          },
+          "meta": {
+            "sync": true,
+            "title": "系统设置",
+            "group": "通用"
+          }
+        },
+        {
+          "path": "richtext",
+          "style": {
+            "navigationBarTitleText": "富文本"
+          },
+          "meta": {
+            "sync": true,
+            "title": "富文本",
+            "group": "通用"
+          }
+        },
+        {
+          "path": "faq",
+          "style": {
+            "navigationBarTitleText": "常见问题"
+          },
+          "meta": {
+            "sync": true,
+            "title": "常见问题",
+            "group": "通用"
+          }
+        },
+        {
+          "path": "error",
+          "style": {
+            "navigationBarTitleText": "错误页面"
+          }
+        },
+        {
+          "path": "webview",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/coupon",
+      "pages": [
+        {
+          "path": "list",
+          "style": {
+            "navigationBarTitleText": "领券中心"
+          },
+          "meta": {
+            "sync": true,
+            "title": "领券中心",
+            "group": "优惠券"
+          }
+        },
+        {
+          "path": "detail",
+          "style": {
+            "navigationBarTitleText": "优惠券"
+          },
+          "meta": {
+            "auth": false,
+            "sync": true,
+            "title": "优惠券详情",
+            "group": "优惠券"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/chat",
+      "pages": [
+        {
+          "path": "index",
+          "style": {
+            "navigationBarTitleText": "客服"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "客服",
+            "group": "客服"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/pay",
+      "pages": [
+        {
+          "path": "index",
+          "style": {
+            "navigationBarTitleText": "收银台"
+          }
+        },
+        {
+          "path": "result",
+          "style": {
+            "navigationBarTitleText": "支付结果"
+          }
+        },
+        {
+          "path": "recharge",
+          "style": {
+            "navigationBarTitleText": "充值余额"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "充值余额",
+            "group": "支付"
+          }
+        },
+        {
+          "path": "recharge-log",
+          "style": {
+            "navigationBarTitleText": "充值记录"
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "充值记录",
+            "group": "支付"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/activity",
+      "pages": [
+        {
+          "path": "groupon/detail",
+          "style": {
+            "navigationBarTitleText": "拼团详情"
+          }
+        },
+        {
+          "path": "groupon/order",
+          "style": {
+            "navigationBarTitleText": "我的拼团",
+            "enablePullDownRefresh": true
+          },
+          "meta": {
+            "auth": true,
+            "sync": true,
+            "title": "拼团订单",
+            "group": "营销活动"
+          }
+        },
+        {
+          "path": "index",
+          "style": {
+            "navigationBarTitleText": "营销商品"
+          },
+          "meta": {
+            "sync": true,
+            "title": "营销商品",
+            "group": "营销活动"
+          }
+        },
+        {
+          "path": "groupon/list",
+          "style": {
+            "navigationBarTitleText": "拼团活动"
+          },
+          "meta": {
+            "sync": true,
+            "title": "拼团活动",
+            "group": "营销活动"
+          }
+        },
+        {
+          "path": "seckill/list",
+          "style": {
+            "navigationBarTitleText": "秒杀活动"
+          },
+          "meta": {
+            "sync": true,
+            "title": "秒杀活动",
+            "group": "营销活动"
+          }
+        }
+      ]
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "芋道商城",
+    "navigationBarBackgroundColor": "#FFFFFF",
+    "backgroundColor": "#FFFFFF",
+    "navigationStyle": "custom"
+  },
+  "tabBar": {
+    "list": [
+      {
+        "pagePath": "pages/index/index"
+      },
+      {
+        "pagePath": "pages/index/cart"
+      },
+      {
+        "pagePath": "pages/index/user"
+      }
+    ]
+  }
 }
diff --git a/pages/activity/point/list.vue b/pages/activity/point/list.vue
index 8b1e1bf9..5774175f 100644
--- a/pages/activity/point/list.vue
+++ b/pages/activity/point/list.vue
@@ -1,4 +1,4 @@
-<!-- 页面  -->
+<!-- 积分商城：商品列表  -->
 <template>
   <s-layout title="积分商城">
     <view class="ss-p-20">
@@ -8,14 +8,14 @@
           :data="item"
           priceColor="#FF3000"
           @tap="sheep.$router.go('/pages/goods/point', { id: item.id })"
-        ></s-point-card>
+        />
       </view>
     </view>
     <s-empty
       v-if="state.pagination.total === 0"
       icon="/static/goods-empty.png"
       text="暂无积分商品"
-    ></s-empty>
+    />
     <uni-load-more
       v-if="state.pagination.total > 0"
       :status="state.loadStatus"
@@ -42,6 +42,7 @@
     loadStatus: '',
   });
   async function getData(page = 1, list_rows = 5) {
+    // TODO @puhui999：分页重写成，我们的代码风格。原先的有点复杂
     state.loadStatus = 'loading';
     let res = await sheep.$api.app.scoreShop.list({
       list_rows,
diff --git a/sheep/api/promotion/point.js b/sheep/api/promotion/point.js
index c786fb5f..d4e17b80 100644
--- a/sheep/api/promotion/point.js
+++ b/sheep/api/promotion/point.js
@@ -17,11 +17,7 @@ const PointApi = {
     });
   },
 
-  /**
-   * 获得积分商城活动明细
-   * @param {number} id 积分商城活动编号
-   * @return {*}
-   */
+  // 获得积分商城活动明细
   getPointActivity: (id) => {
     return request({
       url: 'promotion/point-activity/get-detail',