diff --git a/api/promotion/bargain.js b/api/promotion/bargain.js index 743f56c2..5ec2f7a2 100644 --- a/api/promotion/bargain.js +++ b/api/promotion/bargain.js @@ -44,8 +44,8 @@ export function getBargainRecordPage(data) { // 获得砍价活动详情 export function getBargainRecordDetail(id, activityId) { return request.get("app-api/promotion/bargain-record/get-detail", { - id, - activityId + id: id > 0 ? id : undefined, + activityId: activityId > 0 ? activityId : undefined }, { noAuth: true // TODO 芋艿:后续要做调整 }); diff --git a/pages/activity/bargain/index.vue b/pages/activity/bargain/index.vue index e58abe5b..9568df0c 100644 --- a/pages/activity/bargain/index.vue +++ b/pages/activity/bargain/index.vue @@ -27,10 +27,10 @@
去下单
-
+
去付款
-
+
继续砍价
@@ -146,9 +146,9 @@ /** * 前往砍价记录的详情 */ - goDetail: function(id) { + goDetail: function(id, activityId) { 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) { - const returnUrl = encodeURIComponent('/pages/activity/bargain/index'); + goPay: function (orderId, payOrderId) { + const returnUrl = encodeURIComponent('/pages/order_pay_status/index?order_id=' + orderId); uni.navigateTo({ url: `/pages/goods/cashier/index?order_id=${payOrderId}&returnUrl=${returnUrl}` }); diff --git a/pages/activity/goods_bargain_details/index.vue b/pages/activity/goods_bargain_details/index.vue index 1b9f4e7b..53c11a30 100644 --- a/pages/activity/goods_bargain_details/index.vue +++ b/pages/activity/goods_bargain_details/index.vue @@ -465,6 +465,12 @@ uni.navigateTo({ 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() { - BargainApi.getBargainRecordDetail(this.bargainId, this.id).then(res => { + BargainApi.getBargainRecordDetail(this.storeBargainId, this.id).then(res => { const bargainUserInfo = res.data; this.bargainUserInfo = bargainUserInfo; this.action = this.calculateAction(bargainUserInfo);