优化

api/home.js

@@ -14,4 +14,12 @@ export function settingHomeAddress(data) {
         method: 'post',
         data
     })
+}
+
+
+export function regionAddresstree() {
+    return request({
+        url: `/utils/common/region/tree`,
+        method: 'get',
+    })
 }

components/CustomTabBar/index.vue

@@ -2,13 +2,13 @@
     <view class="tab_bar">
         <view class="tabbarBox">
             <view class="handleBox" v-for="(item, index) in tabBarList" :key="index">
-                <view class="menuBox" @click="goPages(item,index)">
+                <view class="menuBox" @click="goPages(item)">
                     <view class="menuIcon">
-                        <image v-if="index != selectIndex" class="img" :src="item.iconPath"></image>
+                        <image v-if="item.key != selectIndex" class="img" :src="item.iconPath"></image>
                         <image v-else class="img" :src="item.selectedIconPath"></image>
                     </view>
                     <view class="menuName">
-                        <text :class="index == selectIndex ? 'TextColor' : 'Text'">{{ item.text }}</text>
+                        <text :class="item.key == selectIndex ? 'TextColor' : 'Text'">{{ item.text }}</text>
                     </view>
                 </view>
             </view>
@@ -22,7 +22,7 @@ export default {
     props: {
         page: {
             type: String,
-            default: "homeIndex"
+            default: "home"
         }
     },
     watch: {
@@ -52,24 +52,28 @@ export default {
                     "iconPath": "/static/images/tabbar/home.png",
                     "selectedIconPath": "/static/images/tabbar/home_.png",
                     "text": "首页",
+                    key:'home'
                 },
                 {
                     "pagePath": "/pages/mallMenu",
                     "iconPath": "/static/images/tabbar/class.png",
                     "selectedIconPath": "/static/images/tabbar/class_.png",
                     "text": "分类",
+                    key:'class'
                 },
                 {
                     "pagePath": "/pages/classify",
                     "iconPath": "/static/images/tabbar/work.png",
                     "selectedIconPath": "/static/images/tabbar/work_.png",
                     "text": "订单",
+                    key:'order'
                 },
                 {
                     "pagePath": "/pages/mine",
                     "iconPath": "/static/images/tabbar/mine.png",
                     "selectedIconPath": "/static/images/tabbar/mine_.png",
                     "text": "我的",
+                    key:'mine'
                 }
             ]
             }
@@ -79,12 +83,21 @@ export default {
                     "iconPath": "/static/images/tabbar/home.png",
                     "selectedIconPath": "/static/images/tabbar/home_.png",
                     "text": "首页",
+                     key:'home'
                 },
                 {
                     "pagePath": "/pages/mallMenu",
                     "iconPath": "/static/images/tabbar/class.png",
                     "selectedIconPath": "/static/images/tabbar/class_.png",
                     "text": "分类",
+                     key:'class'
+                },
+                {
+                    "pagePath": "/pages/release",
+                    "iconPath": "/static/images/tabbar/class.png",
+                    "selectedIconPath": "/static/images/tabbar/class_.png",
+                    "text": "发布",
+                    key:'release'
                 },
                 // {
                 //     "pagePath": "/pages/chat",
@@ -97,12 +110,14 @@ export default {
                     "iconPath": "/static/images/tabbar/work.png",
                     "selectedIconPath": "/static/images/tabbar/work_.png",
                     "text": "订单",
+                     key:'order'
                 },
                 {
                     "pagePath": "/pages/mine",
                     "iconPath": "/static/images/tabbar/mine.png",
                     "selectedIconPath": "/static/images/tabbar/mine_.png",
                     "text": "我的",
+                    key:'mine'
                 }
             ]
         }
@@ -115,8 +130,8 @@ export default {
     }, 
     methods: {
         //进入tabble页
-        goPages(page,index) {
-            console.log('page,index',page,index,this.userType);
+        goPages(page) {
+            console.log('page,index',page);
             uni.switchTab({
                 url: page.pagePath
             })

config.js

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

pages.json

@@ -60,6 +60,12 @@
 			"style": {
 				"navigationBarTitleText": "消息"
 			}
+		},
+		{
+			"path": "pages/release",
+			"style": {
+				"navigationBarTitleText": "发布"
+			}
 		}
 	],
 	"subPackages": [
@@ -134,6 +140,12 @@
 					"style": {
 						"navigationBarTitleText": "地址编辑"
 					}
+				},
+				{
+					"path": "pages/qualifications/index",
+					"style": {
+						"navigationBarTitleText": "资质管理"
+					}
 				}
 			]
 		},
