mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into zmj

Browse Source
This commit is contained in:
zmj 2023-11-04 19:19:33 +08:00
commit 16cd0a9ad4
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pages/users/order_confirm/index.vue
View File

@ -718,13 +718,6 @@
// this.getAgreement(); // this.getAgreement();
let _this = this let _this = this
this.textareaStatus = true; this.textareaStatus = true;
if (this.isLogin && this.toPay == false && !this.orderPay) {
this.getaddressInfo();
this.$nextTick(function() {
this.$refs.addressWindow.getAddressList();
this.getUserInfo()
})
}
uni.setStorage({ uni.setStorage({
key: 'invoice_Data', key: 'invoice_Data',
data: {}, data: {},
@ -744,6 +737,13 @@
uni.$off('handClick'); uni.$off('handClick');
}) })
that.invoice.invoice = false that.invoice.invoice = false
if (this.isLogin && this.toPay == false && !this.orderPay) {
this.getaddressInfo();
this.$nextTick(function() {
this.$refs.addressWindow.getAddressList();
this.getUserInfo()
})
}
}, },
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
@ -1188,11 +1188,15 @@
if (that.addressInfo.real_name) { if (that.addressInfo.real_name) {
that.textareaStatus = false; that.textareaStatus = false;
that.address.address = true; that.address.address = true;
that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this // that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this
.pinkId + '&couponId=' + this.couponId; // .pinkId + '&couponId=' + this.couponId;
that.pagesUrl = '/pages/users/user_address_list/index'
} else { } else {
// uni.navigateTo({
// url: `/pages/users/user_address/index?cartId=${this.cartId}`,
// });
uni.navigateTo({ uni.navigateTo({
url: `/pages/users/user_address/index?cartId=${this.cartId}`, url: `pages/users/user_address_list/index`,
}); });
} }
}, },