From df04614c50d08b7d249bf1ffd6a3ec79b627b0f9 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 8 May 2024 14:37:16 +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=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/user_address/index.vue | 136 +++++++++++++++++++++--------
 vue.config.js                      |   1 +
 2 files changed, 100 insertions(+), 37 deletions(-)

diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index c9f44f9..5a445d0 100644
--- a/pages/users/user_address/index.vue
+++ b/pages/users/user_address/index.vue
@@ -1,8 +1,44 @@
+<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"
@@ -13,38 +49,22 @@
             <input type='text' placeholder='请输入联系电话' name="phone" :value='userAddress.phone'
                    placeholder-class='placeholder'></input>
           </view>
-          <view class='item acea-row row-between-wrapper'>
+          <!-- <view class='item acea-row row-between-wrapper'>
             <view class='name'>所在地区</view>
             <view class="region">
-              <view class="region_count" @click="changeRegion">
-                <text v-if="!addressInfo.length" style="color:#cdcdcd;">请选择地区</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>
+              <view class="region_count" @click="handleToChoose">
+                <text v-if="!detail.length" style="color:#cdcdcd;">请选择地区</text>
+                <text v-else>{{detail}}</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'>
@@ -86,7 +106,9 @@ import {
   editAddress,
   getAddressDetail
 } from '@/api/user.js';
-import { wgsToGcj } from "@/utils/wgs.js";
+import {
+  wgsToGcj
+} from "@/utils/wgs.js";
 import {
   getCityV2,
   getCityList
@@ -113,7 +135,8 @@ export default {
       couponId: 0, //优惠券id
       address_id: 0, //地址id
       userAddress: {
-        is_default: false
+        is_default: false,
+		detail: '',
       }, //地址详情
       region: ['省', '市', '区'],
       valueRegion: [0, 0, 0],
@@ -126,10 +149,15 @@ export default {
       display: false,
       display_one: false,
       addressInfo: [],
+      newAddrInfo: '',
+      newPCAS: '',
       villageInfo: [],
       list: [],
       latitude: '',
-      longitude: ''
+      longitude: '',
+      detail: '', //四川省泸州市龙马潭区龙门大道15号
+      location: '', // 经纬度
+
     };
   },
   computed: {
@@ -158,14 +186,38 @@ export default {
     }
   },
   methods: {
+
+    // 选择地址
+    handleToChoose() {
+		let that = this;
+		// #ifdef H5
+		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;
+		    })
+		  }
+		})
+		// #endif
+		// #ifndef H5
+		uni.chooseLocation({
+			success: function (res) {
+				that.userAddress.detail = res.address;
+				that.location = `${res.latitude},${res.longitude}`;;
+			}
+		});
+		// #endif
+    },
+
     OnChangeAddress(address) {
       this.addressInfo = address;
       this.list = address
     },
-    OnChangevAddress(address) {
-      this.villageInfo = address;
-      console.log(this.villageInfo)
-    },
+
     // 地址数据
     getCityList: function() {
       let that = this;
@@ -208,11 +260,13 @@ export default {
         let region = [res.data.province, res.data.city, res.data.district, res.data.street, res
             .data.village
         ];
-        console.log({...res.data});
+        console.log({
+          ...res.data
+        });
         that.$set(that, 'userAddress', res.data);
         that.$set(that, 'region', region);
         that.city_id = res.data.city_id
-        if(res.data.areas) that.addressInfo = res.data.areas;
+        if (res.data.areas) that.addressInfo = res.data.areas;
         else {
 
         }
@@ -344,6 +398,8 @@ export default {
     formSubmit: function(e) {
       let that = this,
           value = e.detail.value;
+		  value.location = this.location
+
       if (!value.real_name) return that.$util.Tips({
         title: '请填写收货人姓名'
       });
@@ -353,19 +409,22 @@ export default {
       if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
         title: '请输入正确的手机号码'
       });
-      if (!that.addressInfo.length) return that.$util.Tips({
-        title: '请选择所在地区'
-      });
+      // if (!that.detail.length) return that.$util.Tips({
+      //   title: '请选择所在地区'
+      // });
       // if (!that.villageInfo.length) return that.$util.Tips({
       // 	title: '请选择所在村队'
       // });
       if (!value.detail) return that.$util.Tips({
         title: '请填写详细地址'
       });
+	  if (!value.location) return that.$util.Tips({
+	    title: '请填写详细地址'
+	  });
       value.address_id = that.address_id;
       value.is_default = that.userAddress.is_default ? 1 : 0;
-      value.area = that.addressInfo;
-      value.brigade = that.villageInfo[0]
+      value.area = that.detail;
+      // value.brigade = that.villageInfo[0]
 
       uni.showLoading({
         title: '保存中',
@@ -470,8 +529,11 @@ export default {
 }
 
 .region .region_count {
-  height: 42rpx;
-  line-height: 42rpx;
+  // height: 42rpx;
+  // line-height: 42rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 
   .icon-xiangyou {
     float: right;
diff --git a/vue.config.js b/vue.config.js
index d74d24e..9b302ca 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -8,6 +8,7 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 module.exports = {
+	publicPath: '/h5',
 	productionSourceMap: false, // 生产打包时不输出map文件，增加打包速度
 	configureWebpack: config => {
 		if (process.env.NODE_ENV === 'production') {