From a18bd4f01a5ef16ba996d99de58764be51c5fe49 Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Sat, 12 Oct 2024 17:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E4=B8=8E=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=A4=E6=96=AD=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E8=B6=85=E5=87=BA=E9=99=90=E8=B4=AD=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/seckill/list.vue                       |  2 +-
 pages/goods/groupon.vue                               |  5 +++--
 pages/goods/seckill.vue                               |  7 +++++--
 sheep/components/s-block-item/s-block-item.vue        |  2 +-
 .../s-select-groupon-sku/s-select-groupon-sku.vue     | 11 ++++++++---
 .../s-select-seckill-sku/s-select-seckill-sku.vue     |  7 ++++++-
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue
index 49fe147..81edf7c 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -264,7 +264,7 @@
 
   // 时间段轮播图
   .header {
-    width: 710rpx;
+    width: 100%;
     height: 330rpx;
     margin: 0 auto 0 auto;
     border-radius: 14rpx;
diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index d384eb2..93a7441 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -90,7 +90,7 @@
 					</view>
 
 					<!-- 规格与数量弹框 -->
-					<s-select-groupon-sku :show="state.showSelectSku" :goodsInfo="state.goodsInfo"
+					<s-select-groupon-sku :activity="state.activity" :show="state.showSelectSku" :goodsInfo="state.goodsInfo"
 						:grouponAction="state.grouponAction" :grouponNum="state.grouponNum" @buy="onBuy"
 						@change="onSkuChange" @close="onSkuClose" />
 				</view>
@@ -115,7 +115,7 @@
 				  state.activity.status === 0 && state.goodsInfo.stock !== 0
 				    ? 'check-btn-box'
 				    : 'disabled-btn-box'
-				" :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0">
+				" :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0 || state.activity.remainingPurchases == 0"">
 							<view class="btn-price">{{
 				  fen2yuan(state.activity.price || state.goodsInfo.price)
 				}}</view>
@@ -263,6 +263,7 @@
 			data: activity
 		} = await CombinationApi.getCombinationActivity(state.grouponId);
 		state.activity = activity;
+		// console.log(activity,"activity")
 		// 加载商品信息
 		const {
 			data: spu
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index e9ca676..be78f9d 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -68,7 +68,7 @@
 							<detail-cell-sku :sku="state.selectedSku" @tap="state.showSelectSku = true" />
 						</view>
 						<!-- 规格与数量弹框 -->
-						<s-select-seckill-sku v-model="state.goodsInfo" :show="state.showSelectSku"
+						<s-select-seckill-sku :activity="activity" v-model="state.goodsInfo" :show="state.showSelectSku"
 							:single-limit-count="activity.singleLimitCount" @buy="onBuy" @change="onSkuChange"
 							@close="state.showSelectSku = false" />
 
@@ -102,14 +102,16 @@
 								  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 || activity.remainingPurchases == 0">
 									<view class="btn-price">{{ fen2yuan(state.goodsInfo.price) }}</view>
 									<view v-if="timeStatusEnum === TimeStatusEnum.STARTED">
 										<view v-if="state.goodsInfo.stock === 0">已售罄</view>
+										<!-- <view v-else-if=" activity.remainingPurchases == 0">立即秒杀</view> -->
 										<view v-else>立即秒杀</view>
 									</view>
 									<view v-else>{{ timeStatusEnum }}</view>
 								</button>
+								<!-- {{timeStatusEnum}}---{{TimeStatusEnum.STARTED}} -->
 							</view>
 						</detail-tabbar>
 					</view>
@@ -223,6 +225,7 @@
 			data
 		} = await SeckillApi.getSeckillActivity(id);
 		activity.value = data;
+		// console.log(activity.value,"activity.value")
 		timeStatusEnum.value = getTimeStatusEnum(activity.startTime, activity.endTime);
 
 		// 查询商品
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 572959a..85a3af3 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -81,7 +81,7 @@
 		<!-- 用户组件：用户订单 -->
 		<s-order-card v-if="type === 'UserOrder'" :data="data" />
 		<!-- 用户组件：用户资产 -->
-		<s-wallet-card v-if="type === 'UserWallet'" />
+		<s-wallet-card v-if="type === 'UserCard'" />
 		<!-- 用户组件：用户卡券 -->
 		<s-coupon-card v-if="type === 'UserCoupon'" />
 	</view>
diff --git a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
index ebfded8..fcb6672 100644
--- a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
+++ b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
@@ -65,7 +65,7 @@
             <view class="label-text">购买数量</view>
             <su-number-box
               :min="1"
-              :max="state.selectedSku.stock"
+              :max="min([skuList[0].stock,activity.singleLimitCount,activity.remainingPurchases])"
               :step="1"
               v-model="state.selectedSku.count"
               @change="onNumberChange($event)"
@@ -97,6 +97,7 @@
 <script setup>
   import { computed, reactive, watch } from 'vue';
   import sheep from '@/sheep';
+  import { isEmpty, min } from 'lodash-es';
   import { convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
 
   const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-btn-long.png');
@@ -118,6 +119,10 @@
       type: [Number, String],
       default: 0,
     },
+	activity:{
+		type: Array,
+		default: 0,
+	}
   });
   const state = reactive({
     selectedSku: {}, // 选中的 SKU
@@ -133,6 +138,7 @@
     for (let price of skuPrices) {
       price.value_id_array = price.properties.map((item) => item.valueId);
     }
+	console.log(props.activity,"skuPrices")
     return skuPrices;
   });
 
@@ -152,8 +158,8 @@
     if (e === 0) return;
     if (state.selectedSku.count === e) return;
     state.selectedSku.count = e;
+	console.log(state.selectedSku)
   }
-
   // 点击购买
   function onBuy() {
     if (!state.selectedSku.id || state.selectedSku.id <= 0) {
@@ -166,7 +172,6 @@
     }
     emits('buy', state.selectedSku);
   }
-
   // 改变禁用状态：计算每个 property 属性值的按钮，是否禁用
   function changeDisabled(isChecked = false, propertyId = 0, valueId = 0) {
     let newSkus = []; // 所有可以选择的 sku 数组
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 1233cbf..05b85c2 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
@@ -75,7 +75,7 @@
             <view class="label-text">购买数量</view>
             <su-number-box
               :min="1"
-              :max="min([singleLimitCount, state.selectedSku.stock])"
+              :max="min([skuList[0].stock,activity.singleLimitCount,activity.remainingPurchases])"
               :step="1"
               v-model="state.selectedSku.count"
               @change="onBuyCountChange($event)"
@@ -122,12 +122,17 @@
       type: Number,
       default: 1,
     },
+	activity:{
+		type: Array,
+		default: 0,
+	}
   });
   const state = reactive({
     goodsInfo: computed(() => props.modelValue),
     selectedSku: {},
     currentPropertyArray: [],
   });
+  // console.log(props.activity,"activity");
   const getShowPriceText = computed(() => {
     let priceText = `￥${fen2yuan(state.goodsInfo.price)}`;
     if (!isEmpty(state.selectedSku)) {