From e728ccded8fb6d7893007d0ff4ac6f3d44c3072d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com> Date: Fri, 27 Sep 2024 10:07:26 +0800 Subject: [PATCH] 2 --- components/payment/index.vue | 24 +++-------------------- config/app.js | 8 ++++---- pages/order_details/index.vue | 16 +-------------- pages/order_details/stay.vue | 16 +-------------- pages/users/order_confirm/index.vue | 30 +---------------------------- pages/users/order_list/index.vue | 18 ++--------------- 6 files changed, 12 insertions(+), 100 deletions(-) diff --git a/components/payment/index.vue b/components/payment/index.vue index 8164075..7d26ffd 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -105,12 +105,7 @@ // #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: '请选择要支付的订单' }); @@ -326,22 +321,9 @@ 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; + // #endif + + // #ifdef APP-PLUS case 'alipayApp': uni.requestPayment({ provider: 'alipay', diff --git a/config/app.js b/config/app.js index b96baca..4c7bf5e 100644 --- a/config/app.js +++ b/config/app.js @@ -6,12 +6,12 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user` let openPlantGrass = '-openPlantGrass-' // 网络接口修改此字符 小程序域名要求https -let httpApi = 'https://www.miansui.shop' //测试 -// let httpApi = 'http://192.168.1.3:8090' //生产 +// let httpApi = 'http://oversea.hwms.shop' //测试 +let httpApi = 'http://192.168.1.50:8090' //生产 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net -// let wsApi = 'ws://192.168.1.3:8090' -let wsApi = 'ws://www.miansui.shop' +let wsApi = 'ws://192.168.1.50:8090' +// let wsApi = 'wss://oversea.hwms.shop' module.exports = { // 请求域名 格式： https://您的域名 diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index cb7356d..f5fa599 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -368,21 +368,7 @@ 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 fa1ead3..cedc366 100644 --- a/pages/order_details/stay.vue +++ b/pages/order_details/stay.vue @@ -211,7 +211,7 @@ icon: "icon-weixinzhifu", value: 'wechat', title: '微信快捷支付', - payStatus: 2 + payStatus: 1 }, { name: "支付宝支付", @@ -228,20 +228,6 @@ 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 7617a30..f2264af 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: 2, + payStatus: 1, }, { name: "支付宝支付", @@ -556,20 +556,6 @@ 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;', @@ -1410,22 +1396,8 @@ 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 718b843..c4f87a1 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: 2 + payStatus: 1 }, { name: "支付宝支付", @@ -312,21 +312,7 @@ 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: '',