public/crmeb_java
1
0
Fork 0
mirror of https://gitee.com/ZhongBangKeJi/crmeb_java.git synced 2026-04-23 12:08:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

紧急修复了一些bug

Browse Source
This commit is contained in:
张乐
2020-08-17 15:28:28 +08:00
parent f85cfc7ce6
commit ec489d879d
122 changed files with 1235 additions and 3297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/pages/users/order_confirm/index.vue
View File

@@ -61,7 +61,7 @@
</view>
<view class='item acea-row row-between-wrapper' v-if='shippingType==0'>
<view>快递费用</view>
<view class='discount' v-if='priceGroup.storePostage > 0'>+￥{{priceGroup.storePostage}}</view>
<view class='discount' v-if='parseFloat(priceGroup.storePostage) > 0'>+￥{{priceGroup.storePostage}}</view>
<view class='discount' v-else>免运费</view>
</view>
<view v-else>
@@ -293,8 +293,6 @@
this.cartId = options.cartId;
this.is_address = options.is_address ? true : false;
this.news = options.new || true;
console.log('options.new');
console.log(options.new);
this.again = options.again || false;
if (this.isLogin) {
this.getaddressInfo();
@@ -572,16 +570,14 @@
let that = this;
if (that.addressId) {
getAddressDetail(that.addressId).then(res => {
// res.data.isDefault = parseInt(res.data.isDefault);
res.data.isDefault = parseInt(res.data.isDefault);
that.addressInfo = res.data || {};
that.addressId = res.data.id || 0;
that.address.addressId = res.data.id || 0;
})
} else {
getAddressDefault().then(res => {
// res.data.isDefault = parseInt(res.data.isDefault);
console.log('大家发挥绝代风华');
console.log(res.data.id);
res.data.isDefault = parseInt(res.data.isDefault);
that.addressInfo = res.data || {};
that.addressId = res.data.id || 0;
that.address.addressId = res.data.id || 0;
@@ -779,7 +775,16 @@
break;
case "WECHAT_H5_PAY": //网页版公众号支付
setTimeout(() => {
location.href = jsConfig.mweb_url;
let domain = encodeURIComponent(location.href);
let urls = jsConfigAgain.h5PayUrl + '&redirect_url='+ domain;
location.href = urls;
return that.$util.Tips({
title: '支付成功',
icon: 'success'
}, {
tab: 5,
url: goPages
});
}, 100);
break;
}