jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

紧急修复了一些bug

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

2
app/pages/columnGoods/HotNewGoods/index.vue
View File

@@ -6,7 +6,7 @@
indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
<block v-for="(item,index) in imgUrls" :key="index">
<swiper-item>
<image :src="item.img" class="slide-image"></image>
<image :src="item.pic" class="slide-image"></image>
</swiper-item>
</block>
</swiper>

10
app/pages/goods_details/index.vue
View File

@@ -221,7 +221,6 @@
} from '@/config/app.js';
import {
getProductDetail,
getProductCode,
collectAdd,
collectDel,
postCartAdd,
@@ -229,8 +228,7 @@
getReplyConfig
} from '@/api/store.js';
import {
getUserInfo,
userShare
getUserInfo
} from '@/api/user.js';
import {
getCoupons
@@ -653,8 +651,8 @@
// #ifdef H5
that.$set(that, 'storeImage', that.storeInfo.image);
if (that.isLogin) {
that.getCartCount();
that.ShareInfo();
};
};
// #endif
if (that.isLogin) {
@@ -762,7 +760,7 @@
for (let i = 0; i < productAttr.length; i++) {
this.$set(productAttr[i], "index", value[i]);
}
//sort();排序函数:数字-英文-汉字；
//sort();排序函数:数字-英文-汉字；
let productSelect = this.productValue[value.join(",")];
if (productSelect && productAttr.length) {
this.$set(
@@ -774,7 +772,7 @@
this.$set(this.attr.productSelect, "price", productSelect.price);
this.$set(this.attr.productSelect, "stock", productSelect.stock);
this.$set(this.attr.productSelect, "unique", productSelect.id);
this.$set(this.attr.productSelect, "cart_num", 1);
this.$set(this.attr.productSelect, "cart_num", 1);
this.$set(this, "attrValue", value.join(","));
this.$set(this, "attrTxt", "已选择");
} else if (!productSelect && productAttr.length) {

2
app/pages/index/index.vue
View File

@@ -144,7 +144,7 @@
<!-- 首页推荐 -->
<view class="index-product-wrapper" :class="iSshowH?'on':''">
<view class="nav-bd">
<view class="item" v-for="(item,index) in explosiveMoney" :index="item.id" :class="{active:index == ProductNavindex}"
<view class="item" v-for="(item,index) in explosiveMoney" :key="index" :index="item.id" :class="{active:index == ProductNavindex}"
@click="ProductNavTab(item,index)">
<view class="txt">{{item.title}}</view>
<view class="label">{{item.info}}</view>

2
app/pages/index/index001.vue
View File

@@ -249,7 +249,7 @@
<!-- 首页推荐 -->
<view class="index-product-wrapper" style="min-height: 1500rpx;">
<view class="nav-bd">
<view class="item" v-for="(item,index) in explosiveMoney" :index="item.id" :class="{active:index == ProductNavindex}"
<view class="item" v-for="(item,index) in explosiveMoney" :key="index" :index="item.id" :class="{active:index == ProductNavindex}"
@click="ProductNavTab(item,index)">
<view class="txt">{{item.title}}</view>
<view class="label">{{item.info2}}</view>

2
app/pages/order_details/index.vue
View File

@@ -164,7 +164,7 @@
</view>
<view class='wrapper' v-else-if='orderInfo.deliveryType=="send"'>
<view class='item acea-row row-between'>
<view>配送方式：：</view>
<view>配送方式：</view>
<view class='conter'>送货</view>
</view>
<view class='item acea-row row-between'>

5
app/pages/user/index.vue
View File

@@ -15,8 +15,8 @@
<view class="name" v-if="userInfo.uid">
{{userInfo.nickname}}
<view class="vip" v-if="userInfo.vip">
<image :src="userInfo.vip_icon" alt="">
<view style="margin-left: 10rpx;" class="vip-txt">{{userInfo.vip_name}}</view>
<image :src="userInfo.vipIcon" alt="">
<view style="margin-left: 10rpx;" class="vip-txt">{{userInfo.vipName}}</view>
</view>
</view>
<view class="num" v-if="userInfo.phone" @click="goEdit()">
@@ -388,6 +388,7 @@
border-radius: 18px;
font-size: 20rpx;
margin-left: 12rpx;
margin-top: 2rpx;
image {
width: 27rpx;

2
app/pages/users/goods_comment_con/index.vue
View File

@@ -7,7 +7,7 @@
<image :src='productInfo.image'></image>
</view>
<view class='text acea-row row-between'>
<view class='name line2'>{{productInfo.store_name}}</view>
<view class='name line2'>{{productInfo.storeName}}</view>
<view class='money'>
<view>￥{{productInfo.price}}</view>
<view class='num'>x{{cart_num}}</view>

6
app/pages/users/login/index.vue
View File

@@ -221,8 +221,8 @@
});
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
that.$Cache.clear(BACK_URL);
getUserInfo().then(res => {
that.$store.commit("SETUID", res.data.uid);
// getUserInfo().then(res => {
that.$store.commit("SETUID", res.data.user.uid);
if (backUrl === '/pages/index/index' || backUrl === '/pages/order_addcart/order_addcart' || backUrl ===
'/pages/user/index') {
@@ -235,7 +235,7 @@
url: '/pages/index/index'
});
}
})
// })
})
.catch(res => {
that.$util.Tips({

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;
}

42
app/pages/users/user_payment/index.vue
View File

@@ -214,33 +214,11 @@
tab: 5,
url: '/pages/users/user_money/index'
});
}).catch(err=>{
return that.$util.Tips({
title: err
});
})
// // #ifdef MP || APP-PLUS
// rechargeRoutine({
// price: parseFloat(value),
// type: 1
// })
// // #endif
// // #ifdef H5
// rechargeWechat({
// price: parseFloat(value),
// from: that.from,
// type: 1
// })
// // #endif
// .then(res => {
// return that.$util.Tips({
// title: '转入成功',
// icon: 'success'
// }, {
// tab: 5,
// url: '/pages/users/user_money/index'
// });
// }).catch(err => {
// return that.$util.Tips({
// title: err
// })
// });
} else if (res.cancel) {
return that.$util.Tips({
title: '已取消'
@@ -252,7 +230,6 @@
uni.showLoading({
title: '正在支付',
})
// #ifdef MP || APP-PLUS
let money = parseFloat(this.money);
if (this.rechar_id == 0) {
if (Number.isNaN(money)) {
@@ -268,7 +245,7 @@
} else {
money = this.numberPic
}
// #ifdef MP || APP-PLUS
rechargeRoutine({
price: money,
type: 0,
@@ -294,7 +271,6 @@
});
},
fail: function(err) {
console.log(err);
return that.$util.Tips({
title: '支付失败'
});
@@ -314,7 +290,7 @@
// #endif
// #ifdef H5
rechargeWechat({
price: that.rechar_id == 0 ? that.money : that.numberPic,
price: money,
from: that.from,
rechar_id: that.rechar_id,
payType: 0
@@ -353,12 +329,16 @@
});
})
.catch(function(err) {
console.log(err);
return that.$util.Tips({
title: '支付失败'
});
});
}
}).catch(res=>{
uni.hideLoading();
return that.$util.Tips({
title: res
});
})
// #endif
}

4
app/pages/users/user_vip/index.vue
View File

@@ -29,7 +29,7 @@
</view>
</view>
<view class="numList acea-row row-around row-middle">
<view class="item" :class="current >=item.experience?'past':''" v-for="(item,index) in levelList">{{item.experience}}</view>
<view class="item" :class="current >=item.experience?'past':''" v-for="(item,index) in levelList" :key="index">{{item.experience}}</view>
</view>
</view>
<view class="vipList acea-row">
@@ -108,7 +108,7 @@
<view class="icons"></view>经验值明细
</view>
<view class="list">
<view class="item acea-row row-between-wrapper" v-for="(item,index) in expList">
<view class="item acea-row row-between-wrapper" v-for="(item,index) in expList" :key="index">
<view class="text">
<view class="name">{{item.title}}</view>
<view class="data">{{item.add_time}}</view>