From 1a3a5cc65f10caed17011c98001fe7dc0c0063f2 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Mon, 12 Jun 2023 17:36:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=87=8D=E7=8E=B0=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E6=B8=85=E7=A9=BA,=E8=B0=83=E6=95=B4=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/pick-regions/pick-regions.vue      |  24 +-
 .../address/addNewAddress/addNewAddress.vue   | 231 ++++++++++--------
 .../classify/goodsDetail/goodsDetail.vue      |   4 +-
 .../classify/order/wuliuPupup/wuliuPupup.vue  |   3 +-
 uni.scss                                      |   8 +-
 5 files changed, 151 insertions(+), 119 deletions(-)

diff --git a/components/pick-regions/pick-regions.vue b/components/pick-regions/pick-regions.vue
index e742f73..ce52508 100644
--- a/components/pick-regions/pick-regions.vue
+++ b/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')
+				}
+				
+				
 				
-				let address = [this.CHINA_REGIONS[this.multiIndex[0]],this.cityArr[this.multiIndex[1]],this.districtArr[this.multiIndex[2]]];
-				this.$emit('getRegion',address)
 				
             }
 		},
diff --git a/physical-merchants/address/addNewAddress/addNewAddress.vue b/physical-merchants/address/addNewAddress/addNewAddress.vue
index b6e9008..ed1ce42 100644
--- a/physical-merchants/address/addNewAddress/addNewAddress.vue
+++ b/physical-merchants/address/addNewAddress/addNewAddress.vue
@@ -1,7 +1,7 @@
 <template>
-	<view class="page-bottom-fixed backcor9" >
+	<view class="page-bottom-fixed backcor9">
 		<form @submit="form_submit" class="form-container">
-			<view class="pd-main border-box height100" :style="'overflow-y: auto;transform: translateY(-0px);'" >
+			<view class="pd-main border-box height100" :style="'overflow-y: auto;transform: translateY(-0px);'">
 				<view class="form-gorup  backcolorfff">
 					<view class="dis-flex">
 						<view class="form-gorup-title marRight10">收货人:
@@ -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">
@@ -47,26 +48,29 @@
 
 
 					<!-- <view style="clear: both;"> -->
-						<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">
-								
-									<view  class="selector-item" v-for="(item,index) in candidates"  :key="index" @click="getSelect(item)">
-										<view class="text1 name">
-											{{item.name}}
-										</view>
-										<view class="text1 address mart5">
-											{{item.address}}
-										</view>
-									</view>
-								
-								
-							</uni-combox>
-							<!-- <input type="text" name="address" v-model="userAddress.address" maxlength="40"
+					<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">
+
+							<view class="selector-item" v-for="(item,index) in candidates" :key="index"
+								@click="getSelect(item)">
+								<view class="text1 name">
+									{{item.name}}
+								</view>
+								<view class="text1 address mart5">
+									{{item.address}}
+								</view>
+							</view>
+
+
+						</uni-combox>
+						<!-- <input type="text" name="address" v-model="userAddress.address" maxlength="40"
 								placeholder-class="corf6" :class="'fcor666 bs-bb flex-1'" placeholder="详细地址1~40个字符"> -->
-						</view>
-						
+					</view>
+
 
 					<!-- </view> -->
 
@@ -77,7 +81,7 @@
 					<text class="font18">设为默认地址</text>
 				</view>
 
-				
+
 			</view>
 
 			<view class="bottom-fixed ">
@@ -91,7 +95,7 @@
 <script>
 	import pickRegions from '@/components/pick-regions/pick-regions.vue'
 	import UniCombox from '@/components/uni-combox/components/uni-combox/uni-combox.vue'
-	
+
 	import {
 		insertDeliveryAddress,
 		findDeliveryAddressById,
@@ -108,7 +112,7 @@
 					region: '',
 					address: "",
 					is_default: false,
-					
+
 				},
 				dataParams: null,
 				// 
@@ -117,15 +121,15 @@
 				//没用上
 				// defaultRegion: ['北京市', '市辖区', '东城区'],
 				defaultRegionCode: '',
-				
-				candidates:[
+
+				candidates: [
 					// {"name": "重庆国贸中心-东北门","address": "重庆市渝中区中华路189号",},
 					// {"name": "重庆国贸中心-东北门","address": "重庆市渝中区中华路189号",},
 					// {"name": "重庆国贸中心-东北门","address": "重庆市渝中区中华路189号",}
 				],
-				top:0,
-				top1:0,
-				height:0,
+				top: 0,
+				top1: 0,
+				height: 0,
 
 
 			};
@@ -133,7 +137,7 @@
 
 		components: {
 			pickRegions,
-			"uni-combox":UniCombox
+			"uni-combox": UniCombox
 
 		},
 
@@ -177,49 +181,48 @@
 
 		},
 
