From d72f234cc7f9d77731c097bde84636a002cdc923 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Tue, 9 Apr 2024 18:04:21 +0800
Subject: [PATCH] 1

---
 config/app.js                                |   4 +-
 manifest.json                                |   4 +-
 pages/select_address_n/select_address_n.nvue | 805 ++++++++++---------
 pages/users/invite_code/index.vue            |  17 +-
 pages/users/user_address/index.vue           | 119 ++-
 5 files changed, 507 insertions(+), 442 deletions(-)

diff --git a/config/app.js b/config/app.js
index 6793edb..108a689 100644
--- a/config/app.js
+++ b/config/app.js
@@ -15,8 +15,8 @@ let openPlantGrass = '-openPlantGrass-'
 
 let httpSix, httpApi;
 
-const env = 'dev'; // 开发
-// const env = 'prod'; // 生产
+// const env = 'dev'; // 开发
+const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
diff --git a/manifest.json b/manifest.json
index dfeeaae..2e08a7f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
 	"name": "惠农生活",
 	"appid": "__UNI__3A527D1",
 	"description": "",
-	"versionName": "2.0.23",
-	"versionCode": 2023,
+	"versionName": "2.0.20",
+	"versionCode": 2020,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {
diff --git a/pages/select_address_n/select_address_n.nvue b/pages/select_address_n/select_address_n.nvue
index 942f13a..a2c40d5 100644
--- a/pages/select_address_n/select_address_n.nvue
+++ b/pages/select_address_n/select_address_n.nvue
@@ -1,425 +1,440 @@
 <template>
-  <view class="" style="background-color: #fff;">
-    <u-sticky customNavHeight="0">
-      <view class="head_top">
-        <!-- <u-search placeholder="搜索小区、办公楼等" @custom="searchMap"></u-search>
-        <view style="height: 20rpx;"></view> -->
-        <u-tabs :list="tabsList" itemStyle="font-size: 32rpx;height: 74rpx;" :current="current" @change="changeCurrent"
-          lineColor="#FF6D20" lineWidth="105rpx" height="7rpx"></u-tabs>
-        </u-tabs>
-      </view>
-    </u-sticky>
-    <view style="background-color: #f4f4f4;height: 30rpx;"></view>
-    <view class="address-box" v-if="current==0" style="padding: 0;">
-      <map style="width: 750rpx;height: 750rpx;" :longitude="longitude" :latitude="latitude" :markers="[markers]"
-        show-location @tap="handleMapTap"></map>
-      <view class="head_item" style="padding: 10rpx 20rpx;">
-        <view class="re-location">
-          <view style="width: 120rpx;"><text class="text">当前位置: </text></view>
-          <view style="flex: 1;">
-            <text
-              class="text">{{locationInfo.formatted_addresses?locationInfo.formatted_addresses.recommend:locationInfo.address}}</text>
-          </view>
-        </view>
-        <view class="re-btn" @click="reGetLocation">
-          <image class="re-address-img" src="@/static/images/re_address.png"></image><text class="text">重新定位</text>
-        </view>
-      </view>
-      <u-button text="确认" @click="submitAddress"></u-button>
-    </view>
-    <view class="address-box" v-if="current==1">
-      <view class="head_item_tips">
-        <view><text class="text">泸州区县</text></view>
-      </view>
-      <view class="area">
-        <view class="area-item" :class="{'area-item-on': item.code==area_change}" v-for="(item, index) in areaList"
-          :key="index" @click="changeArea(item)">
-          <text class="text">{{item.name}}</text>
-        </view>
-      </view>
-      <view class="head_item_tips">
-        <view><text class="text">选择街道/镇</text></view>
-      </view>
-      <view class="street">
-        <view class="letter-item" v-for="key in mapKey" :key="key">
-          <view class="letter"><text class="text">{{key}}</text></view>
-          <view class="item-box">
-            <view class="street-item" v-for="item in mapList[key]" :key="item.code" @click="changeStreet(item)">
-              <text class="text">{{item.name}}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+	<view class="" style="background-color: #fff;">
+		<u-sticky customNavHeight="0">
+			<view class="head_top">
+				<u-search placeholder="搜索小区、办公楼等" @custom="searchMap"></u-search>
+				<view style="height: 20rpx;"></view>
+				<u-tabs :list="tabsList" itemStyle="font-size: 32rpx;height: 74rpx;" :current="current"
+					@change="changeCurrent" lineColor="#FF6D20" lineWidth="105rpx" height="7rpx"></u-tabs>
+				</u-tabs>
+			</view>
+		</u-sticky>
+		<view style="background-color: #f4f4f4;height: 30rpx;"></view>
+		<view class="address-box" v-if="current==0" style="padding: 0;">
+			<map style="width: 750rpx;height: 750rpx;" :longitude="longitude" :latitude="latitude" :markers="[markers]"
+				show-location @tap="handleMapTap"></map>
+			<view class="head_item" style="padding: 10rpx 20rpx;">
+				<view class="re-location">
+					<view style="width: 120rpx;"><text class="text">当前位置: </text></view>
+					<view style="flex: 1;">
+						<text
+							class="text">{{locationInfo.formatted_addresses?locationInfo.formatted_addresses.recommend:locationInfo.address}}</text>
+					</view>
+				</view>
+				<view class="re-btn" @click="reGetLocation">
+					<image class="re-address-img" src="@/static/images/re_address.png"></image><text
+						class="text">重新定位</text>
+				</view>
+			</view>
+			<u-button text="确认" @click="submitAddress"></u-button>
+		</view>
+		<view class="address-box" v-if="current==1">
+			<view class="head_item_tips">
+				<view><text class="text">泸州区县</text></view>
+			</view>
+			<view class="area">
+				<view class="area-item" :class="{'area-item-on': item.code==area_change}"
+					v-for="(item, index) in areaList" :key="index" @click="changeArea(item)">
+					<text class="text">{{item.name}}</text>
+				</view>
+			</view>
+			<view class="head_item_tips">
+				<view><text class="text">选择街道/镇</text></view>
+			</view>
+			<view class="street">
+				<view class="letter-item" v-for="key in mapKey" :key="key">
+					<view class="letter"><text class="text">{{key}}</text></view>
+					<view class="item-box">
+						<view class="street-item" v-for="item in mapList[key]" :key="item.code"
+							@click="changeStreet(item)">
+							<text class="text">{{item.name}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-  import {
-    getGeocoder,
-    merClassifly,
-    getProductslist
-  } from '@/api/store.js';
-  import {
-    getArea,
-    getStreet
-  } from "@/api/article.js";
-  import { Toast } from '@/libs/uniApi';
-  import { wgsToGcj } from "@/utils/wgs.js";
-  export default {
-    data() {
-      return {
-        tabsList: [{
-          name: '地图定位',
-        }, {
-          name: '泸州区县',
-        }],
-        current: 0,
-        latitude: '28.87',
-        longitude: '105.44',
-        markers: {
-          id: 1,
-          longitude: '28.87',
-          latitude: '105.44',
-          iconPath: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/cbbd5202311241523412538.png',
-          width: 28,
-          height: 28
-        },
-        locationInfo: {},
-        town: '',
-        street_id: '',
-        street: '',
-        areaList: [],
-        streetList: [],
-        mapList: {},
-        area_change: '',
-        street_change: '',
-      }
-    },
-    onLoad(options) {
-      // #ifdef APP-PLUS
-      this.$store.dispatch("permission/requestPermissions",
-        'ACCESS_FINE_LOCATION').then(result => {
-        if (result == 1) {
-          this.getLoaction();
-          this.loadArea();
-        }
-      })
-      // #endif
-      // #ifndef APP-PLUS
-      this.getLoaction();
-      this.loadArea();
-      // #endif
-    },
-    onShow() {},
-    computed: {
-      mapKey() {
-        return Object.keys(this.mapList).sort()
-      }
-    },
-    methods: {
-      changeCurrent(e) {
-        this.current = e.index;
-      },
-      getLoaction() {
-        this.street = '定位中'
-        this.locationInfo = {};
-        this.locationInfo.formatted_addresses = {};
-        this.locationInfo.formatted_addresses.recommend = '定位中'
-        uni.setStorageSync('RejectTarget', false);
-        uni.getLocation({
-          type: 'gcj02',
-          success: (res) => {
-            // res = wgsToGcj(res);
-            let latitude, longitude;
-            latitude = res.latitude.toString();
-            longitude = res.longitude.toString();
-            this.latitude = res.latitude.toFixed(6);
-            this.longitude = res.longitude.toFixed(6);
-            this.$store.commit('setLocation', {
-              lat: res.latitude.toFixed(6),
-              long: res.longitude.toFixed(6),
-            });
-            getGeocoder({
-              lat: latitude,
-              long: longitude
-            }).then(res => {
-              this.locationInfo = res.data;
-              this.town = res.data.address_reference.town.title
-              this.street_id = res.data.address_reference.town.id
-              this.street = res.data.address_reference.town.title;
-            }).catch(err => {
-              uni.showToast({
-                title: err,
-                icon: 'none'
-              })
-              this.street = '定位失败'
-            })
-          },
-          fail: (err) => {
-            console.log('定位失败');
-            this.isshow = false
-            Toast('定位失败,请检查定位权限是否开启')
-            this.street = '定位失败'
-            this.locationInfo.formatted_addresses.recommend = '定位失败'
+	import {
+		getGeocoder,
+		merClassifly,
+		getProductslist
+	} from '@/api/store.js';
+	import {
+		getArea,
+		getStreet
+	} from "@/api/article.js";
+	import {
+		Toast
+	} from '@/libs/uniApi';
+	import {
+		wgsToGcj
+	} from "@/utils/wgs.js";
+	export default {
+		data() {
+			return {
+				tabsList: [{
+					name: '地图定位',
+				}, {
+					name: '泸州区县',
+				}],
+				current: 0,
+				latitude: '28.87',
+				longitude: '105.44',
+				markers: {
+					id: 1,
+					longitude: '28.87',
+					latitude: '105.44',
+					iconPath: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/cbbd5202311241523412538.png',
+					width: 28,
+					height: 28
+				},
+				locationInfo: {},
+				town: '',
+				street_id: '',
+				street: '',
+				areaList: [],
+				streetList: [],
+				mapList: {},
+				area_change: '',
+				street_change: '',
+				selectedInfo: {
+					address: '',
+					location: ''
+				}
+			}
+		},
+		onLoad(options) {
+			// #ifdef APP-PLUS
+			this.$store.dispatch("permission/requestPermissions",
+				'ACCESS_FINE_LOCATION').then(result => {
+				if (result == 1) {
+					this.getLoaction();
+					this.loadArea();
+				}
+			})
+			// #endif
+			// #ifndef APP-PLUS
+			this.getLoaction();
+			this.loadArea();
+			// #endif
+		},
+		onShow() {},
+		computed: {
+			mapKey() {
+				return Object.keys(this.mapList).sort()
+			}
+		},
+		methods: {
+			changeCurrent(e) {
+				this.current = e.index;
+			},
+			getLoaction() {
+				this.street = '定位中'
+				this.locationInfo = {};
+				this.locationInfo.formatted_addresses = {};
+				this.locationInfo.formatted_addresses.recommend = '定位中'
+				uni.setStorageSync('RejectTarget', false);
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						// res = wgsToGcj(res);
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude.toFixed(6);
+						this.longitude = res.longitude.toFixed(6);
+						this.$store.commit('setLocation', {
+							lat: res.latitude.toFixed(6),
+							long: res.longitude.toFixed(6),
+						});
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							this.locationInfo = res.data;
+							this.town = res.data.address_reference.town.title
+							this.street_id = res.data.address_reference.town.id
+							this.street = res.data.address_reference.town.title;
 
-            // uni.showToast({
-            // 	title: "获取定位超时",
-            // 	icon: 'none',
-            // 	duration: 2000
-            // });
-          }
-        });
-      },
-      reGetLocation() {
-        this.getLoaction()
-      },
-      loadArea() {
-        getArea({
-          city_code: 510500
-        }).then((res) => {
-          this.areaList = res.data;
-          this.changeArea(this.areaList[0]);
-        })
-      },
-      loadStreet(area_code) {
-        this.street_change = '';
-        getStreet({
-          area_code
-        }).then((res) => {
-          this.streetList = res.data;
-          this.initPinyin();
-        })
-      },
-      initPinyin() {
-        this.mapList = {};
-        this.streetList.forEach((item) => {
-          let str = item.pinyin?.toUpperCase();
-          str = str ? str : '#';
-          if (this.mapList[str]) {
-            this.mapList[str].push(item);
-          } else {
-            this.mapList[str] = [];
-            this.mapList[str].push(item)
-          }
-        })
-      },
-      changeArea(item) {
-        this.area_change = item.code;
-        this.loadStreet(this.area_change);
-      },
-      // 选择位置
-      changeStreet(item) {
-        uni.navigateBack({
-          success: () => {
-            uni.$emit('changeAddress', {
-              area: this.area_change,
-              street: item
-            })
-          }
-        })
-      },
-      // 点击地图
-      handleMapTap(e) {
-        // console.log('点击地图', e);
-        // #ifdef H5
-        return Toast('H5暂不支持选择坐标');
-        // #endif
-        let longitude = e.detail.longitude;
-        let latitude = e.detail.latitude;
-        this.markers.longitude = longitude;
-        this.markers.latitude = latitude;
-        // console.log('修改成功', this.markers);
-        getGeocoder({
-          lat: latitude,
-          long: longitude
-        }).then(res => {
-          // console.log(res);
-          this.locationInfo = res.data;
-        }).catch(err => {
-          uni.showToast({
-            title: err,
-            icon: 'none'
-          })
-          this.locationInfo = {};
-          this.locationInfo.formatted_addresses = {};
-          this.locationInfo.formatted_addresses.recommend = '定位失败'
-        })
-      },
-      submitAddress() {
-        try {
-          uni.setStorageSync('getAddress', true);
-          this.town = this.locationInfo.address_reference.town.title;
-          this.street_id = this.locationInfo.address_reference.town.id;
-          this.street = this.locationInfo.address_reference.town.title;
-          let obj = {
-            area: this.locationInfo.ad_info.adcode,
-            street: {
-              name: this.street,
-              code: this.street_id
-            },
-            latitude: this.latitude,
-            longitude: this.longitude
-          }
-          console.log({ ...obj });
-          uni.navigateBack({
-            success: () => {
-              uni.$emit('changeAddress', obj)
-            }
-          })
-        } catch (e) {
-          return Toast('地址有误,请重新选择')
-        }
-      },
-      searchMap() {
-        uni.request({
-          url: 'https://restapi.amap.com/v3/place/text?keywords=北京大学&city=beijing&offset=20&page=1&key=0799f37420c0784f1e6cba230a68bdb1&extensions=all',
-          success: (res) => {
-            console.log(res);
-          },
-          fail: (e) => {
-            console.log(e);
-          }
-        })
-      }
-    },
-    onPullDownRefresh() {
-      uni.stopPullDownRefresh()
-    }
-  }
+							this.selectedInfo.address = res.data.address;
+							this.selectedInfo.location = `${latitude},${longitude}`;
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+							this.street = '定位失败'
+						})
+					},
+					fail: (err) => {
+						console.log('定位失败');
+						this.isshow = false
+						Toast('定位失败,请检查定位权限是否开启')
+						this.street = '定位失败'
+						this.locationInfo.formatted_addresses.recommend = '定位失败'
+
+						// uni.showToast({
+						// 	title: "获取定位超时",
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
+					}
+				});
+			},
+			reGetLocation() {
+				this.getLoaction()
+			},
+			loadArea() {
+				getArea({
+					city_code: 510500
+				}).then((res) => {
+					this.areaList = res.data;
+					this.changeArea(this.areaList[0]);
+				})
+			},
+			loadStreet(area_code) {
+				this.street_change = '';
+				getStreet({
+					area_code
+				}).then((res) => {
+					this.streetList = res.data;
+					this.initPinyin();
+				})
+			},
+			initPinyin() {
+				this.mapList = {};
+				this.streetList.forEach((item) => {
+					let str = item.pinyin?.toUpperCase();
+					str = str ? str : '#';
+					if (this.mapList[str]) {
+						this.mapList[str].push(item);
+					} else {
+						this.mapList[str] = [];
+						this.mapList[str].push(item)
+					}
+				})
+			},
+			changeArea(item) {
+				this.area_change = item.code;
+				this.loadStreet(this.area_change);
+			},
+			// 选择位置
+			changeStreet(item) {
+				uni.navigateBack({
+					success: () => {
+						uni.$emit('changeAddress', {
+							area: this.area_change,
+							street: item
+						})
+					}
+				})
+			},
+			// 点击地图
+			handleMapTap(e) {
+				// console.log('点击地图', e);
+				// #ifdef H5
+				return Toast('H5暂不支持选择坐标');
+				// #endif
+				let longitude = e.detail.longitude;
+				let latitude = e.detail.latitude;
+				this.markers.longitude = longitude;
+				this.markers.latitude = latitude;
+				getGeocoder({
+					lat: latitude,
+					long: longitude
+				}).then(res => {
+					// console.log(res);
+					this.locationInfo = res.data;
+				}).catch(err => {
+					uni.showToast({
+						title: err,
+						icon: 'none'
+					})
+					this.locationInfo = {};
+					this.locationInfo.formatted_addresses = {};
+					this.locationInfo.formatted_addresses.recommend = '定位失败'
+				})
+			},
+			submitAddress() {
+				try {
+					uni.setStorageSync('getAddress', true);
+					this.town = this.locationInfo.address_reference.town.title;
+					this.street_id = this.locationInfo.address_reference.town.id;
+					this.street = this.locationInfo.address_reference.town.title;
+					let obj = {
+						area: this.locationInfo.ad_info.adcode,
+						street: {
+							name: this.street,
+							code: this.street_id
+						},
+						latitude: this.latitude,
+						longitude: this.longitude,
+						addr: {
+							...this.selectedInfo
+						}
+					}
+
+					uni.navigateBack({
+						success: () => {
+							uni.$emit('changeAddress', obj)
+						}
+					})
+				} catch (e) {
+					return Toast('地址有误,请重新选择')
+				}
+			},
+			searchMap() {
+				uni.request({
+					url: 'https://restapi.amap.com/v3/place/text?keywords=北京大学&city=beijing&offset=20&page=1&key=0799f37420c0784f1e6cba230a68bdb1&extensions=all',
+					success: (res) => {
+						console.log(res);
+					},
+					fail: (e) => {
+						console.log(e);
+					}
+				})
+			}
+		},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		}
+	}
 </script>
 
 <style>
