|
|
@@ -314,7 +314,7 @@
|
|
|
<view class='item acea-row row-between-wrapper'
|
|
|
v-if="open_integral && order_type == 0 && is_jf == 0 && is_xfq == 0 && is_jk == 0">
|
|
|
<view>积分抵扣：</view>
|
|
|
- <view class='money' >
|
|
|
+ <view class='money'>
|
|
|
<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral*1}}</text></text>
|
|
|
<text v-else>使用了{{integral_count}}个积分，抵扣<text class="pColor">{{integral_price}}元</text></text>
|
|
|
<checkbox-group class="checkbox integral_checked" name="isDefault" @change="changeIntegral">
|
|
|
@@ -466,6 +466,7 @@
|
|
|
title: '可用余额:',
|
|
|
payStatus: this.$store.getters.globalData.yue_pay_status,
|
|
|
},
|
|
|
+ // #ifndef APP-PLUS
|
|
|
{
|
|
|
"name": "微信支付",
|
|
|
"icon": "icon-weixin2",
|
|
|
@@ -478,6 +479,7 @@
|
|
|
title: '微信快捷支付',
|
|
|
payStatus: 1,
|
|
|
},
|
|
|
+ // #endif
|
|
|
// #ifndef MP
|
|
|
{
|
|
|
name: "支付宝支付",
|
|
|
@@ -493,7 +495,7 @@
|
|
|
payStatus: 1,
|
|
|
},
|
|
|
// #endif
|
|
|
-
|
|
|
+
|
|
|
],
|
|
|
tagStyle: {
|
|
|
img: 'width:100%;display:block;',
|
|
|
@@ -619,7 +621,7 @@
|
|
|
if (options.is_jf) {
|
|
|
this.is_jf = options.is_jf
|
|
|
}
|
|
|
- if(options.is_jk) {
|
|
|
+ if (options.is_jk) {
|
|
|
this.is_jk = options.is_jk
|
|
|
}
|
|
|
|
|
|
@@ -1119,6 +1121,7 @@
|
|
|
this.contactsTel = e.detail.value;
|
|
|
},
|
|
|
payment: function(data) {
|
|
|
+ console.log(data,'支付信息++++++++')
|
|
|
let that = this;
|
|
|
createOrder(data).then(res => {
|
|
|
console.log(res, 'zhifures++++++++++++++++++++++++')
|
|
|
@@ -1160,16 +1163,20 @@
|
|
|
});
|
|
|
break;
|
|
|
case 'alipay':
|
|
|
+ // #ifdef APP-PLUS
|
|
|
+ console.log(res.data,'app ali zhifu+++++')
|
|
|
+ console.log(res.data.result.config.jsConfig.expend.pay_info,'app--zhifu')
|
|
|
+ plus.runtime.openURL('alipays://platformapi/startapp?saId=10000007&qrcode=' + res.data.result.config.jsConfig.expend.pay_info,function(res) {
|
|
|
+ console.log(res,'没有调起')
|
|
|
+ uni.hideLoading();
|
|
|
+ });
|
|
|
+ uni.hideLoading()
|
|
|
+ // #endif
|
|
|
+ break;
|
|
|
case "alipayQr":
|
|
|
- // uni.hideLoading();
|
|
|
- // this.$emit('onChangeFun', {
|
|
|
- // action: 'payClose'
|
|
|
- // });
|
|
|
- // uni.navigateTo({
|
|
|
- // url: '/pages/order_pay_back/index?keyCode=' + callback_key + '&url=' +
|
|
|
- // jsConfig
|
|
|
- // })
|
|
|
+ // #ifndef H5
|
|
|
window.location.href = res.data.result.config.jsConfig.expend.pay_info
|
|
|
+ // #endif
|
|
|
return;
|
|
|
break;
|
|
|
// #ifndef MP
|
|
|
@@ -1178,7 +1185,7 @@
|
|
|
case "weixinApp":
|
|
|
jsConfig.timeStamp = jsConfig.timestamp;
|
|
|
// #ifndef APP-PLUS
|
|
|
- console.log(jsConfig.timestamp,res,'ddddddddddddddddddddddddddddddd')
|
|
|
+ console.log(jsConfig.timestamp, res, 'ddddddddddddddddddddddddddddddd')
|
|
|
this.$wechat.pay(jsConfig).then(res => {
|
|
|
console.log('测试支付数据无效的success：' + res.data)
|
|
|
return that.$util.Tips({
|
|
|
@@ -1464,11 +1471,10 @@
|
|
|
use_integral: this.use_integral,
|
|
|
receipt_data: this.invoiceData,
|
|
|
extend: this.extend,
|
|
|
- // #ifdef H5
|
|
|
- return_url: 'http://' + window.location.host + '/pages/users/order_list/index',
|
|
|
- // #endif
|
|
|
+ return_url: 'http://ygs.hqgjsmc.com/pages/users/order_list/index',
|
|
|
userConsumption: this.is_xfq == 1 ? 1 : 0
|
|
|
};
|
|
|
+ console.log('return_url', data.return_url)
|
|
|
if (data.mark && this.isEmojiCharacter(data.mark[Object.keys(data.mark)[0]])) {
|
|
|
that.$util.Tips({
|
|
|
title: '备注不允许输入表情！'
|
