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

components/cart-choose/cart-choose.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,

pages/user/order_list/order_list.vue

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

physical-merchants/classify/cart/cart.vue

@@ -213,14 +213,19 @@
 			this.initData();
 		},
 		methods: {
-			initData() {
+			initData(status) {
+				if(!status){
 						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;
@@ -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();
+					
 
 
 				})

physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue

@@ -1,7 +1,7 @@
 <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="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">
@@ -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,11 +182,13 @@
 										phone.push((num.match(mobile)))	
 									}
 								// }
+								
 							})
 							
 							this.phoneNumber =phone.flat(Infinity);
 							// console.log(this.phoneNumber, phone)
-							/*  */	
+							
+							
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -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:"暂无可拨打电话号码",
@@ -283,6 +259,8 @@
 					}
 				});
 				
+				
+				
 			},