-  /* page {
+	/* page {
     background-color: #fff;
   } */
 
-  .text {
-    font-size: 28rpx;
-    white-space: normal;
-  }
+	.text {
+		font-size: 28rpx;
+		white-space: normal;
+	}
 
-  .head_top {
-    background-color: #fff;
-    padding: 28rpx;
-  }
+	.head_top {
+		background-color: #fff;
+		padding: 28rpx;
+	}
 
-  .address-box {
-    border-radius: 21rpx 21rpx 0rpx 0rpx;
-    padding: 30rpx 28rpx;
-    width: 750rpx;
-  }
+	.address-box {
+		border-radius: 21rpx 21rpx 0rpx 0rpx;
+		padding: 30rpx 28rpx;
+		width: 750rpx;
+	}
 
-  .head_item {
-    width: 750rpx;
-    flex-direction: row;
-    justify-content: space-between;
-    padding-bottom: 28rpx;
-    font-size: 28rpx;
-    font-family: PingFang SC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #333333;
-  }
+	.head_item {
+		width: 750rpx;
+		flex-direction: row;
+		justify-content: space-between;
+		padding-bottom: 28rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+	}
 
-  .re-location {
-    flex-direction: row;
-    flex-wrap: nowrap;
-    width: 480rpx;
-    align-items: center;
-  }
+	.re-location {
+		flex-direction: row;
+		flex-wrap: nowrap;
+		width: 480rpx;
+		align-items: center;
+	}
 
