修改收货地址页面

pages/users/user_address/index.vue

@@ -1,44 +1,8 @@
-<style lang="scss">
-	.sel_addr_wrap {
-		height: 120rpx;
-		padding: 30rpx 0;
-
-		.sel_addr {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			margin: 0 30rpx;
-			border: 2rpx solid #40ae36;
-			height: 60rpx;
-			line-height: 60rpx;
-			text-align: center;
-			color: #40ae36;
-			border-radius: 10rpx;
-			font-weight: bold;
-
-			&:active {
-				background: rgba(64, 174, 54, .1);
-			}
-
-			text {
-				margin-right: 10rpx;
-			}
-		}
-	}
-</style>
 <template>
   <view :style="viewColor">
     <form @submit="formSubmit" report-submit='true'>
       <view class='addAddress'>
         <view class='list'>
-
-					<view 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='item acea-row row-between-wrapper'>
             <view class='name'>姓名</view>
             <input type='text' placeholder='请输入姓名' name='real_name' :value="userAddress.real_name"
@@ -52,19 +16,35 @@
           <view class='item acea-row row-between-wrapper'>
             <view class='name'>所在地区</view>
             <view class="region">
-							<view class="region_count" @click="handleToChoose">
+              <view class="region_count" @click="changeRegion">
-								<text v-if="!detail.length" style="color:#cdcdcd;">请选择地区</text>
+                <text v-if="!addressInfo.length" style="color:#cdcdcd;">请选择地区</text>
-								<text v-else>{{detail}}</text>
+                <text v-else>{{addressText}}</text>
                 <text class="iconfont icon-xiangyou"></text>
               </view>
             </view>
 
           </view>
+          <!-- <view class='item acea-row row-between-wrapper'>
+            <view class='name'>所在村队</view>
+            <view class="region">
+              <view class="region_count" @click="changevillage">
+                <text v-if="!villageInfo.length" style="color:#cdcdcd;">请选择村队</text>
+                <text v-else>{{villageText}}</text>
+                <text class="iconfont icon-xiangyou"></text>
+              </view>
+            </view>
 
+          </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 class="location" @click="selfLocation">
+              <text class="iconfont icon-chakanditu"></text>
+              <br>
+              定位
+            </view> -->
+
           </view>
         </view>
         <view class='default acea-row row-middle'>
@@ -106,9 +86,7 @@
   editAddress,
   getAddressDetail
 } from '@/api/user.js';
-	import {
+import { wgsToGcj } from "@/utils/wgs.js";
-		wgsToGcj
-	} from "@/utils/wgs.js";
 import {
   getCityV2,
   getCityList
@@ -148,15 +126,10 @@
       display: false,
       display_one: false,
       addressInfo: [],
-				newAddrInfo: '',
-				newPCAS: '',
       villageInfo: [],
       list: [],
       latitude: '',
-				longitude: '',
+      longitude: ''
-				detail: '', //四川省泸州市龙马潭区龙门大道15号
-				location: '', // 经纬度
-
     };
   },
   computed: {
@@ -185,28 +158,14 @@
     }
   },
   methods: {
-
-			// 选择地址
-			handleToChoose() {
-				let that = this;
-				uni.navigateTo({
-					url: "/pages/select_address_n/select_address_n",
-					success: (res) => {
-						uni.$once('changeAddress', res => {
-							console.log(res)
-							// this.newAddrInfo = res.addr; "name": "中国,四川省,泸州市,龙马潭区",
-							that.detail = res.addr.address;
-							that.location = res.addr.location;
-						})
-					}
-				})
-			},
-
     OnChangeAddress(address) {
       this.addressInfo = address;
       this.list = address
     },
-
+    OnChangevAddress(address) {
+      this.villageInfo = address;
+      console.log(this.villageInfo)
+    },
     // 地址数据
     getCityList: function() {
       let that = this;
@@ -249,9 +208,7 @@
         let region = [res.data.province, res.data.city, res.data.district, res.data.street, res
             .data.village
         ];
-					console.log({
+        console.log({...res.data});
-						...res.data
-					});
         that.$set(that, 'userAddress', res.data);
         that.$set(that, 'region', region);
         that.city_id = res.data.city_id
@@ -387,7 +344,6 @@
     formSubmit: function(e) {
       let that = this,
           value = e.detail.value;
-
       if (!value.real_name) return that.$util.Tips({
         title: '请填写收货人姓名'
       });
@@ -397,7 +353,7 @@
       if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
         title: '请输入正确的手机号码'
       });
-				if (!that.detail.length) return that.$util.Tips({
+      if (!that.addressInfo.length) return that.$util.Tips({
         title: '请选择所在地区'
       });
       // if (!that.villageInfo.length) return that.$util.Tips({
@@ -408,8 +364,8 @@
       });
       value.address_id = that.address_id;
       value.is_default = that.userAddress.is_default ? 1 : 0;
-				value.area = that.detail;
+      value.area = that.addressInfo;
-				// value.brigade = that.villageInfo[0]
+      value.brigade = that.villageInfo[0]
 
       uni.showLoading({
         title: '保存中',
@@ -514,11 +470,8 @@
 }
 
 .region .region_count {
-		// height: 42rpx;
+  height: 42rpx;
-		// line-height: 42rpx;
+  line-height: 42rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
 
   .icon-xiangyou {
     float: right;