diff --git a/manifest.json b/manifest.json index 87fc739..5d0a1cc 100644 --- a/manifest.json +++ b/manifest.json @@ -146,9 +146,9 @@ "version" : "1.1.10", "provider" : "wx2b03c6e691cd7370" } - // #endif } }, + // #endif "mp-alipay" : { "usingComponents" : true }, diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue index e574c50..7794230 100644 --- a/pages/activity/DargainDetails/index.vue +++ b/pages/activity/DargainDetails/index.vue @@ -55,8 +55,8 @@ - 砍价成功 - + 砍价成功 + @@ -267,15 +267,15 @@ // 查看商品 openAlone: function () { this.$yrouter.push({ - path: "/detail/" + this.bargain.productId + path: "/detail/" + this.goodsDetail.productId }); }, // 砍价完成,去支付 goPay: function () { var data = {}; var that = this; - data.productId = that.bargain.productId; - data.cartNum = that.bargain.num; + data.productId = that.goodsDetail.productId; + data.cartNum = that.goodsDetail.num; data.uniqueId = ""; data.bargainId = that.bargainId; data.new = 1; @@ -379,7 +379,7 @@ getBargainHelp: function () { var that = this; if ( - this.bargainHelpCount.remainingPrice === 0 && + this.bargainHelpCount.price === 0 && that.bargainUid !== that.userInfo.uid ) { return uni.showToast({ @@ -478,7 +478,7 @@ bargainUserUid: this.bargainUid }) .then(res => { - // 剩余砍价金额 = 商品价格 - 已经砍掉的金额 + // 剩余砍价金额,显示已砍至¥** 使用 = 商品价格 - 已经砍掉的金额 let remainingPrice = (this.goodsDetail.price - res.data.alreadyPrice).toFixed(2) this.bargainHelpCount = { ...res.data, @@ -514,7 +514,7 @@ if ( this.bargainUid === this.userInfo.uid && this.bargainHelpCount.status == 1 && - this.bargainHelpCount.remainingPrice > 0 + this.bargainHelpCount.price > 0 ) { this.inviteFriends = true } else { @@ -526,7 +526,7 @@ this.bargainUid != this.userInfo.uid && this.bargainHelpCount.status == 1 && // this.bargainHelpCount.userBargainStatus && - this.bargainHelpCount.remainingPrice > 0 + this.bargainHelpCount.price > 0 ) { this.helpFriendsBargain = true } else { @@ -537,7 +537,7 @@ if ( this.bargainUid === this.userInfo.uid && this.bargainHelpCount.status == 1 && - this.bargainHelpCount.remainingPrice <= 0 + this.bargainHelpCount.price <= 0 ) { this.pay = true } else { diff --git a/unpackage/debug/.ios.ins b/unpackage/debug/.ios.ins new file mode 100644 index 0000000..3b526db --- /dev/null +++ b/unpackage/debug/.ios.ins @@ -0,0 +1 @@ +forceInstall \ No newline at end of file diff --git a/unpackage/debug/iOS_debug.ipa b/unpackage/debug/iOS_debug.ipa new file mode 100644 index 0000000..f8b51d1 Binary files /dev/null and b/unpackage/debug/iOS_debug.ipa differ