-  .re-address-img {
-    width: 38.55rpx;
-    height: 38.55rpx;
-    margin-right: 10rpx;
-  }
+	.re-address-img {
+		width: 38.55rpx;
+		height: 38.55rpx;
+		margin-right: 10rpx;
+	}
 
-  .re-btn {
-    flex-direction: row;
-    padding-left: 10rpx;
-    width: 200rpx;
-    height: 100rpx;
-    align-items: center;
-  }
+	.re-btn {
+		flex-direction: row;
+		padding-left: 10rpx;
+		width: 200rpx;
+		height: 100rpx;
+		align-items: center;
+	}
 
-  .head_item_tips {
-    height: 44rpx;
-    font-size: 32rpx;
-    font-family: PingFang SC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #737373;
-  }
+	.head_item_tips {
+		height: 44rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #737373;
+	}
 
-  .address-list {
-    font-size: 28rpx;
-    font-family: PingFang SC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #333333;
-    height: 80rpx;
-    line-height: 75rpx;
-    border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
-  }
+	.address-list {
+		font-size: 28rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+		height: 80rpx;
+		line-height: 75rpx;
+		border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
+	}
 
-  .area {
-    flex-direction: row;
-    flex-wrap: wrap;
-    padding-top: 30rpx;
-    justify-content: flex-start;
-  }
+	.area {
+		flex-direction: row;
+		flex-wrap: wrap;
+		padding-top: 30rpx;
+		justify-content: flex-start;
+	}
 
