diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue index 15263ca..b36aa21 100644 --- a/package1/buyFood/buyFood.vue +++ b/package1/buyFood/buyFood.vue @@ -434,6 +434,7 @@ } if (option.item) { this.groupItem = JSON.parse(decodeURIComponent(option.item)); + console.log("1111111",this.groupItem) this.isGroupBuy = this.groupItem.orderType === 2; this.isFaceToFace = this.groupItem.isFaceToFace || false; } @@ -714,10 +715,10 @@ } else { let isInitiating = !this.groupItem.groupId; let isJoining = !!this.groupItem.groupId; - if (isInitiating) { this.isPaymentSuccessGroupInitiate = true; this.$refs.pintuanPopup.open('center'); + return; } else if (isJoining) { uni.redirectTo({ url: '/package1/order/orderDetail?id=' + this.currentOrderId @@ -726,9 +727,11 @@ } }, onPintuanPopupChange(e) { - uni.redirectTo({ - url: '/package1/order/orderDetail?id=' + this.currentOrderId - }); + if(!e.show){ + uni.redirectTo({ + url: '/package1/order/orderDetail?id=' + this.currentOrderId + }); + } }, getMustFinishTime() { if (!this.formData.deliveryTime || this.formData.deliveryTime === '自动送达' || this.formData.deliveryTime === diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue index 21ad1fd..04a5458 100644 --- a/package1/group/groupBuySingle.vue +++ b/package1/group/groupBuySingle.vue @@ -513,7 +513,7 @@ menuButtonInfo: {}, groupdeliveryType:'', isPintuan: true, - groupId: '', + groupId: null, isFaceToFaceGroup: false, targetMembers: 2, backendTotalAmount: 0, @@ -966,7 +966,6 @@ this.currentItem.moreBuyData.push(this.moreBuyData[i]) } } - let goData = { item: this.currentItem, groupRule: this.selectedGroupRule,