From 4d5a4bce704bff0cfd0a036ab377e8f27c6a5461 Mon Sep 17 00:00:00 2001
From: owen <77210450@qq.com>
Date: Sat, 23 Dec 2023 22:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/seckill/list.vue               |   7 +-
 pages/goods/seckill.vue                       | 136 ++++----
 .../s-seckill-block/s-seckill-block.vue       |   6 +-
 .../s-select-seckill-sku.vue                  | 306 +++++++++---------
 sheep/hooks/useGoods.js                       |   4 +-
 sheep/platform/share.js                       |   3 +-
 6 files changed, 233 insertions(+), 229 deletions(-)

diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue
index 4c2d9b00..a9b15144 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -66,12 +66,7 @@
             :data="{ ...activity, price: activity.seckillPrice }"
             :goodsFields="goodsFields"
             :seckillTag="true"
-            @click="
-              sheep.$router.go('/pages/goods/seckill', {
-                id: activity.spuId,
-                activityId: activity.id
-              })
-            "
+            @click="sheep.$router.go('/pages/goods/seckill', { id: activity.id })"
           >
             <!-- 抢购进度 -->
             <template #activity>
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 82798d2b..344eb1fd 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -31,7 +31,7 @@
           <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">
-                {{ state.selectedSkuPrice.price || formatPrice(state.goodsInfo.price) }}
+                {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
               </view>
               <view class="tig ss-flex ss-col-center">
                 <view class="tig-icon ss-flex ss-col-center ss-row-center">
@@ -53,24 +53,24 @@
             <view class="countdown-title" v-else> 活动已结束 </view>
           </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.original_price">
+            <view class="origin-price ss-flex ss-col-center" v-if="state.goodsInfo.marketPrice">
               原价
               <view class="origin-price-text">
-                {{ state.selectedSkuPrice.original_price || state.goodsInfo.original_price }}
+                {{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
               </view>
             </view>
             <detail-progress :percent="state.percent" />
           </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"
+            v-model="state.selectedSku.goods_sku_text"
+            :sku="state.selectedSku"
             @tap="state.showSelectSku = true"
           />
         </view>
@@ -78,6 +78,7 @@
         <s-select-seckill-sku
           v-model="state.goodsInfo"
           :show="state.showSelectSku"
+          :single-limit-count="activity.singleLimitCount"
           @buy="onBuy"
           @change="onSkuChange"
           @close="state.showSelectSku = false"
@@ -85,9 +86,9 @@
       </view>
 
       <!-- 评价 -->
-      <detail-comment-card class="detail-comment-selector" :goodsId="state.goodsId" />
+      <detail-comment-card class="detail-comment-selector" :goodsId="state.goodsInfo.id" />
       <!-- 详情 -->
-      <detail-content-card class="detail-content-selector" :content="state.goodsInfo.content" />
+      <detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
 
       <!-- 详情tabbar -->
       <detail-tabbar v-model="state.goodsInfo">
@@ -95,11 +96,11 @@
         <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.original_price"
+            v-if="state.goodsInfo.marketPrice"
             @tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })"
           >
             <view>
-              <view class="btn-price">{{ state.goodsInfo.original_price }}</view>
+              <view class="btn-price">{{ fen2yuan(state.goodsInfo.marketPrice) }}</view>
               <view>原价购买</view>
             </view>
           </button>
@@ -107,7 +108,7 @@
             <view
               class="no-original"
               :class="
-                state.goodsInfo.stock === 0 || state.goodsInfo.activity.status != 'ing' ? '' : ''
+                state.goodsInfo.stock === 0 || activity.status != 'ing' ? '' : ''
               "
               >秒杀价</view
             >
@@ -116,18 +117,18 @@
             class="ss-reset-button btn-box ss-flex-col"
             @tap="state.showSelectSku = true"
             :class="
-              state.goodsInfo.activity.status === 'ing' && state.goodsInfo.stock != 0
+              activity.status === 'ing' && state.goodsInfo.stock != 0
                 ? 'check-btn-box'
                 : 'disabled-btn-box'
             "
-            :disabled="state.goodsInfo.stock === 0 || state.goodsInfo.activity.status != 'ing'"
+            :disabled="state.goodsInfo.stock === 0 || activity.status != 'ing'"
           >
-            <view class="btn-price">{{ state.goodsInfo.price[0] }}</view>
-            <view v-if="state.goodsInfo.activity.status === 'ing'">
+            <view class="btn-price">{{ fen2yuan(state.goodsInfo.price) }}</view>
+            <view v-if="activity.status === 'ing'">
               <view v-if="state.goodsInfo.stock === 0">已售罄</view>
               <view v-else>立即秒杀</view>
             </view>
-            <view v-else>{{ state.goodsInfo.activity.status_text }}</view>
+            <view v-else>{{ activity.status_text }}</view>
           </button>
         </view>
       </detail-tabbar>
@@ -136,11 +137,11 @@
 </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 { isEmpty } from 'lodash';
-  import { useDurationTime, formatGoodsSwiper, formatPrice } from '@/sheep/hooks/useGoods';
+  import {isEmpty, min} from 'lodash';
+  import {useDurationTime, formatGoodsSwiper, fen2yuan} from '@/sheep/hooks/useGoods';
   import detailNavbar from './components/detail/detail-navbar.vue';
   import detailCellSku from './components/detail/detail-cell-sku.vue';
   import detailTabbar from './components/detail/detail-tabbar.vue';
@@ -148,6 +149,8 @@
   import detailCommentCard from './components/detail/detail-comment-card.vue';
   import detailContentCard from './components/detail/detail-content-card.vue';
   import detailProgress from './components/detail/detail-progress.vue';
+  import SeckillApi from "@/sheep/api/promotion/seckill";
+  import SpuApi from "@/sheep/api/product/spu";
 
   const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-bg.png');
   const btnBg = sheep.$url.css('/static/img/shop/goods/seckill-btn.png');
@@ -159,26 +162,24 @@
 
   onPageScroll(() => {});
   const state = reactive({
-    goodsId: 0,
     skeletonLoading: true,
     goodsInfo: {},
     showSelectSku: false,
     goodsSwiper: [],
-    selectedSkuPrice: {},
+    selectedSku: {},
     showModel: false,
     total: 0,
     percent: 0,
     price: '',
   });
 
-  // 倒计时
   const endTime = computed(() => {
-    return useDurationTime(state.goodsInfo.activity.end_time);
+    return useDurationTime(activity.value.endTime);
   });
 
   // 规格变更
   function onSkuChange(e) {
-    state.selectedSkuPrice = e;
+    state.selectedSku = e;
   }
 
   // 立即购买
@@ -187,7 +188,7 @@
       data: JSON.stringify({
         order_type: 'goods',
         buy_type: 'seckill',
-        activity_id: state.goodsInfo.activity.id,
+        activityId: activity.value.id,
         goods_list: [
           {
             goods_id: e.goods_id,
@@ -203,53 +204,76 @@
     if (isEmpty(state.goodsInfo?.activity)) return {};
     return sheep.$platform.share.getShareInfo(
       {
-        title: state.goodsInfo.title,
-        image: sheep.$url.cdn(state.goodsInfo.image),
+        title: state.goodsInfo.name,
+        image: sheep.$url.cdn(state.goodsInfo.picUrl),
         params: {
           page: '4',
-          query: state.goodsInfo.id + ',' + state.goodsInfo.activity.id,
+          query: state.goodsInfo.id + ',' + activity.value.id,
         },
       },
       {
         type: 'goods', // 商品海报
-        title: state.goodsInfo.title, // 商品标题
-        image: sheep.$url.cdn(state.goodsInfo.image), // 商品主图
+        title: state.goodsInfo.name, // 商品标题
+        image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
         price: state.goodsInfo.price[0], // 商品价格
-        original_price: state.goodsInfo.original_price, // 商品原价
+        marketPrice: state.goodsInfo.marketPrice, // 商品原价
       },
     );
   });
 
+  const activity = ref()
+  // 查询活动
+  const getActivity = async (id) => {
+    const { data } = await SeckillApi.getSeckillActivity(id)
+    activity.value = data
+
+    // 查询商品
+    await getSpu(data.spuId)
+  }
+
+  const getSpu = async (id) => {
+    const { data } = await SpuApi.getSpuDetail(id)
+    // 模拟
+    data.activity_type = 'seckill'
+    state.goodsInfo = data
+    // 处理轮播图
+    state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.sliderPicUrls);
+
+    // 默认显示最低价
+    state.goodsInfo.price = min([state.goodsInfo.price, ...activity.value.products.map(spu => spu.seckillPrice)])
+
+    // 价格、库存使用活动的
+    data.skus.forEach(sku => {
+      debugger
+      const product = activity.value.products.find(product => product.skuId === sku.id);
+      if (product) {
+        sku.price = product.seckillPrice;
+        sku.stock = Math.min(sku.stock, product.stock);
+      } else { // 找不到可能是没配置，则不能发起秒杀
+        sku.stock = 0;
+      }
+      // 设置限购数量
+      if (activity.value.totalLimitCount > 0 && activity.value.singleLimitCount > 0) {
+        sku.limitCount = Math.min(activity.value.totalLimitCount, activity.value.singleLimitCount);
+      } else if (activity.value.totalLimitCount > 0) {
+        sku.limitCount = activity.value.totalLimitCount;
+      } else if (activity.value.singleLimitCount > 0) {
+        sku.limitCount = activity.value.singleLimitCount;
+      }
+    });
+
+    state.skeletonLoading = false;
+  }
+
   onLoad((options) => {
     // 非法参数
     if (!options.id) {
       state.goodsInfo = null;
       return;
     }
-    state.goodsId = options.id;
-    // 加载商品信息
-    sheep.$api.goods
-      .detail(options.id, {
-        activity_id: options.activity_id,
-      })
-      .then((res) => {
-        state.skeletonLoading = false;
-        if (res.error === 0) {
-          state.goodsInfo = res.data;
-          state.percent =
-            state.goodsInfo.stock + state.goodsInfo.sales > 0
-              ? (
-                  (state.goodsInfo.sales / (state.goodsInfo.sales + state.goodsInfo.stock)) *
-                  100
-                ).toFixed(2)
-              : 0;
-          state.percent = Number(state.percent);
-          state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.images);
-        } else {
-          // 未找到商品
-          state.goodsInfo = null;
-        }
-      });
+
+    // 查询活动
+    getActivity(options.id)
   });
 </script>
 
diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index 5b317257..09c26136 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -28,8 +28,7 @@
           :bottomRadius="data.borderRadiusBottom"
           @click="
             sheep.$router.go('/pages/goods/seckill', {
-              id: product.id,
-              activity_id: props.data.activityId,
+              id: props.data.activityId,
             })
           "
         ></s-goods-column>
@@ -55,8 +54,7 @@
           :bottomRadius="data.borderRadiusBottom"
           @click="
             sheep.$router.go('/pages/goods/seckill', {
-              id: product.id,
-              activity_id: props.data.activityId,
+              id: props.data.activityId,
             })
           "
         >
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 d339120d..ffc2514d 100644
--- a/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
+++ b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
@@ -1,55 +1,61 @@
 <template>
-  <!-- 规格弹窗 -->
-  <su-popup :show="show" round="10" @close="emits('close')">
-    <view class="ss-modal-box bg-white ss-flex-col">
-      <view class="modal-header ss-flex ss-col-center">
-        <view class="header-left ss-m-r-30">
-          <image
-            class="sku-image"
-            :src="sheep.$url.cdn(state.selectedSkuPrice.image || state.goodsInfo.image)"
-            mode="aspectFill"
-          >
-          </image>
-        </view>
-        <view class="header-right ss-flex-col ss-row-between ss-flex-1">
-          <view class="goods-title ss-line-2">{{ state.goodsInfo.title }}</view>
-          <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
-            <view class="price-text">
-              {{ state.selectedSkuPrice.groupon_price || formatPrice(state.goodsInfo.price) }}
-            </view>
-            <view class="tig ss-flex ss-col-center">
-              <view class="tig-icon ss-flex ss-col-center ss-row-center">
-                <text class="cicon-alarm"></text>
+	<!-- 规格弹窗 -->
+	<su-popup :show="show" round="10" @close="emits('close')">
+		<!-- SKU 信息 -->
+		<view class="ss-modal-box bg-white ss-flex-col">
+			<view class="modal-header ss-flex ss-col-center">
+				<!-- 规格图 -->
+				<view class="header-left ss-m-r-30">
+					<image
+						class="sku-image"
+						:src="sheep.$url.cdn(state.selectedSku.picUrl || state.goodsInfo.picUrl)"
+						mode="aspectFill"
+					>
+					</image>
+				</view>
+				<view class="header-right ss-flex-col ss-row-between ss-flex-1">
+					<!-- 名称 -->
+					<view class="goods-title ss-line-2">{{ state.goodsInfo.name }}</view>
+					<view class="header-right-bottom ss-flex ss-col-center ss-row-between">
+						<!-- 价格 -->
+						<view class="price-text">
+							{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
+						</view>
+						<!-- 秒杀价格标签 -->
+						<view class="tig ss-flex ss-col-center">
+							<view class="tig-icon ss-flex ss-col-center ss-row-center">
+	              <text class="cicon-alarm"></text>
               </view>
               <view class="tig-title">秒杀价</view>
             </view>
+            <!-- 库存 -->
             <view class="stock-text ss-m-l-20">
-              库存{{ state.selectedSkuPrice.stock || state.goodsInfo.stock }}件
+              库存{{ state.selectedSku.stock || state.goodsInfo.stock }}件
             </view>
           </view>
         </view>
       </view>
       <view class="modal-content ss-flex-1">
         <scroll-view scroll-y="true" class="modal-content-scroll">
-          <view class="sku-item ss-m-b-20" v-for="sku1 in state.goodsInfo.skus" :key="sku1.id">
-            <view class="label-text ss-m-b-20">{{ sku1.name }}</view>
+          <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="sku2 in sku1.children"
+                v-for="value in property.values"
                 :class="[
                   {
-                    'checked-btn': state.currentSkuArray[sku2.parent_id] == sku2.id,
+                    'checked-btn': state.currentPropertyArray[property.id] === value.id,
                   },
                   {
-                    'disabled-btn': sku2.disabled == true,
+                    'disabled-btn': value.disabled === true,
                   },
                 ]"
-                :key="sku2.id"
-                :disabled="sku2.disabled == true"
-                @tap="onSelectSku(sku2.parent_id, sku2.id)"
+                :key="value.id"
+                :disabled="value.disabled === true"
+                @tap="onSelectSku(property.id, value.id)"
               >
-                {{ sku2.name }}
+                {{ value.name }}
               </button>
             </view>
           </view>
@@ -57,10 +63,10 @@
             <view class="label-text">购买数量</view>
             <su-number-box
               :min="1"
-              :max="state.selectedSkuPrice.stock"
+              :max="min([singleLimitCount, state.selectedSku.stock])"
               :step="1"
-              v-model="state.selectedSkuPrice.goods_num"
-              @change="onNumberChange($event)"
+              v-model="state.selectedSku.count"
+              @change="onBuyCountChange($event)"
               activity="seckill"
             ></su-number-box>
           </view>
@@ -77,13 +83,15 @@
 
 <script setup>
   /**
-   * 1. 根据spus获得skus： 后台已算好
-   * 2. 用路径字典，生成路径map
-   * 3. 计算用户选择后，其他路径是否可用
+   * 秒杀活动SKU选择，
+   * 与s-select-sku的区别：多一个秒杀价的标签、没有加入购物车按钮、立即购买按钮叫确认、秒杀有最大购买数量限制
+   * 差别不大，可以考虑合并 todo @芋艿
    */
   // 按钮状态： active,nostock
   import { computed, reactive, watch } from 'vue';
   import sheep from '@/sheep';
+  import {convertProductPropertyList, fen2yuan} from "@/sheep/hooks/useGoods";
+  import {min} from "lodash";
   const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
   const props = defineProps({
     modelValue: {
@@ -94,28 +102,34 @@
       type: Boolean,
       default: false,
     },
+    // 单次限购数量
+    singleLimitCount: {
+      type: Number,
+      default: 1,
+    }
   });
   const state = reactive({
     goodsInfo: computed(() => props.modelValue),
-    skuPrices: computed(() => {
-      let skuPrices = props.modelValue.sku_prices;
-      if (props.modelValue.is_sku) {
-        skuPrices.forEach((item) => {
-          item.goods_sku_id_arr = item.goods_sku_ids.split(',');
-        });
-      }
-      return skuPrices;
-    }),
-    skuList: props.modelValue.skus,
-    selectedSkuPrice: {},
-    currentSkuArray: [],
+    selectedSku: {},
+    currentPropertyArray: [],
   });
+
+  const propertyList = convertProductPropertyList(state.goodsInfo.skus);
+  // SKU 列表
+  const skuList = computed(() => {
+    let skuPrices = state.goodsInfo.skus;
+    for (let price of skuPrices) {
+      price.value_id_array = price.properties.map((item) => item.valueId)
+    }
+    return skuPrices;
+  });
+
   if (!state.goodsInfo.is_sku) {
-    state.selectedSkuPrice = state.goodsInfo.sku_prices[0];
+    state.selectedSku = state.goodsInfo.skus[0];
   }
 
   watch(
-    () => state.selectedSkuPrice,
+    () => state.selectedSku,
     (newVal) => {
       emits('change', newVal);
     },
@@ -125,178 +139,152 @@
     },
   );
 
