faiz
/
overseas
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2

This commit is contained in:
faiz 2024-09-27 10:07:26 +08:00
parent 3515b7e740
commit e728ccded8
6 changed files with 12 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/payment/index.vue
View File

@ -105,12 +105,7 @@
// #ifdef MP // #ifdef MP
type = 'alipayQr'; type = 'alipayQr';
// #endif // #endif
}else if(paytype == 'wtAliPay'){
type = 'wtAliPay';
}else if(paytype == 'wtWxPay'){
type = 'wtWxPay';
} }
if (!that.order_id) return that.$util.Tips({ if (!that.order_id) return that.$util.Tips({
title: '请选择要支付的订单' title: '请选择要支付的订单'
}); });
@ -326,22 +321,9 @@
location.href = locations; location.href = locations;
}, 100); }, 100);
break; break;
case 'wtAliPay':
case 'wtWxPay':
setTimeout(() => {
location.href = jsConfig;
}, 100);
break;
// #endif // #endif
// #ifdef APP-PLUS // #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': case 'alipayApp':
uni.requestPayment({ uni.requestPayment({
provider: 'alipay', provider: 'alipay',

8
config/app.js
View File

@ -6,12 +6,12 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
let openPlantGrass = '-openPlantGrass-' let openPlantGrass = '-openPlantGrass-'
// 网络接口修改此字符 小程序域名要求https // 网络接口修改此字符 小程序域名要求https
let httpApi = 'https://www.miansui.shop' //测试 // let httpApi = 'http://oversea.hwms.shop' //测试
// let httpApi = 'http://192.168.1.3:8090' //生产 let httpApi = 'http://192.168.1.50:8090' //生产
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net
// let wsApi = 'ws://192.168.1.3:8090' let wsApi = 'ws://192.168.1.50:8090'
let wsApi = 'ws://www.miansui.shop' // let wsApi = 'wss://oversea.hwms.shop'
module.exports = { module.exports = {
// 请求域名 格式： https://您的域名 // 请求域名 格式： https://您的域名

16
pages/order_details/index.vue
View File

@ -368,21 +368,7 @@
title: '可用余额:', title: '可用余额:',
number: 0, number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status 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_close: false,
pay_order_id: '', pay_order_id: '',

16
pages/order_details/stay.vue
View File

@ -211,7 +211,7 @@
icon: "icon-weixinzhifu", icon: "icon-weixinzhifu",
value: 'wechat', value: 'wechat',
title: '微信快捷支付', title: '微信快捷支付',
payStatus: 2 payStatus: 1
}, },
{ {
name: "支付宝支付", name: "支付宝支付",
@ -228,20 +228,6 @@
number: 0, number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status 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_close: false,
pay_order_id: '', pay_order_id: '',

30
pages/users/order_confirm/index.vue
View File

@ -528,7 +528,7 @@
"icon": "icon-weixin2", "icon": "icon-weixin2",
value: 'weixin', value: 'weixin',
title: '微信快捷支付', title: '微信快捷支付',
payStatus: 2, payStatus: 1,
}, },
{ {
name: "支付宝支付", name: "支付宝支付",
@ -556,20 +556,6 @@
title: '线下支付', title: '线下支付',
payStatus: 2, 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: { tagStyle: {
img: 'width:100%;display:block;', img: 'width:100%;display:block;',
@ -1410,22 +1396,8 @@
location.href = locations; location.href = locations;
}, 100); }, 100);
break; break;
case 'wtAliPay':
case 'wtWxPay':
setTimeout(() => {
location.href = jsConfig;
}, 100);
break;
// #endif // #endif
// #ifdef APP-PLUS // #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': case 'alipayApp':
uni.requestPayment({ uni.requestPayment({
provider: 'alipay', provider: 'alipay',

18
pages/users/order_list/index.vue
View File

@ -296,7 +296,7 @@
icon: "icon-weixinzhifu", icon: "icon-weixinzhifu",
value: 'wechat', value: 'wechat',
title: '微信快捷支付', title: '微信快捷支付',
payStatus: 2 payStatus: 1
}, },
{ {
name: "支付宝支付", name: "支付宝支付",
@ -312,21 +312,7 @@
title: '可用余额:', title: '可用余额:',
number: 0, number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status 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_close: false,
pay_order_id: '', pay_order_id: '',