From 98354a5f00c43955e561b350fd95b59798744520 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 9 May 2024 16:34:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E8=B4=A7=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/user_address/index.vue | 42 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index 18a8c1a..c8f43ab 100644
--- a/pages/users/user_address/index.vue
+++ b/pages/users/user_address/index.vue
@@ -70,23 +70,28 @@
 		<form @submit="formSubmit" report-submit='true'>
 			<view class='addAddress'>
 				<view class='list'>
-					<view class="sel_addr_wrap">
+
+					<view v-if="userAddress.detail != ''" class="sel_addr_update-wrap">
+						<view class="sel_addr_update">
+							<view class="sel_addr_wrap-l">
+								<view class="sel_addr_wrap-l-addr line1">{{userAddress.detail}}</view>
+								<view class="sel_addr_wrap-l-detail line1">{{userAddress.address_detail}}</view>
+							</view>
+							<view class="sel_addr_wrap-r" @click="handleToChoose">修改地址</view>
+						</view>
+					</view>
+					<view v-else class="sel_addr_wrap">
 						<view class="sel_addr" @click="handleToChoose">
 							<text>选择收货地址</text>
 							<u-icon name="arrow-right" size="16" color="#40ae36"></u-icon>
 						</view>
 					</view>
 
-					<view class="sel_addr_update-wrap">
-						<view class="sel_addr_update">
-							<view class="sel_addr_wrap-l">
-								<view class="sel_addr_wrap-l-addr line1">柏林湾</view>
-								<view class="sel_addr_wrap-l-detail line1">四川省泸州市龙马潭区陶然路三段1号</view>
-							</view>
-							<view class="sel_addr_wrap-r">修改地址</view>
-						</view>
+					<view class='item acea-row row-between-wrapper'>
+						<view class='name'>门牌号</view>
+						<input type='text' class="location-input" placeholder='详细地址,例:1栋101号' name='house_number'
+							placeholder-class='placeholder' v-model="userAddress.house_number"></input>
 					</view>
-
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'>姓名</view>
 						<input type='text' placeholder='请输入姓名' name='real_name' :value="userAddress.real_name"
@@ -109,11 +114,6 @@
 
           </view> -->
 
-					<view class='item acea-row row-between-wrapper'>
-						<view class='name'>详细地址</view>
-						<input type='text' class="location-input" placeholder='请填写具体地址' name='detail'
-							placeholder-class='placeholder' v-model="userAddress.detail"></input>
-					</view>
 				</view>
 				<view class='default acea-row row-middle'>
 					<checkbox-group @change='ChangeIsDefault'>
@@ -184,7 +184,7 @@
 				address_id: 0, //地址id
 				userAddress: {
 					is_default: false,
-					detail: '',
+					detail: ''
 				}, //地址详情
 				region: ['省', '市', '区'],
 				valueRegion: [0, 0, 0],
@@ -254,7 +254,8 @@
 				// #ifndef H5
 				uni.chooseLocation({
 					success: function(res) {
-						that.userAddress.detail = res.address;
+						that.userAddress.detail = res.name
+						that.userAddress.address_detail = res.address;
 						that.location = `${res.latitude},${res.longitude}`;;
 					}
 				});
@@ -308,9 +309,6 @@
 					let region = [res.data.province, res.data.city, res.data.district, res.data.street, res
 						.data.village
 					];
-					console.log({
-						...res.data
-					});
 					that.$set(that, 'userAddress', res.data);
 					that.$set(that, 'region', region);
 					that.city_id = res.data.city_id
@@ -446,7 +444,9 @@
 			formSubmit: function(e) {
 				let that = this,
 					value = e.detail.value;
-				value.location = this.location
+				value.location = that.location
+				value.detail = that.userAddress.detail
+				value.address_detail = that.userAddress.address_detail
 
 				if (!value.real_name) return that.$util.Tips({
 					title: '请填写收货人姓名'