-  .area-item {
-    height: 64rpx;
-    /* width: 100px; */
-    background-color: #fff;
-    border-radius: 11rpx 11rpx 11rpx 11rpx;
-    border: 2rpx solid #B3B3B3;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    padding: 0 20rpx;
-    font-size: 28rpx;
-    font-family: PingFang SC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #737373;
-    margin-bottom: 22rpx;
-    margin-right: 22rpx;
-  }
+	.area-item {
+		height: 64rpx;
+		/* width: 100px; */
+		background-color: #fff;
+		border-radius: 11rpx 11rpx 11rpx 11rpx;
+		border: 2rpx solid #B3B3B3;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 20rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #737373;
+		margin-bottom: 22rpx;
+		margin-right: 22rpx;
+	}
 
-  .area-item-on {
-    color: #ff6d20;
-    border: 2rpx solid #ff6d20;
-  }
+	.area-item-on {
+		color: #ff6d20;
+		border: 2rpx solid #ff6d20;
+	}
 
-  .street {
-    padding-top: 28rpx;
+	.street {
+		padding-top: 28rpx;
 
 
-  }
+	}
 
-  .letter-item {
-    flex-direction: row;
-  }
+	.letter-item {
+		flex-direction: row;
+	}
 
-  .letter {
-    margin-right: 28rpx;
-    font-size: 25rpx;
-    font-family: PingFang SC, PingFang SC;
-    font-weight: 400;
-    width: 40rpx;
-    text-align: center;
-    color: #737373;
-  }
+	.letter {
+		margin-right: 28rpx;
+		font-size: 25rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		width: 40rpx;
+		text-align: center;
+		color: #737373;
+	}
 
