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

physical-merchants/address/addNewAddress/addNewAddress.vue

@@ -17,7 +17,7 @@
 					
 						<view class="form-gorup-title">联系人<text class="form-group-tips-must">*</text>
 						</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个字符">
 					
 					<view class="width100 mart10 border-b">
@@ -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() {

physical-merchants/address/address.vue

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

physical-merchants/classify/cart/cart.vue

@@ -82,7 +82,7 @@
 						</label>
 						<!--  -->
 					</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>
@@ -208,19 +208,18 @@
 			this.initData();
 		},
 		methods: {
-			initData(status) {
-				if(!status){
+			initData() {
+				
 						uni.showLoading({
 							title: '加载中',
 							mask:true,
 							duration:2000
 						});
-						// console.log(20)
-					}
+						
+					
 				getShoppingCartList().then(res => {
-					if(!status){
+					 setTimeout(()=>{
 						 uni.hideLoading();
-					}
 						 if (res.return_code == '000000') {
 						 	this.allCheck.whetherCheck = false;
 						 	this.cartList = res.return_data;
@@ -228,8 +227,6 @@
 						 	// 测试失效数据
 						 	// this.cartList[0].loseEfficacy=true;
 						 
-						
-						
 						 	this.allCheckInit(); //全选是否勾中判断
 						 
 						 } else {
@@ -239,6 +236,9 @@
 						 		duration: 2000
 						 	})
 						 }
+					 },100)
+					
+					
 				})
 			},
 			editDelete() {
@@ -504,13 +504,16 @@
 						this.initData();
 					} else {
 						//增加数量失败 
+						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;

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

physical-merchants/classify/goodsDetail/goodsDetail.vue

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

physical-merchants/classify/order/orderDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="backcor9 pd-main pdb50 headsbg">
+	<view class="backcor9 pd-main pdb60 headsbg">
 
 
 		<!-- 待支付 -->
@@ -264,7 +264,18 @@
 		</view> -->
 		<view v-if="recinfo.orderStatus != 1" class="toPay font14  backcolorfff">
 			
+			<!-- #ifdef MP-->
+			<button open-type="contact" class="btn" style="margin: 0; box-sizing: content-box;line-height: unset;">
+				联系客服
+				<!-- <image src="../../../static/img/home/cusser.png" mode="widthFix" class="icon30"></image> -->
+			</button>
+
+			<!-- #endif -->
+			<!-- #ifdef H5-->
 			<view class="btn" @click="playPhone">联系客服</view>
+			<!-- #endif -->
+			
+			
 		</view>
 		<wuliuPopup ref="wuliu"></wuliuPopup>
 	</view>
@@ -370,7 +381,12 @@
 					orderNo: this.orderId,
 				}
 				getDetailByOrderNo(params).then(res => {
+					
+					setTimeout(()=>{
 						uni.hideLoading();
+					},100)
+					
+					
 					if (res.return_code == '000000') {
 						this.recinfo = res.return_data;
 						// if (res.return_data.productType == 6) {
@@ -504,7 +520,7 @@
 					url: '/physical-merchants/classify/order/pay?obj=' + obj
 				})
 			},
-			//拨打客服电话
+			//联系客服
 			playPhone() {
 					uni.showModal({
 						title: '客服',
@@ -666,8 +682,8 @@
 		border-radius: 15px;
 	}
 
-	.pdb50 {
-		padding-bottom: 50px;
+	.pdb60 {
+		padding-bottom: 60px;
 	}
 
 	// 底部待支付按钮
@@ -691,7 +707,7 @@
 			margin-left: 15px;
 			border: 1px solid #666666;
 			color: #666666;
-
+			font-size: 16px;
 			&.bgred {
 				color: #ffffff;
 				background-color: #FF2342;

physical-merchants/classify/order/paymentResult.vue

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

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

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

physical-merchants/settleAccounts/settleAccounts.vue

@@ -478,7 +478,9 @@
 				});
 				this.postPrice = 0;
 				getAddressPrice().then(res => {
+					setTimeout(()=>{
 						uni.hideLoading();
+					},100)
 					this.isFirstSearchAddress = false;
 					if (res.return_code == '000000') {
 						if (res.return_data) {
@@ -730,7 +732,7 @@
 				
 
 				uni.showLoading({
-					title: '支付中...'
+					title: ''
 				})
 				createOrder(params).then(res => {
 					uni.hideLoading();