master
游梦婷 2 years ago
parent c7ca758b0d
commit 8191c8c8fb
  1. 13
      physical-merchants/address/addNewAddress/addNewAddress.vue
  2. 5
      physical-merchants/address/address.vue
  3. 28
      physical-merchants/classify/cart/cart.vue
  4. 3
      physical-merchants/classify/goods-search/goods-search.vue
  5. 7
      physical-merchants/classify/goodsDetail/goodsDetail.vue
  6. 5
      physical-merchants/classify/order/orderDetail.vue
  7. 3
      physical-merchants/classify/order/paymentResult.vue
  8. 5
      physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
  9. 2
      physical-merchants/settleAccounts/settleAccounts.vue

@ -17,7 +17,7 @@
<view class="form-gorup-title">联系人<text class="form-group-tips-must">*</text> <view class="form-gorup-title">联系人<text class="form-group-tips-must">*</text>
</view> </view>
<input type="text" name="name" v-model="userAddress.name" maxlength="5" <input type="text" name="name" v-model="userAddress.name"
placeholder-class="corf6" class="fcor666 bs-bb" placeholder="联系人2~5个字符"> placeholder-class="corf6" class="fcor666 bs-bb" placeholder="联系人2~5个字符">
<view class="width100 mart10 border-b"> <view class="width100 mart10 border-b">
@ -114,6 +114,17 @@
onLoad(params) { onLoad(params) {
this.dataParams = 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: { computed: {
// regionName() { // regionName() {

@ -84,6 +84,9 @@
}); });
this.addressList=[]; this.addressList=[];
getDeliveryAddressList().then(res => { getDeliveryAddressList().then(res => {
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -104,7 +107,7 @@
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
}, },

@ -82,7 +82,7 @@
</label> </label>
<!-- --> <!-- -->
</checkbox-group> </checkbox-group>
<view v-if="!isEdit" class="paddleft5 fcorred " @click="editDelete">编辑</view> <view v-if="!isEdit" class="paddleft5 paddtright5 fcorred " @click="editDelete">编辑</view>
<view v-if="isEdit" class="icon-ymt delete paddleft5 fcorred font16" @click="deleteCart">删除</view> <view v-if="isEdit" class="icon-ymt delete paddleft5 fcorred font16" @click="deleteCart">删除</view>
</view> </view>
@ -208,19 +208,18 @@
this.initData(); this.initData();
}, },
methods: { methods: {
initData(status) { initData() {
if(!status){
uni.showLoading({ uni.showLoading({
title: '加载中', title: '加载中',
mask:true, mask:true,
duration:2000 duration:2000
}); });
// console.log(20)
}
getShoppingCartList().then(res => { getShoppingCartList().then(res => {
if(!status){ setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
}
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.allCheck.whetherCheck = false; this.allCheck.whetherCheck = false;
this.cartList = res.return_data; this.cartList = res.return_data;
@ -228,8 +227,6 @@
// //
// this.cartList[0].loseEfficacy=true; // this.cartList[0].loseEfficacy=true;
this.allCheckInit(); // this.allCheckInit(); //
} else { } else {
@ -239,6 +236,9 @@
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
}, },
editDelete() { editDelete() {
@ -504,13 +504,16 @@
this.initData(); this.initData();
} else { } else {
// //
setTimeout(()=>{
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
},200)
// //
this.initData(2); this.initData();
} }
@ -708,7 +711,10 @@
.tool-jiesuan {} .tool-jiesuan {}
.jiesuan-btn { .jiesuan-btn {
width: 240rpx; max-width: 240rpx;
min-width: 100px;
font-size: 16px;
flex: 1;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
text-align: center; text-align: center;

@ -122,6 +122,7 @@
getListGoodsDetail(params).then(res => { getListGoodsDetail(params).then(res => {
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -143,6 +144,8 @@
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
} }
} }

@ -282,6 +282,9 @@
}); });
findGoodsDetailById(params).then(res => { findGoodsDetailById(params).then(res => {
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -302,6 +305,10 @@
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
}, },

@ -370,7 +370,12 @@
orderNo: this.orderId, orderNo: this.orderId,
} }
getDetailByOrderNo(params).then(res => { getDetailByOrderNo(params).then(res => {
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
},100)
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.recinfo = res.return_data; this.recinfo = res.return_data;
// if (res.return_data.productType == 6) { // if (res.return_data.productType == 6) {

@ -75,7 +75,10 @@
orderNo: this.orderId, orderNo: this.orderId,
} }
getDetailByOrderNo(params).then(res => { getDetailByOrderNo(params).then(res => {
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
},100)
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.recinfo = res.return_data; this.recinfo = res.return_data;

@ -154,6 +154,9 @@
mask:true, mask:true,
}); });
getLogisticsMsg(params).then(res=>{ getLogisticsMsg(params).then(res=>{
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -196,6 +199,8 @@
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
}, },
// //

@ -478,7 +478,9 @@
}); });
this.postPrice = 0; this.postPrice = 0;
getAddressPrice().then(res => { getAddressPrice().then(res => {
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
},100)
this.isFirstSearchAddress = false; this.isFirstSearchAddress = false;
if (res.return_code == '000000') { if (res.return_code == '000000') {
if (res.return_data) { if (res.return_data) {

Loading…
Cancel
Save