From 7fe2c49d197bfc96be0a8daf5c2a9722a0f80bbf Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Sat, 23 Mar 2024 18:46:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/payment/get_payment - 副本.vue | 541 +++++ pages/payment/get_payment.vue | 10 +- pages/payment/settlement - 副本 (2).vue | 2476 +++++++++++++++++++++++ pages/payment/settlement - 副本.vue | 1214 +++++++++++ 4 files changed, 4239 insertions(+), 2 deletions(-) create mode 100644 pages/payment/get_payment - 副本.vue create mode 100644 pages/payment/settlement - 副本 (2).vue create mode 100644 pages/payment/settlement - 副本.vue diff --git a/pages/payment/get_payment - 副本.vue b/pages/payment/get_payment - 副本.vue new file mode 100644 index 0000000..03a8000 --- /dev/null +++ b/pages/payment/get_payment - 副本.vue @@ -0,0 +1,541 @@ + + + + \ No newline at end of file diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue index f6a3d62..3dcd0b0 100644 --- a/pages/payment/get_payment.vue +++ b/pages/payment/get_payment.vue @@ -234,10 +234,13 @@ } if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) { + // return console.log(this.checkForm); + // return uni.navigateTo({ + // url: "/pages/payment/settlement?cartId="+this.checkForm.cart_id.join(',')+"&money="+this.cartForm.total_amount, + // }) orderCheck(that.checkForm).then(res1 => { that.loading = false; - console.log(res1); uni.navigateTo({ url: "/pages/payment/settlement", success: (res) => { @@ -247,7 +250,10 @@ checkForm: that.checkForm, merName: that.mer_name, money: that.cartForm.total_amount, - key: res1.data.key + key: res1.data.key, + order_type: res1.data.order_type, + enabledPlatformCoupon: res1.data.enabledPlatformCoupon, + platformCoupon: res1.data.platformCoupon }) // uni.setStorageSync('datas', { diff --git a/pages/payment/settlement - 副本 (2).vue b/pages/payment/settlement - 副本 (2).vue new file mode 100644 index 0000000..19721e8 --- /dev/null +++ b/pages/payment/settlement - 副本 (2).vue @@ -0,0 +1,2476 @@ + + + + \ No newline at end of file diff --git a/pages/payment/settlement - 副本.vue b/pages/payment/settlement - 副本.vue new file mode 100644 index 0000000..ae396ec --- /dev/null +++ b/pages/payment/settlement - 副本.vue @@ -0,0 +1,1214 @@ + + + + \ No newline at end of file