fix:冲突解决

config.js

@@ -2,8 +2,8 @@
 const config = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	//cloud后台网关地址
-	baseUrl: 'http://192.168.100.94:9527',
-	// baseUrl: 'https://zybooks.tech/prod-api',
+	// baseUrl: 'http://192.168.100.94:9527',
+	baseUrl: 'https://zybooks.tech/prod-api',
 	mapKey:'KFEBZ-P2GKZ-A5PX4-7Q6Y7-KXOBF-XCB4C',
 	appName: '金邻助家',
 	// 应用信息

pages.json

@@ -335,10 +335,6 @@
 			"version": "1.0.2",
 			"provider": "wx63ffb7b7894e99ae"
 		}
-		// "chooseLocation": {
-		// 	"version": "1.1.1",
-		// 	"provider": "wx76a9a06e5b4e693e"
-		// }
 	},
 	"permission": {
 		"scope.userFuzzyLocation": {

pages_classify/pages/order/index.vue

@@ -34,9 +34,9 @@
 						<view class="info-item">{{ detaile.volunteerReview }}</view>
 					</view>
 				</view>
-				<view class="upload-box">
+				<view class="upload-box-see">
 					<view class="upload-img-item" v-for="(item) in volunteerPicture" :key="item.url">
-						<img class="upload-img" :src="item.url" :alt="item.fileName" srcset="">
+						<img class="upload-img-see" :src="item.url" :alt="item.fileName" srcset="">
 					</view>
 				</view>
 			</view>
@@ -48,9 +48,9 @@
 						<view  class="info-item">{{ detaile.userReview || '用户未完成评价'}}</view>
 					</view>
 				</view>
-				<view class="upload-box">
+				<view class="upload-box-see">
 					<view class="upload-img-item" v-for="(item) in userPicture" :key="item.url">
-						<img class="upload-img" :src="item.url" :alt="item.fileName" srcset="">
+						<img class="upload-img-see" :src="item.url" :alt="item.fileName" srcset="">
 					</view>
 				</view>
 			</view>
@@ -278,19 +278,19 @@ onLoad((options) => {
 	}
 
 	.upload-img {
-		// height: 68px;
-		// width: 68px;
+		height: 68px;
+		width: 68px;
 		margin-right: 12px;
 		margin-bottom: 12px;
 	}
 
 	.upload-box {
-		// display: flex;
-		// flex-wrap: wrap;
 		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+		flex-wrap: wrap;
+		// display: flex;
+		// flex-direction: column;
+		// align-items: center;
+		// justify-content: center;
 
 		.upload-img-item {
 			position: relative;
@@ -303,6 +303,15 @@ onLoad((options) => {
 			}
 		}
 	}
+	.upload-box-see {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.upload-img-see{
+			margin-bottom: 12px;
+		}
+	}
 
 	.phone {
 		color: #3c9cff;

pages_mine/components/setupUser/Add.vue

@@ -36,7 +36,7 @@
 					</view>
 				</pickerAddress>
 				<template #right>
-					<up-icon name="arrow-right"></up-icon>
+					<up-icon name="map" size="22" @click="onCityWx"></up-icon>
 				</template>
 			</up-form-item>
 			<up-form-item label="地址" prop="address" borderBottom labelWidth="70">
@@ -57,6 +57,7 @@
 		computed
 	} from 'vue';
 	import pickerAddress from '@/pages_mine/components/pickerAddress/pickerAddress.vue' // 地区选择器组件
+	import { splitAddress } from '@/utils/adress'
 	const formRef = ref(null)
 	const modelForm = ref({
 		name: '',
@@ -198,7 +199,30 @@
 		modelForm.value.districtInd = index[2]
 
 	}
-
+	function onCityWx(row) {
+    console.log('地区选点',row);
+    wx.chooseLocation({
+        success: function (res) {
+            const result = splitAddress(res.address);
+            console.log(res,result);
+            modelForm.value.provinceName = result.province
+			modelForm.value.cityName = result.city
+			modelForm.value.districtName = result.district
+			modelForm.value.address = result.detail
+			modelForm.value.longitude =res.longitude
+			modelForm.value.latitude = res.latitude
+
+
+        },
+        fail: function (err) {
+            console.log(err);
+            uni.showToast({
+			title:'获取地址失败',
+			icon: 'error',
+		});
+        },
+    })
+}
 	
 	// 预留校验函数
 	function handleVerify() {

pages_mine/pages/selectAddress/index.vue

@@ -141,6 +141,7 @@
 	  padding: 24rpx 0;
 	  border-bottom: 1rpx solid #f0f0f0;
 	  position: relative; /* 可选：用于绝对定位 */
+	  width: 100%;
 	}
 	.radio-group {
 		flex-shrink: 0;