diff --git a/App.vue b/App.vue index 94e18c9..f1bb974 100644 --- a/App.vue +++ b/App.vue @@ -24,6 +24,17 @@ // 获取商城基础信息 this.getStoreInfo() }, + onShow(options) { + console.log('app onShow', options); + let extraData = options.referrerInfo.extraData; + if (extraData) { + // wx.showToast({ + // title: params.errStr, + // icon: 'none', + // }); + uni.$emit('appShow', extraData); + } + }, methods: { diff --git a/pages/checkout/cashier/index.vue b/pages/checkout/cashier/index.vue index 37e8ba5..5e987d5 100644 --- a/pages/checkout/cashier/index.vue +++ b/pages/checkout/cashier/index.vue @@ -135,11 +135,19 @@ // 记录订单ID this.orderId = Number(orderId) // 获取收银台信息 - this.getCashierInfo() + this.getCashierInfo(); + uni.$on('appShow', this.solveShowMsg); }, methods: { - + solveShowMsg(msgData) { + console.log(msgData); + if (msgData.errCode === '0000') { + this.onShowSuccess({ message: msgData.errStr }); + } else { + this.onPayFail({ message: msgData.errStr }); + } + }, // 获取收银台信息 getCashierInfo() { const app = this @@ -230,36 +238,30 @@ // 按钮禁用 if (app.disabled) return app.disabled = true - if (app.curPaymentItem.method !== 'huifu') { // 提交到后端API - CashierApi.orderPay(app.orderId, { - method: app.curPaymentItem.method, - client: app.platform, - extra: app.getExtraAsUnify(app.curPaymentItem.method) - }) - .then(result => app.onSubmitCallback(result)) - .finally(err => setTimeout(() => app.disabled = false, 10)) - } else { - console.log(app.curPaymentItem.method); - CashierApi.unify({ - outTradeNo: new Date().getTime(), - totalFee: 1, + CashierApi.orderPay(app.orderId, { + method: app.curPaymentItem.method, + client: app.platform, + extra: app.getExtraAsUnify(app.curPaymentItem.method) }) .then(result => { - const { miniPayRequest } = result.data.data; - let appPayRequest = ''; - appPayRequest = encodeURIComponent(JSON.stringify({ - sign: miniPayRequest.sign, - prepayid: miniPayRequest.prepayid, - })); - console.log(appPayRequest); - uni.navigateToMiniProgram({ - appId: miniPayRequest.miniuser, - path: `${miniPayRequest.minipath}?appPayRequest=${appPayRequest}`, - }); + console.log(result); + if (app.curPaymentItem.method === 'huifu') { + const { miniPayRequest } = result.data.payment; + let appPayRequest = ''; + appPayRequest = encodeURIComponent(JSON.stringify({ + sign: miniPayRequest.sign, + prepayid: miniPayRequest.prepayid, + })); + uni.navigateToMiniProgram({ + appId: miniPayRequest.miniuser, + path: `${miniPayRequest.minipath}?appPayRequest=${appPayRequest}`, + }); + } else { + app.onSubmitCallback(result) + } }) .finally(err => setTimeout(() => app.disabled = false, 10)) - } }, // 获取第三方支付的扩展参数