From b044182656d7e141b3c84d920f7c33ad28261e17 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Fri, 24 Nov 2023 22:45:47 +0800 Subject: [PATCH] =?UTF-8?q?app=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/payment/payment.vue | 55 ++++++++++++++++++- .../wallet/user-recharge/user-recharge.vue | 2 +- manifest.json | 45 +++++++++------ pages/plugins/membershiplevelvip/buy/buy.vue | 2 +- .../membershiplevelvip/order/order.vue | 2 +- pages/plugins/scanpay/index/index.vue | 2 +- pages/plugins/wallet/recharge/recharge.vue | 6 +- pages/user-order/user-order.vue | 2 +- 8 files changed, 88 insertions(+), 28 deletions(-) diff --git a/components/payment/payment.vue b/components/payment/payment.vue index 41b24997..55ba80b3 100644 --- a/components/payment/payment.vue +++ b/components/payment/payment.vue @@ -200,7 +200,6 @@ submit_disabled_status: true, order_id: 0, currency_symbol: app.globalData.data.currency_symbol, - popup_view_pay_html_is_show: false, }; }, @@ -210,7 +209,7 @@ this.setData({ is_show_payment_popup: false, }); - this.$emit('close-payment-poupon', false); + this.$emit('close-payment-popup', false); }, // 支付二维码展示窗口事件 popup_view_pay_qrcode_event_close(e) { @@ -235,7 +234,7 @@ is_show_payment_popup: false, }); this.pay_handle(this.propTempPayValue, this.payment_id); - this.$emit('close-payment-poupon', false); + this.$emit('close-payment-popup', false); }, // 支付方法 @@ -323,6 +322,9 @@ // 正常线上支付 case 0: var data = res.data.data; + // #ifdef APP + this.app_pay_handle(this, data, order_id); + // #endif // #ifdef MP-WEIXIN || MP-ALIPAY || MP-BAIDU || MP-TOUTIAO this.common_pay_handle(this, data, order_id); // #endif @@ -382,6 +384,53 @@ app.globalData.showToast('支付组件接口不能为空'); } }, + // APP支付 + app_pay_handle(self, data, order_id) { + uni.getProvider({ + service: 'payment', + success: function (res) { + switch(data.payment.payment) { + // 支付宝 + case 'Alipay' : + if(~res.provider.indexOf('alipay')) { + uni.requestPayment({ + provider: 'alipay', + orderInfo: data.data, + success: function (res) { + self.order_item_pay_success_handle(data, order_id); + }, + fail: function (err) { + self.order_item_pay_fail_handle(data, order_id, '支付失败'); + } + }); + } + break; + + // 微信 + case 'Weixin' : + if(~res.provider.indexOf('wxpay')) { + uni.requestPayment({ + provider: 'wxpay', + orderInfo: data.data, + success: function (res) { + self.order_item_pay_success_handle(data, order_id); + var rawdata = JSON.parse(res.rawdata); + console.log("支付成功"); + }, + fail: function (err) { + self.order_item_pay_fail_handle(data, order_id, '支付失败'); + console.log('支付失败:' + JSON.stringify(err)); + } + }); + } + break; + + default : + app.globalData.showToast(data.payment.payment+'支付未定义'); + } + } + }); + }, // 快手小程序 kuaishou_pay_handle(self, data, order_id) { uni.pay({ diff --git a/components/wallet/user-recharge/user-recharge.vue b/components/wallet/user-recharge/user-recharge.vue index 25245141..d3f33693 100644 --- a/components/wallet/user-recharge/user-recharge.vue +++ b/components/wallet/user-recharge/user-recharge.vue @@ -52,7 +52,7 @@ :prop-to-appoint-page="to_appoint_page" :prop-default-payment-id="default_payment_id" :prop-is-show-payment="is_show_payment_popup" - @close-payment-poupon="payment_popup_event_close" + @close-payment-popup="payment_popup_event_close" @pay-success="order_item_pay_success_handle" > diff --git a/manifest.json b/manifest.json index 17980027..6146d4c7 100644 --- a/manifest.json +++ b/manifest.json @@ -15,36 +15,47 @@ "autoclose" : true, "delay" : 0 }, - "modules" : {}, + "modules" : { + "Payment" : {} + }, "distribute" : { "android" : { "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", "", + "", + "", + "", + "", + "", "", "", - "", "", - "", - "", - "", - "", - "", - "", - "", - "", "", - "", + "", + "", "", - "", - "", - "", - "", - "", + "", + "", "" ] }, "ios" : {}, - "sdkConfigs" : {} + "sdkConfigs" : { + "payment" : { + "alipay" : { + "__platform__" : [ "ios", "android" ] + } + }, + "push" : {} + } } }, "quickapp" : {}, diff --git a/pages/plugins/membershiplevelvip/buy/buy.vue b/pages/plugins/membershiplevelvip/buy/buy.vue index 06b3f71d..9395dfe9 100644 --- a/pages/plugins/membershiplevelvip/buy/buy.vue +++ b/pages/plugins/membershiplevelvip/buy/buy.vue @@ -78,7 +78,7 @@ :prop-to-fail-page="to_fail_page" :prop-to-appoint-page="to_appoint_page" :prop-is-show-payment="is_show_payment_popup" - @close-payment-poupon="payment_popup_event_close" + @close-payment-popup="payment_popup_event_close" > diff --git a/pages/plugins/membershiplevelvip/order/order.vue b/pages/plugins/membershiplevelvip/order/order.vue index 74e81d8d..d3d7e707 100644 --- a/pages/plugins/membershiplevelvip/order/order.vue +++ b/pages/plugins/membershiplevelvip/order/order.vue @@ -51,7 +51,7 @@ :prop-default-payment-id="default_payment_id" :prop-pay-price="pay_price" :prop-is-show-payment="is_show_payment_popup" - @close-payment-poupon="payment_popup_event_close" + @close-payment-popup="payment_popup_event_close" @pay-success="order_item_pay_success_handle" :prop-nav-status-index="nav_status_index" @reset-event="reset_event" diff --git a/pages/plugins/scanpay/index/index.vue b/pages/plugins/scanpay/index/index.vue index 9da1a308..257dbebb 100644 --- a/pages/plugins/scanpay/index/index.vue +++ b/pages/plugins/scanpay/index/index.vue @@ -114,7 +114,7 @@ :propToFailPage="to_fail_page" :prop-to-appoint-page="to_appoint_page" :prop-is-show-payment="is_show_payment_popup" - @close-payment-poupon="payment_popup_event_close" + @close-payment-popup="payment_popup_event_close" @pay-success="pay_back_event" @pay-fail="pay_back_event" > diff --git a/pages/plugins/wallet/recharge/recharge.vue b/pages/plugins/wallet/recharge/recharge.vue index a9421be6..1d0f9cbb 100644 --- a/pages/plugins/wallet/recharge/recharge.vue +++ b/pages/plugins/wallet/recharge/recharge.vue @@ -13,7 +13,7 @@ {{ user_wallet.normal_money }} - + 选择充值金额 @@ -27,7 +27,7 @@ - + {{preset_data.length > 0 ? '其他' : '充值'}}金额 @@ -65,7 +65,7 @@ :prop-to-fail-page="to_fail_page" :prop-to-appoint-page="to_appoint_page" :prop-is-show-payment="is_show_payment_popup" - @close-payment-poupon="payment_popup_event_close" + @close-payment-popup="payment_popup_event_close" > diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue index 87ab3fc0..ccd8feea 100644 --- a/pages/user-order/user-order.vue +++ b/pages/user-order/user-order.vue @@ -127,7 +127,7 @@ :prop-default-payment-id="default_payment_id" :prop-pay-price="pay_price" :prop-is-show-payment="is_show_payment_popup" - @close-payment-poupon="payment_popup_event_close" + @close-payment-popup="payment_popup_event_close" @pay-success="order_item_pay_success_handle" >