From 582c995ff6e6f2db487c3ce36e02a03532bf53da Mon Sep 17 00:00:00 2001
From: ldh <ldh@ldhmbp2.local>
Date: Mon, 6 Feb 2023 18:43:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=98=B6=E6=A2=AF=E6=8B=BC=E5=9B=A2\?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8B=BC=E5=9B=A2\=E5=8F=82=E4=B8=8E?=
 =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E9=80=89=E6=8B=A9=E5=9B=A2=E4=BA=BA=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/groupon.vue                           |  9 +++++----
 .../s-select-groupon-sku/s-select-groupon-sku.vue | 15 ++++++---------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 20372c00..051b71b1 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -116,7 +116,7 @@
           :show="state.showSelectSku"
           :goodsInfo="state.goodsInfo"
           :grouponAction="state.grouponAction"
-          :grouponNum="state.defaultGrouponNum"
+          :grouponNum="state.grouponNum"
           @buy="onBuy"
           @ladder="onLadder"
           @change="onSkuChange"
@@ -208,7 +208,6 @@
     selectedSkuPrice: {},   // 选中的规格价格
     grouponId: 0,           // 团购ID
     grouponType: '',        // 团购类型
-    defaultGrouponNum: 0,   // 默认团购人数
     grouponNum: 0,          // 团购人数
     grouponAction: 'create',  // 团购操作  
   });
@@ -242,7 +241,11 @@
 
   // 阶梯变更
   function onLadder(e) {
+    state.showSelectSku = false;
     state.grouponNum = e
+    setTimeout(() => {
+      state.showSelectSku = true;
+    }, 80);
   }
 
   function onSkuClose() {
@@ -260,7 +263,6 @@
   function onJoinGroupon(groupon) {
     state.grouponAction = 'join';
     state.grouponId = groupon.id;
-    state.defaultGrouponNum = groupon.num;
     state.grouponNum = groupon.num;
     state.showSelectSku = true;
   }
@@ -323,7 +325,6 @@
       state.goodsInfo = data;
       state.grouponType = state.goodsInfo.activity_type;
       if (state.grouponType === 'groupon') {
-        state.defaultGrouponNum = state.goodsInfo.activity.rules.team_num;
         state.grouponNum = state.goodsInfo.activity.rules.team_num;
       }
       state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.images);
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 c67e54aa..4ea32810 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
@@ -49,7 +49,7 @@
                 class="ss-reset-button spec-btn"
                 :class="[
                   {
-                    'checked-btn': state.grouponNum == ladder,
+                    'checked-btn': grouponNum == ladder,
                   },
                 ]"
                 @tap="onSelectLadder(ladder)"
@@ -97,7 +97,7 @@
           <view class="ss-flex">
             <button class="ss-reset-button origin-price-btn ss-flex-col">
               <view class="btn-title">{{
-                state.grouponNum === 0 ? '阶梯团' : state.grouponNum + '人团'
+                grouponNum === 0 ? '阶梯团' : grouponNum + '人团'
               }}</view>
             </button>
             <button class="ss-reset-button btn-tox ss-flex-col" @tap="onBuy">
@@ -184,11 +184,9 @@
   // 规格价格
   const goodsPrice = computed(() => {
     if (isEmpty(state.selectedSkuPrice)) {
-      console.log(222);
       return formatPrice(props.goodsInfo.price);
     }
-    if (state.grouponNum === 0 && activityType === 'groupon_ladder') {
-      console.log(1111);
+    if (props.grouponNum === 0 && activityType === 'groupon_ladder') {
       return formatPrice(props.goodsInfo.price);
     }
 
@@ -208,7 +206,7 @@
       return formatPrice(props.goodsInfo.price);
     }
 
-    if (state.grouponNum === 0 && activityType === 'groupon_ladder') {
+    if (props.grouponNum === 0 && activityType === 'groupon_ladder') {
       return formatPrice(props.goodsInfo.price);
     }
 
@@ -223,7 +221,7 @@
 
   // 获取阶梯价
   function getSkuPriceByLadder() {
-    return state.selectedSkuPrice.ladders.find((item) => item.ladder == state.grouponNum);
+    return state.selectedSkuPrice.ladders.find((item) => item.ladder == props.grouponNum);
   }
 
   watch(
@@ -359,14 +357,13 @@
 
   // 选择阶梯拼团人数
   function onSelectLadder(ladder) {
-    state.grouponNum = ladder;
     emits('ladder', ladder);
   }
 
   // 选择规格
   function onSelectSku(pid, skuId) {
     // 清空已选择
-    if (activityType === 'groupon_ladder' && state.grouponNum == 0) {
+    if (activityType === 'groupon_ladder' && props.grouponNum == 0) {
       sheep.$helper.toast('请选择拼团人数');
       return;
     }