-  .item-box {
-    flex: 1;
-  }
+	.item-box {
+		flex: 1;
+	}
 
-  .street-item {
-    width: 100%;
-    padding-bottom: 28rpx;
-    font-size: 28rpx;
-    font-family: PingFang SC, PingFang SC;
-    font-weight: 400;
-    color: #333333;
-  }
+	.street-item {
+		width: 100%;
+		padding-bottom: 28rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/users/invite_code/index.vue b/pages/users/invite_code/index.vue
index f0d7764..7fdc9d9 100644
--- a/pages/users/invite_code/index.vue
+++ b/pages/users/invite_code/index.vue
@@ -18,8 +18,8 @@
 		</view>
 
 		<view class="con">
-			<image class="record"
-				src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_active_mer/new_active_mer_qrcode_record.webp">
+			<image mode="aspectFit" class="record"
+				src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/eec81202404091550527405.webp">
 			</image>
 
 			<view class="table" v-if="list.length > 0">
@@ -199,7 +199,7 @@
 
 <style lang="scss" scoped>
 	page {
-		background-color: #FFF3EF;
+		background-color: #fff;
 	}
 
 	.invite {
@@ -217,7 +217,7 @@
 			align-items: center;
 			width: 690rpx;
 			height: 666rpx;
-			background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_active_mer/new_active_mer_qrcode_bg.webp);
+			background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/5a3b2202404091555409835.webp);
 			background-size: 100%;
 			background-repeat: no-repeat;
 			padding-top: 54rpx;