@@ -371,10 +383,10 @@
 				"text": "我的"
 			},
 			{
-				"pagePath": "pages/chat",
+				"pagePath": "pages/release",
 				"iconPath": "static/images/tabbar/class.png",
 				"selectedIconPath": "static/images/tabbar/class_.png",
-				"text": "消息"
+				"text": "发布"
 			}
 		]
 	},
@@ -384,10 +396,6 @@
 		"navigationBarBackgroundColor": "#FFFFFF"
 	},
 	"plugins": {
-		"citySelector": {
-			"version": "1.0.2",
-			"provider": "wx63ffb7b7894e99ae"
-		}
 	},
 	"permission": {
 		"scope.userLocation": {

pages/classify.vue

@@ -21,7 +21,7 @@
         </view>
       </view>
     </view>
-    <custom-tab-bar :page="2" />
+    <custom-tab-bar page="order" />
   </view>
 </template>
 

pages/index.vue

@@ -48,7 +48,7 @@
 
 		</view>
 
-		<custom-tab-bar :page="0" />
+		<custom-tab-bar page="home" />
 	</view>
 </template>
 
@@ -233,6 +233,8 @@ const getBanners = async () => {
 
 const settingAddress = async() => {
 	try {
+		console.log('data',data);
+		
 		const {address}=data;
 		const {cityCode,latitude,longitude} = address;
 		const parmas = {

pages/mallMenu.vue

@@ -27,7 +27,7 @@
                 </view>
             </scroll-view>
         </view>
-        <CustomTabBar :page="1"/>
+        <CustomTabBar page="class"/>
     </view>
 </template>
 <script>

pages/mine.vue

@@ -84,7 +84,7 @@
 			</view>
 		</view>
 
-		<custom-tab-bar :page="3" />
+		<custom-tab-bar page="mine" />
 	</view>
 </template>
 
@@ -159,10 +159,15 @@ const userType = uni.getStorageSync('userType') //读取本地存储
 
 const adminList = ref(
 	[
+		// {
+		// 	name: '差评申述',
+		// 	iconName: 'chat',
+		// 	page: '/pages_mine/pages/bad/index'
+		// },
 		{
-			name: '差评申述',
+			name: '资质申请',
 			iconName: 'chat',
-			page: '/pages_mine/pages/bad/index'
+			page: '/pages_home/pages/qualifications/index'
 		},
 		{
 			name: '帮助与客服',

pages/release.vue

@@ -0,0 +1,10 @@
+<template>
+    <view>
+        <view>发布</view>
+        <custom-tab-bar page="release" />
+    </view>
+</template>
+
+<script setup>
+import CustomTabBar from '@/components/CustomTabBar/index.vue'
+</script>

pages_home/components/cust-form/index.vue

@@ -72,10 +72,13 @@
 
                 <up-form-item v-if="item.type === 'city'" :label="item.label" :prop="item.key" borderBottom
                     labelWidth="94" :required="item.required">
-                        <pickerAddress @change="(info)=>addressChange(info,item)"
-                        :selectValue="[ formData.provinceInd, formData.cityInd, formData.districtInd ]">
+                    <pickerAddress 
+                        @change="(info)=>addressChange(info,item)"
+                        :selectValue="[ formData.provinceInd, formData.cityInd, formData.districtInd ]"
+                        >
                         <view class="inp"
-                            :class="formData.provinceName&&formData.cityName&&formData.districtName?'':'address-inp'">
+                            :class="formData.provinceName&&formData.cityName&&formData.districtName?'':'address-inp'"
+                            >
                             {{formData.provinceName ? formData.provinceName:'省'}} /
                             {{formData.cityName ? formData.cityName:'市'}} /
                             {{formData.districtName ? formData.districtName:'区'}}
@@ -124,6 +127,7 @@ import {
     onUnload
 } from "@dcloudio/uni-app";
 import { splitAddress,getCityCode } from '@/utils/adress'
+import {regionAddresstree} from '@/api/home.js'
 
 import pickerAddress from '../pickerAddress/pickerAddress.vue'
 
@@ -369,9 +373,10 @@ function addressChange(info,row) {
 function onCityWx(row) {
     console.log('地区选点',row);
     wx.chooseLocation({
-        success: function (res) {
+        success:async function (res) {
             const result = splitAddress(res.address);
-            const handlecityData = getCityCode([result.province,result.city,result.district].join(' '))
+            const res_dara = await regionAddresstree();
+            const handlecityData = getCityCode([result.province,result.city,result.district].join(' '),res_dara.data)
             console.log(res,handlecityData);
             addressChange(handlecityData,row)
 

pages_home/pages/qualifications/index.vue

@@ -0,0 +1,35 @@
+<template>
+    <view>
+        <view class="status-btn" @click="onAdd">申请</view>
+    </view>
+</template>
+<script setup>
+
+const onAdd = () => {
+    uni.navigateTo({
+        url: `/pages_home/pages/register/index?data=${encodeURIComponent(JSON.stringify({
+            icon: '/static/Tioimages/15-旅游服务-01.png',
+            name: '旅游服务',
+            key: 7,
+        }))}`
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+.status-btn {
+    // width: 716rpx;
+    height: 96rpx;
+    border-radius: 16rpx;
+    background: rgba(221, 94, 69, 1);
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    font-size: 32rpx;
+    font-weight: 400;
+    color: rgba(255, 255, 255, 1);
+    margin-bottom: 88rpx;
+}
+</style>

pages_home/pages/register/index.vue

@@ -4,7 +4,7 @@
 			<FontTitle title="请完成注册信息填报" />
 			<CustForm :column="com_column" ref="cust_form_ref" :isCode="isAdd" />
 		</view>
-		<view class="register-card">
+		<!-- <view class="register-card">
 
 			<view class="info-list">
 				<view class="font-title">服务类别（ {{ serviceOptions.length }} ）</view>
@@ -65,7 +65,7 @@
 
 
 			</view>
-		</view>
+		</view> -->
 
 		<view class="register-card" v-if="details.appStatus === '3'">
 			<view class="font-title">驳回原因</view>
@@ -80,8 +80,6 @@
 		</view>
 
 
-
-		<!-- <up-button  color="rgba(221, 94, 69, 1)" text="确定" @click="onSubmit" ></up-button> -->
 		<view class="status-btn" @click="onSubmit">确定</view>
 
 	</view>
@@ -237,34 +235,34 @@ function onSubmit() {
 				}
 			}
 
-			if (!(serviceKeys.threeKeyname || serviceKeys.itemKeyname || serviceKeys.classKeyname)) {
-				uni.showToast({
-					title: '请选择服务',
-					icon: 'none'
-				})
-				return
-			}
-			if (!serviceKeys.time) {
-				uni.showToast({
-					title: '请选择服务时长',
-					icon: 'none'
-				})
-				return
-			}
-			if (!serviceKeys.price) {
-				uni.showToast({
-					title: '请输入服务价格',
-					icon: 'none'
-				})
-				return
-			}
+			// if (!(serviceKeys.threeKeyname || serviceKeys.itemKeyname || serviceKeys.classKeyname)) {
+			// 	uni.showToast({
+			// 		title: '请选择服务',
+			// 		icon: 'none'
+			// 	})
+			// 	return
+			// }
+			// if (!serviceKeys.time) {
+			// 	uni.showToast({
+			// 		title: '请选择服务时长',
+			// 		icon: 'none'
+			// 	})
+			// 	return
+			// }
+			// if (!serviceKeys.price) {
+			// 	uni.showToast({
+			// 		title: '请输入服务价格',
+			// 		icon: 'none'
+			// 	})
+			// 	return
+			// }
 
 			const parmas = {
 				serviceCategory: data.value.key,
 				...file_url,
-				businessManagementId: serviceKeys.threeKey || serviceKeys.itemKey || serviceKeys.classKey,
-				businessPrice: serviceKeys.price,
-				businessDuration: serviceKeys.time
+				// businessManagementId: serviceKeys.threeKey || serviceKeys.itemKey || serviceKeys.classKey,
+				// businessPrice: serviceKeys.price,
+				// businessDuration: serviceKeys.time
 			};
 			for (const key in res) {
 				parmas[key] = key == 'sex' ? sex_status[res[key]] : res[key];

q

@@ -1,770 +0,0 @@
-commit a4f2d018db4e2d5ad2203dfc959f4111ee60642b (HEAD -> jyb_20250422_dev)
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Mon Apr 28 11:24:21 2025 +0800
-
-    用户端列表修改
-
-commit 0fdfb791d6fb8f5adc9f3a0bc6164071f5a7aac6
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Sun Apr 27 15:34:30 2025 +0800
-
-    下单地址id修改，分类志愿者图片修改
-
-commit cffde0b5e0db5c0a06c7ec3ab4c3ad02f677d2c2
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Sun Apr 27 13:48:52 2025 +0800
-
-    用户订单服务时长修改
-
-commit cb1a1e60a044b43337805e1292b36e3876071dcd
-Merge: 72088bc a682086
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Sun Apr 27 10:29:10 2025 +0800
-
-    fix:冲突解决
-
-commit 72088bc9600e22a534cbcdc868186ba981449a5d
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Sun Apr 27 10:26:47 2025 +0800
-
-    用户订单时间禁用修改/支付交互
-
-commit a6820862c54a81319e3b35584ecf720b047064e9
-Author: chenjj <18696601943@163.com>
-Date:   Sun Apr 27 09:43:12 2025 +0800
-
-    fix: 地图
-
-commit 54bbfd6e5a9bb139a45fa0a68f4474ed08788769
-Author: chenjj <18696601943@163.com>
-Date:   Sun Apr 27 09:22:08 2025 +0800
-
-    fix:　代码合并
-
-commit d7cdb4602f082edb92aa473f7132ef700b7df13b
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Sun Apr 27 09:20:11 2025 +0800
-
-    首页列表分页参数修改
-
-commit 30faa7bacc0bfc8107be7d46a2a188db0eb0844d
-Merge: 5821a80 82c8b44
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Sat Apr 26 21:23:54 2025 +0800
-
-    fix:冲突解决
-
-commit 5821a800a4e7b4add2f6c2a8abf27091aa1a4325
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Sat Apr 26 20:33:59 2025 +0800
-
-    用户端列表下拉刷新/订单地址回显选择
-
-commit 82c8b4498f0e2410a38172423ad52f0c8ed23fe8
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 25 17:49:08 2025 +0800
-
-    fix:　修改访问地址
-
-commit b9cc43d00a5f744709ce44d70d53658ebb999572
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 25 17:22:56 2025 +0800
-
-    fix:　修改访问地址
-
-commit 93ccf4d69be795f563ab18783180d31384ba62e5
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 25 16:49:49 2025 +0800
-
-    feat: 用户协议和隐私协议
-
-commit c9b59faa682b856e6335995460328d3d37727cb6
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 25 16:21:21 2025 +0800
-
-    fix:　主页样式调整
-
-commit faf7a3eb04da21871491910ea694ec0606e7c15c
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 25 14:47:34 2025 +0800
-
-    fix: 首页优化
-
-commit 0c7c4aa7a669eabf2cc8acac7bd1f44cc295e5ad
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 25 14:38:38 2025 +0800
-
-    首页
-
-commit e7a513c8b15976c015133198ac2d5cdcf89ecc12
-Merge: 30248a1 6a93c09
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 25 13:18:42 2025 +0800
-
-    fix：冲突解决
-
-commit 30248a10dcd7e799d55be52388afcd482555823d
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 25 13:16:08 2025 +0800
-
-    用户编辑/新增交互修改/首页布局修改
-
-commit 6a93c09f360578099539a80326d7c0c47779a8f0
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 25 13:15:52 2025 +0800
-
-    fix: 优化
-
-commit 6113a505f105d9ee464d7bd6e9ac59bfd00c9a3a
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 25 10:38:55 2025 +0800
-
-    feat:　banner
-
-commit 1df6d4767c6ee2044841ec1983e62cf5091deebc
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 25 08:47:20 2025 +0800
-
-    fix: 修复bug
-
-commit 1ecb55765c7aec779d051219228fe21c3bb73485
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 25 08:39:50 2025 +0800
-
-    fix: 修复bug
-
-commit 14ecbeab2576f63c4d920fab90da284dd26a1ad2
-Merge: 9adcc4d 069cc33
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Thu Apr 24 16:35:37 2025 +0800
-
-    fix:冲突解决
-
-commit 9adcc4de6b6b94661f3c5a94a39d1c5e21776200
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Thu Apr 24 16:31:12 2025 +0800
-
-    用户地址编辑
-
-commit 069cc3397f3deea37ed8e079d0bed8d6053dee48
-Author: chenjj <18696601943@163.com>
-Date:   Thu Apr 24 15:56:24 2025 +0800
-
-    fix:　志愿者注册调整
-
-commit ddb18c00e9cbeb4da29b50d479a9cf83b33d5f51
-Author: chenjj <18696601943@163.com>
-Date:   Thu Apr 24 14:04:24 2025 +0800
-
-    fix:　志愿者注册调整
-
-commit ff1ace01c2d4761b1c6c39a33a721a3743b8c124
-Merge: cc7dcf0 6314da5
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Thu Apr 24 09:30:08 2025 +0800
-
-    fix:冲突修改
-
-commit 6314da56510e6d22468afe432f7b73a22945a654
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Thu Apr 24 09:07:31 2025 +0800
-
-    用户地址新增
-
-commit cc7dcf0bfe5f19e120e46777be1712ad5ff2658b
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 23 19:36:36 2025 +0800
-
-    fix:　代码体积优化，子包分区
-
-commit c8f15c28d1efd82e21c3ad7d84acbf20c9f35de6
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 23 17:03:57 2025 +0800
-
-    fix: bug
-
-commit 294b37d4123ee097bc81753071e79a473cfd552e
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 23 17:03:29 2025 +0800
-
-    fix: bug
-
-commit 432777ea3e4015eca7120c1db4c239c083b9c92c
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 23 14:01:21 2025 +0800
-
-    Revert "appid"
-    
-    This reverts commit 3077f20949e5ba8a9ab861a5d2d1ea6efa83e03a.
-
-commit 520b0df14d6c37330dc1626997c26e8490c6ff23
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 23 11:23:37 2025 +0800
-
-    appid
-
-commit e0ac60ecfc2df5dd5a741241bac1a81b5b4ad23a (origin/jyb_20250422_dev)
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 23 16:38:39 2025 +0800
-
-    fix：分包
-
-commit 90cf9398e14958eb76cb1b53f0aaa7014c4a6129
-Merge: bbf9647 f551486
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 23 11:21:01 2025 +0800
-
-    fix:冲突解决
-
-commit f55148625c9dd58c75d6c7ca450f64437ad792e5
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 23 11:10:04 2025 +0800
-
-    style: 订单列表样式调整
-
-commit bbf9647c8b7f6b481f1588813b5684591acf6125
-Merge: 5e69969 a447f47
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 23 11:06:41 2025 +0800
-
-    Merge branch 'master' into jyb_20250422_dev
-
-commit 5e699694cb36e9bf156a1cb20aec204e76460e99
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 23 11:06:02 2025 +0800
-
-    订单字段传参/取消清空
-
-commit a447f471523a43a9365f9ea95d32b6f8e31befaa
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 23 10:58:42 2025 +0800
-
-    fix:　志愿者订单列表
-
-commit 51b0598d1dd7c6f0ae1bbfa8369ea6fb3a2180cb
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 23 10:26:15 2025 +0800
-
-    fix: 订单列表状态修复
-
-commit 60f8a6f152c87c599c185cd8ef985ec1502a5606
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 23 10:04:57 2025 +0800
-
-    fix:　解决冲突
-
-commit 69bbd95b37feaa3768e7d3f0a505e213dc2eac3e
-Merge: c7c0709 b729301
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 23 09:18:09 2025 +0800
-
-    fix:冲突解决
-
-commit c7c0709cf8c307cb6814961e5373ff89f965e273
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 23 09:12:11 2025 +0800
-
-    用户端订单金额修改
-
-commit b729301caea70907fb5d5058ed4df8c80449b34e
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 23 09:10:18 2025 +0800
-
-    fix: 订单详情
-
-commit a9218e8ea236fa6b7017e3d1fa0c497b8f1e2944
-Merge: cfee28d 5715cbf
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 23 01:17:46 2025 +0800
-
-    Merge branch 'master' into jyb_20250422_dev
-
-commit 5715cbf4ded784e0d780350ba136da76e498f9ef
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 23 01:16:42 2025 +0800
-
-    解决冲突
-
-commit cfee28df1c2e020077162c1bdcfbceaa4ed5565f
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Tue Apr 22 22:45:12 2025 +0800
-
-    修改
-
-commit b4fc3205e119add5e21ba4a70e8fdea39c1fa30b
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 18:19:02 2025 +0800
-
-    fix: 志愿者不开设置
-
-commit a37cfc337fed4a18af8824854b58e9a5d23e432a
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 18:02:35 2025 +0800
-
-    fix: 修复bug
-
-commit 314150ca9446a8560fcf58970e0cca0bc00f4749
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 17:26:35 2025 +0800
-
-    fix: 类别
-
-commit ffc0bd7d490ce9314624e41f7b3fbb372cfe7445
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 16:42:14 2025 +0800
-
-    feat: 钱包
-
-commit 132a0c1a325c2a783d3dfb54a789d520b0beb9b6
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 16:15:23 2025 +0800
-
-    fix:　代码合并
-
-commit 26e786433ef240cdeb821002a88015e7b6c5ac26
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 16:11:22 2025 +0800
-
-    fix:　代码合并
-
-commit 97166efd9ba37acd222b551ba0b44e12ac8754f0
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 16:11:00 2025 +0800
-
-    fix:　代码合并
-
-commit ca3f7279970be77c42f700e2bc3891f6f15f7e3a
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 16:10:27 2025 +0800
-
-    fix:　代码合并
-
-commit 67651982ec6b5409567ed97374cc81fa28a64523
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 14:50:58 2025 +0800
-
-    fix:　代码合并
-
-commit cf6a2078221c25125c3b60df6e1c216a257293fd (origin/feature-1.0.0)
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 13:51:06 2025 +0800
-
-    style:　我的
-
-commit c58a86d78fce952fc918b0f7acfabd40363e927a
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 09:11:41 2025 +0800
-
-    fix: 重新注册
-
-commit a6daca20406a20189e4566620d0ef4ac5b4dc1c7
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 22 08:56:36 2025 +0800
-
-    fix: 注册
-
-commit aaa1e96afdfd8068528bb3240780f05cc55b7a09
-Author: chenjj <18696601943@163.com>
-Date:   Mon Apr 21 17:40:40 2025 +0800
-
-    fix:　修复
-
-commit bb08753ad853e6c6a35b185142309b927c8a8c87
-Author: chenjj <18696601943@163.com>
-Date:   Mon Apr 21 17:27:43 2025 +0800
-
-    fix:　修复
-
-commit 1c05018d68faa8a8c367f98e5ee93f5efb780ec0
-Author: chenjj <18696601943@163.com>
-Date:   Mon Apr 21 16:40:10 2025 +0800
-
-    fix:　修复
-
-commit 688351a0009b6bdd75a772632b9224d8ed925f0b
-Author: chenjj <18696601943@163.com>
-Date:   Mon Apr 21 16:13:36 2025 +0800
-
-    style: 调整home样式
-
-commit 700ce4ec70be85aadd11aa8cf8d141b511a6f4b1
-Author: chenjj <18696601943@163.com>
-Date:   Mon Apr 21 11:21:44 2025 +0800
-
-    feat: 服务项目
-
-commit e529c7b84bc2098f28fd22242b140adfc6ee1947
-Author: chenjj <18696601943@163.com>
-Date:   Mon Apr 21 10:58:42 2025 +0800
-
-    feat: 服务项目
-
-commit 1c6e101cf12f3027fe68627e1358083d0bbf151a
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 18 14:06:17 2025 +0800
-
-    用户订单修改
-
-commit 7092f2ea3413a60467bcdbabc51225b184afe987
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 18 13:34:16 2025 +0800
-
-    用户端购买订单修改
-
-commit 751443e4b95b86236c0b4ebed7aa23ee92178510
-Merge: f9a0dd6 042fe22
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 18 09:53:27 2025 +0800
-
-    fix:冲突解决
-
-commit f9a0dd6f6a637cafd35f79575d713d69d7741c70
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 18 09:48:19 2025 +0800
-
-    用户订单
-
-commit b50d8c1efe95e75d4eeca301224092eed1eef860
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 18 09:35:15 2025 +0800
-
-    fetch：用户订单列表/详情
-
-commit 042fe228c68e93c226c2650940617b08df05c4a2
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 18 08:57:53 2025 +0800
-
-    feat: 角色选择页
-
-commit ce10f3678b231c2029d8510b1f884baf6acb7eb6
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Thu Apr 17 20:21:15 2025 +0800
-
-    fix：更改订单金额，志愿者id
-
-commit 6affd405c4e31673b094177584860a44ea023b43
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Thu Apr 17 19:43:33 2025 +0800
-
-    fetch:list列表详情下单
-
-commit 5e5168751aa81fcfc702c785ea428301bc69fd42
-Merge: dd94485 b588528
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Thu Apr 17 15:10:13 2025 +0800
-
-    Merge branch 'master' of http://1.95.212.35:13000/root/leromro-mini
-
-commit dd9448527f1b7df5f4433120d313f43943ec8bf7
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Thu Apr 17 15:07:56 2025 +0800
-
-    fetch:用户端订单管理
-
-commit b58852884deb852681f35c2c4938d6c5bfc2bddc
-Author: chenjj <18696601943@163.com>
-Date:   Thu Apr 17 11:52:01 2025 +0800
-
-    fix:　订单详情增加反馈
-
-commit cf456fffd2659a99c148e3652f649387f4f75b0e
-Author: chenjj <18696601943@163.com>
-Date:   Thu Apr 17 10:43:02 2025 +0800
-
-    fix:　排班去重
-
-commit 18d3764a3f9f93377c685fe0064869f761280de8
-Merge: ff78574 8d48ffe
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Thu Apr 17 09:28:46 2025 +0800
-
-    fix：冲突解决
-
-commit ff785747464bcfc1c99a4de3effc0a80eb78f2e9
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Thu Apr 17 09:22:03 2025 +0800
-
-    fix:修改志愿者获取日期
-
-commit 8d48ffe4ed00516441ecaf24a309cb73f349dc70
-Author: chenjj <18696601943@163.com>
-Date:   Thu Apr 17 08:56:49 2025 +0800
-
-    fix:　代码冲突，新增添加提示语
-
-commit 5779187bcc7d13c8023b136bd5a631aa4ae088a1
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 16 18:43:55 2025 +0800
-
-    fetch：志愿者信息回显
-
-commit 293a394ae1827d721e1dbc90b1605aa51d559d0e
-Merge: 76708b8 f8950dd
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 16 18:42:25 2025 +0800
-
-    Merge branch 'master' into jyb_20250411_fix_file
-
-commit 76708b85fe601043bcc0cdd3f3d69b30f18ecf0d
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 16 17:43:58 2025 +0800
-
-    用户端
-
-commit f8950dd128eba58b6c5f6cd6eec686b30ccf677c
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 16 17:42:10 2025 +0800
-
-    fix:　添加是否有传染病
-
-commit aa776a428c6670ff2b398d84c8510d86657600ec
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 16 17:34:13 2025 +0800
-
-    1、用户详情
-
-commit 205bdbdab6ad9a644764e2c3e6565985dbcf6bb5
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 16 17:31:16 2025 +0800
-
-    1、用户订单详情
-    2、用户首页详情接口修改
-    3、用户首页选择分类
-
-commit dc247db0aab0632b8ee46a04e357922f373016f7
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 16 15:50:51 2025 +0800
-
-    feat: 分包、订单接口对接
-
-commit a1c850bbdfd54aa0a1e54b2e35fd1946b46db6f8
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 16 14:32:40 2025 +0800
-
-    fix: 订单对接
-
-commit 270d297afeed63a1af8146ef32f7131d982e0aa6
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 16 13:07:06 2025 +0800
-
-    fix: list引入
-
-commit 7744fb740e4d5a25d99eb0628a386a3f82559c28
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 16 11:49:20 2025 +0800
-
-    fix: 删除pages下的order页面
-
-commit a4e07365e9ff4b8aeb77ed827c6954decc9ef8f6
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Tue Apr 15 18:53:32 2025 +0800
-
-    用户端
-
-commit 971568bf6ca928a91f1b541c53293ccdb3872c38
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 15 17:43:58 2025 +0800
-
-    fix:代码冲突解决
-
-commit dd9e86e9a2eca34cd937bb41053ac576ab8ae07e
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Tue Apr 15 17:30:30 2025 +0800
-
-    冲突解决
-
-commit 7fae6697610cdd75e1b4bea7f68a2426fa2aff36
-Merge: d2afca5 6a69d09
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Tue Apr 15 17:12:53 2025 +0800
-
-    冲突解决
-
-commit d2afca5549d8f9d41192be841807e454d56ace28
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Tue Apr 15 16:40:32 2025 +0800
-
-    用户端
-
-commit 6a69d097892340385fbc618905c82a243470622e (origin/jyb_dev)
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 15 16:11:43 2025 +0800
-
-    fix: 订单模块分包
-
-commit 57503b63f85b1e795f83810ec4a634cfe01aca52
-Author: chenjj <18696601943@163.com>
-Date:   Tue Apr 15 15:30:18 2025 +0800
-
-    feat:　钱包、添加银行卡、银行卡解绑、收入明细、申述文件上传、消息
-
-commit 5791afc48f6b306f50bed2995b28900f7ee41fa0
-Author: chenjj <18696601943@163.com>
-Date:   Mon Apr 14 18:44:03 2025 +0800
-
-    feat: 订单开始、订单结束接口对接
-
-commit bff9081988ab3db6b63e794a609025ab834ee8f5
-Merge: 9fc8ba9 9b3c659
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Mon Apr 14 15:31:10 2025 +0800
-
-    冲突解决
-
-commit 9fc8ba9c32a4a60ffdf960a46a087cf188e0cf41
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Mon Apr 14 15:17:27 2025 +0800
-
-    fix：客户端tabs修改接口
-
-commit 9b3c6594c93058bf6ac4aaca6c00a1ba41b2814d
-Author: chenjj <18696601943@163.com>
-Date:   Mon Apr 14 15:13:49 2025 +0800
-
-    feat: 申述
-
-commit 6696e80e8f61a00f94cb260d04198ee857726d30
-Author: chenjj <18696601943@163.com>
-Date:   Mon Apr 14 14:30:46 2025 +0800
-
-    feat: 我的
-
-commit 7f5ce4eed9c1d05ec9f8e208821cb645c816e290
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 11 17:45:25 2025 +0800
-
-    feat:　沟通页面
-
-commit 7875f24ef4050613dd3872bd2a82b7a21f77c332
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 11 17:44:54 2025 +0800
-
-    feat:　沟通页面
-
-commit 6d5e59207023ce627ca735a2f2aa166be3683eaf
-Merge: 7584720 82f8c94
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 11 14:02:04 2025 +0800
-
-    Merge branch 'master' of http://1.95.212.35:13000/root/leromro-mini
-
-commit 82f8c945dab72ceefff07de72ebc6859821abe49
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 11 13:51:40 2025 +0800
-
-    fix:　解决冲突
-
-commit 00d77c4bd08fdf33add1bc4cf5841f225b765ce3
-Author: chenjj <18696601943@163.com>
-Date:   Fri Apr 11 13:45:42 2025 +0800
-
-    feat: 志愿者订单详情
-
-commit 75847209cb82d83c38e04c5ae8744e7830e1341e
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 11 11:32:11 2025 +0800
-
-    用户端
-
-commit d8e652b11a8d5ce4db9dbfecd687931f9aec3770
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 11 11:13:12 2025 +0800
-
-    config.js修改请求
-
-commit 26fc105534c9849e85bf21966000402a095bd96b
-Merge: ecd4cb3 e304b33
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 11 10:57:16 2025 +0800
-
-    用户端
-
-commit ecd4cb3a155eb1bde05a62548926f4841802b3c1
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Fri Apr 11 10:56:17 2025 +0800
-
-    用户端
-
-commit e304b330bbea412ab178beebd8b9788292f4e724
-Author: chenjj <18696601943@163.com>
-Date:   Thu Apr 10 17:22:22 2025 +0800
-
-    feat: 订单详情
-
-commit 22d6ce7ee05b2659b4333456e9b31864bd5e2e50
-Author: chenjj <18696601943@163.com>
-Date:   Thu Apr 10 15:46:06 2025 +0800
-
-    feat: 订单列表
-
-commit 044c26a94460c5473568020579a3bf7bc13232df
-Author: chenjj <18696601943@163.com>
-Date:   Thu Apr 10 09:32:51 2025 +0800
-
-    feat: 陪伴陪聊注册
-
-commit 013ec0bb9848ac80b7c6d344eb29d469727d751d
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 9 18:21:55 2025 +0800
-
-    fix: 多选、删除
-
-commit 51c690036f59632a30c42974b56b64c6ed65df31
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 9 15:23:04 2025 +0800
-
-    feat: 时间管理
-
-commit 51f125b25814e47bc55593083830296ab0ec0c82
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 9 10:24:00 2025 +0800
-
-    Remove unpackage
-
-commit 42537529b0fc77f9013ae64adabe2cd8fa0345f5
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 9 10:23:14 2025 +0800
-
-    Remove uview-plus
-
-commit 3590afee52f20d2fbe215de0067da6ab56fe87c8
-Author: chenjj <18696601943@163.com>
-Date:   Wed Apr 9 10:13:15 2025 +0800
-
-    fix:　合并代码，解决冲突
-
-commit 483e290f6c3f96642760cb1ce0fd7a0e2be23205
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 9 09:41:40 2025 +0800
-
-    up1
-
-commit e45d3a60d531bb2cbaaf1616153334a13fbafec2
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 9 09:38:42 2025 +0800
-
-    update
-
-commit 82a6a62e99f7fe59bb051aa2f8f73998f88506df
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Tue Apr 8 08:44:06 2025 +0800
-
-    志愿者/用户权限
-
-commit b5b819127ed3833ddccf3e01ef2199ee53a91710
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 2 16:44:03 2025 +0800
-
-    '登录页面'
-
-commit df072b2ef1bf90c8f202a263da921b5f070a6543
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 2 14:15:30 2025 +0800
-
-    feat-1
-
-commit c31e11c3ccba8186dc79307cfcc3b1f5035fd211
-Author: 贾宇博 <1975924210@qq.com>
-Date:   Wed Apr 2 10:25:15 2025 +0800
-
-    first commit

utils/adress.js

@@ -4,7 +4,7 @@ const appName = config.appName;
 // const QQMapWX = require('./qqmap-wx-jssdk.js')
 import QQMapWX from './qqmap-wx-jssdk.js'
 
-import addressData from './address.js';
+// import addressData from './address.js';
 
 
 /**
@@ -154,7 +154,8 @@ function normalizeAddress(str) {
  * @param {string} address 例如："重庆 重庆市 永川区"
  * @returns {Object|null} 包含 data/name、code、index 的对象
  */
-const getCityCode = (address) => {
+const getCityCode = (address,addressData) => {
+  if(!addressData) return null;
    //address:重庆市永川区人民大道191号
   const names = address.split(/\s+/)
   const result = {
@@ -165,11 +166,12 @@ const getCityCode = (address) => {
 
   // 查找省份
   const provinceIndex = addressData.findIndex(p => p.name.includes(names[0]))
+	console.log("TCL: getCityCode -> provinceIndex", provinceIndex)
   if (provinceIndex === -1) return null
 
   const province = addressData[provinceIndex]
   result.data.push(province.name)
-  result.code.push(province.code)
+  result.code.push(province.regionCode)
   result.index.push(provinceIndex)
 
   if (names.length < 2) return result
@@ -180,7 +182,7 @@ const getCityCode = (address) => {
 
   const city = province.children[cityIndex]
   result.data.push(city.name)
-  result.code.push(city.code)
+  result.code.push(city.regionCode)
   result.index.push(cityIndex)
 
   if (names.length < 3) return result
@@ -191,7 +193,7 @@ const getCityCode = (address) => {
 
   const district = city.children[districtIndex]
   result.data.push(district.name)
-  result.code.push(district.code)
+  result.code.push(district.regionCode)
   result.index.push(districtIndex)
 
   return result