diff --git a/components/payment/index.vue b/components/payment/index.vue index 7d26ffd..8164075 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -105,7 +105,12 @@ // #ifdef MP type = 'alipayQr'; // #endif + }else if(paytype == 'wtAliPay'){ + type = 'wtAliPay'; + }else if(paytype == 'wtWxPay'){ + type = 'wtWxPay'; } + if (!that.order_id) return that.$util.Tips({ title: '请选择要支付的订单' }); @@ -321,9 +326,22 @@ location.href = locations; }, 100); break; - // #endif - - // #ifdef APP-PLUS + case 'wtAliPay': + case 'wtWxPay': + setTimeout(() => { + location.href = jsConfig; + }, 100); + break; + // #endif + // #ifdef APP-PLUS + case 'wtAliPay': + case 'wtWxPay': + if (plus.os.name === 'iOS') { + plus.runtime.openURL(jsConfig); + } else if (plus.os.name === 'Android') { + plus.runtime.openURL(jsConfig); + } + break; case 'alipayApp': uni.requestPayment({ provider: 'alipay', diff --git a/config/app.js b/config/app.js index 4c7bf5e..ae1e0d9 100644 --- a/config/app.js +++ b/config/app.js @@ -7,10 +7,10 @@ let openPlantGrass = '-openPlantGrass-' // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://oversea.hwms.shop' //测试 -let httpApi = 'http://192.168.1.50:8090' //生产 +let httpApi = 'http://192.168.1.3:8090' //生产 // 聊天接口修改此字符 小程序聊天要求wss 例如:wss://mer. .net -let wsApi = 'ws://192.168.1.50:8090' +let wsApi = 'ws://192.168.1.3:8090' // let wsApi = 'wss://oversea.hwms.shop' module.exports = { diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index f5fa599..cb7356d 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -368,7 +368,21 @@ title: '可用余额:', number: 0, payStatus: this.$store.getters.globalData.yue_pay_status - } + }, + { + "name": "微信支付", + "icon": "icon-weixinzhifu", + value: 'wtWxPay', + title: '微信快捷支付', + payStatus: this.$store.getters.globalData.wt_wxpay_open, + }, + { + name: "支付宝支付", + icon: "icon-zhifubao", + value: 'wtAliPay', + title: '支付宝支付', + payStatus: this.$store.getters.globalData.wt_alipay_open + }, ], pay_close: false, pay_order_id: '', diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue index cedc366..fa1ead3 100644 --- a/pages/order_details/stay.vue +++ b/pages/order_details/stay.vue @@ -211,7 +211,7 @@ icon: "icon-weixinzhifu", value: 'wechat', title: '微信快捷支付', - payStatus: 1 + payStatus: 2 }, { name: "支付宝支付", @@ -228,6 +228,20 @@ number: 0, payStatus: this.$store.getters.globalData.yue_pay_status }, + { + "name": "微信支付", + "icon": "icon-weixin2", + value: 'wtWxPay', + title: '微信快捷支付', + payStatus: this.$store.getters.globalData.wt_wxpay_open, + }, + { + name: "支付宝支付", + icon: "icon-icon34", + value: 'wtAliPay', + title: '支付宝支付', + payStatus: this.$store.getters.globalData.wt_alipay_open + }, ], pay_close: false, pay_order_id: '', diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index f2264af..7617a30 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -528,7 +528,7 @@ "icon": "icon-weixin2", value: 'weixin', title: '微信快捷支付', - payStatus: 1, + payStatus: 2, }, { name: "支付宝支付", @@ -556,6 +556,20 @@ title: '线下支付', payStatus: 2, }, + { + "name": "微信支付", + "icon": "icon-weixin2", + value: 'wtWxPay', + title: '微信快捷支付', + payStatus: this.$store.getters.globalData.wt_wxpay_open, + }, + { + name: "支付宝支付", + icon: "icon-icon34", + value: 'wtAliPay', + title: '支付宝支付', + payStatus: this.$store.getters.globalData.wt_alipay_open + }, ], tagStyle: { img: 'width:100%;display:block;', @@ -1396,8 +1410,22 @@ location.href = locations; }, 100); break; + case 'wtAliPay': + case 'wtWxPay': + setTimeout(() => { + location.href = jsConfig; + }, 100); + break; // #endif // #ifdef APP-PLUS + case 'wtAliPay': + case 'wtWxPay': + if (plus.os.name === 'iOS') { + plus.runtime.openURL(jsConfig); + } else if (plus.os.name === 'Android') { + plus.runtime.openURL(jsConfig); + } + break; case 'alipayApp': uni.requestPayment({ provider: 'alipay', diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index c4f87a1..718b843 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -296,7 +296,7 @@ icon: "icon-weixinzhifu", value: 'wechat', title: '微信快捷支付', - payStatus: 1 + payStatus: 2 }, { name: "支付宝支付", @@ -312,7 +312,21 @@ title: '可用余额:', number: 0, payStatus: this.$store.getters.globalData.yue_pay_status - } + }, + { + "name": "微信支付", + "icon": "icon-weixinzhifu", + value: 'wtWxPay', + title: '微信快捷支付', + payStatus: this.$store.getters.globalData.wt_wxpay_open, + }, + { + name: "支付宝支付", + icon: "icon-zhifubao", + value: 'wtAliPay', + title: '支付宝支付', + payStatus: this.$store.getters.globalData.wt_alipay_open + }, ], pay_close: false, pay_order_id: '',