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] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E3=80=91=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=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 591d004..0e89b30 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 978448a..13f71da 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 0000000..d7b88de
--- /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 4c000e5..460ccf7 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 fa14a61..720f599 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 08e0b28..23b1b43 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 86caeb7..153afc2 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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