From cab431c25ed0c3a7476b6d169eb5bcc3307d02e0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 5 Oct 2023 17:22:38 +0800
Subject: [PATCH] =?UTF-8?q?trade=EF=BC=9A=E5=AE=8C=E5=96=84=E7=A0=8D?=
 =?UTF-8?q?=E4=BB=B7=E7=9A=84=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/bargain/index.vue              |  4 ++--
 pages/activity/goods_bargain/index.vue        |  6 +++---
 .../activity/goods_seckill_details/index.vue  | 20 ++++++++++---------
 pages/index/components/c_bargain.vue          |  4 +++-
 pages/users/order_confirm/index.vue           | 13 +++++++++---
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/pages/activity/bargain/index.vue b/pages/activity/bargain/index.vue
index 923cb7c7..c285399f 100644
--- a/pages/activity/bargain/index.vue
+++ b/pages/activity/bargain/index.vue
@@ -11,11 +11,11 @@
 							<div class="line1" style="width: 100%;">{{ item.activityName }}</div>
 							<count-down :justify-left="'justify-content:left'" :bgColor="bgColor" :is-day="true" :tip-text="'倒计时 '" :day-text="'天'"
 							 :hour-text="' 时 '" :minute-text="' 分 '"
-							 :second-text="' 秒 '" :datatime="item.expireTime / 1000" v-if="item.status === 1"></count-down>
+							 :second-text="' 秒 '" :datatime="item.endTime / 1000" v-if="item.status === 1"></count-down>
 							<div class="successTxt font-color-red" v-else-if="item.status === 2">砍价成功</div>
 							<div class="endTxt" v-else>活动已结束</div>
 							<div class="money">
-								已砍至<span class="symbol font-color-red">￥</span><span class="num font-color-red">{{ fen2yuan(item.payPrice) }}</span>
+								已砍至<span class="symbol font-color-red">￥</span><span class="num font-color-red">{{ fen2yuan(item.bargainPrice) }}</span>
 							</div>
 						</div>
 					</div>
diff --git a/pages/activity/goods_bargain/index.vue b/pages/activity/goods_bargain/index.vue
index 00393844..e44b60f9 100644
--- a/pages/activity/goods_bargain/index.vue
+++ b/pages/activity/goods_bargain/index.vue
@@ -46,7 +46,7 @@
 							<view v-if="item.stock === 0">
 								<view style="font-size: 22rpx;" @tap="openSubscribe('/pages/activity/goods_bargain_details/index?id='+ item.id +'&startBargainUid='+ uid)">已售罄</view>
 							</view>
-							<view class='money font-color'>最低: ￥<text class='price'>{{ fen2yuan(item.bargainPrice) }}</text></view>
+							<view class='money font-color'>最低: ￥<text class='price'>{{ fen2yuan(item.bargainMinPrice) }}</text></view>
 						</view>
 						<view v-if="item.stock > 0" class='cutBnt bg-color'>参与砍价</view>
 						<view v-if="item.stock === 0" class='cutBnt bg-color-hui'>已售罄</view>
@@ -130,8 +130,8 @@
        */
 			getBargainHeader: function() {
         BargainApi.getBargainRecordSummary().then(res => {
-          this.bargainTotal = res.data.userCount;
-          this.bargainSuccessList = res.data.successRecords;
+          this.bargainTotal = res.data.successUserCount;
+          this.bargainSuccessList = res.data.successList;
         }).catch(err => {
           return this.$util.Tips({
             title: err
diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue
index 74fde159..c9327f2e 100644
--- a/pages/activity/goods_seckill_details/index.vue
+++ b/pages/activity/goods_seckill_details/index.vue
@@ -373,17 +373,19 @@
         SeckillApi.getSeckillActivity(this.id).then(res => {
           this.activity = res.data;
           // 计算活动状态
-          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) {
+            const now = new Date().getTime();
+            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;
           }
 
           // 获得商品详情
diff --git a/pages/index/components/c_bargain.vue b/pages/index/components/c_bargain.vue
index 3b72b981..b233d5d6 100644
--- a/pages/index/components/c_bargain.vue
+++ b/pages/index/components/c_bargain.vue
@@ -16,7 +16,9 @@
 							</view>
 							<view class="text lines1">
 								<view class="name line1">{{ item.name }}</view>
-								<view class="money">¥<text class="num">{{ fen2yuan(item.bargainPrice) }}</text></view>
+								<view class="money">
+                  ¥<text class="num">{{ fen2yuan(item.bargainMinPrice) }}</text>
+                </view>
 								<view class="btn">参与砍价</view>
 							</view>
 						</view>
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index f8a49665..9f3204d0 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -113,6 +113,10 @@
 						<view>商品总价：</view>
 						<view class='money'>￥{{ fen2yuan(orderInfoVo.price.totalPrice || 0 ) }}</view>
 					</view>
+          <view class='item acea-row row-between-wrapper'>
+            <view>订单优惠：</view>
+            <view class='money'>-￥{{ fen2yuan(orderInfoVo.price.discountPrice) }}</view>
+          </view>
 					<view class='item acea-row row-between-wrapper' v-if="orderInfoVo.price.couponPrice > 0">
 						<view>优惠券抵扣：</view>
 						<view class='money'>-￥{{ fen2yuan(orderInfoVo.price.couponPrice) }}</view>
@@ -169,7 +173,6 @@
 	import { toLogin } from '@/libs/login.js';
 	import { mapGetters } from "vuex";
   import * as Util from '@/utils/util.js';
-  import {getTradeConfig} from "../../../api/trade/config";
   export default {
 		components: {
 			couponListWindow,
@@ -187,9 +190,9 @@
         },
         mark: '', // 备注信息
 
-				bargain: false, // 是否是砍价
+				bargainRecordId: false, // 是否是砍价
 				combination: false, // 是否是拼团
-				secKill: false, // 是否是秒杀
+				seckillActivityId: false, // 是否是秒杀
 
         // ========== 积分 ==========
         pointStatus: false, //是否使用积分
@@ -250,6 +253,8 @@
           count: options.count | 1
         }]
       }
+      this.seckillActivityId = options.seckillActivityId;
+      this.bargainRecordId = options.bargainRecordId;
       this.getloadPreOrder();
 
       // 处理 address 地址
@@ -363,6 +368,8 @@
           receiverMobile: this.deliveryType === 2 ? this.contactsTel : undefined,
           couponId: this.couponId > 0 ? this.couponId : undefined,
           pointStatus: this.pointStatus,
+          seckillActivityId: this.seckillActivityId,
+          bargainRecordId: this.bargainRecordId,
           // TODO 芋艿：秒杀等等
         }
       },