From 0e66cbd46407cf9deefbf03aea7614f8f11f75e1 Mon Sep 17 00:00:00 2001 From: Enzo <1284707383@qq.com> Date: Thu, 24 Jun 2021 16:59:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=B8=B2=E6=9F=93bug?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/confirm-order.vue | 197 ++++++++++++++++++---------------- pages/order/index.vue | 3 +- pages/order/order-details.vue | 161 +++++++++++++-------------- pages/order/pay-success.vue | 7 +- pages/order/unpay-details.vue | 111 ++++++++++--------- 5 files changed, 252 insertions(+), 227 deletions(-) diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue index a048651..63ebbb4 100644 --- a/pages/order/confirm-order.vue +++ b/pages/order/confirm-order.vue @@ -1,76 +1,79 @@ @@ -89,12 +92,18 @@ goods_id: 1, goods_specs_id: 1, orderDetails: {}, - ifchoose: true + ifchoose: true, + ifCheck: true } }, computed: { total(){ return this.num * this.price + }, + isRight(){ + return function(val){ + return this.$shared.isRight(val); + } } }, onLoad(e) { @@ -107,6 +116,11 @@ if(res.code == 0) { this.orderDetails = res.data this.skeletonLoading = false + if( Object.keys(res.metal_data).length != 0 ) { + this.ifCheck = true + }else { + this.ifCheck = false + } }else { this.$msg(res.msg) } @@ -136,39 +150,34 @@ }, submit(){ if(this.ifchoose == true) { - this.$http(this.API.API_PRPAID, { - goods_id: this.goods_id, - goods_specs_id: this.goods_specs_id, - number: this.num, - token: 'fdf12000e774e48bc60c6b6d42055602' - }).then(res => { - console.log(res) - - // let nonceStr = res.data.nonceStr - // appId: "wxb35ef055a4dd8ad4" - // nonceStr: "60d3125d138af" - // order_num: "2842855348400816128" - // package: "prepay_id=wx23185213000285e14ea77ac97acc670000" - // paySign: "6DC330CBDF6C29BEDD4D254D9DA97364" - // signType: "MD5" - // timeStamp: "1624445533" - - - uni.requestPayment({ - orderInfo: res.data.order_num, - timeStamp: res.data.timeStamp, - nonceStr: res.data.nonceStr, - package: res.data.package, - signType: res.data.signType, - paySign: res.data.paySign, - complete: result => { - console.log(result) - } + if(this.ifCheck == true) { + this.$routerGo('/pages/login/index?type=phone') + }else { + this.$http(this.API.API_PRPAID, { + goods_id: this.goods_id, + goods_specs_id: this.goods_specs_id, + number: this.num, + token: 'fdf12000e774e48bc60c6b6d42055602' + }).then(res => { + console.log(res) + uni.requestPayment({ + orderInfo: res.data.order_num, + timeStamp: res.data.timeStamp, + nonceStr: res.data.nonceStr, + package: res.data.package, + signType: res.data.signType, + paySign: res.data.paySign, + success: function (res) { + this.$routerGo('/pages/order/pay-success?ifSuccess='+1) + }, + fail: function (err) { + this.$routerGo('/pages/order/pay-success?ifSuccess='+2) + } + }) + }) - - }) - return - this.$routerGo('/pages/order/pay-success') + } + }else { this.$msg('请认真阅读并同意协议!') return diff --git a/pages/order/index.vue b/pages/order/index.vue index d69d1d6..c2f620c 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -224,7 +224,8 @@ overflow: hidden; margin: 20rpx 32rpx; background-color: #FFFFFF; - box-shadow: 0 0 10px 5px #e5e5e5; + // box-shadow: 0 0 10px 5px #e5e5e5; + box-shadow: 0 10px 10px -1px #e5e5e5; align-items: flex-start; .left { diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue index 9959aea..e087cce 100644 --- a/pages/order/order-details.vue +++ b/pages/order/order-details.vue @@ -1,99 +1,99 @@ @@ -116,6 +116,11 @@ computed: { total(){ return this.num * this.price + }, + isRight(){ + return function(val){ + return this.$shared.isRight(val); + } } }, onLoad(e) { diff --git a/pages/order/pay-success.vue b/pages/order/pay-success.vue index 75d3cb7..b1513a3 100644 --- a/pages/order/pay-success.vue +++ b/pages/order/pay-success.vue @@ -1,6 +1,6 @@