yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

拼团：修复部分字段读取不对的问题

pull/5/head
YunaiV 2023-10-07 22:48:39 +08:00
parent 52b8033e2d
commit 8d1cb7c4de
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pages/activity/goods_bargain_details/index.vue
View File

@ -461,7 +461,6 @@
* 去支付 * 去支付
*/ */
goConfirm() { goConfirm() {
// TODO 芋艿：目前跳转不合理,应该跳转到支付界面
uni.navigateTo({ uni.navigateTo({
url: `/pages/activity/bargain/index` url: `/pages/activity/bargain/index`
}) })

18
pages/activity/goods_combination_details/index.vue
View File

@ -459,16 +459,18 @@
}, 0); }, 0);
// 计算活动状态 // 计算活动状态
const now = new Date().getTime(); const now = new Date().getTime();
if (this.activity.status !== 0) { if (this.activity.status === 0) {
if (this.activity.startTime > now) { if (this.activity.status === 1) {
this.status = 1; this.status = 0;
} else if (now <= this.activity.endTime) {
this.status = 2;
} else { } 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 => { CombinationApi.getHeadCombinationRecordList(this.id, 1).then(res => {

2
pages/activity/goods_combination_status/index.vue
View File

@ -100,7 +100,7 @@
<div class="item" v-for="(item, index) in storeCombinationHost" :key="index" @click="goDetail(item.id)"> <div class="item" v-for="(item, index) in storeCombinationHost" :key="index" @click="goDetail(item.id)">
<div class="pictrue"> <div class="pictrue">
<img :src="item.picUrl" /> <img :src="item.picUrl" />
<div class="team" v-text="(item.userSize - item.userCount) + '人团'"></div> <div class="team" v-text="(item.userSize) + '人团'"></div>
</div> </div>
<div class="name line1" v-text="item.spuName"></div> <div class="name line1" v-text="item.spuName"></div>
<div class="money font-color-red" v-text="'￥' + fen2yuan(item.combinationPrice)"></div> <div class="money font-color-red" v-text="'￥' + fen2yuan(item.combinationPrice)"></div>

10
pages/users/order_confirm/index.vue
View File

@ -113,7 +113,7 @@
<view>商品总价：</view> <view>商品总价：</view>
<view class='money'>￥{{ fen2yuan(orderInfoVo.price.totalPrice || 0 ) }}</view> <view class='money'>￥{{ fen2yuan(orderInfoVo.price.totalPrice || 0 ) }}</view>
</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>订单优惠：</view>
<view class='money'>-￥{{ fen2yuan(orderInfoVo.price.discountPrice) }}</view> <view class='money'>-￥{{ fen2yuan(orderInfoVo.price.discountPrice) }}</view>
</view> </view>
@ -190,9 +190,9 @@
}, },
mark: '', // 备注信息 mark: '', // 备注信息
bargainRecordId: false, // 是否是砍价 bargainRecordId: undefined, // 是否是砍价
combination: false, // 是否是拼团 seckillActivityId: undefined, // 是否是秒杀
seckillActivityId: false, // 是否是秒杀 combinationActivityId: undefined, // 是否是拼团
// ========== 积分 ========== // ========== 积分 ==========
pointStatus: false, //是否使用积分 pointStatus: false, //是否使用积分
@ -255,6 +255,7 @@
} }
this.seckillActivityId = options.seckillActivityId; this.seckillActivityId = options.seckillActivityId;
this.bargainRecordId = options.bargainRecordId; this.bargainRecordId = options.bargainRecordId;
this.combinationActivityId = options.combinationActivityId;
this.getloadPreOrder(); this.getloadPreOrder();
// 处理 address 地址 // 处理 address 地址
@ -370,6 +371,7 @@
pointStatus: this.pointStatus, pointStatus: this.pointStatus,
seckillActivityId: this.seckillActivityId, seckillActivityId: this.seckillActivityId,
bargainRecordId: this.bargainRecordId, bargainRecordId: this.bargainRecordId,
combinationActivityId: this.combinationActivityId,
// TODO 芋艿：秒杀等等 // TODO 芋艿：秒杀等等
} }
}, },