|
|
@@ -16,7 +16,7 @@ Page({ |
|
|
|
mallTenantId: '' |
|
|
|
}, |
|
|
|
onLoad: function (options) { |
|
|
|
console.log(options, 'options'); |
|
|
|
console.log(options, 'options!!!!!!!'); |
|
|
|
|
|
|
|
if (options.mallTenantId) { |
|
|
|
this.setData({ |
|
|
@@ -321,7 +321,9 @@ Page({ |
|
|
|
tt.hideLoading() |
|
|
|
// 有价券 |
|
|
|
if (!type && type != 'free') { |
|
|
|
console.log('Over Here! type'); |
|
|
|
setTimeout(() => { |
|
|
|
console.log(_this.data.orderFlag, orderId, that.data.mallTenantId, 'notice!!!'); |
|
|
|
let url = "" |
|
|
|
if (_this.data.orderFlag) { |
|
|
|
tt.redirectTo({ |
|
|
@@ -335,6 +337,7 @@ Page({ |
|
|
|
|
|
|
|
}, 1600); |
|
|
|
} else if (type == 'free') { |
|
|
|
console.log('Over Here! type2'); |
|
|
|
tt.navigateTo({ |
|
|
|
url: `/pages/order/detail/index?orderId=${orderId |
|
|
|
}&mallTenantId=${that.data.mallTenantId}` |
|
|
@@ -343,6 +346,7 @@ Page({ |
|
|
|
}) |
|
|
|
.catch(err => { |
|
|
|
console.log(err); |
|
|
|
console.log('Over Here! type3'); |
|
|
|
if (!type) { |
|
|
|
setTimeout(function () { |
|
|
|
_this.payOrderUpdate(orderId, payOrderId, status, reason, type, _this, composeOrderType); |
|
|
@@ -925,7 +929,7 @@ Page({ |
|
|
|
console.log(err) |
|
|
|
if (err.code == 11004) { |
|
|
|
tt.navigateTo({ |
|
|
|
url: `/pages/getuserinfo/getuserinfo?fromflag=confirmation&confirmationFlag=${that.data.couponChannelId}`, |
|
|
|
url: `/pages/getuserinfo/getuserinfo?fromflag=confirmation&confirmationFlag=${that.data.couponChannelId}&mallTenantId=${that.data.mallTenantId}`, |
|
|
|
}) |
|
|
|
} else { |
|
|
|
tt.showToast({ |
|
|
|