-		
+
 		async mounted() {
-		await	this.getRect('.scrol-t').then(res => {
-			       
-					this.top = res.top;
-					
-			        })
-				await	this.getRect('.bottom-fixed').then(res => {
-					        
-							this.top1 = res.top;
-							
-					        }) 
-							
-							this.height = this.top1 - this.top - 120;
-							
-							// console.log(this.top1,this.top,this.height)
+			await this.getRect('.scrol-t').then(res => {
+
+				this.top = res.top;
+
+			})
+			await this.getRect('.bottom-fixed').then(res => {
+
+				this.top1 = res.top;
+
+			})
+
+			this.height = this.top1 - this.top - 120;
+
+			// console.log(this.top1,this.top,this.height)
 		},
 
 		methods: {
-			
-			focusMethod(){
-				
-				
+
+			focusMethod() {
+
+
 			},
-			blurMethod(){
+			blurMethod() {
 				this.baiduApiMap(this.userAddress.address)
 			},
 			getRect(selector, all) {
-			            return new Promise(resolve => {
-			                uni.createSelectorQuery()
-			                    .in(this)
-			                    [all ? 'selectAll' : 'select'](selector)
-			                    .boundingClientRect(rect => {
-			                        if (all && Array.isArray(rect) && rect.length) {
-			                            resolve(rect);
-			                        }
-			                        if (!all && rect) {
-			                            resolve(rect);
-			                        }
-			                    })
-			                    .exec();
-			            });
-			        },
+				return new Promise(resolve => {
+					uni.createSelectorQuery()
+						.in(this)[all ? 'selectAll' : 'select'](selector)
+						.boundingClientRect(rect => {
+							if (all && Array.isArray(rect) && rect.length) {
+								resolve(rect);
+							}
+							if (!all && rect) {
+								resolve(rect);
+							}
+						})
+						.exec();
+				});
+			},
 			findAddressById(id) {
 				let params = {
 					id: id
@@ -251,7 +254,7 @@
 
 			// 获取选择的地区
 			handleGetRegion(region) {
-				
+
 				// let region = JSON.parse(JSON.stringify(reg))
 				this.region = region;
 				this.regionId = this.region[2].code;
@@ -267,59 +270,71 @@
 			init() {
 
 			},
-			
+
 			// //监听详细地址的onInput事件
 			// location(n){
 			// 	// this.userAddress.address = this.userAddress.address.replace(/\s+/g, "")
 			// },
-			
-			
-			baiduApiMap(query){
+
+
+			baiduApiMap(query) {
 				query = query.replace(/\s+/g, "")
-				let params={
-					query:query
+				let params = {
+					query: query
 				}
 				uni.showLoading({
-				        title: '加载中',
-				        mask:true,
-				    });
-				
+					title: '加载中',
+					mask: true,
+				});
+
 				// console.log(params,"params")
-				baiduApiMapSearch(params).then(res=>{
+				baiduApiMapSearch(params).then(res => {
 					uni.hideLoading();
 					console.log(res)
 					if (res.return_code == '000000') {
-					                    
-					    if(res.return_data&&res.return_data.length>0){
+
+						if (res.return_data && res.return_data.length > 0) {
 							this.candidates = res.return_data;
-							
-					    }else{
-							this.candidates=[]
+
+						} else {
+							this.candidates = []
 						}
-					
-					}else{
-						this.candidates=[]
-					    uni.showToast({
-					        title: res.return_msg,
-					        icon: 'none',
-					        duration: 2000
-					    })
+
+					} else {
+						this.candidates = []
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
-					
+
 				})
 			},
 			// 点击获取的详细地址
-			getSelect(desc){
-				
+			getSelect(desc) {
+
 				// console.log(desc)
-				this.defaultRegionCode = desc.adcode ;
-				this.userAddress.address =desc.name + desc.address;
+				this.defaultRegionCode = desc.adcode;
+				this.userAddress.address = desc.name + desc.address;
 				uni.showToast({
-					icon:'none',
-					title:"所在地区同步修改"
+					icon: 'none',
+					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 {
@@ -542,31 +558,32 @@
 		font-size: 24rpx;
 		color: #f00;
 	}
-	
-	
+
+
 	.selector-item {
-		
+
 		font-size: 16px;
 		text-align: center;
 		border-bottom: solid 1px #DDDDDD;
 		padding: 10px;
 		cursor: pointer;
 		text-align: left;
-		.name{
+
+		.name {
 			height: 18px;
 			line-height: 18px;
 			color: #3da7e7;
 			font-size: 16px;
 			font-weight: bold;
-			
+
 		}
-		.address{
+
+		.address {
 			font-size: 14px;
 			height: 16px;
 			line-height: 16px;
 			color: #666666;
-			
+
 		}
 	}
-	
 </style>
diff --git a/physical-merchants/classify/goodsDetail/goodsDetail.vue b/physical-merchants/classify/goodsDetail/goodsDetail.vue
index f6a97a0..5277dda 100644
--- a/physical-merchants/classify/goodsDetail/goodsDetail.vue
+++ b/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">
diff --git a/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
index 0d5fffd..2c7e9ea 100644
--- a/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
+++ b/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;
diff --git a/uni.scss b/uni.scss
index 4ae9ffc..1a6b300 100644
--- a/uni.scss
+++ b/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;