-  // 格式化价格
-  const formatPrice = (e) => {
-    return e.length === 1 ? e[0] : e.join('~');
-  };
-  const onAddCart = () => {
-    if (state.selectedSkuPrice.goods_id) {
-      if (state.selectedSkuPrice.stock <= 0) {
+  const onBuy = () => {
+    if (state.selectedSku.id) {
+      if (state.selectedSku.stock <= 0) {
         sheep.$helper.toast('库存不足');
       } else {
-        emits('addCart', state.selectedSkuPrice);
+        emits('buy', state.selectedSku);
       }
     } else {
       sheep.$helper.toast('请选择规格');
     }
   };
 
-  const onBuy = () => {
-    if (state.selectedSkuPrice.goods_id) {
-      if (state.selectedSkuPrice.stock <= 0) {
-        sheep.$helper.toast('库存不足');
-      } else {
-        emits('buy', state.selectedSkuPrice);
-      }
-    } else {
-      sheep.$helper.toast('请选择规格');
+  // 购买数量改变
+  function onBuyCountChange(buyCount) {
+    if (buyCount > 0 && state.selectedSku.count !== buyCount) {
+      state.selectedSku.count = buyCount;
     }
-  };
-  //输入框改变数量
-  function onNumberChange(e) {
-	if (e === 0) return;
-    if (state.selectedSkuPrice.goods_num === e) return;
-    state.selectedSkuPrice.goods_num = e;
   }
   // 改变禁用状态
-  const changeDisabled = (isChecked = false, pid = 0, skuId = 0) => {
-    let newPrice = []; // 所有可以选择的 skuPrice
-
+  const changeDisabled = (isChecked = false, propertyId = 0, valueId = 0) => {
+    let newSkus = []; // 所有可以选择的 sku 数组
     if (isChecked) {
-      // 选中规格
-      // 当前点击选中规格下的 所有可用 skuPrice
-      for (let price of state.skuPrices) {
+      // 情况一：选中 property
+      // 获得当前点击选中 property 的、所有可用 SKU
+      for (let price of skuList.value) {
         if (price.stock <= 0) {
-          // this.goodsNum 不判断是否大于当前选择数量，在 uni-number-box 判断，并且 取 stock 和 goods_num 的小值
           continue;
         }
-        if (price.goods_sku_id_arr.indexOf(skuId.toString()) >= 0) {
-          newPrice.push(price);
+        if (price.value_id_array.indexOf(valueId) >= 0) {
+          newSkus.push(price);
         }
       }
     } else {
-      // 取消选中
-      // 当前所选规格下，所有可以选择的 skuPrice
-      newPrice = getCanUseSkuPrice();
+      // 情况二：取消选中 property
+      // 当前所选 property 下，所有可以选择的 SKU
+      newSkus = getCanUseSkuList();
     }
 
-    // 所有存在并且有库存未选择的规格项 的 子项 id
-    let noChooseSkuIds = [];
-    for (let price of newPrice) {
-      noChooseSkuIds = noChooseSkuIds.concat(price.goods_sku_id_arr);
+    // 所有存在并且有库存未选择的 SKU 的 value 属性值 id
+    let noChooseValueIds = [];
+    for (let price of newSkus) {
+      noChooseValueIds = noChooseValueIds.concat(price.value_id_array);
     }
-
-    // 去重
-    noChooseSkuIds = Array.from(new Set(noChooseSkuIds));
+    noChooseValueIds = Array.from(new Set(noChooseValueIds)); // 去重
 
     if (isChecked) {
-      // 去除当前选中的规格项
-      let index = noChooseSkuIds.indexOf(skuId.toString());
-      noChooseSkuIds.splice(index, 1);
+      // 去除当前选中的 value 属性值 id
+      let index = noChooseValueIds.indexOf(valueId);
+      noChooseValueIds.splice(index, 1);
     } else {
-      // 循环去除当前已选择的规格项
-      state.currentSkuArray.forEach((sku) => {
-        if (sku.toString() != '') {
-          // sku 为空是反选 填充的
-          let index = noChooseSkuIds.indexOf(sku.toString());
-          if (index >= 0) {
-            // sku 存在于 noChooseSkuIds
-            noChooseSkuIds.splice(index, 1);
-          }
+      // 循环去除当前已选择的 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);
         }
       });
     }
 
-    // 当前已选择的规格大类
-    let chooseSkuKey = [];
+    // 当前已选择的 property 数组
+    let choosePropertyIds = [];
     if (!isChecked) {
-      // 当前已选择的规格大类
-      state.currentSkuArray.forEach((sku, key) => {
-        if (sku != '') {
-          // sku 为空是反选 填充的
-          chooseSkuKey.push(key);
+      // 当前已选择的 property
+      state.currentPropertyArray.forEach((currentPropertyId, currentValueId) => {
+        if (currentPropertyId !== '') {
+          // currentPropertyId 为空是反选 填充的
+          choosePropertyIds.push(currentValueId);
         }
       });
     } else {
-      // 当前点击选择的规格大类
-      chooseSkuKey = [pid];
+      // 当前点击选择的 property
+      choosePropertyIds = [propertyId];
     }
 
-    for (let i in state.skuList) {
-      // 当前点击的规格，或者取消选择时候 已选中的规格 不进行处理
-      if (chooseSkuKey.indexOf(state.skuList[i]['id']) >= 0) {
+    for (let propertyIndex in propertyList) {
+      // 当前点击的 property、或者取消选择时候，已选中的 property 不进行处理
+      if (choosePropertyIds.indexOf(propertyList[propertyIndex]['id']) >= 0) {
         continue;
       }
-
-      for (let j in state.skuList[i]['children']) {
-        // 如果当前规格项 id 不存在于有库存的规格项中，则禁用
-        if (noChooseSkuIds.indexOf(state.skuList[i]['children'][j]['id'].toString()) >= 0) {
-          state.skuList[i]['children'][j]['disabled'] = false;
-        } else {
-          state.skuList[i]['children'][j]['disabled'] = true;
-        }
+      // 如果当前 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 不禁用
       }
     }
   };
-  // 当前所选规格下，获取所有有库存的 skuPrice
-  const getCanUseSkuPrice = () => {
-    let newPrice = [];
-
-    for (let price of state.skuPrices) {
-      if (price.stock <= 0) {
-        // || price.stock < this.goodsNum		不判断是否大于当前选择数量，在 uni-number-box 判断，并且 取 stock 和 goods_num 的小值
+  // 获取可用的（有库存的）SKU 列表
+  const getCanUseSkuList = () => {
+    let newSkus = [];
+    for (let sku of skuList.value) {
+      if (sku.stock <= 0) {
         continue;
       }
-      var isOk = true;
-
-      state.currentSkuArray.forEach((sku) => {
-        // sku 不为空，并且，这个 条 skuPrice 没有被选中,则排除
-        if (sku.toString() != '' && price.goods_sku_id_arr.indexOf(sku.toString()) < 0) {
+      let isOk = true;
+      state.currentPropertyArray.forEach((propertyId) => {
+        // propertyId 不为空，并且，这个 条 sku 没有被选中，则排除
+        if (propertyId.toString() !== '' && sku.value_id_array.indexOf(propertyId) < 0) {
           isOk = false;
         }
       });
-
       if (isOk) {
-        newPrice.push(price);
+        newSkus.push(sku);
       }
     }
-
-    return newPrice;
+    return newSkus;
   };
   // 选择规格
-  const onSelectSku = (pid, skuId) => {
+  const onSelectSku = (propertyId, valueId) => {
     // 清空已选择
     let isChecked = true; // 选中 or 取消选中
-    if (state.currentSkuArray[pid] != undefined && state.currentSkuArray[pid] == skuId) {
+    if (state.currentPropertyArray[propertyId] !== undefined && state.currentPropertyArray[propertyId] === valueId) {
       // 点击已被选中的，删除并填充 ''
       isChecked = false;
-      state.currentSkuArray.splice(pid, 1, '');
+      state.currentPropertyArray.splice(propertyId, 1, '');
     } else {
       // 选中
-      state.currentSkuArray[pid] = skuId;
+      state.currentPropertyArray[propertyId] = valueId;
     }
 
-    let chooseSkuId = []; // 选中的规格大类
-    state.currentSkuArray.forEach((sku) => {
-      if (sku != '') {
-        // sku 为空是反选 填充的
-        chooseSkuId.push(sku);
+    // 选中的 property 大类
+    let choosePropertyId = [];
+    state.currentPropertyArray.forEach((currentPropertyId) => {
+      if (currentPropertyId !== '') {
+        // currentPropertyId 为空是反选 填充的
+        choosePropertyId.push(currentPropertyId);
       }
     });
 
-    // 当前所选规格下，所有可以选择的 skuPric
-    let newPrice = getCanUseSkuPrice();
+    // 当前所选 property 下，所有可以选择的 SKU 们
+    let newSkuList = getCanUseSkuList();
 
-    // 判断所有规格大类是否选择完成
-    if (chooseSkuId.length == state.skuList.length && newPrice.length) {
-      newPrice[0].goods_num = state.selectedSkuPrice.goods_num || 1;
-      state.selectedSkuPrice = newPrice[0];
+    // 判断所有 property 大类是否选择完成
+    if (choosePropertyId.length === propertyList.length && newSkuList.length) {
+      newSkuList[0].goods_num = state.selectedSku.goods_num || 1;
+      state.selectedSku = newSkuList[0];
     } else {
-      state.selectedSkuPrice = {};
+      state.selectedSku = {};
     }
 
-    // 改变规格项禁用状态
-    changeDisabled(isChecked, pid, skuId);
+    // 改变 property 禁用状态
+    changeDisabled(isChecked, propertyId, valueId);
   };
 
   changeDisabled(false);
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index eb13a471..22b09e29 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -74,7 +74,7 @@ const VIDEO_SUFFIX_LIST = ['.avi', '.mp4']
  * @return {{src: string, type: 'video' | 'image' }[]}  转换后的链接列表
  */
 export function formatGoodsSwiper(urlList) {
-  return urlList.map((url, key) => {
+  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);
@@ -367,4 +367,4 @@ export function convertProductPropertyList(skus) {
     }
   }
   return result;
-}
\ No newline at end of file
+}
diff --git a/sheep/platform/share.js b/sheep/platform/share.js
index d6d96073..644bcefe 100644
--- a/sheep/platform/share.js
+++ b/sheep/platform/share.js
@@ -136,8 +136,7 @@ const decryptSpm = (spm) => {
       shareParams.page = '/pages/goods/seckill';
       query = shareParamsArray[2].split(',');
       shareParams.query = {
-        id: query[0],
-        activity_id: query[1],
+        id: query[1],
       };
       break;
     case '5':