Merge branch 'youmengting-dev' of http://gitea.dctpay.com/yangjie/high-mini into new-dev

master
杨杰 2 years ago
commit 24ea237176
  1. 8
      components/cart-choose/cart-choose.vue
  2. 2
      pages/user/order_list/order_list.vue
  3. 27
      physical-merchants/classify/cart/cart.vue
  4. 50
      physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue

@ -135,17 +135,19 @@
handler(n,o){
this.chooseNumber = 1;
this.chooseIndex = 0;
for(let i=0;i<n.length;i++){
if(n[i].stock>0){
this.chooseIndex = i;
// console.log(this.chooseIndex,"this.chooseIndex")
return
}
}
if(this.specificationList.length>0&&this.specificationList[this.chooseIndex].stock==0){
this.chooseNumber = 0;
}else{
this.chooseNumber = 1;
}
},
deep:true,

@ -706,7 +706,7 @@
overflow: auto;
.onorder {
width: 100%;
height: 50vw;
// height: 50vw;
display: flex;
justify-content: center;
align-content: center;

@ -213,14 +213,19 @@
this.initData();
},
methods: {
initData() {
uni.showLoading({
title: '加载中',
mask:true,
duration:2000
});
initData(status) {
if(!status){
uni.showLoading({
title: '加载中',
mask:true,
duration:2000
});
console.log(20)
}
getShoppingCartList().then(res => {
uni.hideLoading();
if(!status){
uni.hideLoading();
}
if (res.return_code == '000000') {
this.allCheck.whetherCheck = false;
this.cartList = res.return_data;
@ -473,7 +478,8 @@
if (res.return_code == '000000') {
//
this.initData();
} else {
//
uni.showToast({
@ -481,10 +487,11 @@
icon: 'none',
duration: 2000
})
//
this.initData(2);
}
//
this.initData();
})

@ -1,8 +1,8 @@
<template>
<wybPopup ref="popup" zIndex="999" type="bottom" width="500" height="500" :scrollY="true" radius="0" :showCloseIcon="true">
<wybPopup @touchmove.stop ref="popup" zIndex="999" type="bottom" width="500" height="500" :scrollY="true" radius="0" :showCloseIcon="true">
<view class="pd-main wuliupop backcor9">
<view class="pop-title fontwig6"><text>物流信息</text></view>
<view class="pd-main backcolorfff border-8r font14">
<view class="pop-title fontwig6 backcor9"><text>物流信息</text></view>
<view class="pd-main backcolorfff border-8r font14" >
<view class="dis-flex flex-sp mart10 marb10 paddbotm10 border-b">
<view class="dis-flex">
<!-- <image class="wuliu-img" src="https://pic.616pic.com/ys_bnew_img/00/07/04/1ZtrvD1AMY.jpg" mode="aspectFill"></image> -->
@ -135,18 +135,7 @@
trackNode
},
created(){
// this.tracesData=dataList.data;
// this.tracesData.logisticsTraceDetails=this.tracesData.logisticsTraceDetails.sort((item,item2)=>{
// if(item.logisticsStatus == 'TRANSPORT'){
// item.isMainNode=false;
// }else{
// item.isMainNode=true;
// }
// return item2.time - item.time;
// })
},
methods:{
show(logisticsNo){
@ -178,9 +167,11 @@
}else{
item.isMainNode=true;
}
return item2.time - item.time;
})
/* */
let mobile = /(1[0-9]{10})|([0-9]{3,4})?[0-9]{7,8}/g; //
let phone = [];
this.tracesData.logisticsTraceDetails.map(item=>{
@ -191,12 +182,14 @@
phone.push((num.match(mobile)))
}
// }
})
this.phoneNumber =phone.flat(Infinity);
// console.log(this.phoneNumber, phone)
/* */
}else{
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
@ -231,24 +224,7 @@
},
//
callPhone(){
// uni.showModal({
// title: '',
// content: '4006780738',
// success: function(res) {
// if (res.confirm) {
// uni.makePhoneCall({
// phoneNumber: '4006780738', //
// success: function(e) {
// console.log(e);
// },
// fail: function(e) {
// console.log(e);
// }
// })
// }
// }
// })
if(this.phoneNumber.length==0){
uni.showToast({
title:"暂无可拨打电话号码",
@ -259,7 +235,7 @@
}
//
this.phoneNumber = [...new Set(this.phoneNumber)];
this.phoneNumber = [...new Set(this.phoneNumber)];
let that = this;
uni.showActionSheet({
itemList: that.phoneNumber,
@ -283,6 +259,8 @@
}
});
},

Loading…
Cancel
Save