From 8d1cb7c4ded1f0b105a68e92fb0d56cc6c82d75a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 7 Oct 2023 22:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E8=AF=BB=E5=8F=96=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/goods_bargain_details/index.vue |  1 -
 .../goods_combination_details/index.vue        | 18 ++++++++++--------
 .../goods_combination_status/index.vue         |  2 +-
 pages/users/order_confirm/index.vue            | 10 ++++++----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pages/activity/goods_bargain_details/index.vue b/pages/activity/goods_bargain_details/index.vue
index 53c11a30..5f651dac 100644
--- a/pages/activity/goods_bargain_details/index.vue
+++ b/pages/activity/goods_bargain_details/index.vue
@@ -461,7 +461,6 @@
        * 去支付
        */
       goConfirm() {
-        // TODO 芋艿：目前跳转不合理,应该跳转到支付界面
         uni.navigateTo({
           url: `/pages/activity/bargain/index`
         })
diff --git a/pages/activity/goods_combination_details/index.vue b/pages/activity/goods_combination_details/index.vue
index 664b7f71..7b333bed 100644
--- a/pages/activity/goods_combination_details/index.vue
+++ b/pages/activity/goods_combination_details/index.vue
@@ -459,16 +459,18 @@
           }, 0);
           // 计算活动状态
           const now = new Date().getTime();
-          if (this.activity.status !== 0) {
-            if (this.activity.startTime > now) {
-              this.status = 1;
-            } else if (now <= this.activity.endTime) {
-              this.status = 2;
+          if (this.activity.status === 0) {
+            if (this.activity.status === 1) {
+              this.status = 0;
             } else {
-              this.status = 3;
+              if (this.activity.startTime > now) {
+                this.status = 1;
+              } else if (now <= this.activity.endTime) {
+                this.status = 2;
+              } else {
+                this.status = 3;
+              }
             }
-          } else {
-            this.status = 0;
           }
           // 参团记录
           CombinationApi.getHeadCombinationRecordList(this.id, 1).then(res => {
diff --git a/pages/activity/goods_combination_status/index.vue b/pages/activity/goods_combination_status/index.vue
index 8e93c577..09b5ed98 100644
--- a/pages/activity/goods_combination_status/index.vue
+++ b/pages/activity/goods_combination_status/index.vue
@@ -100,7 +100,7 @@
 				<div class="item" v-for="(item, index) in storeCombinationHost" :key="index" @click="goDetail(item.id)">
 					<div class="pictrue">
 						<img :src="item.picUrl" />
-						<div class="team" v-text="(item.userSize - item.userCount) + '人团'"></div>
+						<div class="team" v-text="(item.userSize) + '人团'"></div>
 					</div>
 					<div class="name line1" v-text="item.spuName"></div>
 					<div class="money font-color-red" v-text="'￥' + fen2yuan(item.combinationPrice)"></div>
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 9f3204d0..94bc0fdb 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -113,7 +113,7 @@
 						<view>商品总价：</view>
 						<view class='money'>￥{{ fen2yuan(orderInfoVo.price.totalPrice || 0 ) }}</view>
 					</view>
-          <view class='item acea-row row-between-wrapper'>
+          <view class='item acea-row row-between-wrapper' v-if="orderInfoVo.price.discountPrice > 0">
             <view>订单优惠：</view>
             <view class='money'>-￥{{ fen2yuan(orderInfoVo.price.discountPrice) }}</view>
           </view>
@@ -190,9 +190,9 @@
         },
         mark: '', // 备注信息
 
-				bargainRecordId: false, // 是否是砍价
-				combination: false, // 是否是拼团
-				seckillActivityId: false, // 是否是秒杀
+				bargainRecordId: undefined, // 是否是砍价
+				seckillActivityId: undefined, // 是否是秒杀
+        combinationActivityId: undefined, // 是否是拼团
 
         // ========== 积分 ==========
         pointStatus: false, //是否使用积分
@@ -255,6 +255,7 @@
       }
       this.seckillActivityId = options.seckillActivityId;
       this.bargainRecordId = options.bargainRecordId;
+      this.combinationActivityId = options.combinationActivityId;
       this.getloadPreOrder();
 
       // 处理 address 地址
@@ -370,6 +371,7 @@
           pointStatus: this.pointStatus,
           seckillActivityId: this.seckillActivityId,
           bargainRecordId: this.bargainRecordId,
+          combinationActivityId: this.combinationActivityId,
           // TODO 芋艿：秒杀等等
         }
       },