@@ -261,18 +261,21 @@
 		}
 
 		.con {
-			background-color: #FFF3EF;
+			width: 100%;
+			background-color: #ECECEC;
 			padding: 192rpx 30rpx 0;
+			border-radius: 40rpx 40rpx 0 0;
 
 			image {
 				width: 100%;
-				height: 45rpx;
+				height: 42rpx;
 				margin-bottom: 40rpx;
 			}
 
 			.table {
 				#scrollView {
-					height: calc(100vh - 544rpx - 350rpx);
+					width: 100%;
+					height: calc(100vh - 544rpx - 340rpx);
 					overflow: auto;
 					padding-bottom: 20rpx;
 				}
diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index ad3941f..4426370 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"
@@ -16,35 +52,19 @@
 					<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>
+							<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>
-						<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'>
@@ -86,7 +106,9 @@
 		editAddress,
 		getAddressDetail
 	} from '@/api/user.js';
-  import { wgsToGcj } from "@/utils/wgs.js";
+	import {
+		wgsToGcj
+	} from "@/utils/wgs.js";
 	import {
 		getCityV2,
 		getCityList
@@ -126,10 +148,15 @@
 				display: false,
 				display_one: false,
 				addressInfo: [],
+				newAddrInfo: '',
+				newPCAS: '',
 				villageInfo: [],
 				list: [],
 				latitude: '',
-				longitude: ''
+				longitude: '',
+				detail: '', //四川省泸州市龙马潭区龙门大道15号
+				location: '', // 经纬度
+
 			};
 		},
 		computed: {
@@ -158,14 +185,28 @@
 			}
 		},
 		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;
@@ -208,14 +249,16 @@
 					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;
-          else {
-            
-          }
+					if (res.data.areas) that.addressInfo = res.data.areas;
+					else {
+
+					}
 					that.villageInfo = [res.data.brigade]
 				});
 			},
@@ -291,7 +334,7 @@
 				uni.getLocation({
 					type: 'gcj02',
 					success: (res) => {
-            res = wgsToGcj(res);
+						res = wgsToGcj(res);
 						let latitude, longitude;
 						latitude = res.latitude.toString();
 						longitude = res.longitude.toString();
@@ -344,6 +387,7 @@
 			formSubmit: function(e) {
 				let that = this,
 					value = e.detail.value;
+
 				if (!value.real_name) return that.$util.Tips({
 					title: '请填写收货人姓名'
 				});
@@ -353,7 +397,7 @@
 				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({
+				if (!that.detail.length) return that.$util.Tips({
 					title: '请选择所在地区'
 				});
 				// if (!that.villageInfo.length) return that.$util.Tips({
@@ -364,8 +408,8 @@
 				});
 				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 +514,11 @@
 	}
 
 	.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;