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

physical-merchants/address/addNewAddress/addNewAddress.vue

@@ -48,7 +48,7 @@
 
 					<!-- <view style="clear: both;"> -->
 						<view class="dis-flex scrol-t mart10">
-							<view class="form-gorup-title marRight10">详细地址:</view>
+							<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">
 								
@@ -313,7 +313,7 @@
 				
 				// console.log(desc)
 				this.defaultRegionCode = desc.adcode ;
-				this.userAddress.address = desc.address;
+				this.userAddress.address =desc.name + desc.address;
 				uni.showToast({
 					icon:'none',
 					title:"所在地区同步修改"