From 391055e68ad5c7cd14b1268ea83cb83e377af72a Mon Sep 17 00:00:00 2001 From: gaoxs Date: Mon, 8 Jun 2020 20:06:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=8F=96=E6=B6=88=E7=9A=84=E9=97=AE=E9=A2=98,?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/order.js | 2 ++ libs/wechat.js | 9 ++++-- pages/authorization/index.vue | 40 ++------------------------- pages/order/OrderDetails/index.vue | 2 +- pages/order/OrderSubmission/index.vue | 6 +++- 5 files changed, 17 insertions(+), 42 deletions(-) diff --git a/libs/order.js b/libs/order.js index 20da3eb..d6e6493 100644 --- a/libs/order.js +++ b/libs/order.js @@ -98,10 +98,12 @@ export function payOrderHandle(orderId, type, from) { weappPay(data.result.jsConfig).then(res => { resolve(data); }); + break; case "WECHAT_APP_PAY": weappPay(data.result.jsConfig).then(res => { resolve(data); }); + break; } }) .catch(err => { diff --git a/libs/wechat.js b/libs/wechat.js index 1ba5e05..310cc7e 100644 --- a/libs/wechat.js +++ b/libs/wechat.js @@ -14,7 +14,7 @@ export const weappPay = (option) => { sign: option.sign, timestamp: option.timestamp + '', } - // 调用登录接口 + // 调用只接口 uni.requestPayment({ provider: 'wxpay', ...option, @@ -23,9 +23,12 @@ export const weappPay = (option) => { success: (success) => { console.log(success) uni.showToast({ - title: '支付成功', icon: 'success', duration: 5000 + title: '支付成功', icon: 'success', duration: 5000, }); - resolve(success) + let time = setTimeout(() => { + clearTimeout(time) + resolve(success) + }, 3000) }, fail: (error) => { console.log(error) diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue index 29b8989..a77db68 100644 --- a/pages/authorization/index.vue +++ b/pages/authorization/index.vue @@ -2,7 +2,7 @@ - + 您还未允许微信登录授权,请点击下方按钮允许微信授权登录。 @@ -11,17 +11,12 @@ - + 请先登录 - - - 登录中 - - @@ -45,26 +40,13 @@ export default { ...mapState(["isAuthorization", "$deviceType", "token"]) }, onShow() { - this.UPDATE_AUTHORIZATIONPAGE(true); // // 先校验用户是否授权,如果没有授权,显示授权按钮 - console.log("先校验用户是否授权,如果没有授权,显示授权按钮"); - authorize("userInfo") - .then(res => { - console.log(res); - }) - .catch(error => { - console.log(error); - // 用户未授权,显示授权按钮 - this.authorize = true; - }); }, onHide() { - console.log("离开授权页面,11111"); this.UPDATE_AUTHORIZATIONPAGE(false); this.changeAuthorization(false); }, onUnload() { - console.log("离开授权页面,11111"); this.UPDATE_AUTHORIZATIONPAGE(false); this.changeAuthorization(false); }, @@ -109,24 +91,8 @@ export default { }); } }, - onUnload() { - console.log("离开授权页面,11111"); - this.UPDATE_AUTHORIZATIONPAGE(false); - this.changeAuthorization(false); - }, mounted() { - this.UPDATE_AUTHORIZATIONPAGE(true); - // // 先校验用户是否授权,如果没有授权,显示授权按钮 - console.log("先校验用户是否授权,如果没有授权,显示授权按钮"); - authorize("userInfo") - .then(res => { - console.log(res); - }) - .catch(error => { - console.log(error); - // 用户未授权,显示授权按钮 - this.authorize = true; - }); + } }; diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 04f8827..15eefa8 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -660,6 +660,6 @@ export default { await payOrderHandle(this.orderInfo.orderId, type, that.from); that.getDetail(); } - } + }, }; diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 157ffa9..8b04562 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -521,6 +521,8 @@ }); break; case "PAY_DEFICIENCY": + break; + case "PAY_ERROR": uni.showToast({ title: res.msg, @@ -569,6 +571,8 @@ } }); }) + break; + case "WECHAT_APP_PAY": // APP支付 weappPay(data.result.jsConfig).finally(()=>{ @@ -579,7 +583,7 @@ } }); }) - + break; // 下面为原先微信支付方式, // pay(data.result.jsConfig).finally(() => { // this.$yrouter.replace({