This commit is contained in:
parent
3515b7e740
commit
e728ccded8
|
@ -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',
|
||||
|
|
|
@ -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://您的域名
|
||||
|
|
|
@ -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: '',
|
||||
|
|
|
@ -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: '',
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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: '',
|
||||
|
|
Loading…
Reference in New Issue