diff --git a/physical-merchants/address/addNewAddress/addNewAddress.vue b/physical-merchants/address/addNewAddress/addNewAddress.vue index 1902251..2065352 100644 --- a/physical-merchants/address/addNewAddress/addNewAddress.vue +++ b/physical-merchants/address/addNewAddress/addNewAddress.vue @@ -17,7 +17,7 @@ 联系人* - @@ -114,6 +114,17 @@ onLoad(params) { this.dataParams = params }, + watch:{ + 'userAddress.name':{ + handler(n) { + if(n.length>5){ + setTimeout(()=>{ + this.userAddress.name = this.userAddress.name.substr(0,5) + },0) + } + }, + }, + }, computed: { // regionName() { diff --git a/physical-merchants/address/address.vue b/physical-merchants/address/address.vue index 1ff58b7..79c6ef5 100644 --- a/physical-merchants/address/address.vue +++ b/physical-merchants/address/address.vue @@ -84,27 +84,30 @@ }); this.addressList=[]; getDeliveryAddressList().then(res => { - uni.hideLoading(); - if (res.return_code == '000000') { + + setTimeout(()=>{ + + uni.hideLoading(); + if (res.return_code == '000000') { + + if (res.return_data.length > 0) { + // console.log(res.return_data) + this.addressList = res.return_data; + this.addressList.map(item => { + if (item.whetherDefault) { + this.selectId = item.id; + } + }) + } - if (res.return_data.length > 0) { - // console.log(res.return_data) - this.addressList = res.return_data; - this.addressList.map(item => { - if (item.whetherDefault) { - this.selectId = item.id; - } + } else { + uni.showToast({ + title: res.return_msg, + icon: 'none', + duration: 2000 }) } - - } else { - uni.showToast({ - title: res.return_msg, - icon: 'none', - duration: 2000 - }) - } - + },100) }) }, diff --git a/physical-merchants/classify/cart/cart.vue b/physical-merchants/classify/cart/cart.vue index 52fe5b6..d0c2c66 100644 --- a/physical-merchants/classify/cart/cart.vue +++ b/physical-merchants/classify/cart/cart.vue @@ -82,7 +82,7 @@ - 编辑 + 编辑 删除 @@ -208,37 +208,37 @@ this.initData(); }, methods: { - initData(status) { - if(!status){ + initData() { + uni.showLoading({ title: '加载中', mask:true, duration:2000 }); - // console.log(20) - } - getShoppingCartList().then(res => { - if(!status){ - uni.hideLoading(); - } - if (res.return_code == '000000') { - this.allCheck.whetherCheck = false; - this.cartList = res.return_data; - // 测试失效数据 - // this.cartList[0].loseEfficacy=true; - - - - this.allCheckInit(); //全选是否勾中判断 - - } else { - uni.showToast({ - title: res.return_msg, - icon: 'none', - duration: 2000 - }) - } + + getShoppingCartList().then(res => { + setTimeout(()=>{ + uni.hideLoading(); + if (res.return_code == '000000') { + this.allCheck.whetherCheck = false; + this.cartList = res.return_data; + + // 测试失效数据 + // this.cartList[0].loseEfficacy=true; + + this.allCheckInit(); //全选是否勾中判断 + + } else { + uni.showToast({ + title: res.return_msg, + icon: 'none', + duration: 2000 + }) + } + },100) + + }) }, editDelete() { @@ -503,14 +503,17 @@ //重新刷新数据 this.initData(); } else { - //增加数量失败 - uni.showToast({ - title: res.return_msg, - icon: 'none', - duration: 2000 - }) + //增加数量失败 + setTimeout(()=>{ + uni.showToast({ + title: res.return_msg, + icon: 'none', + duration: 2000 + }) + },200) + //重新刷新数据 - this.initData(2); + this.initData(); } @@ -708,7 +711,10 @@ .tool-jiesuan {} .jiesuan-btn { - width: 240rpx; + max-width: 240rpx; + min-width: 100px; + font-size: 16px; + flex: 1; height: 50px; line-height: 50px; text-align: center; diff --git a/physical-merchants/classify/goods-search/goods-search.vue b/physical-merchants/classify/goods-search/goods-search.vue index efb4049..fdce3e0 100644 --- a/physical-merchants/classify/goods-search/goods-search.vue +++ b/physical-merchants/classify/goods-search/goods-search.vue @@ -48,7 +48,7 @@ } }, onLoad(options){ - console.log(options,"options") + // console.log(options,"options") if(options.goodsLabel){ this.goodsLabel = options.goodsLabel @@ -122,27 +122,30 @@ getListGoodsDetail(params).then(res => { - uni.hideLoading(); - if (res.return_code == '000000') { + setTimeout(()=>{ + uni.hideLoading(); + if (res.return_code == '000000') { - if (res.return_data.list.length > 0) { - _this.data_list = _this.data_list.concat(res.return_data.list); - this.page.pageStart = res.return_data.pageNum; - this.page.pageSize = res.return_data.pageSize; - this.page.total = res.return_data.total; - this.page.navigateLastPage = res.return_data.navigateLastPage + if (res.return_data.list.length > 0) { + _this.data_list = _this.data_list.concat(res.return_data.list); + this.page.pageStart = res.return_data.pageNum; + this.page.pageSize = res.return_data.pageSize; + this.page.total = res.return_data.total; + this.page.navigateLastPage = res.return_data.navigateLastPage + + } else { + _this.data_list = [] + } } else { - _this.data_list = [] + uni.showToast({ + title: res.return_msg, + icon: 'none', + duration: 2000 + }) } - - } else { - uni.showToast({ - title: res.return_msg, - icon: 'none', - duration: 2000 - }) - } + },100) + }) } } diff --git a/physical-merchants/classify/goodsDetail/goodsDetail.vue b/physical-merchants/classify/goodsDetail/goodsDetail.vue index 66777fe..f6a97a0 100644 --- a/physical-merchants/classify/goodsDetail/goodsDetail.vue +++ b/physical-merchants/classify/goodsDetail/goodsDetail.vue @@ -282,26 +282,33 @@ }); findGoodsDetailById(params).then(res => { - uni.hideLoading(); + + setTimeout(()=>{ + + uni.hideLoading(); - if (res.return_code == '000000') { + if (res.return_code == '000000') { - this.goodsDetail = res.return_data; - this.goodsDetail.bannerImg = res.return_data.bannerImg.split(",").map(temp => this - .imageUrl + temp); - this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp => this - .imageUrl + temp); - console.log(this.goodsDetail, ) + this.goodsDetail = res.return_data; + this.goodsDetail.bannerImg = res.return_data.bannerImg.split(",").map(temp => this + .imageUrl + temp); + this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp => this + .imageUrl + temp); + console.log(this.goodsDetail, ) - // let list =item.map(temp=>this.imageUrl + temp) + // let list =item.map(temp=>this.imageUrl + temp) - } else { - uni.showToast({ - title: res.return_msg, - icon: 'none', - duration: 2000 - }) - } + } else { + uni.showToast({ + title: res.return_msg, + icon: 'none', + duration: 2000 + }) + } + + },100) + + }) }, diff --git a/physical-merchants/classify/order/orderDetail.vue b/physical-merchants/classify/order/orderDetail.vue index f491363..2c9d8c2 100644 --- a/physical-merchants/classify/order/orderDetail.vue +++ b/physical-merchants/classify/order/orderDetail.vue @@ -1,5 +1,5 @@