|
|
@@ -135,8 +135,8 @@
|
|
|
<RedemptionRules ref="redemptionRulesRef"></RedemptionRules>
|
|
|
</u-popup>
|
|
|
<u-popup :z-index="999" :show="selectProductShowPopup" mode="bottom" round="10">
|
|
|
- <SelectProduct :redeemNowBtnDisable="redeemNowBtnDisable" :params="params" ref="selectProductRef" :defaultAddress="defaultAddress"
|
|
|
- @redeemNowFun="redeemNowFun" @closeSelectProduct="closeSelectProduct">
|
|
|
+ <SelectProduct :redeemNowBtnDisable="redeemNowBtnDisable" :params="params" ref="selectProductRef"
|
|
|
+ :defaultAddress="defaultAddress" @redeemNowFun="redeemNowFun" @closeSelectProduct="closeSelectProduct">
|
|
|
</SelectProduct>
|
|
|
</u-popup>
|
|
|
|
|
|
@@ -270,7 +270,7 @@ export default {
|
|
|
this.redemptionRulesShowPopup = true
|
|
|
},
|
|
|
//立即兑换
|
|
|
- redeemNowFun(selectedObj, selectPayMeth, orderRemarks,redeemNowBtnDisable) {
|
|
|
+ redeemNowFun(selectedObj, selectPayMeth, orderRemarks, redeemNowBtnDisable) {
|
|
|
if (selectedObj) this.selectedObj = selectedObj
|
|
|
if (selectPayMeth) this.selectPayMeth = selectPayMeth
|
|
|
if (orderRemarks) this.orderRemarks = orderRemarks
|
|
|
@@ -294,9 +294,9 @@ export default {
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- this.redeemNowBtnDisable = redeemNowBtnDisable?redeemNowBtnDisable:true
|
|
|
+ this.redeemNowBtnDisable = redeemNowBtnDisable ? redeemNowBtnDisable : true
|
|
|
let params = {}
|
|
|
- params.openId = uni.getStorageSync('wx_copenid');//用户openId
|
|
|
+ //params.openId = uni.getStorageSync('wx_copenid');//用户openId
|
|
|
params.userPhone = this.defaultAddress.phone;//用户手机号
|
|
|
params.userName = this.defaultAddress.userName;//用户名
|
|
|
params.userAddress = this.defaultAddress.address + this.defaultAddress.atlasAdd;//地图地址+详细地址
|
|
|
@@ -337,7 +337,7 @@ export default {
|
|
|
let url = 'https://city.baoxianzhanggui.com/fragrance/'
|
|
|
productOrderCreate(params).then(res => {
|
|
|
if (res.data.code == 200) {
|
|
|
-
|
|
|
+
|
|
|
productOrderPay({
|
|
|
orderNo: res.data.data, //订单编号
|
|
|
payType: params.payType, //支付方式:1微信支付 2:余额支付
|
|
|
@@ -371,10 +371,10 @@ export default {
|
|
|
},
|
|
|
function (res) {
|
|
|
// 使用以上方式判断前端返回,微信团队郑重提示:res.err_msg将在用户支付成功后返回ok,但并不保证它绝对可靠。
|
|
|
-
|
|
|
+ this.redeemNowBtnDisable = false
|
|
|
// JSON.stringify(res);
|
|
|
if (res.err_msg == "get_brand_wcpay_request:ok") {
|
|
|
- this.redeemNowBtnDisable = false
|
|
|
+
|
|
|
uni.navigateTo({
|
|
|
url: '/points/productDetails/paymentSuccessful?orderNo=' + this.orderNo
|
|
|
});
|