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

promotion：基本完善完砍价逻辑

pull/5/head
YunaiV 2023-10-06 10:18:05 +08:00
parent 7e55249b79
commit 52b8033e2d
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/promotion/bargain.js
View File

@ -44,8 +44,8 @@ export function getBargainRecordPage(data) {
// 获得砍价活动详情 // 获得砍价活动详情
export function getBargainRecordDetail(id, activityId) { export function getBargainRecordDetail(id, activityId) {
return request.get("app-api/promotion/bargain-record/get-detail", { return request.get("app-api/promotion/bargain-record/get-detail", {
id, id: id > 0 ? id : undefined,
activityId activityId: activityId > 0 ? activityId : undefined
}, { }, {
noAuth: true // TODO 芋艿：后续要做调整 noAuth: true // TODO 芋艿：后续要做调整
}); });

12
pages/activity/bargain/index.vue
View File

@ -27,10 +27,10 @@
<div class="bnt bg-color-red" v-if="item.status === 2 && !item.orderId" @click="goConfirm(item)"> <div class="bnt bg-color-red" v-if="item.status === 2 && !item.orderId" @click="goConfirm(item)">
去下单 去下单
</div> </div>
<div class="bnt bg-color-red" v-if="item.status === 2 && item.orderId && !item.payStatus" @click="goPay(item.payOrderId)"> <div class="bnt bg-color-red" v-if="item.status === 2 && item.orderId && !item.payStatus" @click="goPay(item.orderId, item.payOrderId)">
去付款 去付款
</div> </div>
<div class="bnt bg-color-red" v-if="item.status === 1" @click="goDetail(item.id)"> <div class="bnt bg-color-red" v-if="item.status === 1" @click="goDetail(item.id, item.activityId)">
继续砍价 继续砍价
</div> </div>
<div class="bnt bg-color-red" v-if="item.status === 3" @click="goList"> <div class="bnt bg-color-red" v-if="item.status === 3" @click="goList">
@ -146,9 +146,9 @@
/** /**
* 前往砍价记录的详情 * 前往砍价记录的详情
*/ */
goDetail: function(id) { goDetail: function(id, activityId) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/activity/goods_bargain_details/index?id=${id}&startBargainUid=${this.uid}` url: `/pages/activity/goods_bargain_details/index?id=${activityId}&startBargainUid=${this.uid}&storeBargainId=${id}`
}) })
}, },
/** /**
@ -183,8 +183,8 @@
/** /**
* 打开支付组件 * 打开支付组件
*/ */
goPay: function (payOrderId) { goPay: function (orderId, payOrderId) {
const returnUrl = encodeURIComponent('/pages/activity/bargain/index'); const returnUrl = encodeURIComponent('/pages/order_pay_status/index?order_id=' + orderId);
uni.navigateTo({ uni.navigateTo({
url: `/pages/goods/cashier/index?order_id=${payOrderId}&returnUrl=${returnUrl}` url: `/pages/goods/cashier/index?order_id=${payOrderId}&returnUrl=${returnUrl}`
}); });

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

@ -465,6 +465,12 @@
uni.navigateTo({ uni.navigateTo({
url: `/pages/activity/bargain/index` url: `/pages/activity/bargain/index`
}) })
// 下单界面
const returnUrl = encodeURIComponent('/pages/order_pay_status/index?order_id=' + this.bargainUserInfo.orderId);
uni.navigateTo({
url: `/pages/goods/cashier/index?order_id=${this.bargainUserInfo.payOrderId}&returnUrl=${returnUrl}`
});
}, },
// ========== 砍价记录 ========== // ========== 砍价记录 ==========
@ -473,7 +479,7 @@
* 获得拼团记录 * 获得拼团记录
*/ */
gobargainUserInfo: function() { gobargainUserInfo: function() {
BargainApi.getBargainRecordDetail(this.bargainId, this.id).then(res => { BargainApi.getBargainRecordDetail(this.storeBargainId, this.id).then(res => {
const bargainUserInfo = res.data; const bargainUserInfo = res.data;
this.bargainUserInfo = bargainUserInfo; this.bargainUserInfo = bargainUserInfo;
this.action = this.calculateAction(bargainUserInfo); this.action = this.calculateAction(bargainUserInfo);