Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app
This commit is contained in:
commit
7ed638e00f
@ -234,10 +234,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) {
|
if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) {
|
||||||
// return console.log(this.checkForm);
|
// return console.log(this.checkForm);
|
||||||
return uni.navigateTo({
|
return uni.navigateTo({
|
||||||
url: "/pages/payment/settlement?cartId="+this.checkForm.cart_id.join(',')+"&money="+this.cartForm.total_amount,
|
url: "/pages/payment/settlement?cartId=" + this.checkForm.cart_id.join(',') +
|
||||||
})
|
"&money=" + this.cartForm.total_amount,
|
||||||
|
})
|
||||||
orderCheck(that.checkForm).then(res1 => {
|
orderCheck(that.checkForm).then(res1 => {
|
||||||
that.loading = false;
|
that.loading = false;
|
||||||
|
|
||||||
@ -251,9 +252,9 @@
|
|||||||
merName: that.mer_name,
|
merName: that.mer_name,
|
||||||
money: that.cartForm.total_amount,
|
money: that.cartForm.total_amount,
|
||||||
key: res1.data.key,
|
key: res1.data.key,
|
||||||
order_type: res1.data.order_type,
|
order_type: res1.data.order_type,
|
||||||
enabledPlatformCoupon: res1.data.enabledPlatformCoupon,
|
enabledPlatformCoupon: res1.data.enabledPlatformCoupon,
|
||||||
platformCoupon: res1.data.platformCoupon
|
platformCoupon: res1.data.platformCoupon
|
||||||
})
|
})
|
||||||
|
|
||||||
// uni.setStorageSync('datas', {
|
// uni.setStorageSync('datas', {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user