地址重现失败清空,调整样式

components/pick-regions/pick-regions.vue

@@ -150,23 +150,25 @@
                 this.$emit('getRegion',address)
             },
             handleDefaultRegion(region){
-				// console.log(region)
+				console.log(region,"region")
                 const isCode = !Array.isArray(region)
                 this.isInitMultiArray = false;
-                let children = this.CHINA_REGIONS
+                let children = this.CHINA_REGIONS;
+				let num =0;
                 for(let i=0;i<3;i++){
                     for(let j=0;j<children.length;j++){
 						let condition;
 						if(i==2){
 							 condition = isCode?String(children[j].code).slice(0)==region.slice(0):children[j].name.includes(region[i]);
-							// console.log(String(children[j].code).slice(0),region.slice(0))
+							console.log(String(children[j].code).slice(0),region.slice(0))
 						}else{
 							 condition = isCode?String(children[j].code).slice(0,(i+1)*2)==region.slice(0,(i+1)*2):children[j].name.includes(region[i]);
-							
+							// console.log(String(children[j].code).slice(0,(i+1)*2)==region.slice(0,(i+1)*2))
+							console.log(String(children[j].code).slice(0,(i+1)*2),region.slice(0,(i+1)*2))
 						}
 						
 					   if(condition){
-						  
+							num++;
                            // 匹配成功进行赋值
                            // console.log(i,j,children.length-1);
                            // children = children[j].childs;
@@ -192,7 +194,7 @@
                            break;
                        }else{
                            // 首次匹配失败就用默认的初始化
-                           // console.log(i,j,children.length-1);
+                           console.log(i,j,children.length-1,"匹配失败");
                            if(i==0 && j==(children.length-1)){
                                this.isInitMultiArray = true;
                            }
@@ -201,9 +203,15 @@
                     }
                 }
 				
-				
+				if(num == 3){
 					let address = [this.CHINA_REGIONS[this.multiIndex[0]],this.cityArr[this.multiIndex[1]],this.districtArr[this.multiIndex[2]]];
 					this.$emit('getRegion',address)
+				}else{
+					this.$emit('failureRegion')
+				}
+				
+				
+				
 				
             }
 		},

physical-merchants/address/addNewAddress/addNewAddress.vue

@@ -28,7 +28,8 @@
 
 				<view class="form-gorup backcolorfff">
 					<view class="">
-						<pick-regions :defaultRegion="defaultRegionCode" @getRegion="handleGetRegion">
+						<pick-regions @failureRegion="failureRegion" :defaultRegion="defaultRegionCode"
+							@getRegion="handleGetRegion">
 							<view class="dis-flex  ">
 								<view class=" form-gorup-title">所在地区:</view>
 								<view class="dis-flex flex-1 flex-end">
@@ -50,9 +51,12 @@
 					<view class="dis-flex scrol-t mart10">
 						<view class="form-gorup-title marRight10 align-self" style="padding: 0;">详细地址:</view>
 
-							<uni-combox :height="height" @focus="focusMethod" @blur="blurMethod" :cursorSpacing="50" placeholderClass="corf6" :candidates="candidates" class="flex-1" :isAddress="true" :isShowIcon="false" placeholder="请输入详细地址" v-model="userAddress.address">
+						<uni-combox :height="height" @focus="focusMethod" @blur="blurMethod" :cursorSpacing="50"
+							placeholderClass="corf6" :candidates="candidates" class="flex-1" :isAddress="true"
+							:isShowIcon="false" placeholder="请输入详细地址" v-model="userAddress.address">
 
-									<view  class="selector-item" v-for="(item,index) in candidates"  :key="index" @click="getSelect(item)">
+							<view class="selector-item" v-for="(item,index) in candidates" :key="index"
+								@click="getSelect(item)">
 								<view class="text1 name">
 									{{item.name}}
 								</view>
@@ -207,8 +211,7 @@
 			getRect(selector, all) {
 				return new Promise(resolve => {
 					uni.createSelectorQuery()
-			                    .in(this)
-			                    [all ? 'selectAll' : 'select'](selector)
+						.in(this)[all ? 'selectAll' : 'select'](selector)
 						.boundingClientRect(rect => {
 							if (all && Array.isArray(rect) && rect.length) {
 								resolve(rect);
@@ -316,10 +319,22 @@
 				this.userAddress.address = desc.name + desc.address;
 				uni.showToast({
 					icon: 'none',
-					title:"所在地区同步修改"
+					title: "所在地区同步修改",
+					duration:2000
+				})
+			},
+			failureRegion() {
+				this.defaultRegionCode = "";
+				this.regionId ="";
+				this.userAddress.region = "";
+				this.region = [];
+				uni.hideToast();
+				uni.showToast({
+					icon: 'none',
+					title: "地区同步修改失败,请手动选择",
+					duration:3000
 				})
 			},
-
 			// 默认地址设置改变
 			defaultChange(e) {
 				this.userAddress.is_default = !this.userAddress.is_default
@@ -500,6 +515,7 @@
 	/*表单*/
 	.form-container {
 		height: 100%;
+
 		/* display: flex;
 		flex-direction: column; */
 		.form-gorup {
@@ -552,6 +568,7 @@
 		padding: 10px;
 		cursor: pointer;
 		text-align: left;
+
 		.name {
 			height: 18px;
 			line-height: 18px;
@@ -560,6 +577,7 @@
 			font-weight: bold;
 
 		}
+
 		.address {
 			font-size: 14px;
 			height: 16px;
@@ -568,5 +586,4 @@
 
 		}
 	}
-	
 </style>

physical-merchants/classify/goodsDetail/goodsDetail.vue

@@ -26,7 +26,7 @@
 
 			<!-- 选择参数 -->
 			<view class="br bg-white parameter  width100 " @click="showPopup(1)">
-				<view class=" ">
+				<view class=" font16">
 					选择
 				</view>
 				<view class="color999 font14">
@@ -36,7 +36,7 @@
 			</view>
 			<!-- 保障 -->
 			<view class="br bg-white parameter  width100 " @click="showPopup(2)">
-				<view class=" ">
+				<view class="font16 ">
 					保障
 				</view>
 				<view class="color999 font14">

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

@@ -1,6 +1,6 @@
 <template>
 	<wybPopup @touchmove.stop ref="popup"  zIndex="999"  type="bottom" width="500" height="500" :scrollY="true" radius="0" :showCloseIcon="true">
-		<view class="pd-main wuliupop height100  border-box backcor9">
+		<view class="pd-main wuliupop   border-box backcor9">
 			<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">
@@ -286,6 +286,7 @@
 	
 .wuliupop{
 	padding: 50px 10px 10px;
+	min-height: 100%;
 }
 .pop-title{
 		text-align: center;

uni.scss

@@ -794,7 +794,9 @@ $uni-font-size-paragraph:30upx;
 .paddbotm20 {
   padding-bottom: 20px;
 }
-
+.paddbotm60 {
+  padding-bottom: 60px;
+}
 
 /*内边距*/
 .pd-main{
@@ -803,6 +805,10 @@ $uni-font-size-paragraph:30upx;
 .pd-lr{
 	padding:0 20rpx;
 }
+.pd-h{
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+}
 /* 左悬浮 */
 .flleft {
   float: left;