diff --git a/App.vue b/App.vue
index e920460..b7cc57b 100644
--- a/App.vue
+++ b/App.vue
@@ -1,276 +1,263 @@
 <script>
-	// #ifdef APP-PLUS
-	import {
-		isNotificationsEnabled,
-		permissions,
-		registPush
-	} from '@/utils/AS-NotifyTheAuthority.js'
-	import {
-		permissionListener
-	} from './utils/permissionTips.js'
-	// import { appUpdateListener } from '@/common/utils/appUpdateTips.js'
-	import locationService from './utils/locationService.js'
-	// import uploadApp from './utils/uploadApp.js'
-	// #endif
-	import request from './utils/request'
-	import {
-		setVersion
-	} from './utils/version.js'
-	//初始化一键登录插件
-	const aLiSDKModule = uni.requireNativePlugin('AliCloud-NirvanaPns');
-	export default {
-		globalData: {
-			artisanType: 2,
-			latitude: '38.366667',
-			longitude: '117.333333',
-			address: '黄骅市',
-			servers_region: `河北省-沧州市-黄骅市`,
-			deviceid: '',
-			addressRes: {
-				"type": "gcj02",
-				"altitude": 0,
-				"latitude": 38.372266,
-				"longitude": 117.332895,
-				"speed": 0,
-				"accuracy": 30,
+// #ifdef APP-PLUS
+import {
+	isNotificationsEnabled,
+	permissions,
+	registPush
+} from '@/utils/AS-NotifyTheAuthority.js'
+import {
+	permissionListener
+} from './utils/permissionTips.js'
+// import { appUpdateListener } from '@/common/utils/appUpdateTips.js'
+import locationService from './utils/locationService.js'
+// import uploadApp from './utils/uploadApp.js'
+// #endif
+import request from './utils/request'
+import {
+	setVersion
+} from './utils/version.js'
+import {
+	APP_BACK_BASE_URL
+} from './utils/appBackBase.js'
+//初始化一键登录插件
+const aLiSDKModule = uni.requireNativePlugin('AliCloud-NirvanaPns');
+export default {
+	globalData: {
+		artisanType: 2,
+		latitude: '38.366667',
+		longitude: '117.333333',
+		address: '黄骅市',
+		servers_region: `河北省-沧州市-黄骅市`,
+		deviceid: '',
+		addressRes: {
+			"type": "gcj02",
+			"altitude": 0,
+			"latitude": 38.372266,
+			"longitude": 117.332895,
+			"speed": 0,
+			"accuracy": 30,
+			"adcode": "130983",
+			"cCode": "130900",
+			"pcode": "130000",
+			"address": {
+				"country": "中国",
+				"province": "河北省",
+				"city": "沧州市",
+				"district": "黄骅市",
+				"street": "渤海西路",
+				"streetNum": "35号",
+				// "poiName": "请开启位置权限",
+				"poiName": "黄骅市人民政府",
+				"cityCode": "0317",
 				"adcode": "130983",
 				"cCode": "130900",
 				"pcode": "130000",
-				"address": {
-					"country": "中国",
-					"province": "河北省",
-					"city": "沧州市",
-					"district": "黄骅市",
-					"street": "渤海西路",
-					"streetNum": "35号",
-					// "poiName": "请开启位置权限",
-					"poiName": "黄骅市人民政府",
-					"cityCode": "0317",
-					"adcode": "130983",
-					"cCode": "130900",
-					"pcode": "130000",
-				}
 			}
-		},
-		onLaunch: async function() {
-			// #ifdef APP-PLUS
-			uni.hideTabBar();
-			if (uni.getStorageSync('accessToken')) {
-				registPush()
-				//跟新底部消息数量
-				this.messageUpudateNum()
-			}
-			// #endif
-			
-			//缓存手机版本号
-			// await setVersion()
-
-			//获取访问路由
-			// 发起 GET 请求
-			let version = uni.getStorageSync('setVersion')
-			let baseUrl
-			await uni.request({
-				url: 'https://api.mrrwlkj.top/api/openPuc/getSjApiUrl', // 接口地址
-				method: 'GET', // 请求方法（默认 GET）
-				header: {
-					'Content-Type': 'application/json', // 请求头
-					'VersionCode': version.VersionCode,
-					'DeviceBrand': version.DeviceBrand,
-					'DeviceType': version.DeviceType
-				},
-				success: (res) => {
-
-					if (res.data.code == 200) {
-						// #ifndef MP-WEIXIN
-						uni.setStorageSync('baseUrl', res.data.data.url)
-						// #endif
-						// #ifdef MP-WEIXIN
-						wx.setStorageSync('baseUrl', res.data.data.url)
-						// #endif
-						this.$store.commit("setLocation", true)
-					}
-					console.log('请求成功', res.data);
-				},
-				fail: (err) => {
-					console.log('请求失败', err);
-				},
-				complete: () => {
-					console.log('请求完成（无论成功失败都会执行）');
-				}
-			});
-
-			// #ifdef APP-PLUS
-			//禁止手机横屏
-			plus.screen.lockOrientation("portrait-primary")
-			// #endif
-			// #ifdef APP-PLUS
-			//权限提示监听
-			let systemInfo = uni.getSystemInfoSync();
-			let platform = systemInfo.platform;
-			if (platform === 'android') {
-				// console.log('安卓用户')
-				permissionListener()
-			} else if (platform === 'ios') {
-				// console.log('苹果用户')
-			} else {
-				// console.log('平台未知')
-			}
-
-			//一键登录密钥设置
-			let sdkInfo = '';
-			//设置秘钥
-			if (platform == 'android') {
-				//开启SDK日志打印
-				aLiSDKModule.setLoggerEnable(true);
-				aLiSDKModule.expandAuthPageCheckedScope(true);
-				//禁用物理返回键
-				//aLiSDKModule.closeAuthPageReturnBack(true);
-				//开启区分界面返回及物理返回功能，自动控制后续返回事件
-				aLiSDKModule.userControlAuthPageCancel();
-				//是否跟随系统深色模式
-				aLiSDKModule.setAuthPageUseDayLight(false);
-				sdkInfo =
-					'cvJWYFO9s7xgJrzD+Ok2m2kCh3x0kdRkfJzGI0oxnyUXGlNAwAzvj87Yd6y030BWposVHUT84av2adBG9SdHl5CJpL0mGi+BRtachnyADJjfdpkJC0e0Uqb45pO7h7ZZvT+sNWQs1sa4JpL0U7hYKkgCP1iVXHoA1zKfzZynON6eKyvkzL1xpoPPag4O50slww4+6XuRVplCOSNCcsLRtot4CYnfsdcMvlV34MY5qB/rV+HNb1velpx4rg5atk3iTEiSLjla69c6pOT6vpjkK1qFVpNMxrEY';
-			} else if (platform == 'ios') {
-				sdkInfo =
-					'BONXQSabNMt1a8Cru1TjeW94aXen5rQHeAxzLGgpFzIUicDYeb9SD0l35MkKvjq7gQemE2HDp6B7adKZ8nrdUk4wgg1LIYSGDYVSc/Q1CwrJ9A3lMUeBfS1UUu3nBBg58bDvG1bl3j6tS4h6FjnYmP5+dDsyqb0YNmIhlSmia5Et7cfBMv2OT85N9WLJc/tOMQ9ZQCnuizKVlofkmDGFgjsBN/Bf2gLq6lTQyVqsgPJE5yEPd4riNg=='
-			}
-			aLiSDKModule.setAuthSDKInfo(sdkInfo)
-
-
-
-			// await uploadApp.uploadApp('onLaunch');
-			// #endif
-
-
-			console.log('App Launch')
-			this.globalData.deviceId = uni.getDeviceInfo().deviceId;
-			// this.globalData.deviceid = 'AC6F605124DFA87DCE40D5C062C94C3B';
-
-			// #ifndef MP-WEIXIN
-			if (uni.getStorageSync('refreshToken')) {
-				let endTime = uni.getStorageSync('refresh_token_expries');
-				endTime = new Date(endTime)
-				// 当前系统时间
-				var nowTime = new Date();
-				var residueTime = (endTime.getTime() - nowTime.getTime() / 1000);
-				// 4小时 14400
-				if (residueTime < 4 * 60 * 60) {
-					console.log('----------------------------')
-
-					uni.removeStorageSync('accessToken')
-					uni.removeStorageSync('refreshToken')
-				}
-			}
-			// #endif
-			// #ifdef MP-WEIXIN
-			if (wx.getStorageSync('refreshToken')) {
-				let endTime = wx.getStorageSync('refresh_token_expries');
-				endTime = new Date(endTime)
-				// 当前系统时间
-				var nowTime = new Date();
-				var residueTime = (endTime.getTime() - nowTime.getTime() / 1000);
-				// 4小时 14400
-				if (residueTime < 4 * 60 * 60) {
-					console.log('----------------------------')
-
-					wx.removeStorageSync('accessToken')
-					wx.removeStorageSync('refreshToken')
-				}
-			}
-			// #endif
-		},
-		onShow: function() {
-			uni.hideTabBar();
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		},
-		methods: {
-			// 验证登陆的全局方法
-			verifyLogin() {
-				if (!vuex.state.userInfo.token) {
-					uni.showModal({
-						title: '提示',
-						content: '您需要登陆后才能进行此操作',
-						confirmColor: '#F1AC66',
-						success(e) {
-							if (e.confirm) {
-								// uni.oprPresentLogin()
-								uni.navigateTo({
-									url: '/pages/blogPopup/blogPopup'
-								});
-							}
-						}
-					})
-				} else {
-					return true
-				}
-			},
-			/**
-			 * 区/县adcode转换为6位市adcode（后两位补0）
-			 * @param {string|number} districtAdcode - 6位区/县编码（字符串或数字类型）
-			 * @returns {string|null} 6位市编码，无效编码返回null
-			 */
-			districtAdcodeTo6DigitCityAdcode(districtAdcode) {
-				// 1. 统一转换为字符串并去除空格
-				const adcodeStr = String(districtAdcode).trim();
-
-				// 2. 验证编码有效性（6位数字）
-				const adcodeReg = /^\d{6}$/;
-				if (!adcodeReg.test(adcodeStr)) {
-					console.warn('无效的区/县编码，必须是6位数字');
-					return null;
-				}
-
-				// 3. 截取前4位 + 拼接"00" → 6位市编码
-				const cityAdcode4Digit = adcodeStr.slice(0, 4);
-				const cityAdcode6Digit = cityAdcode4Digit + '00';
-
-				// 4. 可选验证：确保结果为6位数字
-				if (!/^\d{6}$/.test(cityAdcode6Digit)) {
-					console.warn('编码转换异常');
-					return null;
-				}
-
-				return cityAdcode6Digit;
-			},
-			// 更新全局定位
-			updateAddress(item) {
-				console.log('item', item)
-				let location = item.location.split(',');
-				this.globalData.latitude = location[1];
-				this.globalData.longitude = location[0];
-				this.globalData.address = item.name;
-				this.globalData.servers_region = `${item.pname}-${item.cityname}-${item.adname}`;
-				this.globalData.pcode = item.pcode;
-				this.globalData.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
-				this.globalData.adcode = item.adcode;
-				//存储用户定位
-				this.globalData.addressRes.latitude = location[1];
-				this.globalData.addressRes.longitude = location[0];
-				this.globalData.addressRes.address.province = item.pname;
-				this.globalData.addressRes.address.city = item.cityname;
-				this.globalData.addressRes.address.district = item.adname;
-				this.globalData.addressRes.address.street = item.address;
-				this.globalData.addressRes.address.poiName = item.name;
-				this.globalData.addressRes.address.streetNum = '';
-				this.globalData.addressRes.address.cityCode = '';
-				this.globalData.addressRes.address.pcode = item.pcode;
-				this.globalData.addressRes.address.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
-				this.globalData.addressRes.address.adcode = item.adcode;
-				this.globalData.addressRes.pcode = item.pcode;
-				this.globalData.addressRes.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
-				this.globalData.addressRes.adcode = item.adcode;
-				console.log('globalData', this.globalData)
-				uni.setStorageSync('userAdrees', this.globalData)
-			},
 		}
+	},
+	onLaunch: async function () {
+		// #ifdef APP-PLUS
+		uni.hideTabBar();
+		if (uni.getStorageSync('accessToken')) {
+			registPush()
+			//跟新底部消息数量
+			this.messageUpudateNum()
+		}
+		// #endif
+
+		//缓存手机版本号
+		// await setVersion()
+
+		//获取访问路由
+		// #ifndef MP-WEIXIN
+		uni.setStorageSync('baseUrl', APP_BACK_BASE_URL)
+		// #endif
+		// #ifdef MP-WEIXIN
+		wx.setStorageSync('baseUrl', APP_BACK_BASE_URL)
+		// #endif
+		this.$store.commit("setLocation", true)
+
+		// #ifdef APP-PLUS
+		//禁止手机横屏
+		plus.screen.lockOrientation("portrait-primary")
+		// #endif
+		// #ifdef APP-PLUS
+		//权限提示监听
+		let systemInfo = uni.getSystemInfoSync();
+		let platform = systemInfo.platform;
+		if (platform === 'android') {
+			// console.log('安卓用户')
+			permissionListener()
+		} else if (platform === 'ios') {
+			// console.log('苹果用户')
+		} else {
+			// console.log('平台未知')
+		}
+
+		//一键登录密钥设置
+		let sdkInfo = '';
+		//设置秘钥
+		if (platform == 'android') {
+			//开启SDK日志打印
+			aLiSDKModule.setLoggerEnable(true);
+			aLiSDKModule.expandAuthPageCheckedScope(true);
+			//禁用物理返回键
+			//aLiSDKModule.closeAuthPageReturnBack(true);
+			//开启区分界面返回及物理返回功能，自动控制后续返回事件
+			aLiSDKModule.userControlAuthPageCancel();
+			//是否跟随系统深色模式
+			aLiSDKModule.setAuthPageUseDayLight(false);
+			sdkInfo =
+				'cvJWYFO9s7xgJrzD+Ok2m2kCh3x0kdRkfJzGI0oxnyUXGlNAwAzvj87Yd6y030BWposVHUT84av2adBG9SdHl5CJpL0mGi+BRtachnyADJjfdpkJC0e0Uqb45pO7h7ZZvT+sNWQs1sa4JpL0U7hYKkgCP1iVXHoA1zKfzZynON6eKyvkzL1xpoPPag4O50slww4+6XuRVplCOSNCcsLRtot4CYnfsdcMvlV34MY5qB/rV+HNb1velpx4rg5atk3iTEiSLjla69c6pOT6vpjkK1qFVpNMxrEY';
+		} else if (platform == 'ios') {
+			sdkInfo =
+				'BONXQSabNMt1a8Cru1TjeW94aXen5rQHeAxzLGgpFzIUicDYeb9SD0l35MkKvjq7gQemE2HDp6B7adKZ8nrdUk4wgg1LIYSGDYVSc/Q1CwrJ9A3lMUeBfS1UUu3nBBg58bDvG1bl3j6tS4h6FjnYmP5+dDsyqb0YNmIhlSmia5Et7cfBMv2OT85N9WLJc/tOMQ9ZQCnuizKVlofkmDGFgjsBN/Bf2gLq6lTQyVqsgPJE5yEPd4riNg=='
+		}
+		aLiSDKModule.setAuthSDKInfo(sdkInfo)
+
+
+
+		// await uploadApp.uploadApp('onLaunch');
+		// #endif
+
+
+		console.log('App Launch')
+		this.globalData.deviceId = uni.getDeviceInfo().deviceId;
+		// this.globalData.deviceid = 'AC6F605124DFA87DCE40D5C062C94C3B';
+
+		// #ifndef MP-WEIXIN
+		if (uni.getStorageSync('refreshToken')) {
+			let endTime = uni.getStorageSync('refresh_token_expries');
+			endTime = new Date(endTime)
+			// 当前系统时间
+			var nowTime = new Date();
+			var residueTime = (endTime.getTime() - nowTime.getTime() / 1000);
+			// 4小时 14400
+			if (residueTime < 4 * 60 * 60) {
+				console.log('----------------------------')
+
+				uni.removeStorageSync('accessToken')
+				uni.removeStorageSync('refreshToken')
+			}
+		}
+		// #endif
+		// #ifdef MP-WEIXIN
+		if (wx.getStorageSync('refreshToken')) {
+			let endTime = wx.getStorageSync('refresh_token_expries');
+			endTime = new Date(endTime)
+			// 当前系统时间
+			var nowTime = new Date();
+			var residueTime = (endTime.getTime() - nowTime.getTime() / 1000);
+			// 4小时 14400
+			if (residueTime < 4 * 60 * 60) {
+				console.log('----------------------------')
+
+				wx.removeStorageSync('accessToken')
+				wx.removeStorageSync('refreshToken')
+			}
+		}
+		// #endif
+	},
+	onShow: function () {
+		uni.hideTabBar();
+		console.log('App Show')
+		uni.$emit('appShowRefresh')
+	},
+	onHide: function () {
+		console.log('App Hide')
+	},
+	methods: {
+		// 验证登陆的全局方法
+		verifyLogin() {
+			if (!vuex.state.userInfo.token) {
+				uni.showModal({
+					title: '提示',
+					content: '您需要登陆后才能进行此操作',
+					confirmColor: '#F1AC66',
+					success(e) {
+						if (e.confirm) {
+							// uni.oprPresentLogin()
+							uni.navigateTo({
+								url: '/pages/blogPopup/blogPopup'
+							});
+						}
+					}
+				})
+			} else {
+				return true
+			}
+		},
+		/**
+		 * 区/县adcode转换为6位市adcode（后两位补0）
+		 * @param {string|number} districtAdcode - 6位区/县编码（字符串或数字类型）
+		 * @returns {string|null} 6位市编码，无效编码返回null
+		 */
+		districtAdcodeTo6DigitCityAdcode(districtAdcode) {
+			// 1. 统一转换为字符串并去除空格
+			const adcodeStr = String(districtAdcode).trim();
+
+			// 2. 验证编码有效性（6位数字）
+			const adcodeReg = /^\d{6}$/;
+			if (!adcodeReg.test(adcodeStr)) {
+				console.warn('无效的区/县编码，必须是6位数字');
+				return null;
+			}
+
+			// 3. 截取前4位 + 拼接"00" → 6位市编码
+			const cityAdcode4Digit = adcodeStr.slice(0, 4);
+			const cityAdcode6Digit = cityAdcode4Digit + '00';
+
+			// 4. 可选验证：确保结果为6位数字
+			if (!/^\d{6}$/.test(cityAdcode6Digit)) {
+				console.warn('编码转换异常');
+				return null;
+			}
+
+			return cityAdcode6Digit;
+		},
+		// 更新全局定位
+		updateAddress(item) {
+			console.log('item', item)
+			let location = item.location.split(',');
+			this.globalData.latitude = location[1];
+			this.globalData.longitude = location[0];
+			this.globalData.address = item.name;
+			this.globalData.servers_region = `${item.pname}-${item.cityname}-${item.adname}`;
+			this.globalData.pcode = item.pcode;
+			this.globalData.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
+			this.globalData.adcode = item.adcode;
+			//存储用户定位
+			this.globalData.addressRes.latitude = location[1];
+			this.globalData.addressRes.longitude = location[0];
+			this.globalData.addressRes.address.province = item.pname;
+			this.globalData.addressRes.address.city = item.cityname;
+			this.globalData.addressRes.address.district = item.adname;
+			this.globalData.addressRes.address.street = item.address;
+			this.globalData.addressRes.address.poiName = item.name;
+			this.globalData.addressRes.address.streetNum = '';
+			this.globalData.addressRes.address.cityCode = '';
+			this.globalData.addressRes.address.pcode = item.pcode;
+			this.globalData.addressRes.address.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
+			this.globalData.addressRes.address.adcode = item.adcode;
+			this.globalData.addressRes.pcode = item.pcode;
+			this.globalData.addressRes.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
+			this.globalData.addressRes.adcode = item.adcode;
+			console.log('globalData', this.globalData)
+			uni.setStorageSync('userAdrees', this.globalData)
+		},
 	}
+}
 </script>
 
 <style>
-	/*每个页面公共css */
-	@import '@/static/css/common.css';
-</style>
\ No newline at end of file
+/*每个页面公共css */
+@import '@/static/css/common.css';
+
+/* App.vue全局style */
+page,
+html,
+body {
+	-webkit-text-size-adjust: 100% !important;
+	text-size-adjust: 100% !important;
+}
+</style>
diff --git a/CHANGE_RECORD.md b/CHANGE_RECORD.md
new file mode 100644
index 0000000..58c3eda
--- /dev/null
+++ b/CHANGE_RECORD.md
@@ -0,0 +1,92 @@
+# 改动记录
+
+## 2026-06-12
+
+### 后台长时间运行后首页登录态不同步
+
+问题现象：
+
+- APP 后台运行较长时间后再次进入。
+- 商家首页显示未登录或无法及时获取商家信息。
+- “我的”页面仍显示已登录。
+- 从“我的”页面切回首页后，首页才能正常获取商家信息。
+
+涉及文件：
+
+- `App.vue`
+- `pages/home/home.vue`
+- `utils/request.js`
+
+改动内容：
+
+- `App.vue`
+  - 在全局 `onShow` 中新增 `uni.$emit('appShowRefresh')`。
+  - APP 从后台恢复前台时主动通知页面刷新状态，避免只依赖页面级 `onShow`。
+
+- `pages/home/home.vue`
+  - 新增 `refreshPageState` 方法，统一处理首页登录态刷新。
+  - `onShow`、下拉刷新、APP 前台恢复事件都调用同一套刷新逻辑。
+  - `onLoad` 注册 `appShowRefresh` 事件。
+  - `onUnload` 解除 `appShowRefresh` 事件，避免重复监听。
+  - 有 token 时主动重新请求 `/sj/user/getUser`。
+  - 无 token 时清空 `userInfo`、`authDetails`、`sjId`，并重置 `isUserInfoLoaded`。
+  - `getUserInfo` 请求成功后显式设置 `isLogin = true` 和 `isUserInfoLoaded = true`。
+  - `getUserInfo` 请求失败时，如果本地 token 已被清理，则同步首页为未登录状态。
+
+- `utils/request.js`
+  - `refreshToken` 兼容后端返回结构：
+    - 支持 token 在 `res.access_token`。
+    - 支持 token 在 `res.data.access_token`。
+  - 刷新 token 成功后同步更新：
+    - `accessToken`
+    - `refreshToken`
+    - `refresh_token_expries`
+  - 如果刷新接口成功但没有返回 `access_token`，主动抛错，避免写入 `undefined` token。
+
+验证情况：
+
+- 已检查相关 diff，未做全文件重构。
+- `pages/home/home.vue` 原文件为 CRLF 行尾；为避免整文件行尾改造造成大面积 diff，本次保留原行尾。
+- 项目 `package.json` 未配置 build/lint 脚本，未执行完整构建校验。
+
+### 订单详情顾客头像被挤压
+
+问题现象：
+
+- `pages/shop/SellerDetail` 页面“顾客信息”一栏中，客户头像在部分图片比例下显示被拉伸或挤压。
+
+涉及文件：
+
+- `pages/shop/SellerDetail.vue`
+
+改动内容：
+
+- 给顾客头像 `<image>` 增加 `mode="aspectFill"`，按头像容器比例裁剪填充，避免原图比例不一致时被拉伸。
+- 为 `.shop_photo` 增加 `min-width` 和 `min-height`，在 flex 布局中进一步锁定头像为固定正方形尺寸。
+
+验证情况：
+
+- 已执行 `pages/shop/SellerDetail.vue` 与 `CHANGE_RECORD.md` 的空白格式检查。
+
+### 核销成功后工时/工位订单详情跳转错误
+
+问题现象：
+
+- 商家扫码核销或输入核销码核销成功后，工时订单和工位订单跳转到详情页时参数或页面类型不正确。
+- 工时订单会进入工位详情链路，工位订单会落到普通订单详情链路。
+
+涉及文件：
+
+- `pages/shop/verify/verify-order-detail.vue`
+
+改动内容：
+
+- 新增 `getOrderDetailUrl`，统一按 `order_type` 生成核销成功后的详情页地址。
+- `order_type=3` 工时订单跳转到 `/pages/shop/SellerDetail?order_id=...&identity=1`，使用手艺人工时订单详情链路。
+- `order_type=4` 工位订单跳转到 `/pages/shop/SellerDetail?order_id=...`，使用商家工位订单详情链路。
+- `order_type=6` 自营订单跳转普通订单详情并携带 `serviceType=2`。
+- 其他普通订单跳转普通订单详情，不再误携带自营参数。
+
+验证情况：
+
+- 已执行 `pages/shop/verify/verify-order-detail.vue` 与 `CHANGE_RECORD.md` 的空白格式检查。
diff --git a/components/MyTabBar.vue b/components/MyTabBar.vue
index 8f4b0e6..54c8af2 100644
--- a/components/MyTabBar.vue
+++ b/components/MyTabBar.vue
@@ -95,7 +95,7 @@ export default {
   color: #999;
 }
 .tab-text.active {
-  color: #E8101E; /* 选中颜色 */
+  color: #FF4767; /* 选中颜色 */
 }
 .tab-badge {
   position: absolute;
diff --git a/components/circle-progress/circle-progress.vue b/components/circle-progress/circle-progress.vue
index b683442..ea989e3 100644
--- a/components/circle-progress/circle-progress.vue
+++ b/components/circle-progress/circle-progress.vue
@@ -43,7 +43,7 @@ export default {
     // 圆环颜色
     color: {
       type: String,
-      default: '#E8101E'
+      default: '#FF4767'
     },
     // 背景圆环颜色
     backgroundColor: {
diff --git a/components/common/CommonFilter.vue b/components/common/CommonFilter.vue
index 8e06ee6..406a915 100644
--- a/components/common/CommonFilter.vue
+++ b/components/common/CommonFilter.vue
@@ -402,7 +402,7 @@ export default {
   }
 
   .time-option.active .time-text {
-    color: #E8101E;
+    color: #FF4767;
     font-weight: 500;
   }
 
@@ -413,7 +413,7 @@ export default {
 
   .time-discount {
     font-size: 24rpx;
-    color: #E8101E;
+    color: #FF4767;
     padding: 4rpx 12rpx;
     background-color: #fff5f6;
     border-radius: 20rpx;
@@ -444,7 +444,7 @@ export default {
   color: #666;
 }
 .active {
-  color: #E8101E; /* 选中态主题色 */
+  color: #FF4767; /* 选中态主题色 */
 }
 
 /* 服务时间按钮专属：控制下拉图标尺寸 */
diff --git a/components/common/service-first-tab.vue b/components/common/service-first-tab.vue
index cd5dbac..e911c06 100644
--- a/components/common/service-first-tab.vue
+++ b/components/common/service-first-tab.vue
@@ -52,7 +52,7 @@ export default {
     // 已定义的激活色props（无需修改）
     activeColor: {
       type: String,
-      default: "#E8101E",
+      default: "#FF4767",
     },
     // 已定义的非激活色props（无需修改）
     inactiveColor: {
diff --git a/components/common/service-second-icon-tab.vue b/components/common/service-second-icon-tab.vue
index f5c689d..757650b 100644
--- a/components/common/service-second-icon-tab.vue
+++ b/components/common/service-second-icon-tab.vue
@@ -59,7 +59,7 @@ export default {
     // 激活状态的颜色
     activeColor: {
       type: String,
-      default: "#E8101E",
+      default: "#FF4767",
     },
     // 非激活状态的颜色
     inactiveColor: {
@@ -129,7 +129,7 @@ export default {
   left: 0;
   right: 0;
   bottom: 0;
-  border: 2rpx solid #E8101E;
+  border: 2rpx solid #FF4767;
   border-radius: 48rpx;
 }
 
@@ -143,6 +143,6 @@ export default {
 }
 
 .icon-item.active .icon-text {
-  color: #E8101E;
+  color: #FF4767;
 }
 </style>
diff --git a/components/filter-popup/filter-popup.vue b/components/filter-popup/filter-popup.vue
index 4189288..9db6136 100644
--- a/components/filter-popup/filter-popup.vue
+++ b/components/filter-popup/filter-popup.vue
@@ -208,7 +208,7 @@ export default {
         padding-left: 30rpx;
         position: relative;
         &__point {
-          background-color: #E8101E;
+          background-color: #FF4767;
           height: 6rpx;
           width: 6rpx;
           border-radius: 50%;
@@ -221,7 +221,7 @@ export default {
       }
       .active {
         background: #ffffff;
-        color: #E8101E;
+        color: #FF4767;
       }
     }
     &__right {
@@ -295,17 +295,17 @@ export default {
       height: 82rpx;
       font-weight: 400;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
       line-height: 42rpx;
       text-align: left;
       font-style: normal;
     }
     &__sure {
       border-radius: 41rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
     }
     &__reset {
-      background: #E8101E;
+      background: #FF4767;
       border-radius: 41rpx;
       color: #ffffff;
     }
diff --git a/components/filterCard/filterCard.vue b/components/filterCard/filterCard.vue
index 9c203e5..3ef8b7d 100644
--- a/components/filterCard/filterCard.vue
+++ b/components/filterCard/filterCard.vue
@@ -114,8 +114,8 @@ export default {
   }
   .active {
     background: rgba(252, 67, 124, 0.1);
-    color: #E8101E;
-    border: 1rpx solid #E8101E;
+    color: #FF4767;
+    border: 1rpx solid #FF4767;
   }
 }
 </style>
diff --git a/components/hao-indexList/hao-indexList/hao-indexList.vue b/components/hao-indexList/hao-indexList/hao-indexList.vue
index eff530a..aabce58 100644
--- a/components/hao-indexList/hao-indexList/hao-indexList.vue
+++ b/components/hao-indexList/hao-indexList/hao-indexList.vue
@@ -548,7 +548,7 @@
 				width: 690rpx;
 				height: 68rpx;
 				background: #FFFFFF;
-				border: 2rpx solid #E8101E;
+				border: 2rpx solid #FF4767;
 				background-color: #fafafa;
 				display: flex;
 				align-items: center;
diff --git a/components/hot-card/hot-card.vue b/components/hot-card/hot-card.vue
index 47f3f6e..7bc0b2d 100644
--- a/components/hot-card/hot-card.vue
+++ b/components/hot-card/hot-card.vue
@@ -121,7 +121,7 @@ export default {
         border: 1rpx solid #fba9bb;
         font-weight: 500;
         font-size: 24rpx;
-        color: #E8101E;
+        color: #FF4767;
         text-align: left;
         font-style: normal;
       }
@@ -197,7 +197,7 @@ export default {
         margin-top: 10rpx;
         font-weight: 500;
         font-size: 24rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 33rpx;
         text-align: left;
         font-style: normal;
diff --git a/components/noData/noLogin.vue b/components/noData/noLogin.vue
index 5c3b06c..47e85de 100644
--- a/components/noData/noLogin.vue
+++ b/components/noData/noLogin.vue
@@ -59,7 +59,7 @@ export default {
   .loginBtn {
     width: 262rpx;
     height: 86rpx;
-    background: #e8101e;
+    background: #FF4767;
     border-radius: 43rpx;
     text-align: center;
     line-height: 86rpx;
diff --git a/components/select-time-page/select-time-page.vue b/components/select-time-page/select-time-page.vue
index 9636437..5e39ee0 100644
--- a/components/select-time-page/select-time-page.vue
+++ b/components/select-time-page/select-time-page.vue
@@ -408,11 +408,11 @@ export default {
 
 .isActive {
   background: rgba(252, 67, 124, 0.08);
-  color: #e8101e !important;
+  color: #FF4767 !important;
 }
 
 .isActive .time-picker-content__time__list__item__text {
-  color: #e8101e !important;
+  color: #FF4767 !important;
 }
 
 /* 选中样式前后弧度 */
@@ -433,7 +433,7 @@ border-radius: 0rpx 51rpx 51rpx 0rpx}
 .time-picker-content__time__sure__box {
   width: 648rpx;
   height: 94rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 48rpx;
   display: flex;
   align-items: center;
diff --git a/components/select-time-page/select-time-page2.vue b/components/select-time-page/select-time-page2.vue
index c9b03bd..e8fdd4a 100644
--- a/components/select-time-page/select-time-page2.vue
+++ b/components/select-time-page/select-time-page2.vue
@@ -467,8 +467,8 @@
 			.isActive {
 				background: rgba(252, 67, 124, 0.08);
 				border-radius: 10rpx;
-				border: 1rpx solid #E8101E;
-				color: #E8101E;
+				border: 1rpx solid #FF4767;
+				color: #FF4767;
 				/* 选中状态 */
 			}
 
@@ -493,7 +493,7 @@
 			&__box {
 				width: 648rpx;
 				height: 94rpx;
-				background: linear-gradient(140deg, #fa4e9a 0%, #E8101E 100%);
+				background: linear-gradient(140deg, #fa4e9a 0%, #FF4767 100%);
 				border-radius: 48rpx;
 				display: flex;
 				align-items: center;
diff --git a/components/service-code-input/service-code-input.vue b/components/service-code-input/service-code-input.vue
index 37cb524..9c49111 100644
--- a/components/service-code-input/service-code-input.vue
+++ b/components/service-code-input/service-code-input.vue
@@ -1,30 +1,19 @@
 <template>
-	<view class="service-code-modal" v-if="show" :style="{bottom:`${popBotom}px`}">
+	<view class="service-code-modal" v-if="show" :style="{ bottom: `${popBotom}px` }">
 		<view class="modal-mask" @touchmove.stop.prevent></view>
 		<view class="modal-content">
 			<view class="modal-title">开始服务</view>
 			<view class="modal-subtitle">请输入服务码</view>
 			<view class="code-box">
-				<view
-					v-for="(item, idx) in codeLength"
-					:key="idx"
+				<view v-for="(item, idx) in codeLength" :key="idx"
 					:class="['code-cell', idx === currentIndex ? 'active' : '', code[idx] ? 'filled' : '']">
 					<text v-if="code[idx]">{{ code[idx] }}</text>
 				</view>
 				<!-- 隐藏真实输入框 -->
-				<input
-					:adjust-position="false"
-					class="real-input"
-					type="number"
-					:maxlength="codeLength"
-					v-model="inputValue"
-					:focus="true"
-					@input="onInput"
-					@focus="onFocus"
-					@keyboardheightchange="onkeyboardheightchange"
-					@blur="onBlur"
-					cursor-spacing="100"
-					ref="realInput" />
+				<input :adjust-position="false" class="real-input" type="number" :maxlength="codeLength"
+					v-model="inputValue" :focus="true" @input="onInput" @focus="onFocus"
+					@keyboardheightchange="onkeyboardheightchange" @blur="onBlur" cursor-spacing="100"
+					cursor-color="transparent" ref="realInput" />
 			</view>
 			<button class="confirm-btn" :disabled="code.length < codeLength" @click="onConfirm">确定</button>
 			<view class="close-btn" @click="close">×</view>
@@ -33,210 +22,212 @@
 </template>
 
 <script>
-	export default {
-		name: 'serviceCodeInput',
-		props: {
-			show: {
-				type: Boolean,
-				default: false
-			},
-			codeLength: {
-				type: Number,
-				default: 6
+export default {
+	name: 'serviceCodeInput',
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		codeLength: {
+			type: Number,
+			default: 6
+		}
+	},
+	data() {
+		return {
+			inputValue: '',
+			isFocus: true,
+			keyboardHeight: 0,
+			popBotom: 0,
+		}
+	},
+	computed: {
+		code() {
+			return this.inputValue.split('').slice(0, this.codeLength)
+		},
+		currentIndex() {
+			return this.inputValue.length
+		}
+	},
+	watch: {
+		// show(val) {
+		// 	if (val) {
+		// 		this.$refs.realInput && this.$refs.realInput.focus
+		// 	} else {
+		// 		this.inputValue = ''
+		// 	}
+		// }
+	},
+	mounted() {
+		// uni.onKeyboardHeightChange((res)=>{
+		// 	this.keyboardHeight = res.height;
+		// })
+	},
+	methods: {
+		onInput(e) {
+			let val = e.detail.value.replace(/[^0-9]/g, '').slice(0, this.codeLength)
+			this.inputValue = val
+			this.$emit('input', val)
+			if (val.length === this.codeLength) {
+				this.$emit('finish', val)
 			}
 		},
-		data() {
-			return {
-				inputValue: '',
-				isFocus: true,
-				keyboardHeight: 0,
-				popBotom:0,
+		onFocus(e) {
+			this.isFocus = true
+			this.inputValue = ''
+		},
+		onkeyboardheightchange(e) {
+			this.popBotom = e.target.height || 0
+		},
+		onBlur() {
+			this.isFocus = false
+		},
+		onConfirm() {
+			if (this.inputValue.length === this.codeLength) {
+				this.$emit('confirm', this.inputValue);
 			}
+
 		},
-		computed: {
-			code() {
-				return this.inputValue.split('').slice(0, this.codeLength)
-			},
-			currentIndex() {
-				return this.inputValue.length
-			}
-		},
-		watch: {
-			// show(val) {
-			// 	if (val) {
-			// 		this.$refs.realInput && this.$refs.realInput.focus
-			// 	} else {
-			// 		this.inputValue = ''
-			// 	}
-			// }
-		},
-		mounted() {
-			// uni.onKeyboardHeightChange((res)=>{
-			// 	this.keyboardHeight = res.height;
-			// })
-		},
-		methods: {
-			onInput(e) {
-				let val = e.detail.value.replace(/[^0-9]/g, '').slice(0, this.codeLength)
-				this.inputValue = val
-				this.$emit('input', val)
-				if (val.length === this.codeLength) {
-					this.$emit('finish', val)
-				}
-			},
-			onFocus(e) {
-				this.isFocus = true
-				this.inputValue = ''
-			},
-			onkeyboardheightchange(e){
-				this.popBotom = e.target.height || 0
-			},
-			onBlur() {
-				this.isFocus = false
-			},
-			onConfirm() {
-				if (this.inputValue.length === this.codeLength) {
-					this.$emit('confirm', this.inputValue);
-				}
-				
-			},
-			close() {
-				this.$emit('close')
-			}
+		close() {
+			this.$emit('close')
 		}
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.service-code-modal {
+.service-code-modal {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 999999;
+
+	.modal-mask {
 		position: fixed;
 		left: 0;
 		top: 0;
 		right: 0;
 		bottom: 0;
-		z-index: 999999;
+		background: rgba(0, 0, 0, 0.5);
+		z-index: -1;
+	}
 
-		.modal-mask {
+	.modal-content {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: #fff;
+		border-radius: 32rpx 32rpx 0 0;
+		padding: 56rpx 40rpx 40rpx 40rpx;
+		box-shadow: 0 -8rpx 32rpx rgba(0, 0, 0, 0.08);
+		min-height: 340rpx;
+		align-items: center;
+		display: flex;
+		flex-direction: column;
+		animation: modalUp 0.25s;
+	}
+
+	.modal-title {
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #222;
+		text-align: center;
+	}
+
+	.modal-subtitle {
+		font-size: 28rpx;
+		color: #888;
+		margin: 24rpx 0 40rpx 0;
+		text-align: center;
+	}
+
+	.code-box {
+		flex-direction: row;
+		display: flex;
+		justify-content: center;
+		margin-bottom: 48rpx;
+		position: relative;
+
+		.code-cell {
+			width: 72rpx;
+			height: 72rpx;
+			border: 2rpx solid #eee;
+			border-radius: 16rpx;
+			margin-right: 24rpx;
+			font-size: 40rpx;
+			color: #ff4d8d;
+			background: #fff;
+			text-align: center;
+			line-height: 72rpx;
+			box-sizing: border-box;
+			transition: border-color 0.2s;
+
+			&.active {
+				border-color: #ff4d8d;
+			}
+
+			&.filled {
+				border-color: #ff4d8d;
+			}
+
+			&:last-child {
+				margin-right: 0;
+			}
+		}
+
+		.real-input {
 			position: absolute;
 			left: 0;
 			top: 0;
-			right: 0;
-			bottom: 0;
-			background: rgba(0, 0, 0, 0.15);
-		}
-
-		.modal-content {
-			position: absolute;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			background: #fff;
-			border-radius: 32rpx 32rpx 0 0;
-			padding: 56rpx 40rpx 40rpx 40rpx;
-			box-shadow: 0 -8rpx 32rpx rgba(0, 0, 0, 0.08);
-			min-height: 340rpx;
-			align-items: center;
-			display: flex;
-			flex-direction: column;
-			animation: modalUp 0.25s;
-		}
-
-		.modal-title {
-			font-size: 36rpx;
-			font-weight: bold;
-			color: #222;
-			text-align: center;
-		}
-
-		.modal-subtitle {
-			font-size: 28rpx;
-			color: #888;
-			margin: 24rpx 0 40rpx 0;
-			text-align: center;
-		}
-
-		.code-box {
-			flex-direction: row;
-			display: flex;
-			justify-content: center;
-			margin-bottom: 48rpx;
-			position: relative;
-
-			.code-cell {
-				width: 72rpx;
-				height: 72rpx;
-				border: 2rpx solid #eee;
-				border-radius: 16rpx;
-				margin-right: 24rpx;
-				font-size: 40rpx;
-				color: #ff4d8d;
-				background: #fff;
-				text-align: center;
-				line-height: 72rpx;
-				box-sizing: border-box;
-				transition: border-color 0.2s;
-
-				&.active {
-					border-color: #ff4d8d;
-				}
-
-				&.filled {
-					border-color: #ff4d8d;
-				}
-
-				&:last-child {
-					margin-right: 0;
-				}
-			}
-
-			.real-input {
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 100%;
-				height: 100%;
-				opacity: 0;
-				z-index: 2;
-			}
-		}
-
-		.confirm-btn {
 			width: 100%;
-			height: 88rpx;
-			background: #ff4d8d;
+			height: 100%;
+			opacity: 0;
+			z-index: 2;
+			caret-color: transparent;
+		}
+	}
+
+	.confirm-btn {
+		width: 100%;
+		height: 88rpx;
+		background: #ff4d8d;
+		color: #fff;
+		font-size: 32rpx;
+		border-radius: 16rpx;
+		margin-top: 16rpx;
+		text-align: center;
+		line-height: 88rpx;
+		border: none;
+
+		&:disabled {
+			background: #ffd1e3;
 			color: #fff;
-			font-size: 32rpx;
-			border-radius: 16rpx;
-			margin-top: 16rpx;
-			text-align: center;
-			line-height: 88rpx;
-			border: none;
-
-			&:disabled {
-				background: #ffd1e3;
-				color: #fff;
-			}
-		}
-
-		.close-btn {
-			position: absolute;
-			right: 32rpx;
-			top: 32rpx;
-			font-size: 48rpx;
-			color: #bbb;
-			z-index: 10;
-			font-weight: bold;
-			line-height: 1;
 		}
 	}
 
-	@keyframes modalUp {
-		from {
-			transform: translateY(100%);
-		}
-
-		to {
-			transform: translateY(0);
-		}
+	.close-btn {
+		position: absolute;
+		right: 32rpx;
+		top: 32rpx;
+		font-size: 48rpx;
+		color: #bbb;
+		z-index: 10;
+		font-weight: bold;
+		line-height: 1;
 	}
+}
+
+@keyframes modalUp {
+	from {
+		transform: translateY(100%);
+	}
+
+	to {
+		transform: translateY(0);
+	}
+}
 </style>
\ No newline at end of file
diff --git a/components/service-grid/service-grid.vue b/components/service-grid/service-grid.vue
index 16b665c..a7e55ec 100644
--- a/components/service-grid/service-grid.vue
+++ b/components/service-grid/service-grid.vue
@@ -181,7 +181,7 @@
 		position: absolute;
 		top: 0rpx;
 		left: 0rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		color: #FFFFFF;
 		font-size: 24rpx;
 		padding: 6rpx 14rpx;
@@ -247,7 +247,7 @@
 	.price-symbol {
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
@@ -256,7 +256,7 @@
 	.price-value {
 		font-weight: 500;
 		font-size: 36rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
@@ -332,12 +332,12 @@
 
 .price-symbol {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-value {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
   margin-right: 12rpx;
 }
diff --git a/components/shop-list/shop-list.vue b/components/shop-list/shop-list.vue
index a7b2a0b..f6f4458 100644
--- a/components/shop-list/shop-list.vue
+++ b/components/shop-list/shop-list.vue
@@ -336,7 +336,7 @@
 	.price-text{
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
@@ -345,7 +345,7 @@
 	.price-symbol {
 		font-weight: 500;
 		font-size: 20rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
@@ -354,7 +354,7 @@
 	.price-value {
 		font-weight: 500;
 		font-size: 30rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
diff --git a/components/step-tab/step-tab.vue b/components/step-tab/step-tab.vue
index 1615bfe..7b9b60f 100644
--- a/components/step-tab/step-tab.vue
+++ b/components/step-tab/step-tab.vue
@@ -1,63 +1,54 @@
 <template>
   <view class="step-tab">
     <view class="step-container">
-      <!-- 步骤1: 入驻协议 -->
       <view class="step-item" :class="getStepClass(0)">
         <view class="step-icon">
-          <image 
-            v-if="currentStep === 0" 
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d" 
+          <image
+            v-if="mappedStep === 0"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d62a1d01-52cb-418e-ba5b-afef513061b9.png"
             class="step-img active-circle"
             mode="aspectFit"
           />
-          <view v-else-if="currentStep > 0" class="step-done">1</view>
+          <view v-else-if="mappedStep > 0" class="step-done">1</view>
           <view v-else class="step-number">1</view>
         </view>
-        <text class="step-text" :class="{ active: currentStep === 0 }">入驻协议</text>
+        <text class="step-text" :class="{ active: mappedStep === 0 }">入驻协议</text>
       </view>
-      
-      <!-- 第一个连接线 -->
+
       <view class="line-segment line-1">
         <view class="line-progress" :class="{ active: line1Active, deactivating: line1Deactivating }"></view>
       </view>
-      
-      <!-- 步骤2: 根据身份显示不同信息 -->
+
       <view class="step-item" :class="getStepClass(1)">
         <view class="step-icon">
-          <image 
-            v-if="currentStep === 1" 
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d" 
+          <image
+            v-if="mappedStep === 1"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d62a1d01-52cb-418e-ba5b-afef513061b9.png"
             class="step-img active-circle"
             mode="aspectFit"
           />
-          <view v-else-if="currentStep > 1" class="step-done">2</view>
+          <view v-else-if="mappedStep > 1" class="step-done">2</view>
           <view v-else class="step-number">2</view>
         </view>
-        <text class="step-text" :class="{ active: currentStep === 1 }">
-          {{ identity === 1 ? '个人信息' : '资质信息' }}
-        </text>
+        <text class="step-text" :class="{ active: mappedStep === 1 }">基本信息</text>
       </view>
-      
-      <!-- 第二个连接线 -->
+
       <view class="line-segment line-2">
         <view class="line-progress" :class="{ active: line2Active, deactivating: line2Deactivating }"></view>
       </view>
-      
-      <!-- 步骤3: 根据身份显示不同信息 -->
+
       <view class="step-item" :class="getStepClass(2)">
         <view class="step-icon">
-          <image 
-            v-if="currentStep === 2" 
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d" 
+          <image
+            v-if="mappedStep === 2"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d62a1d01-52cb-418e-ba5b-afef513061b9.png"
             class="step-img active-circle"
             mode="aspectFit"
           />
-          <view v-else-if="currentStep > 2" class="step-done">3</view>
+          <view v-else-if="mappedStep > 2" class="step-done">3</view>
           <view v-else class="step-number">3</view>
         </view>
-        <text class="step-text" :class="{ active: currentStep === 2 }">
-          {{ identity === 1 ? '资质信息' : '门店信息' }}
-        </text>
+        <text class="step-text" :class="{ active: mappedStep === 2 }">资质认证</text>
       </view>
     </view>
   </view>
@@ -67,32 +58,23 @@
 export default {
   name: "StepTab",
   props: {
-    // 当前步骤索引 (0, 1, 2)
-    currentStep: {
+    mappedStep: {
       type: Number,
       default: 0
-    },
-    // 身份类型：1-手艺人，2-商家
-    identity: {
-      type: Number,
-      default: 2
     }
   },
   data() {
     return {
-      prevStep: 0, // 记录上一步骤
-      line1Active: false, // 第一条线激活状态
-      line2Active: false, // 第二条线激活状态
-      line1Deactivating: false, // 第一条线正在取消激活
-      line2Deactivating: false // 第二条线正在取消激活
+      prevStep: 0,
+      line1Active: false,
+      line2Active: false,
+      line1Deactivating: false,
+      line2Deactivating: false
     };
   },
   watch: {
-    // 监听currentStep变化，处理线条动画
-    currentStep(newVal, oldVal) {
+    mappedStep(newVal, oldVal) {
       this.prevStep = oldVal;
-      
-      // 处理前进动画
       if (newVal > oldVal) {
         if (newVal >= 1) {
           this.line1Active = true;
@@ -102,38 +84,34 @@ export default {
           this.line2Active = true;
           this.line2Deactivating = false;
         }
-      } 
-      // 处理返回动画
-      else if (newVal < oldVal) {
+      } else if (newVal < oldVal) {
         if (newVal < 2) {
           this.line2Deactivating = true;
           setTimeout(() => {
             this.line2Active = false;
             this.line2Deactivating = false;
-          }, 300); // 与动画持续时间匹配
+          }, 300);
         }
         if (newVal < 1) {
           this.line1Deactivating = true;
           setTimeout(() => {
             this.line1Active = false;
             this.line1Deactivating = false;
-          }, 300); // 与动画持续时间匹配
+          }, 300);
         }
       }
     }
   },
   mounted() {
-    // 初始化线条状态
-    this.line1Active = this.currentStep >= 1;
-    this.line2Active = this.currentStep >= 2;
+    this.line1Active = this.mappedStep >= 1;
+    this.line2Active = this.mappedStep >= 2;
   },
   methods: {
-    // 获取步骤的CSS类名
     getStepClass(stepIndex) {
-      if (stepIndex === this.currentStep) {
+      if (stepIndex === this.mappedStep) {
         return 'active';
       }
-      else if (stepIndex < this.currentStep) {
+      else if (stepIndex < this.mappedStep) {
         return 'completed';
       }
       return '';
@@ -206,7 +184,7 @@ export default {
   justify-content: center;
   align-items: center;
   font-size: 28rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
   transition: all 0.3s ease;
   box-shadow: inset 0 0 4rpx rgba(232, 16, 30, 0.2);
@@ -259,35 +237,16 @@ export default {
   transform-origin: left center;
 }
 
-/* 激活状态的线条 - 前进动画 */
 .line-progress.active {
   width: 100%;
-  background-color: #E8101E;
+  background-color: #FF4767;
   transition: width 0.3s ease;
 }
 
-/* 取消激活状态的线条 - 返回动画 */
 .line-progress.deactivating {
   width: 0%;
-  background-color: #E8101E;
+  background-color: #FF4767;
   transition: width 0.3s ease;
   transform-origin: right center;
 }
-
-/* 响应式调整 */
-@media (max-width: 750rpx) {
-  .step-container {
-    /* padding: 5rpx 40rpx; */
-  }
-  
-  .line-segment {
-    /* width: 100rpx; */
-  }
-  
-  /* .line-1,
-  .line-2 {
-    margin-left: 15rpx;
-    margin-right: 15rpx;
-  } */
-}
-</style>
\ No newline at end of file
+</style>
diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 6bbe3f5..32b9d65 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -1,123 +1,209 @@
 <template>
-	<uv-tabbar fixed :value="selected" @change="change1" activeColor="#ee0a24" :placeholder="false"
-		:safeAreaInsetBottom="false" :customStyle="{height:`110rpx`}">
-		<uv-tabbar-item v-for="(item,index) in $store.state.tabbarList" :key="index" :badge="getNum(index)"
-			:customStyle="{height:`110rpx`}">
-			<template v-slot:active-icon>
-				<image class="icon" :src="item.selectedIconPath"></image>
-			</template>
-			<template v-slot:inactive-icon>
-				<image class="icon" :src="item.iconPath"></image>
-			</template>
-		</uv-tabbar-item>
-	</uv-tabbar>
+    <uv-tabbar
+        v-if="tabbarReady"
+        :key="refreshKey"
+        fixed
+        :value="currentTabIndex"
+        @change="onTabChange"
+        activeColor="#FF4767"
+        :placeholder="false"
+        :safeAreaInsetBottom="false"
+        :customStyle="{height:'110rpx'}"
+    >
+        <uv-tabbar-item
+            v-for="(item, idx) in tabbarList"
+            :key="idx"
+            :name="idx"
+            :text="item.text"
+            :badge="getNum(idx)"
+            :customStyle="{height:'110rpx'}"
+            @click="onItemClick(idx)"
+        >
+            <template v-slot:active-icon>
+                <image class="icon" :src="item.selectedIconPath"></image>
+            </template>
+            <template v-slot:inactive-icon>
+                <image class="icon" :src="item.iconPath"></image>
+            </template>
+        </uv-tabbar-item>
+    </uv-tabbar>
 </template>
 
 <script>
-	import request from "@/utils/request";
-	export default {
-		name: "tab-bar",
-		props: {
-			selected: {
-				type: [Number, String]
-			}
-		},
-		data() {
-			return {
-				tabbarList: [{
-						"iconPath": "/static/images/tabbar/new_home_gray.png",
-						"text": "首页",
-						"selectedIconPath": "/static/images/tabbar/new_home.png",
-						"pagePath": "/pages/home/home"
-					},
-					{
-						"iconPath": "/static/images/tabbar/new_message_gray.png",
-						"text": "消息",
-						"selectedIconPath": "/static/images/tabbar/new_message.png",
-						"pagePath": "/pages/message/message"
-					},
-					{
-						"iconPath": "/static/images/tabbar/new_my_gray.png",
-						"text": "我的",
-						"selectedIconPath": "/static/images/tabbar/new_my.png",
-						"pagePath": "/pages/my/my"
-					}
-				]
-			};
-		},
-		computed: {
-			messageNum() {
-				return this.$store.state.messageNum || 0
-			}
-		},
-		async created() {
-			if (!this.$store.state.tabbarList.length) {
-				let isnNetwork = uni.getStorageSync("isnNetwork");
-				if (isnNetwork) {
-					await this.getButtonImg()
-				} else {
-					uni.getNetworkType({
-						success: (res) => {
-							console.log(res.networkType);
-							if (res.networkType == "none") {
+import { mapState, mapMutations } from 'vuex';
+import request from "@/utils/request";
 
-								this.$store.commit("setTabbarList", this.tabbarList)
-							} else {
-								// 页面加载逻辑
-								uni.setStorageSync("isnNetwork", 1);
-								this.getButtonImg()
-							}
-						},
-					});
-				}
+export default {
+    name: "tab-bar",
+    // 不再需要 props.selected，完全由 Vuex 控制高亮
+    data() {
+        return {
+            refreshKey: 0,          // 强制重建标识
+            tabbarReady: false,     // 组件就绪标识
+            tabbarList: [           // tab 配置
+                {
+                    iconPath: "/static/images/tabbar/new_home_gray.png",
+                    text: "首页",
+                    selectedIconPath: "/static/images/tabbar/new_home.png",
+                    pagePath: "/pages/home/home"
+                },
+                {
+                    iconPath: "/static/images/tabbar/new_order_gray.png",
+                    text: "订单",
+                    selectedIconPath: "/static/images/tabbar/new_order.png",
+                    pagePath: "/pages/order/userorder-list"
+                },
+                {
+                    iconPath: "/static/images/tabbar/new_message_gray.png",
+                    text: "消息",
+                    selectedIconPath: "/static/images/tabbar/new_message.png",
+                    pagePath: "/pages/message/message"
+                },
+                {
+                    iconPath: "/static/images/tabbar/new_my_gray.png",
+                    text: "我的",
+                    selectedIconPath: "/static/images/tabbar/new_my.png",
+                    pagePath: "/pages/my/my"
+                }
+            ]
+        };
+    },
+    computed: {
+        // 保留对消息数量的映射
+        ...mapState(['messageNum']),
+        
+        // ========= 动态计算当前高亮索引 =========
+        // 替代原先直接获取 Vuex 的方式，改为根据当前真实路由计算，解决刷新状态丢失问题
+        currentTabIndex() {
+            try {
+                // 获取当前页面栈
+                const pages = getCurrentPages();
+                if (pages && pages.length > 0) {
+                    // 获取当前页面实例
+                    const currentPage = pages[pages.length - 1];
+                    // 拼接当前页面路径（兼容不同平台获取路由的方式）
+                    const currentPath = '/' + (currentPage.route || currentPage.__route__);
+                    
+                    // 在 tabbarList 中查找匹配当前路径的索引
+                    const index = this.tabbarList.findIndex(item => item.pagePath === currentPath);
+                    if (index !== -1) {
+                        return index;
+                    }
+                }
+                // 如果由于某些原因匹配不到，降级去取 Vuex 中的值（防止其他极端情况报错）
+                return this.$store.state.currentTabIndex || 0;
+            } catch (e) {
+                return this.$store.state.currentTabIndex || 0;
+            }
+        }
+        // =================================================
+    },
+    watch: {
+        // 当 tabbarList 内容变化（如异步更新图标）时，强制重建组件
+        tabbarList: {
+            deep: true,
+            handler() {
+                this.rebuildTabbar();
+            }
+        }
+    },
+    created() {
+        // 初始化时延迟显示，避免闪烁
+        this.tabbarReady = false;
+        this.$nextTick(() => {
+            this.tabbarReady = true;
+            // 如果需要异步加载图标，取消下面注释
+            // this.getButtonImg();
+        });
+    },
+    methods: {
+        ...mapMutations(['SET_CURRENT_TAB_INDEX']),
 
-			}
+        // 设置全局选中索引（简化调用）
+        setCurrentTabIndex(index) {
+            this.SET_CURRENT_TAB_INDEX(index);
+        },
 
-		},
-		methods: {
-			getNum(index) {
-				if (index == 1) {
-					return this.messageNum
-				} else {
-					return 0
-				}
-			},
-			//获取头部背景图片
-			async getButtonImg() {
-				let res = await request.post("/sj/poster/getButtonImg", {});
-				if (res.code == 200) {
-					// if (res.data?.photo) {
-					// 	this.topBgImage = res.data?.photo + '?time=666'
-					// }
-					this.tabbarList.forEach((item, index) => {
-						if (res.data[index].iconPath) {
-							item.iconPath = res.data[index].iconPath
-						}
-						if (res.data[index].selectedIconPath) {
-							item.selectedIconPath = res.data[index].selectedIconPath
-						}
-					})
-				}
-				this.$store.commit("setTabbarList", this.tabbarList)
-			},
-			change1(val) {
-				// 因为在pages中配置了需要跳转的页面为 tabbar页面 
-				// 所以不能使用navigateTo 只能使用下面这个方法跳转。
-				uni.switchTab({
-					url: this.tabbarList[val].pagePath
-				})
-				this.messageUpudateNum()
-			}
-		}
-	}
+        // 强制重建 uv-tabbar（用于异步更新图标后）
+        rebuildTabbar() {
+            this.tabbarReady = false;
+            this.$nextTick(() => {
+                this.refreshKey++;
+                this.tabbarReady = true;
+            });
+        },
+
+        // 获取角标数字（只有消息 tab 且数量 > 0 才显示）
+        getNum(index) {
+            if (index === 2 && this.messageNum > 0) {
+                return this.messageNum;
+            }
+            return null;
+        },
+
+        // 异步更新图标（保留你的业务逻辑）
+        async getButtonImg() {
+            try {
+                let res = await request.post("/sj/poster/getButtonImg", {});
+                if (res.code === 200) {
+                    this.tabbarList.forEach((item, index) => {
+                        if (res.data[index]?.iconPath) {
+                            item.iconPath = res.data[index].iconPath;
+                        }
+                        if (res.data[index]?.selectedIconPath) {
+                            item.selectedIconPath = res.data[index].selectedIconPath;
+                        }
+                    });
+                    this.$store.commit("setTabbarList", this.tabbarList);
+                    // 图标更新后，强制重建组件
+                    this.rebuildTabbar();
+                }
+            } catch (err) {
+                console.error('getButtonImg 请求失败', err);
+            }
+        },
+
+        // uv-tabbar 的 change 事件（组件内部触发）
+        onTabChange(val) {
+            const idx = parseInt(val, 10);
+            this.doJump(idx);
+        },
+
+        // 手动点击 item 时触发
+        onItemClick(idx) {
+            this.doJump(idx);
+        },
+
+        // 实际跳转逻辑 + 更新全局高亮
+        doJump(index) {
+            const idx = parseInt(index, 10);
+            if (isNaN(idx) || !this.tabbarList[idx]) return;
+
+            // 依然更新全局高亮，确保其他可能依赖 Vuex 状态的逻辑正常运行
+            this.setCurrentTabIndex(idx);
+
+            // 跳转页面
+            const targetPage = this.tabbarList[idx].pagePath;
+            uni.switchTab({
+                url: targetPage,
+                fail: (err) => console.error('switchTab 失败', err)
+            });
+
+            // 保留你原有的消息更新方法
+            if (typeof this.messageUpudateNum === 'function') {
+                this.messageUpudateNum();
+            }
+        }
+    }
+};
 </script>
 
 <style lang="scss">
-	.icon {
-		height: 98rpx;
-		width: 98rpx;
-	}
-	::v-deep .uv-tabbar__content{
-		z-index: 999!important;
-	}
+.icon {
+    height: 54rpx;
+    width: 54rpx;
+}
+::v-deep .uv-tabbar__content {
+    z-index: 999 !important;
+}
 </style>
\ No newline at end of file
diff --git a/components/time-picker/time-date-picker.vue b/components/time-picker/time-date-picker.vue
index 3e40274..965f575 100644
--- a/components/time-picker/time-date-picker.vue
+++ b/components/time-picker/time-date-picker.vue
@@ -383,7 +383,7 @@
 			justify-content: center;
 			width: 690rpx;
 			height: 80rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 38rpx;
 			font-weight: 400;
 			font-size: 30rpx;
diff --git a/components/time-picker/time-picker.vue b/components/time-picker/time-picker.vue
index 1cc688b..641a639 100644
--- a/components/time-picker/time-picker.vue
+++ b/components/time-picker/time-picker.vue
@@ -169,7 +169,7 @@ export default {
     justify-content: center;
     width: 690rpx;
     height: 80rpx;
-    background: #E8101E;
+    background: #FF4767;
     border-radius: 38rpx;
     font-weight: 400;
     font-size: 30rpx;
diff --git a/components/upload-app/upload-app.vue b/components/upload-app/upload-app.vue
index 917bbaf..c0ff40e 100644
--- a/components/upload-app/upload-app.vue
+++ b/components/upload-app/upload-app.vue
@@ -307,7 +307,7 @@ export default {
       &__text {
         font-weight: 400;
         font-size: 18rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 25rpx;
         text-align: left;
         font-style: normal;
@@ -371,7 +371,7 @@ export default {
       &__immediately {
         width: 236rpx;
         height: 78rpx;
-        background: #E8101E;
+        background: #FF4767;
         border-radius: 39rpx;
         display: flex;
         align-items: center;
@@ -405,7 +405,7 @@ export default {
 
         &__active {
           height: 28rpx;
-          background: linear-gradient(270deg, #fe78b3 0%, #E8101E 100%);
+          background: linear-gradient(270deg, #fe78b3 0%, #FF4767 100%);
           border-radius: 39rpx;
         }
 
diff --git a/manifest.json b/manifest.json
index 584ecdc..52bd228 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,14 +2,21 @@
     "name" : "美融融商家",
     "appid" : "__UNI__BBE6285",
     "description" : "同城便捷到家美业“技术外卖”服务、同城预约到店服务平台美融融为同城爱美人群提供更优质的更全面的服务。",
-    "versionName" : "1.0.09",
-    "versionCode" : 1009,
+    "versionName" : "1.0.22",
+    "versionCode" : 1022,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
+        "screenOrientation" : [
+            //可选，字符串数组类型，应用支持的横竖屏
+            "portrait-primary", //可选，字符串类型，支持竖屏
+            "portrait-secondary", //可选，字符串类型，支持反向竖屏
+            "landscape-primary", //可选，字符串类型，支持横屏
+            "landscape-secondary" //可选，字符串类型，支持反向横屏
+        ],
         "compatible" : {
             "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
         },
@@ -34,7 +41,8 @@
             "Payment" : {},
             "VideoPlayer" : {},
             "OAuth" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "Barcode" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -69,6 +77,7 @@
             },
             /* ios打包配置 */
             "ios" : {
+                "UIRequiresFullScreen" : false, // 允许非全屏模式
                 "urlschemewhitelist" : [ "iosmap" ],
                 "dSYMs" : false,
                 "plistcmds" : [
diff --git a/pages.json b/pages.json
index b63a79f..f3b2606 100644
--- a/pages.json
+++ b/pages.json
@@ -31,6 +31,20 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/home/growth-package",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/home/growth-package-result",
+			"style": {
+				"navigationBarTitleText": "支付结果",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/message/message",
 			"style": {
@@ -89,8 +103,12 @@
 			"path": "pages/order/userorder-list",
 			"style": {
 				"navigationBarTitleText": "订单",
-				"navigationBarBackgroundColor": "#FFFFFF"
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"app-plus": {
+				      "softinputNavBar": "none"
+				    }
 			}
+			
 		},
 		{
 			"path": "pages/order/userorder-detail",
@@ -150,7 +168,13 @@
 			}
 		},
 		{
-			"path": "pages/add/add",
+			"path": "pages/notice/notice_list",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/notice/detail",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -221,6 +245,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/search_common/search",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/settings/index",
 			"style": {
@@ -584,6 +614,30 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/shop/verify/verify-order",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/shop/verify/manual-verify",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/shop/verify/verify-fail",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/shop/verify/verify-order-detail",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/shop/photoAlbum/photoManage",
 			"style": {
@@ -596,6 +650,14 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/shop/photoAlbum/videoplayer",
+			"style": {
+				"navigationBarTitleText": "全屏视频播放",
+				"pageOrientation": "auto",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/shop/photoAlbum/videoList",
 			"style": {
@@ -943,6 +1005,43 @@
 			"style": {
 				"navigationBarTitleText": "拍摄技巧"
 			}
+		},
+		{
+			"path": "pages/my/myFavorite",
+			"style": {
+				"navigationBarTitleText": "我的收藏",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/jingxuan/selected-skills",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/jingxuan/selected-brands",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/jingxuan/brand-detail",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/jingxuan/skill-detail",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/ruzhu/successruzhu",
+			"style": {
+				"navigationBarTitleText": "入驻成功"
+			}
 		}
 
 
@@ -955,7 +1054,7 @@
 	},
 	"tabBar": {
 		"color": "#999",
-		"selectedColor": "#E8101E",
+		"selectedColor": "#FF4767",
 		"backgroundColor": "#fff",
 		"list": [{
 				"iconPath": "/static/images/tabbar/home_icon_dis.png",
@@ -963,10 +1062,17 @@
 				"selectedIconPath": "/static/images/tabbar/home_icon_active.png",
 				"pagePath": "pages/home/home"
 			},
-			{ 	"iconPath": "/static/images/tabbar/new_message_gray.png",
-				"text": "消息", 
-				"selectedIconPath": "/static/images/tabbar/new_message.png", 
-				"pagePath": "pages/message/message" 
+			{
+				"iconPath": "/static/images/tabbar/new_order_gray.png",
+				"text": "订单",
+				"selectedIconPath": "/static/images/tabbar/new_order.png",
+				"pagePath": "pages/order/userorder-list"
+			},
+			{
+				"iconPath": "/static/images/tabbar/new_message_gray.png",
+				"text": "消息",
+				"selectedIconPath": "/static/images/tabbar/new_message.png",
+				"pagePath": "pages/message/message"
 			},
 			{
 				"iconPath": "/static/images/tabbar/my_icon_dis.png",
@@ -977,4 +1083,4 @@
 		]
 	},
 	"uniIdRouter": {}
-}
\ No newline at end of file
+}
diff --git a/pages/address/add.nvue b/pages/address/add.nvue
index 4fe7123..2e2a5d5 100644
--- a/pages/address/add.nvue
+++ b/pages/address/add.nvue
@@ -55,7 +55,7 @@
 				<!-- 设为默认地址 -->
 				<view class="form-item switch-item">
 					<text class="label">设为默认地址</text>
-					<switch :checked="addressInfo.is_default == 1" @change="onSwitchChange" color="#E8101E" />
+					<switch :checked="addressInfo.is_default == 1" @change="onSwitchChange" color="#FF4767" />
 				</view>
 				<!-- 顶部图标 -->
 				<view class="biao"></view>
@@ -622,7 +622,7 @@
 	.save-btn {
 		width: 630rpx;
 		height: 96rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 44rpx;
 		display: flex;
 		justify-content: center;
diff --git a/pages/address/list.vue b/pages/address/list.vue
index 8d7fa59..bbe9d94 100644
--- a/pages/address/list.vue
+++ b/pages/address/list.vue
@@ -261,7 +261,7 @@
 
 	/* .tag {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
   background-color: rgba(252, 67, 124, 0.08);
   padding: 6rpx 16rpx;
   border-radius: 6rpx;
@@ -370,7 +370,7 @@
 		width: 690rpx;
 		height: 78rpx;
 		border-radius: 39rpx;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		text-align: center;
 		line-height: 64rpx;
 		display: flex;
@@ -383,7 +383,7 @@
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
 		font-size: 30rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 42rpx;
 		text-align: left;
 		font-style: normal;
diff --git a/pages/address/newSearch.nvue b/pages/address/newSearch.nvue
index b0d7c08..4194541 100644
--- a/pages/address/newSearch.nvue
+++ b/pages/address/newSearch.nvue
@@ -7,7 +7,7 @@
 		<!-- <view class="search-container">
 			<text class="search-container-text" @click="goSelectCity">{{ city.name }}</text>
 			<search-box v-model="searchKeyword" placeholder="请输入地址" width="571rpx" height="68rpx"
-				border="1px solid #E8101E" style="padding: 0;" @confirm="onSearch" :showBack="false"></search-box>
+				border="1px solid #FF4767" style="padding: 0;" @confirm="onSearch" :showBack="false"></search-box>
 		</view> -->
 		<view class="search-container">
 			<text class="search-container-text" @click="goSelectCity">
@@ -858,7 +858,7 @@
 			flex: 1;
 			height: 68rpx;
 			background: #FFFFFF;
-			border: 2rpx solid #E8101E;
+			border: 2rpx solid #FF4767;
 			border-radius: 60rpx;
 			position: relative;
 
@@ -936,7 +936,7 @@
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 34rpx;
 				text-align: center;
 				font-style: normal;
@@ -1124,7 +1124,7 @@
 		width: 48rpx;
 		height: 26rpx;
 		border-radius: 6rpx;
-		background: #E8101E;
+		background: #FF4767;
 		margin-right: 10rpx;
 
 		&__text {
diff --git a/pages/address/revise.nvue b/pages/address/revise.nvue
index 86bbf04..d535b87 100644
--- a/pages/address/revise.nvue
+++ b/pages/address/revise.nvue
@@ -55,7 +55,7 @@
 				<!-- 设为默认地址 -->
 				<view class="form-item switch-item">
 					<text class="label">设为默认地址</text>
-					<switch :checked="addressInfo.is_default == 1" @change="onSwitchChange" color="#E8101E" />
+					<switch :checked="addressInfo.is_default == 1" @change="onSwitchChange" color="#FF4767" />
 				</view>
 				<!-- 顶部图标 -->
 				<view class="biao"></view>
@@ -614,7 +614,7 @@
 	.save-btn {
 		width: 630rpx;
 		height: 96rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 44rpx;
 		display: flex;
 		justify-content: center;
diff --git a/pages/address/search-副本.nvue b/pages/address/search-副本.nvue
index 6cc05bc..81f7f5d 100644
--- a/pages/address/search-副本.nvue
+++ b/pages/address/search-副本.nvue
@@ -666,7 +666,7 @@
 			flex: 1;
 			height: 68rpx;
 			background: #FFFFFF;
-			border: 2rpx solid #E8101E;
+			border: 2rpx solid #FF4767;
 			border-radius: 60rpx;
 			position: relative;
 
diff --git a/pages/address/search.vue b/pages/address/search.vue
index 49fb62c..4f803a5 100644
--- a/pages/address/search.vue
+++ b/pages/address/search.vue
@@ -1,86 +1,78 @@
 <template>
-    <view class="search-address-page">
-        <!-- 自定义导航栏 -->
-        <custom-navbar title="搜索地址" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
+	<view class="search-address-page">
+		<!-- 自定义导航栏 -->
+		<custom-navbar title="搜索地址" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
 
-        <!-- 城市选择-->
-        <view class="search-container" v-if="isSelectCity">
-            <text class="search-container-text" @click="goSelectCity">{{ city.name }}</text>
-            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/Fill.jpg" mode="aspectFit" class="text-img"></image>
-        </view>
+		<!-- 城市选择-->
+		<view class="search-container" v-if="isSelectCity">
+			<text class="search-container-text" @click="goSelectCity">{{ city.name }}</text>
+			<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/Fill.jpg" mode="aspectFit"
+				class="text-img"></image>
+		</view>
 
-        <!-- 地图容器 -->
-        <view class="map-container" :style="{ height: mapHeight + 'rpx' }">
-            <map
-                v-if="mapVisible"
-                :key="mapRenderKey"
-                id="map"
-                class="map"
-                :latitude="latitude"
-                :longitude="longitude"
-                scale="19"
-                @tap="onMapTap"
-                @regionchange="changeMap"
-            ></map>
+		<!-- 地图容器 -->
+		<view class="map-container" :style="{ height: mapHeight + 'rpx' }">
+			<map v-if="mapVisible" :key="mapRenderKey" id="map" class="map" :latitude="latitude" :longitude="longitude"
+				scale="19" @tap="onMapTap" @regionchange="changeMap"></map>
 
-            <image
-                v-if="showMapSnapshot"
-                class="map-snapshot"
-                :src="mapSnapshotUrl"
-                mode="aspectFill"
-                @load="onSnapshotLoad"
-                @error="onSnapshotError"
-            ></image>
+			<image v-if="showMapSnapshot" class="map-snapshot" :src="mapSnapshotUrl" mode="aspectFill"
+				@load="onSnapshotLoad" @error="onSnapshotError"></image>
 
-            <cover-view v-if="mapVisible" class="center-marker">
-                <cover-image
-                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/04007cab-3047-42b0-baab-44df344a92d2"
-                    class="center-marker-img"
-                ></cover-image>
-            </cover-view>
-        </view>
+			<cover-view v-if="mapVisible" class="center-marker">
+				<cover-image
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/04007cab-3047-42b0-baab-44df344a92d2"
+					class="center-marker-img"></cover-image>
+			</cover-view>
+		</view>
 
-        <!-- 底部编辑区域 -->
-        <view class="bottom-edit-section">
-            <!-- 地址识别输入行 -->
-            <view class="address-input-row">
-                <textarea class="raw-address-input" v-model="rawAddress" placeholder="粘贴文本到此处，将自动识别地址信息。" placeholder-style="color: #C6C9CC; font-size: 14px;" :maxlength="200" :adjust-position="true" />
-                <view class="action-buttons">
-                    <view class="action-btn paste-btn" @click="hasRawContent ? clearRawAddress() : onPaste()">
-                        <text class="btn-text" :style="{ color: '#333333' }">{{ hasRawContent ? '一键清空' : '粘贴' }}</text>
-                    </view>
-                    <view class="action-btn smart-btn" :class="{ 'smart-btn-active': hasRawContent }" @click="onSmartRecognize">
-                        <text class="btn-text" :style="{ color: hasRawContent ? '#E8101E' : '#999999' }">{{ smartBtnText }}</text>
-                    </view>
-                </view>
-            </view>
+		<!-- 底部编辑区域 -->
+		<view class="bottom-edit-section">
+			<!-- 地址识别输入行 -->
+			<view class="address-input-row">
+				<textarea class="raw-address-input" v-model="rawAddress" placeholder="粘贴文本到此处，将自动识别地址信息。"
+					placeholder-style="color: #C6C9CC; font-size: 14px;" :maxlength="200" :adjust-position="true" />
+				<view class="action-buttons">
+					<view class="action-btn paste-btn" @click="hasRawContent ? clearRawAddress() : onPaste()">
+						<text class="btn-text" :style="{ color: '#333333' }">{{ hasRawContent ? '一键清空' : '粘贴' }}</text>
+					</view>
+					<view class="action-btn smart-btn" :class="{ 'smart-btn-active': hasRawContent }"
+						@click="onSmartRecognize">
+						<text class="btn-text"
+							:style="{ color: hasRawContent ? '#FF4767' : '#999999' }">{{ smartBtnText }}</text>
+					</view>
+				</view>
+			</view>
 
-            <!-- 地址信息栏 -->
-            <view class="address-info-panel">
-                <view class="info-row" @click="selectRegion">
-                    <text class="row-label">所在地区</text>
-                    <view class="row-content">
-                        <text :class="currentRegion ? 'content-text' : 'placeholder'">{{ currentRegion || "请选择"}}</text>
-                        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/71c63001-a104-49ad-a90d-30d2ade73f4d.png" mode="aspectFit" class="arrow-icon"></image>
-                    </view>
-                </view>
-                <view class="line"></view>
-                <view class="info-row">
-                    <text class="row-label">详细地址</text>
-                    <input type="text" class="detail-input" v-model="detailAddress" @input="onDetailInput" placeholder="请填写详细地址" placeholder-style="color: #999999; font-size: 14px;" :adjust-position="true" />
-                </view>
-                <view class="line"></view>
-            </view>
+			<!-- 地址信息栏 -->
+			<view class="address-info-panel">
+				<view class="info-row" @click="selectRegion">
+					<text class="row-label">所在地区</text>
+					<view class="row-content">
+						<text :class="currentRegion ? 'content-text' : 'placeholder'">{{ currentRegion || "请选择"}}</text>
+						<image
+							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/71c63001-a104-49ad-a90d-30d2ade73f4d.png"
+							mode="aspectFit" class="arrow-icon"></image>
+					</view>
+				</view>
+				<view class="line"></view>
+				<view class="info-row">
+					<text class="row-label">详细地址</text>
+					<input type="text" class="detail-input" v-model="detailAddress" @input="onDetailInput"
+						placeholder="请填写详细地址" placeholder-style="color: #999999; font-size: 14px;"
+						:adjust-position="true" />
+				</view>
+				<view class="line"></view>
+			</view>
 
-            <!-- 确认按钮 -->
-            <view class="fixed-confirm-bar">
-                <view class="confirm-btn" @click="onConfirm">
-                    <text class="con-btn-text">确认</text>
-                </view>
-            </view>
-        </view>
+			<!-- 确认按钮 -->
+			<view class="fixed-confirm-bar">
+				<view class="confirm-btn" @click="onConfirm">
+					<text class="con-btn-text">确认</text>
+				</view>
+			</view>
+		</view>
 
-        <!-- 地区选择弹窗（用户端） -->
+		<!-- 地区选择弹窗（用户端） -->
 		<view class="popup" :class="{ show: showRegionPicker }">
 			<view class="popup-mask" @click="closeRegionPicker"></view>
 			<view class="popup-content">
@@ -89,32 +81,19 @@
 					<text class="popup-close" @click="closeRegionPicker">×</text>
 				</view>
 				<view class="region-body">
-					<picker-view
-						@change="onRegionChange"
-						class="picker-scroll"
-						:indicator-style="indicatorStyle"
-						:value="regionPickerValue"
-					>
+					<picker-view @change="onRegionChange" class="picker-scroll" :indicator-style="indicatorStyle"
+						:value="regionPickerValue">
 						<picker-view-column>
-							<view
-								class="picker-item"
-								v-for="(item, index) in regionProvinceList"
-								:key="index"
-							>{{ item.province }}</view>
+							<view class="picker-item" v-for="(item, index) in regionProvinceList" :key="index">
+								{{ item.province }}</view>
 						</picker-view-column>
 						<picker-view-column>
-							<view
-								class="picker-item"
-								v-for="(item, index) in regionCityList"
-								:key="index"
-							>{{ item.city }}</view>
+							<view class="picker-item" v-for="(item, index) in regionCityList" :key="index">
+								{{ item.city }}</view>
 						</picker-view-column>
 						<picker-view-column>
-							<view
-								class="picker-item"
-								v-for="(item, index) in regionDistrictList"
-								:key="index"
-							>{{ item.area }}</view>
+							<view class="picker-item" v-for="(item, index) in regionDistrictList" :key="index">
+								{{ item.area }}</view>
 						</picker-view-column>
 					</picker-view>
 				</view>
@@ -128,2450 +107,2522 @@
 				</view>
 			</view>
 		</view>
-    </view>
+	</view>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import ChinaCitys from './data/ChinaCitys.json'
-    import store from '@/store'
-    import { setVersion } from '@/utils/version.js'
-
-    export default {
-        data() {
-            return {
-                useApiRawRecognize: false,
-                mapVisible: true,
-                showMapSnapshot: false,
-                mapSnapshotUrl: '',
-                mapRenderKey: 0,
-                mapMoveTimer: null,
-                mapProgrammaticUntil: 0,
-                mapGuardTimer: null,
-                mapReverseTimer: null,
-                popupRestoreTimer: null,
-                reverseGeocodeRequestId: 0,
-                dependencyInitLock: false,
-                dependencyInitTimer: null,
-                blankPageInitLock: false,
-
-                // 地图与定位相关
-                systemInfo: {},
-                latitude: 0,
-                longitude: 0,
-                newLatitude: 0,
-                newLongitude: 0,
-                mapHeight: 670,
-                city: {
-                    center: '',
-                    name: ''
-                },
-                isSelectCity: false,
-                searchCity: uni.getStorageSync('searchCity'),
-                source: '',
-                recognizeMapMoving: false,
-                recognizeMapMoveTimer: null,
-
-                // 编辑区数据
-                manualDetail: '',
-                isManualDetail: false,
-                currentProvince: '',
-                currentCity: '',
-                currentDistrict: '',
-                currentDetail: '',
-                selectedProvinceCode: '',
-                selectedCityCode: '',
-                selectedDistrictCode: '',
-                rawAddress: '',
-                hasRawContent: false,
-                smartBtnText: '智能识别',
-                hasDetailContent: false,
-                currentRegion: '',
-                detailAddress: '',
-
-                // 首次进入且上页没有详细地址时，禁止自动回填详细地址
-                suppressInitDetailFill: false,
-                ignoreRegionChangeOnce: false,
-
-                // 地区选择弹窗数据
-                showRegionPicker: false,
-                regionProvinceList: [],
-                regionCityList: [],
-                regionDistrictList: [],
-                regionPickerValue: [0, 0, 0],
-
-                indicatorStyle: 'height: 68rpx;',
-                userSelectedRegion: false,
-
-                // 高德地图 key
-                amapKey: '30b7eb1a1b2f88edc085b9b3ee9a2188'
-            }
-        },
-
-        watch: {
-            rawAddress(newVal) {
-                this.hasRawContent = (newVal || '').trim().length > 0
-                this.smartBtnText = '智能识别'
-            },
-            detailAddress(newVal) {
-                this.hasDetailContent = (newVal || '').trim().length > 0
-            }
-        },
-
-        onLoad(options) {
-    console.log('ChinaCitys 数据:', ChinaCitys)
-    console.log('ChinaCitys 长度:', ChinaCitys?.length)
-
-    this.systemInfo = uni.getSystemInfoSync()
-    this.source = options.source || ''
-    this.mapHeight = 670
-
-    const incomingAddress = options.address ? decodeURIComponent(options.address) : ''
-    const hasDependency = !!options.dependency
-    const hasLocation = !!(options.longitude && options.latitude)
-    const skipAutoLocate = String(options.skip_auto_locate || '') === '1'
-    const initCurrentLocation = String(options.init_current_location || '') === '1'
-    const silentLocate = String(options.silent_locate || '') === '1'
-
-    // 1. 有传入地区：优先按传入地区初始化，禁止首屏地图自动反写
-    if (hasDependency) {
-        const regions = decodeURIComponent(options.dependency).split('-')
-        console.log('传入地区信息:', regions)
-
-        this.currentProvince = regions[0] || ''
-        this.currentCity = regions[1] || ''
-        this.currentDistrict = regions[2] || ''
-
-        let regionText = ''
-        if (this.currentProvince) regionText += this.currentProvince
-        if (this.currentCity && this.currentCity !== this.currentProvince) regionText += this.currentCity
-        if (this.currentDistrict) regionText += this.currentDistrict
-        this.currentRegion = regionText
-
-        if (incomingAddress) {
-            this.detailAddress = incomingAddress
-            this.manualDetail = incomingAddress
-            this.currentDetail = incomingAddress
-            this.isManualDetail = true
-            this.suppressInitDetailFill = false
-        } else {
-            this.detailAddress = ''
-            this.manualDetail = ''
-            this.currentDetail = ''
-            this.isManualDetail = false
-            this.suppressInitDetailFill = true
-        }
-
-        this.startDependencyInitLock()
-
-        if (hasLocation) {
-            this.applyMapLocation(options.longitude, options.latitude, true)
-            return
-        }
-
-        const dependencyCode = options.dependency_code
-
-        ;(async () => {
-            let center = null
-
-            if (dependencyCode && regions[2]) {
-                center = await this.getDistrictCenter(regions[2], dependencyCode)
-            }
-
-            if (!center && regions[2]) {
-                center = await this.getDistrictCenter(regions[2])
-            }
-            if (!center && regions[1] && regions[1] !== regions[0]) {
-                center = await this.getDistrictCenter(regions[1])
-            }
-            if (!center && regions[0]) {
-                center = await this.getDistrictCenter(regions[0])
-            }
-
-            if (center) {
-                const locationRes = center.split(',')
-                if (locationRes.length >= 2) {
-                    this.updateMapCenter(
-                        parseFloat(locationRes[0]),
-                        parseFloat(locationRes[1]),
-                        true
-                    )
-                }
-            } else if (!skipAutoLocate) {
-                this.clearDependencyInitLock()
-                this.getCurrentLocation()
-            } else {
-                this.clearDependencyInitLock()
-            }
-        })()
-
-        return
-    }
-
-    // 2. 只有经纬度，没有地区
-    if (hasLocation) {
-        this.applyMapLocation(options.longitude, options.latitude, true)
-
-        if (incomingAddress) {
-            this.detailAddress = incomingAddress
-            this.manualDetail = incomingAddress
-            this.currentDetail = incomingAddress
-            this.isManualDetail = true
-            this.suppressInitDetailFill = false
-        } else {
-            this.detailAddress = ''
-            this.manualDetail = ''
-            this.currentDetail = ''
-            this.isManualDetail = false
-            this.suppressInitDetailFill = true
-        }
-
-        this.reverseGeocode(parseFloat(options.longitude), parseFloat(options.latitude))
-        return
-    }
-
-    // 3. 从城市选择页进入
-    if (options.city) {
-        const city = JSON.parse(decodeURIComponent(options.city))
-        this.city = city
-        this.ignoreRegionChangeOnce = true
-        this.getNowLocation(city.center)
-        this.isSelectCity = true
-        return
-    }
-
-    // 4. 仅标记城市选择模式
-    if (options.isSelectCity) {
-        this.isSelectCity = true
-        this.getCurrentLocation()
-        return
-    }
-
-    // 5. 手艺人信息页首次进入且详细地址为空：按当前定位初始化
-    if (initCurrentLocation) {
-        this.blankPageInitLock = false
-        this.getCurrentLocation(silentLocate, true)
-        return
-    }
-
-    // 6. 空白进入且明确要求不自动定位
-    if (skipAutoLocate && !hasDependency && !hasLocation) {
-        this.blankPageInitLock = true
-        this.currentProvince = ''
-        this.currentCity = ''
-        this.currentDistrict = ''
-        this.currentRegion = ''
-        this.detailAddress = ''
-        this.manualDetail = ''
-        this.currentDetail = ''
-        this.isManualDetail = false
-        this.suppressInitDetailFill = true
-        return
-    }
-
-    // 7. 默认当前位置
-    if (!skipAutoLocate) {
-        this.blankPageInitLock = false
-        this.getCurrentLocation(silentLocate, false)
-    }
-},
-
-        onShow() {
-            if (!this.isSelectCity) return
-
-            const searchCity = uni.getStorageSync('searchCity')
-            if (searchCity && this.city.name !== searchCity.name) {
-                this.city = searchCity
-                this.searchCity = searchCity
-                this.ignoreRegionChangeOnce = true
-                this.getNowLocation(searchCity.center)
-            }
-        },
-
-        methods: {
-            normalizeMunicipalityName(name) {
-                const value = String(name || '').trim()
-
-                const map = {
-                    '北京': '北京市',
-                    '北京市': '北京市',
-                    '上海': '上海市',
-                    '上海市': '上海市',
-                    '天津': '天津市',
-                    '天津市': '天津市',
-                    '重庆': '重庆市',
-                    '重庆市': '重庆市',
-                    '香港': '香港特别行政区',
-                    '香港特别行政区': '香港特别行政区',
-                    '澳门': '澳门特别行政区',
-                    '澳门特别行政区': '澳门特别行政区'
-                }
-
-                return map[value] || value
-            },
-
-            normalizeRecognizedRegionParts(province, city, district) {
-                let p = this.normalizeMunicipalityName(province)
-                let c = this.normalizeMunicipalityName(city)
-                const d = String(district || '').trim()
-
-                const municipalities = [
-                    '北京市',
-                    '上海市',
-                    '天津市',
-                    '重庆市',
-                    '香港特别行政区',
-                    '澳门特别行政区'
-                ]
-
-                if (!p && municipalities.includes(c)) {
-                    p = c
-                }
-
-                if (!c && municipalities.includes(p)) {
-                    c = p
-                }
-
-                return {
-                    province: p,
-                    city: c,
-                    district: d
-                }
-            },
-
-            buildRegionText(province, city, district) {
-                let text = ''
-                if (province) text += province
-                if (city && city !== province) text += city
-                if (district) text += district
-                return text
-            },
-
-            startDependencyInitLock(duration = 800) {
-                this.dependencyInitLock = true
-
-                if (this.dependencyInitTimer) {
-                    clearTimeout(this.dependencyInitTimer)
-                }
-
-                this.dependencyInitTimer = setTimeout(() => {
-                    this.dependencyInitLock = false
-                    this.dependencyInitTimer = null
-                }, duration)
-            },
-
-            clearDependencyInitLock() {
-                this.dependencyInitLock = false
-
-                if (this.dependencyInitTimer) {
-                    clearTimeout(this.dependencyInitTimer)
-                    this.dependencyInitTimer = null
-                }
-            },
-
-            clearBlankPageInitLock() {
-                this.blankPageInitLock = false
-            },
-
-            isUserGestureMapEvent(causedBy) {
-                return ['gesture', 'drag', 'scale'].includes(String(causedBy || '').toLowerCase())
-            },
-
-            applyMapLocation(longitude, latitude, noReverse = true) {
-                const lng = Number(longitude)
-                const lat = Number(latitude)
-
-                if (!Number.isFinite(lng) || !Number.isFinite(lat)) return
-
-                this.ignoreRegionChangeOnce = true
-                this.mapProgrammaticUntil = Date.now() + 280
-
-                this.longitude = lng
-                this.latitude = lat
-                this.newLongitude = lng
-                this.newLatitude = lat
-
-                if (this.mapGuardTimer) {
-                    clearTimeout(this.mapGuardTimer)
-                }
-                this.mapGuardTimer = setTimeout(() => {
-                    this.ignoreRegionChangeOnce = false
-                    this.mapGuardTimer = null
-                }, 320)
-
-                if (this.mapReverseTimer) {
-                    clearTimeout(this.mapReverseTimer)
-                    this.mapReverseTimer = null
-                }
-
-                if (!noReverse) {
-                    this.mapReverseTimer = setTimeout(() => {
-                        this.reverseGeocode(lng, lat)
-                        this.mapReverseTimer = null
-                    }, 220)
-                }
-            },
-
-            normalizeCityName(province, city) {
-                let cityName = ''
-
-                if (Array.isArray(city)) {
-                    cityName = city[0] || ''
-                } else {
-                    cityName = city || ''
-                }
-
-                const fallbackCities = [
-                    '北京市',
-                    '上海市',
-                    '天津市',
-                    '重庆市',
-                    '香港特别行政区',
-                    '澳门特别行政区'
-                ]
-
-                if (!cityName && fallbackCities.includes(province)) {
-                    cityName = province
-                }
-
-                return cityName
-            },
-
-            buildMapSnapshotUrl() {
-                const lng = Number(this.longitude || this.newLongitude || 0).toFixed(6)
-                const lat = Number(this.latitude || this.newLatitude || 0).toFixed(6)
-                return `https://restapi.amap.com/v3/staticmap?location=${lng},${lat}&zoom=17&size=750*500&scale=2&markers=mid,0xE8101E,A:${lng},${lat}&key=${this.amapKey}`
-            },
-
-            onSnapshotLoad() {
-                console.log('地图加载成功:', this.mapSnapshotUrl)
-            },
-
-            onSnapshotError(e) {
-                console.log('地图加载失败:', e, this.mapSnapshotUrl)
-                uni.showToast({
-                    title: '地图加载失败',
-                    icon: 'none'
-                })
-            },
-
-            findRegionIndexByCode(baseData, provinceCode, cityCode, areaCode) {
-                const result = { provinceIndex: -1, cityIndex: -1, areaIndex: -1 }
-                const targetProvinceCode = (provinceCode || '').slice(0, 6)
-                const targetCityCode = (cityCode || '').slice(0, 6)
-                const targetAreaCode = (areaCode || '').slice(0, 6)
-                if (!targetProvinceCode || !targetCityCode || !targetAreaCode) return result
-
-                for (let pIdx = 0; pIdx < baseData.length; pIdx++) {
-                    const provinceItem = baseData[pIdx]
-                    const currentProvinceCode = (provinceItem.code || '').slice(0, 6)
-                    if (currentProvinceCode === targetProvinceCode) {
-                        result.provinceIndex = pIdx
-                        const citys = provinceItem.citys || []
-                        for (let cIdx = 0; cIdx < citys.length; cIdx++) {
-                            const cityItem = citys[cIdx]
-                            const currentCityCode = (cityItem.code || '').slice(0, 6)
-                            if (currentCityCode === targetCityCode) {
-                                result.cityIndex = cIdx
-                                const areas = cityItem?.areas || []
-                                for (let aIdx = 0; aIdx < areas.length; aIdx++) {
-                                    const areaItem = areas[aIdx]
-                                    const currentAreaCode = (areaItem.code || '').slice(0, 6)
-                                    if (currentAreaCode === targetAreaCode) {
-                                        result.areaIndex = aIdx
-                                        return result
-                                    }
-                                }
-                                return result
-                            }
-                        }
-                        return result
-                    }
-                }
-                return result
-            },
-
-            convert(item) {
-                const data = {
-                    key: this.amapKey,
-                    locations: `${item.longitude},${item.latitude}`,
-                    coordsys: 'gps'
-                }
-                return new Promise((resolve) => {
-                    uni.request({
-                        url: 'https://restapi.amap.com/v3/assistant/coordinate/convert',
-                        method: 'GET',
-                        data,
-                        success(res) {
-                            resolve(res.data)
-                        }
-                    })
-                })
-            },
-
-            getLocation(silent = false) {
-                return new Promise((resolve, reject) => {
-                    const handleFail = (err) => {
-                        if (!silent) {
-                            uni.showToast({ title: '获取位置失败', icon: 'none' })
-                        }
-                        reject(err)
-                    }
-
-                    if (this.$store?.state?.version?.DeviceBrand === 'ios') {
-                        uni.getLocation({
-                            type: 'wgs84',
-                            isHighAccuracy: true,
-                            success: async (res) => {
-                                try {
-                                    const convert = await this.convert(res)
-                                    const locations = String(convert?.locations || '').split(',')
-
-                                    if (locations.length >= 2) {
-                                        res.longitude = Number(locations[0])
-                                        res.latitude = Number(locations[1])
-                                    }
-
-                                    resolve(res)
-                                } catch (error) {
-                                    handleFail(error)
-                                }
-                            },
-                            fail: handleFail
-                        })
-                    } else {
-                        uni.getLocation({
-                            type: 'gcj02',
-                            geocode: true,
-                            success: (res) => resolve(res),
-                            fail: handleFail
-                        })
-                    }
-                })
-            },
-
-            async getCurrentLocation(silent = false, lockInit = false) {
-                this.blankPageInitLock = false
-
-                try {
-                    const locationRes = await this.getLocation(silent)
-
-                    if (lockInit) {
-                        this.startDependencyInitLock(1200)
-                        this.userSelectedRegion = false
-                        this.isManualDetail = false
-                        this.suppressInitDetailFill = false
-                    }
-
-                    this.updateMapCenter(locationRes.longitude, locationRes.latitude, false)
-                } catch (error) {
-                    if (silent) {
-                        this.latitude = 0
-                        this.longitude = 0
-                        this.newLatitude = 0
-                        this.newLongitude = 0
-
-                        this.currentProvince = ''
-                        this.currentCity = ''
-                        this.currentDistrict = ''
-                        this.currentRegion = ''
-                        this.detailAddress = ''
-                        this.manualDetail = ''
-                        this.currentDetail = ''
-                        this.isManualDetail = false
-
-                        this.blankPageInitLock = true
-                        this.suppressInitDetailFill = true
-                    }
-
-                    console.log('定位失败', error)
-                }
-            },
-
-            getNowLocation(center) {
-                if (!center) return
-                const locationRes = center.split(',')
-                if (locationRes.length < 2) return
-
-                this.updateMapCenter(
-                    parseFloat(locationRes[0]),
-                    parseFloat(locationRes[1]),
-                    false
-                )
-            },
-
-            normalizeAdcode6(code) {
-                    return String(code || '').slice(0, 6)
-                },
-
-                validateLocationWithDependency(longitude, latitude, dependencyCode) {
-                    return new Promise((resolve) => {
-                        const targetCode = this.normalizeAdcode6(dependencyCode)
-
-                        if (!targetCode || !longitude || !latitude) {
-                            resolve(true)
-                            return
-                        }
-
-                        uni.request({
-                            url: 'https://restapi.amap.com/v3/geocode/regeo',
-                            method: 'GET',
-                            data: {
-                                key: this.amapKey,
-                                location: `${longitude},${latitude}`,
-                                extensions: 'base'
-                            },
-                            success: (res) => {
-                                const adcode = this.normalizeAdcode6(
-                                    res?.data?.regeocode?.addressComponent?.adcode || ''
-                                )
-
-                                if (!adcode) {
-                                    resolve(true)
-                                    return
-                                }
-
-                                resolve(adcode === targetCode)
-                            },
-                            fail: () => {
-                                resolve(true)
-                            }
-                        })
-                    })
-                },
-
-                async locateByDependencyCenter(regions, dependencyCode, skipAutoLocate) {
-                    let center = null
-
-                    if (dependencyCode && regions[2]) {
-                        center = await this.getDistrictCenter(regions[2], dependencyCode)
-                    }
-
-                    if (!center && regions[2]) {
-                        center = await this.getDistrictCenter(regions[2])
-                    }
-                    if (!center && regions[1] && regions[1] !== regions[0]) {
-                        center = await this.getDistrictCenter(regions[1])
-                    }
-                    if (!center && regions[0]) {
-                        center = await this.getDistrictCenter(regions[0])
-                    }
-
-                    if (center) {
-                        const locationRes = center.split(',')
-                        if (locationRes.length >= 2) {
-                            this.updateMapCenter(
-                                parseFloat(locationRes[0]),
-                                parseFloat(locationRes[1]),
-                                true
-                            )
-                        }
-                    } else if (!skipAutoLocate) {
-                        this.getCurrentLocation()
-                    }
-                },
-
-            reverseGeocode(lng, lat) {
-                const requestId = ++this.reverseGeocodeRequestId
-                const targetLng = parseFloat(lng)
-                const targetLat = parseFloat(lat)
-
-                if (!Number.isFinite(targetLng) || !Number.isFinite(targetLat)) return
-
-                uni.request({
-                    url: 'https://restapi.amap.com/v3/geocode/regeo',
-                    data: {
-                        key: this.amapKey,
-                        location: `${targetLng},${targetLat}`,
-                        extensions: 'base'
-                    },
-                    success: (res) => {
-                        if (requestId !== this.reverseGeocodeRequestId) return
-
-                        if (res.data.status === '1' && res.data.regeocode) {
-                            if (this.recognizeMapMoving) return
-
-                            const regeo = res.data.regeocode
-                            const formatted = regeo.formatted_address || ''
-                            const addrComp = regeo.addressComponent || {}
-
-                            const provinceName = addrComp.province || ''
-                            const cityName = this.normalizeCityName(provinceName, addrComp.city)
-                            const districtName = addrComp.district || ''
-
-                            let region = ''
-                            if (provinceName) region += provinceName
-                            if (cityName && cityName !== provinceName) region += cityName
-                            if (districtName) region += districtName
-
-                            if (!this.userSelectedRegion) {
-                                this.currentRegion = region || formatted
-                                this.currentProvince = provinceName
-                                this.currentCity = cityName
-                                this.currentDistrict = districtName
-
-                                const adcode = addrComp.adcode || ''
-                                if (adcode.length >= 6) {
-                                    this.selectedDistrictCode = adcode
-                                    this.selectedCityCode = adcode.substring(0, 4) + '00'
-                                    this.selectedProvinceCode = adcode.substring(0, 2) + '0000'
-                                }
-                            }
-
-                            let detail = ''
-                            if (region && formatted.startsWith(region)) {
-                                detail = formatted.substring(region.length).trim()
-                            } else {
-                                detail = formatted.trim()
-                            }
-
-                            if (this.suppressInitDetailFill) {
-                                this.suppressInitDetailFill = false
-                                return
-                            }
-
-                            if (!this.isManualDetail) {
-                                this.detailAddress = detail || formatted
-                                this.manualDetail = this.detailAddress
-                                this.currentDetail = this.detailAddress
-                            }
-                        }
-                    },
-                    fail: (err) => {
-                        if (requestId !== this.reverseGeocodeRequestId) return
-                        console.error('逆地理编码失败:', err)
-                    }
-                })
-            },
-
-            onMapTap(e) {
-                this.clearDependencyInitLock()
-                this.clearBlankPageInitLock()
-
-                this.userSelectedRegion = false
-                this.isManualDetail = false
-                this.suppressInitDetailFill = false
-
-                const tapLat = Number(e?.detail?.latitude)
-                const tapLng = Number(e?.detail?.longitude)
-
-                if (Number.isFinite(tapLat) && Number.isFinite(tapLng)) {
-                    this.latitude = tapLat
-                    this.longitude = tapLng
-                    this.newLatitude = tapLat
-                    this.newLongitude = tapLng
-                    this.reverseGeocode(tapLng, tapLat)
-                    return
-                }
-
-                const mapCtx = uni.createMapContext('map', this)
-                mapCtx.getCenterLocation({
-                    success: (res) => {
-                        this.latitude = res.latitude
-                        this.longitude = res.longitude
-                        this.newLatitude = res.latitude
-                        this.newLongitude = res.longitude
-                        this.reverseGeocode(res.longitude, res.latitude)
-                    },
-                    fail: (err) => {
-                        console.error('点击地图获取中心点失败', err)
-                    }
-                })
-            },
-
-            syncCenterFromMap() {
-                if (this.dependencyInitLock) return
-                if (this.blankPageInitLock) return
-
-                const mapCtx = uni.createMapContext('map', this)
-
-                mapCtx.getCenterLocation({
-                    success: (res) => {
-                        if (
-                            !res ||
-                            !Number.isFinite(Number(res.longitude)) ||
-                            !Number.isFinite(Number(res.latitude))
-                        ) {
-                            return
-                        }
-
-                        this.userSelectedRegion = false
-                        this.isManualDetail = false
-                        this.suppressInitDetailFill = false
-
-                        this.latitude = Number(res.latitude)
-                        this.longitude = Number(res.longitude)
-                        this.newLatitude = Number(res.latitude)
-                        this.newLongitude = Number(res.longitude)
-
-                        this.reverseGeocode(this.longitude, this.latitude)
-                    },
-                    fail: (err) => {
-                        console.error('syncCenterFromMap失败', err)
-                    }
-                })
-            },
-
-            changeMap(e) {
-                if (this.showRegionPicker || !this.mapVisible) return
-                if (this.recognizeMapMoving) return
-                if (this.dependencyInitLock) return
-
-                const eventType = e?.detail?.type || e?.type || ''
-                const causedBy = e?.detail?.causedBy || e?.causedBy || ''
-
-                if (this.blankPageInitLock) {
-                    if (this.isUserGestureMapEvent(causedBy)) {
-                        this.clearBlankPageInitLock()
-                    } else {
-                        return
-                    }
-                }
-
-                if (eventType === 'begin') return
-
-                if (Date.now() < this.mapProgrammaticUntil) {
-                    return
-                }
-
-                const isProgrammaticEvent = causedBy && causedBy !== 'gesture'
-
-                if (isProgrammaticEvent && this.ignoreRegionChangeOnce) {
-                    this.ignoreRegionChangeOnce = false
-                    return
-                }
-
-                if (this.mapMoveTimer) {
-                    clearTimeout(this.mapMoveTimer)
-                }
-
-                const delay = eventType === 'end' ? 80 : 260
-
-                this.mapMoveTimer = setTimeout(() => {
-                    this.syncCenterFromMap()
-
-                    setTimeout(() => {
-                        this.syncCenterFromMap()
-                    }, 180)
-
-                    this.mapMoveTimer = null
-                }, delay)
-            },
-
-            goSelectCity() {
-                uni.navigateTo({
-                    url: '/subPackages/address/selectCity'
-                })
-            },
-
-            clearRawAddress() {
-                this.rawAddress = ''
-                uni.showToast({ title: '已清空', icon: 'none' })
-            },
-
-            onDetailInput(e) {
-                const val = e.detail.value || ''
-                this.detailAddress = val
-                this.manualDetail = val
-                this.currentDetail = val
-                this.isManualDetail = val.trim().length > 0
-            },
-
-            onPaste() {
-                uni.getClipboardData({
-                    success: (res) => {
-                        if (res.data) {
-                            this.rawAddress = res.data
-                            uni.showToast({ title: '已粘贴', icon: 'none' })
-                        }
-                    }
-                })
-            },
-
-            sanitizeRawAddress(raw) {
-                let text = (raw || '')
-                    .replace(/[\r\n\t]+/g, ' ')
-                    .replace(/　/g, ' ')
-                    .replace(/\s+/g, ' ')
-                    .trim()
-
-                const addressMatch = text.match(/地址[:：]\s*(.*)/)
-                if (addressMatch && addressMatch[1]) {
-                    text = addressMatch[1].trim()
-                }
-
-                text = text
-                    .replace(/(收货人|联系人|姓名)[:：]\s*[\u4e00-\u9fa5A-Za-z·]{1,20}/g, '')
-                    .replace(/(电话|手机)[:：]?\s*1[3-9]\d{9}/g, '')
-                    .replace(/1[3-9]\d{9}/g, '')
-                    .replace(/[，,；;]+/g, ' ')
-                    .replace(/\s+/g, ' ')
-                    .trim()
-
-                return text
-            },
-
-            escapeRegExp(str) {
-                return (str || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-            },
-
-            getNetworkTypeSafe() {
-                return new Promise((resolve) => {
-                    uni.getNetworkType({
-                        success: (res) => resolve(res.networkType || 'unknown'),
-                        fail: () => resolve('unknown')
-                    })
-                })
-            },
-
-            async ensureRecognizeNetworkAvailable() {
-                const networkType = await this.getNetworkTypeSafe()
-
-                if (networkType === 'none') {
-                    this.showRecognizeNetworkError()
-                    return false
-                }
-
-                return true
-            },
-
-            showRecognizeNetworkError() {
-                uni.showToast({
-                    title: '网络异常，无法进行地址识别与地图定位，请检查网络后重试',
-                    icon: 'none',
-                    duration: 3500
-                })
-            },
-
-            isLikelyNetworkError(error) {
-                const msg = String(
-                    error?.errMsg ||
-                    error?.message ||
-                    error ||
-                    ''
-                ).toLowerCase()
-
-                return (
-                    msg.includes('network') ||
-                    msg.includes('timeout') ||
-                    msg.includes('request:fail') ||
-                    msg.includes('fail')
-                )
-            },
-
-            hasStrongAddressFeature(text) {
-                return /(\d|号|栋|幢|单元|室|楼|层|座|路|街|巷|道|村|镇|乡|里|弄|园|苑|小区|大厦|广场|市场|学校|医院|公寓|酒店|中心|胡同)/.test(text || '')
-            },
-
-            containsObviousInvalidNoise(text) {
-                return /(价格|价钱|多少钱|举报|投诉|建议|咨询|测试|示例|比如|比方|假设|无效|乱填)/i.test(text || '')
-            },
-
-            isLikelyInvalidRecognizedDetail(text) {
-                const value = String(text || '').trim()
-                if (!value) return true
-
-                if (/(价格|价钱|多少钱|举报|投诉|建议|咨询|测试|示例|比如|比方|假设|无效|乱填)/i.test(value)) {
-                    return true
-                }
-
-                if (/^\d{6,}$/.test(value) || /^[A-Za-z]{6,}$/.test(value)) {
-                    return true
-                }
-
-                const specialChars = (value.match(/[^\u4e00-\u9fa5a-zA-Z0-9]/g) || []).length
-                if (specialChars / value.length > 0.3) {
-                    return true
-                }
-
-                if (value.length < 2) {
-                    return true
-                }
-
-                const hasLongLetterChunk = /[A-Za-z]{6,}/.test(value)
-                const letterCount = (value.match(/[A-Za-z]/g) || []).length
-                const letterRatio = value.length ? (letterCount / value.length) : 0
-                const hasAddressFeature = this.hasStrongAddressFeature(value)
-
-                if (hasLongLetterChunk && !hasAddressFeature) {
-                    return true
-                }
-
-                if (letterRatio > 0.35 && !hasAddressFeature) {
-                    return true
-                }
-
-                return false
-            },
-
-            isPreciseGeocodeLevel(level) {
-                return [
-                    '门牌号',
-                    '兴趣点',
-                    '道路',
-                    '道路交叉口',
-                    '乡镇',
-                    '村庄',
-                    '村级地名',
-                    'roadno',
-                    'poi'
-                ].includes(String(level || '').trim())
-            },
-
-            normalizeDistrictName(name) {
-                return String(name || '').trim()
-            },
-
-            validateRecognizedDetail(detailText, geo, hit = {}) {
-                const cleaned = String(detailText || '').trim()
-                if (!cleaned) {
-                    return { valid: false, cleaned: '', reason: 'empty' }
-                }
-
-                if (this.isLikelyInvalidRecognizedDetail(cleaned)) {
-                    return { valid: false, cleaned: '', reason: 'invalid_detail' }
-                }
-
-                if (!geo) {
-                    return { valid: false, cleaned: '', reason: 'geocode_failed' }
-                }
-
-                const geoLevel = String(geo?.level || '').trim()
-                const preciseLevel = this.isPreciseGeocodeLevel(geoLevel)
-                const hasAddressFeature = this.hasStrongAddressFeature(cleaned)
-
-                const hitCountyCode = String(hit?.county_code || '').slice(0, 6)
-                const geoAdcode = String(geo?.adcode || '').slice(0, 6)
-
-                const hitDistrictName = this.normalizeDistrictName(hit?.county_name)
-                const geoDistrictName = this.normalizeDistrictName(geo?.district)
-
-                const sameDistrictByCode = !!hitCountyCode && !!geoAdcode && hitCountyCode === geoAdcode
-                const sameDistrictByName = !!hitDistrictName && !!geoDistrictName && hitDistrictName === geoDistrictName
-                const sameDistrict = sameDistrictByCode || sameDistrictByName
-
-                const purePoiLike =
-                    cleaned.length >= 2 &&
-                    /^[\u4e00-\u9fa5A-Za-z0-9]+$/.test(cleaned) &&
-                    !/[A-Za-z]{6,}/.test(cleaned)
-
-                if (hasAddressFeature || preciseLevel) {
-                    return { valid: true, cleaned, reason: '' }
-                }
-
-                if (sameDistrict && purePoiLike) {
-                    return { valid: true, cleaned, reason: 'district_geo_verified' }
-                }
-
-                return { valid: false, cleaned: '', reason: 'detail_not_precise' }
-            },
-
-            cleanRecognizedDetail(detail, province, city, district) {
-                let text = this.stripLeadingRegionParts(detail, [
-                    province,
-                    city,
-                    district
-                ])
-
-                text = text
-                    .replace(/(收货人|联系人|姓名)[:：].*$/g, '')
-                    .replace(/(电话|手机)[:：]?\s*1[3-9]\d{9}.*$/g, '')
-                    .replace(/备注[:：].*$/g, '')
-                    .replace(/1[3-9]\d{9}/g, '')
-                    .replace(/[（(][^）)]*[）)]/g, '')
-                    .replace(/^[，,；;、\s]+/, '')
-                    .replace(/\s+/g, ' ')
-                    .trim()
-
-                return text
-            },
-
-            appendIfMissing(base, part) {
-                const src = String(base || '').trim()
-                const seg = String(part || '').trim()
-
-                if (!seg) return src
-                if (!src) return seg
-                if (src.includes(seg)) return src
-
-                return `${src}${seg}`
-            },
-
-            deriveCodesFromDivision(divcode = '') {
-                const code = String(divcode || '').trim()
-                if (!/^\d{12}$/.test(code)) {
-                    return {
-                        province_code: '',
-                        city_code: '',
-                        county_code: ''
-                    }
-                }
-
-                return {
-                    province_code: `${code.slice(0, 2)}0000`,
-                    city_code: `${code.slice(0, 4)}00`,
-                    county_code: code.slice(0, 6)
-                }
-            },
-
-            parseDivisionInfo(area = {}) {
-                const divisionInfo = area?.division_info || {}
-                const divisionName = String(divisionInfo.division_name || '').trim()
-                const divcode = String(divisionInfo.divcode || '').trim()
-
-                let parts = []
-                if (divisionName.includes(';')) {
-                    parts = divisionName.split(';')
-                } else if (divisionName) {
-                    parts = divisionName.split(/\s+/)
-                }
-
-                const derivedCodes = this.deriveCodesFromDivision(divcode)
-
-                return {
-                    province_name: String(parts[0] || '').trim(),
-                    city_name: String(parts[1] || '').trim(),
-                    county_name: String(parts[2] || '').trim(),
-                    town_name: String(parts[3] || '').trim(),
-                    province_code: derivedCodes.province_code,
-                    city_code: derivedCodes.city_code,
-                    county_code: derivedCodes.county_code
-                }
-            },
-
-            parseLonlatInfo(lonlat = {}) {
-                const offline = lonlat?.offline_geocode || {}
-
-                return {
-                    gcj02: String(offline.gcj02 || '').trim(),
-                    wgs84: String(offline.wgs84 || '').trim(),
-                    level: String(offline.level || '').trim()
-                }
-            },
-
-            parseStreetStd(streetStd = '') {
-                const parsed = {}
-
-                String(streetStd)
-                    .split(/\t+/)
-                    .forEach(item => {
-                        const index = item.indexOf('=')
-                        if (index === -1) return
-
-                        const key = item.slice(0, index).trim().toLowerCase()
-                        const value = item.slice(index + 1).trim()
-
-                        if (key) {
-                            parsed[key] = value
-                        }
-                    })
-
-                return {
-                    province_name: (parsed.prov || parsed.province || '').trim(),
-                    city_name: (parsed.city || '').trim(),
-                    county_name: (parsed.district || parsed.county || parsed.area || '').trim(),
-                    town_name: (parsed.town || parsed.street || '').trim(),
-                    road_name: (parsed.road || '').trim(),
-                    road_no: (parsed.roadno || parsed.road_no || '').trim(),
-                    poi_name: (parsed.poi || parsed.poi_name || '').trim(),
-                    house_no: (parsed.houseno || parsed.house_no || '').trim(),
-                    room_no: (parsed.roomno || parsed.room_no || '').trim(),
-                    floor_no: (parsed.floor || parsed.floor_no || '').trim(),
-                    unit_no: (parsed.unit || parsed.unit_no || '').trim(),
-                    building_no: (parsed.building || parsed.building_no || '').trim(),
-                    block_no: (parsed.block || parsed.block_no || '').trim(),
-                    detail: (parsed.detail || parsed.address || parsed.addr || '').trim(),
-                    address: (parsed.address || parsed.detail || parsed.addr || '').trim(),
-                    province_code: (parsed.province_code || parsed.prov_code || '').trim(),
-                    city_code: (parsed.city_code || '').trim(),
-                    county_code: (parsed.county_code || parsed.district_code || parsed.area_code || '').trim(),
-                    _street_std_map: parsed
-                }
-            },
-
-            normalizeRecognizeHit(res) {
-                if (!res || (res.code !== 200 && res.code !== 0)) return null
-
-                // 旧格式1：data是数组
-                if (Array.isArray(res.data) && res.data.length) {
-                    const item = res.data[0]
-                    return {
-                        province_name: (item.province_name || '').trim(),
-                        city_name: (item.city_name || '').trim(),
-                        county_name: (item.county_name || '').trim(),
-                        town_name: (item.town_name || '').trim(),
-                        road_name: '',
-                        road_no: '',
-                        poi_name: '',
-                        house_no: '',
-                        room_no: '',
-                        floor_no: '',
-                        unit_no: '',
-                        building_no: '',
-                        block_no: '',
-                        detail: (item.detail || '').trim(),
-                        address: (item.address || item.detail || '').trim(),
-                        province_code: (item.province_code || '').trim(),
-                        city_code: (item.city_code || '').trim(),
-                        county_code: (item.county_code || '').trim(),
-                        backend_gcj02: '',
-                        backend_wgs84: '',
-                        backend_level: '',
-                        _street_std_map: {}
-                    }
-                }
-
-                // 旧格式2：data.data是数组
-                if (Array.isArray(res?.data?.data) && res.data.data.length) {
-                    const item = res.data.data[0]
-                    return {
-                        province_name: (item.province_name || '').trim(),
-                        city_name: (item.city_name || '').trim(),
-                        county_name: (item.county_name || '').trim(),
-                        town_name: (item.town_name || '').trim(),
-                        road_name: '',
-                        road_no: '',
-                        poi_name: '',
-                        house_no: '',
-                        room_no: '',
-                        floor_no: '',
-                        unit_no: '',
-                        building_no: '',
-                        block_no: '',
-                        detail: (item.detail || '').trim(),
-                        address: (item.address || item.detail || '').trim(),
-                        province_code: (item.province_code || '').trim(),
-                        city_code: (item.city_code || '').trim(),
-                        county_code: (item.county_code || '').trim(),
-                        backend_gcj02: '',
-                        backend_wgs84: '',
-                        backend_level: '',
-                        _street_std_map: {}
-                    }
-                }
-
-                // 旧格式3：result是数组
-                if (Array.isArray(res.result) && res.result.length) {
-                    const item = res.result[0]
-                    return {
-                        province_name: (item.province_name || '').trim(),
-                        city_name: (item.city_name || '').trim(),
-                        county_name: (item.county_name || '').trim(),
-                        town_name: (item.town_name || '').trim(),
-                        road_name: '',
-                        road_no: '',
-                        poi_name: '',
-                        house_no: '',
-                        room_no: '',
-                        floor_no: '',
-                        unit_no: '',
-                        building_no: '',
-                        block_no: '',
-                        detail: (item.detail || '').trim(),
-                        address: (item.address || item.detail || '').trim(),
-                        province_code: (item.province_code || '').trim(),
-                        city_code: (item.city_code || '').trim(),
-                        county_code: (item.county_code || '').trim(),
-                        backend_gcj02: '',
-                        backend_wgs84: '',
-                        backend_level: '',
-                        _street_std_map: {}
-                    }
-                }
-
-                // 新格式：data本身就是对象
-                if (
-                    res.data &&
-                    typeof res.data === 'object' &&
-                    (
-                        res.data.province_name ||
-                        res.data.city_name ||
-                        res.data.county_name ||
-                        res.data.detail ||
-                        res.data.address
-                    )
-                ) {
-                    return {
-                        province_name: (res.data.province_name || '').trim(),
-                        city_name: (res.data.city_name || '').trim(),
-                        county_name: (res.data.county_name || '').trim(),
-                        town_name: (res.data.town_name || '').trim(),
-                        road_name: (res.data.road_name || res.data.road || '').trim(),
-                        road_no: (res.data.road_no || res.data.roadno || '').trim(),
-                        poi_name: (res.data.poi_name || res.data.poi || '').trim(),
-                        house_no: (res.data.house_no || res.data.houseno || '').trim(),
-                        room_no: (res.data.room_no || res.data.roomno || '').trim(),
-                        floor_no: (res.data.floor_no || res.data.floor || '').trim(),
-                        unit_no: (res.data.unit_no || res.data.unit || '').trim(),
-                        building_no: (res.data.building_no || res.data.building || '').trim(),
-                        block_no: (res.data.block_no || res.data.block || '').trim(),
-                        detail: (res.data.detail || '').trim(),
-                        address: (res.data.address || res.data.detail || '').trim(),
-                        province_code: (res.data.province_code || '').trim(),
-                        city_code: (res.data.city_code || '').trim(),
-                        county_code: (res.data.county_code || '').trim(),
-                        backend_gcj02: '',
-                        backend_wgs84: '',
-                        backend_level: '',
-                        _street_std_map: {}
-                    }
-                }
-
-                // 新格式：data.street + data.area + data.lonlat
-                if (res?.data?.street && typeof res.data.street === 'object') {
-                    const street = res.data.street
-                    const stdParsed = this.parseStreetStd(street.street_std || '')
-                    const divisionParsed = this.parseDivisionInfo(res?.data?.area || {})
-                    const lonlatParsed = this.parseLonlatInfo(res?.data?.lonlat || {})
-
-                    return {
-                        province_name: (street.province_name || street.province || stdParsed.province_name || divisionParsed.province_name || '').trim(),
-                        city_name: (street.city_name || street.city || stdParsed.city_name || divisionParsed.city_name || '').trim(),
-                        county_name: (street.county_name || street.district || street.county || stdParsed.county_name || divisionParsed.county_name || '').trim(),
-                        town_name: (street.town_name || street.town || street.street_name || stdParsed.town_name || divisionParsed.town_name || '').trim(),
-                        road_name: (street.road_name || street.road || stdParsed.road_name || '').trim(),
-                        road_no: (street.road_no || street.roadno || stdParsed.road_no || '').trim(),
-                        poi_name: (street.poi_name || street.poi || stdParsed.poi_name || '').trim(),
-                        house_no: (street.house_no || street.houseno || stdParsed.house_no || '').trim(),
-                        room_no: (street.room_no || street.roomno || stdParsed.room_no || '').trim(),
-                        floor_no: (street.floor_no || street.floor || stdParsed.floor_no || '').trim(),
-                        unit_no: (street.unit_no || street.unit || stdParsed.unit_no || '').trim(),
-                        building_no: (street.building_no || street.building || stdParsed.building_no || '').trim(),
-                        block_no: (street.block_no || street.block || stdParsed.block_no || '').trim(),
-                        detail: (street.detail || street.address || stdParsed.detail || stdParsed.address || '').trim(),
-                        address: (street.address || street.detail || stdParsed.address || stdParsed.detail || '').trim(),
-                        province_code: (street.province_code || stdParsed.province_code || divisionParsed.province_code || '').trim(),
-                        city_code: (street.city_code || stdParsed.city_code || divisionParsed.city_code || '').trim(),
-                        county_code: (street.county_code || street.district_code || stdParsed.county_code || divisionParsed.county_code || '').trim(),
-                        backend_gcj02: lonlatParsed.gcj02,
-                        backend_wgs84: lonlatParsed.wgs84,
-                        backend_level: lonlatParsed.level,
-                        _street_std_map: stdParsed._street_std_map || {}
-                    }
-                }
-
-                return null
-            },
-
-            getRecognizeApiUrl() {
-                const app = typeof getApp === 'function' ? getApp() : null
-
-                const baseUrl =
-                    app?.globalData?.url ||
-                    app?.globalData?.baseUrl ||
-                    app?.globalData?.apiBaseUrl ||
-                    'https://api.mrrwlkj.top'
-
-                return `${String(baseUrl).replace(/\/+$/, '')}/api/recognize/address`
-            },
-
-            buildMultipartFormData(fields = {}) {
-                const boundary = '----UniFormBoundary' + Date.now()
-                let body = ''
-
-                Object.keys(fields).forEach((key) => {
-                    const value = fields[key] == null ? '' : String(fields[key])
-                    body += `--${boundary}\r\n`
-                    body += `Content-Disposition: form-data; name="${key}"\r\n\r\n`
-                    body += `${value}\r\n`
-                })
-
-                body += `--${boundary}--\r\n`
-
-                return {
-                    boundary,
-                    body
-                }
-            },
-
-            requestRecognizeAddress(rawText) {
-                return request.post('/api/recognize/address', {
-                    text: rawText
-                })
-            },
-
-            buildGeoFromBackend(hit) {
-                const location = String(hit?.backend_gcj02 || '').trim()
-                if (!location) return null
-
-                return {
-                    location,
-                    adcode: String(hit?.county_code || '').trim(),
-                    level: String(hit?.backend_level || '').trim(),
-                    district: String(hit?.county_name || '').trim()
-                }
-            },
-
-            geocodeRecognizedAddress(address) {
-                return new Promise((resolve) => {
-                    if (!address) {
-                        resolve({
-                            ok: true,
-                            data: null,
-                            error: null
-                        })
-                        return
-                    }
-
-                    uni.request({
-                        url: 'https://restapi.amap.com/v3/geocode/geo',
-                        method: 'GET',
-                        data: {
-                            key: this.amapKey,
-                            address,
-                            output: 'JSON'
-                        },
-                        success: (res) => {
-                            if (res.data.status === '1' && res.data.geocodes?.length > 0) {
-                                resolve({
-                                    ok: true,
-                                    data: res.data.geocodes[0],
-                                    error: null
-                                })
-                            } else {
-                                resolve({
-                                    ok: true,
-                                    data: null,
-                                    error: null
-                                })
-                            }
-                        },
-                        fail: (error) => resolve({
-                            ok: false,
-                            data: null,
-                            error
-                        })
-                    })
-                })
-            },
-
-            stripLeadingRegionParts(text, parts = []) {
-                let result = String(text || '').trim()
-
-                const validParts = [...new Set(
-                    parts
-                        .map(item => String(item || '').trim())
-                        .filter(Boolean)
-                )].sort((a, b) => b.length - a.length)
-
-                if (!result || !validParts.length) return result
-
-                let changed = true
-
-                while (changed && result) {
-                    changed = false
-                    result = result.replace(/^\s+/, '')
-
-                    for (const part of validParts) {
-                        const reg = new RegExp(`^${this.escapeRegExp(part)}(?:\\s+|\\b)?`)
-                        if (reg.test(result)) {
-                            result = result.replace(reg, '').trim()
-                            changed = true
-                            break
-                        }
-                    }
-                }
-
-                return result
-            },
-
-            assembleDetailByInterfaceFields(hit, sanitizedText, province, city, district) {
-                const directDetail = String(
-                    hit?.detail ||
-                    hit?.address ||
-                    hit?.addr ||
-                    hit?.full_address_detail ||
-                    hit?.address_detail ||
-                    ''
-                ).trim()
-
-                const structuredValues = [
-                    String(hit?.town_name || '').trim(),
-                    String(hit?.road_name || '').trim(),
-                    String(hit?.road_no || '').trim(),
-                    String(hit?.poi_name || '').trim(),
-                    String(hit?.house_no || '').trim(),
-                    String(hit?.unit_no || '').trim(),
-                    String(hit?.floor_no || '').trim(),
-                    String(hit?.room_no || '').trim(),
-                    String(hit?.building_no || '').trim(),
-                    String(hit?.block_no || '').trim()
-                ]
-
-                let result = ''
-
-                // 先放街道/镇
-                result = this.appendIfMissing(result, structuredValues[0])
-
-                // 再放接口直接给出的detail/address
-                if (directDetail) {
-                    const cleanedDirect = this.stripLeadingRegionParts(
-                        directDetail,
-                        [province, city, district].filter(Boolean)
-                    ).trim()
-                    result = this.appendIfMissing(result, cleanedDirect)
-                }
-
-                // 再按结构化字段补齐
-                for (let i = 1; i < structuredValues.length; i++) {
-                    result = this.appendIfMissing(result, structuredValues[i])
-                }
-
-                // 再把street_std中其他未知字段补齐，做到“有什么就拼什么”
-                const rawMap = hit?._street_std_map || {}
-                const ignoredKeys = new Set([
-                    'prov', 'province',
-                    'city',
-                    'district', 'county', 'area',
-                    'town', 'street',
-                    'road',
-                    'roadno', 'road_no',
-                    'poi', 'poi_name',
-                    'houseno', 'house_no',
-                    'roomno', 'room_no',
-                    'floor', 'floor_no',
-                    'unit', 'unit_no',
-                    'building', 'building_no',
-                    'block', 'block_no',
-                    'detail', 'address', 'addr',
-                    'province_code', 'prov_code',
-                    'city_code',
-                    'county_code', 'district_code', 'area_code'
-                ])
-
-                Object.keys(rawMap).forEach((key) => {
-                    if (ignoredKeys.has(key)) return
-                    const value = String(rawMap[key] || '').trim()
-                    if (!value) return
-                    result = this.appendIfMissing(result, value)
-                })
-
-                // 最后兜底原始文本扣省市区
-                if (!result) {
-                    result = this.stripLeadingRegionParts(
-                        sanitizedText,
-                        [province, city, district].filter(Boolean)
-                    ).trim()
-                }
-
-                // 最终再次确保详细地址不带省市区
-                result = this.stripLeadingRegionParts(
-                    result,
-                    [province, city, district].filter(Boolean)
-                ).trim()
-
-                return result
-            },
-
-            buildExactRecognizedDetail(hit, sanitizedText, province, city, district) {
-                return this.assembleDetailByInterfaceFields(
-                    hit,
-                    sanitizedText,
-                    province,
-                    city,
-                    district
-                )
-            },
-
-            async onSmartRecognize() {
-                this.clearBlankPageInitLock()
-                this.userSelectedRegion = false
-                this.isManualDetail = false
-                this.suppressInitDetailFill = false
-
-                if (!this.hasRawContent) {
-                    uni.showToast({ title: '请先粘贴或输入地址', icon: 'none' })
-                    return
-                }
-
-                const originalRawText = (this.rawAddress || '').trim()
-                if (!originalRawText) {
-                    uni.showToast({ title: '请先粘贴或输入地址', icon: 'none' })
-                    return
-                }
-
-                const hasNetwork = await this.ensureRecognizeNetworkAvailable()
-                if (!hasNetwork) return
-
-                const sanitizedText = this.sanitizeRawAddress(originalRawText)
-                const removedNoise = sanitizedText !== originalRawText
-
-                if (!sanitizedText) {
-                    uni.showToast({ title: '未提取到有效地址', icon: 'none' })
-                    return
-                }
-
-                uni.showLoading({ title: '识别中...' })
-
-                try {
-                    const res = await this.requestRecognizeAddress(sanitizedText)
-                    console.log('智能识别接口返回:', res)
-
-                    const hit = this.normalizeRecognizeHit(res)
-
-                    if (!res || (res.code !== 0 && res.code !== 200) || !hit) {
-                        uni.hideLoading()
-                        uni.showToast({
-                            title: res?.msg || '地址解析失败',
-                            icon: 'none'
-                        })
-                        return
-                    }
-
-                    console.log('智能识别标准化结果:', hit)
-
-                    const normalizedRegion = this.normalizeRecognizedRegionParts(
-                        hit.province_name,
-                        hit.city_name,
-                        hit.county_name
-                    )
-
-                    const province = normalizedRegion.province
-                    const city = normalizedRegion.city
-                    const district = normalizedRegion.district
-
-                    const regionText = this.buildRegionText(province, city, district)
-
-                    if (!regionText) {
-                        uni.hideLoading()
-                        const tip = this.getRecognizeToast('low', removedNoise, false, hit, '', false)
-                        if (tip.type === 'modal') {
-                            uni.showModal({
-                                title: tip.title,
-                                content: tip.content,
-                                showCancel: false
-                            })
-                        } else {
-                            uni.showToast({
-                                title: tip.title,
-                                icon: 'none'
-                            })
-                        }
-                        return
-                    }
-
-                    const detailCandidate = this.cleanRecognizedDetail(
-                        this.buildExactRecognizedDetail(
-                            hit,
-                            sanitizedText,
-                            province,
-                            city,
-                            district
-                        ),
-                        province,
-                        city,
-                        district
-                    )
-
-                    const fullAddress = `${regionText}${detailCandidate}`.trim()
-                    console.log('用于定位的完整地址:', fullAddress)
-
-                    let geocodeOk = false
-                    let geo = null
-                    let detailRejected = false
-                    let detailText = ''
-
-                    const fullGeoResult = await this.geocodeRecognizedAddress(fullAddress)
-
-                    if (!fullGeoResult.ok) {
-                        uni.hideLoading()
-                        this.showRecognizeNetworkError()
-                        return
-                    }
-
-                    geo = fullGeoResult.data || this.buildGeoFromBackend(hit)
-
-                    const detailDecision = this.validateRecognizedDetail(detailCandidate, geo, hit)
-                    detailRejected = !detailDecision.valid && !!detailCandidate
-                    detailText = detailDecision.valid ? detailDecision.cleaned : ''
-
-                    if (!detailText) {
-                        const regionGeoResult = await this.geocodeRecognizedAddress(regionText)
-                        if (!regionGeoResult.ok) {
-                            uni.hideLoading()
-                            this.showRecognizeNetworkError()
-                            return
-                        }
-                        geo = regionGeoResult.data || this.buildGeoFromBackend(hit)
-                        detailText = ''
-                    }
-
-                    if (geo) {
-                        const location = geo.location
-                        const adcode = geo.adcode || ''
-
-                        if (adcode.length >= 6) {
-                            this.selectedDistrictCode = adcode.slice(0, 6)
-                            this.selectedCityCode = adcode.slice(0, 4) + '00'
-                            this.selectedProvinceCode = adcode.slice(0, 2) + '0000'
-                        } else {
-                            this.selectedProvinceCode = hit.province_code || this.selectedProvinceCode || ''
-                            this.selectedCityCode = hit.city_code || this.selectedCityCode || ''
-                            this.selectedDistrictCode = hit.county_code || this.selectedDistrictCode || ''
-                        }
-
-                        if (location) {
-                            const [lng, lat] = location.split(',')
-                            this.longitude = parseFloat(lng)
-                            this.latitude = parseFloat(lat)
-                            this.newLongitude = this.longitude
-                            this.newLatitude = this.latitude
-
-                            this.recognizeMapMoving = true
-                            if (this.recognizeMapMoveTimer) {
-                                clearTimeout(this.recognizeMapMoveTimer)
-                            }
-
-                            this.updateMapCenter(this.longitude, this.latitude, true)
-                            geocodeOk = true
-
-                            this.recognizeMapMoveTimer = setTimeout(() => {
-                                this.recognizeMapMoving = false
-                                this.recognizeMapMoveTimer = null
-                            }, 1500)
-                        }
-                    }
-
-                    const level = this.getRecognizeLevel(hit, detailText, sanitizedText)
-                    const shouldOnlyToast = this.shouldOnlyToastForGarbageRecognize(
-                        sanitizedText,
-                        hit,
-                        detailText,
-                        detailRejected,
-                        geocodeOk
-                    )
-
-                    if (level === 'low' || shouldOnlyToast) {
-                        uni.hideLoading()
-
-                        if (shouldOnlyToast) {
-                            uni.showModal({
-                                title: '未识别到有效地址',
-                                content: '当前输入内容无效，系统未自动填入所在地区和详细地址，请检查后重新输入，或手动选择地址。',
-                                showCancel: false
-                            })
-                        } else {
-                            const tip = this.getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText, detailRejected)
-                            if (tip.type === 'modal') {
-                                uni.showModal({
-                                    title: tip.title,
-                                    content: tip.content,
-                                    showCancel: false
-                                })
-                            } else {
-                                uni.showToast({
-                                    title: tip.title,
-                                    icon: 'none'
-                                })
-                            }
-                        }
-                        return
-                    }
-
-                    this.commitRecognizedResult(province, city, district, regionText, detailText, geo, level, removedNoise, geocodeOk, hit, detailRejected)
-                } catch (error) {
-                    console.error('智能识别失败:', error)
-                    uni.hideLoading()
-
-                    if (this.isLikelyNetworkError(error)) {
-                        this.showRecognizeNetworkError()
-                        return
-                    }
-
-                    uni.showToast({
-                        title: '识别失败，请稍后重试',
-                        icon: 'none'
-                    })
-                }
-            },
-
-            getRecognizeLevel(hit, detailText, rawText) {
-                const province = (hit?.province_name || '').trim()
-                const city = (hit?.city_name || '').trim()
-                const district = (hit?.county_name || '').trim()
-
-                if (/火星市|月球|银河|测试地址/.test(rawText || '')) {
-                    return 'low'
-                }
-
-                if (!province || (!city && !district)) {
-                    return 'low'
-                }
-
-                if (!detailText || detailText.length < 2) {
-                    return 'medium'
-                }
-
-                return 'high'
-            },
-
-            shouldOnlyToastForGarbageRecognize(rawText, hit, detailText, detailRejected = false, geocodeOk = false) {
-                if (geocodeOk) return false
-
-                const input = String(rawText || '').trim()
-                if (!input) return true
-
-                const province = (hit?.province_name || '').trim()
-                const city = (hit?.city_name || '').trim()
-                const district = (hit?.county_name || '').trim()
-
-                const hasFullRegion = !!(province && (city || district))
-                if (!hasFullRegion) return false
-
-                const hasAddressFeature = this.hasStrongAddressFeature(input)
-                const hasRegionKeyword = /(省|市|区|县|旗|镇|乡|村|街道)/.test(input)
-                const hasLongLetterChunk = /[A-Za-z]{2,}/.test(input)
-                const hasInvalidNoise = this.containsObviousInvalidNoise(input)
-
-                if (!hasAddressFeature && !hasRegionKeyword && !detailText) {
-                    if (hasLongLetterChunk || hasInvalidNoise || detailRejected) {
-                        return true
-                    }
-                }
-
-                return false
-            },
-
-            getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText, detailRejected = false) {
-                const province = (hit?.province_name || '').trim()
-                const city = (hit?.city_name || '').trim()
-                const district = (hit?.county_name || '').trim()
-
-                const hasRegion = !!(province || city || district)
-                const hasFullRegion = !!(province && (city || district))
-                const hasDetail = !!(detailText && detailText.trim())
-
-                if (detailRejected && hasFullRegion && !hasDetail) {
-                    return {
-                        type: 'modal',
-                        title: '已识别到地区，详细地址未自动填入',
-                        content: '已识别到省市区，但检测到详细地址中包含无效或不完整内容，系统未自动填入详细地址，请手动补充。'
-                    }
-                }
-
-                if (level === 'low') {
-                    if (!hasRegion) {
-                        return {
-                            type: 'modal',
-                            title: '已识别，但未匹配到有效地区',
-                            content: '未查找到明确的省市区信息，请手动选择所在地区，并检查输入内容是否包含错别字、备注或无效地址。'
-                        }
-                    }
-
-                    if (hasRegion && !hasFullRegion) {
-                        return {
-                            type: 'modal',
-                            title: '已识别到部分地区信息',
-                            content: '当前仅识别到部分地区，未能完整匹配到市区县，请手动补全所在地区并核对详细地址。'
-                        }
-                    }
-
-                    if (hasFullRegion && !hasDetail) {
-                        return {
-                            type: 'modal',
-                            title: '已识别到地区，但详细地址不完整',
-                            content: '已识别到省市区，但未能准确提取详细地址，请补充门牌号、楼栋号等信息。'
-                        }
-                    }
-
-                    return {
-                        type: 'modal',
-                        title: '已识别，但未匹配到有效地区',
-                        content: '当前地址未匹配到有效地区，请核对所在地区和详细地址，必要时请手动修正。'
-                    }
-                }
-
-                if (level === 'medium') {
-                    if (!hasDetail) {
-                        return {
-                            type: 'toast',
-                            title: removedNoise ? '已识别到地区，请补充详细地址' : '已识别到地区，请补充详细地址'
-                        }
-                    }
-
-                    if (!geocodeOk) {
-                        return {
-                            type: 'toast',
-                            title: removedNoise ? '已识别，但未查到地图位置' : '已识别，但未查到对应地图位置'
-                        }
-                    }
-
-                    return {
-                        type: 'toast',
-                        title: removedNoise ? '已识别到部分地址，请核对' : '已识别到部分地址，请核对'
-                    }
-                }
-
-                if (!geocodeOk) {
-                    return {
-                        type: 'toast',
-                        title: removedNoise ? '已识别，但未查到地图位置' : '已识别，请核对地址和地图位置'
-                    }
-                }
-
-                return {
-                    type: 'toast',
-                    title: removedNoise ? '识别成功，请核对' : '识别成功，请核对'
-                }
-            },
-
-            commitRecognizedResult(province, city, district, regionText, detailText, geo, level, removedNoise, geocodeOk, hit, detailRejected) {
-                this.currentProvince = province
-                this.currentCity = city
-                this.currentDistrict = district
-                this.currentRegion = regionText
-
-                this.selectedProvinceCode = hit.province_code || this.selectedProvinceCode || ''
-                this.selectedCityCode = hit.city_code || this.selectedCityCode || ''
-                this.selectedDistrictCode = hit.county_code || this.selectedDistrictCode || ''
-
-                this.detailAddress = detailText
-                this.manualDetail = detailText
-                this.currentDetail = detailText
-                this.isManualDetail = !!detailText
-
-                this.smartBtnText = '已识别'
-                uni.hideLoading()
-
-                const tip = this.getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText, detailRejected)
-                if (tip.type === 'modal') {
-                    uni.showModal({
-                        title: tip.title,
-                        content: tip.content,
-                        showCancel: false
-                    })
-                } else {
-                    uni.showToast({
-                        title: tip.title,
-                        icon: 'none'
-                    })
-                }
-            },
-
-            updateMapCenter(longitude, latitude, noReverse = false) {
-                const lng = parseFloat(longitude)
-                const lat = parseFloat(latitude)
-
-                if (!Number.isFinite(lng) || !Number.isFinite(lat)) return
-
-                this.applyMapLocation(lng, lat, noReverse)
-            },
-
-            selectRegion() {
-                this.openRegionPicker()
-            },
-
-            openRegionPicker() {
-                this.regionProvinceList = ChinaCitys || []
-
-                let provinceIndex = 0
-                let cityIndex = 0
-                let areaIndex = 0
-
-                if (this.selectedProvinceCode && this.selectedCityCode && this.selectedDistrictCode) {
-                    const idx = this.findRegionIndexByCode(
-                        ChinaCitys,
-                        this.selectedProvinceCode,
-                        this.selectedCityCode,
-                        this.selectedDistrictCode
-                    )
-                    provinceIndex = idx.provinceIndex >= 0 ? idx.provinceIndex : 0
-                    cityIndex = idx.cityIndex >= 0 ? idx.cityIndex : 0
-                    areaIndex = idx.areaIndex >= 0 ? idx.areaIndex : 0
-                }
-
-                this.regionCityList = this.regionProvinceList[provinceIndex]?.citys || []
-                this.regionDistrictList = this.regionCityList[cityIndex]?.areas || []
-                this.regionPickerValue = [provinceIndex, cityIndex, areaIndex]
-
-                if (this.mapMoveTimer) {
-                    clearTimeout(this.mapMoveTimer)
-                    this.mapMoveTimer = null
-                }
-
-                this.mapSnapshotUrl = this.buildMapSnapshotUrl()
-                this.showMapSnapshot = true
-                this.mapVisible = false
-                this.showRegionPicker = true
-            },
-
-            closeRegionPicker() {
-                this.showRegionPicker = false
-
-                if (this.popupRestoreTimer) {
-                    clearTimeout(this.popupRestoreTimer)
-                }
-
-                this.popupRestoreTimer = setTimeout(() => {
-                    this.showMapSnapshot = false
-                    this.mapSnapshotUrl = ''
-
-                    this.ignoreRegionChangeOnce = true
-                    this.mapProgrammaticUntil = Date.now() + 500
-
-                    if (this.mapGuardTimer) {
-                        clearTimeout(this.mapGuardTimer)
-                    }
-                    this.mapGuardTimer = setTimeout(() => {
-                        this.ignoreRegionChangeOnce = false
-                        this.mapGuardTimer = null
-                    }, 550)
-
-                    this.mapVisible = true
-                    this.mapRenderKey += 1
-                    this.popupRestoreTimer = null
-                }, 300)
-            },
-
-            onRegionChange(e) {
-                const val = e.detail.value
-                this.regionPickerValue = val
-
-                const provinceIdx = val[0]
-                const cityIdx = val[1] || 0
-
-                if (this.regionProvinceList.length > provinceIdx) {
-                    this.regionCityList = this.regionProvinceList[provinceIdx].citys || []
-                    const maxCityIdx = this.regionCityList.length - 1
-                    const adjustedCityIdx = Math.min(cityIdx, maxCityIdx)
-
-                    if (adjustedCityIdx !== cityIdx) {
-                        this.regionPickerValue = [provinceIdx, adjustedCityIdx, 0]
-                    }
-
-                    if (this.regionCityList.length > adjustedCityIdx) {
-                        this.regionDistrictList = this.regionCityList[adjustedCityIdx].areas || []
-                        const areaIdx = val[2] || 0
-                        const maxAreaIdx = this.regionDistrictList.length - 1
-                        if (areaIdx > maxAreaIdx) {
-                            this.regionPickerValue = [provinceIdx, adjustedCityIdx, 0]
-                        }
-                    } else {
-                        this.regionDistrictList = []
-                        this.regionPickerValue = [provinceIdx, 0, 0]
-                    }
-                } else {
-                    this.regionCityList = []
-                    this.regionDistrictList = []
-                    this.regionPickerValue = [0, 0, 0]
-                }
-            },
-
-            async confirmRegion() {
-                this.clearBlankPageInitLock()
-                const [provinceIdx, cityIdx, districtIdx] = this.regionPickerValue
-                const provinceItem = this.regionProvinceList[provinceIdx]
-                const cityItem = this.regionCityList[cityIdx]
-                const districtItem = this.regionDistrictList[districtIdx]
-
-                if (!provinceItem || !cityItem || !districtItem) {
-                    uni.showToast({ title: '选择无效', icon: 'none' })
-                    return
-                }
-
-                this.userSelectedRegion = true
-
-                const regionStr = provinceItem.province + cityItem.city + districtItem.area
-                this.currentProvince = provinceItem.province
-                this.currentCity = cityItem.city
-                this.currentDistrict = districtItem.area
-                this.currentRegion = regionStr
-
-                this.selectedProvinceCode = provinceItem.code
-                this.selectedCityCode = cityItem.code
-                this.selectedDistrictCode = districtItem.code
-
-                this.isManualDetail = false
-                this.suppressInitDetailFill = true
-                this.detailAddress = ''
-                this.manualDetail = ''
-                this.currentDetail = ''
-
-                const shortCode = districtItem.code ? districtItem.code.toString().slice(0, 6) : ''
-                this.startDependencyInitLock()
-                const center = await this.getDistrictCenter(districtItem.area, shortCode)
-
-                if (center) {
-                    const [lng, lat] = center.split(',')
-                    this.updateMapCenter(parseFloat(lng), parseFloat(lat), true)
-                } else {
-                    uni.showToast({ title: '无法定位该地区，请手动拖动地图', icon: 'none' })
-                }
-
-                this.closeRegionPicker()
-            },
-
-            getDistrictCenter(keyword, adcode = '', subdistrict = 0) {
-                return new Promise((resolve) => {
-                    const params = {
-                        key: this.amapKey,
-                        subdistrict,
-                        extensions: 'all'
-                    }
-
-                    const queryAdcode = () => {
-                        if (!adcode) return Promise.resolve(null)
-
-                        return new Promise((resolveInner) => {
-                            uni.request({
-                                url: 'https://restapi.amap.com/v3/config/district',
-                                method: 'GET',
-                                data: {
-                                    ...params,
-                                    keywords: adcode.slice(0, 6)
-                                },
-                                success: (res) => {
-                                    if (res.data.status === '1' && res.data.districts && res.data.districts.length > 0) {
-                                        const district = res.data.districts[0]
-                                        if (district.center) {
-                                            resolveInner(district.center)
-                                            return
-                                        }
-                                    }
-                                    resolveInner(null)
-                                },
-                                fail: () => resolveInner(null)
-                            })
-                        })
-                    }
-
-                    const queryKeyword = () => {
-                        return new Promise((resolveInner) => {
-                            uni.request({
-                                url: 'https://restapi.amap.com/v3/config/district',
-                                method: 'GET',
-                                data: {
-                                    ...params,
-                                    keywords: keyword
-                                },
-                                success: (res) => {
-                                    if (res.data.status === '1' && res.data.districts && res.data.districts.length > 0) {
-                                        const district = res.data.districts[0]
-                                        if (district.center) {
-                                            resolveInner(district.center)
-                                            return
-                                        }
-                                    }
-                                    resolveInner(null)
-                                },
-                                fail: () => resolveInner(null)
-                            })
-                        })
-                    }
-
-                    queryAdcode().then(center => {
-                        if (center) {
-                            resolve(center)
-                        } else {
-                            queryKeyword().then(resolve)
-                        }
-                    })
-                })
-            },
-
-            onConfirm() {
-                const fullAddress = (this.currentRegion + (this.detailAddress ? ' ' + this.detailAddress : '')).trim()
-
-                const addressItem = {
-                    name: fullAddress,
-                    address: this.detailAddress,
-                    location: `${this.longitude},${this.latitude}`,
-                    pname: this.currentProvince,
-                    cityname: this.currentCity,
-                    adname: this.currentDistrict,
-                    province: this.currentProvince,
-                    city: this.currentCity,
-                    district: this.currentDistrict,
-                    provinceCode: this.selectedProvinceCode,
-                    cityCode: this.selectedCityCode,
-                    districtCode: this.selectedDistrictCode,
-                    source: this.source
-                }
-
-                const pages = getCurrentPages()
-                const prevPage = pages[pages.length - 2]
-                const currentPage = pages[pages.length - 1]
-                const source = this.source || currentPage.options.source
+	import request from '@/utils/request'
+	import ChinaCitys from './data/ChinaCitys.json'
+	import store from '@/store'
+	import {
+		setVersion
+	} from '@/utils/version.js'
+
+	export default {
+		data() {
+			return {
+				useApiRawRecognize: false,
+				mapVisible: true,
+				showMapSnapshot: false,
+				mapSnapshotUrl: '',
+				mapRenderKey: 0,
+				mapMoveTimer: null,
+				mapProgrammaticUntil: 0,
+				mapGuardTimer: null,
+				mapReverseTimer: null,
+				popupRestoreTimer: null,
+				reverseGeocodeRequestId: 0,
+				dependencyInitLock: false,
+				dependencyInitTimer: null,
+				blankPageInitLock: false,
+
+				// 地图与定位相关
+				systemInfo: {},
+				latitude: 0,
+				longitude: 0,
+				newLatitude: 0,
+				newLongitude: 0,
+				mapHeight: 670,
+				city: {
+					center: '',
+					name: ''
+				},
+				isSelectCity: false,
+				searchCity: uni.getStorageSync('searchCity'),
+				source: '',
+				recognizeMapMoving: false,
+				recognizeMapMoveTimer: null,
+
+				// 编辑区数据
+				manualDetail: '',
+				isManualDetail: false,
+				currentProvince: '',
+				currentCity: '',
+				currentDistrict: '',
+				currentDetail: '',
+				selectedProvinceCode: '',
+				selectedCityCode: '',
+				selectedDistrictCode: '',
+				rawAddress: '',
+				hasRawContent: false,
+				smartBtnText: '智能识别',
+				hasDetailContent: false,
+				currentRegion: '',
+				detailAddress: '',
+
+				// 首次进入且上页没有详细地址时，禁止自动回填详细地址
+				suppressInitDetailFill: false,
+				ignoreRegionChangeOnce: false,
+
+				// 地区选择弹窗数据
+				showRegionPicker: false,
+				regionProvinceList: [],
+				regionCityList: [],
+				regionDistrictList: [],
+				regionPickerValue: [0, 0, 0],
+
+				indicatorStyle: 'height: 68rpx;',
+				userSelectedRegion: false,
+
+				// 高德地图 key
+				amapKey: '30b7eb1a1b2f88edc085b9b3ee9a2188'
+			}
+		},
+
+		watch: {
+			rawAddress(newVal) {
+				this.hasRawContent = (newVal || '').trim().length > 0
+				this.smartBtnText = '智能识别'
+			},
+			detailAddress(newVal) {
+				this.hasDetailContent = (newVal || '').trim().length > 0
+			}
+		},
+
+		onLoad(options) {
+			console.log('ChinaCitys 数据:', ChinaCitys)
+			console.log('ChinaCitys 长度:', ChinaCitys?.length)
+
+			this.systemInfo = uni.getSystemInfoSync()
+			this.source = options.source || ''
+			this.mapHeight = 670
+
+			const incomingAddress = options.address ? decodeURIComponent(options.address) : ''
+			const hasDependency = !!options.dependency
+			const hasLocation = !!(options.longitude && options.latitude)
+			const skipAutoLocate = String(options.skip_auto_locate || '') === '1'
+			const initCurrentLocation = String(options.init_current_location || '') === '1'
+			const silentLocate = String(options.silent_locate || '') === '1'
+
+			// 1. 有传入地区：优先按传入地区初始化，禁止首屏地图自动反写
+			if (hasDependency) {
+				const regions = decodeURIComponent(options.dependency).split('-')
+				console.log('传入地区信息:', regions)
+
+				this.currentProvince = regions[0] || ''
+				this.currentCity = regions[1] || ''
+				this.currentDistrict = regions[2] || ''
+
+				let regionText = ''
+				if (this.currentProvince) regionText += this.currentProvince
+				if (this.currentCity && this.currentCity !== this.currentProvince) regionText += this.currentCity
+				if (this.currentDistrict) regionText += this.currentDistrict
+				this.currentRegion = regionText
+
+				if (incomingAddress) {
+					this.detailAddress = incomingAddress
+					this.manualDetail = incomingAddress
+					this.currentDetail = incomingAddress
+					this.isManualDetail = true
+					this.suppressInitDetailFill = false
+				} else {
+					this.detailAddress = ''
+					this.manualDetail = ''
+					this.currentDetail = ''
+					this.isManualDetail = false
+					this.suppressInitDetailFill = true
+				}
+
+				this.startDependencyInitLock()
+				if (hasLocation) {
+					
+					this.applyMapLocation(options.longitude, options.latitude, false)
+					return
+				}
+
+				const dependencyCode = options.dependency_code
+
+				;
+				(async () => {
+					let center = null
+					
+					if (dependencyCode && regions[2]) {
+						center = await this.getDistrictCenter(regions[2], dependencyCode)
+					}
+
+					if (!center && regions[2]) {
+						center = await this.getDistrictCenter(regions[2])
+					}
+					if (!center && regions[1] && regions[1] !== regions[0]) {
+						center = await this.getDistrictCenter(regions[1])
+					}
+					if (!center && regions[0]) {
+						center = await this.getDistrictCenter(regions[0])
+					}
+
+					if (center) {
+						const locationRes = center.split(',')
+						if (locationRes.length >= 2) {
+							this.updateMapCenter(
+								parseFloat(locationRes[0]),
+								parseFloat(locationRes[1]),
+								false
+							)
+						}
+					} else if (!skipAutoLocate) {
+						this.clearDependencyInitLock()
+						this.getCurrentLocation()
+					} else {
+						this.clearDependencyInitLock()
+					}
+				})()
+
+				return
+			}
+
+			// 2. 只有经纬度，没有地区
+			if (hasLocation) {
+				this.applyMapLocation(options.longitude, options.latitude, true)
+
+				if (incomingAddress) {
+					this.detailAddress = incomingAddress
+					this.manualDetail = incomingAddress
+					this.currentDetail = incomingAddress
+					this.isManualDetail = true
+					this.suppressInitDetailFill = false
+				} else {
+					this.detailAddress = ''
+					this.manualDetail = ''
+					this.currentDetail = ''
+					this.isManualDetail = false
+					this.suppressInitDetailFill = true
+				}
 				
+
+				this.reverseGeocode(parseFloat(options.longitude), parseFloat(options.latitude))
+				return
+			}
+
+			// 3. 从城市选择页进入
+			if (options.city) {
+				const city = JSON.parse(decodeURIComponent(options.city))
+				this.city = city
+				this.ignoreRegionChangeOnce = true
+				this.getNowLocation(city.center)
+				this.isSelectCity = true
+				return
+			}
+
+			// 4. 仅标记城市选择模式
+			if (options.isSelectCity) {
+				this.isSelectCity = true
+				this.getCurrentLocation()
+				return
+			}
+
+			// 5. 手艺人信息页首次进入且详细地址为空：按当前定位初始化
+			if (initCurrentLocation) {
+				this.blankPageInitLock = false
+				this.getCurrentLocation(silentLocate, true)
+				return
+			}
+
+			// 6. 空白进入且明确要求不自动定位
+			if (skipAutoLocate && !hasDependency && !hasLocation) {
+				this.blankPageInitLock = true
+				this.currentProvince = ''
+				this.currentCity = ''
+				this.currentDistrict = ''
+				this.currentRegion = ''
+				this.detailAddress = ''
+				this.manualDetail = ''
+				this.currentDetail = ''
+				this.isManualDetail = false
+				this.suppressInitDetailFill = true
+				return
+			}
+
+			// 7. 默认当前位置
+			if (!skipAutoLocate) {
+				this.blankPageInitLock = false
+				this.getCurrentLocation(silentLocate, false)
+			}
+		},
+
+		onShow() {
+			if (!this.isSelectCity) return
+
+			const searchCity = uni.getStorageSync('searchCity')
+			if (searchCity && this.city.name !== searchCity.name) {
+				this.city = searchCity
+				this.searchCity = searchCity
+				this.ignoreRegionChangeOnce = true
+				this.getNowLocation(searchCity.center)
+			}
+		},
+
+		methods: {
+			normalizeMunicipalityName(name) {
+				const value = String(name || '').trim()
+
+				const map = {
+					'北京': '北京市',
+					'北京市': '北京市',
+					'上海': '上海市',
+					'上海市': '上海市',
+					'天津': '天津市',
+					'天津市': '天津市',
+					'重庆': '重庆市',
+					'重庆市': '重庆市',
+					'香港': '香港特别行政区',
+					'香港特别行政区': '香港特别行政区',
+					'澳门': '澳门特别行政区',
+					'澳门特别行政区': '澳门特别行政区'
+				}
+
+				return map[value] || value
+			},
+
+			normalizeRecognizedRegionParts(province, city, district) {
+				let p = this.normalizeMunicipalityName(province)
+				let c = this.normalizeMunicipalityName(city)
+				const d = String(district || '').trim()
+
+				const municipalities = [
+					'北京市',
+					'上海市',
+					'天津市',
+					'重庆市',
+					'香港特别行政区',
+					'澳门特别行政区'
+				]
+
+				if (!p && municipalities.includes(c)) {
+					p = c
+				}
+
+				if (!c && municipalities.includes(p)) {
+					c = p
+				}
+
+				return {
+					province: p,
+					city: c,
+					district: d
+				}
+			},
+
+			buildRegionText(province, city, district) {
+				let text = ''
+				if (province) text += province
+				if (city && city !== province) text += city
+				if (district) text += district
+				return text
+			},
+
+			startDependencyInitLock(duration = 800) {
+				this.dependencyInitLock = true
+
+				if (this.dependencyInitTimer) {
+					clearTimeout(this.dependencyInitTimer)
+				}
+
+				this.dependencyInitTimer = setTimeout(() => {
+					this.dependencyInitLock = false
+					this.dependencyInitTimer = null
+				}, duration)
+			},
+
+			clearDependencyInitLock() {
+				this.dependencyInitLock = false
+
+				if (this.dependencyInitTimer) {
+					clearTimeout(this.dependencyInitTimer)
+					this.dependencyInitTimer = null
+				}
+			},
+
+			clearBlankPageInitLock() {
+				this.blankPageInitLock = false
+			},
+
+			isUserGestureMapEvent(causedBy) {
+				return ['gesture', 'drag', 'scale'].includes(String(causedBy || '').toLowerCase())
+			},
+
+			applyMapLocation(longitude, latitude, noReverse = true) {
+				const lng = Number(longitude)
+				const lat = Number(latitude)
+
+				if (!Number.isFinite(lng) || !Number.isFinite(lat)) return
+
+				this.ignoreRegionChangeOnce = true
+				this.mapProgrammaticUntil = Date.now() + 280
+
+				this.longitude = lng
+				this.latitude = lat
+				this.newLongitude = lng
+				this.newLatitude = lat
+
+				if (this.mapGuardTimer) {
+					clearTimeout(this.mapGuardTimer)
+				}
+				this.mapGuardTimer = setTimeout(() => {
+					this.ignoreRegionChangeOnce = false
+					this.mapGuardTimer = null
+				}, 320)
+
+				if (this.mapReverseTimer) {
+					clearTimeout(this.mapReverseTimer)
+					this.mapReverseTimer = null
+				}
+				
+
+				if (!noReverse) {
+					this.mapReverseTimer = setTimeout(() => {
+						this.reverseGeocode(lng, lat)
+						this.mapReverseTimer = null
+					}, 220)
+				}
+			},
+
+			normalizeCityName(province, city) {
+				let cityName = ''
+
+				if (Array.isArray(city)) {
+					cityName = city[0] || ''
+				} else {
+					cityName = city || ''
+				}
+
+				const fallbackCities = [
+					'北京市',
+					'上海市',
+					'天津市',
+					'重庆市',
+					'香港特别行政区',
+					'澳门特别行政区'
+				]
+
+				if (!cityName && fallbackCities.includes(province)) {
+					cityName = province
+				}
+
+				return cityName
+			},
+
+			buildMapSnapshotUrl() {
+				const lng = Number(this.longitude || this.newLongitude || 0).toFixed(6)
+				const lat = Number(this.latitude || this.newLatitude || 0).toFixed(6)
+				return `https://restapi.amap.com/v3/staticmap?location=${lng},${lat}&zoom=17&size=750*500&scale=2&markers=mid,0xE8101E,A:${lng},${lat}&key=${this.amapKey}`
+			},
+
+			onSnapshotLoad() {
+				console.log('地图加载成功:', this.mapSnapshotUrl)
+			},
+
+			onSnapshotError(e) {
+				console.log('地图加载失败:', e, this.mapSnapshotUrl)
+				uni.showToast({
+					title: '地图加载失败',
+					icon: 'none'
+				})
+			},
+
+			findRegionIndexByCode(baseData, provinceCode, cityCode, areaCode) {
+				const result = {
+					provinceIndex: -1,
+					cityIndex: -1,
+					areaIndex: -1
+				}
+				const targetProvinceCode = (provinceCode || '').slice(0, 6)
+				const targetCityCode = (cityCode || '').slice(0, 6)
+				const targetAreaCode = (areaCode || '').slice(0, 6)
+				if (!targetProvinceCode || !targetCityCode || !targetAreaCode) return result
+
+				for (let pIdx = 0; pIdx < baseData.length; pIdx++) {
+					const provinceItem = baseData[pIdx]
+					const currentProvinceCode = (provinceItem.code || '').slice(0, 6)
+					if (currentProvinceCode === targetProvinceCode) {
+						result.provinceIndex = pIdx
+						const citys = provinceItem.citys || []
+						for (let cIdx = 0; cIdx < citys.length; cIdx++) {
+							const cityItem = citys[cIdx]
+							const currentCityCode = (cityItem.code || '').slice(0, 6)
+							if (currentCityCode === targetCityCode) {
+								result.cityIndex = cIdx
+								const areas = cityItem?.areas || []
+								for (let aIdx = 0; aIdx < areas.length; aIdx++) {
+									const areaItem = areas[aIdx]
+									const currentAreaCode = (areaItem.code || '').slice(0, 6)
+									if (currentAreaCode === targetAreaCode) {
+										result.areaIndex = aIdx
+										return result
+									}
+								}
+								return result
+							}
+						}
+						return result
+					}
+				}
+				return result
+			},
+
+			convert(item) {
+				const data = {
+					key: this.amapKey,
+					locations: `${item.longitude},${item.latitude}`,
+					coordsys: 'gps'
+				}
+				return new Promise((resolve) => {
+					uni.request({
+						url: 'https://restapi.amap.com/v3/assistant/coordinate/convert',
+						method: 'GET',
+						data,
+						success(res) {
+							resolve(res.data)
+						}
+					})
+				})
+			},
+
+			getLocation(silent = false) {
+				return new Promise((resolve, reject) => {
+					const handleFail = (err) => {
+						if (!silent) {
+							uni.showToast({
+								title: '获取位置失败',
+								icon: 'none'
+							})
+						}
+						reject(err)
+					}
+
+					if (this.$store?.state?.version?.DeviceBrand === 'ios') {
+						uni.getLocation({
+							type: 'wgs84',
+							isHighAccuracy: true,
+							success: async (res) => {
+								try {
+									const convert = await this.convert(res)
+									const locations = String(convert?.locations || '').split(',')
+
+									if (locations.length >= 2) {
+										res.longitude = Number(locations[0])
+										res.latitude = Number(locations[1])
+									}
+
+									resolve(res)
+								} catch (error) {
+									handleFail(error)
+								}
+							},
+							fail: handleFail
+						})
+					} else {
+						uni.getLocation({
+							type: 'gcj02',
+							geocode: true,
+							success: (res) => resolve(res),
+							fail: handleFail
+						})
+					}
+				})
+			},
+
+			async getCurrentLocation(silent = false, lockInit = false) {
+				this.blankPageInitLock = false
+
+				try {
+					const locationRes = await this.getLocation(silent)
+
+					if (lockInit) {
+						this.startDependencyInitLock(1200)
+						this.userSelectedRegion = false
+						this.isManualDetail = false
+						this.suppressInitDetailFill = false
+					}
+
+					this.updateMapCenter(locationRes.longitude, locationRes.latitude, false)
+				} catch (error) {
+					if (silent) {
+						this.latitude = 0
+						this.longitude = 0
+						this.newLatitude = 0
+						this.newLongitude = 0
+
+						this.currentProvince = ''
+						this.currentCity = ''
+						this.currentDistrict = ''
+						this.currentRegion = ''
+						this.detailAddress = ''
+						this.manualDetail = ''
+						this.currentDetail = ''
+						this.isManualDetail = false
+
+						this.blankPageInitLock = true
+						this.suppressInitDetailFill = true
+					}
+
+					console.log('定位失败', error)
+				}
+			},
+
+			getNowLocation(center) {
+				if (!center) return
+				const locationRes = center.split(',')
+				if (locationRes.length < 2) return
+
+				this.updateMapCenter(
+					parseFloat(locationRes[0]),
+					parseFloat(locationRes[1]),
+					false
+				)
+			},
+
+			normalizeAdcode6(code) {
+				return String(code || '').slice(0, 6)
+			},
+
+			validateLocationWithDependency(longitude, latitude, dependencyCode) {
+				return new Promise((resolve) => {
+					const targetCode = this.normalizeAdcode6(dependencyCode)
+
+					if (!targetCode || !longitude || !latitude) {
+						resolve(true)
+						return
+					}
+
+					uni.request({
+						url: 'https://restapi.amap.com/v3/geocode/regeo',
+						method: 'GET',
+						data: {
+							key: this.amapKey,
+							location: `${longitude},${latitude}`,
+							extensions: 'base'
+						},
+						success: (res) => {
+							const adcode = this.normalizeAdcode6(
+								res?.data?.regeocode?.addressComponent?.adcode || ''
+							)
+
+							if (!adcode) {
+								resolve(true)
+								return
+							}
+
+							resolve(adcode === targetCode)
+						},
+						fail: () => {
+							resolve(true)
+						}
+					})
+				})
+			},
+
+			async locateByDependencyCenter(regions, dependencyCode, skipAutoLocate) {
+				let center = null
+
+				if (dependencyCode && regions[2]) {
+					center = await this.getDistrictCenter(regions[2], dependencyCode)
+				}
+
+				if (!center && regions[2]) {
+					center = await this.getDistrictCenter(regions[2])
+				}
+				if (!center && regions[1] && regions[1] !== regions[0]) {
+					center = await this.getDistrictCenter(regions[1])
+				}
+				if (!center && regions[0]) {
+					center = await this.getDistrictCenter(regions[0])
+				}
+
+				if (center) {
+					const locationRes = center.split(',')
+					if (locationRes.length >= 2) {
+						this.updateMapCenter(
+							parseFloat(locationRes[0]),
+							parseFloat(locationRes[1]),
+							true
+						)
+					}
+				} else if (!skipAutoLocate) {
+					this.getCurrentLocation()
+				}
+			},
+
+			reverseGeocode(lng, lat) {
+				const requestId = ++this.reverseGeocodeRequestId
+				const targetLng = parseFloat(lng)
+				const targetLat = parseFloat(lat)
+
+				if (!Number.isFinite(targetLng) || !Number.isFinite(targetLat)) return
+
+				uni.request({
+					url: 'https://restapi.amap.com/v3/geocode/regeo',
+					data: {
+						key: this.amapKey,
+						location: `${targetLng},${targetLat}`,
+						extensions: 'base'
+					},
+					success: (res) => {
+						if (requestId !== this.reverseGeocodeRequestId) return
+
+						if (res.data.status === '1' && res.data.regeocode) {
+							if (this.recognizeMapMoving) return
+
+							const regeo = res.data.regeocode
+							const formatted = regeo.formatted_address || ''
+							const addrComp = regeo.addressComponent || {}
+
+							const provinceName = addrComp.province || ''
+							const cityName = this.normalizeCityName(provinceName, addrComp.city)
+							const districtName = addrComp.district || ''
+
+							let region = ''
+							if (provinceName) region += provinceName
+							if (cityName && cityName !== provinceName) region += cityName
+							if (districtName) region += districtName
+
+							if (!this.userSelectedRegion) {
+								this.currentRegion = region || formatted
+								this.currentProvince = provinceName
+								this.currentCity = cityName
+								this.currentDistrict = districtName
+
+								const adcode = addrComp.adcode || ''
+								if (adcode.length >= 6) {
+									this.selectedDistrictCode = adcode
+									this.selectedCityCode = adcode.substring(0, 4) + '00'
+									this.selectedProvinceCode = adcode.substring(0, 2) + '0000'
+								}
+							}
+
+							let detail = ''
+							if (region && formatted.startsWith(region)) {
+								detail = formatted.substring(region.length).trim()
+							} else {
+								detail = formatted.trim()
+							}
+
+							if (this.suppressInitDetailFill) {
+								this.suppressInitDetailFill = false
+								return
+							}
+
+							if (!this.isManualDetail) {
+								this.detailAddress = detail || formatted
+								this.manualDetail = this.detailAddress
+								this.currentDetail = this.detailAddress
+							}
+						}
+					},
+					fail: (err) => {
+						if (requestId !== this.reverseGeocodeRequestId) return
+						console.error('逆地理编码失败:', err)
+					}
+				})
+			},
+
+			onMapTap(e) {
+				this.clearDependencyInitLock()
+				this.clearBlankPageInitLock()
+
+				this.userSelectedRegion = false
+				this.isManualDetail = false
+				this.suppressInitDetailFill = false
+
+				const tapLat = Number(e?.detail?.latitude)
+				const tapLng = Number(e?.detail?.longitude)
+
+				if (Number.isFinite(tapLat) && Number.isFinite(tapLng)) {
+					this.latitude = tapLat
+					this.longitude = tapLng
+					this.newLatitude = tapLat
+					this.newLongitude = tapLng
+					this.reverseGeocode(tapLng, tapLat)
+					return
+				}
+
+				const mapCtx = uni.createMapContext('map', this)
+				mapCtx.getCenterLocation({
+					success: (res) => {
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						this.newLatitude = res.latitude
+						this.newLongitude = res.longitude
+						this.reverseGeocode(res.longitude, res.latitude)
+					},
+					fail: (err) => {
+						console.error('点击地图获取中心点失败', err)
+					}
+				})
+			},
+
+			syncCenterFromMap() {
+				if (this.dependencyInitLock) return
+				if (this.blankPageInitLock) return
+
+				const mapCtx = uni.createMapContext('map', this)
+
+				mapCtx.getCenterLocation({
+					success: (res) => {
+						if (
+							!res ||
+							!Number.isFinite(Number(res.longitude)) ||
+							!Number.isFinite(Number(res.latitude))
+						) {
+							return
+						}
+
+						this.userSelectedRegion = false
+						this.isManualDetail = false
+						this.suppressInitDetailFill = false
+
+						this.latitude = Number(res.latitude)
+						this.longitude = Number(res.longitude)
+						this.newLatitude = Number(res.latitude)
+						this.newLongitude = Number(res.longitude)
+
+						this.reverseGeocode(this.longitude, this.latitude)
+					},
+					fail: (err) => {
+						console.error('syncCenterFromMap失败', err)
+					}
+				})
+			},
+
+			changeMap(e) {
+				if (this.showRegionPicker || !this.mapVisible) return
+				if (this.recognizeMapMoving) return
+				if (this.dependencyInitLock) return
+
+				const eventType = e?.detail?.type || e?.type || ''
+				const causedBy = e?.detail?.causedBy || e?.causedBy || ''
+
+				if (this.blankPageInitLock) {
+					if (this.isUserGestureMapEvent(causedBy)) {
+						this.clearBlankPageInitLock()
+					} else {
+						return
+					}
+				}
+
+				if (eventType === 'begin') return
+
+				if (Date.now() < this.mapProgrammaticUntil) {
+					return
+				}
+
+				const isProgrammaticEvent = causedBy && causedBy !== 'gesture'
+
+				if (isProgrammaticEvent && this.ignoreRegionChangeOnce) {
+					this.ignoreRegionChangeOnce = false
+					return
+				}
+
+				if (this.mapMoveTimer) {
+					clearTimeout(this.mapMoveTimer)
+				}
+
+				const delay = eventType === 'end' ? 80 : 260
+
+				this.mapMoveTimer = setTimeout(() => {
+					this.syncCenterFromMap()
+
+					setTimeout(() => {
+						this.syncCenterFromMap()
+					}, 180)
+
+					this.mapMoveTimer = null
+				}, delay)
+			},
+
+			goSelectCity() {
+				uni.navigateTo({
+					url: '/subPackages/address/selectCity'
+				})
+			},
+
+			clearRawAddress() {
+				this.rawAddress = ''
+				uni.showToast({
+					title: '已清空',
+					icon: 'none'
+				})
+			},
+
+			onDetailInput(e) {
+				const val = e.detail.value || ''
+				this.detailAddress = val
+				this.manualDetail = val
+				this.currentDetail = val
+				this.isManualDetail = val.trim().length > 0
+			},
+
+			onPaste() {
+				uni.getClipboardData({
+					success: (res) => {
+						if (res.data) {
+							this.rawAddress = res.data
+							uni.showToast({
+								title: '已粘贴',
+								icon: 'none'
+							})
+						}
+					}
+				})
+			},
+
+			sanitizeRawAddress(raw) {
+				let text = (raw || '')
+					.replace(/[\r\n\t]+/g, ' ')
+					.replace(/　/g, ' ')
+					.replace(/\s+/g, ' ')
+					.trim()
+
+				const addressMatch = text.match(/地址[:：]\s*(.*)/)
+				if (addressMatch && addressMatch[1]) {
+					text = addressMatch[1].trim()
+				}
+
+				text = text
+					.replace(/(收货人|联系人|姓名)[:：]\s*[\u4e00-\u9fa5A-Za-z·]{1,20}/g, '')
+					.replace(/(电话|手机)[:：]?\s*1[3-9]\d{9}/g, '')
+					.replace(/1[3-9]\d{9}/g, '')
+					.replace(/[，,；;]+/g, ' ')
+					.replace(/\s+/g, ' ')
+					.trim()
+
+				return text
+			},
+
+			escapeRegExp(str) {
+				return (str || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+			},
+
+			getNetworkTypeSafe() {
+				return new Promise((resolve) => {
+					uni.getNetworkType({
+						success: (res) => resolve(res.networkType || 'unknown'),
+						fail: () => resolve('unknown')
+					})
+				})
+			},
+
+			async ensureRecognizeNetworkAvailable() {
+				const networkType = await this.getNetworkTypeSafe()
+
+				if (networkType === 'none') {
+					this.showRecognizeNetworkError()
+					return false
+				}
+
+				return true
+			},
+
+			showRecognizeNetworkError() {
+				uni.showToast({
+					title: '网络异常，无法进行地址识别与地图定位，请检查网络后重试',
+					icon: 'none',
+					duration: 3500
+				})
+			},
+
+			isLikelyNetworkError(error) {
+				const msg = String(
+					error?.errMsg ||
+					error?.message ||
+					error ||
+					''
+				).toLowerCase()
+
+				return (
+					msg.includes('network') ||
+					msg.includes('timeout') ||
+					msg.includes('request:fail') ||
+					msg.includes('fail')
+				)
+			},
+
+			hasStrongAddressFeature(text) {
+				return /(\d|号|栋|幢|单元|室|楼|层|座|路|街|巷|道|村|镇|乡|里|弄|园|苑|小区|大厦|广场|市场|学校|医院|公寓|酒店|中心|胡同)/.test(text || '')
+			},
+
+			containsObviousInvalidNoise(text) {
+				return /(价格|价钱|多少钱|举报|投诉|建议|咨询|测试|示例|比如|比方|假设|无效|乱填)/i.test(text || '')
+			},
+
+			isLikelyInvalidRecognizedDetail(text) {
+				const value = String(text || '').trim()
+				if (!value) return true
+
+				if (/(价格|价钱|多少钱|举报|投诉|建议|咨询|测试|示例|比如|比方|假设|无效|乱填)/i.test(value)) {
+					return true
+				}
+
+				if (/^\d{6,}$/.test(value) || /^[A-Za-z]{6,}$/.test(value)) {
+					return true
+				}
+
+				const specialChars = (value.match(/[^\u4e00-\u9fa5a-zA-Z0-9]/g) || []).length
+				if (specialChars / value.length > 0.3) {
+					return true
+				}
+
+				if (value.length < 2) {
+					return true
+				}
+
+				const hasLongLetterChunk = /[A-Za-z]{6,}/.test(value)
+				const letterCount = (value.match(/[A-Za-z]/g) || []).length
+				const letterRatio = value.length ? (letterCount / value.length) : 0
+				const hasAddressFeature = this.hasStrongAddressFeature(value)
+
+				if (hasLongLetterChunk && !hasAddressFeature) {
+					return true
+				}
+
+				if (letterRatio > 0.35 && !hasAddressFeature) {
+					return true
+				}
+
+				return false
+			},
+
+			isPreciseGeocodeLevel(level) {
+				return [
+					'门牌号',
+					'兴趣点',
+					'道路',
+					'道路交叉口',
+					'乡镇',
+					'村庄',
+					'村级地名',
+					'roadno',
+					'poi'
+				].includes(String(level || '').trim())
+			},
+
+			normalizeDistrictName(name) {
+				return String(name || '').trim()
+			},
+
+			validateRecognizedDetail(detailText, geo, hit = {}) {
+				const cleaned = String(detailText || '').trim()
+				if (!cleaned) {
+					return {
+						valid: false,
+						cleaned: '',
+						reason: 'empty'
+					}
+				}
+
+				if (this.isLikelyInvalidRecognizedDetail(cleaned)) {
+					return {
+						valid: false,
+						cleaned: '',
+						reason: 'invalid_detail'
+					}
+				}
+
+				if (!geo) {
+					return {
+						valid: false,
+						cleaned: '',
+						reason: 'geocode_failed'
+					}
+				}
+
+				const geoLevel = String(geo?.level || '').trim()
+				const preciseLevel = this.isPreciseGeocodeLevel(geoLevel)
+				const hasAddressFeature = this.hasStrongAddressFeature(cleaned)
+
+				const hitCountyCode = String(hit?.county_code || '').slice(0, 6)
+				const geoAdcode = String(geo?.adcode || '').slice(0, 6)
+
+				const hitDistrictName = this.normalizeDistrictName(hit?.county_name)
+				const geoDistrictName = this.normalizeDistrictName(geo?.district)
+
+				const sameDistrictByCode = !!hitCountyCode && !!geoAdcode && hitCountyCode === geoAdcode
+				const sameDistrictByName = !!hitDistrictName && !!geoDistrictName && hitDistrictName === geoDistrictName
+				const sameDistrict = sameDistrictByCode || sameDistrictByName
+
+				const purePoiLike =
+					cleaned.length >= 2 &&
+					/^[\u4e00-\u9fa5A-Za-z0-9]+$/.test(cleaned) &&
+					!/[A-Za-z]{6,}/.test(cleaned)
+
+				if (hasAddressFeature || preciseLevel) {
+					return {
+						valid: true,
+						cleaned,
+						reason: ''
+					}
+				}
+
+				if (sameDistrict && purePoiLike) {
+					return {
+						valid: true,
+						cleaned,
+						reason: 'district_geo_verified'
+					}
+				}
+
+				return {
+					valid: false,
+					cleaned: '',
+					reason: 'detail_not_precise'
+				}
+			},
+
+			cleanRecognizedDetail(detail, province, city, district) {
+				let text = this.stripLeadingRegionParts(detail, [
+					province,
+					city,
+					district
+				])
+
+				text = text
+					.replace(/(收货人|联系人|姓名)[:：].*$/g, '')
+					.replace(/(电话|手机)[:：]?\s*1[3-9]\d{9}.*$/g, '')
+					.replace(/备注[:：].*$/g, '')
+					.replace(/1[3-9]\d{9}/g, '')
+					.replace(/[（(][^）)]*[）)]/g, '')
+					.replace(/^[，,；;、\s]+/, '')
+					.replace(/\s+/g, ' ')
+					.trim()
+
+				return text
+			},
+
+			appendIfMissing(base, part) {
+				const src = String(base || '').trim()
+				const seg = String(part || '').trim()
+
+				if (!seg) return src
+				if (!src) return seg
+				if (src.includes(seg)) return src
+
+				return `${src}${seg}`
+			},
+
+			deriveCodesFromDivision(divcode = '') {
+				const code = String(divcode || '').trim()
+				if (!/^\d{12}$/.test(code)) {
+					return {
+						province_code: '',
+						city_code: '',
+						county_code: ''
+					}
+				}
+
+				return {
+					province_code: `${code.slice(0, 2)}0000`,
+					city_code: `${code.slice(0, 4)}00`,
+					county_code: code.slice(0, 6)
+				}
+			},
+
+			parseDivisionInfo(area = {}) {
+				const divisionInfo = area?.division_info || {}
+				const divisionName = String(divisionInfo.division_name || '').trim()
+				const divcode = String(divisionInfo.divcode || '').trim()
+
+				let parts = []
+				if (divisionName.includes(';')) {
+					parts = divisionName.split(';')
+				} else if (divisionName) {
+					parts = divisionName.split(/\s+/)
+				}
+
+				const derivedCodes = this.deriveCodesFromDivision(divcode)
+
+				return {
+					province_name: String(parts[0] || '').trim(),
+					city_name: String(parts[1] || '').trim(),
+					county_name: String(parts[2] || '').trim(),
+					town_name: String(parts[3] || '').trim(),
+					province_code: derivedCodes.province_code,
+					city_code: derivedCodes.city_code,
+					county_code: derivedCodes.county_code
+				}
+			},
+
+			parseLonlatInfo(lonlat = {}) {
+				const offline = lonlat?.offline_geocode || {}
+
+				return {
+					gcj02: String(offline.gcj02 || '').trim(),
+					wgs84: String(offline.wgs84 || '').trim(),
+					level: String(offline.level || '').trim()
+				}
+			},
+
+			parseStreetStd(streetStd = '') {
+				const parsed = {}
+
+				String(streetStd)
+					.split(/\t+/)
+					.forEach(item => {
+						const index = item.indexOf('=')
+						if (index === -1) return
+
+						const key = item.slice(0, index).trim().toLowerCase()
+						const value = item.slice(index + 1).trim()
+
+						if (key) {
+							parsed[key] = value
+						}
+					})
+
+				return {
+					province_name: (parsed.prov || parsed.province || '').trim(),
+					city_name: (parsed.city || '').trim(),
+					county_name: (parsed.district || parsed.county || parsed.area || '').trim(),
+					town_name: (parsed.town || parsed.street || '').trim(),
+					road_name: (parsed.road || '').trim(),
+					road_no: (parsed.roadno || parsed.road_no || '').trim(),
+					poi_name: (parsed.poi || parsed.poi_name || '').trim(),
+					house_no: (parsed.houseno || parsed.house_no || '').trim(),
+					room_no: (parsed.roomno || parsed.room_no || '').trim(),
+					floor_no: (parsed.floor || parsed.floor_no || '').trim(),
+					unit_no: (parsed.unit || parsed.unit_no || '').trim(),
+					building_no: (parsed.building || parsed.building_no || '').trim(),
+					block_no: (parsed.block || parsed.block_no || '').trim(),
+					detail: (parsed.detail || parsed.address || parsed.addr || '').trim(),
+					address: (parsed.address || parsed.detail || parsed.addr || '').trim(),
+					province_code: (parsed.province_code || parsed.prov_code || '').trim(),
+					city_code: (parsed.city_code || '').trim(),
+					county_code: (parsed.county_code || parsed.district_code || parsed.area_code || '').trim(),
+					_street_std_map: parsed
+				}
+			},
+
+			normalizeRecognizeHit(res) {
+				if (!res || (res.code !== 200 && res.code !== 0)) return null
+
+				// 旧格式1：data是数组
+				if (Array.isArray(res.data) && res.data.length) {
+					const item = res.data[0]
+					return {
+						province_name: (item.province_name || '').trim(),
+						city_name: (item.city_name || '').trim(),
+						county_name: (item.county_name || '').trim(),
+						town_name: (item.town_name || '').trim(),
+						road_name: '',
+						road_no: '',
+						poi_name: '',
+						house_no: '',
+						room_no: '',
+						floor_no: '',
+						unit_no: '',
+						building_no: '',
+						block_no: '',
+						detail: (item.detail || '').trim(),
+						address: (item.address || item.detail || '').trim(),
+						province_code: (item.province_code || '').trim(),
+						city_code: (item.city_code || '').trim(),
+						county_code: (item.county_code || '').trim(),
+						backend_gcj02: '',
+						backend_wgs84: '',
+						backend_level: '',
+						_street_std_map: {}
+					}
+				}
+
+				// 旧格式2：data.data是数组
+				if (Array.isArray(res?.data?.data) && res.data.data.length) {
+					const item = res.data.data[0]
+					return {
+						province_name: (item.province_name || '').trim(),
+						city_name: (item.city_name || '').trim(),
+						county_name: (item.county_name || '').trim(),
+						town_name: (item.town_name || '').trim(),
+						road_name: '',
+						road_no: '',
+						poi_name: '',
+						house_no: '',
+						room_no: '',
+						floor_no: '',
+						unit_no: '',
+						building_no: '',
+						block_no: '',
+						detail: (item.detail || '').trim(),
+						address: (item.address || item.detail || '').trim(),
+						province_code: (item.province_code || '').trim(),
+						city_code: (item.city_code || '').trim(),
+						county_code: (item.county_code || '').trim(),
+						backend_gcj02: '',
+						backend_wgs84: '',
+						backend_level: '',
+						_street_std_map: {}
+					}
+				}
+
+				// 旧格式3：result是数组
+				if (Array.isArray(res.result) && res.result.length) {
+					const item = res.result[0]
+					return {
+						province_name: (item.province_name || '').trim(),
+						city_name: (item.city_name || '').trim(),
+						county_name: (item.county_name || '').trim(),
+						town_name: (item.town_name || '').trim(),
+						road_name: '',
+						road_no: '',
+						poi_name: '',
+						house_no: '',
+						room_no: '',
+						floor_no: '',
+						unit_no: '',
+						building_no: '',
+						block_no: '',
+						detail: (item.detail || '').trim(),
+						address: (item.address || item.detail || '').trim(),
+						province_code: (item.province_code || '').trim(),
+						city_code: (item.city_code || '').trim(),
+						county_code: (item.county_code || '').trim(),
+						backend_gcj02: '',
+						backend_wgs84: '',
+						backend_level: '',
+						_street_std_map: {}
+					}
+				}
+
+				// 新格式：data本身就是对象
+				if (
+					res.data &&
+					typeof res.data === 'object' &&
+					(
+						res.data.province_name ||
+						res.data.city_name ||
+						res.data.county_name ||
+						res.data.detail ||
+						res.data.address
+					)
+				) {
+					return {
+						province_name: (res.data.province_name || '').trim(),
+						city_name: (res.data.city_name || '').trim(),
+						county_name: (res.data.county_name || '').trim(),
+						town_name: (res.data.town_name || '').trim(),
+						road_name: (res.data.road_name || res.data.road || '').trim(),
+						road_no: (res.data.road_no || res.data.roadno || '').trim(),
+						poi_name: (res.data.poi_name || res.data.poi || '').trim(),
+						house_no: (res.data.house_no || res.data.houseno || '').trim(),
+						room_no: (res.data.room_no || res.data.roomno || '').trim(),
+						floor_no: (res.data.floor_no || res.data.floor || '').trim(),
+						unit_no: (res.data.unit_no || res.data.unit || '').trim(),
+						building_no: (res.data.building_no || res.data.building || '').trim(),
+						block_no: (res.data.block_no || res.data.block || '').trim(),
+						detail: (res.data.detail || '').trim(),
+						address: (res.data.address || res.data.detail || '').trim(),
+						province_code: (res.data.province_code || '').trim(),
+						city_code: (res.data.city_code || '').trim(),
+						county_code: (res.data.county_code || '').trim(),
+						backend_gcj02: '',
+						backend_wgs84: '',
+						backend_level: '',
+						_street_std_map: {}
+					}
+				}
+
+				// 新格式：data.street + data.area + data.lonlat
+				if (res?.data?.street && typeof res.data.street === 'object') {
+					const street = res.data.street
+					const stdParsed = this.parseStreetStd(street.street_std || '')
+					const divisionParsed = this.parseDivisionInfo(res?.data?.area || {})
+					const lonlatParsed = this.parseLonlatInfo(res?.data?.lonlat || {})
+
+					return {
+						province_name: (street.province_name || street.province || stdParsed.province_name ||
+							divisionParsed.province_name || '').trim(),
+						city_name: (street.city_name || street.city || stdParsed.city_name || divisionParsed.city_name ||
+							'').trim(),
+						county_name: (street.county_name || street.district || street.county || stdParsed.county_name ||
+							divisionParsed.county_name || '').trim(),
+						town_name: (street.town_name || street.town || street.street_name || stdParsed.town_name ||
+							divisionParsed.town_name || '').trim(),
+						road_name: (street.road_name || street.road || stdParsed.road_name || '').trim(),
+						road_no: (street.road_no || street.roadno || stdParsed.road_no || '').trim(),
+						poi_name: (street.poi_name || street.poi || stdParsed.poi_name || '').trim(),
+						house_no: (street.house_no || street.houseno || stdParsed.house_no || '').trim(),
+						room_no: (street.room_no || street.roomno || stdParsed.room_no || '').trim(),
+						floor_no: (street.floor_no || street.floor || stdParsed.floor_no || '').trim(),
+						unit_no: (street.unit_no || street.unit || stdParsed.unit_no || '').trim(),
+						building_no: (street.building_no || street.building || stdParsed.building_no || '').trim(),
+						block_no: (street.block_no || street.block || stdParsed.block_no || '').trim(),
+						detail: (street.detail || street.address || stdParsed.detail || stdParsed.address || '').trim(),
+						address: (street.address || street.detail || stdParsed.address || stdParsed.detail || '').trim(),
+						province_code: (street.province_code || stdParsed.province_code || divisionParsed.province_code ||
+							'').trim(),
+						city_code: (street.city_code || stdParsed.city_code || divisionParsed.city_code || '').trim(),
+						county_code: (street.county_code || street.district_code || stdParsed.county_code || divisionParsed
+							.county_code || '').trim(),
+						backend_gcj02: lonlatParsed.gcj02,
+						backend_wgs84: lonlatParsed.wgs84,
+						backend_level: lonlatParsed.level,
+						_street_std_map: stdParsed._street_std_map || {}
+					}
+				}
+
+				return null
+			},
+
+			getRecognizeApiUrl() {
+				const app = typeof getApp === 'function' ? getApp() : null
+
+				const baseUrl =
+					app?.globalData?.url ||
+					app?.globalData?.baseUrl ||
+					app?.globalData?.apiBaseUrl ||
+					'https://api.mrrwlkj.top'
+
+				return `${String(baseUrl).replace(/\/+$/, '')}/api/recognize/address`
+			},
+
+			buildMultipartFormData(fields = {}) {
+				const boundary = '----UniFormBoundary' + Date.now()
+				let body = ''
+
+				Object.keys(fields).forEach((key) => {
+					const value = fields[key] == null ? '' : String(fields[key])
+					body += `--${boundary}\r\n`
+					body += `Content-Disposition: form-data; name="${key}"\r\n\r\n`
+					body += `${value}\r\n`
+				})
+
+				body += `--${boundary}--\r\n`
+
+				return {
+					boundary,
+					body
+				}
+			},
+
+			requestRecognizeAddress(rawText) {
+				return request.post('/api/recognize/address', {
+					text: rawText
+				})
+			},
+
+			buildGeoFromBackend(hit) {
+				const location = String(hit?.backend_gcj02 || '').trim()
+				if (!location) return null
+
+				return {
+					location,
+					adcode: String(hit?.county_code || '').trim(),
+					level: String(hit?.backend_level || '').trim(),
+					district: String(hit?.county_name || '').trim()
+				}
+			},
+
+			geocodeRecognizedAddress(address) {
+				return new Promise((resolve) => {
+					if (!address) {
+						resolve({
+							ok: true,
+							data: null,
+							error: null
+						})
+						return
+					}
+
+					uni.request({
+						url: 'https://restapi.amap.com/v3/geocode/geo',
+						method: 'GET',
+						data: {
+							key: this.amapKey,
+							address,
+							output: 'JSON'
+						},
+						success: (res) => {
+							if (res.data.status === '1' && res.data.geocodes?.length > 0) {
+								resolve({
+									ok: true,
+									data: res.data.geocodes[0],
+									error: null
+								})
+							} else {
+								resolve({
+									ok: true,
+									data: null,
+									error: null
+								})
+							}
+						},
+						fail: (error) => resolve({
+							ok: false,
+							data: null,
+							error
+						})
+					})
+				})
+			},
+
+			stripLeadingRegionParts(text, parts = []) {
+				let result = String(text || '').trim()
+
+				const validParts = [...new Set(
+					parts
+					.map(item => String(item || '').trim())
+					.filter(Boolean)
+				)].sort((a, b) => b.length - a.length)
+
+				if (!result || !validParts.length) return result
+
+				let changed = true
+
+				while (changed && result) {
+					changed = false
+					result = result.replace(/^\s+/, '')
+
+					for (const part of validParts) {
+						const reg = new RegExp(`^${this.escapeRegExp(part)}(?:\\s+|\\b)?`)
+						if (reg.test(result)) {
+							result = result.replace(reg, '').trim()
+							changed = true
+							break
+						}
+					}
+				}
+
+				return result
+			},
+
+			assembleDetailByInterfaceFields(hit, sanitizedText, province, city, district) {
+				const directDetail = String(
+					hit?.detail ||
+					hit?.address ||
+					hit?.addr ||
+					hit?.full_address_detail ||
+					hit?.address_detail ||
+					''
+				).trim()
+
+				const structuredValues = [
+					String(hit?.town_name || '').trim(),
+					String(hit?.road_name || '').trim(),
+					String(hit?.road_no || '').trim(),
+					String(hit?.poi_name || '').trim(),
+					String(hit?.house_no || '').trim(),
+					String(hit?.unit_no || '').trim(),
+					String(hit?.floor_no || '').trim(),
+					String(hit?.room_no || '').trim(),
+					String(hit?.building_no || '').trim(),
+					String(hit?.block_no || '').trim()
+				]
+
+				let result = ''
+
+				// 先放街道/镇
+				result = this.appendIfMissing(result, structuredValues[0])
+
+				// 再放接口直接给出的detail/address
+				if (directDetail) {
+					const cleanedDirect = this.stripLeadingRegionParts(
+						directDetail,
+						[province, city, district].filter(Boolean)
+					).trim()
+					result = this.appendIfMissing(result, cleanedDirect)
+				}
+
+				// 再按结构化字段补齐
+				for (let i = 1; i < structuredValues.length; i++) {
+					result = this.appendIfMissing(result, structuredValues[i])
+				}
+
+				// 再把street_std中其他未知字段补齐，做到“有什么就拼什么”
+				const rawMap = hit?._street_std_map || {}
+				const ignoredKeys = new Set([
+					'prov', 'province',
+					'city',
+					'district', 'county', 'area',
+					'town', 'street',
+					'road',
+					'roadno', 'road_no',
+					'poi', 'poi_name',
+					'houseno', 'house_no',
+					'roomno', 'room_no',
+					'floor', 'floor_no',
+					'unit', 'unit_no',
+					'building', 'building_no',
+					'block', 'block_no',
+					'detail', 'address', 'addr',
+					'province_code', 'prov_code',
+					'city_code',
+					'county_code', 'district_code', 'area_code'
+				])
+
+				Object.keys(rawMap).forEach((key) => {
+					if (ignoredKeys.has(key)) return
+					const value = String(rawMap[key] || '').trim()
+					if (!value) return
+					result = this.appendIfMissing(result, value)
+				})
+
+				// 最后兜底原始文本扣省市区
+				if (!result) {
+					result = this.stripLeadingRegionParts(
+						sanitizedText,
+						[province, city, district].filter(Boolean)
+					).trim()
+				}
+
+				// 最终再次确保详细地址不带省市区
+				result = this.stripLeadingRegionParts(
+					result,
+					[province, city, district].filter(Boolean)
+				).trim()
+
+				return result
+			},
+
+			buildExactRecognizedDetail(hit, sanitizedText, province, city, district) {
+				return this.assembleDetailByInterfaceFields(
+					hit,
+					sanitizedText,
+					province,
+					city,
+					district
+				)
+			},
+
+			async onSmartRecognize() {
+				this.clearBlankPageInitLock()
+				this.userSelectedRegion = false
+				this.isManualDetail = false
+				this.suppressInitDetailFill = false
+
+				if (!this.hasRawContent) {
+					uni.showToast({
+						title: '请先粘贴或输入地址',
+						icon: 'none'
+					})
+					return
+				}
+
+				const originalRawText = (this.rawAddress || '').trim()
+				if (!originalRawText) {
+					uni.showToast({
+						title: '请先粘贴或输入地址',
+						icon: 'none'
+					})
+					return
+				}
+
+				const hasNetwork = await this.ensureRecognizeNetworkAvailable()
+				if (!hasNetwork) return
+
+				const sanitizedText = this.sanitizeRawAddress(originalRawText)
+				const removedNoise = sanitizedText !== originalRawText
+
+				if (!sanitizedText) {
+					uni.showToast({
+						title: '未提取到有效地址',
+						icon: 'none'
+					})
+					return
+				}
+
+				uni.showLoading({
+					title: '识别中...'
+				})
+
+				try {
+					const res = await this.requestRecognizeAddress(sanitizedText)
+					console.log('智能识别接口返回:', res)
+
+					const hit = this.normalizeRecognizeHit(res)
+
+					if (!res || (res.code !== 0 && res.code !== 200) || !hit) {
+						uni.hideLoading()
+						uni.showToast({
+							title: res?.msg || '地址解析失败',
+							icon: 'none'
+						})
+						return
+					}
+
+					console.log('智能识别标准化结果:', hit)
+
+					const normalizedRegion = this.normalizeRecognizedRegionParts(
+						hit.province_name,
+						hit.city_name,
+						hit.county_name
+					)
+
+					const province = normalizedRegion.province
+					const city = normalizedRegion.city
+					const district = normalizedRegion.district
+
+					const regionText = this.buildRegionText(province, city, district)
+
+					if (!regionText) {
+						uni.hideLoading()
+						const tip = this.getRecognizeToast('low', removedNoise, false, hit, '', false)
+						if (tip.type === 'modal') {
+							uni.showModal({
+								title: tip.title,
+								content: tip.content,
+								showCancel: false
+							})
+						} else {
+							uni.showToast({
+								title: tip.title,
+								icon: 'none'
+							})
+						}
+						return
+					}
+
+					const detailCandidate = this.cleanRecognizedDetail(
+						this.buildExactRecognizedDetail(
+							hit,
+							sanitizedText,
+							province,
+							city,
+							district
+						),
+						province,
+						city,
+						district
+					)
+
+					const fullAddress = `${regionText}${detailCandidate}`.trim()
+					console.log('用于定位的完整地址:', fullAddress)
+
+					let geocodeOk = false
+					let geo = null
+					let detailRejected = false
+					let detailText = ''
+
+					const fullGeoResult = await this.geocodeRecognizedAddress(fullAddress)
+
+					if (!fullGeoResult.ok) {
+						uni.hideLoading()
+						this.showRecognizeNetworkError()
+						return
+					}
+
+					geo = fullGeoResult.data || this.buildGeoFromBackend(hit)
+
+					const detailDecision = this.validateRecognizedDetail(detailCandidate, geo, hit)
+					detailRejected = !detailDecision.valid && !!detailCandidate
+					detailText = detailDecision.valid ? detailDecision.cleaned : ''
+
+					if (!detailText) {
+						const regionGeoResult = await this.geocodeRecognizedAddress(regionText)
+						if (!regionGeoResult.ok) {
+							uni.hideLoading()
+							this.showRecognizeNetworkError()
+							return
+						}
+						geo = regionGeoResult.data || this.buildGeoFromBackend(hit)
+						detailText = ''
+					}
+
+					if (geo) {
+						const location = geo.location
+						const adcode = geo.adcode || ''
+
+						if (adcode.length >= 6) {
+							this.selectedDistrictCode = adcode.slice(0, 6)
+							this.selectedCityCode = adcode.slice(0, 4) + '00'
+							this.selectedProvinceCode = adcode.slice(0, 2) + '0000'
+						} else {
+							this.selectedProvinceCode = hit.province_code || this.selectedProvinceCode || ''
+							this.selectedCityCode = hit.city_code || this.selectedCityCode || ''
+							this.selectedDistrictCode = hit.county_code || this.selectedDistrictCode || ''
+						}
+
+						if (location) {
+							const [lng, lat] = location.split(',')
+							this.longitude = parseFloat(lng)
+							this.latitude = parseFloat(lat)
+							this.newLongitude = this.longitude
+							this.newLatitude = this.latitude
+
+							this.recognizeMapMoving = true
+							if (this.recognizeMapMoveTimer) {
+								clearTimeout(this.recognizeMapMoveTimer)
+							}
+
+							this.updateMapCenter(this.longitude, this.latitude, true)
+							geocodeOk = true
+
+							this.recognizeMapMoveTimer = setTimeout(() => {
+								this.recognizeMapMoving = false
+								this.recognizeMapMoveTimer = null
+							}, 1500)
+						}
+					}
+
+					const level = this.getRecognizeLevel(hit, detailText, sanitizedText)
+					const shouldOnlyToast = this.shouldOnlyToastForGarbageRecognize(
+						sanitizedText,
+						hit,
+						detailText,
+						detailRejected,
+						geocodeOk
+					)
+
+					if (level === 'low' || shouldOnlyToast) {
+						uni.hideLoading()
+
+						if (shouldOnlyToast) {
+							uni.showModal({
+								title: '未识别到有效地址',
+								content: '当前输入内容无效，系统未自动填入所在地区和详细地址，请检查后重新输入，或手动选择地址。',
+								showCancel: false
+							})
+						} else {
+							const tip = this.getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText,
+								detailRejected)
+							if (tip.type === 'modal') {
+								uni.showModal({
+									title: tip.title,
+									content: tip.content,
+									showCancel: false
+								})
+							} else {
+								uni.showToast({
+									title: tip.title,
+									icon: 'none'
+								})
+							}
+						}
+						return
+					}
+
+					this.commitRecognizedResult(province, city, district, regionText, detailText, geo, level,
+						removedNoise, geocodeOk, hit, detailRejected)
+				} catch (error) {
+					console.error('智能识别失败:', error)
+					uni.hideLoading()
+
+					if (this.isLikelyNetworkError(error)) {
+						this.showRecognizeNetworkError()
+						return
+					}
+
+					uni.showToast({
+						title: '识别失败，请稍后重试',
+						icon: 'none'
+					})
+				}
+			},
+
+			getRecognizeLevel(hit, detailText, rawText) {
+				const province = (hit?.province_name || '').trim()
+				const city = (hit?.city_name || '').trim()
+				const district = (hit?.county_name || '').trim()
+
+				if (/火星市|月球|银河|测试地址/.test(rawText || '')) {
+					return 'low'
+				}
+
+				if (!province || (!city && !district)) {
+					return 'low'
+				}
+
+				if (!detailText || detailText.length < 2) {
+					return 'medium'
+				}
+
+				return 'high'
+			},
+
+			shouldOnlyToastForGarbageRecognize(rawText, hit, detailText, detailRejected = false, geocodeOk = false) {
+				if (geocodeOk) return false
+
+				const input = String(rawText || '').trim()
+				if (!input) return true
+
+				const province = (hit?.province_name || '').trim()
+				const city = (hit?.city_name || '').trim()
+				const district = (hit?.county_name || '').trim()
+
+				const hasFullRegion = !!(province && (city || district))
+				if (!hasFullRegion) return false
+
+				const hasAddressFeature = this.hasStrongAddressFeature(input)
+				const hasRegionKeyword = /(省|市|区|县|旗|镇|乡|村|街道)/.test(input)
+				const hasLongLetterChunk = /[A-Za-z]{2,}/.test(input)
+				const hasInvalidNoise = this.containsObviousInvalidNoise(input)
+
+				if (!hasAddressFeature && !hasRegionKeyword && !detailText) {
+					if (hasLongLetterChunk || hasInvalidNoise || detailRejected) {
+						return true
+					}
+				}
+
+				return false
+			},
+
+			getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText, detailRejected = false) {
+				const province = (hit?.province_name || '').trim()
+				const city = (hit?.city_name || '').trim()
+				const district = (hit?.county_name || '').trim()
+
+				const hasRegion = !!(province || city || district)
+				const hasFullRegion = !!(province && (city || district))
+				const hasDetail = !!(detailText && detailText.trim())
+
+				if (detailRejected && hasFullRegion && !hasDetail) {
+					return {
+						type: 'modal',
+						title: '已识别到地区，详细地址未自动填入',
+						content: '已识别到省市区，但检测到详细地址中包含无效或不完整内容，系统未自动填入详细地址，请手动补充。'
+					}
+				}
+
+				if (level === 'low') {
+					if (!hasRegion) {
+						return {
+							type: 'modal',
+							title: '已识别，但未匹配到有效地区',
+							content: '未查找到明确的省市区信息，请手动选择所在地区，并检查输入内容是否包含错别字、备注或无效地址。'
+						}
+					}
+
+					if (hasRegion && !hasFullRegion) {
+						return {
+							type: 'modal',
+							title: '已识别到部分地区信息',
+							content: '当前仅识别到部分地区，未能完整匹配到市区县，请手动补全所在地区并核对详细地址。'
+						}
+					}
+
+					if (hasFullRegion && !hasDetail) {
+						return {
+							type: 'modal',
+							title: '已识别到地区，但详细地址不完整',
+							content: '已识别到省市区，但未能准确提取详细地址，请补充门牌号、楼栋号等信息。'
+						}
+					}
+
+					return {
+						type: 'modal',
+						title: '已识别，但未匹配到有效地区',
+						content: '当前地址未匹配到有效地区，请核对所在地区和详细地址，必要时请手动修正。'
+					}
+				}
+
+				if (level === 'medium') {
+					if (!hasDetail) {
+						return {
+							type: 'toast',
+							title: removedNoise ? '已识别到地区，请补充详细地址' : '已识别到地区，请补充详细地址'
+						}
+					}
+
+					if (!geocodeOk) {
+						return {
+							type: 'toast',
+							title: removedNoise ? '已识别，但未查到地图位置' : '已识别，但未查到对应地图位置'
+						}
+					}
+
+					return {
+						type: 'toast',
+						title: removedNoise ? '已识别到部分地址，请核对' : '已识别到部分地址，请核对'
+					}
+				}
+
+				if (!geocodeOk) {
+					return {
+						type: 'toast',
+						title: removedNoise ? '已识别，但未查到地图位置' : '已识别，请核对地址和地图位置'
+					}
+				}
+
+				return {
+					type: 'toast',
+					title: removedNoise ? '识别成功，请核对' : '识别成功，请核对'
+				}
+			},
+
+			commitRecognizedResult(province, city, district, regionText, detailText, geo, level, removedNoise, geocodeOk,
+				hit, detailRejected) {
+				this.currentProvince = province
+				this.currentCity = city
+				this.currentDistrict = district
+				this.currentRegion = regionText
+
+				this.selectedProvinceCode = hit.province_code || this.selectedProvinceCode || ''
+				this.selectedCityCode = hit.city_code || this.selectedCityCode || ''
+				this.selectedDistrictCode = hit.county_code || this.selectedDistrictCode || ''
+
+				this.detailAddress = detailText
+				this.manualDetail = detailText
+				this.currentDetail = detailText
+				this.isManualDetail = !!detailText
+
+				this.smartBtnText = '已识别'
+				uni.hideLoading()
+
+				const tip = this.getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText, detailRejected)
+				if (tip.type === 'modal') {
+					uni.showModal({
+						title: tip.title,
+						content: tip.content,
+						showCancel: false
+					})
+				} else {
+					uni.showToast({
+						title: tip.title,
+						icon: 'none'
+					})
+				}
+			},
+
+			updateMapCenter(longitude, latitude, noReverse = false) {
+				const lng = parseFloat(longitude)
+				const lat = parseFloat(latitude)
+
+				if (!Number.isFinite(lng) || !Number.isFinite(lat)) return
+
+				this.applyMapLocation(lng, lat, noReverse)
+			},
+
+			selectRegion() {
+				this.openRegionPicker()
+			},
+
+			openRegionPicker() {
+				this.regionProvinceList = ChinaCitys || []
+
+				let provinceIndex = 0
+				let cityIndex = 0
+				let areaIndex = 0
+
+				if (this.selectedProvinceCode && this.selectedCityCode && this.selectedDistrictCode) {
+					const idx = this.findRegionIndexByCode(
+						ChinaCitys,
+						this.selectedProvinceCode,
+						this.selectedCityCode,
+						this.selectedDistrictCode
+					)
+					provinceIndex = idx.provinceIndex >= 0 ? idx.provinceIndex : 0
+					cityIndex = idx.cityIndex >= 0 ? idx.cityIndex : 0
+					areaIndex = idx.areaIndex >= 0 ? idx.areaIndex : 0
+				}
+
+				this.regionCityList = this.regionProvinceList[provinceIndex]?.citys || []
+				this.regionDistrictList = this.regionCityList[cityIndex]?.areas || []
+				this.regionPickerValue = [provinceIndex, cityIndex, areaIndex]
+
+				if (this.mapMoveTimer) {
+					clearTimeout(this.mapMoveTimer)
+					this.mapMoveTimer = null
+				}
+
+				this.mapSnapshotUrl = this.buildMapSnapshotUrl()
+				this.showMapSnapshot = true
+				this.mapVisible = false
+				this.showRegionPicker = true
+			},
+
+			closeRegionPicker() {
+				this.showRegionPicker = false
+
+				if (this.popupRestoreTimer) {
+					clearTimeout(this.popupRestoreTimer)
+				}
+
+				this.popupRestoreTimer = setTimeout(() => {
+					this.showMapSnapshot = false
+					this.mapSnapshotUrl = ''
+
+					this.ignoreRegionChangeOnce = true
+					this.mapProgrammaticUntil = Date.now() + 500
+
+					if (this.mapGuardTimer) {
+						clearTimeout(this.mapGuardTimer)
+					}
+					this.mapGuardTimer = setTimeout(() => {
+						this.ignoreRegionChangeOnce = false
+						this.mapGuardTimer = null
+					}, 550)
+
+					this.mapVisible = true
+					this.mapRenderKey += 1
+					this.popupRestoreTimer = null
+				}, 300)
+			},
+
+			onRegionChange(e) {
+				const val = e.detail.value
+				this.regionPickerValue = val
+
+				const provinceIdx = val[0]
+				const cityIdx = val[1] || 0
+
+				if (this.regionProvinceList.length > provinceIdx) {
+					this.regionCityList = this.regionProvinceList[provinceIdx].citys || []
+					const maxCityIdx = this.regionCityList.length - 1
+					const adjustedCityIdx = Math.min(cityIdx, maxCityIdx)
+
+					if (adjustedCityIdx !== cityIdx) {
+						this.regionPickerValue = [provinceIdx, adjustedCityIdx, 0]
+					}
+
+					if (this.regionCityList.length > adjustedCityIdx) {
+						this.regionDistrictList = this.regionCityList[adjustedCityIdx].areas || []
+						const areaIdx = val[2] || 0
+						const maxAreaIdx = this.regionDistrictList.length - 1
+						if (areaIdx > maxAreaIdx) {
+							this.regionPickerValue = [provinceIdx, adjustedCityIdx, 0]
+						}
+					} else {
+						this.regionDistrictList = []
+						this.regionPickerValue = [provinceIdx, 0, 0]
+					}
+				} else {
+					this.regionCityList = []
+					this.regionDistrictList = []
+					this.regionPickerValue = [0, 0, 0]
+				}
+			},
+
+			async confirmRegion() {
+				this.clearBlankPageInitLock()
+				const [provinceIdx, cityIdx, districtIdx] = this.regionPickerValue
+				const provinceItem = this.regionProvinceList[provinceIdx]
+				const cityItem = this.regionCityList[cityIdx]
+				const districtItem = this.regionDistrictList[districtIdx]
+
+				if (!provinceItem || !cityItem || !districtItem) {
+					uni.showToast({
+						title: '选择无效',
+						icon: 'none'
+					})
+					return
+				}
+
+				this.userSelectedRegion = true
+
+				const regionStr = provinceItem.province + cityItem.city + districtItem.area
+				this.currentProvince = provinceItem.province
+				this.currentCity = cityItem.city
+				this.currentDistrict = districtItem.area
+				this.currentRegion = regionStr
+
+				this.selectedProvinceCode = provinceItem.code
+				this.selectedCityCode = cityItem.code
+				this.selectedDistrictCode = districtItem.code
+
+				this.isManualDetail = false
+				this.suppressInitDetailFill = true
+				this.detailAddress = ''
+				this.manualDetail = ''
+				this.currentDetail = ''
+
+				const shortCode = districtItem.code ? districtItem.code.toString().slice(0, 6) : ''
+				this.startDependencyInitLock()
+				const center = await this.getDistrictCenter(districtItem.area, shortCode)
+
+				if (center) {
+					const [lng, lat] = center.split(',')
+					this.updateMapCenter(parseFloat(lng), parseFloat(lat), true)
+				} else {
+					uni.showToast({
+						title: '无法定位该地区，请手动拖动地图',
+						icon: 'none'
+					})
+				}
+
+				this.closeRegionPicker()
+			},
+
+			getDistrictCenter(keyword, adcode = '', subdistrict = 0) {
+				return new Promise((resolve) => {
+					const params = {
+						key: this.amapKey,
+						subdistrict,
+						extensions: 'all'
+					}
+
+					const queryAdcode = () => {
+						if (!adcode) return Promise.resolve(null)
+
+						return new Promise((resolveInner) => {
+							uni.request({
+								url: 'https://restapi.amap.com/v3/config/district',
+								method: 'GET',
+								data: {
+									...params,
+									keywords: adcode.slice(0, 6)
+								},
+								success: (res) => {
+									if (res.data.status === '1' && res.data.districts &&
+										res.data.districts.length > 0) {
+										const district = res.data.districts[0]
+										if (district.center) {
+											resolveInner(district.center)
+											return
+										}
+									}
+									resolveInner(null)
+								},
+								fail: () => resolveInner(null)
+							})
+						})
+					}
+
+					const queryKeyword = () => {
+						return new Promise((resolveInner) => {
+							uni.request({
+								url: 'https://restapi.amap.com/v3/config/district',
+								method: 'GET',
+								data: {
+									...params,
+									keywords: keyword
+								},
+								success: (res) => {
+									if (res.data.status === '1' && res.data.districts &&
+										res.data.districts.length > 0) {
+										const district = res.data.districts[0]
+										if (district.center) {
+											resolveInner(district.center)
+											return
+										}
+									}
+									resolveInner(null)
+								},
+								fail: () => resolveInner(null)
+							})
+						})
+					}
+
+					queryAdcode().then(center => {
+						if (center) {
+							resolve(center)
+						} else {
+							queryKeyword().then(resolve)
+						}
+					})
+				})
+			},
+
+			onConfirm() {
+				const fullAddress = (this.currentRegion + (this.detailAddress ? ' ' + this.detailAddress : '')).trim()
+
+				const addressItem = {
+					name: fullAddress,
+					address: this.detailAddress,
+					location: `${this.longitude},${this.latitude}`,
+					pname: this.currentProvince,
+					cityname: this.currentCity,
+					adname: this.currentDistrict,
+					province: this.currentProvince,
+					city: this.currentCity,
+					district: this.currentDistrict,
+					provinceCode: this.selectedProvinceCode,
+					cityCode: this.selectedCityCode,
+					districtCode: this.selectedDistrictCode,
+					source: this.source
+				}
+
+				const pages = getCurrentPages()
+				const prevPage = pages[pages.length - 2]
+				const currentPage = pages[pages.length - 1]
+				const source = this.source || currentPage.options.source
+
 				//特殊处理重庆
-				if(addressItem.cityCode == 500100){
+				if (addressItem.cityCode == 500100) {
 					addressItem.cityname = "重庆城区"
 				}
-				if(addressItem.cityCode == 500200){
+				if (addressItem.cityCode == 500200) {
 					addressItem.cityname = "重庆郊县"
 				}
 
-                if (source === 'syr_info') {
-                    uni.$emit('address-selected-for-syr', addressItem)
-                    uni.setStorageSync('syr_selected_address', addressItem)
-                } else if (source === 'sj_info') {
-                    uni.$emit('address-selected-for-sj', addressItem)
-                    uni.setStorageSync('sj_selected_address', addressItem)
-                    if (getApp().globalData) getApp().globalData.selectedAddress = addressItem
-                } else if (prevPage) {
-                    if (prevPage.$vm && typeof prevPage.$vm.editAddress === 'function') {
-                        prevPage.$vm.editAddress(addressItem)
-                    } else {
-                        uni.$emit('address-selected', addressItem)
-                    }
-                } else {
-                    uni.$emit('address-selected', addressItem)
-                }
 
-                uni.navigateBack()
-            }
-        }
-    }
+				if (source === 'syr_info') {
+					uni.$emit('address-selected-for-syr', addressItem)
+					uni.setStorageSync('syr_selected_address', addressItem)
+				} else if (source === 'sj_info') {
+					uni.$emit('address-selected-for-sj', addressItem)
+					uni.setStorageSync('sj_selected_address', addressItem)
+					if (getApp().globalData) getApp().globalData.selectedAddress = addressItem
+				} else if (prevPage) {
+					if (prevPage.$vm && typeof prevPage.$vm.editAddress === 'function') {
+						prevPage.$vm.editAddress(addressItem)
+					} else {
+						uni.$emit('address-selected', addressItem)
+					}
+				} else {
+					uni.$emit('address-selected', addressItem)
+				}
+
+				uni.navigateBack()
+			}
+		}
+	}
 </script>
 
 <style scoped lang="less">
-    .search-address-page {
-        flex: 1;
-        height: 100vh;
-        overflow: hidden;
-        display: flex;
-        flex-direction: column;
-        background-color: #FFFFFF;
-    }
+	.search-address-page {
+		flex: 1;
+		height: 100vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		background-color: #FFFFFF;
+	}
 
-    /* 城市选择 */
-    .search-container {
-        background-color: #FFFFFF;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        padding: 32rpx 30rpx 20rpx 30rpx;
+	/* 城市选择 */
+	.search-container {
+		background-color: #FFFFFF;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		padding: 32rpx 30rpx 20rpx 30rpx;
 
-        .search-container-text {
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 500;
-            font-size: 32rpx;
-            color: #333333;
-            line-height: 45rpx;
-        }
+		.search-container-text {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			line-height: 45rpx;
+		}
 
-        .text-img {
-            width: 20rpx;
-            height: 12rpx;
-            margin-left: 8rpx;
-            margin-right: 26rpx;
-        }
-    }
+		.text-img {
+			width: 20rpx;
+			height: 12rpx;
+			margin-left: 8rpx;
+			margin-right: 26rpx;
+		}
+	}
 
-    /* 地图区域 */
-    .map-container {
-        width: 750rpx;
-        position: relative;
-        overflow: hidden;
-    }
+	/* 地图区域 */
+	.map-container {
+		width: 750rpx;
+		position: relative;
+		overflow: hidden;
+	}
 
-    .map {
-        width: 750rpx;
-        height: 100%;
-    }
+	.map {
+		width: 750rpx;
+		height: 100%;
+	}
 
-    .map-snapshot {
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 750rpx;
-        height: 100%;
-        display: block;
-        z-index: 2;
-        background: #f5f5f5;
-    }
+	.map-snapshot {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 750rpx;
+		height: 100%;
+		display: block;
+		z-index: 2;
+		background: #f5f5f5;
+	}
 
-    .center-marker {
-        position: absolute;
-        left: 375rpx;
-        transform: translateX(-50%);
-        top: 250rpx;
-        width: 42rpx;
-        height: 69rpx;
-        z-index: 3;
+	.center-marker {
+		position: absolute;
+		left: 375rpx;
+		transform: translateX(-50%);
+		top: 250rpx;
+		width: 42rpx;
+		height: 69rpx;
+		z-index: 3;
 
-        .center-marker-img {
-            width: 42rpx;
-        }
-    }
+		.center-marker-img {
+			width: 42rpx;
+		}
+	}
 
-    .map-snapshot {
-        width: 750rpx;
-        height: 100%;
-        display: block;
-    }
+	.map-snapshot {
+		width: 750rpx;
+		height: 100%;
+		display: block;
+	}
 
-    /* 底部编辑区域（用户端样式） */
-    .bottom-edit-section {
-        background-color: #FFFFFF;
-        padding: 20rpx 20rpx 120rpx 20rpx;
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-    }
+	/* 底部编辑区域（用户端样式） */
+	.bottom-edit-section {
+		background-color: #FFFFFF;
+		padding: 20rpx 20rpx 120rpx 20rpx;
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
 
-    /* 固定按钮栏 */
-    .fixed-confirm-bar {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background-color: #FFFFFF;
-        padding: 20rpx 20rpx env(safe-area-inset-bottom) 20rpx; /* 适配刘海屏 */
-        box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
-        z-index: 10;
-    }
+	/* 固定按钮栏 */
+	.fixed-confirm-bar {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: #FFFFFF;
+		padding: 20rpx 20rpx env(safe-area-inset-bottom) 20rpx;
+		/* 适配刘海屏 */
+		box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
+		z-index: 10;
+	}
 
-    .address-input-row {
-        // width: 702rpx;
-        display: flex;
-        flex-direction: column;
-        background-color: #F5F5F5;
-        border-radius: 20rpx;
-        padding: 16rpx 24rpx;
-        margin-bottom: 30rpx;
-    }
+	.address-input-row {
+		// width: 702rpx;
+		display: flex;
+		flex-direction: column;
+		background-color: #F5F5F5;
+		border-radius: 20rpx;
+		padding: 16rpx 24rpx;
+		margin-bottom: 30rpx;
+	}
 
-    .raw-address-input {
-        width: 100%;
-        height: 120rpx;
-        font-size: 14px;
-        color: #333333;
-        background-color: transparent;
-        border-width: 0;
-        padding: 0;
-        margin: 0;
-    }
+	.raw-address-input {
+		width: 100%;
+		height: 120rpx;
+		font-size: 14px;
+		color: #333333;
+		background-color: transparent;
+		border-width: 0;
+		padding: 0;
+		margin: 0;
+	}
 
-    .action-buttons {
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-end;
-        margin-top: 0rpx;
-    }
+	.action-buttons {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		margin-top: 0rpx;
+	}
 
-    .action-btn {
-        margin-left: 16rpx;
-        padding: 7rpx 20rpx;
-        font-size: 24rpx;
-        border-radius: 11rpx;
-        border-width: 1rpx;
-        border-style: solid;
-        background-color: transparent;
-        align-items: center;
-        justify-content: center;
-    }
+	.action-btn {
+		margin-left: 16rpx;
+		padding: 7rpx 20rpx;
+		font-size: 24rpx;
+		border-radius: 11rpx;
+		border-width: 1rpx;
+		border-style: solid;
+		background-color: transparent;
+		align-items: center;
+		justify-content: center;
+	}
 
-    .action-btn:first-child {
-        margin-left: 0;
-    }
+	.action-btn:first-child {
+		margin-left: 0;
+	}
 
-    .btn-text {
-        font-size: 24rpx;
-        font-weight: 400;
-        line-height: 33rpx;
-    }
+	.btn-text {
+		font-size: 24rpx;
+		font-weight: 400;
+		line-height: 33rpx;
+	}
 
-    .paste-btn {
-        border-color: #C6C9CC;
-        color: #333333;
-    }
+	.paste-btn {
+		border-color: #C6C9CC;
+		color: #333333;
+	}
 
-    .smart-btn {
-        border-color: #C6C9CC;
-        color: #999999;
-    }
+	.smart-btn {
+		border-color: #C6C9CC;
+		color: #999999;
+	}
 
-    .smart-btn.smart-btn-active {
-        border-color: #E8101E;
-        color: #E8101E;
-    }
+	.smart-btn.smart-btn-active {
+		border-color: #FF4767;
+		color: #FF4767;
+	}
 
-    .address-info-panel {
-        background-color: #FFFFFF;
-        border-radius: 16rpx;
-        margin-bottom: 40rpx;
-    }
+	.address-info-panel {
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		margin-bottom: 40rpx;
+	}
 
-    .info-row {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-between;
-        padding: 30rpx 0;
-    }
+	.info-row {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx 0;
+	}
 
-    .line {
-        border-bottom: 1rpx solid #F0F0F0;
-        width: 540rpx;
-        margin-left: 150rpx;
-    }
+	.line {
+		border-bottom: 1rpx solid #F0F0F0;
+		width: 540rpx;
+		margin-left: 150rpx;
+	}
 
-    .row-label {
-        font-size: 28rpx;
-        color: #333333;
-        font-weight: 500;
-        width: 160rpx;
-    }
+	.row-label {
+		font-size: 28rpx;
+		color: #333333;
+		font-weight: 500;
+		width: 160rpx;
+	}
 
-    .row-content {
-        flex: 1;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: flex-start;
-    }
+	.row-content {
+		flex: 1;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: flex-start;
+	}
 
-    .content-text {
-        font-size: 28rpx;
-        color: #333333;
-        margin-right: 12rpx;
-        flex: 1;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
+	.content-text {
+		font-size: 28rpx;
+		color: #333333;
+		margin-right: 12rpx;
+		flex: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 
-    .placeholder {
-        color: #999999;
-        font-size: 28rpx;
-    }
+	.placeholder {
+		color: #999999;
+		font-size: 28rpx;
+	}
 
-    .arrow-icon {
-        width: 14rpx;
-        height: 26rpx;
-        position: absolute;
-        right: 60rpx;
-    }
+	.arrow-icon {
+		width: 14rpx;
+		height: 26rpx;
+		position: absolute;
+		right: 60rpx;
+	}
 
-    .detail-input {
-        flex: 1;
-        font-size: 28rpx;
-        color: #333333;
-        padding: 0;
-        border-width: 0;
-        background-color: transparent;
-        height: 60rpx;
-    }
+	.detail-input {
+		flex: 1;
+		font-size: 28rpx;
+		color: #333333;
+		padding: 0;
+		border-width: 0;
+		background-color: transparent;
+		height: 60rpx;
+	}
 
-    .confirm-btn {
-        background-color: #E8101E;
-        border-radius: 49rpx;
-        height: 98rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 32rpx;
-        color: #FFFFFF;
-        // margin-top: 40rpx;
-    }
+	.confirm-btn {
+		background-color: #FF4767;
+		border-radius: 49rpx;
+		height: 98rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 32rpx;
+		color: #FFFFFF;
+		// margin-top: 40rpx;
+	}
 
-    .con-btn-text {
-        font-size: 32rpx;
-        color: #FFFFFF;
-    }
+	.con-btn-text {
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
 
-    /* 弹窗基础 */
+	/* 弹窗基础 */
 	.popup {
 		position: fixed;
 		left: 0;
@@ -2582,10 +2633,12 @@
 		opacity: 0;
 		transition: all 0.3s ease;
 	}
+
 	.popup.show {
 		visibility: visible !important;
 		opacity: 1 !important;
 	}
+
 	.popup-mask {
 		position: fixed;
 		top: 0;
@@ -2594,6 +2647,7 @@
 		bottom: 0;
 		background-color: rgba(0, 0, 0, 0.5);
 	}
+
 	.popup-content {
 		position: relative;
 		background-color: #ffffff;
@@ -2603,9 +2657,11 @@
 		transition: transform 0.3s ease;
 		max-height: 70vh;
 	}
+
 	.popup.show .popup-content {
 		transform: translateY(0);
 	}
+
 	.popup-header {
 		display: flex;
 		align-items: center;
@@ -2614,23 +2670,28 @@
 		padding: 0 0 20rpx 0;
 		border-bottom: 1rpx solid #F0F0F0;
 	}
+
 	.popup-title {
 		font-size: 32rpx;
 		font-weight: 500;
 		color: #333;
 	}
+
 	.popup-close {
 		font-size: 40rpx;
 		color: #999;
 		padding: 10rpx;
 	}
+
 	.region-body {
 		height: 400rpx;
 		overflow: hidden;
 	}
+
 	.picker-scroll {
 		height: 400rpx;
 	}
+
 	.picker-item {
 		height: 68rpx;
 		line-height: 68rpx;
@@ -2638,12 +2699,14 @@
 		font-size: 28rpx;
 		color: #333;
 	}
+
 	.popup-footer {
 		display: flex;
 		margin-top: 30rpx;
 		padding-top: 20rpx;
 		border-top: 1rpx solid #F0F0F0;
 	}
+
 	.popup-btn {
 		flex: 1;
 		height: 88rpx;
@@ -2653,24 +2716,30 @@
 		justify-content: center;
 		margin: 0 16rpx;
 	}
+
 	.popup-btn.cancel {
 		background-color: #f5f5f5;
 	}
+
 	.popup-btn.confirm {
-		background: #e8101e;
+		background: #FF4767;
 	}
+
 	.popup-btn .btn-text {
 		font-size: 32rpx;
 		font-weight: 500;
 	}
+
 	.popup-btn.cancel .btn-text {
 		color: #666666;
 	}
+
 	.popup-btn.confirm .btn-text {
 		color: #ffffff;
 	}
+
 	/* 指示器样式（沿用原有） */
 	.indicatorStyle {
 		height: 68rpx;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/address/selectAddress.vue b/pages/address/selectAddress.vue
index 22ea79b..5c31a9d 100644
--- a/pages/address/selectAddress.vue
+++ b/pages/address/selectAddress.vue
@@ -274,7 +274,7 @@
 				flex: 1;
 				height: 68rpx;
 				background: #FFFFFF;
-				border: 2rpx solid #E8101E;
+				border: 2rpx solid #FF4767;
 				background-color: #fafafa;
 				display: flex;
 				align-items: center;
diff --git a/pages/address/selectCity.vue b/pages/address/selectCity.vue
index 0deb358..930e821 100644
--- a/pages/address/selectCity.vue
+++ b/pages/address/selectCity.vue
@@ -8,7 +8,7 @@
     ></custom-navbar>
     <!-- <view class="search-container">
 			<search-box v-model="searchKeyword" placeholder="请输入你的服务地址" width="690rpx" height="68rpx"
-				border="1px solid #E8101E" style="padding: 0;" @confirm="onSearch" :showBack="false"></search-box>
+				border="1px solid #FF4767" style="padding: 0;" @confirm="onSearch" :showBack="false"></search-box>
 		</view>
 		<scroll-view scroll-y class="hao-scroll">
 			<view class="hot-citys">
diff --git a/pages/album/components/videoSlide.nvue b/pages/album/components/videoSlide.nvue
index 6e195c4..ea43006 100644
--- a/pages/album/components/videoSlide.nvue
+++ b/pages/album/components/videoSlide.nvue
@@ -1,822 +1,88 @@
 <template>
-	<view style="z-index: 100;">
-		<!-- 视频滑动主容器 -->
-		<view class="view-box" :style="viewTopLength">
-			<!-- 复用的5个视频容器 - 核心复用节点，不可删减 -->
-			<view class="video-box" :style="itemViewTopLength0">
-				<video :src="videoInfo_0.src" :style="fillScreen" :autoplay="videoInfo_0.autoplay"
-					:loop="videoInfo_0.loop" :controls="videoInfo_0.controls"
-					:enable-play-gesture="videoInfo_0.enablePlayGesture" :objectFit="videoInfo_0.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_0.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_0.enableProgressGesture" @timeupdate="timeupdate(0,$event)"
-					@ended='ended' :show-play-btn="videoInfo_0.showPlayBtn" :show-progress="videoInfo_0.showProgress"
-					initial-time="0" id='video_id_0' @play="playing(0)" :muted="videoInfo_0.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_0.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_0.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_0.mode || mode" :src="videoInfo_0.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart.stop='videotouchstart' @touchmove.stop="videotochmove"
-					@touchend.stop='videotouchend' @click.stop="videoClick"></view>
-				<!-- 视频文本区域 - 每个视频都有 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">{{ videoInfo_0.src }}</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_0.name}}</text>
-						<!-- 声音图标 - 绑定0号视频的状态，点击切换静音 -->
-						<image class="video-sound"
-							:src="videoInfo_0.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(0)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength1">
-				<video :src="videoInfo_1.src" :style="fillScreen" :autoplay="videoInfo_1.autoplay"
-					:loop="videoInfo_1.loop" :controls="videoInfo_1.controls"
-					:enable-play-gesture="videoInfo_1.enablePlayGesture" :objectFit="videoInfo_1.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_1.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_1.enableProgressGesture" @timeupdate="timeupdate(1,$event)"
-					@ended='ended' :show-play-btn="videoInfo_1.showPlayBtn" :show-progress="videoInfo_1.showProgress"
-					initial-time="0" id='video_id_1' @play="playing(1)" :muted="videoInfo_1.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_1.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_1.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_1.mode || mode" :src="videoInfo_1.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 1号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_1.name}}</text>
-						<!-- 声音图标 - 绑定1号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_1.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(1)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength2">
-				<video :src="videoInfo_2.src" :style="fillScreen" :autoplay="videoInfo_2.autoplay"
-					:loop="videoInfo_2.loop" :controls="videoInfo_2.controls"
-					:enable-play-gesture="videoInfo_2.enablePlayGesture" :objectFit="videoInfo_2.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_2.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_2.enableProgressGesture" @timeupdate="timeupdate(2,$event)"
-					@ended='ended' :show-play-btn="videoInfo_2.showPlayBtn" :show-progress="videoInfo_2.showProgress"
-					initial-time="0" id='video_id_2' @play="playing(2)" :muted="videoInfo_2.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_2.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_2.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_2.mode || mode" :src="videoInfo_2.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 2号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_2.name}}</text>
-						<!-- 声音图标 - 绑定2号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_2.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(2)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength3">
-				<video :src="videoInfo_3.src" :style="fillScreen" :autoplay="videoInfo_3.autoplay"
-					:loop="videoInfo_3.loop" :controls="videoInfo_3.controls"
-					:enable-play-gesture="videoInfo_3.enablePlayGesture" :objectFit="videoInfo_3.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_3.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_3.enableProgressGesture" @timeupdate="timeupdate(3,$event)"
-					@ended='ended' :show-play-btn="videoInfo_3.showPlayBtn" :show-progress="videoInfo_3.showProgress"
-					initial-time="0" id='video_id_3' @play="playing(3)" :muted="videoInfo_3.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_3.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_3.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_3.mode || mode" :src="videoInfo_3.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 3号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_3.name}}</text>
-						<!-- 声音图标 - 绑定3号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_3.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(3)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength4">
-				<video :src="videoInfo_4.src" :style="fillScreen" :autoplay="videoInfo_4.autoplay"
-					:loop="videoInfo_4.loop" :controls="videoInfo_4.controls"
-					:enable-play-gesture="videoInfo_4.enablePlayGesture" :objectFit="videoInfo_4.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_4.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_4.enableProgressGesture" @timeupdate="timeupdate(4,$event)"
-					@ended='ended' :show-play-btn="videoInfo_4.showPlayBtn" :show-progress="videoInfo_4.showProgress"
-					initial-time="0" id='video_id_4' @play="playing(4)" :muted="videoInfo_4.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_4.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_4.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_4.mode || mode" :src="videoInfo_4.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 4号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_4.name}}</text>
-						<!-- 声音图标 - 绑定4号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_4.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(4)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view @touchend='progressTouchend' class="progress-view">
-				<uv-slider v-if="showSlider" v-model="progressValue" activeColor="#D8D8D8" block-size="6"
-					backgroundColor="#494949;" class="progress-slider"></uv-slider>
-			</view>
-
-			<!-- 修改：Dot指示器 - 最多显示5个 -->
-			<view class="dots" :style="{top:`${0.5*winHeight}px`}" v-if="videoListLength > 1">
-				<view class="dots-container">
-					<view class="dot-item" v-for="(dotIndex, idx) in visibleDots" :key="idx"
-						:class="{ active: dotIndex === videoIndex }" @click="jumpToVideo(dotIndex)"></view>
-				</view>
-				<text class="pageNumber">
-					{{ videoIndex+1 }}/{{ videoListLength }}
-				</text>
-			</view>
+	<view class="video-page">
+		<!-- 原生视频组件：全端兼容 -->
+		<video id="fullVideo" class="video-box" :src="videoUrl" controls show-fullscreen-btn enable-progress-gesture
+			:autoplay="false" :loop="false" :muted="false" @play="onPlay" @pause="onPause"
+			@fullscreenchange="handleFullScreenChange" @ended="onVideoEnd"></video>
 
+		<!-- 自定义操作按钮 -->
+		<view class="btn-wrap">
+			<button type="primary" size="default" @click="openFullScreen">
+				手动横屏全屏播放
+			</button>
+			<button type="warn" size="default" @click="closeFullScreen">
+				退出全屏
+			</button>
 		</view>
 	</view>
 </template>
 
 <script>
-	let VIDEO_LIST = []
-	let initVideoInfo = {
-		src: "",
-		coverStatus: true,
-		coverUrl: "",
-		flag: false,
-		objectFit: "",
-		mode: "",
-		isMuted: false, // 默认不静音
-		autoplay: false,
-		loop: true,
-		controls: false,
-		enablePlayGesture: true,
-		showFullscreenBtn: false,
-		enableProgressGesture: false,
-		showPlayBtn: false,
-		showProgress: false
-	}
 	export default {
-		props: {
-			popVideoList: {
-				type: Array,
-				default: [] // 默认值设为空数组JSON，避免parse报错
-			},
-			marginTop: {
-				type: String,
-				default: "88" // 默认值设为空数组JSON，避免parse报错
-			}
-		},
 		data() {
 			return {
-				playSetTime:null,
-				showSlider: true,
-				progressTime: 0,
-				progressValue: 0,
-				boxHeight: 0,
-				objectFit: "fill",
-				mode: "scaleToFill",
-				winWidth: 1,
-				winHeight: 1,
-				videoIndex: 0,
-				viewTop: 0,
-				viewTopPostion: 0,
-				videoList: [],
-				videoListLength: 0,
-				itemViewTop0: 0,
-				itemViewTop1: 0,
-				itemViewTop2: 0,
-				itemViewTop3: 0,
-				itemViewTop4: 0,
-				videoInfo_0: initVideoInfo,
-				videoInfo_1: initVideoInfo,
-				videoInfo_2: initVideoInfo,
-				videoInfo_3: initVideoInfo,
-				videoInfo_4: initVideoInfo,
-				stopIcon: '',
-				videotouchstartTimestamp: 0,
-				videotouchendTimestamp: 0,
-				moveView: true,
-				cover: true,
-				slidingStatus: false,
-				videoPlayingStatus: false,
-				preloadedIndex: [],
-				startPageY: 0,
-				endPageY: 0,
-				// 新增：控制可视dot的数组
-				visibleDots: [],
+				// 测试视频地址，替换自己的
+				videoUrl: "https://www.w3school.com.cn/i/movie.mp4",
+				videoContext: null
 			};
 		},
-		watch: {
-			// videoList: {
-			// 	handler(newVal, oldVal) {
-
-
-			// 	},
-			// 	immediate: true, // 可选：组件初始化时立即执行一次（即使值未变化）
-			// 	deep: false // 普通类型无需深度监听，默认false
-			// }
-		},
-		created(options) {
-			//#ifdef APP-PLUS
-			plus.screen.lockOrientation("portrait-primary")
-			//#endif
-			if (this.popVideoList.length) {
-				try {
-					VIDEO_LIST = []
-					this.popVideoList.forEach((item, index) => {
-						let obj = {
-							"src": "",
-							"coverStatus": true,
-							"coverUrl": "",
-							"flag": false,
-							"objectFit": "contain",
-							"mode": "aspectFit",
-							"isMuted": false, // 默认不静音
-							"autoplay": false,
-							"loop": true,
-							"controls": false,
-							"enablePlayGesture": true,
-							"showFullscreenBtn": false,
-							"enableProgressGesture": false,
-							"showPlayBtn": false,
-							"showProgress": false,
-							"name": ""
-						}
-						obj.name = item.name
-						obj.src = item.url
-						obj.coverUrl = item.url +
-							`?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`
-						VIDEO_LIST.push(obj)
-						if (index == 0) {
-							initVideoInfo = obj
-						}
-					})
-				} catch (e) {}
-				this.getSystemInfo();
-				this.videoList = VIDEO_LIST;
-				this.videoListLength = this.videoList.length;
-				this.boxHeight = this.videoListLength * this.winHeight;
-				for (let i = 0; i < 5; i++) {
-					if (this.videoList[i]) {
-						this['videoInfo_' + i] = this.videoList[i]
-					}
-				}
-				// 初始化可视dot范围
-				this.updateVisibleDots();
-				// setTimeout(() => {
-				// 	this.playVideo(0)
-				// }, 500)
-			}
-		},
-		onUnload() {
-			for (let i = 0; i < 5; i++) {
-				this.unloadVideo(i)
-			}
-		},
-		computed: {
-			getVideoTop() {
-				return uni.upx2px(this.marginTop)
-			},
-			viewTopLength() {
-				return `height:${this.boxHeight}px;top:${this.viewTop}px;`
-			},
-			fillScreen() {
-				let style = `height:${this.winHeight}px;width:${this.winWidth}px;`
-				return style
-			},
-			fillScreen2() {
-				let style = `height:auto;width:${this.winWidth}px;`
-				return style
-			},
-			itemViewTopLength0() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop0}px;`
-			},
-			itemViewTopLength1() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop1}px;`
-			},
-			itemViewTopLength2() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop2}px;`
-			},
-			itemViewTopLength3() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop3}px;`
-			},
-			itemViewTopLength4() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop4}px;`
-			}
+		onReady() {
+			// 初始化视频实例
+			this.videoContext = uni.createVideoContext("fullVideo", this);
 		},
 		methods: {
-			// 新增：切换视频静音状态
-			toggleMute(videoNum) {
-				// 1. 切换数据层状态
-				this['videoInfo_' + videoNum].isMuted = !this['videoInfo_' + videoNum].isMuted;
-				// 2. 同步视频实例静音状态（恢复并完善原有注释代码，加容错）
-				const videoCtx = uni.createVideoContext("video_id_" + videoNum, this);
-				if (videoCtx) {
-					videoCtx.mute(this['videoInfo_' + videoNum].isMuted);
-				}
+			// 进入横屏全屏
+			openFullScreen() {
+				// direction 90：横屏；-90反向横屏；0自适应
+				this.videoContext.requestFullScreen({
+					direction: 90
+				});
 			},
-			// 修改：点击dot跳转 - 传真实的视频索引
-			jumpToVideo(targetIndex) {
-				if (targetIndex === this.videoIndex || this.slidingStatus) return;
-				this.stopVideo(this.videoIndex % 5, true);
-				const diff = targetIndex - this.videoIndex;
-				this.videoIndex = targetIndex;
-				this.viewTopPostion = -this.videoIndex * this.winHeight;
-				this.viewTop = this.viewTopPostion;
-				if (this.videoListLength > 5) {
-					this.sortItemView(diff > 0 ? -1 : 1);
-				}
-				// 更新可视dot范围
-				this.updateVisibleDots();
-				setTimeout(() => {
-					this.playVideo(this.videoIndex % 5);
-				}, 400);
+			// 退出全屏
+			closeFullScreen() {
+				this.videoContext.exitFullScreen();
 			},
-			// 核心：更新可视dot范围 - 最多显示5个
-			updateVisibleDots() {
-				const maxShow = 5;
-				const total = this.videoListLength;
-				// 视频总数 ≤ 5，显示全部
-				if (total <= maxShow) {
-					this.visibleDots = Array.from({
-						length: total
-					}, (_, i) => i);
-					return;
-				}
-				// 视频总数 > 5，显示包含当前索引的5个dot
-				// 计算起始索引，避免越界
-				let start = Math.max(0, Math.min(this.videoIndex - 2, total - maxShow));
-				// 生成5个连续的索引
-				this.visibleDots = Array.from({
-					length: maxShow
-				}, (_, i) => start + i);
+			// 播放监听
+			onPlay() {
+				console.log("视频开始播放");
 			},
-			progressTouchend() {
-				let s = Math.round(this.progressValue / 100 * this.time)
-				let i = this.videoIndex % 5
-				uni.createVideoContext("video_id_" + i, this).seek(s)
-				uni.createVideoContext("video_id_" + i, this).play()
+			// 暂停监听
+			onPause() {
+				console.log("视频暂停");
 			},
-			sliderchanging(e) {
-				console.log(3333, e)
-			},
-			getSystemInfo() {
-				var _this = this;
-				uni.getSystemInfo({
-					success: function(res) {
-						_this.winWidth = res.windowWidth;
-						_this.winHeight = res.windowHeight;
-						let p = uni.upx2px(150)
-						_this.stopIcon = `left:${(res.windowWidth - p)/2}px;top:${(res.windowHeight - p)/2}px;`
-						_this.itemViewTop1 = res.windowHeight
-						_this.itemViewTop2 = res.windowHeight * 2
-						_this.itemViewTop3 = res.windowHeight * 3
-						_this.itemViewTop4 = res.windowHeight * 4
-					},
-				})
-			},
-			unloadVideo(index) {
-				if (index < 0 || index >= this.videoListLength) return;
-				const nodeNum = index % 5;
-				const videoCtx = uni.createVideoContext("video_id_" + nodeNum, this);
-				videoCtx.stop();
-				this.preloadedIndex = this.preloadedIndex.filter(item => item !== index);
-			},
-			playVideo(num) {
-				clearTimeout(this.playSetTime)
-				uni.$uv.debounce(() => {
-					this.videoPlayingStatus = true
-					this["videoInfo_" + num].flag = true
-					let VideoContext = uni.createVideoContext("video_id_" + num, this)
-					this.playSetTime = setTimeout(() => {
-						VideoContext.play()
-					}, 400)
-				}, 30)
-			},
-			stopVideo(num, control = false) {
-				const videoCtx = uni.createVideoContext("video_id_" + num, this);
-				if (!control) {
-					this['videoInfo_' + num].coverStatus = true;
-					videoCtx.stop()
+			// 全屏状态切换监听
+			handleFullScreenChange(e) {
+				if (e.detail.fullScreen) {
+					uni.setNavigationBarHidden(true); // 全屏隐藏顶部导航
 				} else {
-					videoCtx.pause()
+					uni.setNavigationBarHidden(false); // 退出恢复导航
 				}
-				this["videoInfo_" + num].flag = false
+				console.log("当前全屏状态：", e.detail.fullScreen);
 			},
-			nowPlayVideo() {
-				clearTimeout(this.playSetTime)
-				uni.$uv.debounce(() => {
-					this.videoPlayingStatus = true
-					this["videoInfo_" + this.videoIndex].flag = true
-					let VideoContext = uni.createVideoContext("video_id_" + this.videoIndex, this)
-					this.playSetTime = setTimeout(() => {
-						VideoContext.play()
-					}, 400)
-				}, 30)
-			},
-			nowStopVideo() {
-				const videoCtx = uni.createVideoContext("video_id_" + this.videoIndex, this);
-				videoCtx.pause()
-				this["videoInfo_" + this.videoIndex].flag = false
-			},
-			videoClick() {
-				let num = this.videoIndex % 5
-				if (this["videoInfo_" + num].flag) {
-					this.stopVideo(num, true)
-				} else {
-					this.playVideo(num, true)
-				}
-			},
-			videotouchstart(e) {
-				this.videotouchendTimestamp = this.videotouchstartTimestamp
-				this.videotouchstartTimestamp = e.timestamp
-				if ((this.videotouchstartTimestamp - this.videotouchendTimestamp) < 500) return
-				if (this.slidingStatus) return
-				this.startPageY = e.changedTouches[0].screenY;
-			},
-			videotochmove(e) {
-				if ((this.videotouchstartTimestamp - this.videotouchendTimestamp) < 500) return
-				if (this.slidingStatus) return
-				this.endPageY = e.changedTouches[0].screenY;
-				let sliding = this.endPageY - this.startPageY
-				if (sliding > 20 || sliding < -20) {
-					this.moveView = false
-				} else {
-					this.moveView = true
-				}
-				if (this.videoIndex == 0 && sliding > 50) {
-					this.viewTop = 50
-				} else if (this.videoIndex == this.videoListLength - 1 && sliding < 0) {
-					this.viewTop = this.viewTopPostion
-				} else {
-					this.viewTop = this.viewTopPostion + sliding
-				}
-			},
-			videotouchend(e) {
-				if ((this.videotouchstartTimestamp - this.videotouchendTimestamp) < 500) return
-				if (this.slidingStatus) return
-				this.moveView = true
-				this.endPageY = e.changedTouches[0].screenY;
-				let sliding = this.endPageY - this.startPageY
-				if ((sliding >= -40 && sliding < 0) || (sliding <= 40 && sliding > 0)) {
-					this.slidingStatus = true
-					this.videoSlidingReset(sliding)
-					return
-				}
-				if (sliding < -30) {
-					this.slidingStatus = true
-					if (this.videoIndex == this.videoListLength - 1) {
-						this.videoSlidingReset(sliding)
-						uni.showToast({
-							title: "已经到底了",
-							icon: "none"
-						})
-						return
-					}
-					this.moveView = false
-					this.videoSlidingToTop(sliding)
-					return
-				}
-				if (sliding > 30) {
-					this.slidingStatus = true
-					if (this.videoIndex == 0) {
-						this.videoSlidingReset(sliding)
-						return
-					}
-					this.moveView = false
-					this.videoSlidingToBottom(sliding)
-				}
-			},
-			videoSlidingReset(sliding) {
-				this.viewTop = this.viewTopPostion
-				this.slidingStatus = false
-			},
-			videoSlidingToTop(sliding) {
-				this.stopVideo(this.videoIndex % 5, true)
-				this.videoIndex++
-				if (this.videoListLength > 5) {
-					this.sortItemView(sliding)
-				}
-				this.viewTopPostion = this.viewTopPostion - this.winHeight
-				setTimeout(() => {
-					this.playVideo(this.videoIndex % 5)
-				}, 5)
-				let timer = setInterval(() => {
-					this.viewTop = this.viewTop - 35
-					if (this.viewTop < (this.viewTopPostion + 10)) {
-						this.viewTop = this.viewTopPostion
-						clearInterval(timer)
-						this.slidingStatus = false
-						this.slidingCallback()
-					}
-				}, 3)
-			},
-			videoSlidingToBottom(sliding) {
-				this.stopVideo(this.videoIndex % 5, true)
-				this.videoIndex--
-				if (this.videoListLength > 5) {
-					this.sortItemView(sliding)
-				}
-				this.viewTopPostion = this.viewTopPostion + this.winHeight
-				setTimeout(() => {
-					this.playVideo(this.videoIndex % 5)
-				}, 5)
-				let timer = setInterval(() => {
-					this.viewTop = this.viewTop + 35
-					if (this.viewTop > (this.viewTopPostion - 10)) {
-						this.viewTop = this.viewTopPostion
-						clearInterval(timer)
-						this.slidingStatus = false
-						this.slidingCallback()
-					}
-				}, 3)
-			},
-			// 修改：滑动结束后更新可视dot
-			slidingCallback() {
-				this.progressValue = 0
-				this.updateVisibleDots();
-			},
-			//滑动组件排序
-			sortItemView(silding) {
-				// 向上滑动
-				if (silding < 0) {
-					if (this.videoIndex > 2 && this.videoIndex < this.videoListLength - 2) {
-						let i = (this.videoIndex - 3) % 5
-						this["itemViewTop" + i] = this["itemViewTop" + i] + this.winHeight * 5
-						this['videoInfo_' + i] = this.videoList[this.videoIndex + 2]
-					}
-					return
-				}
-				// 向下滑动
-				if (silding > 0) {
-					if (this.videoIndex > 1 && this.videoIndex < this.videoListLength - 3) {
-						let i = (this.videoIndex + 3) % 5
-						this["itemViewTop" + i] = this["itemViewTop" + i] - this.winHeight * 5
-						this['videoInfo_' + i] = this.videoList[this.videoIndex - 2]
-					}
-				}
-			},
-			playing(i) {
-				setTimeout(() => {
-					this['videoInfo_' + i].coverStatus = false
-					this.moveView = true
-					this.slidingStatus = false
-				}, 600)
-			},
-			timeupdate(i, e) {
-				if (this.videoPlayingStatus) {
-					this.slidingStatus = false
-					this.videoPlayingStatus = false
-					setTimeout(() => {
-						this['videoInfo_' + i].coverStatus = false
-						this.moveView = true
-					}, 200)
-				}
-				this["videoInfo_" + i].flag = true
-				if (e.detail.duration >= this.progressTime) {
-					if (this.videoIndex%5 == i) {
-						this.time = e.detail.duration
-						this.progress = e.detail.currentTime
-						this.progressValue = (e.detail.currentTime / e.detail.duration) * 100
-					}
-
-					this.showProgress = true
-				} else {
-					this.showProgress = false
-				}
-			},
-			ended() {
-				let num = this.videoIndex % 5
-				this["videoInfo_" + num].flag = false
-				this.progressValue = 0
+			// 视频播放结束
+			onVideoEnd() {
+				// 播放完毕自动退出全屏
+				this.videoContext.exitFullScreen();
 			}
 		}
-	}
+	};
 </script>
 
-<style scoped lang="less">
-	.view-box {
-		// position: fixed;
-		// left: 0;
-		// right: 0;
-		background-color: #000;
-		// z-index: 900;
+<style scoped>
+	.video-page {
+		padding: 15rpx;
 	}
 
 	.video-box {
-		position: absolute;
-		left: 0;
-		right: 0;
-		z-index: 2000;
+		width: 100%;
+		height: 420rpx;
+		border-radius: 12rpx;
+		overflow: hidden;
 	}
 
-	.video-image {
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 2001;
-	}
-
-	.video-action {
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 2008;
-	}
-
-	.video-texts {
-		position: absolute;
-		left: 30rpx;
-		right: 30rpx;
-		bottom: 120rpx;
-		z-index: 2009; // 确保在视频上方显示
-
-		.video-title {
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			text-align: left;
-			font-style: normal;
-			lines: 1;
-			max-width: 240rpx;
-		}
-
-		.video-score {
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			text-align: left;
-			font-style: normal;
-			margin-left: 20rpx;
-		}
-
-		.video-text {
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #FFFFFF;
-			text-align: left;
-			font-style: normal;
-		}
-
-		.video-sound {
-			width: 44rpx;
-			height: 42rpx;
-			cursor: pointer; // 点击指针，提示可点击
-		}
-	}
-
-	.cover-view-stop {
-		position: absolute;
-		z-index: 9999;
-		width: 150rpx;
-		height: 200rpx;
-		background-color: rgba(0, 0, 0, 0.3);
-		border-radius: 50%;
-	}
-
-	.progress-view {
-		z-index: 9999;
-		position: fixed;
-		left: 30rpx;
-		right: 30rpx;
-		bottom: 80rpx;
-
-		.progress-slider {}
-	}
-
-	// 修改：Dot指示器样式 - 最多显示5个 + 过渡动画
-	.dots {
-		position: fixed;
-		left: 20rpx;
-		top: 0;
-		transform: translateY(-50%);
-		z-index: 9999;
-		flex-direction: row;
-
-		.dots-container {
-			// 限制最多显示5个，超出隐藏
-			width: fit-content;
-			overflow: hidden;
-			margin: auto 0;
-
-			.dot-item {
-				width: 10rpx;
-				height: 10rpx;
-				background: #FFFFFF;
-				border-radius: 50%;
-				// 核心：过渡动画，切换更丝滑
-				transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-				cursor: pointer;
-				margin-bottom: 10rpx;
-
-				&.active {
-					width: 10rpx;
-					height: 30rpx;
-					background: #FFFFFF;
-					border-radius: 5rpx;
-				}
-			}
-		}
-
-		.pageNumber {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #FFFFFF;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-left: 6rpx;
-		}
-	}
-
-	.flex-row-center-between {
+	.btn-wrap {
+		margin-top: 30rpx;
 		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.flex-row-start-between {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-start;
-		justify-content: space-between;
-	}
-
-	.flex-row-center-center {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.flex-row-center {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.flex-row-start {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-start;
-	}
-
-	.flex-row-end-between {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-end;
-		justify-content: space-between;
+		gap: 20rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/album/components/videoplayer.vue b/pages/album/components/videoplayer.vue
new file mode 100644
index 0000000..9ae18ef
--- /dev/null
+++ b/pages/album/components/videoplayer.vue
@@ -0,0 +1,106 @@
+<template>
+	<view class="video-page">
+		<!-- 原生视频组件：全端兼容 -->
+		<video id="fullVideo" class="video-box" :src="videoUrl" controls show-fullscreen-btn enable-progress-gesture
+			:autoplay="true" :loop="false" :muted="false" @play="onPlay" @pause="onPause" object-fit="cover" :direction="90"
+			@fullscreenchange="handleFullScreenChange" @ended="onVideoEnd" @fullscreenclick="tapback"></video>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				videoUrl: "",
+				videoContext: null
+			};
+		},
+		onLoad(options) {
+			console.log(options, '页面参数');
+			// 接收视频地址
+			if (options.url) {
+				this.videoUrl = options.url;
+			}
+		},
+		onReady() {
+			// #ifdef APP-PLUS
+			//plus.screen.unlockOrientation(); //解除屏幕方向的锁定，但是不一定是竖屏；
+			
+			// #endif
+			// 初始化视频实例（唯一正确位置）
+			this.videoContext = uni.createVideoContext("fullVideo", this);
+			// 页面渲染完成后 安全触发自动全屏
+			//this.autoFullScreen();
+		},
+		methods: {
+			tapback(e) {
+				console.log('点击全屏按钮');
+				// if (e.target.fullScreen) {
+				// 	plus.screen.lockOrientation('landscape'); //锁死屏幕方向为竖屏
+				// }else{
+				// 	plus.screen.lockOrientation('portrait'); //锁死屏幕方向为竖屏
+				// }
+			},
+			// 自动全屏（核心：修复iOS方向错乱）
+			autoFullScreen() {
+				if (!this.videoContext) return;
+
+				// 区分平台设置方向：iOS用0自适应，安卓用90横屏
+				const direction = uni.getSystemInfoSync().platform === 'ios' ? 0 : 90;
+
+				// 延迟执行，避免视频未加载完成导致全屏失败
+				setTimeout(() => {
+					this.videoContext.requestFullScreen({
+						direction: direction
+					});
+				}, 300)
+			},
+			// 手动横屏全屏
+			openFullScreen() {
+				if (!this.videoContext) return;
+				const direction = uni.getSystemInfoSync().platform === 'ios' ? 0 : 90;
+				this.videoContext.requestFullScreen({
+					direction
+				});
+			},
+			// 退出全屏
+			closeFullScreen() {
+				if (!this.videoContext) return;
+				this.videoContext.exitFullScreen();
+			},
+			// 播放监听
+			onPlay() {
+				console.log("视频开始播放");
+			},
+			// 暂停监听
+			onPause() {
+				console.log("视频暂停");
+			},
+			// 全屏状态切换
+			handleFullScreenChange(e) {
+				// 全屏隐藏导航栏，退出显示
+				// uni.setNavigationBarHidden(!!e.detail.fullScreen);
+				console.log("全屏状态：", e.detail.fullScreen);
+			},
+			// 视频播放完毕
+			onVideoEnd() {
+				this.closeFullScreen();
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.video-page {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+	}
+
+	.video-box {
+		width: 100%;
+		/* 自适应高度，避免拉伸 */
+		height: 100%;
+		object-fit: cover;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/album/index.nvue b/pages/album/index.nvue
index 0dda008..5fc2123 100644
--- a/pages/album/index.nvue
+++ b/pages/album/index.nvue
@@ -1,52 +1,59 @@
 <template>
 	<view class="container">
 		<view class="positonFixed">
-			<view class="header-top flex-row-center" :class="{videoTop:current==0}"
-				:style="{ height: `${88+statusBarHeight}rpx`,paddingTop: `${statusBarHeight}rpx`}">
+			<view class="header-top flex-row-center" :style="{ height: `${100 + statusBarHeight}rpx`,paddingTop:`${statusBarHeight}rpx`}">
 				<view class="left-area" @click="goBack">
-					<image src="/static/images/whiteBack.png" mode="aspectFit" class="back-icon"></image>
+					<image src="/static/images/back.png" mode="aspectFit" class="back-icon"></image>
 				</view>
-				<view class="flex-row-center-center" style="flex: 1;margin-right: 18rpx;height:66rpx;">					
+				<view class="flex-row-center-center" style="flex: 1;margin-right: 18rpx;height:66rpx;">
 					<uv-tabs :list="list" @click="tabsClick" itemStyle="height:66rpx;" :activeStyle="activeStyle"
 						:inactiveStyle="inactiveStyle" :current="current" :lineColor="`rgba(232, 16, 30, 1)`"></uv-tabs>
 				</view>
-
 			</view>
-			<scroll-view scroll-x style="height: 100rpx;" v-if="current==1">
+			<scroll-view scroll-x style="height: 100rpx;background-color: #fff;" v-if="current==1">
 				<view class="container-tabs flex-row-center">
 					<view class="container-tab flex-row-center-center" @click="clickTab(item)"
-						:class="{active:cardListIndex==item.id}" v-for="(item,index) in cardList[1]" :key="index">
+						:class="{active:cardListIndex==item.id}" v-for="(item,index) in cardList[user_type]"
+						:key="index">
 						<text class="container-tab-text">{{ item.title }}</text>
 					</view>
 				</view>
 			</scroll-view>
-
 		</view>
-
+		<view :style="swiperStyle3"></view>
 		<view class="container-content" :style="swiperStyle2">
-			<swiper class="swiper" circular :style="swiperStyle" :current="current" @change="swiperChange" :disable-touch="current==0">
+			<swiper class="swiper" circular :style="swiperStyle" :current="current" @change="swiperChange"
+				:disable-touch="current==0">
 				<swiper-item>
-					<videoSlide ref="ideoSlideRrf" :popVideoList="videoList" :marginTop="`${88 + this.statusBarHeight}`" v-show="current==0" v-if="videoList.length"></videoSlide>
+					<scroll-view scroll-y :style="{height:`${viewportHeight - 100 - statusBarHeight}rpx`}">
+						<view class="swiper-items3">
+							<view class="swiper-item3" :class="{item2Left:index%2 == 0}"
+								v-for="(item,index) in videoList" :key="index" @click="tovideo(item)">
+								<image class="swiper-item3-video" mode="aspectFill" :src="item.img"></image>
+								<image
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c6c039fc-99fd-492e-ae9a-ed43260c94ef.png"
+									mode="widthFix"
+									style="width: 80rpx;position: absolute;top: 50%;left: 50%;transform: translate3d(-50%, -50%, 0);">
+								</image>
+							</view>
+						</view>
+					</scroll-view>
 				</swiper-item>
 				<swiper-item>
-					<scroll-view scroll-y :style="{height:`${viewportHeight-88-this.statusBarHeight-100}rpx`}">
+					<scroll-view scroll-y :style="{height:`${viewportHeight - 100 - statusBarHeight - 100}rpx`}">
 						<view class="swiper-items2">
 							<view class="swiper-item2" :class="{item2Left:index%2 == 0}"
-								v-for="(item,index) in imagObj[cardListIndex]" :key="index">
+								v-for="(item,index) in imagObj[cardListIndex]" :key="index" @click="toimg(item)">
 								<image class="swiper-item2-img" mode="aspectFill" :src="item.url"></image>
 								<view class="swiper-item2-title">
 									<text class="swiper-item2-title-text">{{ item.name }}</text>
 								</view>
 							</view>
-
 						</view>
-
-
 					</scroll-view>
 				</swiper-item>
 			</swiper>
 		</view>
-
 	</view>
 </template>
 
@@ -68,6 +75,23 @@
 							title: "主图",
 							id: 1
 						},
+						{
+							title: "作品",
+							id: 3
+						},
+						{
+							title: "其他",
+							id: 4
+						}
+					],
+					2: [{
+							title: "全部",
+							id: 0
+						},
+						{
+							title: "主图",
+							id: 1
+						},
 						{
 							title: "环境",
 							id: 2
@@ -94,7 +118,7 @@
 				inactiveStyle: {
 					fontWeight: 500,
 					fontSize: "32rpx",
-					color: "#666666",
+					color: "#333333",
 				},
 				current: 1,
 				statusBarHeight: 0,
@@ -108,6 +132,7 @@
 			};
 		},
 		async onLoad(options) {
+
 			// 获取状态栏高度
 			const systemInfo = await uni.getSystemInfoSync()
 			this.systemInfo = systemInfo
@@ -120,6 +145,12 @@
 				this.getVideoList()
 			}
 		},
+		onShow() {
+			// // #ifdef APP-PLUS
+			// plus.screen.unlockOrientation(); //解除屏幕方向的锁定，但是不一定是竖屏；
+			// plus.screen.lockOrientation('portrait'); //锁死屏幕方向为竖屏
+			// // #endif
+		},
 		computed: {
 			// 计算swiper的样式
 			swiperStyle() {
@@ -128,68 +159,82 @@
 					// 注意：100vh 是视口高度，需要先转数值计算，再拼接单位
 
 					let viewportHeight = this.pxToRpx(this.systemInfo.windowHeight || window?.innerHeight || document
-						?.documentElement?.clientHeight|| 0, screenWidth ) ;
-					let height = viewportHeight - 88 - this.statusBarHeight;
+						?.documentElement?.clientHeight || 0, screenWidth);
+					let height = viewportHeight - 100 - this.statusBarHeight;
 					return {
 						height: `${height}rpx`
 					};
 				}
 				return {
-					height: `${this.viewportHeight}rpx`
+					height: `${this.viewportHeight - 100 - this.statusBarHeight}rpx`
 				};
 			},
 			swiperStyle2() {
 				if (this.current == 1) {
 					return {
-						marginTop: `${88 + this.statusBarHeight + 100}rpx`,
-						height: `${this.viewportHeight-88-this.statusBarHeight-100}rpx`
+						height: `${this.viewportHeight-100-this.statusBarHeight-100}rpx`
 					};
 				}
 				return {
-					height: `${this.viewportHeight}rpx`
+					height: `${this.viewportHeight - 100 - this.statusBarHeight}rpx`
+				};
+			},
+			swiperStyle3() {
+				if (this.current == 1) {
+					return {
+						width: `750rpx`,
+						height: `${200 + this.statusBarHeight}rpx`,
+					};
+				}
+				return {
+					width: `750rpx`,
+					height: `${100 + this.statusBarHeight}rpx`,
 				};
 			},
 			viewportHeight() {
 				let screenWidth = this.systemInfo.screenWidth;
 				// 注意：100vh 是视口高度，需要先转数值计算，再拼接单位
 				let viewportHeight = this.pxToRpx(this.systemInfo.windowHeight || window?.innerHeight || document
-					?.documentElement?.clientHeight|| 0, screenWidth) ;
+					?.documentElement?.clientHeight || 0, screenWidth);
 				return viewportHeight
 			},
 		},
 		methods: {
+			goBack() {
+				uni.navigateBack(-1)
+			},
+			toimg(item) {
+				console.log(item, 'item');
+				uni.previewImage({
+					urls: [item.url], // 外面加 [] 变成数组
+					current: 0 // 可选，默认第一张
+				})
+			},
+			tovideo(item) {
+				uni.navigateTo({
+					url: '/pages/album/components/videoplayer?url=' + item.url
+				})
+			},
 			clickTab(item) {
 				this.cardListIndex = item.id
 			},
 			tabsClick(e) {
-				this.$nextTick(() => {
-					
-					this.current = e.index
-					if(this.current==1){
-						this.activeStyle.color = "#333333"
-						this.inactiveStyle.color = "#666666"
-						this.$refs.ideoSlideRrf.nowStopVideo()
-					}
-					if(this.current==0){
-						this.activeStyle.color = "#fff"
-						this.inactiveStyle.color = "#ccc"
-						this.$refs.ideoSlideRrf.nowPlayVideo()
-					}
-				})
+				console.log('12312312312');
 
+				this.current = e.index
+				this.activeStyle.color = "#333333"
+				this.inactiveStyle.color = "#666666"
 			},
 			swiperChange(e) {
 				this.$nextTick(() => {
 					this.current = e.detail.current
-					if(this.current==1){
+					if (this.current == 1) {
 						this.activeStyle.color = "#333333"
 						this.inactiveStyle.color = "#666666"
-						this.$refs.ideoSlideRrf.nowStopVideo()
 					}
-					if(this.current==0){
-						this.activeStyle.color = "#fff"
-						this.inactiveStyle.color = "#ccc"
-						this.$refs.ideoSlideRrf.nowPlayVideo()
+					if (this.current == 0) {
+						this.activeStyle.color = "#333333"
+						this.inactiveStyle.color = "#666666"
 					}
 				})
 
@@ -208,12 +253,17 @@
 					type: 1
 				}).then(res => {
 					if (res.code == 200) {
-						this.imagObj = res.data.list[1]
-						let all = []
-						for (let key in res.data.list[1]) {
-							all = [...all, ...res.data.list[1][key]]
+						if (res.data.list.length != 0) {
+							this.imagObj = res.data.list[1]
+							let all = []
+							for (let key in res.data.list[1]) {
+								all = [...all, ...res.data.list[1][key]]
+							}
+							this.imagObj[0] = all
+						} else {
+							this.imagObj[0] = []
 						}
-						this.imagObj[0] = all
+
 					}
 				})
 			},
@@ -224,8 +274,17 @@
 					type: 2
 				}).then(res => {
 					if (res.code == 200) {
-						for (let key in res.data.list[2]) {
-							this.videoList = [...this.videoList, ...res.data.list[2][key]]
+						if (res.data.list.length != 0) {
+							console.log(res.data, 'res.data');
+							for (let key in res.data.list[2]) {
+								this.videoList = [...this.videoList, ...res.data.list[2][key]]
+								this.videoList.forEach((item) => {
+									item.img = item.url +
+										'?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto'
+								})
+							}
+						} else {
+							this.videoList = []
 						}
 					}
 				})
@@ -249,7 +308,7 @@
 			z-index: 9999;
 			background: #f5f5f5;
 			padding: 0 24rpx;
-			
+
 			.left-area {
 				display: flex;
 				align-items: center;
@@ -266,10 +325,12 @@
 				}
 			}
 		}
-		.videoTop{
+
+		.videoTop {
 			background: transparent;
-			::v-deep .uv-tabs__wrapper__nav__line{
-				background: #fff!important;
+
+			::v-deep .uv-tabs__wrapper__nav__line {
+				background: #fff !important;
 			}
 		}
 
@@ -296,7 +357,7 @@
 				.container-tab-text {
 					font-weight: 400;
 					font-size: 28rpx;
-					color: #E8101E;
+					color: #FF4767;
 					line-height: 40rpx;
 					text-align: left;
 					font-style: normal;
@@ -306,6 +367,7 @@
 
 		.container-content {
 			z-index: 1000;
+
 			.swiper {
 				background: #fff;
 
@@ -349,6 +411,47 @@
 					}
 				}
 
+				.swiper-items3 {
+					flex-wrap: wrap;
+					flex-direction: row;
+					display: flex;
+					padding-bottom: 20rpx;
+
+					.swiper-item3 {
+						width: 370rpx;
+						height: 370rpx;
+						margin-top: 10rpx;
+						overflow: hidden;
+						position: relative;
+						box-sizing: border-box;
+						border-radius: 20rpx;
+
+						.swiper-item3-video {
+							width: 370rpx;
+							height: 370rpx;
+						}
+
+						.swiper-item3-title {
+							position: absolute;
+							left: 0;
+							top: 0;
+							height: 33rpx;
+							padding: 0 8rpx;
+							background: rgba(0, 0, 0, 0.5);
+							border-radius: 0rpx 0rpx 10rpx 0rpx;
+							width: fit-content;
+
+							.swiper-item3-title-text {
+								font-weight: 400;
+								font-size: 18rpx;
+								color: #FFFFFF;
+								line-height: 33rpx;
+
+							}
+						}
+					}
+				}
+
 				.item2Left {
 					margin-right: 9rpx;
 				}
@@ -398,6 +501,4 @@
 		align-items: flex-end;
 		justify-content: space-between;
 	}
-	
-	
 </style>
\ No newline at end of file
diff --git a/pages/artisan/add-service.vue b/pages/artisan/add-service.vue
index bbba759..1d8dc24 100644
--- a/pages/artisan/add-service.vue
+++ b/pages/artisan/add-service.vue
@@ -86,7 +86,7 @@
               ? "门店下单购买后，您需到上门至门店进行服务，门店端展示价格为"
               : ""
           }}
-          <text style="color: #e8101e" v-if="showShopPrice">{{
+          <text style="color: #FF4767" v-if="showShopPrice">{{
             shopPrice
           }}</text>
           {{ showShopPrice ? "元。" : "" }}
@@ -364,19 +364,6 @@
       >
     </view>
 
-    <!-- 新增上门提醒弹窗-->
-    <transition name="fade">
-      <view class="popup-mask2" v-if="showReminderPopup" @click="closeReminderPopup(false)">
-        <view class="popup-content2" @click.stop>
-          <view class="popup-title">提示</view>
-          <view class="popup-message">此服务是需要上门服务的哦～</view>
-          <view class="popup-buttons">
-            <view class="popup-btn popup-btn-notshow" @click="closeReminderPopup(true)">不再提示</view>
-            <view class="popup-btn popup-btn-know" @click="closeReminderPopup(false)">我已知晓</view>
-          </view>
-        </view>
-      </view>
-    </transition>
 
   </view>
 </template>
@@ -402,7 +389,6 @@ export default {
   },
   data() {
     return {
-      showReminderPopup: false,
       artisanType: getApp().globalData.artisanType,
       nowQer: "xc",
       progress: 0,
@@ -474,11 +460,6 @@ export default {
         this.serviceTypes = this.serviceTypes.concat(res.data);
       });
     }
-    // 判断是否显示上门提醒弹窗
-    const notShow = uni.getStorageSync('addServiceReminderNotShow');
-    if (!notShow) {
-      this.showReminderPopup = true;
-    }
     this.getUserInfo();
   },
   computed: {
@@ -575,14 +556,6 @@ export default {
       return true;
     },
 
-
-    closeReminderPopup(notShowAgain) {
-      console.log('关闭弹窗，不再提示：', notShowAgain);
-      if (notShowAgain) {
-        uni.setStorageSync('addServiceReminderNotShow', true);
-      }
-      this.showReminderPopup = false;
-    },
     goImgAndText() {
       uni.navigateTo({
         url: `/pages/shop/add-img-text?list=${this.formData.graphic_details}`,
@@ -1234,13 +1207,13 @@ export default {
 
 .btn-draft {
   background-color: #ffffff;
-  color: #e8101e;
-  border: 2rpx solid #e8101e;
+  color: #FF4767;
+  border: 2rpx solid #FF4767;
   box-sizing: border-box;
 }
 
 .btn-submit {
-  background-color: #e8101e;
+  background-color: #FF4767;
   color: #ffffff;
 }
 
@@ -1512,13 +1485,13 @@ export default {
 }
 
 .popup-btn-know {
-  background-color: #e8101e;
+  background-color: #FF4767;
   color: #ffffff;
 }
 
 .popup-btn-notshow {
   background-color: #ffffff;
-  color: #e8101e;
-  border: 1rpx #e8101e solid;
+  color: #FF4767;
+  border: 1rpx #FF4767 solid;
 }
 </style>
diff --git a/pages/artisan/belong_shop.vue b/pages/artisan/belong_shop.vue
index 9abb429..e38624d 100644
--- a/pages/artisan/belong_shop.vue
+++ b/pages/artisan/belong_shop.vue
@@ -1204,7 +1204,7 @@ export default {
 }
 
 .change-info-btn, .view-change-btn, .resubmit-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -1225,7 +1225,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
@@ -1257,7 +1257,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 7rpx;
   border-radius: 5rpx;
 }
@@ -1405,7 +1405,7 @@ export default {
   width: 60rpx;
   height: 60rpx;
   border: 4rpx solid #fff;
-  border-top: 4rpx solid #E8101E;
+  border-top: 4rpx solid #FF4767;
   border-radius: 50%;
   animation: spin 1s linear infinite;
   margin-bottom: 16rpx;
@@ -1470,8 +1470,8 @@ export default {
 }
 
 .radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .radio-icon-image {
@@ -1640,7 +1640,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .popup-btn .btn-text {
@@ -1659,7 +1659,7 @@ export default {
 }
 
 .confirm-text {
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -1771,13 +1771,13 @@ export default {
 }
 
 .tip-btn.cancel {
-  border: #E8101E 2rpx solid;
+  border: #FF4767 2rpx solid;
   background-color: transparent;
-  color: #e8101e;
+  color: #FF4767;
 }
 
 .tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   color: #FFFFFF;
 }
 
diff --git a/pages/artisan/index.vue b/pages/artisan/index.vue
index 7d3d163..3aac651 100644
--- a/pages/artisan/index.vue
+++ b/pages/artisan/index.vue
@@ -165,7 +165,7 @@ export default {
       timeRange: '7days',
 	  count: 0,
       chartOpts: {
-        color: ["#E8101E"],
+        color: ["#FF4767"],
         padding: [15, 15, 0, 15],
         enableScroll: false,
         legend: false,
@@ -657,7 +657,7 @@ page {
 }
 
 .time-filter .active {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .chart-container {
@@ -676,7 +676,7 @@ page {
 	width: 214rpx;
 	height: 56rpx;
 	background-color: #FFFFFF;
-	border: 1rpx solid #E8101E;
+	border: 1rpx solid #FF4767;
 	border-radius: 8rpx;
 	display: flex;
 	justify-content: center;
@@ -687,7 +687,7 @@ page {
 
 .type-name {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .type-count {
@@ -708,7 +708,7 @@ page {
   background-color: #F53F3F;
 }
 .order-type-item.active {
-	background-color: #E8101E;
+	background-color: #FF4767;
 }
 .order-type-item.active .type-name {
   color: #FFFFFF;
@@ -800,7 +800,7 @@ page {
 }
 .action-btn.verify .action-text {
   font-size: 28rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .nothings-box {
diff --git a/pages/artisan/my.vue b/pages/artisan/my.vue
index fdf0dce..02a83a9 100644
--- a/pages/artisan/my.vue
+++ b/pages/artisan/my.vue
@@ -249,7 +249,7 @@ page {
   flex-flow: row nowrap;
   justify-content: center;
   align-items: center;
-  border: 1rpx solid #E8101E;
+  border: 1rpx solid #FF4767;
   background-color: #FFF1F1;
   border-radius: 22rpx;
   box-sizing: border-box;
@@ -267,7 +267,7 @@ page {
 }
 .verified-text {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 .verified-text.no {
   color: #666666;
diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index e73858c..46ca4a2 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -1,768 +1,990 @@
-<template>
-  <view class="profile-page">
-    <!-- 自定义顶部导航栏 -->
-    <view class="custom-navbar">
-      <!-- 左侧返回按钮和标题 -->
-      <view class="navbar-left">
-        <image class="back-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/456f4e6c-e86a-42c9-a272-484db9af6c7c" mode="aspectFit" @click="handleBack"></image>
-        <text class="navbar-title">我的资料</text>
-      </view>
-      
-      <!-- 右侧状态栏 -->
-      <view class="navbar-right">
-        <!-- <view class="nav-status-item" @click="handleShareWechat">
-          <image class="nav-status-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8a412688-b794-4407-bba6-a6dc65d75f08" mode="aspectFit"></image>
-          <text class="nav-status-text">分享到微信</text>
-        </view>
-        <view class="nav-status-item" @click="handleViewShop">
-          <image class="nav-status-icon" :src="identity == '2' ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2b5de852-2d35-4786-a643-d20cabb3eaee' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/85638da9-804e-4811-8378-d1bb6007f99d'" mode="aspectFit"></image>
-          <text class="nav-status-text">{{ identity == '2' ? '查看店铺' : '查看手艺人' }}</text>
-        </view> -->
-      </view>
-    </view>
-    
-    <!-- 内容区域 -->
-    <view class="content">
-      <!-- 基础资料部分 -->
-      <view class="section-card">
-        <view class="section-header">
-          <view class="title-bar"></view>
-          <text class="section-title">基础资料</text>
-        </view>
-        <text class="section-desc">店铺信息将影响顾客到店消费体验，请确保信息准确。</text>
-        
-        <view class="subsection">
-          <view class="subsection-content">
-            <!-- 营业时间（商家） / 服务时间（手艺人） -->
-            <view class="info-item" @click="navigateToTimeSetting">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21f1efaf-0c17-49b0-a2b2-e0fd573b92b3" mode="aspectFit"></image>
-                <text class="item-label">{{ identity == '2' ? '营业时间' : '服务时间' }}</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-            <!-- 服务技能 -->
-            <view class="info-item" @click="navigateToServiceSkill">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b90e2322-a261-4c17-a581-85010c3bc112" mode="aspectFit"></image>
-                <text class="item-label">服务技能</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-            
-            <!-- 门店信息 -->
-            <view class="info-item" v-if="identity == '2'" @click="navigateToShopInfo">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e9618006-db69-446e-92e1-ba9dd81e79f9" mode="aspectFit"></image>
-                <text class="item-label">门店信息</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-
-            <!-- 服务区域（手艺人显示） -->
-            <view class="info-item" v-if="identity == '1'" @click="navigateToServiceArea">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a35603b1-50fb-4248-9f2e-2dd4d5e249c0" mode="aspectFit"></image>
-                <text class="item-label">服务区域</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-
-            <!-- 个人信息（手艺人显示） -->
-            <view class="info-item" v-if="identity == '1'" @click="navigateToPersonalInfo">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/77dc7a16-3b86-44e5-8acc-5f3b85ffc137" mode="aspectFit"></image>
-                <text class="item-label">个人信息</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-			
-			<!-- 个人信息（手艺人显示） -->
-			<view class="info-item"  @click="navigateToimg">
-			  <view class="info-left">
-			    <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/53a9d1e1-e2d2-4001-b599-82e0c0747f1a.png" mode="aspectFit"></image>
-			    <text class="item-label">相册管理</text>
-			  </view>
-			  <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-			</view>
-			
-			<!-- 个人信息（手艺人显示） -->
-			<view class="info-item"  @click="navigateTovideo">
-			  <view class="info-left">
-			    <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6fc821cd-8dd1-41f1-8854-889fb5f76b78.png" mode="aspectFit"></image>
-			    <text class="item-label">视频管理</text>
-			  </view>
-			  <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-			</view>
-			
-          </view>
-        </view>
-      </view>
-
-      <!-- 经营资质部分 -->
-      <view class="section-card">
-        <view class="section-header">
-          <view class="title-bar"></view>
-          <text class="section-title">经营资质</text>
-        </view>
-        
-        <view class="subsection-content">
-          <!-- 资质信息 -->
-          <view class="info-item" @click="navigateToQualification">
-            <view class="info-left">
-              <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2677692c-5931-4ac7-846e-b6d321184789" mode="aspectFit"></image>
-              <text class="item-label">资质信息</text>
-            </view>
-            <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-          </view>
-          
-          <!-- 所属门店（手艺人显示） -->
-          <view class="info-item" v-if="identity == '1'" @click="navigateToBelongShop">
-            <view class="info-left">
-              <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b5541cb5-58c1-4e72-b88f-5cf6450338a8" mode="aspectFit"></image>
-              <text class="item-label">所属门店</text>
-            </view>
-            <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import { handleImgSizeUni } from '@/utils/service.js'
-import request from "../../utils/request";
-
-export default {
-  data() {
-    return {
-      identity: '',
-      currentUserId: '', // 当前用户ID
-      userInfo: {}, // 用户信息
-      sharing: false // 添加分享状态标记
-    }
-  },
-  onLoad() {
-    // 页面显示时重新加载身份信息，确保数据最新
-    this.loadIdentity()
-    console.log('当前身份:', this.identity)
-    // 加载用户信息
-    this.loadUserInfo()
-  },
-  onShow() {
-    // 页面显示时也重新加载，确保数据最新
-    this.loadIdentity()
-    this.loadUserInfo()
-  },
-  methods: {
-    // 返回按钮处理
-    handleBack() {
-      uni.navigateBack()
-    },
-    
-    // 分享到微信
-    handleShareWechat() {
-      console.log('分享到微信')
-      
-      this.handleShareProcess()
-    },
-
-    async handleShareProcess() {
-      // 如果正在分享中，防止重复点击
-      if (this.sharing) {
-        return;
-      }
-      
-      // 设置分享状态
-      this.sharing = true;
-
-      try {
-        // 显示加载提示
-        uni.showLoading({
-          title: '正在准备分享...',
-          mask: true
-        });
-
-        // 确保用户信息已加载
-        if (!this.currentUserId) {
-          await this.loadUserInfo()
-        }
-        
-        // 检查是否已加载用户信息
-        if (!this.currentUserId) {
-          uni.showToast({
-            title: '无法获取用户信息',
-            icon: 'none'
-          })
-          return
-        }
-        
-        // 根据环境处理
-        // #ifdef APP-PLUS
-        this.handleAppAutoShare()
-        // #endif
-        
-        // #ifdef MP-WEIXIN
-        this.handleMpAutoShare()
-        // #endif
-        
-        // #ifdef H5
-        this.handleH5Share()
-        // #endif
-        } catch (error) {
-        console.error('分享过程出错:', error);
-        uni.hideLoading();
-        this.sharing = false;
-        uni.showToast({
-          title: '分享失败，请重试',
-          icon: 'none'
-        });
-      }
-    },
-    
-    // H5环境分享
-    handleH5Share() {
-      // 在H5环境，通常使用浏览器的分享功能或复制链接
-      const shareUrl = window.location.href
-      uni.showModal({
-        title: '分享提示',
-        // content: `请复制链接分享给好友：${shareUrl}`,
-        content: `请在美融融Plus APP 环境下使用此功能`,
-
-        showCancel: false,
-        confirmText: '好的',
-        success: (res) => {
-          if (res.confirm) {
-            // // 复制链接到剪贴板
-            // uni.setClipboardData({
-            //   data: shareUrl,
-            //   success: () => {
-            //     uni.showToast({
-            //       title: '链接已复制',
-            //       icon: 'success'
-            //     })
-            //   }
-            // })
-          }
-        }
-      })
-    },
-    
-    // 小程序环境处理
-    handleMpAutoShare() {
-      // 小程序无法自动触发分享，跳转后提示用户手动操作
-      const url = this.identity == '2' 
-        ? `/pages/user/store-detail?id=${this.currentUserId}` 
-        : `/pages/user/syr-detail?id=${this.currentUserId}`;
-      
-      uni.navigateTo({
-        url: url,
-        success: () => {
-          setTimeout(() => {
-            uni.showToast({
-              title: '请点击右上角分享',
-              icon: 'none',
-              duration: 2000
-            });
-          }, 500);
-        }
-      });
-    },
-    
-    // APP环境自动分享
-    handleAppAutoShare() {
-      if (!this.currentUserId) {
-        uni.showToast({
-          title: '无法获取用户信息',
-          icon: 'none'
-        });
-        return;
-      }
-
-      // 清除旧的分享标记
-      uni.removeStorage({
-        key: 'share_success'
-      });
-      
-      // 跳转到店铺主页并自动触发分享
-      const url = this.identity == '2' 
-        ? `/pages/user/store-detail?id=${this.currentUserId}&autoShare=1` 
-        : `/pages/user/syr-detail?id=${this.currentUserId}&autoShare=1`;
-      
-      uni.navigateTo({
-        url: url,
-        success: () => {
-          console.log('跳转成功，将自动触发分享');
-          // 跳转成功后立即隐藏loading，避免页面闪烁
-          setTimeout(() => {
-            uni.hideLoading();
-            this.sharing = false;
-          }, 200);
-        },
-        fail: () => {
-          console.log('跳转失败:', err);
-          uni.hideLoading();
-          this.sharing = false;
-          this.showManualShareOption();
-        }
-      });
-    },
-    
-    // 执行APP分享
-    executeAppShare(imageUrl) {
-      // 备用图片地址
-      const backupImageUrl = "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/yh/1756713709528-717.png?x-oss-process=image/resize,p_40"
-      
-      // 根据身份设置不同的分享标题
-      const shareTitle = this.identity == '2' 
-        ? "好友刚推了个超赞商家！点开认识TA ~" 
-        : "好友刚推了个超赞手艺人！点开认识TA ~"
-      
-      // 生成分享配置
-      const shareConfig = {
-        provider: "weixin",
-        scene: "WXSceneSession",
-        type: 5,
-        title: shareTitle,
-        miniProgram: {
-          id: "gh_89c92e18b70b", // 小程序原始ID
-          path: this.getSharePath(), // 动态分享路径
-          type: 0, // 正式版
-          webUrl: "https://www.baidu.com/", // 降级网页地址
-        },
-        imageUrl: imageUrl,
-        success: (res) => {
-          console.log("分享成功:", JSON.stringify(res))
-          uni.showToast({
-            title: '分享成功',
-            icon: 'success'
-          })
-        },
-        fail: (err) => {
-          console.log("分享失败:", JSON.stringify(err))
-          // 尝试使用备用图片
-          if (imageUrl !== backupImageUrl) {
-            console.log("尝试使用备用图片分享...")
-            this.executeAppShare(backupImageUrl)
-          } else {
-            uni.showToast({
-              title: '分享失败',
-              icon: 'none'
-            })
-          }
-        }
-      }
-
-      // 检查是否支持分享API
-      if (uni.share) {
-        uni.share(shareConfig)
-      } else {
-        uni.showToast({
-          title: '当前环境不支持分享',
-          icon: 'none'
-        })
-      }
-    },
-    
-    // 获取分享路径
-    getSharePath() {
-      // 根据身份生成不同的分享路径
-      if (this.identity == '2') {
-        // 商家分享店铺详情页
-        return `/pages/user/store-detail?id=${this.currentUserId || ''}`
-      } else {
-        // 手艺人分享个人主页
-        return `/pages/user/syr-detail?id=${this.currentUserId || ''}`
-      }
-    },
-    
-    // 查看店铺
-    async handleViewShop() {
-      console.log('查看店铺')
-      
-      // 确保用户信息已加载
-      if (!this.currentUserId) {
-        await this.loadUserInfo()
-      }
-      
-      // 如果仍然没有用户ID，提示用户手动输入或联系客服
-      if (!this.currentUserId) {
-        uni.showModal({
-          title: '提示',
-          content: '无法获取用户信息，请联系客服或稍后重试',
-          showCancel: false,
-          confirmText: '确定'
-        })
-        return
-      }
-      
-      // 根据身份跳转到不同的页面
-      if (this.identity == '2') {
-        // 商家跳转到店铺主页
-        uni.navigateTo({
-          url: '/pages/user/store-detail?id=' + this.currentUserId
-        })
-      } else {
-        // 手艺人跳转到个人主页
-        uni.navigateTo({
-          url: '/pages/user/syr-detail?id=' + this.currentUserId
-        })
-      }
-    },
-    
-    // 加载用户信息 - 主要使用接口获取
-    async loadUserInfo() {
-      try {
-        // 根据身份设置type参数（参考个人中心页面的逻辑）
-        let type = 1 // 默认值
-        if (this.identity == '1') {
-          type = 2 // 手艺人
-        } else if (this.identity == '2') {
-          type = 3 // 商家
-        }
-        
-        console.log('调用接口获取用户信息，type:', type)
-        
-        // 调用接口获取用户信息
-        const result = await request.post('/user/getuser', { type })
-        
-        if (result.data && result.data.id) {
-          this.userInfo = result.data
-          this.currentUserId = result.data.id
-          
-          // 存储到本地，避免重复调用
-          uni.setStorageSync('userInfo', result.data)
-          console.log('从接口获取用户信息成功:', this.userInfo)
-        } else {
-          console.log('接口返回数据异常:', result)
-        }
-      } catch (error) {
-        console.log('获取用户信息失败:', error)
-        
-        // 降级方案：尝试从其他可能的位置获取用户ID
-        this.tryAlternativeUserInfo()
-      }
-    },
-    
-    // 备用方案：从其他位置获取用户信息
-    tryAlternativeUserInfo() {
-      try {
-        const app = getApp()
-        
-        // 方法1: 从全局数据获取用户ID
-        if (app.globalData.userInfo && app.globalData.userInfo.id) {
-          this.currentUserId = app.globalData.userInfo.id
-          this.userInfo = app.globalData.userInfo
-          console.log('从全局数据获取用户ID:', this.currentUserId)
-          return
-        }
-        
-        // 方法2: 从本地存储获取完整的用户信息
-        const userInfo = uni.getStorageSync('userInfo')
-        if (userInfo && userInfo.id) {
-          this.currentUserId = userInfo.id
-          this.userInfo = userInfo
-          console.log('从存储获取用户ID:', this.currentUserId)
-          return
-        }
-        
-        // 方法3: 直接获取用户ID
-        const userId = uni.getStorageSync('userId')
-        if (userId) {
-          this.currentUserId = userId
-          console.log('从存储获取用户ID:', userId)
-          return
-        }
-        
-        console.log('所有获取用户信息的方法都失败了')
-      } catch (e) {
-        console.log('备用方案获取用户信息失败:', e)
-      }
-    },
-
-    loadIdentity() {
-      // 从全局数据获取身份
-      const app = getApp()
-      const globalIdentity = app.globalData.artisanType
-      console.log('从全局数据获取身份:', globalIdentity)
-      
-      if (globalIdentity) {
-        this.identity = globalIdentity
-        uni.setStorageSync('user_identity', globalIdentity)
-      } else {
-        // 如果全局数据没有，尝试从本地存储获取
-        const localIdentity = uni.getStorageSync('user_identity')
-        if (localIdentity) {
-          this.identity = localIdentity
-          console.log('从本地存储获取身份:', localIdentity)
-        } else {
-          console.log('未获取到身份信息')
-          // 默认设为手艺人
-          this.identity = '1'
-        }
-      }
-      
-      console.log('当前身份:', this.identity)
-    },
-    
-    navigateToTimeSetting() {
-      if (this.identity == '2') {
-        // 商家跳转到营业时间页面
-        uni.navigateTo({
-          url: '/pages/shop/business-time'
-        })
-      } else {
-        // 手艺人跳转到服务时间页面
-        uni.navigateTo({
-          url: '/pages/artisan/service-time'
-        })
-      }
-    },
-    
-    navigateToServiceSkill() {
-      if (this.identity == '2') {
-        // 商家跳转到商家服务技能页面
-        uni.navigateTo({
-          url: '/pages/shop/service-skills'
-        })
-      } else {
-        // 手艺人跳转到手艺人服务技能页面
-        uni.navigateTo({
-          url: '/pages/artisan/service-skills'
-        })
-      }
-    },
-    
-    navigateToShopInfo() {  // 商家：门店信息 
-      uni.navigateTo({
-        url: '/pages/shop/sj-info-change'
-      })
-    },
-    
-    navigateToServiceArea() {  // 手艺人：服务区域
-      uni.navigateTo({
-        url: '/pages/artisan/service-area'
-      })
-    },
-    
-    navigateToPersonalInfo() {  // 手艺人：个人信息
-      uni.navigateTo({
-        url: '/pages/artisan/syr-info-change'
-      })
-    },
-	
-	navigateToimg() {  // 图片管理
-	  uni.navigateTo({
-	    url: '/pages/shop/photoAlbum/photoManage?type=1'
-	  })
+<template>
+	<view class="profile-page">
+		<!-- 自定义顶部导航栏 -->
+		<view class="custom-navbar">
+			<!-- 左侧返回按钮和标题 -->
+			<view class="navbar-left">
+				<image class="back-icon"
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/456f4e6c-e86a-42c9-a272-484db9af6c7c"
+					mode="aspectFit" @click="handleBack"></image>
+				<text class="navbar-title">我的资料</text>
+			</view>
+
+			<!-- 右侧状态栏 -->
+			<view class="navbar-right">
+				<!-- <view class="nav-status-item" @click="handleShareWechat">
+          <image class="nav-status-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8a412688-b794-4407-bba6-a6dc65d75f08" mode="aspectFit"></image>
+          <text class="nav-status-text">分享到微信</text>
+        </view>
+        <view class="nav-status-item" @click="handleViewShop">
+          <image class="nav-status-icon" :src="identity == '2' ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2b5de852-2d35-4786-a643-d20cabb3eaee' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/85638da9-804e-4811-8378-d1bb6007f99d'" mode="aspectFit"></image>
+          <text class="nav-status-text">{{ identity == '2' ? '查看店铺' : '查看手艺人' }}</text>
+        </view> -->
+			</view>
+		</view>
+
+		<!-- 内容区域 -->
+		<view class="content">
+			<!-- 基础资料部分 -->
+			<view class="section-card">
+				<view class="section-header">
+					<view class="title-bar"></view>
+					<text class="section-title">基础资料</text>
+				</view>
+				<text class="section-desc">店铺信息将影响顾客到店消费体验，请确保信息准确。</text>
+
+				<view class="subsection">
+					<view class="subsection-content">
+						<!-- 营业时间（商家） / 服务时间（手艺人） -->
+						<view class="info-item" @click="navigateToTimeSetting">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21f1efaf-0c17-49b0-a2b2-e0fd573b92b3"
+									mode="aspectFit"></image>
+								<text class="item-label">{{ identity == '2' ? '营业时间' : '服务时间' }}</text>
+							</view>
+							<view>
+								<image
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+									mode="widthFix"
+									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
+									v-if="!userInfo.business_time">
+								</image>
+								<text style="margin-right: 16rpx;"
+									:style="{ color: userInfo.business_time ? '#c9c9c9' : '#ec5d57' }">
+									{{ userInfo.business_time ? '已设置' : '待完善' }}
+								</text>
+								<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
+								</image>
+							</view>
+						</view>
+						<view class="info-item" @click="navigateToServiceSkill">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b90e2322-a261-4c17-a581-85010c3bc112"
+									mode="aspectFit"></image>
+								<text class="item-label">服务技能</text>
+							</view>
+							<view>
+								<image
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+									mode="widthFix"
+									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
+									v-if="shouldShowServiceSkillWarningIcon()">
+								</image>
+								<text style="margin-right: 16rpx;"
+									:style="{ color: serviceSkillStatusColor() }">
+									{{ serviceSkillStatusText() }}
+								</text>
+								<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
+								</image>
+							</view>
+						</view>
+
+						<!-- 门店信息 -->
+						<view class="info-item" v-if="identity == '2'" @click="navigateToShopInfo">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e9618006-db69-446e-92e1-ba9dd81e79f9"
+									mode="aspectFit"></image>
+								<text class="item-label">门店信息</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 服务区域（手艺人显示） -->
+						<view class="info-item" v-if="identity == '1'" @click="navigateToServiceArea">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a35603b1-50fb-4248-9f2e-2dd4d5e249c0"
+									mode="aspectFit"></image>
+								<text class="item-label">服务区域</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 个人信息（手艺人显示） -->
+						<view class="info-item" v-if="identity == '1'" @click="navigateToPersonalInfo">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/77dc7a16-3b86-44e5-8acc-5f3b85ffc137"
+									mode="aspectFit"></image>
+								<text class="item-label">个人信息</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 个人信息（手艺人显示） -->
+						<view class="info-item" @click="navigateToimg">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/53a9d1e1-e2d2-4001-b599-82e0c0747f1a.png"
+									mode="aspectFit"></image>
+								<text class="item-label">相册管理</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 个人信息（手艺人显示） -->
+						<view class="info-item" @click="navigateTovideo">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6fc821cd-8dd1-41f1-8854-889fb5f76b78.png"
+									mode="aspectFit"></image>
+								<text class="item-label">视频管理</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+					</view>
+				</view>
+			</view>
+
+			<!-- 经营资质部分 -->
+			<view class="section-card">
+				<view class="section-header">
+					<view class="title-bar"></view>
+					<text class="section-title">经营资质</text>
+				</view>
+
+				<view class="subsection-content">
+					<!-- 资质信息 -->
+					<view class="info-item" @click="navigateToQualification">
+						<view class="info-left">
+							<image class="item-icon"
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2677692c-5931-4ac7-846e-b6d321184789"
+								mode="aspectFit"></image>
+							<text class="item-label">资质信息</text>
+						</view>
+						<view>
+							<image
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+								mode="widthFix"
+								style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
+								v-if="shouldShowQualificationWarningIcon()">
+							</image>
+							<text style="margin-right: 16rpx;"
+								:style="{ color: qualificationStatusColor() }">
+								{{ qualificationStatusText() }}
+							</text>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
+							</image>
+						</view>
+					</view>
+
+					<!-- 所属门店（手艺人显示） -->
+					<view class="info-item" v-if="identity == '1'" @click="navigateToBelongShop">
+						<view class="info-left">
+							<image class="item-icon"
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b5541cb5-58c1-4e72-b88f-5cf6450338a8"
+								mode="aspectFit"></image>
+							<text class="item-label">所属门店</text>
+						</view>
+						<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import {
+	handleImgSizeUni
+} from '@/utils/service.js'
+import request from "../../utils/request";
+
+export default {
+	data() {
+		return {
+			identity: '',
+			currentUserId: '', // 当前用户ID
+			userInfo: {}, // 用户信息
+			authDetails: null,
+			serviceSkillAuditStatus: null,
+			isServiceSkillAuditLoaded: false,
+			qualificationAuditStatus: null,
+			isQualificationAuditLoaded: false,
+			sharing: false // 添加分享状态标记
+		}
 	},
-	
-	navigateTovideo() {  // 视频管理
-	  uni.navigateTo({
-	     url: '/pages/shop/photoAlbum/photoManage?type=2'
-	  })
-	},
-    
-    navigateToQualification() {  // 商家手艺人：资质信息
-      if (this.identity == '2') {
-        // 商家跳转到资质信息页面
-        uni.navigateTo({
-          url: '/pages/shop/qualification_sj_change'
-        })
-      } else {
-        // 手艺人跳转到资质信息页面
-        uni.navigateTo({
-          url: '/pages/artisan/qualification_syr_change'
-        })
-      }
-    },
-    
-    navigateToBelongShop() {  // 手艺人：所属门店
-      uni.navigateTo({
-        url: '/pages/artisan/belong_shop'
-      })
-    }
-  }
-}
-</script>
+	onLoad() {
+		// 页面显示时重新加载身份信息，确保数据最新
+		this.loadIdentity()
+		console.log('当前身份:', this.identity)
+		// 加载用户信息
+		this.loadUserInfo()
+	},
+	onShow() {
+		// 页面显示时也重新加载，确保数据最新
+		this.loadIdentity()
+		this.loadUserInfo()
+	},
+	methods: {
+		// 返回按钮处理
+		handleBack() {
+			uni.navigateBack()
+		},
+
+		// 分享到微信
+		handleShareWechat() {
+			console.log('分享到微信')
+
+			this.handleShareProcess()
+		},
+
+		async handleShareProcess() {
+			// 如果正在分享中，防止重复点击
+			if (this.sharing) {
+				return;
+			}
+
+			// 设置分享状态
+			this.sharing = true;
+
+			try {
+				// 显示加载提示
+				uni.showLoading({
+					title: '正在准备分享...',
+					mask: true
+				});
+
+				// 确保用户信息已加载
+				if (!this.currentUserId) {
+					await this.loadUserInfo()
+				}
+
+				// 检查是否已加载用户信息
+				if (!this.currentUserId) {
+					uni.showToast({
+						title: '无法获取用户信息',
+						icon: 'none'
+					})
+					return
+				}
+
+				// 根据环境处理
+				// #ifdef APP-PLUS
+				this.handleAppAutoShare()
+				// #endif
+
+				// #ifdef MP-WEIXIN
+				this.handleMpAutoShare()
+				// #endif
+
+				// #ifdef H5
+				this.handleH5Share()
+				// #endif
+			} catch (error) {
+				console.error('分享过程出错:', error);
+				uni.hideLoading();
+				this.sharing = false;
+				uni.showToast({
+					title: '分享失败，请重试',
+					icon: 'none'
+				});
+			}
+		},
+
+		// H5环境分享
+		handleH5Share() {
+			// 在H5环境，通常使用浏览器的分享功能或复制链接
+			const shareUrl = window.location.href
+			uni.showModal({
+				title: '分享提示',
+				// content: `请复制链接分享给好友：${shareUrl}`,
+				content: `请在美融融Plus APP 环境下使用此功能`,
+
+				showCancel: false,
+				confirmText: '好的',
+				success: (res) => {
+					if (res.confirm) {
+						// // 复制链接到剪贴板
+						// uni.setClipboardData({
+						//   data: shareUrl,
+						//   success: () => {
+						//     uni.showToast({
+						//       title: '链接已复制',
+						//       icon: 'success'
+						//     })
+						//   }
+						// })
+					}
+				}
+			})
+		},
+
+		// 小程序环境处理
+		handleMpAutoShare() {
+			// 小程序无法自动触发分享，跳转后提示用户手动操作
+			const url = this.identity == '2' ?
+				`/pages/user/store-detail?id=${this.currentUserId}` :
+				`/pages/user/syr-detail?id=${this.currentUserId}`;
+
+			uni.navigateTo({
+				url: url,
+				success: () => {
+					setTimeout(() => {
+						uni.showToast({
+							title: '请点击右上角分享',
+							icon: 'none',
+							duration: 2000
+						});
+					}, 500);
+				}
+			});
+		},
+
+		// APP环境自动分享
+		handleAppAutoShare() {
+			if (!this.currentUserId) {
+				uni.showToast({
+					title: '无法获取用户信息',
+					icon: 'none'
+				});
+				return;
+			}
+
+			// 清除旧的分享标记
+			uni.removeStorage({
+				key: 'share_success'
+			});
+
+			// 跳转到店铺主页并自动触发分享
+			const url = this.identity == '2' ?
+				`/pages/user/store-detail?id=${this.currentUserId}&autoShare=1` :
+				`/pages/user/syr-detail?id=${this.currentUserId}&autoShare=1`;
+
+			uni.navigateTo({
+				url: url,
+				success: () => {
+					console.log('跳转成功，将自动触发分享');
+					// 跳转成功后立即隐藏loading，避免页面闪烁
+					setTimeout(() => {
+						uni.hideLoading();
+						this.sharing = false;
+					}, 200);
+				},
+				fail: () => {
+					console.log('跳转失败:', err);
+					uni.hideLoading();
+					this.sharing = false;
+					this.showManualShareOption();
+				}
+			});
+		},
+
+		// 执行APP分享
+		executeAppShare(imageUrl) {
+			// 备用图片地址
+			const backupImageUrl =
+				"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/yh/1756713709528-717.png?x-oss-process=image/resize,p_40"
+
+			// 根据身份设置不同的分享标题
+			const shareTitle = this.identity == '2' ?
+				"好友刚推了个超赞商家！点开认识TA ~" :
+				"好友刚推了个超赞手艺人！点开认识TA ~"
+
+			// 生成分享配置
+			const shareConfig = {
+				provider: "weixin",
+				scene: "WXSceneSession",
+				type: 5,
+				title: shareTitle,
+				miniProgram: {
+					id: "gh_89c92e18b70b", // 小程序原始ID
+					path: this.getSharePath(), // 动态分享路径
+					type: 0, // 正式版
+					webUrl: "https://www.baidu.com/", // 降级网页地址
+				},
+				imageUrl: imageUrl,
+				success: (res) => {
+					console.log("分享成功:", JSON.stringify(res))
+					uni.showToast({
+						title: '分享成功',
+						icon: 'success'
+					})
+				},
+				fail: (err) => {
+					console.log("分享失败:", JSON.stringify(err))
+					// 尝试使用备用图片
+					if (imageUrl !== backupImageUrl) {
+						console.log("尝试使用备用图片分享...")
+						this.executeAppShare(backupImageUrl)
+					} else {
+						uni.showToast({
+							title: '分享失败',
+							icon: 'none'
+						})
+					}
+				}
+			}
+
+			// 检查是否支持分享API
+			if (uni.share) {
+				uni.share(shareConfig)
+			} else {
+				uni.showToast({
+					title: '当前环境不支持分享',
+					icon: 'none'
+				})
+			}
+		},
+
+		// 获取分享路径
+		getSharePath() {
+			// 根据身份生成不同的分享路径
+			if (this.identity == '2') {
+				// 商家分享店铺详情页
+				return `/pages/user/store-detail?id=${this.currentUserId || ''}`
+			} else {
+				// 手艺人分享个人主页
+				return `/pages/user/syr-detail?id=${this.currentUserId || ''}`
+			}
+		},
+
+		// 查看店铺
+		async handleViewShop() {
+			console.log('查看店铺')
+
+			// 确保用户信息已加载
+			if (!this.currentUserId) {
+				await this.loadUserInfo()
+			}
+
+			// 如果仍然没有用户ID，提示用户手动输入或联系客服
+			if (!this.currentUserId) {
+				uni.showModal({
+					title: '提示',
+					content: '无法获取用户信息，请联系客服或稍后重试',
+					showCancel: false,
+					confirmText: '确定'
+				})
+				return
+			}
+
+			// 根据身份跳转到不同的页面
+			if (this.identity == '2') {
+				// 商家跳转到店铺主页
+				uni.navigateTo({
+					url: '/pages/user/store-detail?id=' + this.currentUserId
+				})
+			} else {
+				// 手艺人跳转到个人主页
+				uni.navigateTo({
+					url: '/pages/user/syr-detail?id=' + this.currentUserId
+				})
+			}
+		},
+
+		// 加载用户信息 - 主要使用接口获取
+		async loadUserInfo() {
+			try {
+				// 根据身份设置type参数（参考个人中心页面的逻辑）
+				let type = 1 // 默认值
+				if (this.identity == '1') {
+					type = 2 // 手艺人
+				} else if (this.identity == '2') {
+					type = 3 // 商家
+				}
+
+				console.log('调用接口获取用户信息，type:', type)
+
+				// 调用接口获取用户信息
+				const result = await request.post('/sj/user/getUser', {
+					type
+				})
+
+				if (result.data && result.data.id) {
+					this.userInfo = result.data
+					this.currentUserId = result.data.id
+					this.fetchServiceSkillApplyDetails()
+					this.fetchQualificationApplyDetails()
+					if (this.isSettled()) {
+						this.fetchAuthDetails()
+					} else {
+						this.authDetails = null
+					}
 
-<style>
-.profile-page {
-  min-height: 100vh;
-  background-color: #f5f5f5;
-}
+					// 存储到本地，避免重复调用
+					uni.setStorageSync('userInfo', result.data)
+					console.log('从接口获取用户信息成功:', this.userInfo)
+				} else {
+					console.log('接口返回数据异常:', result)
+				}
+			} catch (error) {
+				console.log('获取用户信息失败:', error)
+
+				// 降级方案：尝试从其他可能的位置获取用户ID
+				this.tryAlternativeUserInfo()
+				uni.hideLoading();
+			}
+		},
+
+		// 备用方案：从其他位置获取用户信息
+		tryAlternativeUserInfo() {
+			try {
+				const app = getApp()
+
+				// 方法1: 从全局数据获取用户ID
+				if (app.globalData.userInfo && app.globalData.userInfo.id) {
+					this.currentUserId = app.globalData.userInfo.id
+					this.userInfo = app.globalData.userInfo
+					console.log('从全局数据获取用户ID:', this.currentUserId)
+					return
+				}
+
+				// 方法2: 从本地存储获取完整的用户信息
+				const userInfo = uni.getStorageSync('userInfo')
+				if (userInfo && userInfo.id) {
+					this.currentUserId = userInfo.id
+					this.userInfo = userInfo
+					console.log('从存储获取用户ID:', this.currentUserId)
+					return
+				}
+
+				// 方法3: 直接获取用户ID
+				const userId = uni.getStorageSync('userId')
+				if (userId) {
+					this.currentUserId = userId
+					console.log('从存储获取用户ID:', userId)
+					return
+				}
+
+				console.log('所有获取用户信息的方法都失败了')
+			} catch (e) {
+				console.log('备用方案获取用户信息失败:', e)
+			}
+		},
 
-/* 自定义导航栏样式 */
-.custom-navbar {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 108rpx; /* 使用标准导航栏高度 */
-  background: white;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 32rpx;
-  z-index: 999;
-  box-sizing: border-box;
-  /* 适配不同机型的顶部安全区域 */
-  padding-top: var(--status-bar-height);
-  height: calc(128rpx + var(--status-bar-height));
-}
+		fetchAuthDetails() {
+			return request.post("/sj/userSjAuth/details", {
+				type: 1,
+				id_type: '1'
+			}).then(res => {
+				if (res.code == 200 && res.data) {
+					this.authDetails = res.data;
+				}
+				return res;
+			});
+		},
 
-/* 导航栏左侧 */
-.navbar-left {
-  display: flex;
-  align-items: center;
-}
+		fetchServiceSkillApplyDetails() {
+			this.isServiceSkillAuditLoaded = false;
+			return request.post('/sj/userSjAuth/details', {
+				apply_type: 2
+			}).then(res => {
+				if ((res.code == 200 || res.state == 1) && res.data) {
+					const status = Number(res.data.apply_state);
+					this.serviceSkillAuditStatus = Number.isNaN(status) ? null : status;
+				} else {
+					this.serviceSkillAuditStatus = null;
+				}
+				this.isServiceSkillAuditLoaded = true;
+				return res;
+			}).catch(error => {
+				console.log('获取服务技能申请详情失败:', error);
+				this.serviceSkillAuditStatus = null;
+				this.isServiceSkillAuditLoaded = true;
+			});
+		},
 
-.back-icon {
-  width: 16rpx;
-  height: 32rpx;
-  margin-right: 23rpx;
-}
+		fetchQualificationApplyDetails() {
+			this.isQualificationAuditLoaded = false;
+			return request.post('/sj/userSjAuth/details', {
+				apply_type: 4
+			}).then(res => {
+				if ((res.code == 200 || res.state == 1) && res.data) {
+					const statusCheck = this.getQualificationApplyStatus(res.data);
+					this.qualificationAuditStatus = statusCheck.isValid ? statusCheck.status : null;
+				} else {
+					this.qualificationAuditStatus = null;
+				}
+				this.isQualificationAuditLoaded = true;
+				return res;
+			}).catch(error => {
+				console.log('获取资质信息申请详情失败:', error);
+				this.qualificationAuditStatus = null;
+				this.isQualificationAuditLoaded = true;
+			});
+		},
 
-.navbar-title {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 500;
-	font-size: 32rpx;
-	color: #333333;
-	line-height: 45rpx;
-	text-align: left;
-	font-style: normal;
-}
+		isSettled() {
+			return typeof this.userInfo.id_type !== 'undefined' && this.userInfo.id_type !== 0;
+		},
 
-/* 导航栏右侧状态栏 */
-.navbar-right {
-  display: flex;
-  align-items: center;
-}
+		isCertified() {
+			return typeof this.userInfo.id_type !== 'undefined' && this.userInfo.id_type > 0;
+		},
 
-.nav-status-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-left: 11rpx;
-  padding: 16rpx;
-}
+		isUnderReview() {
+			return this.authDetails && Object.keys(this.authDetails).length > 0;
+		},
 
-.nav-status-icon {
-  width: 44rpx;
-  height: 44rpx;
-  margin-bottom: 7rpx;
-}
+		async ensureAuthDetails() {
+			if (this.identity != '2' || !this.isSettled() || this.isUnderReview()) {
+				return;
+			}
+			await this.fetchAuthDetails();
+		},
+		getQualificationApplyStatus(detail) {
+			const status = Number(detail.apply_state);
+			if (Number.isNaN(status)) {
+				return {
+					isValid: false,
+					status: null
+				};
+			}
 
-.nav-status-text {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 400;
-	font-size: 20rpx;
-	color: #333333;
-	line-height: 28rpx;
-	text-align: left;
-	font-style: normal;
-}
+			if (status === 2) {
+				return {
+					isValid: true,
+					status
+				};
+			}
 
-.content {
-  padding: 20rpx;
-  /* 动态计算内容区域的上边距 */
-  padding-top: calc(128rpx + var(--status-bar-height) + 20rpx);
-}
+			return {
+				isValid: true,
+				status
+			};
+		},
 
-/* 部分卡片 */
-.section-card {
-  background: white;
-  border-radius: 20rpx;
-  padding: 20rpx 20rpx 0 20rpx;
-  margin-bottom: 20rpx;
-}
+		loadIdentity() {
+			// 从全局数据获取身份
+			const app = getApp()
+			const globalIdentity = app.globalData.artisanType
+			console.log('从全局数据获取身份:', globalIdentity)
+
+			if (globalIdentity) {
+				this.identity = globalIdentity
+				uni.setStorageSync('user_identity', globalIdentity)
+			} else {
+				// 如果全局数据没有，尝试从本地存储获取
+				const localIdentity = uni.getStorageSync('user_identity')
+				if (localIdentity) {
+					this.identity = localIdentity
+					console.log('从本地存储获取身份:', localIdentity)
+				} else {
+					console.log('未获取到身份信息')
+					// 默认设为手艺人
+					this.identity = '1'
+				}
+			}
+
+			console.log('当前身份:', this.identity)
+		},
+
+		navigateToTimeSetting() {
+			if (this.identity == '2') {
+				// 商家跳转到营业时间页面
+				uni.navigateTo({
+					url: '/pages/shop/business-time'
+				})
+			} else {
+				// 手艺人跳转到服务时间页面
+				uni.navigateTo({
+					url: '/pages/artisan/service-time'
+				})
+			}
+		},
+
+		navigateToServiceSkill() {
+			if (this.identity == '2') {
+				// 商家跳转到商家服务技能页面
+				uni.navigateTo({
+					url: '/pages/shop/service-skills'
+				})
+			} else {
+				// 手艺人跳转到手艺人服务技能页面
+				uni.navigateTo({
+					url: '/pages/artisan/service-skills'
+				})
+			}
+		},
+
+		navigateToShopInfo() { // 商家：门店信息 
+			uni.navigateTo({
+				url: '/pages/shop/sj-info-change'
+			})
+		},
+
+		navigateToServiceArea() { // 手艺人：服务区域
+			uni.navigateTo({
+				url: '/pages/artisan/service-area'
+			})
+		},
+
+		navigateToPersonalInfo() { // 手艺人：个人信息
+			uni.navigateTo({
+				url: '/pages/artisan/syr-info-change'
+			})
+		},
+
+		navigateToimg() { // 图片管理
+			uni.navigateTo({
+				url: '/pages/shop/photoAlbum/photoManage?type=1'
+			})
+		},
+
+		navigateTovideo() { // 视频管理
+			uni.navigateTo({
+				url: '/pages/shop/photoAlbum/photoManage?type=2'
+			})
+		},
+
+		async navigateToQualification() {
+			if (this.identity != '2' || this.isCertified()) {
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+				return;
+			}
 
-.section-header {
-  display: flex;
-  align-items: center;
-  margin-bottom: 8rpx;
-}
+			await this.ensureAuthDetails();
+			if (!this.isSettled()) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			} else if (this.isUnderReview()) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?step=3'
+				});
+			}
+		},
+		navigateToBelongShop() { // 手艺人：所属门店
+			uni.navigateTo({
+				url: '/pages/artisan/belong_shop'
+			})
+		},
+		hasServiceSkills() {
+			return this.userInfo.servers_kill_arr && this.userInfo.servers_kill_arr.length > 0;
+		},
+		serviceSkillStatusText() {
+			if (this.serviceSkillAuditStatus === 1) return '审核中';
+			if (this.serviceSkillAuditStatus === 3) return '审核未通过';
+			return this.hasServiceSkills() ? '已设置' : '待完善';
+		},
+		serviceSkillStatusColor() {
+			const statusText = this.serviceSkillStatusText();
+			if (statusText === '审核未通过' || statusText === '待完善') return '#ec5d57';
+			if (statusText === '审核中') return '#e59e45';
+			return '#c9c9c9';
+		},
+		shouldShowServiceSkillWarningIcon() {
+			const statusText = this.serviceSkillStatusText();
+			return statusText === '审核未通过' || statusText === '待完善';
+		},
+		getCredentialsState() {
+			const state = Number(this.userInfo.credentials_state);
+			return Number.isNaN(state) ? null : state;
+		},
+		qualificationStatusText() {
+			if (!this.isQualificationAuditLoaded) return '';
+			if (this.qualificationAuditStatus === 1) return '审核中';
+			if (this.qualificationAuditStatus === 2) return '已认证';
+			if (this.qualificationAuditStatus === 3) return '审核未通过';
 
-.section-title {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 500;
-	font-size: 32rpx;
-	color: #1D2129;
-	line-height: 48rpx;
-	text-align: left;
-	font-style: normal;
+			const credentialsState = this.getCredentialsState();
+			if (credentialsState === 0) return '待完善';
+			if (credentialsState === 1) return '审核中';
+			if (this.userInfo.id_type < 0) return '审核未通过';
+			return '已认证';
+		},
+		qualificationStatusColor() {
+			const statusText = this.qualificationStatusText();
+			if (statusText === '审核未通过' || statusText === '待完善') return '#ec5d57';
+			if (statusText === '审核中') return '#e59e45';
+			return '#389930';
+		},
+		shouldShowQualificationWarningIcon() {
+			const statusText = this.qualificationStatusText();
+			return statusText === '审核未通过' || statusText === '待完善';
+		}
+	}
 }
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 10rpx;
-  border-radius: 5rpx;
-}
-
-.section-desc {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 400;
-	font-size: 24rpx;
-	color: #666666;
-	line-height: 33rpx;
-	text-align: left;
-	font-style: normal;
-	margin-left: 20rpx;
-	letter-spacing: 0.5rpx; 
-}
-
-/* 子部分 */
-.subsection {
-  /* margin-top: 10rpx; */
-  /* margin-left: 17rpx; */
-}
-
-.subsection-content {
-  border-radius: 12rpx;
-  overflow: hidden;
-  margin-left: 17rpx;
-}
-
-/* 信息项 */
-.info-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 32rpx 0 ;
-  border-bottom: 1rpx solid #f0f0f0;
-}
-
-.info-item:last-child {
-  border-bottom: none;
-}
-
-.info-left {
-  display: flex;
-  align-items: center;
-}
-
-.item-icon {
-  width: 48rpx;
-  height: 48rpx;
-  margin-right: 24rpx;
-}
-
-.item-label {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #333333;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.arrow-right {
-  margin-right: 19rpx;
-  width: 11rpx;
-  height: 22rpx;
-}
-</style>
\ No newline at end of file
+</script>
+
+<style>
+.profile-page {
+	min-height: 100vh;
+	background-color: #f5f5f5;
+}
+
+/* 自定义导航栏样式 */
+.custom-navbar {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	height: 108rpx;
+	/* 使用标准导航栏高度 */
+	background: white;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 32rpx;
+	z-index: 999;
+	box-sizing: border-box;
+	/* 适配不同机型的顶部安全区域 */
+	padding-top: var(--status-bar-height);
+	height: calc(128rpx + var(--status-bar-height));
+}
+
+/* 导航栏左侧 */
+.navbar-left {
+	display: flex;
+	align-items: center;
+}
+
+.back-icon {
+	width: 16rpx;
+	height: 32rpx;
+	margin-right: 23rpx;
+}
+
+.navbar-title {
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 500;
+	font-size: 32rpx;
+	color: #333333;
+	line-height: 45rpx;
+	text-align: left;
+	font-style: normal;
+}
+
+/* 导航栏右侧状态栏 */
+.navbar-right {
+	display: flex;
+	align-items: center;
+}
+
+.nav-status-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	margin-left: 11rpx;
+	padding: 16rpx;
+}
+
+.nav-status-icon {
+	width: 44rpx;
+	height: 44rpx;
+	margin-bottom: 7rpx;
+}
+
+.nav-status-text {
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	font-size: 20rpx;
+	color: #333333;
+	line-height: 28rpx;
+	text-align: left;
+	font-style: normal;
+}
+
+.content {
+	padding: 20rpx;
+	/* 动态计算内容区域的上边距 */
+	padding-top: calc(128rpx + var(--status-bar-height) + 20rpx);
+}
+
+/* 部分卡片 */
+.section-card {
+	background: white;
+	border-radius: 20rpx;
+	padding: 20rpx 20rpx 0 20rpx;
+	margin-bottom: 20rpx;
+}
+
+.section-header {
+	display: flex;
+	align-items: center;
+	margin-bottom: 8rpx;
+}
+
+.section-title {
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 500;
+	font-size: 32rpx;
+	color: #1D2129;
+	line-height: 48rpx;
+	text-align: left;
+	font-style: normal;
+}
+
+.title-bar {
+	width: 6rpx;
+	height: 30rpx;
+	background-color: #FF4767;
+	margin-right: 10rpx;
+	border-radius: 5rpx;
+}
+
+.section-desc {
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	font-size: 24rpx;
+	color: #666666;
+	line-height: 33rpx;
+	text-align: left;
+	font-style: normal;
+	margin-left: 20rpx;
+	letter-spacing: 0.5rpx;
+}
+
+/* 子部分 */
+.subsection {
+	/* margin-top: 10rpx; */
+	/* margin-left: 17rpx; */
+}
+
+.subsection-content {
+	border-radius: 12rpx;
+	overflow: hidden;
+	margin-left: 17rpx;
+}
+
+/* 信息项 */
+.info-item {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 32rpx 0;
+	border-bottom: 1rpx solid #f0f0f0;
+}
+
+.info-item:last-child {
+	border-bottom: none;
+}
+
+.info-left {
+	display: flex;
+	align-items: center;
+}
+
+.item-icon {
+	width: 48rpx;
+	height: 48rpx;
+	margin-right: 24rpx;
+}
+
+.item-label {
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 500;
+	font-size: 28rpx;
+	color: #333333;
+	line-height: 40rpx;
+	text-align: left;
+	font-style: normal;
+}
+
+.arrow-right {
+	margin-right: 19rpx;
+	width: 11rpx;
+	height: 22rpx;
+}
+</style>
diff --git a/pages/artisan/profile_bk.vue b/pages/artisan/profile_bk.vue
index 3d92880..1097b5d 100644
--- a/pages/artisan/profile_bk.vue
+++ b/pages/artisan/profile_bk.vue
@@ -1544,7 +1544,7 @@ export default {
 
 .tag {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
   margin-left: 14rpx;
 }
 .textarea {
@@ -1655,7 +1655,7 @@ export default {
 .save-btn {
   width: 702rpx;
   height: 64rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 32rpx;
   display: flex;
   align-items: center;
@@ -1762,8 +1762,8 @@ export default {
 }
 
 .checkbox.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .check-icon {
@@ -1796,7 +1796,7 @@ export default {
 }
 
 .popup-btn.confirm {
-  background: linear-gradient(90deg, #E8101E 0%, #FF618F 100%);
+  background: linear-gradient(90deg, #FF4767 0%, #FF618F 100%);
 }
 
 .popup-btn .btn-text {
@@ -1834,7 +1834,7 @@ export default {
 }
 
 .region-tab.active {
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -1846,7 +1846,7 @@ export default {
   transform: translateX(-50%);
   width: 40rpx;
   height: 4rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 2rpx;
 }
 
@@ -1907,7 +1907,7 @@ export default {
 
 .confirm-text {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -1949,7 +1949,7 @@ export default {
 }
 
 .time-block.active .time-value {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .time-separator {
diff --git a/pages/artisan/qualification_syr_change.vue b/pages/artisan/qualification_syr_change.vue
index c25553b..3bfb332 100644
--- a/pages/artisan/qualification_syr_change.vue
+++ b/pages/artisan/qualification_syr_change.vue
@@ -43,7 +43,7 @@
             <view class="radio-item" @click="editable && setHealthCardValidType('permanent')">
               <view class="radio" :class="{ checked: displayData.health_card_expiry_type === 1 }">
                   <image v-if="displayData.health_card_expiry_type === 1" 
-                      src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" 
+                      src="/static/images/agree_y.png" 
                       class="radio-icon-image" 
                       mode="aspectFit"></image>
               </view>
@@ -52,7 +52,7 @@
               <view class="radio-item" @click="editable && setHealthCardValidType('date')">
               <view class="radio" :class="{ checked: displayData.health_card_expiry_type === 2 }">
                   <image v-if="displayData.health_card_expiry_type === 2" 
-                      src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" 
+                      src="/static/images/agree_y.png" 
                       class="radio-icon-image" 
                       mode="aspectFit"></image>
               </view>
@@ -1292,7 +1292,7 @@ export default {
 }
 
 .change-info-btn, .view-change-btn, .resubmit-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -1313,7 +1313,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
@@ -1345,7 +1345,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 7rpx;
   border-radius: 5rpx;
 }
@@ -1472,8 +1472,8 @@ export default {
 }
 
 .radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .radio-icon-image {
diff --git a/pages/artisan/service-area.vue b/pages/artisan/service-area.vue
index 3911adf..f57ff1b 100644
--- a/pages/artisan/service-area.vue
+++ b/pages/artisan/service-area.vue
@@ -104,7 +104,7 @@
               @click="toggleDistrictSelect(index)"
             >
               <view class="checkbox" :class="{ checked: district.checked }">
-                <image v-if="district.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" mode="aspectFit"></image>
+                <image v-if="district.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png" mode="aspectFit"></image>
               </view>
               <text class="checkbox-label">{{district.area}}</text>
             </view>
@@ -752,7 +752,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 10rpx;
   border-radius: 5rpx;
 }
@@ -854,7 +854,7 @@ export default {
 
 .limit-text {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 /* 区域选择器样式 */
@@ -942,7 +942,7 @@ export default {
 }
 
 .region-tab.active {
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -954,7 +954,7 @@ export default {
   transform: translateX(-50%);
   width: 40rpx;
   height: 4rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 2rpx;
 }
 
@@ -994,8 +994,8 @@ export default {
 }
 
 .checkbox.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .check-icon {
@@ -1035,7 +1035,7 @@ export default {
 }
 
 .popup-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .popup-btn .btn-text {
@@ -1075,11 +1075,11 @@ export default {
 }
 
 .change-info-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .view-change-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -1100,7 +1100,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
diff --git a/pages/artisan/service-skills.vue b/pages/artisan/service-skills.vue
index ac46be0..8b1b4dd 100644
--- a/pages/artisan/service-skills.vue
+++ b/pages/artisan/service-skills.vue
@@ -25,7 +25,7 @@
               <view class="checkbox" :class="{ checked: isCurrentSkillSelected(skill.id) }">
                 <image v-if="isCurrentSkillSelected(skill.id)" 
                        class="check-icon" 
-                       src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" 
+                       src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png" 
                        mode="aspectFit">
                 </image>
               </view>
@@ -45,7 +45,7 @@
               <view class="checkbox" :class="{ checked: skill.checked }">
                 <image v-if="skill.checked" 
                        class="check-icon" 
-                       src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" 
+                       src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png" 
                        mode="aspectFit">
                 </image>
               </view>
@@ -721,7 +721,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 10rpx;
   border-radius: 5rpx;
 }
@@ -790,8 +790,8 @@ export default {
 }
 
 .checkbox.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .check-icon {
@@ -827,12 +827,12 @@ export default {
 
 .change-info-btn {
   margin-top: 20rpx;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .view-change-btn {
   margin-top: 20rpx;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -853,7 +853,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
diff --git a/pages/artisan/service-time.vue b/pages/artisan/service-time.vue
index 0687a71..badd4d2 100644
--- a/pages/artisan/service-time.vue
+++ b/pages/artisan/service-time.vue
@@ -371,7 +371,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 10rpx;
   border-radius: 5rpx;
 }
@@ -410,7 +410,7 @@ export default {
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 28rpx;
-  color: #E8101E;
+  color: #FF4767;
   line-height: 40rpx;
   text-align: left;
   font-style: normal;
@@ -476,7 +476,7 @@ export default {
 
 .confirm-text {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -526,7 +526,7 @@ export default {
 }
 
 .time-block.active .time-value-picker {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .time-separator {
@@ -572,7 +572,7 @@ export default {
   border: none;
   width: 290rpx;
   height: 86rpx;
-  background: linear-gradient( 180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient( 180deg, #F52540 0%, #FF4767 100%, #FF4767 100%);
   border-radius: 43rpx;
 }
 
@@ -592,7 +592,7 @@ export default {
 }
 
 .btn-confirm-large {
-  background: #E8101E;
+  background: #FF4767;
   color: white;
 }
 </style>
\ No newline at end of file
diff --git a/pages/artisan/syr-info-change.vue b/pages/artisan/syr-info-change.vue
index 399e22c..6224f8d 100644
--- a/pages/artisan/syr-info-change.vue
+++ b/pages/artisan/syr-info-change.vue
@@ -100,13 +100,13 @@
           <view class="radio-group">
             <view class="radio-item" @click="editable && setIdCardValidType(1)">
               <view class="radio" :class="{ checked: displayData.idcard_expiry_type === 1 }">
-                <image v-if="displayData.idcard_expiry_type === 1" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+                <image v-if="displayData.idcard_expiry_type === 1" src="/static/images/agree_y.png" class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">长久有效</text>
             </view>
             <view class="radio-item" @click="editable && setIdCardValidType(2)">
               <view class="radio" :class="{ checked: displayData.idcard_expiry_type === 2 }">
-                <image v-if="displayData.idcard_expiry_type === 2" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+                <image v-if="displayData.idcard_expiry_type === 2" src="/static/images/agree_y.png" class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">指定日期有效</text>
             </view>
@@ -1813,7 +1813,7 @@ export default {
 }
 
 .change-info-btn, .view-change-btn, .resubmit-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -1834,7 +1834,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
@@ -1866,7 +1866,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 7rpx;
   border-radius: 5rpx;
 }
@@ -2029,7 +2029,7 @@ export default {
   width: 60rpx;
   height: 60rpx;
   border: 4rpx solid #fff;
-  border-top: 4rpx solid #E8101E;
+  border-top: 4rpx solid #FF4767;
   border-radius: 50%;
   animation: spin 1s linear infinite;
   margin-bottom: 16rpx;
@@ -2115,8 +2115,8 @@ export default {
 }
 
 .radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .radio-icon-image {
@@ -2291,7 +2291,7 @@ export default {
 
 .confirm-text {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -2321,7 +2321,7 @@ export default {
 }
 
 .popup-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .popup-btn .btn-text {
@@ -2431,13 +2431,13 @@ export default {
 }
 
 .tip-btn.cancel {
-  border: #E8101E 2rpx solid;
+  border: #FF4767 2rpx solid;
   background-color: transparent;
-  color: #e8101e;
+  color: #FF4767;
 }
 
 .tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   color: #FFFFFF;
 }
 
diff --git a/pages/artisan/unavailable-time.vue b/pages/artisan/unavailable-time.vue
index 685339f..576d088 100644
--- a/pages/artisan/unavailable-time.vue
+++ b/pages/artisan/unavailable-time.vue
@@ -326,7 +326,7 @@ export default {
 
 .add-icon {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   margin-right: 8rpx;
 }
 
@@ -367,7 +367,7 @@ export default {
 }
 
 .confirm-btn {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .title {
diff --git a/pages/blogPopup/blogPopup.vue b/pages/blogPopup/blogPopup.vue
index c5ee426..46d706b 100644
--- a/pages/blogPopup/blogPopup.vue
+++ b/pages/blogPopup/blogPopup.vue
@@ -934,7 +934,7 @@
 			.get-code-btn {
 				font-weight: 400;
 				font-size: 30rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 42rpx;
 				text-align: center;
 				font-style: normal;
@@ -959,7 +959,7 @@
 		.input-error {
 			display: block;
 			font-size: 24rpx;
-			color: #e8101e;
+			color: #FF4767;
 			margin-left: 30rpx;
 			margin-top: -20rpx;
 			margin-bottom: 20rpx;
diff --git a/pages/complaint/detail.vue b/pages/complaint/detail.vue
index f41697a..2813423 100644
--- a/pages/complaint/detail.vue
+++ b/pages/complaint/detail.vue
@@ -132,7 +132,7 @@ import request from '../../utils/request';
 .state {
   height: 60rpx;
   line-height: 60rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   padding: 0 24rpx;
 }
 .state-text {
diff --git a/pages/contact/contact.vue b/pages/contact/contact.vue
index 19c433a..51f7179 100644
--- a/pages/contact/contact.vue
+++ b/pages/contact/contact.vue
@@ -132,7 +132,7 @@ export default {
 	color: #91908F;
 }
 .btn-box {
-	background: linear-gradient( 180deg, #F52540 0%, #E8101E 100%);
+	background: linear-gradient( 180deg, #F52540 0%, #FF4767 100%);
 	height: 88rpx;
 	border-radius: 43rpx;
 	font-weight: 500;
diff --git a/pages/evaluate/components/evaluationDetail.nvue b/pages/evaluate/components/evaluationDetail.nvue
index cf22188..d47e4fb 100644
--- a/pages/evaluate/components/evaluationDetail.nvue
+++ b/pages/evaluate/components/evaluationDetail.nvue
@@ -226,7 +226,7 @@
 	.score {
 		font-weight: 400;
 		font-size: 26rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 37rpx;
 	}
 
diff --git a/pages/evaluate/components/evaluationDetail.vue b/pages/evaluate/components/evaluationDetail.vue
index 7cc6076..e12cd55 100644
--- a/pages/evaluate/components/evaluationDetail.vue
+++ b/pages/evaluate/components/evaluationDetail.vue
@@ -251,7 +251,7 @@
 			.score {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
diff --git a/pages/evaluate/evaluationDetails.vue b/pages/evaluate/evaluationDetails.vue
index 698b4a7..2ad5aa2 100644
--- a/pages/evaluate/evaluationDetails.vue
+++ b/pages/evaluate/evaluationDetails.vue
@@ -279,7 +279,7 @@
 			.score {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
diff --git a/pages/evaluate/evaluationList.vue b/pages/evaluate/evaluationList.vue
index c41ac4f..5a92678 100644
--- a/pages/evaluate/evaluationList.vue
+++ b/pages/evaluate/evaluationList.vue
@@ -177,7 +177,7 @@
 			}
 
 			.active {
-				color: #E8101E;
+				color: #FF4767;
 			}
 		}
 
diff --git a/pages/home/components/brand-card.vue b/pages/home/components/brand-card.vue
new file mode 100644
index 0000000..0a73cfd
--- /dev/null
+++ b/pages/home/components/brand-card.vue
@@ -0,0 +1,239 @@
+<template>
+	<view class="brand-card-comp" @click="onClick">
+		<image class="brand-bg" :src="item.bgSrc" mode="aspectFill"></image>
+		<image class="mask-bg"
+			src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9bca353c-fa74-407e-a69e-6f5e9aa43955.png"
+			mode="widthFix"></image>
+
+		<view class="card-content">
+			<view class="avatar-wrapper" style="border-color: #F7E5D7;">
+				<image class="avatar-img" :src="item.avatar || 'https://dummyimage.com/100x100/ccc/fff.png&text=logo'">
+				</image>
+			</view>
+
+			<text class="brand-name">{{ item.name }}</text>
+
+			<view class="tags-container">
+				<view class="tag-item" v-for="(tag, idx) in displayTags" :key="idx" :style="getTagStyle(tag)">
+					<!-- <image class="tag-icon" v-if="tag.icon" :src="tag.icon"></image> -->
+					<text class="tag-text">{{ tag.text }} </text>
+					<text class="tag-text1">›</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+// 预定义的标签库（固定内容）
+const TAG_LIBRARY = {
+	franchise: { // 品牌加盟
+		text: '品牌加盟',
+		color: '#8D4C1B ',
+		borderColor: '#D6CAC0 ',
+		icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60816ae2-92ee-4473-9eca-562e1200dbca.png'
+	},
+	recruit: { // 学员招募
+		text: '学员招募',
+		color: '#E5505F',
+		borderColor: '#EFCFD2 ',
+		icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fd0699b9-9f3c-4b1e-8693-d0c9ec7eabc3.png'
+	},
+	more: { // 更多详情
+		text: '更多详情',
+		color: '#333333',
+		borderColor: '#ECECEC',
+		icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cec453ce-f3fc-4881-8f2c-9ec5c61e759c.png'
+	}
+}
+
+export default {
+	name: 'brand-card',
+	props: {
+		// 基础信息
+		item: {
+			type: Object,
+			default: () => ({})
+		},
+		// 新方式：传入标签 key 数组，例如 ['franchise', 'recruit']
+		tagKeys: {
+			type: Array,
+			default: null
+		}
+	},
+	computed: {
+		// 最终要显示的标签列表（优先使用 tagKeys，否则兼容旧数据 item.tags）
+		displayTags() {
+			if (this.tagKeys && this.tagKeys.length) {
+				return this.tagKeys.map(key => TAG_LIBRARY[key]).filter(v => v)
+			}
+			// 兼容旧数据：如果 item.tags 存在且为数组，则直接使用（但建议逐步迁移）
+			if (this.item.tags && Array.isArray(this.item.tags)) {
+				return this.item.tags
+			}
+			return []
+		},
+		tagsLength() {
+			return this.displayTags.length
+		}
+	},
+	methods: {
+		// 点击品牌卡片跳转详情页
+		onClick() {
+			// 1. 保留 emit，方便外层如果有特殊需求可以监听到
+			this.$emit('click', this.item);
+
+			// 2. 检查登录状态
+			if (!uni.getStorageSync("accessToken")) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return;
+			}
+
+			// 3. 直接在此处处理跳转逻辑
+			if (this.item && this.item.id) {
+				uni.navigateTo({
+					url: `/pages/jingxuan/brand-detail?id=${this.item.id}`
+				});
+			}
+		},
+		getTagStyle(tag) {
+			const len = this.tagsLength
+			let sizeStyle = {}
+			if (len === 1) {
+				sizeStyle = {
+					width: '288rpx',
+					height: '42rpx',
+					padding: '0 12rpx',
+					boxSizing: 'border-box'
+				}
+			} else if (len === 2) {
+				sizeStyle = {
+					width: '142rpx',
+					height: '42rpx',
+					padding: '0 12rpx',
+					boxSizing: 'border-box'
+				}
+			}
+			return {
+				...sizeStyle,
+				color: tag.color,
+				borderColor: tag.borderColor
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.brand-card-comp {
+	width: 328rpx;
+	height: 339rpx;
+	position: relative;
+	border-radius: 21rpx;
+	overflow: hidden;
+	background-color: #fff;
+}
+
+.brand-bg {
+	width: 100%;
+	height: 184rpx;
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1;
+}
+
+.mask-bg {
+	width: 100%;
+	height: 251rpx;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	z-index: 2;
+	display: block;
+}
+
+.card-content {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 3;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding-bottom: 24rpx;
+}
+
+.avatar-wrapper {
+	width: 80rpx;
+	height: 80rpx;
+	border-radius: 50%;
+	border: 2rpx solid;
+	background-color: #fff;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	overflow: hidden;
+	margin-top: -38rpx;
+	margin-bottom: 12rpx;
+}
+
+.avatar-img {
+	width: 100%;
+	height: 100%;
+}
+
+.brand-name {
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #333333;
+	line-height: 34rpx;
+	margin-bottom: 12rpx;
+}
+
+.tags-container {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	gap: 20rpx;
+	flex-wrap: wrap;
+}
+
+.tag-item {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 21rpx;
+	border: 1rpx solid;
+	background-color: transparent;
+	padding: 7rpx 12rpx;
+}
+
+.tag-icon {
+	width: 26rpx;
+	height: 24rpx;
+	margin-right: 6rpx;
+	flex-shrink: 0;
+}
+
+.tag-text {
+	font-size: 24rpx;
+	line-height: 28rpx;
+	white-space: nowrap;
+	margin-top: 4rpx;
+	padding-right: 2rpx;
+}
+
+.tag-text1 {
+	font-size: 40rpx;
+	line-height: 28rpx;
+	white-space: nowrap;
+	margin-top: 4rpx;
+	padding-right: 2rpx;
+	margin-bottom: 6rpx;
+	font-weight: 200;
+}
+</style>
\ No newline at end of file
diff --git a/pages/home/components/filters.vue b/pages/home/components/filters.vue
index 0c62060..8bd2c80 100644
--- a/pages/home/components/filters.vue
+++ b/pages/home/components/filters.vue
@@ -156,6 +156,7 @@
 						weChatRefund: "/sj/workSeatOrder/weChatRefund",
 						aliRefund: "/sj/workSeatOrder/aliRefund",
 						startOrder: "/sj/workSeatOrder/start",
+						sureOrder:"/sj/workSeatOrder/sure",
 						endOrder: "/sj/workSeatOrder/end",
 						ordernum: "/sj/workSeatOrder/orderNum",
 						list: "/sj/workSeatOrder/list",
@@ -209,7 +210,7 @@
 			secondTabs() {
 				if (this.activeFirstId == 1 || this.activeFirstId == 2) {
 					return [{
-							title: `待服务(${this.numInfo.noservernum})`,
+							title: `待开始(${this.numInfo.noservernum})`,
 							id: 3
 						},
 						{
@@ -405,6 +406,7 @@
 					return;
 				}
 				this.clickType = true;
+				console.log(111,this.activeFirstId,this.urls)
 				request
 					.post(this.urls[this.activeFirstId].sureOrder, {
 						id: order.id,
@@ -414,7 +416,7 @@
 					.then((res) => {
 						if (res.state != 1 || res.code != 200) {
 							uni.showToast({
-								title: res.msg,
+								title: "开始服务",
 								icon: "none",
 							});
 						} else {
@@ -459,7 +461,7 @@
 						console.log(res);
 						if (res.state == 1 || res.code == 200) {
 							uni.showToast({
-								title: res.msg,
+								title: "开始服务",
 								icon: "none",
 							});
 							this.searchList();
@@ -513,27 +515,27 @@
 				if (this.idType == 1) {
 					if (this.activeFirstId == 1) {
 						uni.navigateTo({
-							url:  `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}`,
+							url:  `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 2) {
 						uni.navigateTo({
-							url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2`,
+							url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 3) {
 						uni.navigateTo({
-							url: `/pages/shop/SellerDetail?order_id=${order.id}`,
+							url: `/pages/shop/SellerDetail?order_id=${order.id}&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 4) {
 						uni.navigateTo({
-							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}`,
+							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 5) {
 						uni.navigateTo({
-							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2`,
+							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2&haveButton=${this.haveButton}`,
 						});
 					}
 				}
@@ -576,7 +578,7 @@
 
 				// 选中状态样式
 				&.active {
-					color: #e8101e; // 选中文字颜色
+					color: #FF4767; // 选中文字颜色
 					font-weight: 600; // 选中时加粗（可选，根据图片效果）
 
 					// 横条效果：通过伪元素实现
@@ -590,8 +592,8 @@
 						bottom: -6rpx; // 距离文字底部的距离（可调整）
 						height: 6rpx; // 横条高度
 						background: linear-gradient(306deg,
-								#e8101e 0%,
-								#e8101e 100%); // 横条颜色（与文字颜色一致）
+								#FF4767 0%,
+								#FF4767 100%); // 横条颜色（与文字颜色一致）
 						border-radius: 3rpx; // 横条圆角（可选，更柔和）
 					}
 				}
@@ -626,7 +628,7 @@
 
 				// 选中状态样式
 				&.active {
-					color: #e8101e; // 选中颜色
+					color: #FF4767; // 选中颜色
 					background: rgba(252, 67, 124, 0.1); // 可选：选中时背景色变化
 					font-weight: 600; // 可选：选中时加粗
 				}
diff --git a/pages/home/components/notice-card.vue b/pages/home/components/notice-card.vue
new file mode 100644
index 0000000..bfcbdf0
--- /dev/null
+++ b/pages/home/components/notice-card.vue
@@ -0,0 +1,101 @@
+<template>
+  <view class="notice-item" @tap="handleClick">
+    <view class="item-main">
+      <text class="item-title line-2">{{ item.title }}</text>
+      <view class="item-time">
+        <text class="time-text">发布时间：{{ formattedTime }}</text>
+      </view>
+    </view>
+    </view>
+</template>
+
+<script>
+export default {
+  name: "NoticeCard",
+  props: {
+    // 接收外部传入的公告对象数据
+    item: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  computed: {
+    // 利用计算属性自动处理时间格式化
+    formattedTime() {
+      const timeStr = this.item.create_time;
+      if (!timeStr) return '--:--:--';
+      
+      let formatted = timeStr;
+      if (timeStr.includes('.') && !timeStr.includes('-')) {
+        formatted = timeStr.replace(/\./g, '-');
+        if (formatted.match(/\d{4}-\d{2}-\d{2}\d{2}:\d{2}:\d{2}/)) {
+          formatted = formatted.replace(/(\d{4}-\d{2}-\d{2})(\d{2}:\d{2}:\d{2})/, '$1 $2');
+        }
+      }
+      if (formatted.includes('-') && formatted.includes(':')) {
+        return formatted;
+      }
+      return timeStr;
+    }
+  },
+  methods: {
+    handleClick() {
+      // 触发组件的 click 事件，把当前项的数据抛出去
+      this.$emit('click', this.item);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.notice-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: #ffffff;
+  border-radius: 20rpx;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+  transition: all 0.2s ease;
+  
+  .item-main {
+    flex: 1;
+    min-width: 0; // 防止文字溢出
+    
+    .item-title {
+      font-size: 30rpx;
+      font-weight: 500;
+      color: #101010;
+      line-height: 42rpx;
+      margin-bottom: 16rpx;
+    }
+    
+    .item-time {
+      display: flex;
+      align-items: center;
+      
+      .time-icon {
+        width: 24rpx;
+        height: 24rpx;
+        margin-right: 8rpx;
+        opacity: 0.6;
+      }
+      
+      .time-text {
+        font-size: 22rpx;
+        color: #999;
+        line-height: 30rpx;
+      }
+    }
+  }
+}
+
+// 多行省略
+.line-2 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  word-break: break-all;
+}
+</style>
\ No newline at end of file
diff --git a/pages/home/components/orderCard2.vue b/pages/home/components/orderCard2.vue
index eb096fa..6049cee 100644
--- a/pages/home/components/orderCard2.vue
+++ b/pages/home/components/orderCard2.vue
@@ -171,6 +171,7 @@
 			},
 			emitStart() {
 				this.$emit("start");
+				
 			},
 			emitDone() {
 				this.$emit("done");
@@ -181,8 +182,8 @@
 
 <style scoped lang="less">
 	.order-card {
-		padding: 20rpx 30rpx 20rpx 30rpx;
-		margin: 0rpx 30rpx 20rpx 30rpx;
+		padding: 24rpx 20rpx 24rpx 20rpx;
+		margin: 0;
 		background-color: #fff;
 		border-radius: 12px;
 		/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
@@ -205,7 +206,7 @@
 		.stateText {
 			font-weight: 400;
 			font-size: 26rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: left;
 			font-style: normal;
 			position: absolute;
@@ -255,7 +256,7 @@
 	.service-price {
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -292,7 +293,7 @@
 			letter-spacing: 2px;
 			text-align: left;
 			font-style: normal;
-			background: linear-gradient(166deg, #FC5E72 0%, #E8101E 100%);
+			background: linear-gradient(166deg, #FC5E72 0%, #FF4767 100%);
 			border-radius: 6rpx;
 			padding: 4rpx 4rpx 4rpx 8rpx;
 			margin-right: 13rpx;
@@ -388,8 +389,8 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 
 	.order-address {
diff --git a/pages/home/components/project-tabs.vue b/pages/home/components/project-tabs.vue
index 9c14580..ec0caad 100644
--- a/pages/home/components/project-tabs.vue
+++ b/pages/home/components/project-tabs.vue
@@ -129,7 +129,7 @@
 							
 							.tab-text {
 								font-weight: 500;
-								color: #E8101E;
+								color: #FF4767;
 								&::after{
 									content: '';
 									// 绝对定位在元素底部
@@ -139,7 +139,7 @@
 									transform: translateX(-50%);
 									bottom: -6rpx; // 距离文字底部的距离（可调整）
 									height: 6rpx; // 横条高度
-									background: linear-gradient( 306deg, #E8101E 0%, #F25988 100%); // 横条颜色（与文字颜色一致）
+									background: linear-gradient( 306deg, #FF4767 0%, #F25988 100%); // 横条颜色（与文字颜色一致）
 									border-radius: 3rpx; // 横条圆角（可选，更柔和）
 								}
 							}
diff --git a/pages/home/components/skill-card.vue b/pages/home/components/skill-card.vue
new file mode 100644
index 0000000..0e0e9ba
--- /dev/null
+++ b/pages/home/components/skill-card.vue
@@ -0,0 +1,196 @@
+<template>
+  <view class="skill-item" @click="handleClick">
+    <view class="cover-box">
+      <image class="cover" :src="item.coverSrc" mode="aspectFill"></image>
+      <image v-if="item.video" class="play-icon"
+        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5c1ddfef-a200-424a-a9dc-03d9395568f6.png"></image>
+    </view>
+    <view class="skill-info">
+      <view class="skill-title line-2">{{ item.title }}</view>
+      <view class="skill-type" :class="typeClass">
+        <image class="type-icon" :src="item.typeIcon || defaultTypeIcon"></image>
+        <text class="type-text">{{ item.type || '平台课程' }}</text>
+      </view>
+      <view class="skill-stats">
+        <image class="view-icon"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2409b64a-56bb-4d9e-a4cc-5b3444fcf097.png">
+        </image>
+        {{ formatViews(item.views) }}观看 · {{ item.time }}
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'SkillItem',
+  props: {
+    item: {
+      type: Object,
+      required: true,
+      default: () => ({
+        id: null,
+        title: '',
+        coverSrc: '',
+        type: '平台课程',
+        views: 0,
+        time: '',
+        typeIcon: ''
+      })
+    }
+  },
+  data() {
+    return {
+      defaultTypeIcon: 'https://dummyimage.com/30x30/ccc/fff.png&text=I'  // 用于占位
+    }
+  },
+  computed: {
+    typeClass() {
+      const typeMap = {
+        '平台课程': 'platform-course',
+        '脸缘品牌': 'brand-course',
+        '品牌课程': 'brand-course'
+      }
+      return typeMap[this.item.type] || 'platform-course'
+    }
+  },
+  methods: {
+    formatViews(views) {
+      if (!views) return '0'
+      if (views >= 10000) {
+        return (views / 10000).toFixed(1) + 'w'
+      }
+      return views.toString()
+    },
+    handleClick() {
+      // 1. 保留 emit，方便外层如果有特殊需求可以监听到
+      this.$emit('click', this.item);
+
+      // 2. 检查登录状态
+      if (!uni.getStorageSync("accessToken")) {
+        uni.navigateTo({
+          url: '/pages/blogPopup/blogPopup'
+        });
+        return;
+      }
+
+      // 3. 直接在此处处理跳转逻辑
+      if (this.item && this.item.id) {
+        uni.navigateTo({
+          url: `/pages/jingxuan/skill-detail?id=${this.item.id}`
+        });
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.skill-item {
+  display: flex;
+  margin-bottom: 30rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+
+  .cover-box {
+    position: relative;
+    width: 224rpx;
+    height: 126rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+    margin-right: 24rpx;
+    flex-shrink: 0;
+
+    .cover {
+      width: 100%;
+      height: 100%;
+    }
+
+    .play-icon {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      width: 39rpx;
+      height: 39rpx;
+    }
+  }
+
+  .skill-info {
+    flex: 1;
+    display: flex;
+    min-width: 0;
+    flex-direction: column;
+    justify-content: space-between;
+
+    .skill-title {
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      font-size: 28rpx;
+      color: #333;
+      font-weight: 500;
+      line-height: 40rpx;
+    }
+
+    .skill-type {
+      display: flex;
+      align-items: center;
+      font-size: 22rpx;
+      margin-top: 10rpx;
+
+      .type-icon {
+        border: 1rpx solid #D6CAC0;
+        width: 26rpx;
+        height: 26rpx;
+        margin-right: 8rpx;
+        border-radius: 50%;
+      }
+
+      .type-text {
+        border-radius: 7rpx;
+        font-weight: 400;
+        font-size: 24rpx;
+        line-height: 33rpx;
+        padding: 2rpx 10rpx;
+      }
+
+      &.platform-course .type-text {
+        background: #f9d3d760;
+        color: #E55463;
+      }
+
+      &.brand-course .type-text {
+        background: #f9d3d760;
+        color: #E55463;
+      }
+    }
+
+    .skill-stats {
+      font-size: 22rpx;
+      color: #999;
+      margin-top: 10rpx;
+      display: flex;
+      align-items: center;
+
+      .view-icon {
+        width: 26rpx;
+        height: 22rpx;
+        margin-right: 8rpx;
+        margin-top: -2rpx;
+      }
+    }
+  }
+}
+
+.line-2 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+}
+</style>
diff --git a/pages/home/components/workOrderCard.vue b/pages/home/components/workOrderCard.vue
index 14bdcdf..b4e560d 100644
--- a/pages/home/components/workOrderCard.vue
+++ b/pages/home/components/workOrderCard.vue
@@ -6,7 +6,7 @@
 			<view class="stateText" :class="{
 				stateText2: dataItem.state > 4 && dataItem.state !== 7,  // 排除已取消
 				stateText3: dataItem.state === 7  // 已取消状态单独处理
-				}" v-if="showState">
+			}" v-if="showState">
 				{{ stateText }}
 			</view>
 		</view>
@@ -18,8 +18,8 @@
 				<view class="topInfo">
 					<view class="price_title">
 						<view class="service-type white-space-nowrap">{{
-              dataItem.title
-            }}</view>
+							dataItem.title
+						}}</view>
 
 					</view>
 					<view class="service-address">下单时间：{{ dataItem.add_time }}</view>
@@ -45,299 +45,260 @@
 </template>
 
 <script>
-	export default {
-		name: "OrderCard",
-		props: {
-			dataItem: {
-				type: Object,
-			},
-			typeId: {
-				type: Number,
-			},
-			showState: {
-				type: Boolean,
-				default: true,
-			}
+export default {
+	name: "OrderCard",
+	props: {
+		dataItem: {
+			type: Object,
 		},
-		computed: {
-			photo() {
-				return this.dataItem.photo? JSON.parse(this.dataItem.photo):"";
-			},
-			useTime() {
-				const start = this.dataItem.reserve_start_time;
-				const endTime = this.dataItem.reserve_end_time;
-
-				function formatTimeRange(startTimeStr, endTimeStr) {
-					if (!startTimeStr || !endTimeStr) return "未设置";
-					
-					// 解析开始时间为Date对象
-					const startTime = new Date(startTimeStr.replace(/-/g, '/'));
-					const endTime = new Date(endTimeStr.replace(/-/g, '/'));
-					
-					if (isNaN(startTime.getTime()) || isNaN(endTime.getTime())) {
-						console.error("无效的时间格式");
-						return "时间格式错误";
-					}
-					
-					// 格式化年份：YYYY年
-					const formatYear = (date) => {
-						return date.getFullYear() + '年';
-					};
-					
-					// 格式化月份和日期：MM月DD
-					const formatMonthDay = (date) => {
-						const month = String(date.getMonth() + 1).padStart(2, "0");
-						const day = String(date.getDate()).padStart(2, "0");
-						return `${month}月${day}`;
-					};
-					
-					// 格式化时间部分：HH:MM
-					const formatTimePart = (date) => {
-						const hours = String(date.getHours()).padStart(2, "0");
-						const minutes = String(date.getMinutes()).padStart(2, "0");
-						return `${hours}:${minutes}`;
-					};
-					
-					// 判断是否同一天
-					const isSameDay = startTime.getFullYear() === endTime.getFullYear() &&
-									  startTime.getMonth() === endTime.getMonth() &&
-									  startTime.getDate() === endTime.getDate();
-					
-					if (isSameDay) {
-						// 同一天：2025年05月29 12:30-13:30
-						return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatTimePart(endTime)}`;
-					} else {
-						// 跨天：2025年05月29 12:30-2025年05月30 13:30
-						return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatYear(endTime)}${formatMonthDay(endTime)} ${formatTimePart(endTime)}`;
-					}
-				}
-				return formatTimeRange(start, endTime);
-			},
-			stateText() {
-				const textList = [
-					"",
-					"待支付",
-					"待接单",
-					"待开始",
-					"进行中",
-					"已完成",
-					"已评价",
-					"已取消",
-				];
-				return textList[this.dataItem.state];
-			},
+		typeId: {
+			type: Number,
 		},
-		methods: {
-			// 触发取消事件
-			emitCancel() {
-				this.$emit("cancel", this.dataItem);
-			},
-			// 触发接单事件
-			emitAccept() {
-				this.$emit("accept", this.dataItem);
-			},
-			emitStart() {
-				this.$emit("start", this.dataItem);
-			},
-			emitDone() {
-				this.$emit("done", this.dataItem);
-			},
-			goDetail() {
-				this.$emit("goDetail", this.dataItem);
-			},
-			emitGoPay() {
-				this.$emit("goPay", this.dataItem);
-			},
-			emitRefund() {
-				this.$emit("goRefund", this.dataItem);
-			}
+		showState: {
+			type: Boolean,
+			default: true,
+		}
+	},
+	computed: {
+		photo() {
+			return this.dataItem.photo ? JSON.parse(this.dataItem.photo) : "";
 		},
-	};
+		useTime() {
+			const start = this.dataItem.reserve_start_time;
+			const end = this.dataItem.reserve_end_time;
+			if (!start || !end) return "未设置";
+			const startDate = new Date(start.replace(/-/g, '/'));
+			const endDate = new Date(end.replace(/-/g, '/'));
+			if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) return "时间格式错误";
+			const pad = (n) => String(n).padStart(2, "0");
+			const fmt = (d) => `${pad(d.getMonth() + 1)}.${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+			return `${fmt(startDate)}-${fmt(endDate)}`;
+		},
+		stateText() {
+			const textList = [
+				"",
+				"待支付",
+				"待接单",
+				"待开始",
+				"进行中",
+				"已完成",
+				"已评价",
+				"已取消",
+			];
+			return textList[this.dataItem.state];
+		},
+	},
+	methods: {
+		// 触发取消事件
+		emitCancel() {
+			this.$emit("cancel", this.dataItem);
+		},
+		// 触发接单事件
+		emitAccept() {
+			this.$emit("accept", this.dataItem);
+		},
+		emitStart() {
+			this.$emit("start", this.dataItem);
+		},
+		emitDone() {
+			this.$emit("done", this.dataItem);
+		},
+		goDetail() {
+			this.$emit("goDetail", this.dataItem);
+		},
+		emitGoPay() {
+			this.$emit("goPay", this.dataItem);
+		},
+		emitRefund() {
+			this.$emit("goRefund", this.dataItem);
+		}
+	},
+};
 </script>
 
 <style lang="less" scoped>
-	.order-card {
-		position: relative;  // 必须加，确保父容器有定位
-		padding: 24rpx 20rpx 0rpx;
-		margin: 0rpx 30rpx 20rpx 30rpx;
-		background-color: #fff;
-		border-radius: 12px;
-		/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
-	}
+.order-card {
+	position: relative; // 必须加，确保父容器有定位
+	padding: 24rpx 20rpx 0rpx;
+	margin: 0rpx 30rpx 20rpx 30rpx;
+	background-color: #fff;
+	border-radius: 12px;
+	/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
+}
 
-	.orderNumBox {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 40rpx;
+.orderNumBox {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 40rpx;
 
-		.stateText {
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #E8101E;
-			text-align: left;
-			font-style: normal;
-			position: absolute;
-			right: 0;
-			top: 0;
-			background-image: url("/static/images/icons/tabBj.png");
-			background-size: 100% auto;
-			background-position: center top;
-			background-repeat: no-repeat;
-			width: 128rpx;
-			height: 49rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-
-		.stateText2 {
-			background-image: url("/static/images/icons/tabBj2.png");
-			color: #333;
-		}
-
-		.stateText3 {
-			background-image: url("/static/images/icons/tabBj2.png");
-			color: #999999 !important;
-		}
-	}
-
-	/* 订单编号 */
-	.order-id {
-		width: 530rpx;
-		font-size: 28rpx;
-		color: #333333;
-	}
-
-	/* 服务信息容器 */
-	.service-container {
-		display: flex;
-		align-items: center;
-		padding-bottom: 24rpx;
-		border-bottom: 1px solid #f6f5f5;
-		width: 100%;
-	}
-
-	/* 服务图片 */
-	.service-img {
-		width: 172rpx;
-		height: 168rpx;
-		border-radius: 24rpx;
-		margin-right: 30rpx;
-		flex-shrink: 0;
-	}
-
-	/* 服务信息 */
-	.service-info {
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		width: 100%;
-		height: 168rpx;
-
-		.topInfo {
-			display: flex;
-			flex-direction: column;
-
-			.price_title {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				margin-bottom: 20rpx;
-
-				.service-type {
-					font-weight: 500;
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 34rpx;
-					max-width: 300rpx;
-				}
-
-
-			}
-
-		}
-
-		.service-price {
-			font-family: DINPro, DINPro;
-			font-weight: 500;
-			font-size: 36rpx;
-			color: #E8101E;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-		}
-	}
-
-	.service_subTitle {
-		font-size: 26rpx;
-		line-height: 26rpx;
-		color: #666666;
-		margin-top: 18rpx;
-	}
-
-
-
-	.service-address {
+	.stateText {
 		font-weight: 400;
 		font-size: 26rpx;
-		color: #999999;
-		line-height: 33rpx;
+		color: #FF4767;
 		text-align: left;
 		font-style: normal;
-	}
-
-	/* 时间信息 */
-	.time-info {
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #333333;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-		padding-bottom: 20rpx;
-		margin-top: 28rpx;
-	}
-
-	/* 按钮组 */
-	.button-group {
-		display: flex;
-		justify-content: flex-end;
-		gap: 30rpx;
-		padding-bottom: 30rpx;
-	}
-
-	/* 通用按钮样式 */
-	.btn {
-		white-space: nowrap;
-		width: 100rpx;
-		height: 32rpx;
+		position: absolute;
+		right: 0;
+		top: 0;
+		background-image: url("/static/images/icons/tabBj.png");
+		background-size: 100% auto;
+		background-position: center top;
+		background-repeat: no-repeat;
+		width: 128rpx;
+		height: 49rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		padding: 10px 20px;
-		border-radius: 64rpx;
-		// box-sizing: border-box;
-		//height: 64rpx;
-		//border-radius: 32rpx;
-		border: 2rpx solid #979797;
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #333333;
-		line-height: 64rpx;
-		// padding: 0 28rpx;
+	}
+
+	.stateText2 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #333;
+	}
+
+	.stateText3 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #999999 !important;
+	}
+}
+
+/* 订单编号 */
+.order-id {
+	width: 530rpx;
+	font-size: 28rpx;
+	color: #333333;
+}
+
+/* 服务信息容器 */
+.service-container {
+	display: flex;
+	align-items: center;
+	padding-bottom: 24rpx;
+	border-bottom: 1px solid #f6f5f5;
+	width: 100%;
+}
+
+/* 服务图片 */
+.service-img {
+	width: 172rpx;
+	height: 168rpx;
+	border-radius: 24rpx;
+	margin-right: 30rpx;
+	flex-shrink: 0;
+}
+
+/* 服务信息 */
+.service-info {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	width: 100%;
+	height: 168rpx;
+
+	.topInfo {
+		display: flex;
+		flex-direction: column;
+
+		.price_title {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-bottom: 20rpx;
+
+			.service-type {
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 34rpx;
+				max-width: 300rpx;
+			}
+
+
+		}
 
 	}
 
-	/* 取消按钮 */
-	.cancel-btn {
-		border: 2rpx solid #979797;
-		color: #333333;
+	.service-price {
+		font-family: DINPro, DINPro;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #FF4767;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
 	}
+}
 
-	/* 接单按钮 */
-	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
-	}
+.service_subTitle {
+	font-size: 26rpx;
+	line-height: 26rpx;
+	color: #666666;
+	margin-top: 18rpx;
+}
+
+
+
+.service-address {
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #999999;
+	line-height: 33rpx;
+	text-align: left;
+	font-style: normal;
+}
+
+/* 时间信息 */
+.time-info {
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #333333;
+	line-height: 34rpx;
+	text-align: left;
+	font-style: normal;
+	padding-bottom: 20rpx;
+	margin-top: 28rpx;
+}
+
+/* 按钮组 */
+.button-group {
+	display: flex;
+	justify-content: flex-end;
+	gap: 30rpx;
+	padding-bottom: 30rpx;
+}
+
+/* 通用按钮样式 */
+.btn {
+	white-space: nowrap;
+	width: 100rpx;
+	height: 32rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 10px 20px;
+	border-radius: 64rpx;
+	// box-sizing: border-box;
+	//height: 64rpx;
+	//border-radius: 32rpx;
+	border: 2rpx solid #979797;
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #333333;
+	line-height: 64rpx;
+	// padding: 0 28rpx;
+
+}
+
+/* 取消按钮 */
+.cancel-btn {
+	border: 2rpx solid #979797;
+	color: #333333;
+}
+
+/* 接单按钮 */
+.accept-btn {
+	border: 2rpx solid #FF4767;
+	color: #FF4767;
+}
 </style>
\ No newline at end of file
diff --git a/pages/home/growth-package-result.vue b/pages/home/growth-package-result.vue
new file mode 100644
index 0000000..8dc9008
--- /dev/null
+++ b/pages/home/growth-package-result.vue
@@ -0,0 +1,167 @@
+<template>
+	<view class="growth-package-result-page">
+		<custom-navbar
+			title="支付结果"
+			:showBack="true"
+			backgroundColor="#F7F7F7"
+			borderBottom="none"
+		></custom-navbar>
+
+		<view class="result-main">
+			<view class="result-icon" :class="isFail ? 'is-fail' : 'is-success'">
+				<block v-if="isFail">
+					<view class="fail-line"></view>
+					<view class="fail-dot"></view>
+				</block>
+				<view v-else class="success-check"></view>
+			</view>
+			<view class="result-title">{{ resultInfo.title }}</view>
+			<view class="result-desc">{{ resultInfo.desc }}</view>
+			<view class="primary-btn" @tap="handlePrimaryTap">{{ isFail ? "重新支付" : "返回首页" }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+
+export default {
+	components: {
+		CustomNavbar,
+	},
+	data() {
+		return {
+			status: "success",
+		};
+	},
+	computed: {
+		isFail() {
+			return this.status === "fail";
+		},
+		resultInfo() {
+			if (this.isFail) {
+				return {
+					title: "报名失败",
+					desc: "最后一步出了点问题 请重新支付",
+				};
+			}
+			return {
+				title: "报名成功",
+				desc: "您已完成支付 感谢你对美融融的支持",
+			};
+		},
+	},
+	onLoad(options) {
+		this.status = options.status === "fail" ? "fail" : "success";
+	},
+	methods: {
+		handlePrimaryTap() {
+			if (this.isFail) {
+				uni.redirectTo({
+					url: "/pages/home/growth-package",
+				});
+				return;
+			}
+			uni.switchTab({
+				url: "/pages/home/home",
+			});
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+page {
+	background: #ffffff;
+}
+
+.growth-package-result-page {
+	min-height: 100vh;
+	background: #ffffff;
+	padding-bottom: env(safe-area-inset-bottom);
+}
+
+.result-main {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 246rpx 40rpx 0;
+}
+
+.result-icon {
+	width: 104rpx;
+	height: 104rpx;
+	border-radius: 50%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.result-icon.is-success {
+	background: #12c76b;
+}
+
+.result-icon.is-fail {
+	background: #ff4652;
+}
+
+.success-check {
+	width: 44rpx;
+	height: 24rpx;
+	border-left: 8rpx solid #ffffff;
+	border-bottom: 8rpx solid #ffffff;
+	transform: rotate(-45deg);
+	margin-top: -8rpx;
+}
+
+.fail-line {
+	width: 8rpx;
+	height: 46rpx;
+	border-radius: 8rpx;
+	background: #ffffff;
+}
+
+.fail-dot {
+	width: 8rpx;
+	height: 8rpx;
+	margin-left: -8rpx;
+	margin-top: 58rpx;
+	border-radius: 50%;
+	background: #ffffff;
+}
+
+.result-title {
+	margin-top: 34rpx;
+	font-weight: 600;
+	font-size: 40rpx;
+	color: #333333;
+	line-height: 56rpx;
+	text-align: center;
+}
+
+.result-desc {
+	margin-top: 8rpx;
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #b9b9b9;
+	line-height: 38rpx;
+	text-align: center;
+}
+
+.primary-btn {
+	width: 350rpx;
+	height: 80rpx;
+	margin-top: 144rpx;
+	border: 1rpx solid #ff4b67;
+	border-radius: 40rpx;
+	box-sizing: border-box;
+	background: #ffffff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-weight: 400;
+	font-size: 30rpx;
+	color: #ff4767;
+	line-height: 42rpx;
+}
+</style>
diff --git a/pages/home/growth-package.vue b/pages/home/growth-package.vue
new file mode 100644
index 0000000..723f526
--- /dev/null
+++ b/pages/home/growth-package.vue
@@ -0,0 +1,348 @@
+<template>
+	<view class="growth-package-page">
+		<image class="content-image" src="@/static/images/home/growth-package/intro.png" mode="widthFix"></image>
+		<view class="deal-carousel">
+			<swiper class="deal-swiper" autoplay circular :interval="3000" previous-margin="40rpx"
+				next-margin="40rpx" :current="dealCurrentIndex" @change="handleDealChange">
+				<swiper-item v-for="(item, index) in dealSlides" :key="item">
+					<view class="deal-slide" :class="getDealSlideClass(index)">
+						<image class="deal-slide-image" :src="item" mode="aspectFit"></image>
+					</view>
+				</swiper-item>
+			</swiper>
+			<view class="deal-indicator">
+				<view class="indicator-track" v-for="(item, index) in dealSlides" :key="item"
+					:class="{ active: index === dealCurrentIndex }"></view>
+			</view>
+		</view>
+		<image class="content-image" src="@/static/images/home/growth-package/plan.png" mode="widthFix"></image>
+
+		<view class="fixed-action" @tap="handlePayTap">
+			<image class="action-image" :src="actionImage" mode="widthFix"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+import request from "@/utils/request";
+
+export default {
+	name: "GrowthPackage",
+	data() {
+		return {
+			dealCurrentIndex: 0,
+			isPaying: false,
+			isJoined: false,
+			dealSlides: [
+				"/static/images/home/growth-package/deal-1.png",
+				"/static/images/home/growth-package/deal-2.png",
+				"/static/images/home/growth-package/deal-3.png",
+			],
+		};
+	},
+	computed: {
+		actionImage() {
+			return this.isJoined
+				? "/static/images/home/growth-package/action-success.png"
+				: "/static/images/home/growth-package/action.png";
+		},
+	},
+	onShow() {
+		this.getGrowthPackageStatus();
+	},
+	methods: {
+		async getGrowthPackageStatus() {
+			if (!uni.getStorageSync("accessToken")) {
+				this.isJoined = false;
+				return;
+			}
+			if (this.isPaying) return;
+			uni.showLoading({
+				title: "查询报名状态...",
+				mask: true,
+			});
+			try {
+				const res = await request.post(
+					"/sj/growthPackage/status",
+					{},
+					{
+						hideLoading: true,
+					}
+				);
+				this.isJoined = !!(res && res.code === 200 && res.data && Number(res.data.is_joined) === 1);
+			} catch (error) {
+				console.log("growthPackageStatus error", error);
+			} finally {
+				uni.hideLoading();
+			}
+		},
+		handleDealChange(event) {
+			this.dealCurrentIndex = event.detail.current;
+		},
+		getDealSlideClass(index) {
+			const length = this.dealSlides.length;
+			const prevIndex = (this.dealCurrentIndex + length - 1) % length;
+			const nextIndex = (this.dealCurrentIndex + 1) % length;
+			if (index === this.dealCurrentIndex) {
+				return "is-active";
+			}
+			if (index === prevIndex) {
+				return "is-prev";
+			}
+			if (index === nextIndex) {
+				return "is-next";
+			}
+			return "";
+		},
+		handlePayTap() {
+			if (this.isPaying) return;
+			if (this.isJoined) return;
+			if (!uni.getStorageSync("accessToken")) {
+				uni.navigateTo({
+					url: "/pages/blogPopup/blogPopup",
+				});
+				return;
+			}
+			uni.showActionSheet({
+				itemList: ["微信支付", "支付宝支付"],
+				success: (res) => {
+					const payKind = res.tapIndex === 0 ? 2 : 3;
+					this.createGrowthPackagePay(payKind);
+				},
+			});
+		},
+		async createGrowthPackagePay(payKind) {
+			this.isPaying = true;
+			uni.showLoading({
+				title: "支付中...",
+				mask: true,
+			});
+			try {
+				const payRes = await request.post(
+					"/sj/growthPackage/pay",
+					{
+						pay_kind: payKind,
+					},
+					{
+						hideLoading: true,
+					}
+				);
+				if (!payRes || payRes.code !== 200) {
+					uni.hideLoading();
+					this.isPaying = false;
+					if (payRes && payRes.data && (payRes.data.id || payRes.data.number)) {
+						this.goToPayResult("fail", payRes.data);
+						return;
+					}
+					uni.showToast({
+						title: (payRes && payRes.msg) || "支付请求失败",
+						icon: "none",
+					});
+					return;
+				}
+				const orderInfo = payRes.data || {};
+				if (Number(orderInfo.is_joined) === 1) {
+					uni.hideLoading();
+					this.isPaying = false;
+					this.isJoined = true;
+					this.goToPayResult("success", orderInfo.order || {});
+					return;
+				}
+				const paymentParams = orderInfo.pay_params || orderInfo.orderInfo;
+				if (!paymentParams) {
+					uni.hideLoading();
+					this.isPaying = false;
+					if (orderInfo.id || orderInfo.number) {
+						this.goToPayResult("fail", orderInfo);
+						return;
+					}
+					uni.showToast({
+						title: "支付参数缺失",
+						icon: "none",
+					});
+					return;
+				}
+				uni.hideLoading();
+				this.requestGrowthPackagePayment(payKind, paymentParams, orderInfo);
+			} catch (error) {
+				uni.hideLoading();
+				uni.showToast({
+					title: "支付请求失败",
+					icon: "none",
+				});
+				this.isPaying = false;
+				console.log("growthPackagePay error", error);
+			}
+		},
+		requestGrowthPackagePayment(payKind, paymentParams, orderInfo) {
+			const provider = payKind === 2 ? "wxpay" : "alipay";
+			let payOrderInfo = paymentParams;
+			if (payKind === 2 && paymentParams && typeof paymentParams === "object") {
+				payOrderInfo = {
+					...paymentParams,
+				};
+				const systemInfo = uni.getSystemInfoSync();
+				if (systemInfo.platform === "ios" && payOrderInfo.appid) {
+					payOrderInfo.appId = payOrderInfo.appid;
+					delete payOrderInfo.appid;
+				}
+			}
+			uni.requestPayment({
+				provider,
+				orderInfo: payOrderInfo,
+				success: () => {
+					this.queryGrowthPackagePay(orderInfo);
+				},
+				fail: (err) => {
+					this.isPaying = false;
+					console.log("growthPackage requestPayment fail", err);
+					this.goToPayResult("fail", orderInfo);
+				},
+			});
+		},
+		async queryGrowthPackagePay(orderInfo) {
+			try {
+				const queryRes = await request.post(
+					"/sj/growthPackage/queryPay",
+					{
+						id: orderInfo.id,
+						number: orderInfo.number,
+					},
+					{
+						hideLoading: true,
+					}
+				);
+				const order = queryRes && queryRes.data && queryRes.data.order;
+				if (queryRes && queryRes.code === 200 && order && Number(order.state) === 2) {
+					this.isJoined = true;
+					this.goToPayResult("success", order);
+					return;
+				}
+				this.goToPayResult("fail", orderInfo);
+			} catch (error) {
+				console.log("growthPackageQueryPay error", error);
+				this.goToPayResult("fail", orderInfo);
+			} finally {
+				this.isPaying = false;
+			}
+		},
+		goToPayResult(status, orderInfo = {}) {
+			const params = [`status=${status}`];
+			if (orderInfo.number) {
+				params.push(`number=${encodeURIComponent(orderInfo.number)}`);
+			}
+			if (orderInfo.pay_money || orderInfo.order_money) {
+				params.push(`money=${encodeURIComponent(orderInfo.pay_money || orderInfo.order_money)}`);
+			}
+			uni.redirectTo({
+				url: `/pages/home/growth-package-result?${params.join("&")}`,
+			});
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+page {
+	background: #150903;
+}
+
+.growth-package-page {
+	min-height: 100vh;
+	padding-bottom: 259rpx;
+	background: #150903;
+
+	.content-image {
+		display: block;
+		width: 750rpx;
+	}
+
+	.deal-carousel {
+		position: relative;
+		width: 750rpx;
+		height: 1342rpx;
+		background: #000000;
+		overflow: hidden;
+	}
+
+	.deal-swiper {
+		width: 750rpx;
+		height: 1280rpx;
+		background: #000000;
+	}
+
+	.deal-slide {
+		position: relative;
+		width: 670rpx;
+		height: 1280rpx;
+		background: #000000;
+		overflow: hidden;
+	}
+
+	.deal-slide-image {
+		display: block;
+		width: 670rpx;
+		height: 1280rpx;
+	}
+
+	.deal-slide.is-prev,
+	.deal-slide.is-next {
+		height: 1169rpx;
+		margin-top: 56rpx;
+	}
+
+	.deal-slide.is-prev .deal-slide-image,
+	.deal-slide.is-next .deal-slide-image {
+		position: absolute;
+		top: -56rpx;
+	}
+
+	.deal-slide.is-prev .deal-slide-image {
+		right: 10rpx;
+		border-top-right-radius: 20rpx;
+		border-bottom-right-radius: 20rpx;
+	}
+
+	.deal-slide.is-next .deal-slide-image {
+		left: 10rpx;
+		border-top-left-radius: 20rpx;
+		border-bottom-left-radius: 20rpx;
+	}
+
+	.deal-indicator {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 62rpx;
+		column-gap: 8rpx;
+		background: #000000;
+	}
+
+	.indicator-track {
+		width: 146rpx;
+		height: 8rpx;
+		border-radius: 999rpx;
+		background: rgba(255, 255, 255, 0.42);
+	}
+
+	.indicator-track.active {
+		background: #ffffff;
+	}
+
+	.fixed-action {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 20;
+		width: 750rpx;
+		height: 259rpx;
+		background: #150903;
+	}
+
+	.action-image {
+		display: block;
+		width: 750rpx;
+	}
+}
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 65b041a..81d957a 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,430 +1,1659 @@
-<template>
-  <view class="homePage">
-    <view class="home-navbar">
-      <!-- <custom-navbar
-        title=""
-        :show-back="false"
-        title-color="#333333"
-        :backgroundColor="backgroundColor"
-      ></custom-navbar> -->
-      <view class="home_info">
-        <view class="home_info_left">
-          <view class="home_info_left_text" v-if="userInfo.id_type == 1">
-            <view class="nameText line-1">{{ nameText }}</view>
-            <view class="set_btn" @click="goAcceptSet">营业设置</view>
-          </view>
-          <view class="home_info_left_text" v-else-if="userInfo.id_type == 2">
-            <view class="nameText line-1">{{ nameText }}</view>
-            <view class="set_btn" @click="goAcceptSet">营业设置</view>
-          </view>
-          <view class="home_info_left_text" v-else>{{ nameText }}</view>
-          <view class="home_info_left_tip">{{ tipText }}</view>
-        </view>
-        <view class="home_info_right">
-         
-          <image
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/616767e1-e935-4c9c-a8e1-a099b6db4084.png"
-            class="home_info_right_img"
-          ></image>
-        </view>
-      </view>
-      <filters
-        :isLogin="isLogin"
-        :selfState="userInfo.self_state"
-        @secondClassLength="(e) => (secondLength = e)"
-      ></filters>
-    </view>
-	<upload-app-vue></upload-app-vue>
-	<TabBar :selected="0"></TabBar>
-  </view>
-</template>
-
-<script>
-import TabBar from "@/components/tabbar/tabbar.vue"
-import projectTabs from "./components/project-tabs.vue";
-import request from "@/utils/request";
-
-import filters from "./components/filters.vue";
-import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
-export default {
-  data() {
-    return {
-      secondLength: 2, //2级菜单所占排数
-      name: "",
-      statusBarHeight: 0,
-      listQuery: {},
-      latitude: "",
-      longitude: getApp().globalData.longitude,
-      latitude: getApp().globalData.latitude,
-      servers_region: getApp().globalData.servers_region,
-      address: getApp().globalData.address,
-      isLogin: false,
-      backgroundColor: "transparent",
-      syrId: null,
-      userInfo: {},
-      isShowCheckShop: false,
-      sjInfo: {},
-      sjList: [],
-    };
-  },
-  components: {
-    filters,
-    projectTabs,
-    CustomNavbar,
-	TabBar
-  },
-  computed: {
-    shopText() {
-      if (!this.isLogin) return "请选择门店";
-      if (this.sjInfo && this.sjInfo.id) return this.sjInfo.name;
-      return "全部门店";
-    },
-    tipText() {
-      if (!this.isLogin) return "登录后可体验更多服务";
-      if (this.userInfo.id_type == 1) return "欢迎登陆美融融商家！";
-
-      return "入驻后可体验更多服务";
-    },
-    nameText() {
-      if (!this.isLogin) return "欢迎登录美融融商家";
-      if (this.userInfo.id_type == 1){
-		  return this.userInfo.name || this.userInfo.nick_name;
-	  }
-      return "欢迎使用美融融商家";
-    },
-    // 判断是否账号已停止使用
-    isAccountDisabled() {
-      return this.userInfo?.is_ok === 2;
-    },
-  },
-  onShow() {
-    this.isLogin = uni.getStorageSync("accessToken") ? true : false;
-    if (this.isLogin) {
-      this.getUserInfo();
-    }
-  },
-  onLoad() {
-	  uni.hideTabBar();
-  },
-
-  methods: {
-    // 显示账号停用提示
-    showStopUseModal() {
-      uni.showModal({
-        title: "提示",
-        content:
-          "您的账号已停止使用。若有疑问或恢复需求，请尽快联系平台工作人员核实处理。",
-        showCancel: false,
-        confirmText: "我知道了",
-      });
-    },
-
-    goAcceptSet() {
-      // 添加访问检查
-      if (this.isAccountDisabled) {
-        this.showStopUseModal();
-        return;
-      }
-      uni.navigateTo({
-        url: "/pages/shop/set",
-      });
-    },
-    getUserInfo() {
-      request.post("/sj/user/getUser").then((result) => {
-        this.userInfo = result.data;
-        //存储用户id
-        uni.setStorageSync("syrId", result.data.id);
-        this.syrId = result.data.id;
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss">
-page {
-  // background: linear-gradient(to bottom, #fafafa, #ffffff);
-  background: #f5f5f5;
-}
-
-.homePage {
-  background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bf0dd63c-4205-4af5-a29f-8a9b4ee4188b.png");
-  background-position: 0 0;
-  background-size: 100%;
-  background-repeat: no-repeat;
-
-  .home-navbar {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    .home_info {
-      height: 238rpx;
-      box-sizing: border-box;
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-end;
-      padding: 0rpx 0rpx 0 30rpx;
-      .home_info_left {
-        padding-bottom: 30rpx;
-        .home_info_left_text {
-          font-family:
-            PingFangSC,
-            PingFang SC;
-          font-weight: 500;
-          font-size: 32rpx;
-          color: #333333;
-          text-align: left;
-          font-style: normal;
-          display: flex;
-          align-items: center;
-          .set_btn {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            width: 108rpx;
-            height: 34rpx;
-            background: linear-gradient(180deg, #eb6248 0%, #ea4e45 100%);
-            border-radius: 20rpx;
-            font-family:
-              PingFangSC,
-              PingFang SC;
-            font-weight: 500;
-            font-size: 20rpx;
-            color: #ffffff;
-            line-height: 28rpx;
-          }
-        }
-        .home_info_left_tip {
-          margin-top: 5rpx;
-          font-family:
-            PingFangSC,
-            PingFang SC;
-          font-weight: 400;
-          font-size: 26rpx;
-          color: #979797;
-          line-height: 37rpx;
-          text-align: left;
-          font-style: normal;
-        }
-      }
-
-      .home_info_right {
-        padding-right: 30rpx;
-        height: 181rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        .change_shop {
-          box-sizing: border-box;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          gap: 10rpx;
-          max-width: 270rpx;
-          height: 64rpx;
-          font-size: 28rpx;
-          background: rgba(255, 255, 255, 0.24);
-          border-radius: 33rpx;
-          border: 1rpx solid #bab8bf;
-          padding: 16rpx 13rpx 16rpx 20rpx;
-          .change_shop_logo {
-            width: 34rpx;
-            height: 32rpx;
-            flex-shrink: 0;
-          }
-          .change_down_logo {
-            flex-shrink: 0;
-            width: 16rpx;
-            height: 10rpx;
-          }
-          .line-1 {
-            font-size: 28rpx;
-          }
-        }
-        .home_info_right_img {
-          width: 367rpx;
-          height: 143rpx;
-        }
-      }
-    }
-  }
-}
-
-//搜索组件样式渗透
-::v-deep .uni-input-placeholder {
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #cccccc;
-  line-height: 34rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-::v-deep .uv-icon__img {
-  width: 34rpx !important;
-  height: 34rpx !important;
-}
-
-//列表样式
-.list-item {
-  align-items: flex-start;
-  background: #ffffff;
-  border-radius: 20rpx;
-  margin-bottom: 20rpx;
-
-  .list-item-left {
-    .list-item-left-img {
-      width: 172rpx;
-      height: 172rpx;
-      margin-right: 30rpx;
-    }
-  }
-
-  .list-item-right {
-    height: 172rpx;
-    align-content: space-between;
-    flex-wrap: wrap;
-    display: flex;
-    flex: 1;
-    padding-bottom: 30rpx;
-    border: none;
-
-    .list-item-right-left {
-      font-weight: 500;
-      font-size: 30rpx;
-      color: #333333;
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-    }
-
-    .list-item-right-right {
-      font-weight: 500;
-      font-size: 34rpx;
-      color: #e8101e;
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-      width: 100%;
-      display: flex;
-      flex-wrap: nowrap;
-      justify-content: space-between;
-      align-items: center;
-
-      .list-item-right-right-img {
-        font-weight: 400;
-        font-size: 24rpx;
-        color: #ffffff;
-        line-height: 33rpx;
-        text-align: left;
-        font-style: normal;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 94rpx;
-        height: 44rpx;
-        background: linear-gradient(122deg, #fe78b3 0%, #e8101e 100%);
-        border-radius: 22rpx;
-      }
-    }
-  }
-}
-
-.list-container {
-  padding: 0rpx !important;
-}
-
-.list-scroll {
-  margin-top: 0rpx !important;
-}
-.line-1 {
-  white-space: nowrap; /* 防止文本换行 */
-  overflow: hidden; /* 隐藏溢出的内容 */
-  text-overflow: ellipsis; /* 显示省略号来代表被裁剪的文本 */
-}
-.nameText {
-  max-width: 233rpx;
-  margin-right: 12rpx;
-}
-.mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 100vh;
-  width: 100vw;
-  background-color: rgba(0, 0, 0, 0.4);
-  z-index: 1000;
-}
-.change_shop {
-  position: relative;
-  .select_box {
-    box-sizing: border-box;
-    position: absolute;
-    top: 70rpx;
-    right: 0;
-    width: 471rpx;
-    background-color: #fff;
-    overflow-y: auto;
-    z-index: 10000;
-    border-radius: 32rpx;
-    padding: 30rpx 24rpx 20rpx 24rpx; /* 调整上下内边距 */
-    max-height: 60vh;
-
-    /* 添加滚动条样式 */
-    &::-webkit-scrollbar {
-      width: 8rpx;
-    }
-
-    &::-webkit-scrollbar-track {
-      background: #f1f1f1;
-      border-radius: 4rpx;
-    }
-
-    &::-webkit-scrollbar-thumb {
-      background: #c1c1c1;
-      border-radius: 4rpx;
-    }
-
-    &::-webkit-scrollbar-thumb:hover {
-      background: #a8a8a8;
-    }
-
-    .select_item {
-      margin-bottom: 20rpx;
-      padding-bottom: 20rpx;
-      border-bottom: 2rpx solid #f1f1f1;
-      display: flex;
-      gap: 10rpx;
-      align-items: center;
-
-      &:last-child {
-        margin-bottom: 0;
-        border-bottom: none;
-      }
-
-      .line-1 {
-        max-width: 311rpx;
-        flex: 1;
-      }
-      .tag {
-        width: 102rpx;
-        height: 40rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        color: #fff;
-        border-radius: 10rpx;
-        font-size: 26rpx;
-        flex-shrink: 0;
-      }
-      .red {
-        background-color: #fe5855;
-      }
-      .gray {
-        background: #999999;
-      }
-    }
-  }
-}
-</style>
+<template>
+	<view class="homePage">
+		<image class="page-bg"
+			src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0901dc51-ff5a-427f-aab1-993d80aced79.png"
+			mode="widthFix"></image>
+
+		<view class="header-section">
+			<view class="user-info" @tap="handleLoginRedirect">
+				<image mode="aspectFill" class="avatar" :src="currentAvatar"></image>
+				<view class="info-text">
+					<view class="name">{{ currentName }}</view>
+					<view class="desc">欢迎登录美融融商家版</view>
+				</view>
+			</view>
+
+			<view class="status-toggle" :class="{ 'is-closed': !isOpenStore }" @tap="toggleStatus"
+				v-if="isLogin && userInfo.id_type > 0">
+				<text class="status-text">{{ isOpenStore ? '营业中' : '休息中' }}</text>
+				<view class="toggle-dot"></view>
+			</view>
+		</view>
+
+		<view class="home-banner" @tap="goToGrowthPackage">
+			<image class="home-banner-img" src="@/static/images/home/banner.png" mode="aspectFill"></image>
+		</view>
+
+		<view class="setup-modal-mask" v-if="showSetupModal" catchtouchmove="true">
+			<view class="setup-modal-content">
+				<image class="modal-bg"
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ac2cb4aa-a7c5-4776-98f4-b77e9c0cfa85.png">
+				</image>
+
+				<view class="modal-header">
+					<text>温馨提示</text>
+				</view>
+
+				<view class="modal-body">
+					<text class="modal-subtitle">发布服务请完善以下资料：</text>
+
+					<view class="missing-list">
+						<view class="missing-item" v-if="!hasBusinessTime">
+							<view class="item-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+								</image>
+								<view class="item-texts">
+									<text class="item-title">营业时间未配置</text>
+									<text class="item-desc">请完善店铺的营业时间</text>
+								</view>
+							</view>
+							<view class="item-right orange" @tap="goToBusinessTime">去配置</view>
+						</view>
+
+						<view class="missing-item" v-if="!hasServiceSkill">
+							<view class="item-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+								</image>
+								<view class="item-texts">
+									<text class="item-title">服务技能未配置</text>
+									<text class="item-desc">请完善服务技能</text>
+								</view>
+							</view>
+							<view class="item-right orange" @tap="goToServiceSkill">去配置</view>
+						</view>
+
+						<view class="missing-item" v-if="!isCertified">
+							<view class="item-left">
+								<image class="item-icon"
+									:src="isUnderReview ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'">
+								</image>
+								<view class="item-texts">
+									<!-- 只有在审核中时赋予蓝色样式 blue-text -->
+									<text class="item-title" :class="{ 'blue-text': isUnderReview }">{{ isUnderReview ?
+										'资质认证中' : '资质未认证' }}</text>
+									<text class="item-desc">请完成资质认证</text>
+								</view>
+							</view>
+							<!-- 只有在审核中时为灰色，其余未认证状态为浅绿色 light-green -->
+							<view class="item-right" :class="isUnderReview ? 'grey' : 'light-green'" @tap="goToAuth">
+								{{ isUnderReview ? '查看进度' : '去认证' }}
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="modal-footer">
+					<view class="btn-know" @tap="closeSetupModal">知道了</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="settlement-guide card-box" v-if="isLogin && isUserInfoLoaded && !isCertified">
+			<view class="guide-header"
+				:style="{ backgroundImage: 'url(' + (isSettled ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c3a6cdd8-0447-4b50-a8cc-7bab1eedb502.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/138ccbc3-486d-4287-b67f-f809de99e408.png') + ')' }">
+				<view class="guide-body">
+					<text class="guide-text">{{ isSettled ? '完成认证，开启您的接单之路' : '入驻美融融，生意更轻松' }}</text>
+					<view class="guide-btn" @tap="goToSettle">{{ isSettled ? '去认证' : '去入驻' }}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="quick-actions card-box" v-if="isLogin && isCertified">
+			<view class="action-item" v-for="(item, index) in quickActions" :key="index" @tap="handleQuickAction(item)">
+				<image class="action-icon" :src="item.icon"></image>
+				<text class="action-text">{{ item.name }}</text>
+			</view>
+		</view>
+
+		<view class="order-stats-basic card-box" v-if="isLogin && isCertified">
+			<view class="card-header">
+				<view class="header-left">
+					<text class="title">接单管理</text>
+					<text class="update-time">更新时间：{{ orderBasic.updateTime }}</text>
+					<image class="refresh-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png"
+						@tap="fetchOrderNum"></image>
+				</view>
+				<view class="header-right" @tap="goToOrderList">更多数据 <image class="more-right-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png">
+					</image>
+				</view>
+			</view>
+			<view class="stats-content" @tap="goToOrderList">
+				<view class="stat-item">
+					<text class="num">{{ orderBasic.waitStart }}</text>
+					<text class="label">待开始</text>
+				</view>
+				<view class="stat-item">
+					<text class="num">{{ orderBasic.waitFinish }}</text>
+					<text class="label">待完成</text>
+				</view>
+				<view class="stat-item">
+					<text class="num">{{ orderBasic.finished }}</text>
+					<text class="label">已取消</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="order-stats-detail card-box" v-if="isLogin && isCertified">
+			<view class="card-header">
+				<view class="header-left">
+					<text class="title">当日实时数据</text>
+					<text class="update-time">更新时间：{{ orderDetail.updateTime }}</text>
+					<image class="refresh-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png"
+						@tap="fetchRealTimeData"></image>
+				</view>
+			</view>
+			<view class="detail-content">
+				<view class="score-dashboard">
+					<view class="ring-track"></view>
+					<view class="ring-progress" :style="{ 'background': progressGradient }"></view>
+					<view class="dot start-dot" v-if="displayScore > 0"></view>
+					<view class="dot end-dot" v-if="displayScore > 0"
+						:style="{ 'transform': `rotate(-${displayScoreDeg}deg) translateY(-67rpx)` }"></view>
+					<text class="score-num">{{ displayScore.toFixed(1) }}</text>
+					<image class="score-tag-img"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/52005bc0-2896-407d-8826-f34539637d20.png"
+						mode="aspectFit"></image>
+				</view>
+
+				<view class="detail-grid">
+					<view class="grid-item">
+						<text class="label">访问人数</text>
+						<view class="val-box"><text class="val">{{ orderDetail.visitors }}</text> <text
+								class="unit">人</text></view>
+						<text class="yesterday">昨日{{ orderDetail.yVisitors }}人</text>
+					</view>
+					<view class="grid-item">
+						<text class="label">下单量</text>
+						<view class="val-box"><text class="val">{{ orderDetail.orders }}</text> <text
+								class="unit">单</text></view>
+						<text class="yesterday">昨日{{ orderDetail.yOrders }}单</text>
+					</view>
+					<view class="grid-item">
+						<text class="label">成交金额</text>
+						<view class="val-box">
+							<text class="val">{{ formattedAmount.val }}</text>
+							<text class="unit">{{ formattedAmount.unit }}</text>
+						</view>
+						<text class="yesterday">昨日{{ formattedYAmount.val }}{{ formattedYAmount.unit }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="notice-bar card-box" v-if="noticeList.length > 0">
+			<image class="notice-icon"
+				src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/75f624b8-a6ed-4787-9380-1a087062805b.png">
+			</image>
+			<swiper class="notice-swiper" vertical autoplay circular interval="3000">
+				<swiper-item v-for="(msg, index) in noticeList" :key="index" @tap="goToNotice(msg)">
+					<text class="notice-text line-1">{{ msg.title }}</text>
+				</swiper-item>
+			</swiper>
+			<view class="notice-btn" @tap="goToNoticeList">点击查看</view>
+		</view>
+
+		<view class="brands-section card-box">
+			<view class="card-header">
+				<view class="header-left"><text class="title" style="margin-left: 10rpx;">精选品牌</text></view>
+				<view class="header-right brand-more" @tap="goToBrandList">更多品牌 <image class="more-right-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png">
+					</image>
+				</view>
+			</view>
+
+			<view class="brand-grid">
+				<brand-card class="brand-card-wrap" v-for="(item, index) in brands" :key="index" :item="item"
+					:tagKeys="item.tagKeys"></brand-card>
+			</view>
+			<view class="home-empty" v-if="brands.length === 0">
+				<noData top="20rpx"></noData>
+			</view>
+		</view>
+
+		<view class="skills-section card-box">
+			<view class="card-header">
+				<view class="header-left"><text class="title">技能集市</text></view>
+				<view class="header-right" @tap="goToSkillList">更多技能 <image class="more-right-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png">
+					</image>
+				</view>
+			</view>
+			<view class="skill-list">
+				<skill-card v-for="(item, index) in skills" :key="index" :item="item"></skill-card>
+			</view>
+			<view class="home-empty" v-if="skills.length === 0">
+				<noData top="20rpx"></noData>
+			</view>
+		</view>
+
+		<view style="height: 120rpx;"></view>
+		<TabBar :selected="0"></TabBar>
+	</view>
+</template>
+
+<script>
+// 全局变量：用于控制每次杀进程启动后，只在首页弹一次弹窗
+let hasShownSetupModal = false;
+
+import TabBar from "@/components/tabbar/tabbar.vue"
+import projectTabs from "./components/project-tabs.vue";
+import request from "@/utils/request";
+import filters from "./components/filters.vue";
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+import BrandCard from "./components/brand-card.vue";
+import SkillCard from "./components/skill-card.vue";
+
+export default {
+	components: {
+		filters,
+		projectTabs,
+		CustomNavbar,
+		TabBar,
+		BrandCard,
+		SkillCard
+	},
+	data() {
+		return {
+			isLogin: false,
+			isUserInfoLoaded: false, // 新增：标识用户信息是否已经加载完毕
+			userInfo: {},
+			authDetails: null, // 用于存储获取到的真实入驻详情配置
+			sjId: null,
+
+			showSetupModal: false, //  弹窗开关控制
+
+			displayScore: 0,
+			animationTimer: null,
+
+			noticeList: [],
+
+			quickActions: [{
+				name: '扫码验券',
+				icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png',
+				path: '/pages/shop/verify/verify-order'
+			},
+			{
+				name: '服务管理',
+				icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a90f02a2-9d39-440a-ad20-a4337bcd1b38.png',
+				path: '/pages/artisan/service-list'
+			},
+			{
+				name: '工位管理',
+				icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4c503603-6c2f-4a7a-9329-5e54b8ca769e.png',
+				path: '/pages/shop/workSpace/list'
+			},
+			{
+				name: '财务管理',
+				icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/728c659e-e395-4473-b83e-7e04539f7ec6.png',
+				path: '/pages/wallet/wallet'
+			}
+			],
+			orderBasic: {
+				updateTime: '--:--',
+				waitStart: 0,
+				waitFinish: 0,
+				finished: 0
+			},
+			orderDetail: {
+				updateTime: '--:--',
+				score: '0.0',
+				visitors: 0,
+				yVisitors: 0,
+				orders: 0,
+				yOrders: 0,
+				amount: '0.00',
+				yAmount: '0.00'
+			},
+
+			brands: [],
+			skills: []
+		};
+	},
+	computed: {
+		// 格式化今日成交金额
+		formattedAmount() {
+			return this.formatMoney(this.orderDetail.amount);
+		},
+		// 格式化昨日成交金额
+		formattedYAmount() {
+			return this.formatMoney(this.orderDetail.yAmount);
+		},
+		// 依靠后端实际返回的资料详情来判断是否真的提交过申请，而不是无脑信 id_type: -1
+		isUnderReview() {
+			if (!this.isLogin) return false;
+			// 只要拿到了具体的入驻详情数据对象（比如填了各种地址、执照等，内容肯定不为空），就说明填过表了
+			if (this.authDetails && Object.keys(this.authDetails).length > 0) {
+				// 如果后端是用特定的状态值判断，比如 this.authDetails.state === 0，你可以自己加 && 后面
+				return true;
+			}
+			return false; // 啥也没返回，说明只是刚注册没填资料
+		},
+
+		// 判断是否具备接单的大前提条件
+		canOpenStore() {
+			return this.hasBusinessTime && this.hasServiceSkill && this.isCertified;
+		},
+		// 修复：使用 authDetails 里的真实接口返回字段判定服务技能
+		hasServiceSkill() {
+			// 检查 userInfo 中是否有值
+			const fromUser = this.userInfo && Array.isArray(this.userInfo.servers_kill) && this.userInfo.servers_kill
+				.length > 0;
+			// 检查 authDetails 中是否有值
+			const fromAuth = this.authDetails && Array.isArray(this.authDetails.servers_kill) && this.authDetails
+				.servers_kill.length > 0;
+
+			// 只要有一边配了，就算已配置
+			return this.isLogin && (fromUser || fromAuth);
+		},
+
+		// 状态显示完全由计算属性控制，去除了手动修改可能导致的冲突
+		isOpenStore() {
+			// 如果连开门的前提条件都没满足，强制显示“休息中”
+			if (!this.canOpenStore) {
+				return false;
+			}
+			// 满足条件后，听后端的 (使用 == 防止后端返回字符串 "1")
+			return this.userInfo.order_taking == 1;
+		},
+
+		// 状态管理判定
+		// 是否已入驻 (0: 未入驻, -1: 入驻第一步, >0: 已认证) 只要不等于0，说明已经开启了入驻流程
+		isSettled() {
+			// 加上 typeof 判断，防止初始空对象时 undefined !== 0 造成的误判
+			if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+			return this.userInfo.id_type !== 0;
+		},
+		// 是否认证通过 (根据规则，> 0 说明认证通过了)
+		isCertified() {
+			if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+			return this.userInfo.id_type > 0;
+		},
+		// 优化：兼容判定营业时间（userInfo 和 authDetails 里只要有就算配置了）
+		hasBusinessTime() {
+			const timeFromUser = this.userInfo && this.userInfo.business_time;
+			const timeFromAuth = this.authDetails && this.authDetails.business_time;
+			return this.isLogin && !!(timeFromUser || timeFromAuth);
+		},
+
+		// 根据登录状态动态返回头像
+		currentAvatar() {
+			if (!this.isLogin || !this.userInfo.head_photo) {
+				return 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4099a78b-d3bd-4cf5-8599-68dfe751af16.png'; // 默认未登录头像
+			}
+			return this.userInfo.head_photo;
+		},
+		// 根据登录状态动态返回昵称
+		currentName() {
+			if (!this.isLogin) return '未登录';
+			return this.userInfo.name || this.userInfo.nick_name || '手机用户';
+		},
+		displayScoreDeg() {
+			const score = this.displayScore || 0;
+			const percentage = Math.min(Math.max(score, 0), 100);
+			return (percentage / 100) * 360;
+		},
+		progressGradient() {
+			return `conic-gradient(
+        transparent 0deg,
+        transparent calc(360deg - ${this.displayScoreDeg}deg),
+        #FF4D4F calc(360deg - ${this.displayScoreDeg}deg),
+        #FF4D4F 360deg
+      )`;
+		}
+	},
+	onShow() {
+		this.refreshPageState();
+	},
+	onPullDownRefresh() {
+		// 1. 重新请求首页需要的所有数据
+		this.refreshPageState();
+
+		// 2. 停止下拉刷新的动画
+		setTimeout(() => {
+			uni.stopPullDownRefresh();
+		}, 500);
+	},
+	onLoad() {
+		uni.hideTabBar();
+		uni.$on('appShowRefresh', this.refreshPageState);
+	},
+	onUnload() {
+		uni.$off('appShowRefresh', this.refreshPageState);
+	},
+	watch: {
+		'orderDetail.score'() {
+			this.animateScore();
+		}
+	},
+	methods: {
+		refreshPageState() {
+			const hasToken = !!uni.getStorageSync("accessToken");
+			this.isLogin = hasToken;
+			if (hasToken) {
+				this.getUserInfo();
+			} else {
+				this.userInfo = {};
+				this.authDetails = null;
+				this.isUserInfoLoaded = false;
+				this.sjId = null;
+			}
+			// 通知、品牌、技能 这三个接口不强依赖登录，无论登没登录都获取
+			this.fetchNoticeList();
+			this.fetchBrandList();
+			this.fetchSkillList();
+		},
+		// 金额转换万单位处理
+		formatMoney(amount) {
+			let num = parseFloat(amount);
+			if (isNaN(num)) return {
+				val: '0',
+				unit: '元'
+			};
+
+			if (num >= 10000) {
+				// 达到一万及以上，除以10000，最多保留两位小数（parseFloat会自动去掉末尾的0）
+				let val = parseFloat((num / 10000).toFixed(2));
+				return {
+					val: val,
+					unit: '万元'
+				};
+			}
+			// 小于一万，原样返回，单位为元
+			return {
+				val: parseFloat(num.toFixed(2)),
+				unit: '元'
+			};
+		},
+		// 处理登录跳转
+		handleLoginRedirect() {
+			// 如果 isLogin 为 false（未登录状态），则跳转到登录页
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+			}
+		},
+		goToGrowthPackage() {
+			uni.navigateTo({
+				url: '/pages/home/growth-package'
+			});
+		},
+		//  弹窗中的快捷跳转功能
+		closeSetupModal() {
+			this.showSetupModal = false;
+		},
+		goToBusinessTime() {
+			this.showSetupModal = false;
+			uni.navigateTo({
+				url: '/pages/shop/business-time'
+			});
+		},
+		goToServiceSkill() {
+			this.showSetupModal = false;
+			uni.navigateTo({
+				url: '/pages/shop/service-skills'
+			});
+		},
+
+		// 专门给【提示弹窗】点击用的 (查看进度 / 去认证)
+		goToAuth() {
+			// 1. 点击后先关闭提示弹窗
+			this.showSetupModal = false;
+
+			// 2. 根据咱们新的严谨判断，决定它是真提交了还是纯没填
+			if (this.isUnderReview) {
+				// === 查看进度 ===
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				// === 去认证 / 被驳回重新认证 ===
+				this.navigateToForm();
+			}
+		},
+
+		// 专门给【横幅】点击用的 (去入驻 / 去认证)
+		goToSettle() {
+			if (!this.isSettled) {
+				// 完全没入驻过（新手），从头开始
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			} else if (this.isUnderReview) {
+				// 如果在横幅里处于审核中，也送去进度页
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				// 已经开启入驻但没完成表单，继续去填表！
+				this.navigateToForm();
+			}
+		},
+
+		// 提取公共的【去填表】路由分发大脑
+		navigateToForm() {
+			if (this.isSettled) {
+				// 已经开启入驻（老手），直接空降到 ruzhu 的最后一个流程（第3步：门店信息）
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?step=3'
+				});
+			} else {
+				// 完全没入驻过（纯新手），老老实实从第 0 步开始
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			}
+		},
+
+		goToBrandList() {
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return;
+			}
+			if (this.brands.length === 0) {
+				uni.showToast({
+					title: '暂无数据',
+					icon: 'none'
+				});
+				return;
+			}
+			uni.navigateTo({
+				url: '/pages/jingxuan/selected-brands'
+			});
+		},
+		goToSkillList() {
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return;
+			}
+			if (this.skills.length === 0) {
+				uni.showToast({
+					title: '暂无数据',
+					icon: 'none'
+				});
+				return;
+			}
+			uni.navigateTo({
+				url: '/pages/jingxuan/selected-skills'
+			});
+		},
+		// 处理金刚区点击事件 (包含扫码验券核心逻辑)
+		handleQuickAction(item) {
+			if (item.name === '扫码验券') {
+				uni.navigateTo({
+					url: '/pages/shop/verify/verify-order',
+					fail: (err) => {
+						console.error('跳转失败：', err);
+					}
+				});
+				return;
+			} // 2. 通用跳转逻辑
+			else if (item.path) {
+				uni.navigateTo({
+					url: item.path,
+					fail: () => {
+						uni.showToast({
+							title: '页面开发中...',
+							icon: 'none'
+						});
+					}
+				});
+			}
+		},
+
+		// 格式化时间 (提取 HH:mm)
+		formatTime(dateTimeStr) {
+			if (!dateTimeStr) return '--:--';
+			const arr = dateTimeStr.split(' ');
+			if (arr.length > 1) {
+				return arr[1].substring(0, 5); // 截取 HH:mm
+			}
+			return dateTimeStr;
+		},
+
+		getUserInfo() {
+			this.isUserInfoLoaded = false;
+			return request.post("/sj/user/getUser").then((result) => {
+				if (result.code == 200 && result.data) {
+					this.userInfo = result.data;
+					this.isLogin = true;
+					this.isUserInfoLoaded = true; // 数据回来了，允许相关 UI 进行渲染
+					uni.setStorageSync("sjId", result.data.id);
+					this.sjId = result.data.id;
+
+					// 优化 1：只有完全通过认证，才去后台查单量和收益数据
+					if (this.isCertified) {
+						this.fetchOrderNum();
+						this.fetchRealTimeData();
+					}
+
+					// 优化 2：只要开启了入驻流程（哪怕只是在“去认证”阶段），依然需要拉详情来判断有没有补全三大件
+					if (this.isSettled) {
+						this.fetchAuthDetails();
+					}
+				}
+			}).catch((err) => {
+				if (!uni.getStorageSync("accessToken")) {
+					this.isLogin = false;
+					this.userInfo = {};
+					this.authDetails = null;
+					this.sjId = null;
+				}
+				this.isUserInfoLoaded = false;
+				console.error("首页获取商家信息失败:", err);
+			});
+		},
+
+		// 获取入驻、修改资料审核详情（获取服务技能、营业时间等准确数据）
+		fetchAuthDetails() {
+			request.post("/sj/userSjAuth/details", {
+				type: 1, // 审核类型 1入驻申请
+				id_type: '1' // 平台商家
+			}).then(res => {
+				if (res.code == 200 && res.data) {
+					this.authDetails = res.data;
+				}
+
+				// 只有确保拉到了配置详情后，再来判断三大件有没有配全
+				// 如果没有配全，且是首次大退打开进入首页，拉起弹窗
+				if (!this.canOpenStore && !hasShownSetupModal) {
+					this.showSetupModal = true;
+					hasShownSetupModal = true;
+				}
+			});
+		},
+
+		fetchOrderNum() {
+			request.post("/sj/poster/orderNum").then(res => {
+				if (res.code == 200 && res.data) {
+					this.orderBasic = {
+						updateTime: this.formatTime(res.data.now_date),
+						waitStart: res.data.dfw || 0,
+						waitFinish: res.data.dwc || 0,
+						finished: res.data.yqx || 0
+					};
+				}
+			});
+		},
+
+		// 获取：首页实时数据
+		fetchRealTimeData() {
+			request.post("/sj/poster/realTimeData").then(res => {
+				if (res.code == 200 && res.data) {
+					const today = res.data.today || {};
+					const yesterday = res.data.yesterday || {};
+
+					this.orderDetail = {
+						updateTime: this.formatTime(res.data.now_date),
+						score: today.rating_num || 0,
+						visitors: today.visitor_num || 0,
+						yVisitors: yesterday.visitor_num || 0,
+						orders: today.place_order || 0,
+						yOrders: yesterday.place_order || 0,
+						amount: today.deal_money || 0,
+						yAmount: yesterday.deal_money || 0
+					};
+				}
+			});
+		},
+
+		// 获取：通知公告列表
+		fetchNoticeList() {
+			request.post('/sj/notice/list', {
+				page: 1,
+				limit: 5
+			}).then(res => {
+				if (res.code == 200 && res.data && res.data.list.length > 0) {
+					this.noticeList = res.data.list;
+				}
+			});
+		},
+
+		// 获取：品牌列表
+		fetchBrandList() {
+			request.post('/sj/brand/list', {
+				page: 1,
+				limit: 4,
+				poster_recommend: 1
+			}).then(res => {
+				if (res.code == 200 && res.data && res.data.list) {
+					this.brands = res.data.list.map(item => {
+						let tags = [];
+						if (item.franchise_state === 1) tags.push('franchise');
+						if (item.student_state === 1) tags.push('recruit');
+						if (tags.length === 0) tags.push('more');
+
+						return {
+							id: item.id,
+							name: item.name,
+							bgSrc: item.cover_img ||
+								'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg',
+							avatar: item.logo_img ||
+								'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar',
+							tagKeys: tags
+						};
+					});
+				} else {
+					this.brands = [];
+				}
+			}).catch(() => {
+				this.brands = [];
+			});
+		},
+
+		// 获取：技能集市列表
+		fetchSkillList() {
+			request.post('/sj/skill/list', {
+				page: 1,
+				limit: 4,
+				poster_recommend: 1
+			}).then(res => {
+				if (res.code == 200 && res.data && res.data.list) {
+					this.skills = res.data.list.map(item => {
+						return {
+							id: item.id,
+							title: item.name,
+							type: item.link_name || '平台课程',
+							views: item.browse_num || 0,
+							time: item.create_time ? item.create_time.split(' ')[0] : '',
+							coverSrc: item.cover_img ||
+								'https://dummyimage.com/200x150/ccc/fff.png&text=Video',
+							typeIcon: item.link_logo || '',
+							video: item.video || ''
+						};
+					});
+				} else {
+					this.skills = [];
+				}
+			}).catch(() => {
+				this.skills = [];
+			});
+		},
+
+
+
+		// 跳转：通知详情页
+		goToNotice(msg) {
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return
+			}
+			if (msg.id) {
+				uni.navigateTo({
+					url: `/pages/notice/detail?id=${msg.id}`
+				});
+			}
+		},
+		// 跳转：通知公告列表页
+		goToNoticeList() {
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return
+			}
+			uni.navigateTo({
+				url: '/pages/notice/notice_list'
+			});
+		},
+		// 跳转：订单列表页
+		goToOrderList() {
+			uni.switchTab({
+				url: '/pages/order/userorder-list'
+			});
+		},
+
+		// 营业中 / 休息中 按钮逻辑判断
+		toggleStatus() {
+			const isCurrentlyResting = !this.isOpenStore; // 以页面实际展示状态为准
+
+			// 强力拦截：在休息中且三大件没配全，想要营业时拦截弹窗
+			if (isCurrentlyResting && !this.canOpenStore) {
+				this.showSetupModal = true;
+				return;
+			}
+
+			// 准备切换的新状态
+			let newStatus = this.isOpenStore ? 2 : 1;
+
+			// 加入一个防连点的 Loading
+			uni.showLoading({
+				title: '切换中...',
+				mask: true
+			});
+
+			// 发起请求告诉后端
+			request.post("/sj/sjordertaking", {
+				order_taking: newStatus,
+				sjid: this.sjId
+			}).then((res) => {
+				uni.hideLoading();
+				// 因为上一次的严格判断误伤了你，这里回归你最原始的写法，直接假定成功
+				this.userInfo.order_taking = newStatus; // 强行改一下本地状态让按钮动过去
+				this.getUserInfo(); // 无论如何刷新一下真实数据
+				uni.showToast({
+					title: newStatus == 1 ? '已开启营业' : '已休息',
+					icon: 'none'
+				});
+			}).catch(() => {
+				// 只有在彻底断网报错的情况下，才会弹下面这个
+				uni.hideLoading();
+				uni.showToast({
+					title: '网络异常，切换失败',
+					icon: 'none'
+				});
+			});
+		},
+
+		animateScore() {
+			const target = parseFloat(this.orderDetail.score) || 0;
+			if (this.animationTimer) clearInterval(this.animationTimer);
+
+			const start = this.displayScore;
+			const change = target - start;
+
+			if (Math.abs(change) < 0.05) {
+				this.displayScore = target;
+				return;
+			}
+
+			const frames = 30;
+			const duration = 600;
+			let currentFrame = 0;
+
+			this.animationTimer = setInterval(() => {
+				currentFrame++;
+				const progress = currentFrame / frames;
+				const easeProgress = 1 - Math.pow(1 - progress, 3);
+
+				this.displayScore = start + change * easeProgress;
+
+				if (currentFrame >= frames) {
+					this.displayScore = target;
+					clearInterval(this.animationTimer);
+				}
+			}, duration / frames);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #f5f6f8;
+}
+
+/* ============ 提示弹窗样式 ============ */
+.setup-modal-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 9999;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	.setup-modal-content {
+		width: 630rpx;
+		height: 775rpx;
+		/* 根据要求绝对固定宽高 */
+		background: #FFFFFF;
+		border-radius: 32rpx;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+
+		.modal-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 630rpx;
+			height: 265rpx;
+			z-index: 0;
+		}
+
+		.modal-header {
+			position: relative;
+			z-index: 1;
+			height: 150rpx;
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			padding-bottom: 20rpx;
+
+			text {
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #333333;
+				letter-spacing: 2rpx;
+			}
+		}
+
+		.modal-body {
+			position: relative;
+			z-index: 1;
+			flex: 1;
+			padding: 24rpx 40rpx;
+
+			.modal-subtitle {
+				font-size: 28rpx;
+				color: #333333;
+				margin-bottom: 40rpx;
+				display: block;
+			}
+
+			.missing-list {
+				display: flex;
+				flex-direction: column;
+				gap: 46rpx;
+				/* 间距拉开显得不那么拥挤 */
+
+				.missing-item {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.item-left {
+						display: flex;
+						align-items: flex-start;
+
+						.item-icon {
+							width: 32rpx;
+							height: 32rpx;
+							margin-right: 16rpx;
+							flex-shrink: 0;
+							/* 防止图标被挤压变形 */
+							margin-top: 6rpx;
+						}
+
+						.item-texts {
+							display: flex;
+							flex-direction: column;
+
+							.item-title {
+								font-size: 30rpx;
+								color: #333333;
+								font-weight: 500;
+								margin-bottom: 8rpx;
+
+								/* 增加蓝色字体样式 */
+								&.blue-text {
+									color: #2b85e4;
+								}
+							}
+
+							.item-desc {
+								font-size: 24rpx;
+								color: #999999;
+							}
+						}
+					}
+
+					.item-right {
+						font-size: 26rpx;
+						font-weight: 400;
+						margin-top: -45rpx;
+
+						&.orange {
+							color: #FF7B00;
+						}
+
+						&.grey {
+							color: #999999;
+						}
+
+						/* 增加浅绿色样式 */
+						&.light-green {
+							color: #5CAC81;
+						}
+					}
+				}
+			}
+		}
+
+		.modal-footer {
+			position: relative;
+			z-index: 1;
+			padding: 0 50rpx 50rpx;
+
+			.btn-know {
+				width: 100%;
+				height: 88rpx;
+				background: #FF4767;
+				border-radius: 44rpx;
+				color: #FFFFFF;
+				font-size: 32rpx;
+				font-weight: 500;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+}
+
+/* ==================================== */
+
+.homePage {
+	position: relative;
+	min-height: 100vh;
+	padding: 0 24rpx;
+	padding-top: 100rpx;
+
+	.page-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: 0;
+	}
+
+	.card-box {
+		position: relative;
+		z-index: 1;
+		background: #ffffff;
+		border-radius: 24rpx;
+		margin-bottom: 24rpx;
+		padding: 20rpx 30rpx 30rpx;
+	}
+
+	.more-right-icon {
+		width: 8rpx;
+		height: 14rpx;
+		margin-left: 6rpx;
+	}
+
+	.card-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 24rpx;
+
+		.header-left {
+			display: flex;
+			align-items: center;
+
+			.title {
+				margin-right: 20rpx;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #101010;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.update-time {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 22rpx;
+				color: #8E694D;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.refresh-icon {
+				width: 18rpx;
+				height: 18rpx;
+				margin-left: 10rpx;
+			}
+		}
+
+		.header-right {
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #666666;
+			line-height: 28rpx;
+		}
+
+		.brand-more {
+			font-size: 24rpx;
+		}
+	}
+
+	.header-section {
+		position: relative;
+		z-index: 1;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 24rpx;
+
+		.user-info {
+			display: flex;
+			align-items: center;
+
+			.avatar {
+				width: 76rpx;
+				height: 76rpx;
+				border-radius: 50%;
+				margin-right: 20rpx;
+			}
+
+			.name {
+				height: 42rpx;
+				font-family: PingFangTC, PingFangTC;
+				font-weight: 500;
+				font-size: 34rpx;
+				color: #333333;
+				line-height: 42rpx;
+			}
+
+			.desc {
+				height: 28rpx;
+				font-family: PingFangTC, PingFangTC;
+				font-weight: 400;
+				font-size: 22rpx;
+				color: #858796;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		.status-toggle {
+			position: relative;
+			width: 173rpx;
+			height: 62rpx;
+			display: flex;
+			align-items: center;
+			border-radius: 31rpx;
+			box-sizing: border-box;
+			overflow: hidden;
+
+			background-image: linear-gradient(316deg,
+					rgba(255, 161, 203, 1) 0,
+					rgba(251, 143, 180, 1) 49.381741%,
+					rgba(255, 130, 239, 1) 100%);
+			transition: all 0.3s ease;
+
+			&::before {
+				content: "";
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/269c1024-34ec-42af-8b20-1ce047c9851b.png") no-repeat center;
+				background-size: 100% 100%;
+				opacity: 0;
+				z-index: 1;
+				transition: opacity 0.3s ease;
+			}
+
+			.status-text {
+				position: absolute;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #FFFFFF;
+				line-height: 40rpx;
+				z-index: 3;
+				left: 22rpx;
+				transition: transform 0.3s cubic-bezier(0.25, 1, 0.5, 1);
+			}
+
+			.toggle-dot {
+				position: absolute;
+				top: 5rpx;
+				right: 5rpx;
+				width: 52rpx;
+				height: 52rpx;
+				background: #fff;
+				border-radius: 50%;
+				z-index: 3;
+				transition: transform 0.35s cubic-bezier(0.25, 1, 0.5, 1);
+			}
+
+			&.is-closed {
+				&::before {
+					opacity: 1;
+				}
+
+				.status-text {
+					transform: translateX(46rpx);
+				}
+
+				.toggle-dot {
+					transform: translate(-113rpx, 2rpx);
+				}
+			}
+		}
+	}
+
+	.home-banner {
+		position: relative;
+		z-index: 1;
+		width: 710rpx;
+		height: 266rpx;
+		margin-left: -4rpx;
+		margin-bottom: 24rpx;
+		border-radius: 24rpx;
+		overflow: hidden;
+
+		.home-banner-img {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.settlement-guide {
+		padding: 0;
+		overflow: hidden;
+
+		.guide-header {
+			width: 100%;
+			height: 248rpx;
+			background-size: cover;
+		}
+
+		.guide-body {
+			padding: 90rpx 0 50rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.guide-text {
+				margin-bottom: 20rpx;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+				line-height: 40rpx;
+			}
+
+			.guide-btn {
+				width: 534rpx;
+				height: 70rpx;
+				border-radius: 35rpx;
+				border: 1rpx solid #FF4767;
+
+				color: #FF4767;
+				font-weight: 500;
+				font-size: 28rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+
+	.quick-actions {
+		display: flex;
+		justify-content: space-around;
+		padding: 30rpx 10rpx;
+		background: #F3F4FD;
+
+		.action-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.action-icon {
+				width: 60rpx;
+				height: 60rpx;
+				margin-bottom: 13rpx;
+			}
+
+			.action-text {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #101010;
+				line-height: 33rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+	}
+
+	.order-stats-basic {
+		background: linear-gradient(176deg, #F0F4FF 0%, #FFFFFF 100%);
+		border-radius: 20rpx;
+		border: 1rpx solid #FFFFFF;
+
+		.stats-content {
+			display: flex;
+			justify-content: space-around;
+			text-align: center;
+
+			.num {
+				display: block;
+				font-weight: 500;
+				font-size: 40rpx;
+				color: #333333;
+				line-height: 56rpx;
+				font-style: normal;
+			}
+
+			.label {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #666666;
+				line-height: 33rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+	}
+
+	.order-stats-detail {
+		.detail-content {
+			display: flex;
+			align-items: center;
+
+			.score-dashboard {
+				position: relative;
+				width: 140rpx;
+				height: 140rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				margin-right: 40rpx;
+				flex-shrink: 0;
+
+				.ring-track {
+					position: absolute;
+					width: 130rpx;
+					height: 130rpx;
+					top: 5rpx;
+					left: 5rpx;
+					background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4189620a-fd4f-42eb-9977-817e521b4f12.png") no-repeat center;
+					background-size: contain;
+					z-index: 1;
+				}
+
+				.ring-progress {
+					position: absolute;
+					top: 2rpx;
+					left: 0;
+					width: 140rpx;
+					height: 140rpx;
+					border-radius: 50%;
+					mask: radial-gradient(transparent 62rpx, #000 65rpx);
+					-webkit-mask: radial-gradient(transparent 62rpx, #000 65rpx);
+					z-index: 2;
+				}
+
+				.dot {
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					width: 7rpx;
+					height: 7rpx;
+					background: #FF4D4F;
+					border-radius: 50%;
+					z-index: 3;
+					margin-top: -3.5rpx;
+					margin-left: -3.5rpx;
+				}
+
+				.start-dot {
+					transform: translateY(-66rpx);
+				}
+
+				.end-dot {
+					transform-origin: center center;
+					margin-left: -4rpx;
+					margin-top: -2rpx;
+				}
+
+				.score-num {
+					position: absolute;
+					font-family: AlimamaShuHeiTi, sans-serif;
+					font-weight: bold;
+					font-size: 34rpx;
+					color: #333333;
+					z-index: 3;
+				}
+
+				.score-tag-img {
+					position: absolute;
+					bottom: -10rpx;
+					width: 85rpx;
+					height: 35rpx;
+					z-index: 4;
+				}
+			}
+
+			.detail-grid {
+				flex: 1;
+				display: flex;
+				justify-content: space-between;
+
+				.grid-item {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+
+					.label {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #888888;
+						line-height: 33rpx;
+						margin-bottom: 12rpx;
+					}
+
+					.val-box {
+						display: flex;
+						align-items: baseline;
+						margin-bottom: 6rpx;
+
+						.val {
+							font-weight: 500;
+							font-size: 40rpx;
+							color: #333333;
+							line-height: 56rpx;
+						}
+
+						.unit {
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #888888;
+							line-height: 33rpx;
+							margin-left: 6rpx;
+						}
+					}
+
+					.yesterday {
+						margin-top: 6rpx;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #888888;
+						line-height: 33rpx;
+						text-align: center;
+					}
+				}
+			}
+		}
+	}
+
+	.notice-bar {
+		display: flex;
+		align-items: center;
+		padding: 13rpx 30rpx;
+		min-height: 66rpx;
+		box-sizing: border-box;
+		background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/3d9c6b4b-ef6f-4242-abd4-6194d13e02dc.png");
+		background-size: contain;
+
+		.notice-icon {
+			width: 25rpx;
+			height: 21rpx;
+			margin-right: 16rpx;
+		}
+
+		.notice-swiper {
+			flex: 1;
+			height: 40rpx;
+			line-height: 40rpx;
+
+			.notice-text {
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #30353C;
+			}
+		}
+
+		.notice-btn {
+			// font-weight: 400;
+			font-size: 22rpx;
+			color: #8D4C1B;
+			padding: 6rpx 18rpx;
+			border-radius: 30rpx;
+			border: 1rpx solid #8d4c1b50;
+			margin-left: 10rpx;
+			margin-bottom: 4rpx;
+			margin-top: 4rpx;
+		}
+	}
+
+	.brands-section {
+		padding: 20rpx 20rpx;
+
+		.brand-grid {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.brand-card-wrap {
+				width: 48.5%;
+				margin-bottom: 14rpx;
+			}
+		}
+	}
+
+	.home-empty {
+		height: 360rpx;
+		display: flex;
+		justify-content: center;
+	}
+
+	.skills-section {
+		.skill-list {
+			display: flex;
+			flex-direction: column;
+		}
+
+		.skill-item {
+			display: flex;
+			margin-bottom: 30rpx;
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+
+			.cover-box {
+				position: relative;
+				width: 224rpx;
+				height: 126rpx;
+				border-radius: 16rpx;
+				overflow: hidden;
+				margin-right: 24rpx;
+				flex-shrink: 0;
+
+				.cover {
+					width: 100%;
+					height: 100%;
+				}
+
+				.play-icon {
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					transform: translate(-50%, -50%);
+					width: 39rpx;
+					height: 39rpx;
+				}
+			}
+
+			.skill-info {
+				flex: 1;
+				display: flex;
+				min-width: 0;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.skill-title {
+					display: block;
+					font-size: 28rpx;
+					color: #333;
+					font-weight: 400;
+					line-height: 40rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+
+				.skill-type {
+					display: flex;
+					align-items: center;
+					font-size: 22rpx;
+					margin-top: 10rpx;
+
+					.type-icon {
+						border: 1rpx solid #D6CAC0;
+						width: 26rpx;
+						height: 26rpx;
+						margin-right: 8rpx;
+						border-radius: 50%;
+					}
+
+					.type-text {
+						background: #f9d3d760;
+						border-radius: 7rpx;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #E55463;
+						line-height: 33rpx;
+						padding: 2rpx 10rpx 0 10rpx;
+					}
+				}
+
+				.skill-stats {
+					font-size: 22rpx;
+					color: #999;
+					margin-top: 10rpx;
+					display: flex;
+					align-items: center;
+
+					.view-icon {
+						width: 26rpx;
+						height: 22rpx;
+						margin-right: 8rpx;
+						margin-top: -2rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.line-1 {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.line-2 {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+	}
+}
+</style>
diff --git a/pages/jingxuan/brand-detail.vue b/pages/jingxuan/brand-detail.vue
new file mode 100644
index 0000000..826ee7a
--- /dev/null
+++ b/pages/jingxuan/brand-detail.vue
@@ -0,0 +1,1369 @@
+<template>
+  <view class="brand-detail-page">
+
+    <custom-navbar :title="info.name || '品牌详情'"
+      :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60ae3383-6ff6-4f42-818b-d9b09a9bd0e0.png'"
+      :showUser="true" backgroundColor="#ffffff" titleColor="#333" borderBottom="none">
+      <template #right>
+        <view class="collect-btn" @click="toggleCollectStatus">
+          <text class="collect-icon" :class="{ active: isCollected }">★</text>
+        </view>
+      </template>
+    </custom-navbar>
+
+    <!-- 顶部导航栏扩展：动态计算位置的拨号图标 -->
+    <view class="nav-phone-wrap" :style="{ top: phoneIconTop + 'px', right: phoneIconRight + 'px' }" @click="makeCall">
+      <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c164280f-1ab9-41b4-9d60-846368364e9c.png"
+        class="nav-phone-icon"></image>
+    </view>
+
+    <!-- <view class="mock-switch" @click="toggleMockData">
+      <text>{{ useMockData ? '关闭模拟数据' : '开启模拟数据' }}</text>
+    </view> -->
+
+    <view class="banner-section" v-if="bannerList && bannerList.length">
+
+      <!-- 轮播图区域 -->
+      <swiper class="banner-swiper" circular @change="onSwiperChange" :autoplay="true" :current="currentBannerIndex">
+        <swiper-item v-for="(item, index) in bannerList" :key="index">
+          <image class="banner-img" :src="item" mode="aspectFill"></image>
+          <!-- 第一张图上显示视频播放按钮 -->
+          <view v-if="index === 0 && info.video" class="video-play-overlay" @click="playVideo">
+            <image class="video-play-icon"
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/107eb3d6-cb8f-4857-aaf0-8654203c1c52.png"
+              mode="aspectFit"></image>
+          </view>
+        </swiper-item>
+      </swiper>
+
+      <!-- 指示器 -->
+      <view class="indicator" v-if="bannerList.length > 0">
+        <text>{{ currentBannerIndex + 1 }} / {{ bannerList.length }}</text>
+      </view>
+
+      <!-- 视频播放层 -->
+      <view v-if="showVideo" class="video-fullscreen-mask">
+        <video id="myVideo" class="fullscreen-video" :src="info.video" :autoplay="true" :controls="true"
+          object-fit="contain" :show-center-play-btn="true" :show-play-btn="true" @play="onVideoPlay"
+          @pause="onVideoPause" @ended="onVideoEnded">
+          <cover-view class="video-close-btn" @click.stop="closeVideo">
+            <cover-view class="video-close-icon" @click.stop="closeVideo">关闭</cover-view>
+          </cover-view>
+        </video>
+      </view>
+    </view>
+
+    <view class="intro-section" v-if="info.name">
+      <view class="section-title">品牌介绍</view>
+      <view class="intro-content" :class="{ 'is-expanded': isExpanded }">
+        <rich-text :nodes="formatDetailContent" class="intro-text"></rich-text>
+      </view>
+      <view class="expand-btn" @click="toggleExpand" v-if="info.detail && info.detail.length > 100">
+        <text class="expand-text">{{ isExpanded ? '收起查看' : '展开查看' }}</text>
+        <view class="arrow" :class="{ 'up': isExpanded }"></view>
+      </view>
+    </view>
+
+    <block v-if="showTabSection">
+      <view class="divider-bg"></view>
+      <view class="tab-section">
+        <view class="tab-header">
+          <view class="tab-item" v-for="(tab, index) in availableTabs" :key="tab.key"
+            :class="{ active: activeTab === index }" @click="switchTab(index)">
+            <!-- 加上 class="tab-text" 以便控制层级 -->
+            <text class="tab-text">{{ tab.name }}</text>
+            <view v-if="activeTab === index" class="active-line"></view>
+          </view>
+        </view>
+
+        <view class="tab-content" v-if="availableTabs[activeTab]">
+          <rich-text :nodes="availableTabs[activeTab].content"></rich-text>
+        </view>
+      </view>
+    </block>
+
+    <view class="divider-bg"></view>
+
+    <view class="form-section">
+      <!-- 动态标题：当选中学员招募时显示"立即咨询"，否则显示"在线留言" -->
+      <view class="section-title">{{ activeTabKey === 'student' ? '立即咨询' : '在线留言' }}</view>
+
+      <view class="form-list">
+        <view class="form-item">
+          <view class="label"><text class="required">*</text>姓名</view>
+          <input class="input-el" v-model="formData.contact_name" placeholder="请输入您的姓名" placeholder-class="ph-style" />
+        </view>
+
+        <view class="form-item">
+          <view class="label"><text class="required">*</text>手机号码</view>
+          <input class="input-el" type="number" maxlength="11" v-model="formData.contact_phone" placeholder="请输入您的手机号码"
+            placeholder-class="ph-style" />
+        </view>
+
+        <view class="form-item">
+          <view class="label"><text class="required">*</text>所在城市</view>
+          <!-- 替换为复用的弹窗选择器 -->
+          <view class="picker-el" @click="chooseLocation">
+            <view class="picker-value" :class="{ 'has-val': cityNameText }">
+              {{ cityNameText || '请选择省、市/区' }}
+              <view class="arrow-right"></view>
+            </view>
+          </view>
+        </view>
+
+        <view class="form-item">
+          <view class="label"><text class="required">*</text>意向</view>
+          <picker class="picker-el" :range="intentionOptions" range-key="label" @change="onIntentionChange">
+            <view class="picker-value" :class="{ 'has-val': intentionText }">
+              {{ intentionText || '请选择您的意向' }}
+              <view class="arrow-right"></view>
+            </view>
+          </picker>
+        </view>
+
+        <view class="form-item border-none" v-if="formData.intention === 1">
+          <view class="label"><text class="required">*</text>其他意向</view>
+          <input class="input-el" v-model="formData.intention_other" placeholder="请填写您的其他意向"
+            placeholder-class="ph-style" />
+        </view>
+      </view>
+
+      <button class="submit-btn" :class="{ 'is-active': canSubmit }" @click="submitForm">提交</button>
+    </view>
+
+    <!-- 所在地省市区选择复用弹窗 -->
+    <view class="popup" :class="{ show: showLocationPopupFlag }">
+      <view class="popup-mask" @click="hideLocationPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择所在地</text>
+          <text class="popup-close" @click="hideLocationPopup">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
+            :value="locationValue">
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">{{ item.province }}</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in locatinCitys" :key="index">{{ item.city }}</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in locationAreas" :key="index">{{ item.area }}</view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideLocationPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmLocationSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 拨打电话选择弹窗 -->
+    <view class="phone-popup" :class="{ show: showPhonePopup }">
+      <view class="phone-popup-mask" @click="closePhonePopup"></view>
+      <view class="phone-popup-content">
+        <view class="phone-popup-header">
+          <text class="phone-popup-title">拨打电话</text>
+        </view>
+        <view class="phone-popup-body">
+          <view class="phone-option" v-if="info.contact_phone" @click="selectPhone(info.contact_phone)">
+            <text class="phone-number">{{ info.contact_phone }}</text>
+          </view>
+          <view class="phone-option" v-if="info.alternate_phone" @click="selectPhone(info.alternate_phone)">
+            <text class="phone-number">{{ info.alternate_phone }}</text>
+          </view>
+        </view>
+        <view class="phone-popup-cancel" @click="closePhonePopup">
+          <text class="cancel-text">取消</text>
+        </view>
+      </view>
+    </view>
+
+    <tipsPopup2 :show="tipShow" @closePopup="closePopup" sureText="确认" @okBtn="okBtn">
+      {{ tipsText }}
+    </tipsPopup2>
+
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request";
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+import tipsPopup2 from "@/components/tips-popup/tips-popup2";
+import ChinaCitys from "@/static/data/ChinaCitys.json";
+
+export default {
+  components: {
+    CustomNavbar,
+    tipsPopup2 // 注册弹窗组件
+  },
+  data() {
+    return {
+      // 模拟数据开关
+      useMockData: false,
+
+      brandId: null,
+      info: {},
+      bannerList: [],
+
+      // ====== 收藏和登录相关的状态 ======
+      isLogin: false, // 登录状态
+      tipShow: false, // 弹窗控制
+      tipsText: "",   // 弹窗提示文本
+      tipType: "",    // 弹窗类型判断
+      showPhonePopup: false, // 拨打电话弹窗
+
+      isCollected: false, // 是否已收藏
+      // 未收藏时的灰色星星
+      iconCollectOff: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/561715a5-3de0-49f3-80e4-2662febec500.png',
+      // 已收藏时的粉色星星
+      iconCollectOn: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fe2011b0-a34d-46ee-911a-0ea6f099ad77.png',
+      // ==================================
+
+      phoneIconTop: 20,      // 顶部电话图标初始Top
+      phoneIconRight: 50,    // 顶部电话图标初始Right
+
+      currentBannerIndex: 0,
+      showVideo: false,
+      isVideoPlaying: false,
+      isExpanded: false,
+      activeTab: 0,
+
+      // 省市区选择器相关数据
+      showLocationPopupFlag: false,
+      indicatorStyle: 'height: 68rpx;',
+      ChinaCitys: [],
+      locatinCitys: [],
+      locationAreas: [],
+      locationValue: [0, 0, 0],
+
+      formData: {
+        id: null,
+        intention: '',
+        intention_other: '',
+        contact_name: '',
+        contact_phone: '',
+        province_code: '',
+        city_code: '',
+        area_code: ''
+      },
+
+      cityNameText: '',
+      intentionText: '',
+      hasSubmitted: false,
+      submittedData: null,
+
+      intentionOptions: [
+        { value: 2, label: '品牌加盟' },
+        { value: 3, label: '购买产品' },
+        { value: 4, label: '技能学习' },
+        { value: 1, label: '其它意向' }
+      ]
+    };
+  },
+  computed: {
+    // 获取当前选中的 tab 的 key，用于判断标题
+    activeTabKey() {
+      return this.availableTabs[this.activeTab]?.key || '';
+    },
+    formatDetailContent() {
+      const html = this.info.detail;
+      if (!html) return '<div style="color:#999;font-size:13px;text-align:center;">暂无品牌介绍</div>';
+
+      let newHtml = html.replace(/<img[^>]*>/gi, function (match) {
+        match = match.replace(/style\s*=\s*["'][^"']*["']/gi, '');
+        return match.replace(/<img/gi, '<img style="max-width:100%; height:auto; display:block; border-radius:20rpx; margin:8px 0;"');
+      });
+
+      newHtml = newHtml.replace(/<p[^>]*>/gi, '<p style="margin-bottom: 0px; line-height: 1.6; word-break: break-all;">');
+      return newHtml;
+    },
+    availableTabs() {
+      const tabs = [];
+
+      // 处理富文本图片和小程序样式丢失的绝佳方法
+      const formatRichText = (html) => {
+        if (!html) return '<div style="color:#999;font-size:13px;text-align:center;">暂无详细说明</div>';
+
+        let newHtml = html.replace(/<img[^>]*>/gi, function (match) {
+          match = match.replace(/style\s*=\s*["'][^"']*["']/gi, '');
+          return match.replace(/<img/gi, '<img style="max-width:100%; height:auto; display:block; border-radius:20rpx; margin:8px 0;"');
+        });
+
+        newHtml = newHtml.replace(/<p[^>]*>/gi, '<p style="margin-bottom: 0px; line-height: 1.6; word-break: break-all;">');
+        return newHtml;
+      };
+
+      if (this.info.franchise_state === 1) {
+        tabs.push({
+          key: 'franchise',
+          name: '加盟商招募',
+          content: formatRichText(this.info.franchise_recruit)
+        });
+      }
+      if (this.info.student_state === 1) {
+        tabs.push({
+          key: 'student',
+          name: '学员招募',
+          content: formatRichText(this.info.student_recruit)
+        });
+      }
+      return tabs;
+    },
+    showTabSection() {
+      return this.availableTabs.length > 0;
+    },
+
+    canSubmit() {
+      const d = this.formData;
+      const baseValid = d.contact_name && d.contact_phone && d.province_code && d.city_code && d.area_code && d.intention;
+      if (d.intention === 1) {
+        return baseValid && d.intention_other;
+      }
+      return baseValid;
+    }
+  },
+  onLoad(options) {
+    if (options && options.id) {
+      this.brandId = parseInt(options.id, 10);
+      this.formData.id = this.brandId;
+    }
+
+    // 初始化省市区数据
+    this.ChinaCitys = ChinaCitys;
+    if (this.ChinaCitys && this.ChinaCitys.length > 0) {
+      this.locatinCitys = this.ChinaCitys[0].citys;
+      this.locationAreas = this.locatinCitys[0].areas;
+    }
+
+    this.initNavLayout();
+    this.getBrandDetails();
+  },
+  onShow() {
+    // 每次进入页面时，根据 accessToken 刷新登录状态，就像 my-page 里面写的一样
+    this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+  },
+  onBackPress() {
+    if (this.showVideo) {
+      this.closeVideo();
+      return true;
+    }
+    return false;
+  },
+  methods: {
+    //  弹窗组件相关方法 
+    closePopup() {
+      this.tipShow = false;
+    },
+    okBtn() {
+      if (this.tipType == "login") {
+        uni.navigateTo({
+          url: "/pages/blogPopup/blogPopup", // 你们项目真实的登录页
+        });
+      }
+      this.tipShow = false; // 点击确认后关闭弹窗
+    },
+
+    // 点击右上角星星触发收藏/取消收藏
+    toggleCollectStatus() {
+      // 1. 调用你们自己的未登录弹窗逻辑
+      if (!this.isLogin) {
+        this.tipsText = "您现在还未登录，是否确定登录？";
+        this.tipShow = true;
+        this.tipType = "login";
+        return; // 拦截请求，不再往下执行
+      }
+
+      // 2. 逻辑判断
+      if (!this.brandId) return;
+      const targetState = this.isCollected ? 2 : 1;
+
+      // 3. 模拟环境 (Mock)
+      if (this.useMockData) {
+        this.isCollected = !this.isCollected;
+        uni.showToast({ title: this.isCollected ? '收藏成功(Mock)' : '已取消收藏(Mock)', icon: 'none' });
+        return;
+      }
+
+      // 4. 发送真实请求
+      uni.showLoading({ title: '处理中...', mask: true });
+      request.post("/sj/brand/collect", {
+        id: this.brandId,
+        state: targetState
+      }).then((res) => {
+        if (res.code == 200) {
+          this.isCollected = !this.isCollected;
+          uni.showToast({
+            title: this.isCollected ? '收藏成功' : '已取消收藏',
+            icon: 'none'
+          });
+        } else {
+          uni.showToast({ title: res.msg || '操作失败', icon: 'none' });
+        }
+      }).catch((err) => {
+        console.error('收藏接口异常', err);
+        // 既然拦截成功了，如果这里还是报错，那才是真正的网络不顺畅
+        uni.showToast({ title: '网络不太顺畅，请稍后再试', icon: 'none' });
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+
+    // 地区选择器相关方法
+    chooseLocation() {
+      this.showLocationPopupFlag = true;
+    },
+    hideLocationPopup() {
+      this.showLocationPopupFlag = false;
+    },
+    bindChangeLocation(e) {
+      this.locationValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.locatinCitys = this.ChinaCitys[index1].citys;
+      this.locationAreas = this.locatinCitys[index2].areas;
+    },
+    confirmLocationSelect() {
+      let valueArr = this.locationValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+
+      let province = this.ChinaCitys[index1].province;
+      let city = this.locatinCitys[index2].city;
+      let area = this.locationAreas[index3].area;
+
+      // 更新展示文本及表单数据
+      this.cityNameText = `${province} / ${city} / ${area}`;
+      this.formData.province_code = province;
+      this.formData.city_code = city;
+      this.formData.area_code = area;
+
+      this.showLocationPopupFlag = false;
+    },
+
+    initNavLayout() {
+      let sysInfo = uni.getSystemInfoSync();
+      // NavBar 通常高度是 44px，悬浮容器设置为 40px 高，居中 Y 为 +2px
+      let top = (sysInfo.statusBarHeight || 0) + 2;
+      // 默认距离右侧边距
+      let right = 50;
+
+      // #ifdef MP-WEIXIN
+      let menuBtn = uni.getMenuButtonBoundingClientRect();
+      if (menuBtn) {
+        top = menuBtn.top + (menuBtn.height / 2) - 20;
+        // 算出胶囊左侧的可用空间，再留出右侧搜索图标的距离(通常再向左偏移 45px 左右)
+        right = sysInfo.windowWidth - menuBtn.left + 45;
+      }
+      // #endif
+
+      this.phoneIconTop = top;
+      this.phoneIconRight = right;
+    },
+
+    // 拨打电话面板
+    makeCall() {
+      if (!this.isLogin) {
+        this.tipsText = "您现在还未登录，是否确定登录？";
+        this.tipShow = true;
+        this.tipType = "login";
+        return; // 拦截请求，不再往下执行
+      }
+
+      const contactPhone = this.info.contact_phone || '';
+      const alternatePhone = this.info.alternate_phone || '';
+
+      // 两个号码都存在，弹出自定义弹窗让用户选择
+      if (contactPhone && alternatePhone) {
+        this.showPhonePopup = true;
+      } else if (contactPhone) {
+        // 仅客服电话
+        this.doMakeCall(contactPhone);
+      } else if (alternatePhone) {
+        // 仅备用电话
+        this.doMakeCall(alternatePhone);
+      } else {
+        uni.showToast({ title: '暂无联系电话', icon: 'none' });
+      }
+    },
+
+    // 选择电话号码
+    selectPhone(phone) {
+      this.closePhonePopup();
+      this.doMakeCall(phone);
+    },
+
+    // 关闭电话弹窗
+    closePhonePopup() {
+      this.showPhonePopup = false;
+    },
+
+    // 执行拨号
+    doMakeCall(phone) {
+      uni.makePhoneCall({
+        phoneNumber: String(phone),
+        fail: (err) => {
+          console.log('取消拨打或拨打失败', err);
+        }
+      });
+    },
+
+    goAlbum() {
+      uni.navigateTo({
+        url: `/pages/album/index?id=${this.brandId}&user_type=2`
+      });
+    },
+
+    // 视频事件处理
+    playVideo() {
+      this.showVideo = true;
+    },
+    closeVideo() {
+      const videoContext = uni.createVideoContext('myVideo', this);
+      videoContext.stop();
+      this.showVideo = false;
+      this.isVideoPlaying = false;
+    },
+    onVideoPlay() {
+      this.isVideoPlaying = true;
+    },
+    onVideoPause() {
+      this.isVideoPlaying = false;
+    },
+    onVideoEnded() {
+      // 视频播放结束，关闭视频层
+      this.closeVideo();
+    },
+
+    // 悬浮按钮切换 Mock 数据
+    toggleMockData() {
+      this.useMockData = !this.useMockData;
+      uni.showToast({ title: this.useMockData ? 'Mock已开启' : 'Mock已关闭', icon: 'none' });
+      this.getBrandDetails();
+    },
+
+    getBrandDetails() {
+      if (this.useMockData) {
+        this.injectMockData();
+        return;
+      }
+
+      uni.showLoading({ title: '加载中...' });
+      request.post("/sj/brand/details", {
+        id: this.brandId
+      }).then((res) => {
+        if (res.code == 200 && res.data) {
+          this.info = res.data;
+          // 初始化收藏状态 (假设后端返回 1 为已收藏)
+          this.isCollected = res.data.collect_state === 1;
+          this.parseBanners();
+        } else {
+          uni.showToast({ title: res.msg || '获取详情失败', icon: 'none' });
+        }
+      }).catch((err) => {
+        console.error('获取品牌详情异常', err);
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+
+    injectMockData() {
+      this.info = {
+        name: '蜜丝卡伦美甲美睫',
+        contact_phone: '400-888-8888',
+        video: 'https://vjs.zencdn.net/v/oceans.mp4',
+        banner_imgs: [
+          'https://images.unsplash.com/photo-1610992015732-2449b76344bc?ixlib=rb-4.0.3&auto=format&fit=crop&w=750&q=80',
+          'https://images.unsplash.com/photo-1522337660859-02fbefca4702?ixlib=rb-4.0.3&auto=format&fit=crop&w=750&q=80'
+        ],
+        detail: '内容支持文本/图片上传(后台动态配置)——右侧支持图文/上传图片后转轮播。品牌优势、产品详情、常见问题、发展历程、品牌案例展示区等位。\n\n本品牌深耕行业多年，秉持匠心初心，不断为行业核心发展赋能，专注打造高品质、高性价比、契合大众需求的优质产品。\n品牌经验和可复制性开店闭环模型，从培训、选址、开店扶持到后期运营，展现老牌一站式辅导，并提供职业赋能，成就门店长效盈利、持久发展的秘诀。\n强大的自有生产供应链与专业团队，研发高端前沿技术，保证出新频率与前沿审美，满足各年龄段、覆盖不同场景下的多元使用诉求。\n自创立以来，品牌以真诚口碑立足市场，坚守诚信经营初心。积极致力于打造消费者、加盟商和社会大众三方信任的美业服务管家，获得广大用户信赖与认可。\n未来我们将持续坚守初心，优质服务升级，以更高标准打造全线产品，致力成为行业内极具竞争力与用户信赖的国民品牌，为广大用户传递更自信、更优质的变美体验。\n自创立以来，品牌以真诚口碑立足市场，坚守诚信经营初心，用心服务每一位消费者，凭借稳定出众的产品实力与贴心完善的售后保障，收获万千用户信赖与认可。自创立以来，品牌以真诚口碑立足市场，坚守诚信经营初心，用心服务每一位消费者，凭借稳定出众的产品实力与贴心完善的销售后保障，收获万千用户信赖与认可。',
+        franchise_state: 1,
+        franchise_recruit: `
+          <p>内容支持文本/图片上传(由后台动态化配置)——支持右侧上传视频/上传图片转轮播。品牌优势、产品详情、常见问题、发展历程、品牌案例/展示区等位。</p>
+          <img src="https://images.unsplash.com/photo-1604654894610-df63bc536371?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80" />
+        `,
+        student_state: 1,
+        student_recruit: `<p>学员招募介绍区域...</p>`
+      };
+      this.parseBanners();
+    },
+
+    parseBanners() {
+      if (!this.info.banner_imgs) {
+        this.bannerList = this.info.cover_img ? [this.info.cover_img] : ['https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6744da30-1cef-40ec-8274-f6395b530fe8.png'];
+        return;
+      }
+      try {
+        if (typeof this.info.banner_imgs === 'string') {
+          if (this.info.banner_imgs.includes(',')) {
+            this.bannerList = this.info.banner_imgs.split(',');
+          } else {
+            this.bannerList = JSON.parse(this.info.banner_imgs);
+          }
+        } else if (Array.isArray(this.info.banner_imgs)) {
+          this.bannerList = this.info.banner_imgs;
+        }
+      } catch (e) {
+        this.bannerList = [this.info.cover_img];
+      }
+    },
+
+    onSwiperChange(e) {
+      this.currentBannerIndex = e.detail.current;
+    },
+    toggleExpand() {
+      this.isExpanded = !this.isExpanded;
+    },
+    switchTab(index) {
+      this.activeTab = index;
+    },
+
+    onIntentionChange(e) {
+      const selectItem = this.intentionOptions[e.detail.value];
+      this.intentionText = selectItem.label;
+      this.formData.intention = selectItem.value;
+    },
+
+    submitForm() {
+      if (!this.canSubmit) {
+        uni.showToast({ title: '请填写完整必填信息', icon: 'none' });
+        return;
+      }
+
+      if (!/^1[3-9]\d{9}$/.test(this.formData.contact_phone)) {
+        uni.showToast({ title: '请输入合法的手机号码', icon: 'none' });
+        return;
+      }
+
+      // 检查是否重复提交
+      if (this.hasSubmitted && this.submittedData) {
+        const currentData = JSON.stringify({
+          contact_name: this.formData.contact_name,
+          contact_phone: this.formData.contact_phone,
+          province_code: this.formData.province_code,
+          city_code: this.formData.city_code,
+          area_code: this.formData.area_code,
+          intention: this.formData.intention,
+          intention_other: this.formData.intention_other
+        });
+        if (currentData === this.submittedData) {
+          uni.showModal({
+            title: '提示',
+            content: '未修改内容，不能再次提交',
+            showCancel: false,
+            confirmText: '知道了'
+          });
+          return;
+        }
+      }
+
+      if (this.useMockData) {
+        uni.showToast({ title: '模拟环境下留言提交成功！', icon: 'success' });
+        this.saveSubmittedData();
+        return;
+      }
+
+      uni.showLoading({ title: '正在提交...', mask: true });
+      request.post("/sj/brand/consult", this.formData).then((res) => {
+        if (res.code == 200) {
+          uni.showToast({ title: '留言提交成功！', icon: 'success', duration: 2000 });
+          this.saveSubmittedData();
+        } else {
+          uni.showToast({ title: res.msg || '提交失败', icon: 'none' });
+        }
+      }).catch((err) => {
+        uni.showToast({ title: '网络不太顺畅，请稍后再试', icon: 'none' });
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+
+    saveSubmittedData() {
+      this.hasSubmitted = true;
+      this.submittedData = JSON.stringify({
+        contact_name: this.formData.contact_name,
+        contact_phone: this.formData.contact_phone,
+        province_code: this.formData.province_code,
+        city_code: this.formData.city_code,
+        area_code: this.formData.area_code,
+        intention: this.formData.intention,
+        intention_other: this.formData.intention_other
+      });
+    },
+
+    resetForm() {
+      this.formData = {
+        id: this.brandId,
+        intention: '',
+        intention_other: '',
+        contact_name: '',
+        contact_phone: '',
+        province_code: '',
+        city_code: '',
+        area_code: ''
+      };
+      this.cityNameText = '';
+      this.intentionText = '';
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.brand-detail-page {
+  background-color: #ffffff;
+  min-height: 100vh;
+  padding-bottom: 80rpx;
+  box-sizing: border-box;
+  position: relative;
+}
+
+.brand-detail-page ::v-deep .right-area {
+  border: none;
+  border-radius: 0;
+  background: transparent;
+}
+
+.collect-btn {
+  width: 46rpx;
+  height: 46rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: transparent;
+}
+
+.collect-icon {
+  font-size: 42rpx;
+  line-height: 46rpx;
+  color: #C9CDD4;
+
+  &.active {
+    color: #FF4767;
+  }
+}
+
+/* 导航栏左侧新增动态拨号图标 */
+.nav-phone-wrap {
+  position: fixed;
+  z-index: 9999;
+  width: 40px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: opacity 0.2s;
+
+  &:active {
+    opacity: 0.7;
+  }
+
+  .nav-phone-icon {
+    width: 44rpx;
+    height: 44rpx;
+  }
+}
+
+/* 模拟数据悬浮按钮 */
+.mock-switch {
+  position: fixed;
+  right: 20rpx;
+  top: 200rpx;
+  background: #E5505F;
+  color: #fff;
+  font-size: 24rpx;
+  padding: 10rpx 20rpx;
+  border-radius: 30rpx;
+  z-index: 999;
+  box-shadow: 0 4rpx 10rpx rgba(229, 80, 95, 0.4);
+}
+
+/* 1. 轮播图 / 视频 */
+.banner-section {
+  position: relative;
+  width: 100%;
+  height: 421rpx;
+  background-color: #f5f5f5;
+
+  .banner-video {
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+
+  .banner-swiper {
+    width: 100%;
+    height: 100%;
+
+    swiper-item {
+      position: relative;
+    }
+  }
+
+  .banner-img {
+    width: 100%;
+    height: 100%;
+  }
+
+  .video-play-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10;
+  }
+
+  .video-play-icon {
+    width: 100rpx;
+    height: 100rpx;
+  }
+
+  .video-fullscreen-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: #000;
+    z-index: 9999;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .video-close-btn {
+    position: absolute;
+    top: 140rpx;
+    right: 60rpx;
+    z-index: 10000;
+  }
+
+  .video-close-icon {
+    color: #fff;
+    font-size: 40rpx;
+  }
+
+  .fullscreen-video {
+    width: 100%;
+    height: 100%;
+  }
+
+  .album {
+    position: absolute;
+    bottom: 10rpx;
+    left: 20rpx;
+    height: 44rpx;
+    width: 184rpx;
+    background: rgba(0, 0, 0, 0.4);
+    border-radius: 23rpx;
+    display: flex;
+    align-items: center;
+    z-index: 10;
+
+    .album-left {
+      width: 73rpx;
+      height: 44rpx;
+      background: #FFFFFF;
+      border-radius: 23rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-weight: 400;
+      font-size: 22rpx;
+      color: #333333;
+    }
+
+    .album-line {
+      width: 2rpx;
+      height: 20rpx;
+      background: #A09C9E;
+      border-radius: 1rpx;
+      margin: 0 18rpx;
+    }
+
+    .album-right {
+      display: flex;
+      align-items: center;
+      height: 44rpx;
+
+      .album-right-text {
+        font-weight: 400;
+        font-size: 22rpx;
+        color: #FFFFFF;
+      }
+
+      .album-right-img {
+        width: 8rpx;
+        height: 16rpx;
+        margin-left: 8rpx;
+      }
+    }
+  }
+
+  .indicator {
+    position: absolute;
+    right: 20rpx;
+    bottom: 10rpx;
+    background: #0000003b;
+    color: #ffffff;
+    font-size: 22rpx;
+    font-weight: 500;
+    padding: 8rpx 24rpx;
+    border-radius: 26rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+
+/* 2. 品牌介绍 */
+.intro-section {
+  padding: 40rpx 30rpx;
+
+  .section-title {
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+    line-height: 42rpx;
+    margin-bottom: 24rpx;
+  }
+
+  .intro-content {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #333333;
+    line-height: 37rpx;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 10;
+    overflow: hidden;
+    white-space: pre-line;
+
+    &.is-expanded {
+      -webkit-line-clamp: 9999;
+    }
+  }
+
+  .expand-btn {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 30rpx;
+    padding: 10rpx 40rpx;
+    border-radius: 27rpx;
+    border: 1rpx solid #C4C4C4;
+    width: fit-content;
+    margin-left: auto;
+    margin-right: auto;
+
+    .expand-text {
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #333333;
+      line-height: 33rpx;
+      margin-right: 8rpx;
+    }
+
+    .arrow {
+      margin-bottom: -2rpx;
+      width: 10rpx;
+      height: 10rpx;
+      border-right: 2rpx solid #999999;
+      border-bottom: 2rpx solid #999999;
+      transform: rotate(45deg) translateY(-2rpx);
+      transition: transform 0.2s ease;
+
+      &.up {
+        transform: rotate(-135deg) translateY(2rpx);
+      }
+    }
+  }
+}
+
+.divider-bg {
+  width: 100%;
+  height: 16rpx;
+  background-color: #F8F8F8;
+}
+
+/* 3. 招募详情 Tab */
+.tab-section {
+  padding: 0 30rpx 40rpx;
+
+  .tab-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 30rpx 0 0 0;
+    gap: 120rpx;
+    margin-bottom: 10rpx;
+
+    .tab-item {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #666666;
+      line-height: 40rpx;
+      position: relative;
+      padding-bottom: 16rpx;
+      transition: all 0.2s;
+
+      &.active {
+        font-weight: 500;
+        font-size: 30rpx;
+        color: #000000;
+      }
+
+      .tab-text {
+        position: relative;
+        z-index: 2;
+      }
+
+      .active-line {
+        position: absolute;
+        bottom: 20rpx;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 100%;
+        height: 14rpx;
+        background: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6ea51769-911f-44e7-ae22-55f62e8bfdb9.png') no-repeat center center;
+        background-size: 100% 100%;
+        border-radius: 4rpx;
+        z-index: 1;
+      }
+    }
+  }
+
+  .tab-content {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #333333;
+    line-height: 37rpx;
+
+    ::v-deep img {
+      max-width: 100% !important;
+      height: auto !important;
+      display: block;
+      border-radius: 12rpx;
+      margin: 20rpx 0;
+    }
+
+    ::v-deep p,
+    ::v-deep div {
+      margin-bottom: 24rpx;
+      line-height: 1.6;
+    }
+  }
+}
+
+/* 4. 在线留言表单 */
+.form-section {
+  padding: 40rpx 30rpx;
+
+  .section-title {
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+    line-height: 42rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .form-list {
+    .form-item {
+      display: flex;
+      align-items: center;
+      min-height: 104rpx;
+      border-bottom: 1rpx solid #F5F5F5;
+
+      &.border-none {
+        border-bottom: none;
+      }
+
+      .label {
+        width: 190rpx;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 40rpx;
+
+        .required {
+          color: #E5505F;
+          margin-right: 3rpx;
+        }
+      }
+
+      .input-el,
+      .picker-el {
+        flex: 1;
+        font-size: 28rpx;
+        color: #333333;
+      }
+
+      .ph-style {
+        color: #C4C4C4;
+      }
+
+      .picker-value {
+        color: #CCCCCC;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 100%;
+
+        &.has-val {
+          color: #333333;
+        }
+
+        .arrow-right {
+          width: 12rpx;
+          height: 12rpx;
+          border-top: 2rpx solid #CCCCCC;
+          border-right: 2rpx solid #CCCCCC;
+          transform: rotate(45deg);
+        }
+      }
+    }
+  }
+
+  .submit-btn {
+    margin-top: 60rpx;
+    width: 100%;
+    height: 88rpx;
+    line-height: 88rpx;
+    background-color: #DBDBDB;
+    color: #fff;
+    font-size: 30rpx;
+    border-radius: 44rpx;
+    text-align: center;
+    border: none;
+    transition: all 0.2s ease;
+
+    &::after {
+      border: none;
+    }
+
+    &.is-active {
+      background-color: #FF4767;
+      color: #FFFFFF;
+      box-shadow: 0 8rpx 16rpx rgba(229, 80, 95, 0.15);
+    }
+  }
+}
+
+/* ================= 地区选择弹窗复用样式 ================= */
+.popup {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+  /* 层级调高，防止被挡住 */
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.popup-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+  position: relative;
+  background-color: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+  padding: 32rpx;
+  transform: translateY(100%);
+  transition: transform 0.3s ease;
+}
+
+.popup.show .popup-content {
+  transform: translateY(0);
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20rpx;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999999;
+  padding: 16rpx;
+}
+
+.region-body {
+  flex: 1;
+  overflow: hidden;
+}
+
+.picker-scroll {
+  height: 400rpx;
+}
+
+.picker-item {
+  height: 68rpx;
+  line-height: 68rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #333;
+}
+
+.popup-footer {
+  display: flex;
+  margin-top: 32rpx;
+}
+
+.popup-btn {
+  flex: 1;
+  height: 88rpx;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 16rpx;
+}
+
+.popup-btn.cancel {
+  background-color: #F5F5F5;
+}
+
+.popup-btn.confirm {
+  background: linear-gradient(90deg, #ff6d77 0%, #FF618F 100%);
+}
+
+.popup-btn .btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.popup-btn.cancel .btn-text {
+  color: #666666;
+}
+
+.popup-btn.confirm .btn-text {
+  color: #FFFFFF;
+}
+
+/* 拨打电话弹窗样式 */
+.phone-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.phone-popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.phone-popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.phone-popup-content {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #F5F5F5;
+  border-radius: 24rpx 24rpx 0 0;
+  transform: translateY(100%);
+  transition: transform 0.3s ease;
+}
+
+.phone-popup.show .phone-popup-content {
+  transform: translateY(0);
+}
+
+.phone-popup-header {
+  padding: 30rpx;
+  text-align: center;
+  background-color: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+}
+
+.phone-popup-title {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #333333;
+}
+
+.phone-popup-body {
+  background-color: #FFFFFF;
+  margin-top: 2rpx;
+}
+
+.phone-option {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 30rpx;
+  border-bottom: 1rpx solid #EEEEEE;
+}
+
+.phone-option:last-child {
+  border-bottom: none;
+}
+
+.phone-label {
+  font-size: 26rpx;
+  color: #999999;
+  margin-bottom: 10rpx;
+}
+
+.phone-number {
+  font-size: 34rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.phone-popup-cancel {
+  margin-top: 16rpx;
+  padding: 30rpx;
+  text-align: center;
+  background-color: #FFFFFF;
+}
+
+.cancel-text {
+  font-size: 32rpx;
+  color: #333333;
+}
+</style>
diff --git a/pages/jingxuan/selected-brands.vue b/pages/jingxuan/selected-brands.vue
new file mode 100644
index 0000000..5065c9a
--- /dev/null
+++ b/pages/jingxuan/selected-brands.vue
@@ -0,0 +1,544 @@
+<template>
+  <view>
+    <custom-navbar title="精选品牌"
+      :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60ae3383-6ff6-4f42-818b-d9b09a9bd0e0.png'"
+      :showUser="true"
+      backgroundColor="url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce2e62e1-c26a-45c8-a49d-7ed00b2ce02c.png') center 20%/cover no-repeat"
+      titleColor="#333" borderBottom="none" :show-headle="true"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png"
+      @onHeadleClick="goToSearch" class="nav-img-size">
+    </custom-navbar>
+
+    <serviecFirstTab :tabs="tabs" :activeId="activeId" activeColor="#FF4767" @tab-click="tabClick" bgColor="#fff">
+    </serviecFirstTab>
+
+    <CommonList ref="brandListRef" :apiUrl="'/sj/brand/list'" :initialQuery="{}"
+      :listScrollHeight="`calc(100vh - ${statusBarHeight * 2 + 250}rpx)`" @data-loaded="handleDataLoaded">
+
+      <template #headerScroll>
+        <view class="icon-tabs">
+          <view v-for="item in iconTabs" :key="item.id" class="icon-tab"
+            :class="{ active: currentSecondClass == item.id }" @click="selectSecondClass(item.id)">
+            <image :src="item.photo" class="icon-img" mode="aspectFill"></image>
+            <text class="icon-text">{{ item.title }}</text>
+          </view>
+        </view>
+
+        <view class="sort-bar">
+          <view class="sort-item" @tap="toggleSort('time')">
+            <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
+            <view class="arrows">
+              <image class="arrow-icon" :src="orderType === 2 ? iconPinkUp : iconGreyUp"></image>
+              <image class="arrow-icon" :src="orderType === 1 ? iconPinkDown : iconGreyDown"></image>
+            </view>
+          </view>
+
+          <view class="sort-item" @tap="toggleSort('view')">
+            <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
+            <view class="arrows">
+              <image class="arrow-icon" :src="orderType === 4 ? iconPinkUp : iconGreyUp"></image>
+              <image class="arrow-icon" :src="orderType === 3 ? iconPinkDown : iconGreyDown"></image>
+            </view>
+          </view>
+        </view>
+      </template>
+
+      <template #listData="{ list }">
+        <view class="zhanwei">
+          <view class="brand-grid">
+            <brand-card class="brand-card-wrap" v-for="(brand, idx) in enrichedBrandList(list)" :key="brand.id || idx"
+              :item="brand" :tagKeys="brand._tagKeys" @click="handleBrandClick(brand)" />
+          </view>
+        </view>
+      </template>
+
+      <template #empty>
+        <noData></noData>
+      </template>
+    </CommonList>
+  </view>
+</template>
+
+<script>
+import request from "../../utils/request";
+import serviecFirstTab from "@/components/common/service-first-tab.vue";
+import CommonList from "@/components/common/CommonList.vue";
+import brandCard from "@/pages/home/components/brand-card.vue";
+import noData from "@/components/noData/noData.vue";
+
+export default {
+  components: {
+    serviecFirstTab,
+    CommonList,
+    brandCard,
+    noData
+  },
+  data() {
+    return {
+      statusBarHeight: 0,
+      navHeight: 0,
+
+      // 当前选中的一级/二级分类ID（页面顶部点击用）
+      activeId: "",
+      currentSecondClass: "",
+      tabs: [],
+      iconTabs: [],
+
+      selectedSecondIds: [],  // 抽屉里选中的分类ID
+
+      // 额外筛选参数
+      orderType: 0,
+
+      // 排序图标资源
+      iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
+      iconGreyDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfffb601-6877-4608-a3eb-88695b05c6c2.png',
+      iconPinkUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bc84dff-e120-4d4b-a33e-25d68e065654.png',
+      iconPinkDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ff2c2c9d-694a-4adf-b737-66b07f4a63ae.png',
+    };
+  },
+  onLoad(options) {
+    const systemInfo = uni.getSystemInfoSync();
+    this.statusBarHeight = systemInfo.statusBarHeight;
+    this.navHeight = this.statusBarHeight + 44;
+
+    if (options.id) {
+      this.activeId = options.id;
+    }
+    this.getFirstClass();
+
+    // 初始化时一并获取抽屉内的级联字典数据
+    this.loadFilterCategories();
+  },
+  methods: {
+    // 跳转搜索页
+    goToSearch() {
+      uni.navigateTo({
+        url: '/pages/search_common/search?type=brand' // 告诉搜索页，我要搜品牌
+      });
+    },
+
+    // 加载一级分类并自动组装其对应的二级分类，兼容 state === 1
+    async loadFilterCategories() {
+      try {
+        const syrId = uni.getStorageSync('syrId') || 1;
+        const res = await request.post('/sj/firstclass', { id: syrId })
+        if ((res.code === 200 || res.state === 1) && res.data) {
+          const firstClasses = res.data;
+
+          // 并发请求所有的二级分类
+          const promises = firstClasses.map(async (first) => {
+            try {
+              const subRes = await request.post('/sj/secondclass', { id: first.id })
+              return {
+                id: first.id,
+                title: first.title,
+                children: ((subRes.code === 200 || subRes.state === 1) && subRes.data) ? subRes.data : []
+              }
+            } catch (e) {
+              return { id: first.id, title: first.title, children: [] }
+            }
+          });
+
+          const filterData = await Promise.all(promises);
+          // 过滤掉没有子分类的项，避免面板出现光秃秃的标题
+          this.brandFilterData = filterData.filter(group => group.children.length > 0);
+        } else {
+          this.brandFilterData = []
+        }
+      } catch (error) {
+        console.error('获取分类字典失败', error)
+      }
+    },
+
+    // ============ 排序逻辑 ============
+    toggleSort(type) {
+      if (type === 'time') {
+        if (this.orderType === 1) {
+          this.orderType = 2;
+        } else if (this.orderType === 2) {
+          this.orderType = 0;
+        } else {
+          this.orderType = 1;
+        }
+      } else if (type === 'view') {
+        if (this.orderType === 3) {
+          this.orderType = 4;
+        } else if (this.orderType === 4) {
+          this.orderType = 0;
+        } else {
+          this.orderType = 3;
+        }
+      }
+      this.refreshBrandList();
+    },
+
+    // ============ 页面内分类逻辑 ============
+    getFirstClass() {
+      request.post("/sj/firstclass").then((res) => {
+        this.tabs = res.data || [];
+        if (this.tabs.length && !this.activeId) {
+          this.activeId = this.tabs[0].id;
+        }
+        this.getSecondClassList();
+        this.refreshBrandList();
+      });
+    },
+
+    getSecondClassList() {
+      if (!this.activeId) return;
+      request.post('/sj/secondclass', { id: this.activeId }).then((res) => {
+        this.iconTabs = res.data || [];
+      });
+    },
+
+    selectSecondClass(id) {
+      if (this.currentSecondClass === id) {
+        this.currentSecondClass = "";
+      } else {
+        this.currentSecondClass = id;
+      }
+      // 页面上点击了圆形图标，则清空抽屉里的选择
+      this.selectedSecondIds = [];
+      this.refreshBrandList();
+    },
+
+    tabClick(id) {
+      if (this.activeId === id) return;
+      this.activeId = id;
+      this.currentSecondClass = "";
+      this.selectedSecondIds = [];
+      this.getSecondClassList();
+      this.refreshBrandList();
+    },
+
+    // ============ 刷新列表核心 ============
+    refreshBrandList() {
+      // 如果抽屉里选了分类，优先传抽屉的参数；否则传圆形图标选中的分类
+      const targetSecondClass = this.selectedSecondIds.length > 0
+        ? this.selectedSecondIds.join(',')
+        : this.currentSecondClass;
+
+      const params = {
+        first_class: this.activeId || undefined,
+        second_class: targetSecondClass || undefined,
+        // 如果 orderType 是 0，则设为 undefined，使其不传给后端
+        order_type: this.orderType === 0 ? undefined : this.orderType
+      };
+
+      Object.keys(params).forEach(key => {
+        if (params[key] === undefined) delete params[key];
+      });
+
+      if (this.$refs.brandListRef) {
+        // CommonList 会合并旧 queryData，清空筛选时需要同步移除旧字段。
+        ['first_class', 'second_class', 'order_type'].forEach(key => {
+          if (!Object.prototype.hasOwnProperty.call(params, key) && this.$refs.brandListRef.queryData) {
+            this.$delete(this.$refs.brandListRef.queryData, key);
+          }
+        });
+        this.$refs.brandListRef.manualRefresh(params);
+      }
+    },
+
+    enrichedBrandList(list) {
+      if (!list || !list.length) return [];
+      return list.map(brand => {
+        const tagKeys = [];
+        if (brand.franchise_state === 1) tagKeys.push('franchise');
+        if (brand.student_state === 1) tagKeys.push('recruit');
+        if (tagKeys.length === 0) tagKeys.push('more');
+
+        return {
+          ...brand,
+          name: brand.name,
+          bgSrc: brand.cover_img || 'https://dummyimage.com/300x200/ccc/fff.png',
+          avatar: brand.logo_img || 'https://dummyimage.com/100x100/ccc/fff.png',
+          _tagKeys: tagKeys
+        };
+      });
+    },
+
+    handleBrandClick(brand) {
+      uni.navigateTo({
+        url: `/pages/brand/detail?id=${brand.id}`
+      });
+    },
+
+    handleDataLoaded(data) {
+      console.log("品牌列表加载完成", data);
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+// 保证右侧搜索图标大小合适
+::v-deep .icon-headle {
+  width: 32rpx !important;
+  height: 32rpx !important;
+}
+
+// 一级类目 Tab 样式微调
+.service-first-tab {
+  border-bottom: none;
+  padding-bottom: 27rpx;
+  position: relative;
+  z-index: 101;
+}
+
+::v-deep .service-first-tab {
+  box-shadow: none !important;
+}
+
+/* ================= 抽屉下拉样式 ================= */
+.filter-panel {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 100;
+  pointer-events: none;
+  overflow: hidden;
+
+  &.show {
+    pointer-events: auto;
+
+    .filter-mask {
+      opacity: 1;
+    }
+
+    .filter-container {
+      transform: translateY(0);
+    }
+  }
+
+  .filter-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.4);
+    opacity: 0;
+    transition: opacity 0.3s ease-in-out;
+  }
+
+  .filter-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    background: #fff;
+    border-radius: 0 0 30rpx 30rpx;
+    padding: 140rpx 30rpx 40rpx;
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.05);
+    transform: translateY(-100%);
+    transition: transform 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
+  }
+}
+
+.filter-scroll {
+  max-height: 50vh;
+}
+
+.filter-group {
+  margin-bottom: 30rpx;
+
+  .group-title {
+    font-weight: 500;
+    font-size: 28rpx;
+    color: #333333;
+    line-height: 40rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .pill-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20rpx 10rpx;
+    /* 控制行间距和列间距 */
+  }
+}
+
+/* 通用胶囊按钮 (一行四个) */
+.pill-item {
+  width: calc(25% - 8rpx);
+  /* 精确计算一行四个 */
+  height: 58rpx;
+  background: #F5F5F5;
+  font-weight: 400;
+  font-size: 24rpx;
+  /* 字号略小以防溢出 */
+  color: #333333;
+  line-height: 37rpx;
+
+  /* flex 居中文字 */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  border-radius: 12rpx;
+  transition: all 0.3s;
+  box-sizing: border-box;
+  white-space: nowrap;
+
+  &.active {
+    background: #FFF0F2;
+    color: #FF4767;
+    border: 1rpx solid #FFB0BD;
+  }
+}
+
+.filter-footer {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 40rpx;
+
+  .reset-btn,
+  .confirm-btn {
+    width: 47%;
+    text-align: center;
+    padding: 22rpx 0;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+  }
+
+  .reset-btn {
+    background: #F5F5F5;
+    color: #666;
+  }
+
+  .confirm-btn {
+    background: #FF4767;
+    color: #fff;
+  }
+}
+
+/* ================= 其他页面样式 ================= */
+// 二级类目图标行
+.icon-tabs {
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: flex-start;
+  align-items: center;
+  column-gap: 36rpx;
+  row-gap: 30rpx;
+  background: transparent;
+  padding: 0 0 0 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.icon-tab {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.icon-img {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+  border: 2rpx solid transparent;
+}
+
+.icon-text {
+  margin-top: 10rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #333333;
+  line-height: 33rpx;
+  text-align: left;
+}
+
+.icon-tab.active .icon-text {
+  color: #FF4767;
+  line-height: 33rpx;
+}
+
+.icon-tab.active .icon-img {
+  border: 2rpx solid #FF4767;
+}
+
+// 排序栏样式
+.sort-bar {
+  display: flex;
+  align-items: center;
+  padding: 0 30rpx;
+  margin-bottom: 24rpx;
+  gap: 100rpx;
+
+  .sort-item {
+    display: flex;
+    align-items: center;
+
+    .sort-text {
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #666666;
+      line-height: 37rpx;
+      margin-right: 6rpx;
+
+      &.active {
+        color: #FF4767;
+        font-weight: 500;
+      }
+    }
+
+    .arrows {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+
+      .arrow-icon {
+        width: 13rpx;
+        height: 8rpx;
+        margin: 2rpx 0;
+      }
+    }
+  }
+}
+
+// 品牌卡片网格
+.zhanwei {
+  background-color: #f5f5f5;
+  padding: 20rpx 0 0 0;
+  border-radius: 20rpx 20rpx 0rpx 0rpx;
+}
+
+.brand-grid {
+  background-color: #ffffff;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  padding: 20rpx 24rpx;
+  row-gap: 24rpx;
+  border-radius: 20rpx 20rpx 0rpx 0rpx;
+
+  .brand-card-wrap {
+    width: 48.5%;
+  }
+}
+
+.common-list {
+  ::v-deep .list-container {
+    padding: 0;
+  }
+
+  ::v-deep .list-scroll {
+    margin-top: 0rpx;
+  }
+}
+
+.service-list {
+  background-color: #f5f5f5;
+  border-radius: 20rpx 20rpx 0 0;
+}
+
+.nav-img-size::v-deep .icon-headle {
+  width: 36rpx !important;
+  height: 36rpx !important;
+}
+</style>
diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
new file mode 100644
index 0000000..f01ed2a
--- /dev/null
+++ b/pages/jingxuan/selected-skills.vue
@@ -0,0 +1,579 @@
+<template>
+  <view class="skill-market-page">
+
+    <custom-navbar title="技能集市" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true" borderBottom="none"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png"
+      @onHeadleClick="goToSearch" class="nav-img-size">
+    </custom-navbar>
+    <view class="sticky-header-container" :style="{ top: navHeight + 'px' }">
+
+      <view class="official-author-block" v-if="authorInfo.show">
+        <view class="author-left">
+          <image class="author-avatar" :src="authorInfo.avatar" mode="aspectFill"></image>
+          <view class="author-info">
+            <text class="author-name">{{ authorInfo.name }}</text>
+            <text class="author-desc">发布了{{ authorInfo.videoCount }}条技能</text>
+          </view>
+        </view>
+
+        <view class="view-more-btn" v-if="!authorInfo.isOfficial" @click="goToBrandDetail">
+          <text>查看更多</text>
+          <view class="arrow-right"></view>
+        </view>
+      </view>
+
+      <view class="sort-bar-wrap">
+        <view class="sort-bar">
+          <view class="left-sorts">
+            <view class="sort-item" @tap="toggleSort('time')">
+              <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
+              <view class="arrows">
+                <image class="arrow-icon" :src="orderType === 2 ? iconPinkUp : iconGreyUp"></image>
+                <image class="arrow-icon" :src="orderType === 1 ? iconPinkDown : iconGreyDown"></image>
+              </view>
+            </view>
+
+            <view class="sort-item" @tap="toggleSort('view')">
+              <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
+              <view class="arrows">
+                <image class="arrow-icon" :src="orderType === 4 ? iconPinkUp : iconGreyUp"></image>
+                <image class="arrow-icon" :src="orderType === 3 ? iconPinkDown : iconGreyDown"></image>
+              </view>
+            </view>
+          </view>
+
+          <view class="right-filter" @tap="toggleFilterPanel" v-if="!authorInfo.show">
+            <text class="filter-text">筛选</text>
+            <image class="filter-icon" :src="filterIcon" :class="{ 'rotate': filterVisible }"></image>
+          </view>
+        </view>
+
+        <view class="filter-panel" :class="{ 'show': filterVisible }" catchtouchmove="true">
+          <view class="filter-mask" @tap="closeFilterPanel"></view>
+          <view class="filter-container">
+            <text class="group-title">课程类型</text>
+            <view class="course-filter">
+              <view class="course-type-item" :class="{ active: linkType === '' }" @tap="selectAndApply('')">全部</view>
+              <view class="course-type-item" :class="{ active: linkType === 1 }" @tap="selectAndApply(1)">平台课程</view>
+              <view class="course-type-item" :class="{ active: linkType === 2 }" @tap="selectAndApply(2)">品牌课程</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="list-container">
+      <view v-if="skillList.length > 0">
+        <skill-card v-for="(item, index) in skillList" :key="item.id || index" :item="item"
+          @click="goToDetail(item)"></skill-card>
+      </view>
+
+      <view v-else>
+        <noData></noData>
+      </view>
+    </view>
+
+    <view style="height: 60rpx;"></view>
+
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request"
+import SkillCard from "@/pages/home/components/skill-card.vue"
+import noData from "@/components/noData/noData.vue";
+
+const USE_REAL_API = true
+
+export default {
+  components: { SkillCard, noData },
+  data() {
+    return {
+      navHeight: 0,
+
+      orderType: 0,
+      linkType: '',
+
+      // 【新增】：统一管理作者/官方/品牌信息
+      authorInfo: {
+        show: false,       // 控制是否显示作者头部
+        isOfficial: false, // 区分是官方还是普通品牌
+        brandId: null,     // 品牌ID
+        name: '',          // 作者/品牌名称
+        avatar: '',        // 头像
+        videoCount: 0      // 视频数量
+      },
+
+      filterVisible: false,
+
+      skillList: [],
+      page: 1,
+      limit: 10,
+      isFinished: false,
+
+      iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
+      iconGreyDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfffb601-6877-4608-a3eb-88695b05c6c2.png',
+      iconPinkUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bc84dff-e120-4d4b-a33e-25d68e065654.png',
+      iconPinkDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ff2c2c9d-694a-4adf-b737-66b07f4a63ae.png',
+
+      mockDatabase: []
+    }
+  },
+  computed: {
+    filterIcon() {
+      return this.filterVisible
+        ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png'
+        : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bfe7a104-bef8-4432-9487-42f05e3e9035.png'
+    }
+  },
+  // 接收页面跳转传过来的作者参数
+  onLoad(options) {
+    if (options && options.showAuthor === '1') {
+      this.authorInfo.show = true;
+      this.authorInfo.isOfficial = options.isOfficial === '1';
+      this.authorInfo.brandId = options.linkId || null;
+
+      // 用 decodeURIComponent 把转义的字符解析回正常的中文和链接
+      this.authorInfo.name = options.authorName ? decodeURIComponent(options.authorName) : '未知作者';
+      this.authorInfo.avatar = options.authorAvatar ? decodeURIComponent(options.authorAvatar) : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bbe832bf-aae6-4579-b3cc-246d252488c3';
+      this.authorInfo.videoCount = options.videoCount || 0;
+
+      // 强制设置筛选类型
+      this.linkType = this.authorInfo.isOfficial ? 1 : 2;
+    } else if (options && options.linkType !== undefined) {
+      this.linkType = Number(options.linkType);
+    }
+
+    const sysInfo = uni.getSystemInfoSync()
+    const sbh = sysInfo.statusBarHeight || 0
+    this.navHeight = sbh
+
+    this.initMockData()
+    this.fetchData(true)
+  },
+  onReachBottom() {
+    if (!this.isFinished) {
+      this.fetchData(false)
+    }
+  },
+  methods: {
+    goToSearch() {
+      uni.navigateTo({
+        url: '/pages/search_common/search?type=skill'
+      });
+    },
+
+    // 跳转到品牌详情页面
+    goToBrandDetail() {
+      if (this.authorInfo.brandId) {
+        uni.navigateTo({
+          url: `/pages/jingxuan/brand-detail?id=${this.authorInfo.brandId}`
+        });
+      } else {
+        uni.showToast({ title: '缺少品牌信息', icon: 'none' });
+      }
+    },
+
+    toggleSort(type) {
+      if (type === 'time') {
+        if (this.orderType === 1) this.orderType = 2
+        else if (this.orderType === 2) this.orderType = 0
+        else this.orderType = 1
+      } else if (type === 'view') {
+        if (this.orderType === 3) this.orderType = 4
+        else if (this.orderType === 4) this.orderType = 0
+        else this.orderType = 3
+      }
+      this.fetchData(true)
+    },
+
+    toggleFilterPanel() {
+      this.filterVisible = !this.filterVisible
+    },
+    closeFilterPanel() {
+      this.filterVisible = false
+    },
+
+    selectAndApply(typeVal) {
+      this.linkType = typeVal;
+      // 当通过本地筛选器切换时，关闭“专属展示区”，确保纯净筛选
+      this.authorInfo.show = false;
+      this.closeFilterPanel();
+      this.fetchData(true);
+    },
+
+    async fetchData(isReset = false) {
+      if (isReset) {
+        this.page = 1
+        this.isFinished = false
+        this.skillList = []
+      }
+
+      if (USE_REAL_API) {
+        uni.showLoading({ title: '加载中...' })
+        try {
+          const params = {
+            page: this.page,
+            limit: this.limit
+          }
+          if (this.orderType !== 0) params.order_type = this.orderType;
+          if (this.linkType !== '') params.link_type = this.linkType;
+
+          // 【核心接口预留】：如果当前在看某个品牌的专属页，需要传link_id给后端过滤
+          if (this.authorInfo.show && !this.authorInfo.isOfficial && this.authorInfo.brandId) {
+            params.link_id = this.authorInfo.brandId;
+          }
+
+          const res = await request.post('/sj/skill/list', params)
+          if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
+            const list = res.data.list.map(item => this.formatApiData(item))
+            if (list.length < this.limit) this.isFinished = true
+            this.skillList = isReset ? list : this.skillList.concat(list)
+            this.page++
+          } else {
+            this.isFinished = true
+          }
+        } catch (e) {
+          uni.showToast({ title: '加载失败', icon: 'none' })
+        } finally {
+          uni.hideLoading()
+        }
+      } else {
+        uni.showLoading({ title: '模拟加载中...' })
+        setTimeout(() => {
+          let list = [...this.mockDatabase]
+
+          if (this.linkType !== '') {
+            list = list.filter(item => item.link_type === this.linkType)
+          }
+
+          // 模拟品牌过滤
+          if (this.authorInfo.show && !this.authorInfo.isOfficial && this.authorInfo.brandId) {
+            list = list.filter(item => item.brand_id == this.authorInfo.brandId)
+          }
+
+          if (this.orderType !== 0) {
+            list.sort((a, b) => {
+              if (this.orderType === 1) return b.timestamp - a.timestamp
+              if (this.orderType === 2) return a.timestamp - b.timestamp
+              if (this.orderType === 3) return b.views - a.views
+              if (this.orderType === 4) return a.views - b.views
+              return 0
+            })
+          }
+
+          const start = (this.page - 1) * this.limit
+          const end = start + this.limit
+          const pageData = list.slice(start, end)
+
+          if (pageData.length < this.limit) this.isFinished = true
+          this.skillList = isReset ? pageData : this.skillList.concat(pageData)
+          this.page++
+          uni.hideLoading()
+        }, 500)
+      }
+    },
+
+    formatApiData(item) {
+      return {
+        id: item.id,
+        title: item.name,
+        coverSrc: item.cover_img || 'https://dummyimage.com/300x200/ccc/fff.png',
+        type: item.link_name || (item.link_type === 1 ? '平台课程' : '品牌课程'),
+        link_type: item.link_type,
+        views: item.browse_num || 0,
+        time: item.create_time ? this.formatTimeAgo(item.create_time) : '',
+        typeIcon: item.link_logo || ''
+      }
+    },
+
+    formatTimeAgo(timeStr) {
+      const now = new Date()
+      const time = new Date(timeStr.replace(/-/g, '/'))
+      const diff = Math.floor((now - time) / 1000)
+      if (diff < 3600) return Math.floor(diff / 60) + '分钟前'
+      if (diff < 86400) return Math.floor(diff / 3600) + '小时前'
+      if (diff < 604800) return Math.floor(diff / 86400) + '天前'
+      return timeStr.split(' ')[0]
+    },
+
+    goToDetail(item) {
+      if (item.id) {
+        uni.navigateTo({ url: `/pages/skill/detail?id=${item.id}` })
+      } else {
+        uni.showToast({ title: '详情页开发中', icon: 'none' })
+      }
+    },
+
+    initMockData() {
+      this.mockDatabase = [
+        { id: 1, title: '穿戴甲的操作视频扫码验券操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 836000, time: '7小时前', timestamp: Date.now() - 7 * 3600000 },
+        { id: 2, title: '脸部按摩操作步骤详情', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, brand_id: 101, views: 8334, time: '1天前', timestamp: Date.now() - 24 * 3600000 },
+        { id: 3, title: '全身SPA的操作视频操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 2344, time: '3天前', timestamp: Date.now() - 3 * 24 * 3600000 },
+        { id: 4, title: '高级面部护理手法详解最新版', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 836, time: '4月26日', timestamp: Date.now() - 30 * 24 * 3600000 },
+        { id: 5, title: '光疗美甲进阶全方位解析', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, brand_id: 101, views: 12000, time: '2小时前', timestamp: Date.now() - 2 * 3600000 }
+      ]
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.skill-market-page {
+  min-height: 100vh;
+  background: #fff;
+}
+
+/* 统一吸顶容器 */
+.sticky-header-container {
+  position: sticky;
+  background: #fff;
+  z-index: 101;
+  /* 确保整体吸顶时下方有稍微一点阴影或边框分割更好看，可根据 UI 需求开启 */
+  // border-bottom: 1rpx solid #F5F5F5; 
+}
+
+/* 官方/品牌 作者展示块样式 */
+.official-author-block {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx 30rpx;
+  background: #fff;
+  border-bottom: 10rpx solid #F5F5F5;
+
+  .author-left {
+    display: flex;
+    align-items: center;
+
+    .author-avatar {
+      width: 70rpx;
+      height: 70rpx;
+      border-radius: 50%;
+      margin-right: 20rpx;
+    }
+
+    .author-info {
+      display: flex;
+      flex-direction: column;
+
+      .author-name {
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 40rpx;
+        margin-bottom: 4rpx;
+      }
+
+      .author-desc {
+        font-weight: 400;
+        font-size: 20rpx;
+        color: #999999;
+        line-height: 28rpx;
+      }
+    }
+  }
+
+  .view-more-btn {
+    display: flex;
+    align-items: center;
+    font-size: 24rpx;
+    color: #FF4767;
+    border: 2rpx solid #FF4767;
+    padding: 8rpx 20rpx;
+    border-radius: 45rpx;
+
+    .arrow-right {
+      width: 10rpx;
+      height: 10rpx;
+      border-top: 2rpx solid #FF4767;
+      border-right: 2rpx solid #FF4767;
+      transform: rotate(45deg);
+      margin-left: 6rpx;
+    }
+  }
+}
+
+.sort-bar-wrap {
+  /* 移除单独的 sticky，由外层 container 统一控制 */
+  background: #fff;
+  position: relative;
+}
+
+.sort-bar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx 30rpx;
+
+  .left-sorts {
+    display: flex;
+    align-items: center;
+    gap: 100rpx;
+
+    .sort-item {
+      display: flex;
+      align-items: center;
+
+      .sort-text {
+        font-size: 28rpx;
+        color: #333333;
+        margin-right: 6rpx;
+        font-weight: 400;
+
+        &.active {
+          color: #FF4767;
+          font-weight: 500;
+        }
+      }
+
+      .arrows {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .arrow-icon {
+          width: 14rpx;
+          height: 8rpx;
+          margin: 2rpx 0;
+        }
+      }
+    }
+  }
+
+  .right-filter {
+    display: flex;
+    align-items: center;
+
+    .filter-text {
+      font-size: 26rpx;
+      color: #666666;
+      margin-right: 8rpx;
+    }
+
+    .filter-icon {
+      width: 24rpx;
+      height: 24rpx;
+      transition: transform 0.3s ease;
+
+      &.rotate {
+        transform: rotate(180deg);
+        width: 18rpx;
+        height: 12rpx;
+      }
+    }
+  }
+}
+
+.list-container {
+  padding: 0 24rpx 30rpx;
+}
+
+.filter-panel {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  height: 100vh;
+  z-index: 100;
+  pointer-events: none;
+  overflow: hidden;
+
+  &.show {
+    pointer-events: auto;
+
+    .filter-mask {
+      opacity: 1;
+    }
+
+    .filter-container {
+      transform: translateY(0);
+    }
+  }
+
+  .filter-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.4);
+    opacity: 0;
+    transition: opacity 0.3s ease-in-out;
+  }
+
+  .filter-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    background: #fff;
+    border-radius: 0 0 24rpx 24rpx;
+    padding: 30rpx 30rpx 40rpx;
+    display: flex;
+    flex-direction: column;
+    transform: translateY(-100%);
+    transition: transform 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
+  }
+}
+
+.group-title {
+  font-weight: 500;
+  font-size: 28rpx;
+  color: #333333;
+  margin-bottom: 24rpx;
+  display: block;
+}
+
+.course-filter {
+  display: flex;
+  gap: 20rpx;
+
+  .course-type-item {
+    background: #F5F5F5;
+    color: #333333;
+    font-size: 26rpx;
+    padding: 12rpx 36rpx;
+    border-radius: 12rpx;
+    border: 1rpx solid transparent;
+    transition: all 0.2s;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    &.active {
+      background: #FFF0F2;
+      color: #FF4767;
+      border-color: #FFB0BD;
+    }
+  }
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 120rpx 0;
+
+  .empty-icon {
+    width: 346rpx;
+    height: 373rpx;
+  }
+}
+
+::v-deep .icon-headle {
+  width: 32rpx !important;
+  height: 32rpx !important;
+}
+
+::v-deep .back-icon {
+  width: 28rpx !important;
+  height: 36rpx !important;
+}
+
+.nav-img-size::v-deep .icon-headle {
+  width: 36rpx !important;
+  height: 36rpx !important;
+}
+</style>
diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
new file mode 100644
index 0000000..3b810f2
--- /dev/null
+++ b/pages/jingxuan/skill-detail.vue
@@ -0,0 +1,768 @@
+<template>
+  <view class="skill-detail-page">
+
+    <custom-navbar title="技能集市" backgroundColor="#ffffff" titleColor="#333" borderBottom="none">
+    </custom-navbar>
+
+    <!--  <view class="mock-switch" @click="toggleMockData">
+      <text>{{ useMockData ? '关闭模拟数据' : '开启模拟数据' }}</text>
+    </view> -->
+
+    <view class="video-section" v-if="article.videoSrc">
+      <view class="video-wrapper">
+
+        <video v-if="!tipShow" id="customVideo" class="main-video" :src="article.videoSrc" :poster="article.poster"
+          :controls="showNativeControls" :show-center-play-btn="false" :muted="isMuted" object-fit="cover"
+          @timeupdate="onTimeUpdate" @loadedmetadata="onLoadedMetaData" @ended="onEnded" @play="onPlay" @pause="onPause"
+          @fullscreenchange="onFullScreenChange">
+          <cover-image v-if="!isPlaying && !showNativeControls" class="center-play-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb720bb0-4ada-49f6-9ce5-38abfd613d5d.png"
+            @click.stop="togglePlay"></cover-image>
+
+          <cover-view class="custom-control-bar" v-if="!showNativeControls">
+            <cover-image class="bar-bg"
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce7f28f8-470d-4f5b-9c7e-ff2bf8635226.png"></cover-image>
+
+            <cover-view class="bar-content">
+              <cover-image v-if="isPlaying" class="ctrl-icon" :src="iconPause" @click.stop="togglePlay"></cover-image>
+              <cover-image v-if="!isPlaying" class="ctrl-icon" :src="iconPlay" @click.stop="togglePlay"></cover-image>
+
+              <cover-view class="time-text">{{ formatTime(currentTime) }}</cover-view>
+
+              <cover-view class="slider-track">
+                <cover-view class="slider-bg"></cover-view>
+                <cover-view class="slider-active" :style="activeStyle"></cover-view>
+                <cover-view class="slider-thumb" v-if="currentTime > 0" :style="thumbStyle"></cover-view>
+              </cover-view>
+
+              <cover-view class="time-text">{{ formatTime(duration) }}</cover-view>
+
+              <cover-image v-if="!isMuted" class="ctrl-icon mute-icon" :src="iconSoundOn"
+                @click.stop="toggleMute"></cover-image>
+              <cover-image v-if="isMuted" class="ctrl-icon mute-icon" :src="iconMute"
+                @click.stop="toggleMute"></cover-image>
+
+              <cover-image class="ctrl-icon fullscreen-icon" :src="iconFullscreen"
+                @click.stop="toggleFullScreen"></cover-image>
+            </cover-view>
+          </cover-view>
+        </video>
+
+        <image v-else class="main-video fallback-poster" :src="article.poster || article.videoSrc" mode="aspectFill">
+        </image>
+      </view>
+    </view>
+
+    <view class="article-header" v-if="article.title">
+      <view class="title">{{ article.title }}</view>
+      <view class="meta-row">
+        <view class="author-info" @click="goToAuthorMarket">
+          <image class="avatar" :src="article.authorAvatar" mode="aspectFill"></image>
+          <text class="author-name">{{ article.authorName }}</text>
+          <text class="date">{{ article.date }}</text>
+        </view>
+
+        <view class="favorite-btn" @click="toggleFavorite">
+          <image class="star-icon" :src="isFavorite ? filledStarUrl : emptyStarUrl" />
+          <text :class="{ 'active-fav': isFavorite }">{{ isFavorite ? '已收藏' : '收藏' }}</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="article-content-wrapper">
+      <view class="article-content">
+        <rich-text :nodes="formattedHtmlContent"></rich-text>
+      </view>
+    </view>
+
+    <view class="recommend-section" v-if="recommendList.length > 0">
+      <view class="section-header">
+        <text class="section-title">相关推荐</text>
+        <view class="refresh-btn" @click="refreshList">
+          <image class="refresh-icon" :class="{ 'is-rotating': isRefreshing }"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/f2152145-df2a-49ab-87f5-f66b3207d0b0.png">
+          </image>
+          <text>换一批</text>
+        </view>
+      </view>
+
+      <view class="list-container">
+        <skill-card v-for="(item, index) in recommendList" :key="index" :item="item"></skill-card>
+      </view>
+    </view>
+
+    <tipsPopup2 :show="tipShow" @closePopup="closePopup" sureText="确认" @okBtn="okBtn">
+      {{ tipsText }}
+    </tipsPopup2>
+
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request";
+import SkillCard from "@/pages/home/components/skill-card.vue";
+import tipsPopup2 from "@/components/tips-popup/tips-popup2";
+
+export default {
+  components: {
+    SkillCard,
+    tipsPopup2
+  },
+  data() {
+    return {
+      useMockData: false,
+
+      articleId: null,
+      isFavorite: false,
+      emptyStarUrl: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/53378402-5456-4a80-b2ec-7c18d43d970e.png',
+      filledStarUrl: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/10461305-6bf8-4016-ae76-3415e055ec63.png',
+      isRefreshing: false,
+
+      isLogin: false,
+      tipShow: false,
+      tipsText: "",
+      tipType: "",
+
+      videoContext: null,
+      isPlaying: false,
+      isMuted: false,
+
+      showNativeControls: false,
+
+      currentTime: 0,
+      duration: 0,
+      sliderValue: 0,
+
+      iconPlay: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/88ca4fe3-645c-48a9-abda-1f9b45714970.png',
+      iconPause: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cf9d6dd6-e9df-4c46-bafa-e1a72f7ddbcd.png',
+      iconSoundOn: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9f13a630-7efd-4c61-b6fe-b6b282e28e42.png',
+      iconMute: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/80f856c1-3d66-4b11-b21a-8eb6a3272a3c.png',
+      iconFullscreen: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4286ef33-6849-4851-8866-4230d2523a33.png',
+
+      article: {},
+      recommendList: [],
+      recommendPage: 1
+    }
+  },
+  computed: {
+    formattedHtmlContent() {
+      if (!this.article.htmlContent) return '';
+      let html = this.article.htmlContent;
+      html = html.replace(/<img/gi, '<img style="max-width:100%; height:auto; display:block; border-radius:10px; margin: 20rpx 0;"');
+      html = html.replace(/<p/gi, '<p style="margin-bottom: 24rpx; line-height: 40rpx;"');
+      return html;
+    },
+    activeStyle() {
+      return `width: ${this.sliderValue}%;`;
+    },
+    thumbStyle() {
+      return `left: ${this.sliderValue}%;`;
+    }
+  },
+  onLoad(options) {
+    if (options && options.id) {
+      this.articleId = parseInt(options.id, 10);
+    } else {
+      this.articleId = 1;
+    }
+    this.getPageData();
+  },
+  onShow() {
+    this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+  },
+  methods: {
+    // 点击跳回集市专属页面（兼容官方和品牌方）
+    goToAuthorMarket() {
+      const isOfficial = this.article.linkType === 1 ? '1' : '0';
+      const linkId = this.article.linkId || '';
+      const name = encodeURIComponent(this.article.authorName || '');
+      const avatar = encodeURIComponent(this.article.authorAvatar || '');
+      const count = this.article.authorVideoCount || 0;
+
+      uni.navigateTo({
+        url: `/pages/jingxuan/selected-skills?showAuthor=1&isOfficial=${isOfficial}&linkId=${linkId}&authorName=${name}&authorAvatar=${avatar}&videoCount=${count}`
+      });
+    },
+
+    getVideoContext() {
+      if (!this.videoContext) {
+        this.videoContext = uni.createVideoContext('customVideo', this);
+      }
+      return this.videoContext;
+    },
+
+    closePopup() {
+      this.tipShow = false;
+    },
+    okBtn() {
+      if (this.tipType == "login") {
+        uni.navigateTo({
+          url: "/pages/blogPopup/blogPopup",
+        });
+      }
+      this.tipShow = false;
+    },
+
+    formatTime(sec) {
+      if (!sec) return '00:00';
+      sec = Math.round(sec);
+      let m = Math.floor(sec / 60);
+      let s = sec % 60;
+      return (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
+    },
+    onLoadedMetaData(e) {
+      this.duration = e.detail.duration;
+    },
+    onTimeUpdate(e) {
+      if (e.detail.duration && this.duration === 0) {
+        this.duration = e.detail.duration;
+      }
+      this.currentTime = e.detail.currentTime;
+      if (this.duration > 0) {
+        this.sliderValue = Number(((this.currentTime / this.duration) * 100).toFixed(2));
+      }
+    },
+    onEnded() {
+      this.isPlaying = false;
+      this.currentTime = 0;
+      this.sliderValue = 0;
+      if (this.showNativeControls) {
+        const ctx = this.getVideoContext();
+        if (ctx) ctx.exitFullScreen();
+      }
+    },
+    onPlay() { this.isPlaying = true; },
+    onPause() { this.isPlaying = false; },
+
+    onFullScreenChange(e) {
+      const isFull = e.detail.fullScreen;
+      if (!isFull) {
+        this.showNativeControls = false;
+      } else {
+        this.showNativeControls = true;
+      }
+    },
+
+    togglePlay() {
+      const ctx = this.getVideoContext();
+      if (!ctx) return;
+      if (this.isPlaying) {
+        ctx.pause();
+      } else {
+        ctx.play();
+      }
+    },
+    toggleMute() {
+      this.isMuted = !this.isMuted;
+    },
+
+    toggleFullScreen() {
+      const ctx = this.getVideoContext();
+      if (!ctx) return;
+      this.showNativeControls = true;
+      this.$nextTick(() => {
+        ctx.requestFullScreen({ direction: 90 });
+      });
+    },
+
+    toggleMockData() {
+      this.useMockData = !this.useMockData;
+      uni.showToast({ title: this.useMockData ? 'Mock已开启' : 'Mock已关闭', icon: 'none' });
+      this.getPageData();
+    },
+
+    getPageData() {
+      if (this.useMockData) {
+        this.injectMockData();
+        return;
+      }
+      uni.showLoading({ title: '加载中...' });
+      request.post("/sj/skill/details", {
+        id: this.articleId
+      }).then((res) => {
+        if (res.code == 200 && res.data) {
+          const data = res.data;
+          this.article = {
+            title: data.name || '暂无标题',
+            // 【预留接口字段解析】：这里需要后端配合返回以下字段，如果没有的话目前会使用默认值
+            linkType: data.link_type || 1,        // 1=官方 2=品牌
+            linkId: data.link_id || 0,
+            authorName: data.link_name || '美融融平台',
+            authorAvatar: data.link_logo || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bbe832bf-aae6-4579-b3cc-246d252488c3',
+            authorVideoCount: data.link_publish_num || 0, // 关联者发布数
+
+            date: data.create_time ? data.create_time.substring(0, 10).replace(/-/g, '.') : '',
+            videoSrc: data.video || '',
+            poster: data.cover_img || '',
+            htmlContent: data.detail || ''
+          };
+          this.isFavorite = data.collect_state === 1;
+          request.post("/sj/skill/list", {
+            page: 1,
+            limit: 3,
+            skill_id: data.id
+          }).then((listRes) => {
+            if (listRes.code == 200 && listRes.data && listRes.data.list) {
+              // 使用 map 遍历数组，将后端返回的字段一对一映射成组件需要的字段
+              this.recommendList = listRes.data.list.map(item => {
+                return {
+                  id: item.id,
+                  title: item.name || '暂无标题',                 // 映射标题
+                  coverSrc: item.cover_img || '',               // 映射封面图
+                  type: item.link_name || '平台课程',             // 映射来源（平台/品牌）
+                  typeIcon: item.link_logo || '',               // 映射来源图标
+                  // 浏览量优先取总浏览量，如果没有则取实际/初始浏览量
+                  views: item.total_browse_num || item.real_browse_num || item.browse_num || 0,
+                  // 截取时间并格式化
+                  time: item.create_time ? item.create_time.substring(0, 10).replace(/-/g, '-') : ''
+                };
+              });
+            }
+          }).catch((err) => {
+            console.error('获取推荐列表异常', err);
+          });
+        } else {
+          uni.showToast({ title: res.msg || '获取数据失败', icon: 'none' });
+        }
+      }).catch((err) => {
+        console.error('获取技能集市详情异常', err);
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+
+    toggleFavorite() {
+      if (!this.isLogin) {
+        if (this.isPlaying) {
+          this.getVideoContext().pause();
+        }
+        this.tipsText = "您现在还未登录，是否确定前往登录？";
+        this.tipShow = true;
+        this.tipType = "login";
+        return;
+      }
+
+      if (this.useMockData) {
+        this.isFavorite = !this.isFavorite;
+        uni.showToast({ title: this.isFavorite ? '收藏成功' : '已取消收藏', icon: 'none' });
+        return;
+      }
+
+      uni.showLoading({ title: '处理中' });
+      const targetState = this.isFavorite ? 2 : 1;
+
+      request.post("/sj/skill/collect", {
+        id: this.articleId,
+        state: targetState
+      }).then(res => {
+        if (res.code == 200) {
+          this.isFavorite = !this.isFavorite;
+          uni.showToast({ title: this.isFavorite ? '收藏成功' : '已取消收藏', icon: 'none' });
+        } else {
+          uni.showToast({ title: res.msg || '操作失败', icon: 'none' });
+        }
+      }).catch(err => {
+        uni.showToast({ title: '网络异常', icon: 'none' });
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+
+    refreshList() {
+      if (this.isRefreshing) return;
+      this.isRefreshing = true;
+      uni.showLoading({ title: '加载中' });
+
+      // 页码逻辑：到达10重置为1，否则+1
+      if (this.recommendPage >= 10) {
+        this.recommendPage = 1;
+      } else {
+        this.recommendPage++;
+      }
+
+      request.post("/sj/skill/list", {
+        page: this.recommendPage,
+        limit: 3,
+        skill_id: this.article.id
+      }).then((res) => {
+        if (res.code == 200 && res.data && res.data.list && res.data.list.length > 0) {
+          this.recommendList = res.data.list.map(item => ({
+            id: item.id,
+            title: item.name || '暂无标题',
+            coverSrc: item.cover_img || '',
+            type: item.link_name || '平台课程',
+            views: item.browse_num || 0,
+            time: item.create_time ? item.create_time.split(' ')[0] : '',
+            typeIcon: item.link_logo || '',
+            video: item.video || ''
+          }));
+        } else {
+          // 下一页没有数据，重置为1重新请求
+          this.recommendPage = 1;
+          request.post("/sj/skill/list", {
+            page: 1,
+            limit: 3,
+            skill_id: this.article.id
+          }).then((res2) => {
+            if (res2.code == 200 && res2.data && res2.data.list) {
+              this.recommendList = res2.data.list.map(item => ({
+                id: item.id,
+                title: item.name || '暂无标题',
+                coverSrc: item.cover_img || '',
+                type: item.link_name || '平台课程',
+                views: item.browse_num || 0,
+                time: item.create_time ? item.create_time.split(' ')[0] : '',
+                typeIcon: item.link_logo || '',
+                video: item.video || ''
+              }));
+            }
+          });
+        }
+        this.isRefreshing = false;
+        uni.hideLoading();
+      }).catch(() => {
+        this.isRefreshing = false;
+        uni.hideLoading();
+      });
+    },
+
+    injectMockData() {
+      this.isFavorite = false;
+      this.article = {
+        title: '穿戴甲的操作视频扫码验券操作',
+
+        // Mock作者相关数据(测试品牌跳转，将linkType改为2)
+        linkType: 2,
+        linkId: 101,
+        authorName: '蜜丝卡伦官方品牌',
+        authorAvatar: 'https://images.unsplash.com/photo-1512290923902-8a9f81dc236c?ixlib=rb-4.0.3&auto=format&fit=crop&w=100&q=80',
+        authorVideoCount: 658,
+
+        date: '2026.03.03',
+        videoSrc: 'https://vjs.zencdn.net/v/oceans.mp4',
+        poster: 'https://images.unsplash.com/photo-1610992015732-2449b76344bc?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80',
+        htmlContent: `
+          <p>最近，一向以平价、良心、宠粉著称的胖东来，突然因为一条毛巾被推上风口浪尖。</p>
+          <p>4月下旬，抖音博主“惊梦人-”连续发布多条探店视频，称自己跑遍许昌5家胖东来门店，发现一边是几块钱的玻璃水、洗衣液等亲民好物，另一边却摆着标价249元的高端毛巾，价格形成反差。</p>
+          <img src="https://dummyimage.com/800x400/ff6b81/ffffff.png&text=占位图" alt="会员权益"/>
+        `
+      };
+      this.loadMockRecommend();
+    },
+
+    loadMockRecommend() {
+      this.recommendList = [
+        {
+          id: 1,
+          title: '穿戴甲的操作视频扫码验券操作教程...',
+          coverSrc: 'https://images.unsplash.com/photo-1604654894610-df63bc536371?ixlib=rb-4.0.3&auto=format&fit=crop&w=400&q=80',
+          type: '平台课程',
+          typeIcon: 'https://dummyimage.com/100x100/e6505f/fff.png&text=融',
+          views: 836000,
+          time: '7小时前'
+        },
+        {
+          id: 2,
+          title: '脸部按摩操作步骤详情',
+          coverSrc: 'https://images.unsplash.com/photo-1512290923902-8a9f81dc236c?ixlib=rb-4.0.3&auto=format&fit=crop&w=400&q=80',
+          type: '脸缘品牌',
+          typeIcon: 'https://dummyimage.com/100x100/e6505f/fff.png&text=缘',
+          views: 8334,
+          time: '1天前'
+        }
+      ];
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.skill-detail-page {
+  background-color: #ffffff;
+  min-height: 100vh;
+  padding-bottom: 60rpx;
+  position: relative;
+}
+
+.mock-switch {
+  position: fixed;
+  right: 20rpx;
+  top: 200rpx;
+  background: #E5505F;
+  color: #fff;
+  font-size: 24rpx;
+  padding: 10rpx 20rpx;
+  border-radius: 30rpx;
+  z-index: 999;
+  box-shadow: 0 4rpx 10rpx rgba(229, 80, 95, 0.4);
+}
+
+.video-section {
+  width: 100%;
+  height: 420rpx;
+
+  .video-wrapper {
+    position: relative;
+    width: 100%;
+    height: 100%;
+
+    .main-video {
+      width: 100%;
+      height: 100%;
+      position: relative;
+    }
+
+    .fallback-poster {
+      z-index: 1;
+    }
+
+    .center-play-icon {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      width: 80rpx;
+      height: 80rpx;
+      z-index: 99;
+    }
+
+    .custom-control-bar {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      height: 70rpx;
+      z-index: 99;
+
+      .bar-bg {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 70rpx;
+        z-index: 100;
+      }
+
+      .bar-content {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 70rpx;
+        z-index: 101;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        padding: 0 10rpx;
+        box-sizing: border-box;
+
+        .ctrl-icon {
+          width: 25rpx;
+          height: 30rpx;
+          margin: 0 10rpx;
+          flex-shrink: 0;
+        }
+
+        .mute-icon {
+          width: 38rpx;
+          height: 30rpx;
+          flex-shrink: 0;
+        }
+
+        .fullscreen-icon {
+          width: 30rpx;
+          height: 30rpx;
+          flex-shrink: 0;
+        }
+
+        .time-text {
+          font-size: 22rpx;
+          color: #ffffff;
+          line-height: 70rpx;
+        }
+
+        .slider-track {
+          flex: 1;
+          height: 70rpx;
+          margin: 0 20rpx;
+          position: relative;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+
+          .slider-bg {
+            position: absolute;
+            top: 33rpx;
+            left: 0;
+            width: 100%;
+            height: 4rpx;
+            background-color: rgba(255, 255, 255, 0.4);
+          }
+
+          .slider-active {
+            position: absolute;
+            top: 33rpx;
+            left: 0;
+            height: 4rpx;
+            background-color: #FF4767;
+          }
+
+          .slider-thumb {
+            position: absolute;
+            top: 25rpx;
+            margin-left: -10rpx;
+            width: 20rpx;
+            height: 20rpx;
+            border-radius: 50%;
+            background-color: #FF4767;
+          }
+        }
+      }
+    }
+  }
+}
+
+.article-header {
+  padding: 30rpx 30rpx 20rpx;
+
+  .title {
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #333333;
+    line-height: 45rpx;
+    margin-bottom: 24rpx;
+  }
+
+  .meta-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .author-info {
+      display: flex;
+      align-items: center;
+
+      .avatar {
+        width: 28rpx;
+        height: 28rpx;
+        border-radius: 50%;
+        margin-right: 12rpx;
+      }
+
+      .author-name {
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #666666;
+        line-height: 33rpx;
+        margin-right: 16rpx;
+      }
+
+      .date {
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+        line-height: 33rpx;
+      }
+    }
+
+    .favorite-btn {
+      display: flex;
+      align-items: center;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #999999;
+      line-height: 33rpx;
+
+      .star-icon {
+        width: 26rpx;
+        height: 26rpx;
+        margin-right: 6rpx;
+        margin-top: -2rpx;
+      }
+
+      .active-fav {
+        color: #FD5A8C;
+      }
+    }
+  }
+}
+
+.article-content-wrapper {
+  .article-content {
+    padding: 0 30rpx 40rpx;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #2A2A2A;
+    line-height: 40rpx;
+
+    ::v-deep p {
+      margin-bottom: 24rpx;
+      line-height: 40rpx;
+    }
+
+    ::v-deep img {
+      max-width: 100%;
+      height: auto;
+      display: block;
+      border-radius: 10rpx;
+      margin: 20rpx 0;
+    }
+  }
+
+  .empty-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 50rpx 0 80rpx;
+
+    .empty-icon {
+      width: 140rpx;
+      height: 140rpx;
+      margin-bottom: 24rpx;
+      opacity: 0.8;
+    }
+
+    .empty-text {
+      font-size: 26rpx;
+      color: #A9A9A9;
+    }
+  }
+}
+
+.recommend-section {
+  padding: 0 30rpx;
+
+  .section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 30rpx;
+
+    .section-title {
+      font-weight: 500;
+      font-size: 30rpx;
+      color: #333333;
+      line-height: 42rpx;
+    }
+
+    .refresh-btn {
+      display: flex;
+      align-items: center;
+      font-size: 26rpx;
+      color: #999999;
+
+      .refresh-icon {
+        width: 24rpx;
+        height: 28rpx;
+        margin-right: 8rpx;
+        transition: transform 0.5s ease;
+
+        &.is-rotating {
+          transform: rotate(360deg);
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f036a6b..3367646 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -405,7 +405,7 @@
 	.login {
 		width: 630rpx;
 		height: 96rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		color: #fff;
 		font-size: 40rpx;
 		line-height: 96rpx;
diff --git a/pages/message/active_setting.vue b/pages/message/active_setting.vue
index 27cb9df..3a44ad2 100644
--- a/pages/message/active_setting.vue
+++ b/pages/message/active_setting.vue
@@ -18,7 +18,7 @@
 						</view>
 					</view>
 				</view>
-				<uv-switch v-model="mainSwitch.switch" activeColor="#E8101E" @change="handleSwitchChange('total',mainSwitch, $event)"></uv-switch>
+				<uv-switch v-model="mainSwitch.switch" activeColor="#FF4767" @change="handleSwitchChange('total',mainSwitch, $event)"></uv-switch>
 			</view>
 		</view>
 		<view class="settings-title" v-if="kindList.length">
@@ -34,7 +34,7 @@
 					</view>
 					<view class="card-tip">{{ item.text }}</view>
 				</view>
-				<uv-switch v-model="item.switch" activeColor="#E8101E" @change="handleSwitchChange('branch',item, $event)"></uv-switch>
+				<uv-switch v-model="item.switch" activeColor="#FF4767" @change="handleSwitchChange('branch',item, $event)"></uv-switch>
 			</view>
 		</view>
 
@@ -267,7 +267,7 @@
 		}
 
 		.color-red {
-			color: #E8101E !important;
+			color: #FF4767 !important;
 		}
 
 		/* 弹窗样式 */
@@ -324,7 +324,7 @@
 		.dialog-btn {
 			width: 476rpx;
 			height: 86rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 44rpx;
 			display: flex;
 			align-items: center;
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 2e1dd3c..8f68ef9 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -332,7 +332,7 @@
 			width: 16rpx;
 			height: 16rpx;
 			border-radius: 50%;
-			background-color: #E8101E;
+			background-color: #FF4767;
 			margin-left: 8rpx;
 		}
 
diff --git a/pages/message/message_setting.vue b/pages/message/message_setting.vue
index 60f9d48..22d0fee 100644
--- a/pages/message/message_setting.vue
+++ b/pages/message/message_setting.vue
@@ -18,7 +18,7 @@
 						</view>
 					</view>
 				</view>
-				<uv-switch v-model="mainSwitch.switch" activeColor="#E8101E"
+				<uv-switch v-model="mainSwitch.switch" activeColor="#FF4767"
 					@change="handleSwitchChange('total',mainSwitch, $event)"></uv-switch>
 			</view>
 		</view>
@@ -35,7 +35,7 @@
 					</view>
 					<view class="card-tip">{{ item.text }}</view>
 				</view>
-				<uv-switch v-model="item.switch" activeColor="#E8101E"
+				<uv-switch v-model="item.switch" activeColor="#FF4767"
 					@change="handleSwitchChange('branch',item, $event)"></uv-switch>
 			</view>
 		</view>
@@ -289,7 +289,7 @@
 		}
 
 		.color-red {
-			color: #E8101E !important;
+			color: #FF4767 !important;
 		}
 
 		/* 弹窗样式 */
@@ -346,7 +346,7 @@
 		.dialog-btn {
 			width: 476rpx;
 			height: 86rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 44rpx;
 			display: flex;
 			align-items: center;
@@ -437,7 +437,7 @@
 		width: 300rpx;
 		height: 80rpx;
 		line-height: 80rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 40rpx;
 		margin: 0 auto;
 	}
diff --git a/pages/message/settings.vue b/pages/message/settings.vue
index a4b1e58..d2de657 100644
--- a/pages/message/settings.vue
+++ b/pages/message/settings.vue
@@ -29,7 +29,7 @@
 					</view>
 					<view class="card-tip"> 开启语音提示避免落单</view>
 				</view>
-				<uv-switch v-model="value" @change="changeVoice" activeColor="#E8101E"></uv-switch>
+				<uv-switch v-model="value" @change="changeVoice" activeColor="#FF4767"></uv-switch>
 			</view>
 		</view>
 
@@ -292,7 +292,7 @@
 		}
 
 		.color-red {
-			color: #E8101E !important;
+			color: #FF4767 !important;
 		}
 
 		// 弹窗遮罩
@@ -348,7 +348,7 @@
 		.dialog-btn {
 			width: 400rpx;
 			height: 88rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 44rpx;
 			display: flex;
 			align-items: center;
diff --git a/pages/my/my.vue b/pages/my/my.vue
index ba8c00a..dd29df4 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,1451 +1,1895 @@
-<template>
-	<view class="my-page">
-		<!-- 顶部导航栏 -->
-		<!-- <custom-navbar
-      title="我的"
-      :show-back="false"
-      title-color="#333333"
-      :backgroundColor="backgroundColor"
-    ></custom-navbar> -->
-
-		<!-- 用户信息区域 -->
-		<view class="user-section" v-if="isLogin">
-			<view class="user-info">
-				<view class="user-info-left">
-					<view class="avatar">
-						<image :src="!userInfo.head_photo ? baseAvartar : userInfo.head_photo" mode="aspectFill"
-							class="avatar-img"></image>
-						<button class="avatar-button"></button>
-						<!-- open-type="chooseAvatar" -->
-						<!-- @chooseavatar="getAvatar" -->
-					</view>
-
-					<view class="user-detail" @click="goToProfile">
-						<view class="nickname">
-							<text class="nickname-text">{{
-                userInfo.name || userInfo.nick_name || ""
-              }}</text>
-						</view>
-						<view class="user_detail_tip">
-							<view class="user_detail_tip_phone" v-if="id_type !== 0">
-								资料编辑
-								<image mode="aspectFill"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6a4b7bc9-174a-471a-9bf5-6ba167005960" />
-							</view>
-							<view v-else class="user_detail_tip_phone" style="color: #999999">美融融小程序欢迎您</view>
-						</view>
-					</view>
-				</view>
-				<view class="user-info-right" @click="goToWallet">
-					<view class="wallet_content">
-						<image
-							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/931c0992-5243-4c70-ab2b-b99b430661c8.png"
-							mode="aspectFill" class="wallet_content_img"></image>
-						<view class="wallet_content_text">钱包余额：<text style="color: #e8101e">{{ userInfo.money }}元</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="authentication" v-if="id_type == 2 && !isBind">
-				<view @click="goTypeSelect" class="authentication_content">
-					<image mode="aspectFill" class="authentication_img"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ed8bc685-33bd-48cf-8058-85b07b9be0dc.png" />
-					<view class="authentication_text">申请成为平台商家</view>
-				</view>
-			</view>
-			<view class="inviteMessage" v-if="inviteList.length > 0">
-				<view class="inviteMessage_content">
-					<image mode="widthFix" class="inviteMessage_img"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/7f577210-2d63-4146-af09-bcaf3db85a49.png" />
-					<view class="inviteMessage_text">您有{{ inviteList.length }}条商家邀请</view>
-				</view>
-				<image @click="goToInviteList" mode="aspectFill" class="btn_img"
-					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/f2483bec-bbe7-4f2c-a6fd-e40a0accae82.png" />
-			</view>
-		</view>
-		<!-- 用户相关信息 -->
-		<view class="user-section" v-else>
-			<view class="user-info">
-				<view class="user-info-left" @click="goLogin">
-					<image
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b48d973-d219-4cac-b206-675c192d0cff"
-						mode="aspectFill" class="avatar"></image>
-					<view class="user-detail">
-						<text class="nickname"> 请点击登录 </text>
-						<text class="user-detail-tip">美融融商家欢迎您</text>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="order-card">
-			<template v-for="card in currentCardList">
-				<view class="function-list" v-if="card.type == 'line'">
-					<view class="function-title">{{ card.title }}</view>
-					<view class="function-grid">
-						<view class="grid-item" v-for="(item, index) in card.list" :key="index"
-							@click="handleFunction(item)">
-							<view class="icon-wrapper">
-								<image :src="item.icon" class="grid-icon" mode="widthFix"></image>
-							</view>
-							<text class="grid-text">{{ item.text }}</text>
-						</view>
-					</view>
-				</view>
-				<view class="function-list" style="padding: 24rpx; padding-bottom: 28rpx"
-					v-if="card.type == 'lineCard'">
-					<view class="lineCard-title">{{ card.title }}</view>
-					<view class="lineCard-grid">
-						<image v-for="(item, index) in card.list" :src="item.url" mode="widthFix"
-							@click="handleFunction(item)"></image>
-					</view>
-				</view>
-				<view class="imagePure" v-if="card.type == 'imagePure'">
-					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
-				</view>
-				<view class="image-list" v-if="card.type == 'image'">
-					<view class="image-title">{{ card.title }}</view>
-					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
-				</view>
-				<view class="imageText-list" v-if="card.type == 'imageText'">
-					<view class="imageText-title">{{ card.title }}</view>
-					<view class="imageText-content">
-						<image :src="card.url" mode="widthFix"></image>
-						<view class="text-status">入驻成功啦！</view>
-						<view class="text-next">下一步:等待<text style="color: #e8101e">专属门店商家邀约绑定</text>，解锁订单资源与服</view>
-						<view class="text-next">务通道，开启高效变现、共创共赢的新旅程～</view>
-					</view>
-				</view>
-			</template>
-		</view>
-
-		<tipsPopup2 :show="tipShow" @closePopup="closePopup" sureText="确认" @okBtn="okBtn">
-			{{ tipsText }}
-		</tipsPopup2>
-		<TabBar :selected="2"></TabBar>
-	</view>
-</template>
-
-<script>
-	import TabBar from "@/components/tabbar/tabbar.vue"
-	import tipsPopup2 from "@/components/tips-popup/tips-popup2";
-	import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
-	import request from "@/utils/request";
-	export default {
-		components: {
-			CustomNavbar,
-			tipsPopup2,
-			TabBar
-		},
-		data() {
-			return {
-				tipType: "", //提示弹窗类型
-				userInfo: {},
-				baseAvartar: "https://app.mrrweb.com.cn" + "/public/images/headanimal.png",
-				cardList: [{
-						type: "image",
-						title: "基础功能",
-						id_type: 0,
-						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/aa9fa8d6-8d85-4dce-875a-e71e02595198.png",
-						path: "/pages/ruzhu/ruzhu",
-					},
-					{
-						type: "lineCard",
-						title: "管理中心",
-
-						list: [{
-								title: "员工管理",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a9c13cce-f3e1-4ac1-9881-d39dc2b813ff.png",
-								path: "/pages/shop/staff/manage",
-								go_id_type: 1,
-							},
-							{
-								title: "服务分配",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/673f9885-3be1-4769-b417-b675b8ac5099.png",
-								path: "/pages/shop/staff/distribution-service",
-								go_id_type: 1,
-							},
-						],
-					},
-					{
-						type: "lineCard",
-						title: "交易项目",
-
-						list: [{
-								title: "服务管理",
-								path: "/pages/artisan/service-list",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c4a8df11-b4c0-46e3-a72e-7bbb20bbbd6a.png",
-							},
-							{
-								title: "工位管理",
-								path: "/pages/shop/workSpace/list",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d4c59f74-34a5-4e0f-b3be-766342e4d6e9.png",
-							},
-							{
-								title: "购买服务",
-								path: "/pages/shop/buy-service",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/285172ae-9757-472f-b466-73d5cc78d82a.png",
-							},
-							{
-								title: "购买工时",
-								path: "/pages/shop/manHour/buyManHour",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9a13b1d0-3099-4e52-8d43-549f2520c1ca.png",
-							},
-						],
-					},
-					{
-						type: "lineCard",
-						title: "交易订单",
-
-						list: [{
-								title: "用户订单",
-								path: "/pages/shop/userorders",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/1ca76fe3-21fc-408d-a453-4b253e377e46.png",
-							},
-							{
-								title: "工位订单",
-								path: "/pages/shop/workSpace/saleList",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6ebd42c1-09a4-4ed1-8b82-de6db52f6cda.png",
-							},
-							{
-								title: "服务订单",
-								path: "/pages/shop/buy-order",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/65c5d29b-9aa6-4dd0-b766-baa484d1e5fe.png",
-							},
-							{
-								title: "工时订单",
-								path: "/pages/shop/manHour/saleList",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/f4b1628d-9d2e-4de0-90a8-bd2c83dad2af.png",
-							},
-						],
-					},
-					{
-						type: "lineCard",
-						title: "营销中心",
-
-						list: [{
-								title: "拼团管理",
-								path: "/pages/shop/groupBuying/list",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9a93bf6a-4387-460e-afb5-80441e4e7310.png",
-							},
-							{
-								title: "日常推广",
-								path: "/pages/promotion/promotion",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b7419b23-2241-4b32-98f2-603bb479bcc1.png",
-							},
-						],
-					},
-					{
-						type: "lineCard",
-						title: "平台自营项目",
-						id_type: 1,
-						self_state: true,
-						list: [{
-								text: "自营服务",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b0faf058-e824-4d8b-a4fa-17d3e90b04ec.png",
-								path: "/pages/selfOperated/list",
-							},
-							{
-								text: "自营订单",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b1dc0fc5-13be-4e21-8942-929edd42195b.png",
-								path: "/pages/shop/userorders?serviceType=2",
-							},
-						],
-					},
-					{
-						type: "imagePure",
-						title: "",
-						id_type: 1,
-						self_state: false,
-						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/30b42fe6-21f9-443f-a091-5439d57e3593.png",
-						path: "/pages/selfOperated/agreement?title=平台自营项目介绍&type=18",
-					},
-					{
-						type: "line",
-						title: "我的服务",
-						list: [{
-								text: "联系平台",
-								icon: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/930a458a-9d2a-4543-a39c-399bb5bb5290.png",
-								path: "/pages/contact/contact",
-							},
-							{
-								text: "设置",
-								icon: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0e0676c1-aa2b-4b3f-b9d5-c020c566cc85.png",
-								path: "",
-								type: "setting",
-								isNeedLogin: true,
-							},
-						],
-					},
-				],
-
-				isLogin: false,
-				tipsText: "",
-				tipShow: false,
-				scrollTop: 0,
-				inviteList: [],
-				// 账号停用弹窗控制
-				stopUseModal: false,
-			};
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		computed: {
-			id_type() {
-				return this.userInfo?.id_type || 0;
-			},
-			isBind() {
-				return this.userInfo.bind_count > 0;
-			},
-
-			// 判断是否账号已停止使用
-			isAccountDisabled() {
-				return this.userInfo?.is_ok === 2;
-			},
-
-			currentCardList() {
-				return this.cardList
-					.filter((card) => this.checkShow(card))
-					.map((item) => ({
-						...item,
-						list: item.list?.filter((card) => this.checkShow(card)),
-					}));
-			},
-			backgroundColor() {
-				if (this.scrollTop > 10) {
-					return `rgba(255, 255, 255, ${0.02 * this.scrollTop});`;
-				}
-				return "transparent";
-			},
-		},
-		onLoad() {
-			uni.hideTabBar();
-			const systemInfo = uni.getSystemInfoSync();
-			const statusBarHeight = systemInfo.statusBarHeight;
-			// 导航栏主体高度：iOS一般44px，Android一般48px（可自定义）
-			const navMainHeight = systemInfo.platform === "ios" ? 44 : 48;
-			// 绑定2个CSS变量：状态栏高度、导航栏主体高度
-			this.cssVars = {
-				"--status-bar-height": `${statusBarHeight}px`,
-				"--nav-main-height": `${navMainHeight}px`,
-			};
-		},
-		onShow() {
-			this.isLogin = uni.getStorageSync("accessToken") ? true : false;
-			if (!this.isLogin) {} else {
-				// 获取用户信息
-				this.getUserInfo();
-			}
-		},
-		methods: {
-			// 检查是否允许访问的方法
-			checkAccess(item) {
-				// 如果账号未停止使用，允许访问所有
-				if (!this.isAccountDisabled) {
-					return true;
-				}
-
-				// 账号已停止使用时，只允许特定的路径访问
-				// 允许访问的路径列表
-				const allowedPaths = [
-					"/subPackages/other/contact/contact", // 联系平台
-				];
-
-				const allowedTypes = ["logout"]; // 退出登录
-
-				// 检查是否在允许列表中
-				if (item.type && allowedTypes.includes(item.type)) {
-					return true;
-				}
-
-				if (item.path && allowedPaths.includes(item.path)) {
-					return true;
-				}
-
-				// 其他情况不允许访问
-				this.showStopUseModal();
-				return false;
-			},
-
-			// 显示账号停用提示
-			showStopUseModal() {
-				uni.showModal({
-					title: "提示",
-					content: "您的账号已停止使用。若有疑问或恢复需求，请尽快联系平台工作人员核实处理。",
-					showCancel: false,
-					confirmText: "我知道了",
-				});
-			},
-
-			checkShow(card) {
-				if (card.id_type != undefined && card.id_type != this.id_type) {
-					return false;
-				}
-				if (card.isNeedLogin != undefined) {
-					return this.isLogin;
-				}
-				if (
-					card.self_state != undefined &&
-					(card.self_state ?
-						this.userInfo.self_state != 1 :
-						this.userInfo.self_state == 1)
-				) {
-					return false;
-				}
-				return true;
-			},
-			// 去权益界面
-			goToRights() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				uni.navigateTo({
-					url: "/subPackages/other/agreement/agreement?type=16&title=权益说明",
-				});
-			},
-			goToWallet() {
-				uni.navigateTo({
-					url: "/pages/wallet/wallet",
-				});
-			},
-			saveToast() {
-				setTimeout(() => {
-					uni.showToast({
-						title: "保存成功！",
-						icon: "none",
-					});
-				}, 500);
-			},
-			async getAvatar(e) {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				console.log("getAvatar:", e);
-				const tempFilePath = e.detail.avatarUrl; // 获取临时文件路径
-				try {
-					// 4. 生成唯一文件名（防止OSS文件覆盖，推荐格式：目录/时间戳-随机数.后缀）
-					const filename = `${Date.now()}-${Math.floor(
-          Math.random() * 1000,
-        )}.jpg`;
-
-					// 5. 显示上传中loading（提升用户体验）
-					uni.showLoading({
-						title: "上传中...",
-						mask: true,
-					});
-
-					// 6. 调用后端接口，获取OSS临时上传参数（关键：OSS不允许前端直接传密钥，需后端签名）
-					const ossConfig = await this.getOssUploadConfig(filename);
-					if (!ossConfig) {
-						uni.hideLoading();
-						uni.showToast({
-							title: "获取上传配置失败",
-							icon: "none",
-						});
-						return;
-					}
-
-					// 7. 上传图片到阿里云OSS（使用UniApp uploadFile，适配小程序）
-					await this.uploadToOss(tempFilePath, ossConfig);
-
-					// 8. 上传成功后续操作（如更新页面头像、通知后端更新用户信息）
-					const ossFileUrl = `${ossConfig.host}/${ossConfig.dir}${filename}`; // OSS文件最终URL
-					uni.hideLoading();
-					uni.showToast({
-						title: "头像上传成功",
-					});
-					console.log("OSS图片URL:", ossFileUrl);
-					this.saveProfile(ossFileUrl);
-				} catch (error) {
-					uni.hideLoading();
-					console.error("头像上传异常:", error);
-				}
-			},
-			// 保存资料
-			saveProfile(url) {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				uni.showLoading({
-					title: "保存中...",
-				});
-				let head_photo = url;
-				let {
-					nick_name,
-					sex,
-					dependency
-				} = this.userInfo;
-				request
-					.post("/syr/User/editUser", {
-						nick_name,
-						head_photo,
-						sex,
-						dependency,
-					})
-					.then((res) => {
-						uni.hideLoading();
-						this.userInfo.head_photo = url;
-						uni.showToast({
-							title: "保存成功！",
-							icon: "none",
-						});
-					});
-			},
-			//调用后端接口，获取OSS临时上传参数（关键：OSS不允许前端直接传密钥，需后端签名）
-			async getOssUploadConfig(filename) {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				try {
-					// 调用后端接口，传递文件名（后端需根据filename生成对应的dir和key）
-					const res = await request.post("/user/getalioss", {
-						type: 1, // 后端定义的业务类型（如1=头像）
-						kind: 1, // 后端定义的参数（按实际接口调整）
-						filename: filename, // 告知后端当前要上传的文件名，用于生成OSS的key
-					});
-					return {
-						...res,
-						filename,
-					}; // 格式示例：{ host: "https://xxx.oss-cn-beijing.aliyuncs.com", policy: "...", OSSAccessKeyId: "...", signature: "...", dir: "user/avatar/" }
-				} catch (error) {
-					console.error("获取OSS配置失败:", error);
-					throw error;
-				}
-			},
-			//上传oss
-			async uploadToOss(tempFilePath, ossConfig) {
-				return new Promise((resolve, reject) => {
-					// 构造OSS上传的FormData参数（严格按OSS要求的字段名）
-					const formData = {
-						name: ossConfig.filename, // 文件名（与后端协商的key一致）
-						policy: ossConfig.policy, // OSS临时授权policy
-						OSSAccessKeyId: ossConfig
-						.ossAccessKeyId, // 临时AccessKeyId（注意字段名：后端返回可能是ossAccessKeyId或OSSAccessKeyId，需对齐）
-						signature: ossConfig.signature, // 签名
-						success_action_status: "200", // OSS上传成功后返回200状态码（必须设置）
-						key: ossConfig.dir + ossConfig.filename ||
-							ossConfig.dir + tempFilePath.split("/")
-						.pop(), // OSS存储的完整key（dir + filename，核心字段）
-					};
-
-					// 调用UniApp上传API（小程序推荐用这个，比fetch稳定）
-					uni.uploadFile({
-						url: ossConfig.host, // OSS的Endpoint（如https://xxx.oss-cn-beijing.aliyuncs.com）
-						filePath: tempFilePath, // 小程序临时文件路径
-						name: "file", // OSS要求的文件字段名（固定为"file"，后端需与OSS配置一致）
-						formData: formData, // OSS上传所需的表单参数
-						timeout: 30000, // 超时时间（30秒，防止大文件上传超时）
-						success: (uploadRes) => {
-							// OSS上传成功的判断：statusCode为200且响应体为空（OSS特性）
-							if (uploadRes.statusCode === 200) {
-								resolve();
-							} else {
-								reject(new Error(`OSS上传失败，状态码: ${uploadRes.statusCode}`));
-							}
-						},
-						fail: (err) => {
-							reject(new Error(`上传请求失败: ${err.errMsg}`));
-						},
-					});
-				});
-			},
-			closePopup() {
-				this.tipShow = false;
-				//uni.showTabBar();
-			},
-
-			okBtn() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				if (this.tipType == "tjRuzhu") {
-					getApp().globalData.artisanType = 2;
-					if (this.userInfo.is_ok == 2) {
-						uni.navigateTo({
-							url: "/subPackages/ruzhu/stopuse",
-						});
-						return;
-					}
-					//如果现在身份是推荐官认证中身份是推荐官
-					if (
-						this.userInfo.id_type == 1 &&
-						this.userInfo.auth_info?.id_type == 1
-					) {
-						uni.navigateTo({
-							url: "/subPackages/ruzhu/complete?id_type=1",
-						});
-						return;
-					}
-					if (!this.userInfo.auth_info?.apply_state) {
-						//如果没有认证中信息
-						uni.navigateTo({
-							url: "/subPackages/ruzhu/complete",
-						});
-					} else {
-						//如果认证中信息apply_state状态不同
-						if (this.userInfo.auth_info.apply_state == 1) {
-							uni.navigateTo({
-								url: "/subPackages/ruzhu/submitres?applyState=1",
-							});
-						} else if (this.userInfo.auth_info.apply_state == 2) {
-							uni.navigateTo({
-								url: "/subPackages/ruzhu/submitres?applyState=2",
-							});
-						} else if (this.userInfo.auth_info.apply_state == 3) {
-							uni.navigateTo({
-								url: "/subPackages/ruzhu/submitres?applyState=3",
-							});
-						}
-					}
-				} else if (this.tipType == "login") {
-					uni.navigateTo({
-						url: "/pages/blogPopup/blogPopup",
-					});
-				}
-				// uni.showTabBar();
-			},
-			getUserInfo() {
-				request.post("/sj/user/getUser").then((result) => {
-					this.userInfo = result.data;
-					uni.setStorageSync("syrId", result.data.id);
-				});
-				this.getInviteList();
-			},
-			async goLogin() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				this.tipsText = "您现在还未登录，是否确定登录？";
-				this.tipShow = true;
-				this.tipType = "login";
-				uni.hideTabBar();
-			},
-
-			goToOrderList(type) {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				if (!this.isLogin) {
-					uni.showToast({
-						title: "您暂未登录，无法使用此功能！",
-						icon: "none",
-					});
-					return;
-				}
-			},
-			logout() {
-				uni.showModal({
-					title: "提示",
-					content: "确定要退出登录吗？",
-					success: (res) => {
-						if (res.confirm) {
-							// uni.removeStorageSync('access_token');
-							// uni.removeStorageSync('refresh_token');
-							uni.clearStorageSync();
-							// TODO: 实现退出登录逻辑
-							uni.reLaunch({
-								url: "/pages/home/home",
-							});
-						}
-					},
-				});
-			},
-			async handleFunction(item) {
-				// 如果是退出登录，直接处理，不检查账号状态
-				if (this.isLogin && item.type === "setting") {
-					uni.navigateTo({
-						url: `/pages/settings/index`,
-					});
-					return;
-				}
-
-				// 检查账号状态，如果不允许访问，直接返回
-				if (!this.checkAccess(item)) {
-					return;
-				}
-
-				// if (!this.isLogin) {
-				//   uni.showToast({
-				//     title: "您暂未登录，无法使用此功能！",
-				//     icon: "none",
-				//   });
-				//   return;
-				// }
-
-				if (item.path == "/pages/ruzhu/ruzhu") {
-					request.post("/sj/userSjAuth/details", {
-						type: 1
-					}).then((res) => {
-						if (res.code == 200 && res.data && res.data.apply_state != 2) {
-							uni.navigateTo({
-								url: `/pages/ruzhu/submitres?identity=${res.data.id_type}&applyState=${res.data.apply_state}`,
-							});
-						} else {
-							uni.navigateTo({
-								url: item.path,
-							});
-						}
-					});
-
-					return;
-				}
-				if (item.type) {
-					uni.navigateTo({
-						url: `${item.path}?type=${item.type}`,
-					});
-				} else {
-					if (item.go_id_type == 1 && this.userInfo?.id_type == 0) {
-						uni.showToast({
-							title: `您暂未入驻，无法使用${ item.title }！`,
-							icon: "none",
-						});
-						return;
-					}
-					if(!this.isLogin && item.go_id_type){
-						uni.showToast({
-							title: `您暂未登录，无法使用${ item.title }！`,
-							icon: "none",
-						});
-						return;
-					}
-					uni.navigateTo({
-						url: `${item.path}`,
-					});
-				}
-			},
-			goToProfile() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				if (this.userInfo.id_type == 0) {
-					return;
-				}
-				uni.navigateTo({
-					url: "/pages/artisan/profile",
-				});
-			},
-			goToInviteList() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				if (this.userInfo.id_type == 0) {
-					return;
-				}
-				uni.navigateTo({
-					url: "/subPackages/affiliated/inviteList?type=" + this.id_type,
-				});
-			},
-			getInviteList() {
-				request
-					.post("/syr/sjSyrBind/inviteList", {
-						page: 1,
-						limit: 999
-					})
-					.then((res) => {
-						this.inviteList = res.data.list;
-					});
-			},
-			goTypeSelect() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				request
-					.post("/syr/userSyrAuth/details", {
-						type: 1,
-						id_type: 1
-					})
-					.then((res) => {
-						if (res.code == 200 && res.data && res.data.apply_state != 2) {
-							uni.navigateTo({
-								url: `/subPackages/ruzhu/submitres?identity=${res.data.id_type}&applyState=${res.data.apply_state}`,
-							});
-						} else {
-							uni.navigateTo({
-								url: "/subPackages/ruzhu/typeSelect?id_type=1",
-							});
-						}
-					});
-			},
-		},
-	};
-</script>
-
-<style lang="less">
-	page {
-		background: #f5f5f5 !important;
-	}
-
-	.my-page {
-		/* min-height: 100vh; */
-		position: relative;
-		padding-bottom: 50rpx;
-		padding-top: var(--status-bar-height);
-		background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/825812de-54b3-486a-a3a0-2c4a1fb9fd28.png");
-		background-position: 0 0;
-		background-size: 100%;
-		background-repeat: no-repeat;
-		padding-bottom: 150rpx;
-	}
-
-	// .my-page::before {
-	//   content: "";
-	//   position: fixed;
-	//   top: 0;
-	//   left: 0;
-	//   right: 0;
-	//   height: 489rpx !important;
-	//   background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/825812de-54b3-486a-a3a0-2c4a1fb9fd28.png");
-	//   background-size: cover;
-	//   background-position: center top;
-	//   background-repeat: no-repeat;
-	//   z-index: -1;
-	// }
-
-	/* 确保内容在背景之上 */
-	.user-section,
-	.order-section,
-	.function-list,
-	.user-stats,
-	.image-list,
-	.imageText-list,
-	.info_section {
-		position: relative;
-		z-index: 99;
-		margin: 0 30rpx;
-	}
-
-	/* 用户信息区域 */
-	.user-section {
-		background-color: transparent;
-		box-sizing: border-box;
-		padding-bottom: 40rpx;
-		padding-top: 26rpx;
-
-		.upgradeBanner {
-			padding-top: 40rpx;
-			width: 690rpx;
-			height: 114rpx;
-			position: relative;
-
-			.upgradeBanner-img {
-				width: 690rpx;
-				height: 114rpx;
-			}
-
-			.upgradeBanner-btn {
-				position: absolute;
-				left: 304rpx;
-				bottom: 20rpx;
-				width: 100rpx;
-				height: 40rpx;
-			}
-		}
-
-		.user-info {
-			display: flex;
-			flex-flow: row nowrap;
-			justify-content: space-between;
-			align-items: center;
-
-			.user-info-left {
-				display: flex;
-				flex-flow: row nowrap;
-				justify-content: flex-start;
-				align-items: center;
-
-				.avatar {
-					width: 124rpx;
-					height: 124rpx;
-					border: 4rpx solid #fff;
-					box-sizing: border-box;
-					border-radius: 64rpx;
-					margin-right: 20rpx;
-					overflow: hidden;
-					position: relative;
-
-					.avatar-img {
-						width: 116rpx;
-						height: 116rpx;
-						border-radius: 64rpx;
-						margin-right: 20rpx;
-					}
-
-					.avatar-button {
-						position: absolute;
-						inset: 0;
-						margin: auto;
-					}
-				}
-
-				.user-detail {
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					align-items: flex-start;
-
-					.nickname {
-						font-weight: 500;
-						font-size: 32rpx;
-						color: #333333;
-						line-height: 45rpx;
-						text-align: left;
-						font-style: normal;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						.nickname-text {
-							max-width: 250rpx;
-							white-space: nowrap;
-							overflow: hidden;
-							text-overflow: ellipsis;
-						}
-
-						.inviteCode {
-							padding: 6rpx;
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #7e4e5b;
-							line-height: 28rpx;
-							text-align: left;
-							font-style: normal;
-							background: rgba(255, 255, 255, 0.3);
-							border-radius: 6rpx;
-							margin-left: 6rpx;
-						}
-					}
-
-					.user-detail-tip {
-						font-weight: 400;
-						font-size: 22rpx;
-						color: #999999;
-						line-height: 30rpx;
-						text-align: left;
-						font-style: normal;
-						margin-top: 12rpx;
-					}
-
-					.user-identity {
-						margin-top: 10rpx;
-						border: 1rpx solid #e8101e;
-						border-radius: 22rpx;
-						width: 112rpx;
-						height: 44rpx;
-						line-height: 44rpx;
-						text-align: center;
-						background-color: rgba(255, 241, 241, 1);
-
-						.identity-text {
-							font-size: 20rpx;
-							color: #e8101e;
-							font-weight: 400;
-						}
-					}
-				}
-			}
-
-			.user-info-right {
-				transform: translateY(14rpx);
-
-				.wallet_content {
-					height: 48rpx;
-					padding: 0rpx 16rpx;
-					display: flex;
-					align-items: center;
-					background: rgba(252, 67, 124, 0.1);
-					border-radius: 24rpx;
-					border: 1rpx solid rgba(232, 16, 30, 0.15);
-				}
-
-				.wallet_content_img {
-					width: 29rpx;
-					height: 29rpx;
-					margin-right: 2rpx;
-				}
-
-				.wallet_content_text {
-					font-family:
-						PingFangSC,
-						PingFang SC;
-					font-weight: 500;
-					font-size: 22rpx;
-					color: #666666;
-					line-height: 30rpx;
-					text-align: left;
-				}
-			}
-		}
-	}
-
-	.authentication {
-		display: flex;
-		margin-top: 20rpx;
-
-		.authentication_content {
-			height: 48rpx;
-			padding: 0rpx 20rpx;
-			display: flex;
-			align-items: center;
-			background: #ffe8e8;
-			border-radius: 24rpx;
-			border: 1rpx solid rgba(232, 16, 30, 0.19);
-
-			.authentication_img {
-				width: 27rpx;
-				height: 29rpx;
-				margin-right: 7rpx;
-			}
-
-			.authentication_text {
-				font-family:
-					PingFangSC,
-					PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				line-height: 37rpx;
-				color: #333333;
-			}
-		}
-	}
-
-	.inviteMessage {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 54rpx;
-		background: linear-gradient(320deg, #ffffff 0%, #ffffff 100%);
-		border-radius: 19rpx;
-		padding-right: 40rpx;
-
-		.inviteMessage_content {
-			height: 80rpx;
-			padding: 0rpx 20rpx;
-			display: flex;
-			align-items: center;
-			border-radius: 24rpx;
-
-			.inviteMessage_img {
-				width: 42rpx;
-				height: 42rpx;
-				margin-right: 20rpx;
-				flex-shrink: 0;
-			}
-
-			.inviteMessage_text {
-				font-family:
-					PingFangSC,
-					PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				line-height: 37rpx;
-				color: #333333;
-			}
-		}
-
-		.btn_img {
-			width: 130rpx;
-			height: 54rpx;
-		}
-	}
-
-	.bottom0 {
-		margin-bottom: 0;
-	}
-
-	.user-stats {
-		border-radius: 20rpx;
-		background-color: #fff;
-		box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.05);
-		display: flex;
-		justify-content: space-around;
-	}
-
-	.stat-item {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.stat-icon {
-		width: 64rpx;
-		height: 64rpx;
-		margin-bottom: 8rpx;
-	}
-
-	.stat-label {
-		font-size: 26rpx;
-		color: #252525;
-		font-weight: 400;
-	}
-
-	.order-card {
-		// background: linear-gradient(180deg, #FBF5F8 0%, #F6F6F6 100%);
-		border-radius: 30rpx 30rpx 0rpx 0rpx;
-		// padding-top: 30rpx;
-		display: flex;
-		flex-direction: column;
-		gap: 20rpx;
-	}
-
-	/* 订单状态区域 */
-	.order-section {
-		background: #ffffff;
-		box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(210, 213, 224, 0.5);
-		border-radius: 24rpx;
-		margin-bottom: 24rpx;
-		padding: 30rpx 20rpx 40rpx 20rpx;
-
-		.order-title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			line-height: 45rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 30rpx;
-		}
-
-		.order-status {
-			display: flex;
-			justify-content: space-between;
-			padding: 0rpx;
-			box-sizing: border-box;
-
-			.status-item {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.status-icon {
-					width: 200rpx;
-					height: 169rpx;
-				}
-			}
-		}
-	}
-
-	/* 功能列表 */
-	.function-list {
-		background: #ffffff;
-		border-radius: 24rpx;
-		padding: 30rpx;
-		padding-bottom: 50rpx;
-
-		.function-title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #252525;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 50rpx;
-		}
-
-		.function-grid {
-			display: flex;
-			flex-direction: column;
-			gap: 63rpx;
-
-			.grid-item {
-				display: flex;
-				align-items: center;
-				position: relative;
-				gap: 21rpx;
-
-				.icon-wrapper {
-					width: 42rpx;
-					height: 42rpx;
-					position: relative;
-					// margin-bottom: 12rpx;
-
-					.grid-icon {
-						width: 42rpx;
-						height: 42rpx;
-					}
-				}
-
-				.grid-text {
-					font-weight: 400;
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 42rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-
-			.grid-item::after {
-				position: absolute;
-				content: "";
-				width: 12rpx;
-				height: 24rpx;
-				right: 0rpx;
-				background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/gray_right_icon.png");
-				background-size: cover;
-			}
-		}
-
-		.lineCard-title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #252525;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 24rpx;
-		}
-
-		.lineCard-grid {
-			display: flex;
-			justify-content: space-between;
-			flex-wrap: wrap;
-			gap: 20rpx 0;
-
-			image {
-				width: 310rpx;
-				height: 120rpx;
-			}
-		}
-	}
-
-	/* 功能列表 */
-	.image-list {
-		background: #ffffff;
-		border-radius: 24rpx;
-		padding: 30rpx 20rpx;
-
-		.image-title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #252525;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 20rpx;
-		}
-
-		image {
-			width: 100%;
-			height: 148rpx;
-		}
-	}
-
-	.imageText-list {
-		background: #ffffff;
-		border-radius: 24rpx;
-		padding: 29rpx 27rpx 40rpx;
-
-		.imageText-title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #252525;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 11rpx;
-		}
-
-		.imageText-content {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			image {
-				width: 245rpx;
-				height: 171rpx;
-			}
-
-			.text-status {
-				font-family:
-					PingFangSC,
-					PingFang SC;
-				font-weight: 500;
-				font-size: 30rpx;
-				color: #000000;
-				margin-top: 20rpx;
-				margin-bottom: 22rpx;
-			}
-
-			.text-next {
-				font-family:
-					PingFangSC,
-					PingFang SC;
-				font-weight: 400;
-				font-size: 26rpx;
-				line-height: 37rpx;
-				color: #666666;
-				text-align: center;
-			}
-		}
-	}
-
-	.my-page::before {
-		height: 420rpx;
-	}
-
-	button {
-		background: transparent !important;
-		border: none !important;
-		border-radius: 0 !important;
-		padding: 0 !important;
-		min-width: auto !important;
-		height: auto !important;
-		line-height: normal !important;
-		color: inherit !important;
-		-webkit-tap-highlight-color: transparent !important;
-	}
-
-	button::after {
-		border: none !important;
-	}
-
-
-	.info_section {
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 20rpx;
-
-		.info_section_item {
-			width: 336rpx;
-			height: 193rpx;
-			background-size: cover;
-			background-position: center;
-			box-sizing: border-box;
-			display: flex;
-			flex-direction: column;
-			padding: 23rpx 26rpx 20rpx 26rpx;
-
-			.info_section_item_header {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding-bottom: 16rpx;
-				border-bottom: 2rpx solid rgba(210, 213, 224, 0.15);
-
-				.info_section_item_header_left {
-					display: flex;
-					align-items: center;
-					gap: 11rpx;
-				}
-
-				.info_section_item_img {
-					width: 35rpx;
-					height: 38rpx;
-				}
-
-				.info_section_item_label {
-					font-weight: 500;
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 38rpx;
-					text-align: left;
-					font-style: normal;
-				}
-
-				.info_section_item_header_right {
-					image {
-						width: 10rpx;
-						height: 20rpx;
-					}
-				}
-			}
-
-			.info_section_item_subtitle {
-				font-size: 22rpx;
-				color: #999999;
-				line-height: 30rpx;
-				margin-top: 12rpx;
-				margin-bottom: 6rpx;
-			}
-
-			.info_section_item_content {
-				display: flex;
-				align-items: baseline;
-				font-family: DINPro, DINPro;
-				font-weight: 500;
-				font-size: 36rpx;
-				color: #333333;
-
-				.info_section_item_content_unit {
-					font-family:
-						PingFangSC,
-						PingFang SC;
-					font-weight: 500;
-					font-size: 20rpx;
-					color: #333333;
-					margin-left: 3rpx;
-				}
-			}
-		}
-	}
-
-	.user_detail_tip {
-		display: flex;
-		align-items: center;
-		gap: 12rpx;
-		margin-top: 10rpx;
-
-		.user_detail_tip_phone {
-			max-width: 230rpx;
-			height: 36rpx;
-			line-height: 36rpx;
-			border-radius: 6rpx;
-			font-size: 24rpx;
-			color: #666666;
-			box-sizing: border-box;
-			display: flex;
-			align-items: center;
-			gap: 7rpx;
-
-			image {
-				width: 8rpx;
-				height: 14rpx;
-			}
-		}
-
-		.user_detail_tip_invite_name {
-			max-width: 246rpx;
-			font-size: 22rpx;
-		}
-	}
-
-	.imagePure {
-		width: 690rpx;
-		margin: 0 auto;
-
-		image {
-			width: 100%;
-		}
-	}
-</style>
\ No newline at end of file
+<template>
+	<view class="my-page">
+		<!-- 顶部导航栏 -->
+		<!-- <custom-navbar
+      title="我的"
+      :show-back="false"
+      title-color="#333333"
+      :backgroundColor="backgroundColor"
+    ></custom-navbar> -->
+
+		<!-- 用户信息区域 -->
+		<view class="user-section" v-if="isLogin">
+			<view class="user-info">
+				<view class="user-info-left">
+					<view class="avatar">
+						<image :src="!userInfo.head_photo ? baseAvartar : userInfo.head_photo" mode="aspectFill"
+							class="avatar-img"></image>
+						<button class="avatar-button"></button>
+						<!-- open-type="chooseAvatar" -->
+						<!-- @chooseavatar="getAvatar" -->
+					</view>
+
+					<view class="user-detail">
+						<view class="nickname">
+							<text class="nickname-text">{{
+								userInfo.name || userInfo.nick_name || ""
+							}}</text>
+						</view>
+						<view class="user_detail_tip" @click="toruzhu">
+							<image
+								:src="(userInfo.credentials_state === 2 || (userInfo.id_type > 0 && userInfo.credentials_state === 0)) ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/13cd25db-5b52-4d36-bad2-ee8680eed65f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/711e35a8-a7a1-4eb2-8a76-52ac9795fa7e.png'"
+								mode="" style="width:30rpx;height:30rpx ;"></image>
+							<view class="user_detail_tip_phone" style="margin-left: -10rpx;">
+								{{ (userInfo.credentials_state === 2 || (userInfo.id_type > 0 &&
+									userInfo.credentials_state === 0)) ? '认证通过' : userInfo.credentials_state === 1 ?
+									'资质审核中' : '资质待认证' }}
+							</view>
+							<image mode="widthFix"
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/89f929a5-1486-481f-a696-af520a6bb0f2.png"
+								style="width:8rpx ;margin-left: -6rpx;" />
+
+						</view>
+					</view>
+				</view>
+				<view class="user-info-right" @click="goToWallet">
+					<view class="wallet_content">
+						<image
+							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/931c0992-5243-4c70-ab2b-b99b430661c8.png"
+							mode="aspectFill" class="wallet_content_img"></image>
+						<view class="wallet_content_text">钱包余额：<text style="color: #FF4767">{{ userInfo.money }}元</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="authentication" v-if="id_type == 2 && !isBind">
+				<view @click="goTypeSelect" class="authentication_content">
+					<image mode="aspectFill" class="authentication_img"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ed8bc685-33bd-48cf-8058-85b07b9be0dc.png" />
+					<view class="authentication_text">申请成为平台商家</view>
+				</view>
+			</view>
+			<view class="inviteMessage" v-if="inviteList.length > 0">
+				<view class="inviteMessage_content">
+					<image mode="widthFix" class="inviteMessage_img"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9d15ac-ece5-4481-ae30-62f76ace032f.png" />
+					<view class="inviteMessage_text">您有{{ inviteList.length }}条商家邀请</view>
+				</view>
+				<image @click="goToInviteList" mode="aspectFill" class="btn_img"
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/defe90dd-3e35-4582-ad45-b36f68681bcc.png" />
+			</view>
+		</view>
+		<!-- 用户相关信息 -->
+		<view class="user-section" v-else>
+			<view class="user-info">
+				<view class="user-info-left" @click="goLogin">
+					<image
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b48d973-d219-4cac-b206-675c192d0cff"
+						mode="aspectFill" class="avatar"></image>
+					<view class="user-detail">
+						<text class="nickname"> 请点击登录 </text>
+						<text class="user-detail-tip">美融融商家欢迎您</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="order-card">
+			<template v-for="card in currentCardList">
+				<view class="function-list" v-if="card.type == 'line'" :key="card.title">
+					<view class="function-title">{{ card.title }}</view>
+					<view class="function-grid">
+						<view class="grid-item" v-for="(item, index) in card.list" :key="index"
+							@click="handleFunction(item)">
+							<view class="icon-wrapper">
+								<image :src="item.icon" class="grid-icon" mode="widthFix"></image>
+							</view>
+							<text class="grid-text">{{ item.text }}</text>
+						</view>
+					</view>
+				</view>
+				<view class="function-list" style="padding: 24rpx; padding-bottom: 28rpx" v-if="card.type == 'lineCard'"
+					:key="card.title">
+					<view class="lineCard-title">{{ card.title }}</view>
+					<view class="lineCard-grid">
+						<image v-for="(item, index) in card.list" :src="item.url" mode="widthFix"
+							@click="handleFunction(item)" :key="index"></image>
+					</view>
+				</view>
+				<view class="imagePure" v-if="card.type == 'imagePure'" :key="card.title">
+					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
+				</view>
+				<view class="image-list" v-if="card.type == 'image'" :key="card.title">
+					<view class="image-title">{{ card.title }}</view>
+					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
+				</view>
+				<view class="listcard-list" v-if="card.type == 'listcard'" :key="card.title">
+					<view class="function-title">{{ card.title }}</view>
+					<view class="listcard-item" v-for="(item, index) in card.list" :key="index">
+						<image @click="handleFunction(item)" :src="item.url" mode="widthFix"></image>
+						<view class="listcard-title">{{ item.title }}</view>
+						<view class="listcard-text">{{ item.text }}</view>
+					</view>
+				</view>
+				<view class="imageText-list" v-if="card.type == 'imageText'" :key="card.title">
+					<view class="lineCard-title">{{ card.title }}</view>
+					<view class="imageText-content">
+						<image :src="card.url" mode="widthFix"></image>
+						<view class="text-status">入驻成功啦！</view>
+						<view class="text-next">下一步:等待<text style="color: #FF4767">专属门店商家邀约绑定</text>，解锁订单资源与服</view>
+						<view class="text-next">务通道，开启高效变现、共创共赢的新旅程～</view>
+					</view>
+				</view>
+			</template>
+		</view>
+
+		<view class="setup-modal-mask" v-if="showSetupModal" catchtouchmove="true">
+			<view class="setup-modal-content">
+				<image class="modal-bg"
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ac2cb4aa-a7c5-4776-98f4-b77e9c0cfa85.png">
+				</image>
+
+				<view class="modal-header">
+					<text>温馨提示</text>
+				</view>
+
+				<view class="modal-body">
+					<text class="modal-subtitle">发布服务请完善以下资料：</text>
+
+					<view class="missing-list">
+						<view class="missing-item" v-if="!hasBusinessTime">
+							<view class="item-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+								</image>
+								<view class="item-texts">
+									<text class="item-title">营业时间未配置</text>
+									<text class="item-desc">请完善店铺的营业时间</text>
+								</view>
+							</view>
+							<view class="item-right orange" @tap="goToBusinessTime">去配置</view>
+						</view>
+
+						<view class="divider-line"></view>
+
+						<view class="missing-item" v-if="!hasServiceSkill">
+							<view class="item-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+								</image>
+								<view class="item-texts">
+									<text class="item-title">服务技能未配置</text>
+									<text class="item-desc">请完善服务技能</text>
+								</view>
+							</view>
+							<view class="item-right orange" @tap="goToServiceSkill">去配置</view>
+						</view>
+
+						<view class="divider-line"></view>
+
+						<view class="missing-item" v-if="!isCertified">
+							<view class="item-left">
+								<image class="item-icon"
+									:src="isUnderReview ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'">
+								</image>
+								<view class="item-texts">
+									<text class="item-title" :class="{ 'blue-text': isUnderReview }">{{ isUnderReview ?
+										'资质认证中' : '资质未认证' }}</text>
+									<text class="item-desc">请完成资质认证</text>
+								</view>
+							</view>
+							<view class="item-right" :class="isUnderReview ? 'grey' : 'light-green'" @tap="goToAuth">
+								{{ isUnderReview ? '查看进度' : '去认证' }}
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="modal-footer">
+					<view class="btn-know" @tap="closeSetupModal">知道了</view>
+				</view>
+			</view>
+		</view>
+
+		<tipsPopup2 :show="tipShow" @closePopup="closePopup" sureText="确认" @okBtn="okBtn">
+			{{ tipsText }}
+		</tipsPopup2>
+		<TabBar :selected="2"></TabBar>
+	</view>
+</template>
+
+<script>
+import TabBar from "@/components/tabbar/tabbar.vue"
+import tipsPopup2 from "@/components/tips-popup/tips-popup2";
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+import request from "@/utils/request";
+export default {
+	components: {
+		CustomNavbar,
+		tipsPopup2,
+		TabBar
+	},
+	data() {
+		return {
+			tipType: "", //提示弹窗类型
+			userInfo: {},
+			baseAvartar: "https://app.mrrweb.com.cn" + "/public/images/headanimal.png",
+			cardList: [{
+				type: "image",
+				title: "基础功能",
+				id_type: 0,
+				url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/aa9fa8d6-8d85-4dce-875a-e71e02595198.png",
+				path: "/pages/ruzhu/ruzhu",
+			},
+			{
+				type: "lineCard",
+				title: "管理中心",
+
+				list: [{
+					title: "员工管理",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9d847e84-e4ca-44c0-b9fb-e33803a67457.png",
+					path: "/pages/shop/staff/manage",
+					go_id_type: 1,
+				},
+				{
+					title: "服务分配",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d27ea76-2a81-4374-8033-5eef76598f9c.png",
+					path: "/pages/shop/staff/distribution-service",
+					go_id_type: 1,
+				},
+				{
+					title: "店铺装修",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png",
+					path: "/pages/artisan/profile",
+					go_id_type: 1,
+					directAccess: true,
+				},
+				{
+					title: "财务管理",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/edafae37-8258-4e1c-9dcc-019484117047.png",
+					path: "/pages/wallet/wallet",
+					go_id_type: 1,
+					directAccess: true,
+				},
+				],
+			},
+			{
+				type: "lineCard",
+				title: "交易项目",
+
+				list: [{
+					title: "服务管理",
+					path: "/pages/artisan/service-list",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0076bdee-f1c6-412d-9f05-187189a855a6.png",
+				},
+				{
+					title: "工位管理",
+					path: "/pages/shop/workSpace/list",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6568df0b-e646-4593-804b-a21ed0b35ede.png",
+				},
+				{
+					title: "购买服务",
+					path: "/pages/shop/buy-service",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6c9aa5ea-63aa-4a86-8858-cb58d303114f.png",
+				},
+				{
+					title: "购买工时",
+					path: "/pages/shop/manHour/buyManHour",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c40cddcb-6a43-4355-b25d-ab3e53e17982.png",
+				},
+				],
+			},
+			{
+				type: "lineCard",
+				title: "交易订单",
+
+				list: [{
+					title: "用户订单",
+					path: "/pages/shop/userorders",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b94e033c-836b-404c-85e9-9a7ba7680919.png",
+				},
+				{
+					title: "工位订单",
+					path: "/pages/shop/workSpace/saleList",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b5ede46f-71f9-4718-87a8-3aa4ba99c490.png",
+				},
+				{
+					title: "服务订单",
+					path: "/pages/shop/buy-order",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/673f1dac-1693-4f0a-aec4-c196aa72382b.png",
+				},
+				{
+					title: "购买工时",
+					path: "/pages/shop/manHour/saleList",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/742bd9c9-0f38-4c10-b0fb-9b1ecebfc18c.png",
+				},
+				],
+			},
+			{
+				type: "lineCard",
+				title: "营销中心",
+
+				list: [{
+					title: "拼团管理",
+					path: "/pages/shop/groupBuying/list",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/569c2ba5-2f39-4a3f-b36d-026c480d8203.png",
+				},
+				{
+					title: "日常推广",
+					path: "/pages/promotion/promotion",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/90d92ff7-4110-4ebd-8207-e6370699a1b6.png",
+				},
+				],
+			},
+			{
+				type: "lineCard",
+				title: "平台自营项目",
+				id_type: 1,
+				self_state: true,
+				list: [{
+					text: "自营服务",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa0c9545-91f4-4a73-b5fe-fa1217aa768e.png",
+					path: "/pages/selfOperated/list",
+				},
+				{
+					text: "自营订单",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfeff761-7448-4f31-a4e9-ee12b088d6a8.png",
+					path: "/pages/shop/userorders?serviceType=2",
+				},
+				],
+			},
+			{
+				type: "imagePure",
+				title: "",
+				id_type: 1,
+				self_state: false,
+				url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/545f2db0-d66a-41ca-b1f5-6a28469e65ba.png",
+				path: "/pages/selfOperated/agreement?title=平台自营项目介绍&type=18",
+			},
+			{
+				type: "listcard",
+				title: "我的服务",
+				list: [{
+					text: "我的收藏",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/83fa7f51-dda3-494b-a50e-f15f8fdcdb9c.png",
+					path: "/pages/my/myFavorite",
+				},
+				{
+					text: "设置",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d1173680-386b-4db3-a74c-64108da6cec9.png",
+					path: "/pages/settings/index",
+				},
+				{
+					text: "联系客服",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bbac7f8-940a-414a-be0b-e6faf5215f63.png",
+					path: "/pages/contact/contact",
+				},
+				],
+			},
+			],
+
+			isLogin: false,
+			tipsText: "",
+			tipShow: false,
+			scrollTop: 0,
+			inviteList: [],
+			// 账号停用弹窗控制
+			stopUseModal: false,
+			showSetupModal: false,
+			authDetails: null,
+		};
+	},
+	onPageScroll(e) {
+		this.scrollTop = e.scrollTop;
+	},
+	computed: {
+		id_type() {
+			return this.userInfo?.id_type || 0;
+		},
+		isBind() {
+			return this.userInfo.bind_count > 0;
+		},
+
+		// 判断是否账号已停止使用
+		isAccountDisabled() {
+			return this.userInfo?.is_ok === 2;
+		},
+
+		// 是否认证通过 (根据规则，> 0 说明认证通过了)
+		isCertified() {
+			if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+			return this.userInfo.id_type > 0;
+		},
+		// 是否已入驻
+		isSettled() {
+			if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+			return this.userInfo.id_type !== 0;
+		},
+		// 是否在审核中
+		isUnderReview() {
+			if (!this.isLogin) return false;
+			if (this.authDetails && Object.keys(this.authDetails).length > 0) {
+				return true;
+			}
+			return false;
+		},
+		// 服务技能是否已配置
+		hasServiceSkill() {
+			const fromUser = this.userInfo && Array.isArray(this.userInfo.servers_kill) && this.userInfo.servers_kill.length > 0;
+			const fromAuth = this.authDetails && Array.isArray(this.authDetails.servers_kill) && this.authDetails.servers_kill.length > 0;
+			return this.isLogin && (fromUser || fromAuth);
+		},
+		// 营业时间是否已配置
+		hasBusinessTime() {
+			const timeFromUser = this.userInfo && this.userInfo.business_time;
+			const timeFromAuth = this.authDetails && this.authDetails.business_time;
+			return this.isLogin && !!(timeFromUser || timeFromAuth);
+		},
+
+		currentCardList() {
+			return this.cardList
+				.filter((card) => this.checkShow(card))
+				.map((item) => ({
+					...item,
+					list: item.list?.filter((card) => this.checkShow(card)),
+				}));
+		},
+		backgroundColor() {
+			if (this.scrollTop > 10) {
+				return `rgba(255, 255, 255, ${0.02 * this.scrollTop});`;
+			}
+			return "transparent";
+		},
+	},
+	onLoad() {
+		uni.hideTabBar();
+		const systemInfo = uni.getSystemInfoSync();
+		const statusBarHeight = systemInfo.statusBarHeight;
+		// 导航栏主体高度：iOS一般44px，Android一般48px（可自定义）
+		const navMainHeight = systemInfo.platform === "ios" ? 44 : 48;
+		// 绑定2个CSS变量：状态栏高度、导航栏主体高度
+		this.cssVars = {
+			"--status-bar-height": `${statusBarHeight}px`,
+			"--nav-main-height": `${navMainHeight}px`,
+		};
+	},
+	onShow() {
+		this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+		if (!this.isLogin) { } else {
+			// 获取用户信息
+			this.getUserInfo();
+		}
+	},
+	methods: {
+		// 检查是否允许访问的方法
+		checkAccess(item) {
+			// 如果账号未停止使用，允许访问所有
+			if (!this.isAccountDisabled) {
+				return true;
+			}
+
+			// 账号已停止使用时，只允许特定的路径访问
+			// 允许访问的路径列表
+			const allowedPaths = [
+				"/subPackages/other/contact/contact", // 联系平台
+			];
+
+			const allowedTypes = ["logout"]; // 退出登录
+
+			// 检查是否在允许列表中
+			if (item.type && allowedTypes.includes(item.type)) {
+				return true;
+			}
+
+			if (item.path && allowedPaths.includes(item.path)) {
+				return true;
+			}
+
+			// 其他情况不允许访问
+			this.showStopUseModal();
+			return false;
+		},
+
+		// 显示账号停用提示
+		showStopUseModal() {
+			uni.showModal({
+				title: "提示",
+				content: "您的账号已停止使用。若有疑问或恢复需求，请尽快联系平台工作人员核实处理。",
+				showCancel: false,
+				confirmText: "我知道了",
+			});
+		},
+
+		checkShow(card) {
+			if (card.id_type != undefined && card.id_type != this.id_type) {
+				return false;
+			}
+			if (card.isNeedLogin != undefined) {
+				return this.isLogin;
+			}
+			if (
+				card.self_state != undefined &&
+				(card.self_state ?
+					this.userInfo.self_state != 1 :
+					this.userInfo.self_state == 1)
+			) {
+				return false;
+			}
+			return true;
+		},
+		// 去权益界面
+		goToRights() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			uni.navigateTo({
+				url: "/subPackages/other/agreement/agreement?type=16&title=权益说明",
+			});
+		},
+		goToWallet() {
+			uni.navigateTo({
+				url: "/pages/wallet/wallet",
+			});
+		},
+		saveToast() {
+			setTimeout(() => {
+				uni.showToast({
+					title: "保存成功！",
+					icon: "none",
+				});
+			}, 500);
+		},
+		async getAvatar(e) {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			console.log("getAvatar:", e);
+			const tempFilePath = e.detail.avatarUrl; // 获取临时文件路径
+			try {
+				// 4. 生成唯一文件名（防止OSS文件覆盖，推荐格式：目录/时间戳-随机数.后缀）
+				const filename = `${Date.now()}-${Math.floor(
+					Math.random() * 1000,
+				)}.jpg`;
+
+				// 5. 显示上传中loading（提升用户体验）
+				uni.showLoading({
+					title: "上传中...",
+					mask: true,
+				});
+
+				// 6. 调用后端接口，获取OSS临时上传参数（关键：OSS不允许前端直接传密钥，需后端签名）
+				const ossConfig = await this.getOssUploadConfig(filename);
+				if (!ossConfig) {
+					uni.hideLoading();
+					uni.showToast({
+						title: "获取上传配置失败",
+						icon: "none",
+					});
+					return;
+				}
+
+				// 7. 上传图片到阿里云OSS（使用UniApp uploadFile，适配小程序）
+				await this.uploadToOss(tempFilePath, ossConfig);
+
+				// 8. 上传成功后续操作（如更新页面头像、通知后端更新用户信息）
+				const ossFileUrl = `${ossConfig.host}/${ossConfig.dir}${filename}`; // OSS文件最终URL
+				uni.hideLoading();
+				uni.showToast({
+					title: "头像上传成功",
+				});
+				console.log("OSS图片URL:", ossFileUrl);
+				this.saveProfile(ossFileUrl);
+			} catch (error) {
+				uni.hideLoading();
+				console.error("头像上传异常:", error);
+			}
+		},
+		// 保存资料
+		saveProfile(url) {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			uni.showLoading({
+				title: "保存中...",
+			});
+			let head_photo = url;
+			let {
+				nick_name,
+				sex,
+				dependency
+			} = this.userInfo;
+			request
+				.post("/syr/User/editUser", {
+					nick_name,
+					head_photo,
+					sex,
+					dependency,
+				})
+				.then((res) => {
+					uni.hideLoading();
+					this.userInfo.head_photo = url;
+					uni.showToast({
+						title: "保存成功！",
+						icon: "none",
+					});
+				});
+		},
+		//调用后端接口，获取OSS临时上传参数（关键：OSS不允许前端直接传密钥，需后端签名）
+		async getOssUploadConfig(filename) {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			try {
+				// 调用后端接口，传递文件名（后端需根据filename生成对应的dir和key）
+				const res = await request.post("/user/getalioss", {
+					type: 1, // 后端定义的业务类型（如1=头像）
+					kind: 1, // 后端定义的参数（按实际接口调整）
+					filename: filename, // 告知后端当前要上传的文件名，用于生成OSS的key
+				});
+				return {
+					...res,
+					filename,
+				}; // 格式示例：{ host: "https://xxx.oss-cn-beijing.aliyuncs.com", policy: "...", OSSAccessKeyId: "...", signature: "...", dir: "user/avatar/" }
+			} catch (error) {
+				console.error("获取OSS配置失败:", error);
+				throw error;
+			}
+		},
+		//上传oss
+		async uploadToOss(tempFilePath, ossConfig) {
+			return new Promise((resolve, reject) => {
+				// 构造OSS上传的FormData参数（严格按OSS要求的字段名）
+				const formData = {
+					name: ossConfig.filename, // 文件名（与后端协商的key一致）
+					policy: ossConfig.policy, // OSS临时授权policy
+					OSSAccessKeyId: ossConfig
+						.ossAccessKeyId, // 临时AccessKeyId（注意字段名：后端返回可能是ossAccessKeyId或OSSAccessKeyId，需对齐）
+					signature: ossConfig.signature, // 签名
+					success_action_status: "200", // OSS上传成功后返回200状态码（必须设置）
+					key: ossConfig.dir + ossConfig.filename ||
+						ossConfig.dir + tempFilePath.split("/")
+							.pop(), // OSS存储的完整key（dir + filename，核心字段）
+				};
+
+				// 调用UniApp上传API（小程序推荐用这个，比fetch稳定）
+				uni.uploadFile({
+					url: ossConfig.host, // OSS的Endpoint（如https://xxx.oss-cn-beijing.aliyuncs.com）
+					filePath: tempFilePath, // 小程序临时文件路径
+					name: "file", // OSS要求的文件字段名（固定为"file"，后端需与OSS配置一致）
+					formData: formData, // OSS上传所需的表单参数
+					timeout: 30000, // 超时时间（30秒，防止大文件上传超时）
+					success: (uploadRes) => {
+						// OSS上传成功的判断：statusCode为200且响应体为空（OSS特性）
+						if (uploadRes.statusCode === 200) {
+							resolve();
+						} else {
+							reject(new Error(`OSS上传失败，状态码: ${uploadRes.statusCode}`));
+						}
+					},
+					fail: (err) => {
+						reject(new Error(`上传请求失败: ${err.errMsg}`));
+					},
+				});
+			});
+		},
+		closePopup() {
+			this.tipShow = false;
+			//uni.showTabBar();
+		},
+
+		okBtn() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			if (this.tipType == "tjRuzhu") {
+				getApp().globalData.artisanType = 2;
+				if (this.userInfo.is_ok == 2) {
+					uni.navigateTo({
+						url: "/subPackages/ruzhu/stopuse",
+					});
+					return;
+				}
+				//如果现在身份是推荐官认证中身份是推荐官
+				if (
+					this.userInfo.id_type == 1 &&
+					this.userInfo.auth_info?.id_type == 1
+				) {
+					uni.navigateTo({
+						url: "/subPackages/ruzhu/complete?id_type=1",
+					});
+					return;
+				}
+				if (!this.userInfo.auth_info?.apply_state) {
+					//如果没有认证中信息
+					uni.navigateTo({
+						url: "/subPackages/ruzhu/complete",
+					});
+				} else {
+					//如果认证中信息apply_state状态不同
+					if (this.userInfo.auth_info.apply_state == 1) {
+						uni.navigateTo({
+							url: "/subPackages/ruzhu/submitres?applyState=1",
+						});
+					} else if (this.userInfo.auth_info.apply_state == 2) {
+						uni.navigateTo({
+							url: "/subPackages/ruzhu/submitres?applyState=2",
+						});
+					} else if (this.userInfo.auth_info.apply_state == 3) {
+						uni.navigateTo({
+							url: "/subPackages/ruzhu/submitres?applyState=3",
+						});
+					}
+				}
+			} else if (this.tipType == "login") {
+				uni.navigateTo({
+					url: "/pages/blogPopup/blogPopup",
+				});
+			}
+			// uni.showTabBar();
+		},
+		getUserInfo() {
+			request.post("/sj/user/getUser").then((result) => {
+				this.userInfo = result.data;
+				uni.setStorageSync("syrId", result.data.id);
+				// 认证通过的判断逻辑与模板一致
+				const isCertified = result.data.credentials_state === 2 ||
+					(result.data.id_type > 0 && result.data.credentials_state === 0);
+				const allReady = result.data.business_time &&
+					result.data.servers_kill_arr &&
+					result.data.servers_kill_arr.length > 0 &&
+					isCertified;
+				const mgmtCard = this.cardList.find(c => c.title === "管理中心");
+				if (mgmtCard) {
+					const shopItem = mgmtCard.list.find(i => i.title === "店铺装修");
+					if (shopItem) {
+						shopItem.url = allReady ?
+							"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png" :
+							"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png";
+					}
+				}
+				// 获取入驻详情用于判断认证状态
+				if (this.isSettled) {
+					this.fetchAuthDetails();
+				}
+			});
+			this.getInviteList();
+		},
+		// 获取入驻详情
+		fetchAuthDetails() {
+			return request.post("/sj/userSjAuth/details", {
+				type: 1,
+				id_type: '1'
+			}).then(res => {
+				if (res.code == 200 && res.data) {
+					this.authDetails = res.data;
+				}
+				return res;
+			});
+		},
+		async ensureAuthDetails() {
+			if (!this.isSettled || (this.authDetails && Object.keys(this.authDetails).length > 0)) {
+				return;
+			}
+			await this.fetchAuthDetails();
+		},
+		navigateToCertificationForm() {
+			if (this.isSettled) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?step=3'
+				});
+			} else {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			}
+		},
+		async navigateToCertificationProcess() {
+			if (this.isCertified) {
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+				return;
+			}
+			await this.ensureAuthDetails();
+			if (!this.isSettled) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			} else if (this.isUnderReview) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				this.navigateToCertificationForm();
+			}
+		},
+		async goLogin() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			this.tipsText = "您现在还未登录，是否确定登录？";
+			this.tipShow = true;
+			this.tipType = "login";
+			uni.hideTabBar();
+		},
+
+		goToOrderList(type) {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			if (!this.isLogin) {
+				uni.showToast({
+					title: "您暂未登录，无法使用此功能！",
+					icon: "none",
+				});
+				return;
+			}
+		},
+		logout() {
+			uni.showModal({
+				title: "提示",
+				content: "确定要退出登录吗？",
+				success: (res) => {
+					if (res.confirm) {
+						// uni.removeStorageSync('access_token');
+						// uni.removeStorageSync('refresh_token');
+						uni.clearStorageSync();
+						// TODO: 实现退出登录逻辑
+						uni.reLaunch({
+							url: "/pages/home/home",
+						});
+					}
+				},
+			});
+		},
+		async handleFunction(item) {
+			// 1. 账号停用检查
+			if (!this.checkAccess(item)) {
+				return;
+			}
+
+			// 2. 未登录 → 提示
+			if (!this.isLogin) {
+				if (item.path == "/pages/ruzhu/ruzhu") {
+					uni.navigateTo({
+						url: "/pages/blogPopup/blogPopup",
+					});
+					return;
+				}
+				uni.showToast({
+					title: `您暂未登录，无法使用${item.title || item.text || ''}！`,
+					icon: "none",
+				});
+				return;
+			}
+
+			// 3. 入驻页面特殊处理
+			if (item.path == "/pages/ruzhu/ruzhu") {
+				request.post("/sj/userSjAuth/details", {
+					type: 1
+				}).then((res) => {
+					if (res.code == 200 && res.data && res.data.apply_state != 2) {
+						uni.navigateTo({
+							url: `/pages/ruzhu/submitres?identity=${res.data.id_type}&applyState=${res.data.apply_state}`,
+						});
+					} else {
+						uni.navigateTo({
+							url: item.path,
+						});
+					}
+				});
+				return;
+			}
+
+			// 4. 需要入驻身份的模块 (go_id_type == 1)
+			if (item.go_id_type == 1) {
+				// 4a. 未入驻 → 提示
+				if (!this.isSettled) {
+					uni.showToast({
+						title: `您暂未入驻，无法使用${item.title || item.text || ''}！`,
+						icon: "none",
+					});
+					return;
+				}
+
+				// 4b. 直接进入的模块（店铺装修、财务管理）
+				if (item.directAccess) {
+					uni.navigateTo({ url: item.path });
+					return;
+				}
+
+				// 4c. 未认证或前置条件不完整 → 弹出温馨提示
+				if (!this.isCertified || !this.hasBusinessTime || !this.hasServiceSkill) {
+					this.showSetupModal = true;
+					return;
+				}
+
+				// 4d. 前置条件完整 → 直接进入
+				uni.navigateTo({ url: item.path });
+				return;
+			}
+
+			// 5. 有 type 参数的模块
+			if (item.type) {
+				uni.navigateTo({
+					url: `${item.path}?type=${item.type}`,
+				});
+				return;
+			}
+
+			// 6. 其他模块直接进入
+			uni.navigateTo({ url: item.path });
+		},
+		goToProfile() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			if (this.userInfo.id_type == 0) {
+				return;
+			}
+			uni.navigateTo({
+				url: "/pages/artisan/profile",
+			});
+		},
+		toruzhu() {
+			this.navigateToCertificationProcess();
+		},
+		closeSetupModal() {
+			this.showSetupModal = false;
+		},
+		goToBusinessTime() {
+			this.showSetupModal = false;
+			uni.navigateTo({
+				url: '/pages/shop/business-time'
+			});
+		},
+		goToServiceSkill() {
+			this.showSetupModal = false;
+			uni.navigateTo({
+				url: '/pages/shop/service-skills'
+			});
+		},
+		goToAuth() {
+			this.showSetupModal = false;
+			this.navigateToCertificationProcess();
+		},
+		goToInviteList() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			if (this.userInfo.id_type == 0) {
+				return;
+			}
+			uni.navigateTo({
+				url: "/subPackages/affiliated/inviteList?type=" + this.id_type,
+			});
+		},
+		getInviteList() {
+			request
+				.post("/syr/sjSyrBind/inviteList", {
+					page: 1,
+					limit: 999
+				})
+				.then((res) => {
+					this.inviteList = res.data.list;
+				});
+		},
+		goTypeSelect() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			request
+				.post("/syr/userSyrAuth/details", {
+					type: 1,
+					id_type: 1
+				})
+				.then((res) => {
+					if (res.code == 200 && res.data && res.data.apply_state != 2) {
+						uni.navigateTo({
+							url: `/subPackages/ruzhu/submitres?identity=${res.data.id_type}&applyState=${res.data.apply_state}`,
+						});
+					} else {
+						uni.navigateTo({
+							url: "/subPackages/ruzhu/typeSelect?id_type=1",
+						});
+					}
+				});
+		},
+	},
+};
+</script>
+
+<style lang="less">
+page {
+	background: #f5f5f5 !important;
+}
+
+.my-page {
+	/* min-height: 100vh; */
+	position: relative;
+	padding-bottom: 50rpx;
+	padding-top: var(--status-bar-height);
+	background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c7c4d24-9a21-4d21-b1ed-1aa985d188e6.png");
+	background-position: 0 0;
+	background-size: 100%;
+	background-repeat: no-repeat;
+	padding-bottom: 150rpx;
+}
+
+// .my-page::before {
+//   content: "";
+//   position: fixed;
+//   top: 0;
+//   left: 0;
+//   right: 0;
+//   height: 489rpx !important;
+//   background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/825812de-54b3-486a-a3a0-2c4a1fb9fd28.png");
+//   background-size: cover;
+//   background-position: center top;
+//   background-repeat: no-repeat;
+//   z-index: -1;
+// }
+
+/* 确保内容在背景之上 */
+.user-section,
+.order-section,
+.function-list,
+.user-stats,
+.image-list,
+.imageText-list,
+.info_section {
+	position: relative;
+	z-index: 99;
+	margin: 0 30rpx;
+}
+
+/* 用户信息区域 */
+.user-section {
+	background-color: transparent;
+	box-sizing: border-box;
+	padding-bottom: 40rpx;
+	padding-top: 26rpx;
+
+	.upgradeBanner {
+		padding-top: 40rpx;
+		width: 690rpx;
+		height: 114rpx;
+		position: relative;
+
+		.upgradeBanner-img {
+			width: 690rpx;
+			height: 114rpx;
+		}
+
+		.upgradeBanner-btn {
+			position: absolute;
+			left: 304rpx;
+			bottom: 20rpx;
+			width: 100rpx;
+			height: 40rpx;
+		}
+	}
+
+	.user-info {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: space-between;
+		align-items: center;
+
+		.user-info-left {
+			display: flex;
+			flex-flow: row nowrap;
+			justify-content: flex-start;
+			align-items: center;
+
+			.avatar {
+				width: 110rpx;
+				height: 110rpx;
+				border: 2rpx solid #fff;
+				box-sizing: border-box;
+				border-radius: 64rpx;
+				margin-right: 20rpx;
+				overflow: hidden;
+				position: relative;
+
+				.avatar-img {
+					width: 110rpx;
+					height: 110rpx;
+					border-radius: 64rpx;
+					margin-right: 20rpx;
+				}
+
+				.avatar-button {
+					position: absolute;
+					inset: 0;
+					margin: auto;
+				}
+			}
+
+			.user-detail {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: flex-start;
+
+				.nickname {
+					font-weight: 500;
+					font-size: 34rpx;
+					color: #333333;
+					line-height: 45rpx;
+					text-align: left;
+					font-style: normal;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.nickname-text {
+						max-width: 250rpx;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+
+					.inviteCode {
+						padding: 6rpx;
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #7e4e5b;
+						line-height: 28rpx;
+						text-align: left;
+						font-style: normal;
+						background: rgba(255, 255, 255, 0.3);
+						border-radius: 6rpx;
+						margin-left: 6rpx;
+					}
+				}
+
+				.user-detail-tip {
+					font-weight: 400;
+					font-size: 22rpx;
+					color: #999999;
+					line-height: 30rpx;
+					text-align: left;
+					font-style: normal;
+					margin-top: 12rpx;
+				}
+
+				.user-identity {
+					margin-top: 10rpx;
+					border: 1rpx solid #FF4767;
+					border-radius: 22rpx;
+					width: 112rpx;
+					height: 44rpx;
+					line-height: 44rpx;
+					text-align: center;
+					background-color: rgba(255, 241, 241, 1);
+
+					.identity-text {
+						font-size: 20rpx;
+						color: #FF4767;
+						font-weight: 400;
+					}
+				}
+			}
+		}
+
+		.user-info-right {
+			transform: translateY(14rpx);
+
+			.wallet_content {
+				height: 48rpx;
+				padding: 0rpx 16rpx;
+				display: flex;
+				align-items: center;
+				background: rgba(252, 67, 124, 0.1);
+				border-radius: 24rpx;
+				border: 1rpx solid rgba(232, 16, 30, 0.15);
+			}
+
+			.wallet_content_img {
+				width: 29rpx;
+				height: 29rpx;
+				margin-right: 2rpx;
+			}
+
+			.wallet_content_text {
+				font-family:
+					PingFangSC,
+					PingFang SC;
+				font-weight: 500;
+				font-size: 22rpx;
+				color: #666666;
+				line-height: 30rpx;
+				text-align: left;
+			}
+		}
+	}
+}
+
+.authentication {
+	display: flex;
+	margin-top: 20rpx;
+
+	.authentication_content {
+		height: 48rpx;
+		padding: 0rpx 20rpx;
+		display: flex;
+		align-items: center;
+		background: #ffe8e8;
+		border-radius: 24rpx;
+		border: 1rpx solid rgba(232, 16, 30, 0.19);
+
+		.authentication_img {
+			width: 27rpx;
+			height: 29rpx;
+			margin-right: 7rpx;
+		}
+
+		.authentication_text {
+			font-family:
+				PingFangSC,
+				PingFang SC;
+			font-weight: 500;
+			font-size: 26rpx;
+			line-height: 37rpx;
+			color: #333333;
+		}
+	}
+}
+
+.inviteMessage {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: 54rpx;
+	background: linear-gradient(320deg, #ffffff 0%, #ffffff 100%);
+	border-radius: 19rpx;
+	padding-right: 40rpx;
+
+	.inviteMessage_content {
+		height: 80rpx;
+		padding: 0rpx 20rpx;
+		display: flex;
+		align-items: center;
+		border-radius: 24rpx;
+
+		.inviteMessage_img {
+			width: 42rpx;
+			height: 42rpx;
+			margin-right: 20rpx;
+			flex-shrink: 0;
+		}
+
+		.inviteMessage_text {
+			font-family:
+				PingFangSC,
+				PingFang SC;
+			font-weight: 500;
+			font-size: 26rpx;
+			line-height: 37rpx;
+			color: #333333;
+		}
+	}
+
+	.btn_img {
+		width: 130rpx;
+		height: 54rpx;
+	}
+}
+
+.bottom0 {
+	margin-bottom: 0;
+}
+
+.user-stats {
+	border-radius: 20rpx;
+	background-color: #fff;
+	box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.05);
+	display: flex;
+	justify-content: space-around;
+}
+
+.stat-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.stat-icon {
+	width: 64rpx;
+	height: 64rpx;
+	margin-bottom: 8rpx;
+}
+
+.stat-label {
+	font-size: 26rpx;
+	color: #252525;
+	font-weight: 400;
+}
+
+.order-card {
+	// background: linear-gradient(180deg, #FBF5F8 0%, #F6F6F6 100%);
+	border-radius: 30rpx 30rpx 0rpx 0rpx;
+	// padding-top: 30rpx;
+	display: flex;
+	flex-direction: column;
+	gap: 20rpx;
+}
+
+/* 订单状态区域 */
+.order-section {
+	background: #ffffff;
+	box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(210, 213, 224, 0.5);
+	border-radius: 24rpx;
+	margin-bottom: 24rpx;
+	padding: 30rpx 20rpx 40rpx 20rpx;
+
+	.order-title {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #333333;
+		line-height: 45rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 30rpx;
+	}
+
+	.order-status {
+		display: flex;
+		justify-content: space-between;
+		padding: 0rpx;
+		box-sizing: border-box;
+
+		.status-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.status-icon {
+				width: 200rpx;
+				height: 169rpx;
+			}
+		}
+	}
+}
+
+/* 功能列表 */
+.function-list {
+	background: #ffffff;
+	border-radius: 24rpx;
+	padding: 30rpx;
+	padding-bottom: 50rpx;
+
+	.function-title {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 50rpx;
+	}
+
+	.function-grid {
+		display: flex;
+		flex-direction: column;
+		gap: 63rpx;
+
+		.grid-item {
+			display: flex;
+			align-items: center;
+			position: relative;
+			gap: 21rpx;
+
+			.icon-wrapper {
+				width: 42rpx;
+				height: 42rpx;
+				position: relative;
+				// margin-bottom: 12rpx;
+
+				.grid-icon {
+					width: 42rpx;
+					height: 42rpx;
+				}
+			}
+
+			.grid-text {
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		.grid-item::after {
+			position: absolute;
+			content: "";
+			width: 12rpx;
+			height: 24rpx;
+			right: 0rpx;
+			background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/gray_right_icon.png");
+			background-size: cover;
+		}
+	}
+
+	.lineCard-title {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 24rpx;
+	}
+
+	.lineCard-grid {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		gap: 20rpx 0;
+
+		image {
+			width: 310rpx;
+			height: 120rpx;
+		}
+	}
+}
+
+/* 功能列表 */
+.listcard-list {
+	position: relative;
+	z-index: 99;
+	margin: 0 30rpx;
+	background: #ffffff;
+	border-radius: 24rpx;
+	padding: 30rpx 20rpx;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+
+	.function-title {
+		width: 100%;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 20rpx;
+	}
+
+	.listcard-item {
+		width: 33.33%;
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		image {
+			width: 50rpx;
+			height: 50rpx;
+			margin: 0 auto 10rpx;
+			display: block;
+		}
+
+		.listcard-title {
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #252525;
+			line-height: 32rpx;
+			text-align: center;
+			margin-bottom: 8rpx;
+		}
+
+		.listcard-text {
+			font-size: 24rpx;
+			color: #999999;
+			line-height: 28rpx;
+			text-align: center;
+		}
+	}
+}
+
+.image-list {
+	background: #ffffff;
+	border-radius: 24rpx;
+	padding: 30rpx 20rpx;
+
+	.image-title {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 20rpx;
+	}
+
+	image {
+		width: 100%;
+		height: 148rpx;
+	}
+}
+
+.imageText-list {
+	background: #ffffff;
+	border-radius: 24rpx;
+	padding: 29rpx 27rpx 40rpx;
+
+	.imageText-title {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 11rpx;
+	}
+
+	.imageText-content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		image {
+			width: 245rpx;
+			height: 171rpx;
+		}
+
+		.text-status {
+			font-family:
+				PingFangSC,
+				PingFang SC;
+			font-weight: 500;
+			font-size: 30rpx;
+			color: #000000;
+			margin-top: 20rpx;
+			margin-bottom: 22rpx;
+		}
+
+		.text-next {
+			font-family:
+				PingFangSC,
+				PingFang SC;
+			font-weight: 400;
+			font-size: 26rpx;
+			line-height: 37rpx;
+			color: #666666;
+			text-align: center;
+		}
+	}
+}
+
+.my-page::before {
+	height: 420rpx;
+}
+
+button {
+	background: transparent !important;
+	border: none !important;
+	border-radius: 0 !important;
+	padding: 0 !important;
+	min-width: auto !important;
+	height: auto !important;
+	line-height: normal !important;
+	color: inherit !important;
+	-webkit-tap-highlight-color: transparent !important;
+}
+
+button::after {
+	border: none !important;
+}
+
+
+.info_section {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 20rpx;
+
+	.info_section_item {
+		width: 336rpx;
+		height: 193rpx;
+		background-size: cover;
+		background-position: center;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+		padding: 23rpx 26rpx 20rpx 26rpx;
+
+		.info_section_item_header {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding-bottom: 16rpx;
+			border-bottom: 2rpx solid rgba(210, 213, 224, 0.15);
+
+			.info_section_item_header_left {
+				display: flex;
+				align-items: center;
+				gap: 11rpx;
+			}
+
+			.info_section_item_img {
+				width: 35rpx;
+				height: 38rpx;
+			}
+
+			.info_section_item_label {
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 38rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.info_section_item_header_right {
+				image {
+					width: 10rpx;
+					height: 20rpx;
+				}
+			}
+		}
+
+		.info_section_item_subtitle {
+			font-size: 22rpx;
+			color: #999999;
+			line-height: 30rpx;
+			margin-top: 12rpx;
+			margin-bottom: 6rpx;
+		}
+
+		.info_section_item_content {
+			display: flex;
+			align-items: baseline;
+			font-family: DINPro, DINPro;
+			font-weight: 500;
+			font-size: 36rpx;
+			color: #333333;
+
+			.info_section_item_content_unit {
+				font-family:
+					PingFangSC,
+					PingFang SC;
+				font-weight: 500;
+				font-size: 20rpx;
+				color: #333333;
+				margin-left: 3rpx;
+			}
+		}
+	}
+}
+
+.user_detail_tip {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	margin-top: 10rpx;
+	width: auto;
+	height: 46rpx;
+	padding: 0 8rpx 0 8rpx;
+	background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/378a6936-a543-4ff5-9aa0-cfcb4d4e14b3.png');
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+	margin-left: -6rpx;
+
+	.user_detail_tip_phone {
+		// width: 100rpx;
+		height: 28rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #6A574E;
+		line-height: 30rpx;
+		font-style: normal;
+	}
+
+	.user_detail_tip_invite_name {
+		max-width: 246rpx;
+		font-size: 22rpx;
+	}
+}
+
+.imagePure {
+	width: 690rpx;
+	margin: 0 auto;
+
+	image {
+		width: 100%;
+	}
+}
+
+/* ============ 提示弹窗样式 ============ */
+.setup-modal-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 9999;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	.setup-modal-content {
+		width: 630rpx;
+		height: 775rpx;
+		background: #FFFFFF;
+		border-radius: 32rpx;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+
+		.modal-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 630rpx;
+			height: 265rpx;
+			z-index: 0;
+		}
+
+		.modal-header {
+			position: relative;
+			z-index: 1;
+			height: 100rpx;
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			padding-bottom: 20rpx;
+
+			text {
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #333333;
+				letter-spacing: 2rpx;
+			}
+		}
+
+		.modal-body {
+			position: relative;
+			z-index: 1;
+			flex: 1;
+			padding: 24rpx 40rpx;
+
+			.modal-subtitle {
+				font-size: 28rpx;
+				color: #333333;
+				margin-bottom: 40rpx;
+				display: block;
+			}
+
+			.missing-list {
+				display: flex;
+				flex-direction: column;
+				gap: 46rpx;
+
+				.missing-item {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.item-left {
+						display: flex;
+						align-items: flex-start;
+
+						.item-icon {
+							width: 32rpx;
+							height: 32rpx;
+							margin-right: 16rpx;
+							flex-shrink: 0;
+							margin-top: 6rpx;
+						}
+
+						.item-texts {
+							display: flex;
+							flex-direction: column;
+
+							.item-title {
+								font-size: 30rpx;
+								color: #333333;
+								font-weight: 500;
+								margin-bottom: 8rpx;
+
+								&.blue-text {
+									color: #2b85e4;
+								}
+							}
+
+							.item-desc {
+								font-size: 24rpx;
+								color: #999999;
+							}
+						}
+					}
+
+					.item-right {
+						font-size: 26rpx;
+						font-weight: 400;
+						margin-top: -45rpx;
+
+						&.orange {
+							color: #FF7B00;
+						}
+
+						&.grey {
+							color: #999999;
+						}
+
+						&.light-green {
+							color: #5CAC81;
+						}
+					}
+				}
+
+				.divider-line {
+					width: 100%;
+					height: 1rpx;
+					background-color: #f2f2f2;
+					margin: -26rpx 0;
+				}
+			}
+		}
+
+		.modal-footer {
+			position: relative;
+			z-index: 1;
+			padding: 0 50rpx 50rpx;
+
+			.btn-know {
+				width: 100%;
+				height: 88rpx;
+				background: #FF4767;
+				border-radius: 44rpx;
+				color: #FFFFFF;
+				font-size: 32rpx;
+				font-weight: 500;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
new file mode 100644
index 0000000..011c506
--- /dev/null
+++ b/pages/my/myFavorite.vue
@@ -0,0 +1,670 @@
+<template>
+  <view class="collection-page">
+
+    <custom-navbar title="我的收藏" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true" borderBottom="none"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b18bac2f-3e4c-4586-9d45-0f088629c9d1.png"
+      @onHeadleClick="goToSearch" class="serch-tap">
+    </custom-navbar>
+
+    <view class="tab-bar-wrap" :style="{ top: navHeight + 'px' }">
+      <view class="tab-bar">
+        <view class="tab-items">
+          <view class="tab-item" :class="{ active: currentTab === 'brand' }" @tap="switchTab('brand')">
+            收藏的品牌
+          </view>
+          <view class="tab-item" :class="{ active: currentTab === 'course' }" @tap="switchTab('course')">
+            收藏的课程
+          </view>
+        </view>
+
+      </view>
+    </view>
+
+    <view class="filter-panel" :class="{ 'show': filterVisible }" :style="{ top: filterTop + 'px' }"
+      catchtouchmove="true">
+      <view class="filter-mask" @tap="closeFilterPanel"></view>
+      <view class="filter-container">
+
+        <scroll-view scroll-y class="filter-scroll" v-if="currentTab === 'brand'">
+          <view class="filter-group" v-for="group in brandFilterData" :key="group.id">
+            <view class="group-title">{{ group.title }}</view>
+            <view class="pill-list">
+              <view class="pill-item" v-for="sub in group.children" :key="sub.id"
+                :class="{ active: selectedSecondIds.includes(sub.id) }" @tap="toggleSecondSelect(sub.id)">
+                {{ sub.title }}
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+
+        <view v-else class="course-filter">
+          <view class="course-type-item" :class="{ active: selectedCourseType === 'platform' }"
+            @tap="selectCourseType('platform')">
+            平台课程
+          </view>
+          <view class="course-type-item" :class="{ active: selectedCourseType === 'brand' }"
+            @tap="selectCourseType('brand')">
+            品牌课程
+          </view>
+        </view>
+
+        <view class="filter-footer">
+          <view class="reset-btn" @tap="resetFilter">重置</view>
+          <view class="confirm-btn" @tap="applyFilterAndClose">确定</view>
+        </view>
+      </view>
+    </view>
+
+    <view class="collection-content" v-if="currentTab === 'brand'">
+      <view class="brand-grid" v-if="filteredBrandList.length > 0">
+        <brand-card class="brand-card-wrap" v-for="(item, index) in filteredBrandList" :key="index" :item="item"
+          :tagKeys="item.tagKeys" @click="goToBrandDetail(item)"></brand-card>
+      </view>
+      <view class="empty-state" v-else>
+        <image class="empty-icon"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png">
+        </image>
+      </view>
+    </view>
+
+    <view class="collection-content" v-else>
+      <view class="course-list" v-if="filteredCourseList.length > 0">
+        <skill-card v-for="(item, index) in filteredCourseList" :key="index" :item="item"></skill-card>
+      </view>
+      <view class="empty-state" v-else>
+        <image class="empty-icon"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png">
+        </image>
+      </view>
+    </view>
+    <view style="height: 120rpx;"></view>
+
+  </view>
+</template>
+
+<script>
+import BrandCard from "@/pages/home/components/brand-card.vue"
+import SkillCard from "@/pages/home/components/skill-card.vue"
+import request from "@/utils/request"
+
+// 数据模式开关：true=调用真实接口，false=使用模拟数据
+const USE_REAL_API = true
+
+export default {
+  components: {
+    BrandCard,
+    SkillCard
+  },
+  data() {
+    return {
+      navHeight: 0,    // 动态计算的导航栏高度
+      filterTop: 0,    // 动态计算的筛选框顶部起点
+
+      currentTab: 'brand',
+      // 筛选相关
+      filterVisible: false,
+
+      // 品牌筛选下拉数据 (合并一级和二级)
+      brandFilterData: [],
+      selectedSecondIds: [],   // 选中的二级ID数组
+
+      // 课程筛选
+      selectedCourseType: '',  // 'platform' 或 'brand'
+      // 原始数据（收藏的数据）
+      rawBrandList: [],
+      rawCourseList: [],
+      // 展示数据（过滤后）
+      filteredBrandList: [],
+      filteredCourseList: []
+    }
+  },
+  computed: {
+    filterIcon() {
+      return this.filterVisible
+        ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png'
+        : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bfe7a104-bef8-4432-9487-42f05e3e9035.png'
+    }
+  },
+  onLoad() {
+    // 精准计算吸顶高度与下拉框起点，防止蒙版遮挡白色的Tab区
+    const sysInfo = uni.getSystemInfoSync()
+    const sbh = sysInfo.statusBarHeight || 0
+    this.navHeight = sbh
+    // Tab栏自身的高度大约为 106rpx，转化为 px 叠加上去
+    this.filterTop = this.navHeight + uni.upx2px(106)
+
+    this.loadFilterCategories()
+    this.loadData()
+  },
+  methods: {
+    // 跳转搜索页
+    goToSearch() {
+      // this.currentTab 的值刚好是 'brand' 或 'course'
+      uni.navigateTo({
+        url: `/pages/search_common/search?type=collection_${this.currentTab}`
+      });
+    },
+    goBack() {
+      uni.navigateBack()
+    },
+    addAddress() {
+      // 外部方法占位
+    },
+    switchTab(tab) {
+      if (this.currentTab === tab) return
+      this.currentTab = tab
+      // 重置筛选（不同tab筛选条件独立）
+      if (tab === 'brand') {
+        this.resetBrandFilter()
+      } else {
+        this.resetCourseFilter()
+      }
+      this.loadData()
+      this.closeFilterPanel()
+    },
+    // 筛选面板控制
+    toggleFilterPanel() {
+      this.filterVisible = !this.filterVisible
+    },
+    closeFilterPanel() {
+      this.filterVisible = false
+    },
+
+    // 加载一级分类并自动组装其对应的二级分类，兼容 state === 1
+    async loadFilterCategories() {
+      try {
+        const res = await request.post('/sj/firstclass', {})
+        if ((res.code === 200 || res.state === 1) && res.data) {
+          const firstClasses = res.data;
+
+          // 并发请求所有的二级分类
+          const promises = firstClasses.map(async (first) => {
+            try {
+              const subRes = await request.post('/sj/secondclass', { id: first.id })
+              return {
+                id: first.id,
+                title: first.title,
+                children: ((subRes.code === 200 || subRes.state === 1) && subRes.data) ? subRes.data : []
+              }
+            } catch (e) {
+              return { id: first.id, title: first.title, children: [] }
+            }
+          });
+
+          const filterData = await Promise.all(promises);
+          // 过滤掉没有子分类的项，避免面板出现光秃秃的标题
+          this.brandFilterData = filterData.filter(group => group.children.length > 0);
+        } else {
+          this.brandFilterData = []
+        }
+      } catch (error) {
+        console.error('获取分类字典失败', error)
+      }
+    },
+
+    toggleSecondSelect(secId) {
+      const index = this.selectedSecondIds.indexOf(secId)
+      if (index === -1) {
+        this.selectedSecondIds.push(secId)
+      } else {
+        this.selectedSecondIds.splice(index, 1)
+      }
+    },
+    // 课程筛选
+    selectCourseType(type) {
+      // 点击已选中的则取消选中
+      if (this.selectedCourseType === type) {
+        this.selectedCourseType = ''
+      } else {
+        this.selectedCourseType = type
+      }
+    },
+    // 重置品牌筛选
+    resetBrandFilter() {
+      this.selectedSecondIds = []
+      this.applyBrandFilter()
+    },
+    resetCourseFilter() {
+      this.selectedCourseType = ''
+      this.applyCourseFilter()
+    },
+    resetFilter() {
+      if (this.currentTab === 'brand') {
+        this.resetBrandFilter()
+      } else {
+        this.resetCourseFilter()
+      }
+    },
+    applyFilterAndClose() {
+      if (this.currentTab === 'brand') {
+        this.applyBrandFilter()
+      } else {
+        this.applyCourseFilter()
+      }
+      this.closeFilterPanel()
+    },
+    // 品牌过滤逻辑（根据二级分类ID相交判断）
+    applyBrandFilter() {
+      if (!this.rawBrandList.length) {
+        this.filteredBrandList = []
+        return
+      }
+      if (this.selectedSecondIds.length === 0) {
+        this.filteredBrandList = [...this.rawBrandList]
+      } else {
+        this.filteredBrandList = this.rawBrandList.filter(brand => {
+          return brand.secondClassIds && brand.secondClassIds.some(id => this.selectedSecondIds.includes(id))
+        })
+      }
+    },
+    // 课程过滤逻辑（根据课程类型）
+    applyCourseFilter() {
+      if (!this.rawCourseList.length) {
+        this.filteredCourseList = []
+        return
+      }
+      if (!this.selectedCourseType) {
+        this.filteredCourseList = [...this.rawCourseList]
+      } else {
+        this.filteredCourseList = this.rawCourseList.filter(course => {
+          if (this.selectedCourseType === 'platform') return course.type === '平台课程'
+          if (this.selectedCourseType === 'brand') return course.type === '品牌课程'
+          return true
+        })
+      }
+    },
+    // 加载原始数据（根据当前Tab）
+    loadData() {
+      if (this.currentTab === 'brand') {
+        this.loadBrandList()
+      } else {
+        this.loadCourseList()
+      }
+    },
+    async loadBrandList() {
+      if (USE_REAL_API) {
+        await this.fetchRealBrandList()
+      } else {
+        this.mockBrandList()
+      }
+      this.applyBrandFilter()
+    },
+    async loadCourseList() {
+      if (USE_REAL_API) {
+        await this.fetchRealCourseList()
+      } else {
+        this.mockCourseList()
+      }
+      this.applyCourseFilter()
+    },
+
+    // ============ 真实接口调用 ============
+    async fetchRealBrandList() {
+      try {
+        // 1. 接口路径换成真实的品牌收藏列表
+        const res = await request.post('/sj/brand/collectList', { page: 1, limit: 100 })
+
+        if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
+          // 2. 不需要前端再做 filter(item => item.collect_state === 1) 了，直接用！
+          this.rawBrandList = res.data.list.map(item => {
+            let tags = []
+            if (item.franchise_state == 1) tags.push('franchise')
+            if (item.student_state == 1) tags.push('recruit')
+            if (tags.length === 0) tags.push('more')
+
+            return {
+              id: item.id,
+              name: item.name,
+              bgSrc: item.cover_img || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/default.jpg',
+              avatar: item.logo_img || 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar',
+              tagKeys: tags,
+              // 3. 强制转字符串，防止后端返回纯数字导致 split 报错，同时兼容后端没返回此字段的情况
+              secondClassIds: item.second_class_ids ? String(item.second_class_ids).split(',').map(Number) : []
+            }
+          })
+          console.log('成功获取品牌收藏列表:', this.rawBrandList)
+        } else {
+          this.rawBrandList = []
+        }
+      } catch (error) {
+        console.error('获取品牌收藏失败详情:', error)
+      }
+    },
+    async fetchRealCourseList() {
+      try {
+        // 1. 接口路径换成真实的技能收藏列表
+        const res = await request.post('/sj/skill/collectList', { page: 1, limit: 100 })
+
+        if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
+          // 2. 同样不需要 filter，直接 map 映射数据
+          this.rawCourseList = res.data.list.map(item => {
+            return {
+              id: item.id,
+              title: item.name,
+              coverSrc: item.cover_img,
+              type: item.link_name || (item.link_type == 1 ? '平台课程' : '品牌课程'),
+              link_type: item.link_type,
+              views: item.browse_num || 0,
+              // 3. 使用安全的时间格式化
+              time: item.create_time ? this.formatTimeAgo(item.create_time) : '',
+              typeIcon: item.link_logo || ''
+            }
+          })
+          console.log('成功获取课程收藏列表:', this.rawCourseList)
+        } else {
+          this.rawCourseList = []
+        }
+      } catch (error) {
+        console.error('获取课程收藏失败', error)
+      }
+    },
+
+    formatTimeAgo(timeStr) {
+      if (!timeStr) return '';
+      const timeStrSafe = String(timeStr);
+      const now = new Date()
+      const time = new Date(timeStrSafe.replace(/-/g, '/'))
+      const diff = Math.floor((now - time) / 1000)
+      if (diff < 3600) return Math.floor(diff / 60) + '分钟前'
+      if (diff < 86400) return Math.floor(diff / 3600) + '小时前'
+      if (diff < 604800) return Math.floor(diff / 86400) + '天前'
+      return timeStrSafe.split(' ')[0]
+    },
+    goToBrandDetail(item) {
+      if (item.id) {
+        uni.navigateTo({ url: `/pages/brand/detail?id=${item.id}` })
+      }
+    },
+
+    // ============ 模拟数据兜底 ============
+    mockBrandList() {
+      this.rawBrandList = [
+        {
+          id: 1, name: '脸缘品牌', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          avatar: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          tagKeys: ['franchise', 'recruit'], secondClassIds: [76, 77]
+        },
+        {
+          id: 2, name: '美肌工坊', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          avatar: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          tagKeys: ['franchise'], secondClassIds: [78]
+        },
+        {
+          id: 3, name: '悦容堂', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          avatar: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          tagKeys: ['recruit'], secondClassIds: [201, 202]
+        }
+      ]
+    },
+    mockCourseList() {
+      this.rawCourseList = [
+        { id: 1, title: '穿戴甲的操作视频扫码验券操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', views: 836000, time: '7小时前' },
+        { id: 2, title: '全身SPA的操作视频操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', views: 2344, time: '3天前' },
+        { id: 3, title: '高级面部护理手法详解', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', views: 56700, time: '1周前' }
+      ]
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.collection-page {
+  min-height: 100vh;
+  background: #fff;
+}
+
+/* 将页面左右 padding 转移到内容区，保证 Tab 背景贯穿全屏 */
+.tab-bar-wrap {
+  position: sticky;
+  /* 吸顶，保证滑动页面时一直显示在最前面 */
+  background: #fff;
+  padding: 10rpx 24rpx;
+  z-index: 101;
+}
+
+.tab-bar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: transparent;
+  padding: 10rpx 0;
+
+  .tab-items {
+    display: flex;
+    align-items: center;
+
+    .tab-item {
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #777777;
+      background: #f5f5f5;
+      border-radius: 27rpx;
+      margin-right: 40rpx;
+      padding: 9rpx 24rpx;
+
+      &.active {
+        color: #FF4767;
+        background: #FFECEF;
+        border: 2rpx solid #FFB0BD;
+        border-radius: 29rpx;
+      }
+    }
+  }
+
+  .filter-area {
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+
+    .filter-text {
+      font-size: 24rpx;
+      color: #666666;
+      margin-right: 6rpx;
+    }
+
+    .filter-icon {
+      width: 24rpx;
+      height: 24rpx;
+
+      /* 展开时切换为上下箭头图标，调整大小 */
+      &.rotate {
+        width: 18rpx;
+        height: 12rpx;
+      }
+    }
+  }
+}
+
+/* 核心抽屉动画布局 */
+.filter-panel {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 100;
+  /* 低于 Tab区的101，保证隐藏时躲在其后 */
+  pointer-events: none;
+  /* 面板关闭时，穿透点击到底部列表 */
+  overflow: hidden;
+  /* 防止抽屉向上滑出时外溢 */
+
+  &.show {
+    pointer-events: auto;
+
+    /* 打开时恢复点击拦截 */
+    .filter-mask {
+      opacity: 1;
+    }
+
+    .filter-container {
+      transform: translateY(50rpx);
+      /* 滑出 */
+    }
+  }
+
+  .filter-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.4);
+    opacity: 0;
+    transition: opacity 0.3s ease-in-out;
+  }
+
+  .filter-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    background: #fff;
+    border-radius: 0 0 30rpx 30rpx;
+    padding: 40rpx 30rpx;
+    max-height: 80vh;
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.05);
+    transform: translateY(-100%);
+    /* 默认隐藏在上方（即Tab背后） */
+    transition: transform 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
+  }
+}
+
+/* 垂直分组设计的样式（图3） */
+.filter-scroll {
+  max-height: 50vh;
+}
+
+.filter-group {
+  margin-bottom: 30rpx;
+
+  .group-title {
+    font-weight: 500;
+    font-size: 28rpx;
+    color: #333333;
+    line-height: 40rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .pill-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20rpx;
+  }
+}
+
+/* 通用胶囊按钮 */
+.pill-item {
+  width: calc(25% - 16rpx);
+  /* 25%是一行四个，减去间距 */
+  height: 58rpx;
+  background: #F5F5F5;
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #333333;
+  line-height: 37rpx;
+
+  /* 使用 flex 居中 */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  border-radius: 12rpx;
+  box-sizing: border-box;
+  /* 防止 padding 会撑大盒子 */
+
+  &.active {
+    background: #FFF0F2;
+    color: #FF4767;
+    border: 1rpx solid #FFB0BD;
+  }
+}
+
+.course-filter {
+  display: flex;
+  gap: 20rpx;
+  /* padding: 20rpx 0 40rpx; */
+
+  .course-type-item {
+    background: #F5F5F5;
+    color: #666666;
+    font-size: 26rpx;
+    padding: 12rpx 40rpx;
+    border-radius: 12rpx;
+
+    &.active {
+      background: #FFF0F2;
+      color: #FF4767;
+    }
+  }
+}
+
+.filter-footer {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20rpx;
+  padding-top: 20rpx;
+  /* border-top: 1rpx solid #F5F5F5; */
+
+  .reset-btn,
+  .confirm-btn {
+    width: 47%;
+    text-align: center;
+    padding: 20rpx 0;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+  }
+
+  .reset-btn {
+    background: #F5F5F5;
+    color: #666;
+  }
+
+  .confirm-btn {
+    background: #FF4767;
+    color: #fff;
+  }
+}
+
+/* 内容区缩进补充 */
+.collection-content {
+  padding: 0 24rpx 24rpx;
+  margin-top: 20rpx;
+  overflow: hidden;
+}
+
+.brand-grid {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+
+  .brand-card-wrap {
+    width: 49.2%;
+    margin-bottom: 20rpx;
+  }
+}
+
+.course-list {
+  display: flex;
+  flex-direction: column;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 120rpx 0;
+
+  .empty-icon {
+    width: 346rpx;
+    height: 373rpx;
+  }
+}
+
+::v-deep .icon-headle {
+  width: 36rpx !important;
+  height: 36rpx !important;
+}
+</style>
\ No newline at end of file
diff --git a/pages/my/profile.vue b/pages/my/profile.vue
index d2b5fad..9bc603f 100644
--- a/pages/my/profile.vue
+++ b/pages/my/profile.vue
@@ -400,7 +400,7 @@ export default {
   left: 60rpx;
   width: 630rpx;
   height: 96rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 58rpx;
   display: flex;
   align-items: center;
@@ -499,7 +499,7 @@ export default {
 }
 
 .region-tab.active {
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -511,7 +511,7 @@ export default {
   transform: translateX(-50%);
   width: 40rpx;
   height: 4rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 2rpx;
 }
 
@@ -552,7 +552,7 @@ export default {
 }
 
 .popup-btn.confirm {
-  background: linear-gradient(90deg, #E8101E 0%, #FF618F 100%);
+  background: linear-gradient(90deg, #FF4767 0%, #FF618F 100%);
 }
 
 .popup-btn .btn-text {
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
new file mode 100644
index 0000000..ab31e7f
--- /dev/null
+++ b/pages/notice/detail.vue
@@ -0,0 +1,356 @@
+<template>
+  <view class="notice-detail-page">
+    <!-- 自定义顶部导航组件 -->
+    <custom-navbar 
+      title="公告通知详情" 
+      :showBack="true" 
+      backgroundColor="linear-gradient(180deg, #E6ECFB 0%, #FFFFFF 100%)"
+      :showHeadle="true"
+      borderBottom="none"
+    />
+
+    <!-- 页面主要内容 -->
+    <view class="page-content">
+      <!-- 加载状态 -->
+      <view v-if="loading" class="loading-container">
+        <view class="loading-icon"></view>
+        <text class="loading-text">加载中...</text>
+      </view>
+
+      <!-- 详情内容 -->
+      <view v-else-if="detailData.id" class="detail-card">
+        <!-- 标题 -->
+        <text class="detail-title">{{ detailData.title }}</text>
+        
+        <!-- 发布时间 -->
+        <view class="detail-time">
+          <text class="time-text">时间：{{ formatTime(detailData.create_time) }}</text>
+          <text class="browse-text"> <image class="browse-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6133cbef-5861-40f8-80f5-d8a86477c94f.png" mode="aspectFit"></image> {{ detailData.browse_num }}</text>
+        </view>
+
+        <!-- 富文本内容 -->
+        <view class="detail-content">
+          <rich-text :nodes="detailData.content"></rich-text>
+        </view>
+      </view>
+
+      <!-- 空状态或错误 -->
+      <view v-else-if="!loading && !detailData.id" class="empty-container">
+        <image class="empty-img" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c5e7b2a-3d4f-4b1e-9a7c-6e8f2d1b4a5c.png" mode="aspectFit"></image>
+        <text class="empty-text">公告不存在或已删除</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import CustomNavbar from '@/components/custom-navbar/custom-navbar.vue';
+import request from '@/utils/request';
+
+export default {
+  components: {
+    CustomNavbar
+  },
+  data() {
+    return {
+      loading: false,       // 加载状态
+      detailData: {         // 公告详情数据
+        id: null,
+        title: '',
+        create_time: '',
+        content: ''
+      }
+    };
+  },
+  onLoad(options) {
+    const id = options.id;
+    if (id) {
+      this.fetchNoticeDetail(id);
+    } else {
+      uni.showToast({
+        title: '参数错误',
+        icon: 'none'
+      });
+      setTimeout(() => {
+        uni.navigateBack();
+      }, 1500);
+    }
+  },
+  methods: {
+    // 获取公告详情
+    fetchNoticeDetail(id) {
+      this.loading = true;
+      request.post('/sj/notice/details', { id: id })
+        .then(res => {
+          if (res.code === 200 && res.data) {
+            this.detailData = res.data;
+            // 动态设置页面标题（可选）
+            uni.setNavigationBarTitle({
+              title: this.detailData.title || '公告详情'
+            });
+          } else {
+            uni.showToast({
+              title: res.msg || '获取详情失败',
+              icon: 'none'
+            });
+          }
+        })
+        .catch(err => {
+          console.error('获取公告详情失败:', err);
+          uni.showToast({
+            title: '网络异常，请稍后重试',
+            icon: 'none'
+          });
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+
+    formatTime(timeStr) {
+      if (!timeStr) return '--:--:--';
+      let formatted = timeStr;
+      if (timeStr.includes('.') && !timeStr.includes('-')) {
+        const match = timeStr.match(/(\d{4})\.(\d{2})\.(\d{2})(\d{2}:\d{2}:\d{2})/);
+        if (match) {
+          formatted = `${match[1]}-${match[2]}-${match[3]} ${match[4]}`;
+        } else {
+          formatted = timeStr.replace(/\./g, '-');
+        }
+      }
+      // 如果是标准格式直接返回，否则返回原字符串
+      if (formatted.includes('-') && formatted.includes(':')) {
+        // 转换回点分隔显示，以匹配设计图风格: 2026.05.08 15:00:00
+        const datePart = formatted.split(' ')[0];
+        const timePart = formatted.split(' ')[1] || '';
+        if (datePart && datePart.includes('-')) {
+          const dotDate = datePart.replace(/-/g, '.');
+          return `${dotDate} ${timePart}`.trim();
+        }
+        return formatted;
+      }
+      return timeStr;
+    },
+
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.notice-detail-page {
+  min-height: 100vh;
+  background-color: #fff;
+}
+
+.page-content {
+  // padding: 20rpx 24rpx 60rpx;
+}
+
+// 加载状态
+.loading-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 120rpx 0;
+
+  .loading-icon {
+    width: 60rpx;
+    height: 60rpx;
+    border: 4rpx solid #e0e0e0;
+    border-top-color: #FF4767;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+    margin-bottom: 20rpx;
+  }
+
+  .loading-text {
+    font-size: 26rpx;
+    color: #999;
+  }
+}
+
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+// 详情卡片
+.detail-card {
+  background: #ffffff;
+  border-radius: 24rpx;
+  padding: 20rpx 30rpx;
+  margin-bottom: 30rpx;
+
+  .detail-title {
+    display: block;
+    margin-bottom: 14rpx;
+    font-weight: 500;
+    font-size: 40rpx;
+    color: #333333;
+    line-height: 56rpx;
+  }
+
+  .detail-time {
+    display: flex;
+    align-items: center;
+    margin-bottom: 30rpx;
+    justify-content: space-between;  // 两端对齐
+    // border-bottom: 1rpx solid #f0f0f0;
+
+    .time-icon {
+      width: 28rpx;
+      height: 28rpx;
+      margin-right: 10rpx;
+      opacity: 0.6;
+    }
+
+    .time-text {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #B6B6B6;
+      line-height: 40rpx;
+    }
+    .browse-icon {
+      width: 38rpx;
+      height: 22rpx;
+      // margin-right: 10rpx;
+    }
+    .browse-text {
+      margin-right: 10rpx;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #B08463;
+      line-height: 40rpx;
+    }
+  }
+
+  .detail-content {
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #2A2A2A;
+    line-height: 40rpx;
+    overflow-x: hidden;
+    
+    // 对rich-text内部样式进行补充
+    ::v-deep img {
+      max-width: 100%;
+      height: auto;
+      display: block;
+      margin: 30rpx 0;
+    }
+    
+    ::v-deep p {
+      margin-bottom: 20rpx;          // 重置外边距，避免多余间距
+      padding: 0;
+    }
+
+    // 在需要分段的地方手动创建间距
+    ::v-deep br {
+      display: block;     // 让 <br> 标签表现正常
+      margin-bottom: 30rpx; // 控制段落间距
+    }
+  }
+}
+
+// 空状态
+.empty-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 150rpx 0;
+
+  .empty-img {
+    width: 200rpx;
+    height: 200rpx;
+    margin-bottom: 30rpx;
+    opacity: 0.6;
+  }
+
+  .empty-text {
+    font-size: 28rpx;
+    color: #999;
+  }
+}
+
+// 底部会员营销卡片（根据设计图样式）
+.member-card {
+  background: linear-gradient(135deg, #FFE6E8 0%, #FFF0E6 100%);
+  border-radius: 24rpx;
+  padding: 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 20rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
+  
+  .member-info {
+    flex: 1;
+    
+    .member-price {
+      display: block;
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #FF4767;
+      line-height: 44rpx;
+      margin-bottom: 8rpx;
+    }
+    
+    .member-desc {
+      display: block;
+      font-size: 24rpx;
+      color: #333;
+      line-height: 34rpx;
+      margin-bottom: 12rpx;
+    }
+    
+    .member-tag {
+      display: flex;
+      align-items: center;
+      
+      .tag-text, .tag-gift {
+        font-size: 20rpx;
+        background: rgba(255, 71, 103, 0.15);
+        padding: 4rpx 12rpx;
+        border-radius: 20rpx;
+        color: #FF4767;
+        margin-right: 12rpx;
+      }
+      
+      .tag-gift {
+        background: rgba(255, 193, 7, 0.2);
+        color: #E6A100;
+      }
+    }
+  }
+  
+  .member-btn {
+    background: linear-gradient(135deg, #FF4767, #FF6B8A);
+    border-radius: 48rpx;
+    padding: 14rpx 28rpx;
+    text-align: center;
+    min-width: 160rpx;
+    box-shadow: 0 4rpx 12rpx rgba(255, 71, 103, 0.3);
+    
+    .btn-text {
+      display: block;
+      font-size: 26rpx;
+      font-weight: 600;
+      color: #FFFFFF;
+      line-height: 36rpx;
+    }
+    
+    .btn-sub {
+      display: block;
+      font-size: 20rpx;
+      color: rgba(255, 255, 255, 0.9);
+      line-height: 28rpx;
+    }
+  }
+  
+}
+::v-deep .icon-headle {
+    width: 32rpx !important;
+    height: 32rpx !important;
+}
+</style>
\ No newline at end of file
diff --git a/pages/notice/notice_list.vue b/pages/notice/notice_list.vue
new file mode 100644
index 0000000..bc6c0b9
--- /dev/null
+++ b/pages/notice/notice_list.vue
@@ -0,0 +1,213 @@
+<template>
+  <view class="notice-page">
+    <!-- 自定义顶部导航组件 -->
+    <custom-navbar title="公告通知" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png"
+      @onHeadleClick="goToSearch" class="nav-img-size" />
+
+    <view class="page-content">
+      <!-- 加载状态 -->
+      <view v-if="loading" class="loading-container">
+        <view class="loading-icon"></view>
+        <text class="loading-text">加载中...</text>
+      </view>
+
+      <!-- 公告列表 -->
+      <view v-else-if="noticeList.length > 0" class="notice-list">
+        <NoticeCard v-for="item in noticeList" :key="item.id" :item="item" @click="goToDetail" />
+
+        <!-- 加载更多状态 -->
+        <view v-if="loadingMore" class="load-more">
+          <text>加载更多...</text>
+        </view>
+        <view v-else-if="!hasMore && noticeList.length > 0" class="no-more">
+          <text>没有更多了</text>
+        </view>
+      </view>
+      <!-- 空状态 -->
+      <view v-else class="empty-container">
+        <image class="empty-img"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c5e7b2a-3d4f-4b1e-9a7c-6e8f2d1b4a5c.png"
+          mode="aspectFit"></image>
+        <text class="empty-text">暂无公告通知</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import CustomNavbar from '@/components/custom-navbar/custom-navbar.vue';
+import NoticeCard from '@/pages/home/components/notice-card.vue';
+import request from '@/utils/request';
+
+export default {
+  components: {
+    CustomNavbar,
+    NoticeCard   // 注册组件
+  },
+  data() {
+    return {
+      loading: false,
+      loadingMore: false,
+      noticeList: [],
+      page: 1,
+      limit: 10,
+      total: 0,
+      hasMore: true
+    };
+  },
+  onLoad() {
+    this.fetchNoticeList(true);
+  },
+  onPullDownRefresh() {
+    this.fetchNoticeList(true);
+  },
+  onReachBottom() {
+    if (!this.loadingMore && this.hasMore && !this.loading) {
+      this.fetchNoticeList(false);
+    }
+  },
+  methods: {
+    // 跳转搜索页
+    goToSearch() {
+      uni.navigateTo({
+        url: '/pages/search_common/search?type=notice'
+      });
+    },
+
+    // 获取公告列表
+    fetchNoticeList(reset = true) {
+      if (reset) {
+        this.page = 1;
+        this.hasMore = true;
+        this.loading = true;
+      } else {
+        if (!this.hasMore) return;
+        this.loadingMore = true;
+        // 非重置时页码+1
+        this.page++;
+      }
+
+      request.post('/sj/notice/list', {
+        page: this.page,
+        limit: this.limit
+      }).then(res => {
+        if (res.code === 200 && res.data) {
+          const list = res.data.list || [];
+          const total = res.data.total || 0;
+          this.total = total;
+
+          if (reset) {
+            this.noticeList = list;
+          } else {
+            this.noticeList = [...this.noticeList, ...list];
+          }
+
+          // 判断是否还有更多数据
+          this.hasMore = this.noticeList.length < total;
+        } else {
+          if (reset) this.noticeList = [];
+          this.hasMore = false;
+          // 非重置且请求失败时回滚页码
+          if (!reset && this.page > 1) this.page--;
+        }
+      }).catch(err => {
+        console.error('获取公告列表失败:', err);
+        if (!reset && this.page > 1) this.page--; // 回滚页码
+        uni.showToast({
+          title: '加载失败，请稍后重试',
+          icon: 'none'
+        });
+      }).finally(() => {
+        this.loading = false;
+        this.loadingMore = false;
+        if (reset) {
+          uni.stopPullDownRefresh();
+        }
+      });
+    },
+
+    // 跳转到详情页（接收 NoticeCard 组件 $emit 传递的 item）
+    goToDetail(item) {
+      if (item.id) {
+        uni.navigateTo({
+          url: `/pages/notice/detail?id=${item.id}`
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.notice-page {
+  min-height: 100vh;
+  background-color: #f5f6f8;
+}
+
+.page-content {
+  padding: 20rpx 20rpx 40rpx;
+}
+
+.loading-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 120rpx 0;
+
+  .loading-icon {
+    width: 60rpx;
+    height: 60rpx;
+    border: 4rpx solid #e0e0e0;
+    border-top-color: #FF4767;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+    margin-bottom: 20rpx;
+  }
+
+  .loading-text {
+    font-size: 26rpx;
+    color: #999;
+  }
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.load-more,
+.no-more {
+  text-align: center;
+  padding: 30rpx 0;
+  font-size: 24rpx;
+  color: #999;
+}
+
+.empty-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 150rpx 0;
+
+  .empty-img {
+    width: 200rpx;
+    height: 200rpx;
+    margin-bottom: 30rpx;
+    opacity: 0.6;
+  }
+
+  .empty-text {
+    font-size: 28rpx;
+    color: #999;
+  }
+}
+
+.nav-img-size::v-deep .icon-headle {
+  width: 36rpx !important;
+  height: 36rpx !important;
+}
+</style>
\ No newline at end of file
diff --git a/pages/order/all-orders.vue b/pages/order/all-orders.vue
index 84d416c..0d6d70b 100644
--- a/pages/order/all-orders.vue
+++ b/pages/order/all-orders.vue
@@ -275,18 +275,18 @@ export default {
 
 .rating-score {
   font-size: 16rpx;
-  color: #E8101E;
+  color: #FF4767;
   margin-left: 68rpx;
 }
 
 .currency {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .amount {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -328,7 +328,7 @@ export default {
 }
 .load-date {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .load-text {
diff --git a/pages/order/artisanorder-detail.vue b/pages/order/artisanorder-detail.vue
index 258b92c..e5377c4 100644
--- a/pages/order/artisanorder-detail.vue
+++ b/pages/order/artisanorder-detail.vue
@@ -716,7 +716,7 @@ page {
 .real-price {
   font-size: 32rpx;
   font-weight: 500;
-  color: #E8101E;
+  color: #FF4767;
 }
 /* 订单信息卡片 */
 .order-card {
@@ -788,13 +788,13 @@ page {
   margin-left: 20rpx;
 }
 .btn-border {
-  border: 1rpx solid #E8101E;
+  border: 1rpx solid #FF4767;
   background-color: #fff;
   box-sizing: border-box;
   margin-left: 20rpx;
 }
 .btn-bg {
-  background-color: #E8101E;
+  background-color: #FF4767;
 }
 .button-text {
   font-size: 28rpx;
@@ -804,7 +804,7 @@ page {
 .btn-border .button-text {
   font-size: 28rpx;
   font-weight: 400;
-  color: #E8101E;
+  color: #FF4767;
 }
 /* APP适配 */
 /* #ifdef APP-PLUS */
diff --git a/pages/order/pay.vue b/pages/order/pay.vue
index 8edf58c..3f58277 100644
--- a/pages/order/pay.vue
+++ b/pages/order/pay.vue
@@ -24,7 +24,7 @@
 						<image :src="item.icon" mode="aspectFit" class="method-icon"></image>
 						<text class="method-name">{{ item.name }}</text>
 					</view>
-					<agree-radio :isAgree="item.selected" :yesImg="`/static/images/icons/yes_icon.png`" :radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
+					<agree-radio :isAgree="item.selected" :yesImg="`/static/images/agree_y.png`" :radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
 				</view>
 			</view>
 		</view>
@@ -494,7 +494,7 @@
 			::v-deep .uv-count-down__text {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;;
+				color: #FF4767;;
 				line-height: 37rpx;
 				text-align: center;
 				font-style: normal;
@@ -559,13 +559,13 @@
 	.total-amount .symbol {
 		font-size: 24rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.total-amount .amount {
 		font-size: 28rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.amount-lable {
@@ -576,7 +576,7 @@
 	.pay-btn {
 		width: 680rpx;
 		height: 88rpx;
-		background: linear-gradient( 180deg, #F52540 0%, #E8101E 100%);
+		background: linear-gradient( 180deg, #F52540 0%, #FF4767 100%);
 		border-radius: 43rpx;
 		font-weight: 500;
 		font-size: 30rpx;
diff --git a/pages/order/submit.vue b/pages/order/submit.vue
index 747777c..36d5abd 100644
--- a/pages/order/submit.vue
+++ b/pages/order/submit.vue
@@ -623,7 +623,7 @@ export default {
   height: 28rpx;
   border: 3rpx;
   margin-right: 16rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
 }
 
 .service-item {
@@ -766,7 +766,7 @@ export default {
 .price-total .price {
   font-size: 28rpx;
   font-weight: 500;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .amount-lable {
@@ -777,7 +777,7 @@ export default {
 .submit-btn {
   width: 492rpx;
   height: 64rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 32rpx;
   color: #ffffff;
   font-size: 28rpx;
@@ -984,8 +984,8 @@ export default {
     .isActive {
       background: rgba(252, 67, 124, 0.08);
       border-radius: 10rpx;
-      border: 1rpx solid #E8101E;
-      color: #E8101E;
+      border: 1rpx solid #FF4767;
+      color: #FF4767;
       /* 选中状态 */
     }
 
@@ -1010,7 +1010,7 @@ export default {
     &__box {
       width: 648rpx;
       height: 94rpx;
-      background: linear-gradient(140deg, #fa4e9a 0%, #E8101E 100%);
+      background: linear-gradient(140deg, #fa4e9a 0%, #FF4767 100%);
       border-radius: 48rpx;
       display: flex;
       align-items: center;
diff --git a/pages/order/userorder-detail.vue b/pages/order/userorder-detail.vue
index c0b9355..b046130 100644
--- a/pages/order/userorder-detail.vue
+++ b/pages/order/userorder-detail.vue
@@ -18,7 +18,7 @@
 			<view class="group-invite"
 				v-if="orderInfo.state !=1 && orderInfo.team_buy_id &&  (orderInfo.team_buy_order_state==1||orderInfo.team_buy_order_state==2)">
 				<view class="invite-text" v-if="orderInfo.team_buy_order_state == 1">参团成功，需邀请<text
-						style="color: #E8101E">{{orderInfo.team_buy.person_num - orderInfo.team_buy.pay_person_num}}</text>人才可完成拼团
+						style="color: #FF4767">{{orderInfo.team_buy.person_num - orderInfo.team_buy.pay_person_num}}</text>人才可完成拼团
 				</view>
 				<view class="invite-text" v-if="orderInfo.team_buy_order_state == 2">参团成功，已拼团成功！</view>
 
@@ -266,16 +266,16 @@
 						              formatPriceNumber(this.orderInfo.cost_money-this.orderInfo.order_money),
 						              18,
 						              2
-						            )}rpx;color: #E8101E;line-height: 25rpx;text-align: left;font-style: normal;`" />
+						            )}rpx;color: #FF4767;line-height: 25rpx;text-align: left;font-style: normal;`" />
 				</l-painter-view>
 				<l-painter-view css="margin-top:44rpx;">
 					<l-painter-text text="¥"
-						css="font-weight: 500;font-size: 26rpx;color: #E8101E;line-height: 48rpx;text-align: left;font-style: normal;" />
+						css="font-weight: 500;font-size: 26rpx;color: #FF4767;line-height: 48rpx;text-align: left;font-style: normal;" />
 					<l-painter-text :text=" formatPriceNumber(this.orderInfo.order_money)" :css="`font-weight: 500;font-size:${formatPriceSize(
 						              formatPriceNumber(this.orderInfo.order_money),
 						              56,
 						              3
-						            )}rpx;color: #E8101E;line-height: 34rpx;text-align: left;font-style: normal;`" />
+						            )}rpx;color: #FF4767;line-height: 34rpx;text-align: left;font-style: normal;`" />
 				</l-painter-view>
 				<l-painter-view css="margin-top:0rpx;">
 					<l-painter-text :text="`原价¥${formatPriceNumber(this.orderInfo.cost_money)}`" :css="`text-decoration: line-through;font-weight: 400;font-size:${formatPriceSize(
@@ -1005,7 +1005,7 @@
 	.phone-btn {
 		width: 64rpx;
 		height: 64rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 32rpx;
 	}
 
@@ -1249,7 +1249,7 @@
 	.service-price2 {
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -1282,7 +1282,7 @@
 		font-family: DINPro, DINPro;
 		font-weight: 500;
 		font-size: 36rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -1352,7 +1352,7 @@
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
@@ -1444,7 +1444,7 @@
 				align-items: center;
 				font-weight: 500;
 				font-size: 24rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 33rpx;
 				text-align: left;
 				font-style: normal;
diff --git a/pages/order/userorder-list.vue b/pages/order/userorder-list.vue
index 5129425..53f36d7 100644
--- a/pages/order/userorder-list.vue
+++ b/pages/order/userorder-list.vue
@@ -1,970 +1,700 @@
 <template>
-	<view class="order-list">
-		<view v-if="isLogin">
-			<!-- 订单状态标签 -->
-			<view class="status">
-				<scroll-view scroll-x class="status-tabs" :show-scrollbar="false">
-					<view style="padding-left: 20rpx;">
-						<view class="tab-item" v-for="(tab, index) in OrderType" :key="tab.id"
-							:class="{ active: OrderTypeIndex === tab.id }" @click="switchOrderTab(tab.id)">
-							{{tab.title}}
-						</view>
-					</view>
-					
-				</scroll-view>
-				<scroll-view scroll-x class="status-tabs2" :show-scrollbar="false">
-					<view class="tab-item2" v-for="(tab, index) in tabs" :key="tab.id"
-						:class="{ active: currentTab === tab.id }" @click="switchTab(tab.id)">
-						{{tab.title}}
-					</view>
-				</scroll-view>
-			</view>
+    <view class="order-list-page">
 
+        <view class="status" v-if="isLogin">
+            <scroll-view scroll-x class="status-tabs" :show-scrollbar="false">
+                <view style="padding-left: 20rpx">
+                    <view class="tab-item" v-for="(item, index) in firstTabs" :key="index"
+                        :class="{ active: activeFirstId === item.id }" @click="handleFirstTabClick(item)">
+                        {{ item.title }}
+                    </view>
+                </view>
+            </scroll-view>
 
-			<!-- 订单列表 -->
-			<scroll-view scroll-y class="order-scroll" @scrolltolower="loadMore" refresher-enabled
-				:refresher-triggered="isRefreshing" @refresherrefresh="onRefresh"
-				:style="{height:`calc(100vh - ${210}rpx)`}">
-				<view class="order-item" v-for="(order, index) in orderList" :key="index">
-					<!-- 订单编号和状态 -->
-					<view class="order-header">
-						<view class="order-tag" v-if="!order.team_buy_id || order.team_buy_id==`0`">
-							<text
-								class="order-tag-text">{{order.order_kind == 1 ? '到家' : order.order_kind == 2 ? '到店' :  order.order_kind == 3 ? '到家' : ''}}</text>
-						</view>
-						<text class="order-number">订单编号：{{order.number}}</text>
-						<text class="order-status"
-							:class="order.statusClass">{{order.state == 1 ? '待支付' : order.state == 2 ? '待接单' : order.state == 3 ? '待服务' : order.state == 4 ? '待完成' : order.state == 5 ? '已完成' : order.state == 6 ? '待评价' : order.state == 7 ? '已取消' : ''}}</text>
-					</view>
+            <scroll-view scroll-x class="status-tabs2" :show-scrollbar="false">
+                <view style="padding-left: 20rpx; white-space: nowrap; padding-bottom: 20rpx;">
+                    <view class="tab-item2" v-for="(item, index) in secondTabs" :key="index"
+                        :class="{ active: activeSecondId === item.id }"
+                        @click="handleSecondTabClick(item.id, item.title)">
+                        {{ item.title }}
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
+        <view class="status-gap"></view>
+        <CommonList nList ref="groupRef" :isLogin="isLogin" :apiUrl="apiUrl"
+            :listScrollHeight="`calc(100vh - 280rpx - 20rpx)`" @load-success="loadSuccess" class="nodatamit">
+            <template #listData="{ list }" class="commit">
+                <view class="order-item-wrap" v-for="item in popList" :key="item.id">
+                    <OrderCard v-if="activeFirstId != 3" :haveButton="haveButton" :dataItem="item"
+                        :typeId="activeFirstId" @cancel="cancelOrder($event, item)" @start="startOrder($event, item)"
+                        @done="endOrder($event, item)" @goOrderDetail="goOrderDetail" />
 
-					<!-- 订单内容 -->
-					<view class="order-content" @click="goDetail(order)">
-						<image v-if="order.order_photo" :src="order.order_photo[0]" mode="aspectFill"
-							class="service-image"></image>
-						<view class="service-image" v-else></view>
-						<view class="service-info">
-							<view class="service-name">
-								<image v-if="order.team_buy_id && order.team_buy_id!=0"
-									:src="getGroupType(order.team_buy_order_state)" class="service-name-type"
-									mode="heightFix"></image>
-								<text class="service-name-text">
-									{{order.server_title}}
-								</text>
+                    <WorkHourOrderCard v-else :dataItem="item" :typeId="activeFirstId"
+                        @cancel="cancelOrder($event, item)" @accept="confirmOrder($event, item)"
+                        @start="startOrder($event, item)" @done="endOrder($event, item)" @goOrderDetail="goOrderDetail">
+                    </WorkHourOrderCard>
+                </view>
+            </template>
 
-							</view>
-							<view class="service-time" v-if="order.order_kind == 1 || order.order_kind == 3">
-								<!-- <image src="/static/images/time_icon.png" class="time-icon"></image> -->
-								<text>下单时间：{{order.reservation_time }}</text>
-							</view>
-							<view class="service-time"
-								v-if="order.order_kind == 2 && (!order.team_buy_id || order.team_buy_id==0)">
-								<!-- <image src="/static/images/time_icon.png" class="time-icon"></image> -->
-								<text>下单时间：{{order.add_time}}</text>
-							</view>
-							<view class="service-address" v-if="order.order_kind == 1 || order.order_kind == 3">
-								<!-- <image src="/static/images/position_icon.png" class="location-icon"></image> -->
-								<text
-									class="text-overflow-1">到家地址：{{Object.assign({},order.reservation_address_arr).server_address}}</text>
-							</view>
-							<view class="service-group" v-if="order.team_buy_id && order.team_buy_id!=0">
-								<view class="service-group-time">
-									下单时间：{{ order.add_time }}
-								</view>
-								<view class="service-group-price">
-									团购价:<text style="font-size: 34rpx;">{{ order.order_money }}</text>
-								</view>
+            <template #empty>
+                <view class="noDataBox">
+                    <noData tipText="暂无服务订单哟～" v-if="isLogin"></noData>
+                    <view class="nologin_part" v-else>
+                        <image
+                            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/15e33bab-8868-40bf-935b-a9ee9ca3c0d2.png"
+                            class="nologin_icon"
+                            mode="aspectFit"
+                            @click="goLogin"
+                        ></image>
+                    </view>
+                </view>
+            </template>
+        </CommonList>
 
-							</view>
-						</view>
-					</view>
+        <serviceCodeInput :show="showInput" @close="showInput = false" @confirm="onConfirm" />
 
-					<!-- 订单操作按钮 -->
-					<view class="order-actions">
-						<view class="action-left">
-							<image src="/static/images/evaluate/delete-icon.png" class="delete-icon"
-								@click="deleteOrder(order)"
-								v-if="order.state == 5 || order.state == 6 || order.state == 7"></image>
-						</view>
-						<view class="action-right">
-							<text class="action-btn contact" @click="cancelService(order)"
-								v-if="order.state == 1">取消订单</text>
-							<text class="action-btn contact" @click="refoundService(order)"
-								v-if="order.state == 2 || order.state == 3">申请退款</text>
-							<text class="action-btn contact" @click="contactService(order.order_shopphone)">联系客服</text>
-							<text class="action-btn review" v-if="order.state == 1" @click="payOrder(order)">立即支付</text>
-
-							<text class="action-btn again" v-if="order.state == 5 || order.state == 6"
-								@click="orderAgain(order)">再来一单</text>
-							<text class="action-btn again" v-if="order.state == 5 && order.appeal == 1"
-								@click="addComplaint(order)">投诉</text>
-							<text class="action-btn again" v-if="order.state == 5 && order.appeal == 2"
-								@click="lookComplaint(order)">查看投诉</text>
-							<text class="action-btn review" v-if="order.state == 5 && order.evaluate==2"
-								@click="reviewOrder(order)">立即评价</text>
-							<text class="action-btn again" v-if="order.state == 5 && order.evaluate==1"
-								@click="goEvaluateDetail(order)">已评价</text>
-						</view>
-					</view>
-				</view>
-
-				<!-- 加载更多 -->
-				<view class="loading-more" v-if="hasMore">加载中...</view>
-				<view class="no-more" v-if="!hasMore && orderList.length">暂无数据哦～</view>
-
-				<!-- 没数据的情况 -->
-				<noData v-if="orderList.length==0"></noData>
-
-
-				<!-- 获取权限提示匡内容 -->
-				<view class="permission" :class="{ transform: isShowPer }">
-					<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
-					<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
-				</view>
-			</scroll-view>
-		</view>
-		<view class="nologin_part" v-else>
-			<image src="/static/images/no_login.png" class="nologin_icon" mode="aspectFit"></image>
-			<view class="btn-login">
-				<text class="login-text" @click="goLogin">前去登录</text>
-			</view>
-		</view>
-
-		<!-- 自定义TabBar -->
-		<TabBar :selected="1"></TabBar>
-	</view>
+        <TabBar :selected="1"></TabBar>
+    </view>
 </template>
 
 <script>
-	import TabBar from "@/components/tabbar/tabbar.vue"
-	import request from '../../utils/request'
-	import locationService from '../../utils/locationService';
-	import permissionUtils from '../../utils/per'
-	import {
-		debounce
-	} from '@/utils/debounce.js'
-	import {
-		url
-	} from '../../uni_modules/uv-ui-tools/libs/function/test';
-	export default {
-		components: {
-			TabBar,
-		},
-		data() {
-			return {
-				isShowPer: false,
-				OrderType: [{
-					id: 0,
-					title: '全部订单',
-					url: "/user/order/list",
-				}, {
-					id: 1,
-					title: '普通订单',
-					url: "/user/userorders",
-				}, {
-					id: 2,
-					title: '自营订单',
-					url: "/user/orderSelf/list",
-				}],
-				urls: {
-					order: {
-						cancelorder: "/user/cancelorder",
-						deleteorder: "/user/deleteorder"
-					},
-					order_self: {
-						cancelorder: "/user/orderSelf/cancel",
-						deleteorder: "/user/orderSelf/del"
-					}
-				},
-				OrderTypeIndex: 0,
-				tabs: [{
-					id: 0,
-					title: '全部'
-				}, {
-					id: 1,
-					title: '待支付'
-				}, {
-					id: 2,
-					title: '待接单'
-				}, {
-					id: 3,
-					title: '待服务'
-				}, {
-					id: 4,
-					title: '服务中'
-				}, {
-					id: 5,
-					title: '已完成'
-				}, {
-					id: 7,
-					title: '已取消'
-				}],
-				// ,{id: 6,title: '待评价'}
-				currentTab: 0,
-				isRefreshing: false,
-				hasMore: true,
-				orderList: [],
-				formData: {
-					page: 1,
-					limit: 10
-				},
-				isLogin: false
-			}
-		},
-		computed: {
+import OrderCard from "@/pages/shop/components/orderCard.vue";
+import WorkHourOrderCard from "@/pages/home/components/workOrderCard.vue";
+import CommonList from "@/components/common/CommonList.vue";
+import noLogin from "@/components/noData/noLogin.vue";
+import request from "@/utils/request";
+import serviceCodeInput from "@/components/service-code-input/service-code-input.vue";
+import TabBar from "@/components/tabbar/tabbar.vue";
 
-		},
-		onLoad() {
-			//隐藏原生Tabar
-			uni.hideTabBar()
-			// this.loadOrders();
-			this.handleOrderTypeFromGlobal();
-		},
-		onShow() {
-			this.isLogin = uni.getStorageSync('accessToken') ? true : false;
-			if (!this.isLogin) return;
+export default {
+    name: "filters",
+    props: {
+        title: {
+            type: String,
+            default: "",
+        },
+        userInfo: {
+            type: Object,
+            default: () => ({}),
+        },
+        // 自营状态 0未加入 1加入 2停用
+        selfState: {
+            type: Number,
+            default: 0,
+        },
+    },
+    components: {
+        CommonList,
+        noLogin,
+        serviceCodeInput,
+        OrderCard,
+        WorkHourOrderCard,
+        TabBar
+    },
+    data() {
+        return {
+            isLogin: false, // 将isLogin移至data内管理
+            popList: [],
+            haveButton: true,
+            statusBarHeight: 0,
+            tabs: [{
+                title: "到店订单",
+                id: 1
+            },
+            {
+                title: "自营到店订单",
+                id: 2,
+                isNeedLogin: true,
+                isRuzHu: true,
+                isSelfOrder: true
+            },
+            {
+                title: "工位订单",
+                id: 3,
+                isNeedLogin: true,
+                id_type: 1
+            },
+            {
+                title: "上门订单",
+                id: 4,
+                isNeedLogin: true,
+                id_type: 1
+            },
+            {
+                title: "自营上门订单",
+                id: 5,
+                isNeedLogin: true,
+                id_type: 1
+            },
+            ], // 1级类目
+            activeFirstId: 1, // 记录选中的1级tab id
+            activeSecondId: 3, // 记录选中的2级tab id（null表示"全部"）
+            numInfo: {
+                djd: 0,
+                dfw: 0,
+                dwc: 0,
+                nocompletednum: 0,
+                noconfirmnum: 0,
+                noservernum: 0,
+            },
+            sjId: undefined,
+            idType: undefined,
+            showInput: false,
+            orderInfo: {},
+            urls: {
+                1: {
+                    weChatRefund: "/sj/yhwechatrefund",
+                    aliRefund: "/sj/yhalirefund",
+                    startOrder: "/sj/startserver",
+                    endOrder: "/sj/endserver",
+                    ordernum: "/sj/ordernum",
+                    list: "/sj/sjgetyhorder",
+                },
+                2: {
+                    weChatRefund: "/sj/orderSelf/weChatRefund",
+                    aliRefund: "/sj/orderSelf/aliRefund",
+                    startOrder: "/sj/orderSelf/start",
+                    endOrder: "/sj/orderSelf/end",
+                    ordernum: "/sj/orderSelf/orderNum",
+                    list: "/sj/orderSelf/list",
+                },
+                3: {
+                    weChatRefund: "/sj/workSeatOrder/weChatRefund",
+                    aliRefund: "/sj/workSeatOrder/aliRefund",
+                    startOrder: "/sj/workSeatOrder/start",
+                    sureOrder: "/sj/workSeatOrder/sure",
+                    endOrder: "/sj/workSeatOrder/end",
+                    ordernum: "/sj/workSeatOrder/orderNum",
+                    list: "/sj/workSeatOrder/list",
+                },
+                4: {
+                    ordernum: "/sj/sjonsiteordernum",
+                    list: "/sj/sjonsiteorder",
+                },
+                5: {
+                    ordernum: "/sj/sjonsiteordernumself",
+                    list: "/sj/sjonsiteorderself",
+                }
+            },
+        };
+    },
+    computed: {
+        apiUrl() {
+            if (!this.urls[this.activeFirstId]) {
+                return ""
+            }
+            const urls = this.urls[this.activeFirstId];
+            return urls.list;
+        },
+        getNumUrl() {
+            const urls = this.urls[this.activeFirstId];
+            return urls.ordernum;
+        },
+        // 计算是否显示自营订单tab
+        showSelfOrderTab() {
+            // 只有当self_state为1或2时才显示自营订单tab
+            return this.selfState == 1 || this.selfState == 2;
+        },
+        firstTabs() {
+            return this.tabs
+                .filter((tab) => !tab.isNeedLogin || this.isLogin)
+                .filter((tab) => {
+                    if (tab.id_type) {
+                        return this.idType == tab.id_type;
+                    }
+                    return true;
+                })
+                .filter((tab) => !tab.isRuzHu || this.idType != 0)
+                // 自营订单tab显示条件
+                .filter((tab) => {
+                    if (tab.isSelfOrder) {
+                        return this.showSelfOrderTab;
+                    }
+                    return true;
+                });
+        },
+        secondTabs() {
+            if (this.activeFirstId == 1 || this.activeFirstId == 2) {
+                return [{
+                    title: `待开始(${this.numInfo.noservernum})`,
+                    id: 3
+                },
+                {
+                    title: `待完成(${this.numInfo.nocompletednum})`,
+                    id: 4
+                },
+                ];
+            } else if (this.activeFirstId == 4 || this.activeFirstId == 5) {
+                return [{
+                    title: `待接单(${this.numInfo.noconfirmnum})`,
+                    id: 2
+                },
+                {
+                    title: `待开始(${this.numInfo.noservernum})`,
+                    id: 3
+                },
+                {
+                    title: `待完成(${this.numInfo.nocompletednum})`,
+                    id: 4
+                },
+                ];
+            } else {
+                return [{
+                    title: `待接单(${this.numInfo.djd})`,
+                    id: 2
+                },
+                {
+                    title: `待服务(${this.numInfo.dfw})`,
+                    id: 3
+                },
+                {
+                    title: `待完成(${this.numInfo.dwc})`,
+                    id: 4
+                },
+                ];
+            }
 
-			// 在 onShow 中也处理全局变量
-			this.handleOrderTypeFromGlobal();
+        },
+    },
+    onLoad() {
+        uni.hideTabBar(); // 隐藏原生TabBar
+    },
+    onShow() {
+        this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+        if (this.isLogin) {
+            // 确保默认选中项正确
+            if (!this.activeFirstId) this.activeFirstId = 1;
+            if (!this.activeSecondId) this.activeSecondId = 3; // 或者你想默认 2 (待接单)，这里统一就行
 
-			this.orderList = [];
-			this.formData.page = 1;
-			this.loadOrders();
-		},
-		methods: {
-			//获取拼团状态文字
-			// getGroupType(id) {
-			// 	let list = [{
-			// 			id: 1,
-			// 			text: "团购中",
-			// 		},
-			// 		{
-			// 			id: 2,
-			// 			text: "已成团",
-			// 		},
-			// 		{
-			// 			id: 3,
-			// 			text: "拼团失败",
-			// 		},
-			// 	];
-			// 	let name = list.find((it) => it.id == id)?.text;
-			// 	return name;
-			getGroupType(id) {
-				const imageBasePath = '/static/images/';
-				const imageMap = {
-					1: imageBasePath + 'pintuan_ing.png', // 团购中
-					2: imageBasePath + 'pintuan_done.png', // 已成团
-					3: imageBasePath + 'pintuan_fail.png' // 拼团失败
-				};
-				return imageMap[id] || ''; // 如果id不在1-3范围内，返回空字符串
-			},
-			// 切换标签
-			switchOrderTab(index) {
-				this.OrderTypeIndex = index;
-				this.orderList = [];
-				this.formData.page = 1;
-				// TODO: 根据当前标签加载对应订单数据
-				delete this.formData.state;
-				this.currentTab = 0;
-				this.loadOrders()
-			},
-			// 切换标签
-			switchTab(index) {
-				this.currentTab = index;
-				this.orderList = [];
-				this.formData.page = 1;
-				// TODO: 根据当前标签加载对应订单数据
-				if (this.currentTab != 0) {
-					this.formData.state = this.currentTab;
-				} else {
-					delete this.formData.state;
-				}
-				this.loadOrders()
-			},
+            // 使用 $nextTick 确保 CommonList 组件已经渲染完毕再调用刷新
+            this.$nextTick(() => {
+                this.searchList();
+            });
+        } else {
+            this.activeFirstId = null;
+            this.activeSecondId = null;
+            this.popList = []; // 没登录清空数据
+        }
+    },
+    // watch: {
+    //     isLogin(newVal) {
+    //         if (newVal) {
+    //             this.activeFirstId = 1;
+    //             this.activeSecondId = 2; // 默认选中"待接单"
+    //             this.searchList();
+    //         }
+    //     },
+    // },
+    methods: {
+        searchList() {
+            if (this.syrId && this.idType) {
+                this.$refs.groupRef.manualRefresh({
+                    sjid: this.sjId,
+                    state: this.activeSecondId || undefined,
 
-			// 加载订单数据
-			loadOrders() {
-				request.post(this.OrderType[this.OrderTypeIndex].url, this.formData).then(res => {
-					this.orderList = [...this.orderList, ...res.data];
-					if (res.count == this.orderList.length) {
-						this.hasMore = false
-					} else {
-						this.hasMore = true
-						this.formData.page = this.formData.page + 1;
-					}
-					this.isRefreshing = false
-				})
-			},
+                });
+            } else {
+                request.post("/sj/user/getUser").then((result) => {
+                    this.sjId = result.data.id;
+                    this.idType = result.data.id_type;
+                    this.$refs.groupRef.manualRefresh({
+                        sjid: this.sjId,
+                        state: this.activeSecondId,
+                    });
+                });
+            }
+        },
+        loadSuccess(res) {
+            this.popList = res.list
+            request
+                .post(this.getNumUrl, {
+                    sjid: this.sjId,
+                })
+                .then((result) => {
+                    for (let key in result.data) {
+                        this.numInfo[key] = result.data[key];
+                    }
+                });
+        },
+        // 一级tab点击事件
+        handleFirstTabClick(item) {
+            if (!this.isLogin) return;
+            // 避免重复点击 (一定要在最前面！)
+            if (this.activeFirstId === item.id) return;
 
-			// 下拉刷新
-			onRefresh() {
-				this.isRefreshing = true
-				this.formData.page = 1;
-				this.orderList = [];
-				this.loadOrders()
-			},
+            // 【修改点】：判断完不是重复点击后，再清空旧数据
+            this.popList = [];
 
-			// 加载更多
-			loadMore() {
-				if (!this.hasMore) return
-				// TODO: 加载更多订单数据
-				this.loadOrders();
-			},
+            // 更新1级选中状态
+            this.activeFirstId = item.id;
 
-			// 跳转订单详情
-			goDetail(order) {
-				console.log('order', order)
-				if (order.table_source == "order") {
-					//如果是普通订单
-					uni.navigateTo({
-						url: `/pages/order/userorder-detail?id=${order.id}`
-					})
-				} else if (order.table_source == "order_self") {
-					//如果是自营订单
-					uni.navigateTo({
-						url: `/pages/order/userorder-detail?id=${order.id}&serviceType=2`
-					})
-				}
+            this.haveButton = true;
+            if (this.activeFirstId == 4 || this.activeFirstId == 5) {
+                this.haveButton = false;
+            }
 
-			},
+            // 重置2级选中状态
+            if (this.activeFirstId == 1 || this.activeFirstId == 2) {
+                this.activeSecondId = 3;
+            } else {
+                this.activeSecondId = 2;
+            }
 
-			// 删除订单
-			deleteOrder: debounce(async function(order) {
-				uni.showModal({
-					title: '提示',
-					content: '确定要删除该订单吗？',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 删除订单
-							request.post(this.urls[order.table_source].deleteorder, {
-								id: order.id
-							}).then(res => {
-								uni.showToast({
-									title: '删除成功！',
-									icon: 'none'
-								})
-								this.formData.page = 1;
-								this.orderList = [];
-								this.loadOrders();
-							})
-						}
-					}
-				})
-			}, 500),
+            this.$emit("tabChange", {
+                firstId: this.activeFirstId,
+                secondId: this.activeSecondId,
+            });
 
-			// 显示权限说明弹窗
-			showPermissionDialog(title, content) {
-				return new Promise((resolve) => {
-					uni.showModal({
-						title,
-						content,
-						confirmText: '去开启',
-						success(res) {
-							resolve(res.confirm);
-						}
-					});
-				});
-			},
-			// 订单状态全局变量
-			handleOrderTypeFromGlobal() {
-				const orderType = getApp().globalData.selectedOrderType;
-				console.log('接收到的订单类型:', orderType);
+            this.$nextTick(() => {
+                this.searchList();
+            });
+        },
+        // 二级tab点击事件
+        handleSecondTabClick(id, title) {
+            if (!this.isLogin) return;
+            // 避免重复点击！
+            if (this.activeSecondId === id) return;
+            // 判断完不是重复点击后，再清空旧数据
+            this.popList = [];
+            // 更新2级选中状态
+            this.activeSecondId = id;
+            this.$emit("tabChange", {
+                firstId: this.activeFirstId,
+                secondId: this.activeSecondId,
+            });
 
-				if (orderType) {
-					// 创建类型映射
-					const typeMap = {
-						'unpaid': 1, // 待支付
-						'unaccepted': 2, // 待接单  
-						'unserved': 3, // 待服务
-						'finnish': 5 // 已完成
-					};
-
-					// 映射到对应的数字类型
-					this.currentTab = typeMap[orderType] || 0;
-					console.log('映射后的currentTab:', this.currentTab);
-
-					// 根据currentTab设置formData.state
-					if (this.currentTab !== 0) {
-						this.formData.state = this.currentTab;
-					} else {
-						delete this.formData.state;
-					}
-
-					// 清除全局变量
-					getApp().globalData.selectedOrderType = null;
-				}
-			},
-
-			// 联系客服
-			async contactService(phone) {
-				// TODO: 实现联系客服功能
-				uni.navigateTo({
-					url: '/pages/contact/contact'
-				})
-				//  const systemInfo = uni.getSystemInfoSync()
-				//  if(systemInfo.platform === 'ios') {
-				//  	uni.makePhoneCall({
-				//  		phoneNumber: phone //仅为示例
-				//  	})
-				//  }else {
-				//  	let permission = '';
-				//  	if(systemInfo.platform === 'ios') {
-				//  		permission = 'phone'
-				//  	}else {
-				//  		permission = 'android.permission.CALL_PHONE'
-				//  	}
-				// this.isShowPer = true;
-				//  	const firstRequest = !plus.storage.getItem(`perm_${permission}`)
-				//  	if(firstRequest) {
-				//  		this.isShowPer = true;
-				//  	}
-				//  	// 1. 检查权限
-				//  	const { granted } = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-				//  	if (granted) {
-				//   this.isShowPer = false;
-				//  	  uni.makePhoneCall({
-				//  	  	phoneNumber: phone //仅为示例
-				//  	  })
-				//  	  return;
-				//  	}
-				//  	this.isShowPer = false;
-				//  	// 2. 显示权限说明弹窗
-				//  	const confirm = await this.showPermissionDialog(
-				//  	  '拨打电话权限申请',
-				//  	  '我们需要拨打电话权限，方便您联系商家或平台'
-				//  	);
-
-				//  	if (!confirm) return;
-
-				//  	// 3. 请求权限
-				//  	const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-				//  	console.log('result',result)
-				//  	if (result) {
-				//  	  uni.makePhoneCall({
-				//  	  	phoneNumber: phone //仅为示例
-				//  	  })
-				//  	  return;
-				//  	} else {
-				//  	  locationService.openAppSettings();
-				//  	  return;
-				//  	  // uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-				//  	}
-				//  }
-
-			},
-			// 取消订单
-			async cancelService(order) {
-				let id = '';
-				await request.post('/user/getuser', {
-					type: 1
-				}).then(res => {
-					console.log(res)
-					id = res.data.id
-				})
-				console.log(order)
-				uni.showModal({
-					title: '取消订单',
-					content: '确定要取消该订单吗？',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 取消订单
-							let data = {
-								orderNo: order.number,
-								amount: order.pay_money,
-								cancel_state: 1,
-								cancel_id: id
-							}
-							request.post(this.urls[order.table_source].cancelorder, data).then(res => {
-								uni.showToast({
-									title: '取消成功！',
-									icon: 'none'
-								})
-								this.formData.page = 1;
-								this.orderList = [];
-								this.loadOrders();
-							}).catch(err => {
-								console.log(err)
-							})
-						}
-					}
-				})
-			},
-			// 申请退款
-			async refoundService(order) {
-				let id = '';
-				await request.post('/user/getuser', {
-					type: 1
-				}).then(res => {
-					console.log(res)
-					id = res.data.id
-				})
-				uni.showModal({
-					title: '申请退款',
-					content: '确定申请退款？退款后则订单取消！',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 申请退款
-							let data = {
-								orderNo: order.number,
-								amount: order.pay_money,
-								cancel_state: 1,
-								cancel_id: id
-							}
-							let url = '';
-							if (order.pay_kind == 1) {
-								url = ''
-							} else if (order.pay_kind == 2) {
-								url = '/user/wechatrefund'
-							} else if (order.pay_kind == 3) {
-								url = '/user/alirefund'
-							}
-							console.log(data, url)
-							request.post(url, data).then(res => {
-								console.log('申请退款订单返回结果', res)
-								uni.showToast({
-									title: '申请退款成功！',
-									icon: 'none'
-								})
-								this.formData.page = 1;
-								this.orderList = [];
-								this.loadOrders();
-							}).catch(err => {
-								console.log(err)
-							})
-						}
-					}
-				})
-			},
-
-			// 支付订单
-			payOrder(order) {
-				if(order.table_source == "order_self"){
-					// TODO: 实现支付功能
-					uni.navigateTo({
-						url: `/pages/order/pay?id=${order.id}&money=${order.order_money}&title=${order.server_title}&number=${order.number}&table_source=order_self`
-					})
-				}else{
-					// TODO: 实现支付功能
-					uni.navigateTo({
-						url: `/pages/order/pay?id=${order.id}&money=${order.order_money}&title=${order.server_title}&number=${order.number}`
-					})
-				}
-				
-			},
-
-			// 评价订单
-			reviewOrder(order) {
-				uni.navigateTo({
-					url: `/pages/evaluate/comment?id=${order.id}&evaluator_type=3&order_type=1&order_kind=${order.order_kind}`
-				})
-			},
-			goEvaluateDetail(order) {
-				uni.navigateTo({
-					url: `/pages/evaluate/evaluationDetails?order_id=${order.id}&order_type=1`
-				});
-			},
-
-			// 再次下单
-			orderAgain(order) {
-				console.log(1111111,order)
-				if(order.table_source=="order_self"){
-					// TODO: 实现再次下单功能
-					uni.navigateTo({
-						url: '/pages/selfOperated/detail?id=' + order.server_id
-					})
-				}else{
-					// TODO: 实现再次下单功能
-					uni.navigateTo({
-						url: '/pages/service/detail?id=' + order.server_id
-					})
-				}
-				
-			},
-			// 投诉
-			addComplaint(order) {
-				uni.navigateTo({
-					url: '/pages/complaint/add-complaint?number=' + order.number
-				})
-			},
-			// 查看投诉
-			lookComplaint(order) {
-				uni.navigateTo({
-					url: '/pages/complaint/detail?number=' + order.number
-				})
-			},
-			goLogin() {
-				// uni.oprPresentLogin()
-				uni.navigateTo({
-					url: '/pages/blogPopup/blogPopup'
-				});
-			}
-		}
-	}
+            this.$nextTick(() => {
+                this.searchList();
+            });
+        },
+        cancelOrder(e, order) {
+            uni.showModal({
+                title: "取消订单",
+                content: "确定要取消该订单吗？（订单取消后，支付金额将原路退回）",
+                success: (res) => {
+                    if (res.confirm) {
+                        // TODO: 取消订单
+                        let data = {
+                            orderNo: order.number,
+                            amount: order.pay_money,
+                            syrid: this.syrId,
+                        };
+                        let url = "";
+                        if (order.pay_kind == 1) {
+                            url = "";
+                        } else if (order.pay_kind == 2) {
+                            url = this.urls[this.activeFirstId].weChatRefund;
+                        } else if (order.pay_kind == 3) {
+                            url = this.urls[this.activeFirstId].aliRefund;
+                        }
+                        console.log(data, url);
+                        if (this.clickType) {
+                            return;
+                        }
+                        this.clickType = true;
+                        request
+                            .post(url, data)
+                            .then((res) => {
+                                if (res.state == 1 || res.code == 200 || res.code == 1) {
+                                    uni.showToast({
+                                        title: "取消成功！",
+                                        icon: "none",
+                                    });
+                                    this.searchList();
+                                } else {
+                                    uni.showToast({
+                                        title: res.msg,
+                                        icon: "none",
+                                    });
+                                }
+                            })
+                            .catch((err) => {
+                                console.log(err);
+                            })
+                            .finally(() => {
+                                this.clickType = false;
+                            });
+                    }
+                },
+            });
+        },
+        // 确认接单
+        confirmOrder(e, order) {
+            if (this.clickType) {
+                return;
+            }
+            this.clickType = true;
+            console.log(111, this.activeFirstId, this.urls)
+            request
+                .post(this.urls[this.activeFirstId].sureOrder, {
+                    id: order.id,
+                    syrid: this.syrId,
+                    order_kind: this.idType == 2 ? 3 : 1,
+                })
+                .then((res) => {
+                    if (res.state != 1 || res.code != 200) {
+                        uni.showToast({
+                            title: "开始服务",
+                            icon: "none",
+                        });
+                    } else {
+                        uni.showToast({
+                            title: "已接单",
+                            icon: "none",
+                        });
+                    }
+                    this.searchList();
+                })
+                .finally(() => {
+                    this.clickType = false;
+                });
+        },
+        // 开始服务
+        startOrder(e, order) {
+            if (order.team_buy_order_state == 1) {
+                uni.showToast({
+                    title: "订单当前处于拼团中，服务将在拼团完成后才开启~",
+                    icon: "none",
+                });
+                return
+            }
+            this.showInput = true;
+            this.orderInfo = order;
+        },
+        // 输入完成
+        onConfirm(code) {
+            this.showInput = false;
+            if (this.clickType) {
+                return;
+            }
+            this.clickType = true;
+            console.log(this.orderInfo, "this.urls[this.activeFirstId].startOrder");
+            request
+                .post(this.urls[this.activeFirstId].startOrder, {
+                    id: this.orderInfo.id,
+                    server_code: code,
+                    sjid: this.sjId,
+                })
+                .then((res) => {
+                    console.log(res);
+                    if (res.state == 1 || res.code == 200) {
+                        uni.showToast({
+                            title: "开始服务",
+                            icon: "none",
+                        });
+                        this.searchList();
+                    } else {
+                        uni.showToast({
+                            title: res.msg,
+                            icon: "none",
+                        });
+                    }
+                    this.orderInfo = {};
+                })
+                .finally(() => {
+                    this.clickType = false;
+                });
+        },
+        // 完成服务
+        endOrder(e, order) {
+            // app阻止事件冒泡
+            // #ifdef APP-PLUS
+            // e.preventDefault();
+            // e.stopPropagation();
+            // #endif
+            if (this.clickType) {
+                return;
+            }
+            this.clickType = true;
+            request
+                .post(this.urls[this.activeFirstId].endOrder, {
+                    id: order.id,
+                    sjid: this.sjId,
+                })
+                .then((res) => {
+                    if (res.state == 1 || res.code == 200) {
+                        uni.showToast({
+                            title: res.msg,
+                            icon: "none",
+                        });
+                        this.searchList();
+                    } else {
+                        uni.showToast({
+                            title: res.msg,
+                            icon: "none",
+                        });
+                    }
+                })
+                .finally(() => {
+                    this.clickType = false;
+                });
+        },
+        goOrderDetail(order) {
+            if (this.idType == 1) {
+                if (this.activeFirstId == 1) {
+                    uni.navigateTo({
+                        url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
+                    });
+                }
+                if (this.activeFirstId == 2) {
+                    uni.navigateTo({
+                        url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2&haveButton=${this.haveButton}`,
+                    });
+                }
+                if (this.activeFirstId == 3) {
+                    uni.navigateTo({
+                        url: `/pages/shop/SellerDetail?order_id=${order.id}&haveButton=${this.haveButton}`,
+                    });
+                }
+                if (this.activeFirstId == 4) {
+                    uni.navigateTo({
+                        url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
+                    });
+                }
+                if (this.activeFirstId == 5) {
+                    uni.navigateTo({
+                        url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2&haveButton=${this.haveButton}`,
+                    });
+                }
+            }
+        },
+        // 去登录
+        goLogin() {
+            uni.navigateTo({ url: '/pages/blogPopup/blogPopup' });
+        }
+    },
+};
 </script>
 
-<style lang="less">
-	/* 状态标签栏 */
-	.status {
-		position: sticky;
-		top: 0;
-		/* #ifdef H5 */
-		top: 88rpx;
-		/* H5端顶部适配 */
-		/* #endif */
-		left: 0;
-		right: 0;
-	}
+<style scoped lang="less">
+.order-list-page {
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: #FAFAFA;
+}
 
-	.status-tabs {
+/* 状态标签栏 (移植自用户端示例) */
+.status {
+    position: sticky;
+    top: 0;
+    /* #ifdef H5 */
+    top: 88rpx;
+    /* H5端顶部适配 */
+    /* #endif */
+    left: 0;
+    right: 0;
+    background: white;
+    z-index: 99;
+}
 
-		height: 94rpx;
-		background-color: #FFFFFF;
-		z-index: 99;
-		white-space: nowrap;
-		// padding-left: 20rpx;
-	}
+.status-tabs {
+    height: 94rpx;
+    background-color: white;
+    white-space: nowrap;
+}
 
-	.tab-item {
-		display: inline-block;
-		height: 48rpx;
-		position: relative;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 42rpx;
-		text-align: left;
-		font-style: normal;
-		margin: 20rpx 50rpx 26rpx 0rpx;
-	}
+.tab-item {
+    display: inline-block;
+    height: 48rpx;
+    position: relative;
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+    line-height: 42rpx;
+    text-align: left;
+    font-style: normal;
+    margin: 20rpx 50rpx 26rpx 0rpx;
 
-	.tab-item.active {
-		color: #E8101E;
-		font-weight: 500;
-	}
+    &.active {
+        color: #ff4767;
+        font-weight: 500;
+    }
 
-	.tab-item.active::after {
-		content: '';
-		position: absolute;
-		width: 28rpx;
-		height: 6rpx;
-		left: 50%;
-		bottom: 0;
-		transform: translateX(-50%);
-		background-color: #E8101E;
-		border-radius: 3rpx;
-	}
+    &.active::after {
+        content: "";
+        position: absolute;
+        width: 34rpx;
+        height: 6rpx;
+        left: 50%;
+        bottom: -16rpx;
+        transform: translateX(-50%);
+        background-color: #ff4767;
+        border-radius: 3rpx;
+    }
+}
 
-	.status-tabs2 {
-		height: 56rpx;
-		background-color: #FFFFFF;
-		z-index: 99;
-		white-space: nowrap;
-		padding-bottom: 30rpx;
-	}
+.status-tabs2 {
+    height: 56rpx;
+    background-color: white;
+    white-space: nowrap;
+    padding-bottom: 30rpx;
+    padding-top: 10rpx;
+}
 
-	.tab-item2 {
-		display: inline-block;
-		height: 56rpx;
-		padding: 0 20rpx;
-		background: #F3F5F6;
-		border-radius: 10rpx;
-		position: relative;
-		margin: 0 18rpx;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #333333;
-		line-height: 56rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.tab-item2 {
+    display: inline-block;
+    height: 56rpx;
+    padding: 0 20rpx;
+    background: #f3f5f6;
+    border-radius: 10rpx;
+    position: relative;
+    margin: 0 18rpx 0 0;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #333333;
+    line-height: 56rpx;
+    text-align: left;
+    font-style: normal;
 
-	.tab-item2.active {
-		color: #E8101E;
-		font-weight: 500;
-		background: #FEE5E7;
-	}
+    &.active {
+        color: #ff4767;
+        font-weight: 500;
+        background: #fee5e7;
+    }
+}
 
+/* 数据列表及卡片外框样式 */
+.order-item-wrap {
+    background-color: #FAFAFA;
+    overflow: hidden;
+}
 
+.noDataBox {
+    background-color: transparent;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
 
-	/* 订单列表 */
-	.order-scroll {
-		padding: 0 20rpx 24rpx;
-		margin-top: 24rpx;
-		height: calc(100vh - 112rpx - 24rpx);
-		box-sizing: border-box;
-	}
+/* 未登录状态的样式 */
+.nologin_part {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+}
 
-	.order-item {
-		background-color: #FFFFFF;
-		border-radius: 16rpx;
-		margin-bottom: 24rpx;
-		padding: 20rpx;
-		box-sizing: border-box;
-	}
+.nologin_icon {
+    width: 422rpx;
+    height: 378rpx;
+}
 
-	.order-header {
-		display: flex;
-		align-items: center;
-		margin-bottom: 34rpx;
-	}
+::v-deep .list-scroll {
+    margin-top: 0 !important;
+    box-sizing: border-box;
+    /* padding-top: 24rpx; */
+}
 
-	.order-tag {
-		padding: 2rpx 6rpx;
-		background: #E8101E;
-		border-radius: 6rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-right: 10rpx;
-	}
+.nodatamit {
+    background-color: #FAFAFA;
+}
 
-	.order-tag-text {
-		font-weight: 400;
-		font-size: 20rpx;
-		color: #FFFFFF;
-		line-height: 25rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.order-number {
-		flex: 1;
-		font-size: 24rpx;
-		color: #666666;
-	}
-
-	.order-status {
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #E8101E;
-		line-height: 39rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.status-pending {
-		color: #E8101E;
-	}
-
-	.status-cancelled {
-		color: #E8101E;
-	}
-
-	.status-completed {
-		color: #E8101E;
-	}
-
-	.order-content {
-		display: flex;
-		margin-bottom: 24rpx;
-	}
-
-	.service-image {
-		width: 182rpx;
-		height: 182rpx;
-		border-radius: 16rpx;
-		margin-right: 24rpx;
-		background-color: #000000;
-	}
-
-	.service-info {
-		flex: 1;
-	}
-
-	.service-name {
-		width: 400rpx;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-		display: flex;
-		align-items: center;
-
-		.service-name-type {
-			height: 28rpx;
-			margin-right: 10rpx;
-		}
-
-		.service-name-text {
-			flex: 1;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-	}
-
-	.service-time,
-	.service-address {
-		display: flex;
-		align-items: center;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-		margin-top: 6rpx;
-	}
-
-	.service-time {
-		margin-top: 16rpx;
-	}
-
-	.time-icon,
-	.location-icon {
-		width: 24rpx;
-		height: 24rpx;
-		margin-right: 4rpx;
-		flex-shrink: 0;
-	}
-
-	.order-actions {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		border-top: 1rpx solid #EEEEEE;
-		padding-top: 24rpx;
-	}
-
-	.delete-icon {
-		width: 36rpx;
-		height: 40rpx;
-	}
-
-	.action-left {
-		display: flex;
-		align-items: center;
-	}
-
-	.action-right {
-		display: flex;
-		align-items: center;
-		padding: 4rpx 0;
-		gap: 18rpx;
-	}
-
-	.action-btn {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 129rpx;
-		height: 56rpx;
-		border-radius: 32rpx;
-		border: 2rpx solid #979797;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #333333;
-		line-height: 33rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.action-btn.contact {
-		background-color: #FFFFFF;
-		border: 1rpx solid #999999;
-		color: #333333;
-	}
-
-	.action-btn.primary {
-		background-color: #E8101E;
-		color: #FFFFFF;
-	}
-
-	.action-btn.review {
-		border-color: transparent;
-		background: linear-gradient(143deg, #F52540 0%, #E8101E 100%);
-		color: #FFFFFF;
-	}
-
-	.action-btn.again {
-		background-color: #FFFFFF;
-		border: 1rpx solid #999999;
-		color: #666666;
-	}
-
-	.nologin_part {
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.nologin_icon {
-		width: 360rpx;
-		height: 360rpx;
-		margin-top: 100rpx;
-		margin-bottom: 40rpx;
-	}
-
-	.btn-login {
-		width: 200rpx;
-		height: 68rpx;
-		background-color: yellowgreen;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.login-text {
-		font-size: 36rpx;
-		color: #fff;
-		text-shadow:
-			1px 1px 1px #919191,
-			2px 2px 1px #919191,
-			2px 3px 1px #919191,
-			2px 4px 1px #919191,
-			2px 5px 1px #919191,
-			2px 6px 1px #919191,
-			2px 7px 2px rgba(16, 16, 16, 0.4);
-	}
-
-	/* 加载更多 */
-	.loading-more,
-	.no-more {
-		text-align: center;
-		font-size: 26rpx;
-		color: #999999;
-		padding: 24rpx 0;
-	}
-
-	/* #ifdef APP-PLUS */
-	/* APP端权限弹窗位置适配 */
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-		opacity: 1;
-		visibility: visible;
-	}
-
-	/* #endif */
-
-	.service-group {
-		display: flex;
-		flex-wrap: wrap;
-		align-content: space-between;
-		flex: 1;
-		margin-top: 16rpx;
-
-		.service-group-time {
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #999999;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-			width: 100%;
-		}
-
-		.service-group-price {
-			margin-top: 56rpx;
-			font-family: DINPro, DINPro;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #E8101E;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-		}
-	}
-</style>
\ No newline at end of file
+.status-gap {
+    background-color: #FAFAFA;
+    height: 20rpx;
+}
+</style>
diff --git a/pages/promotion/components/serveList.vue b/pages/promotion/components/serveList.vue
index 4944d73..1febc7b 100644
--- a/pages/promotion/components/serveList.vue
+++ b/pages/promotion/components/serveList.vue
@@ -15,7 +15,7 @@
 							<view>
 								<view class="serve-card-right__content__title">{{item.title}}</view>
 								<view class="serve-card-right__content__price"><text
-										style="color: #E8101E;font-weight: 500;">¥{{item.server_price}} </text> {{' '}}|
+										style="color: #FF4767;font-weight: 500;">¥{{item.server_price}} </text> {{' '}}|
 									{{item.server_time}}分钟
 								</view>
 							</view>
diff --git a/pages/promotion/effect.vue b/pages/promotion/effect.vue
index b79bf9a..4106206 100644
--- a/pages/promotion/effect.vue
+++ b/pages/promotion/effect.vue
@@ -25,7 +25,7 @@
 								<text class="service-name">{{ item.server_title }}</text>
 								<text class="order-time">下单时间：{{ item.pay_time }}</text>
 								<text class="order-status">
-									订单状态：<text style="color: #E8101E;">{{ getDescriptionByNumber(item.state) }}</text>
+									订单状态：<text style="color: #FF4767;">{{ getDescriptionByNumber(item.state) }}</text>
 								</text>
 							</view>
 						</view>
diff --git a/pages/promotion/promotion.vue b/pages/promotion/promotion.vue
index 6337d93..6b7dc5d 100644
--- a/pages/promotion/promotion.vue
+++ b/pages/promotion/promotion.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="promotion">
 		<custom-navbar title="推广服务" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"
 			borderBottom="none"></custom-navbar>
 		<view class="promotion-search">
 			<view class="promotion-add">
@@ -224,7 +224,7 @@
 <style lang="less">
 	.promotion {
 		.promotion-search {
-			background: linear-gradient(134deg, #f52540 0%, #e8101e 100%);
+			background: linear-gradient(134deg, #f52540 0%, #FF4767 100%);
 			box-sizing: border-box;
 			padding: 31rpx 20rpx 60rpx 20rpx;
 
@@ -292,7 +292,7 @@
 					position: relative;
 
 					&.active {
-						color: #E8101E;
+						color: #FF4767;
 
 						&::after {
 							content: '';
@@ -325,7 +325,7 @@
 						width: 100%;
 						font-weight: 400;
 						font-size: 22rpx;
-						color: #E8101E;
+						color: #FF4767;
 						line-height: 30rpx;
 						text-align: left;
 						font-style: normal;
@@ -374,7 +374,7 @@
 								border: 1rpx solid rgba(232, 16, 30, 0.2);
 								font-weight: 400;
 								font-size: 24rpx;
-								color: #E8101E;
+								color: #FF4767;
 								line-height: 33rpx;
 								text-align: left;
 								font-style: normal;
@@ -398,7 +398,7 @@
 								font-family: DINPro, DINPro;
 								font-weight: 500;
 								font-size: 36rpx;
-								color: #E8101E;
+								color: #FF4767;
 								line-height: 46rpx;
 								text-align: left;
 								font-style: normal;
@@ -468,12 +468,12 @@
 		}
 
 		.closeModal {
-			border: 2rpx solid #E8101E;
-			color: #E8101E;
+			border: 2rpx solid #FF4767;
+			color: #FF4767;
 		}
 
 		.sureModal {
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 40rpx;
 			color: #FFFFFF;
 		}
diff --git a/pages/promotion/selectServe.vue b/pages/promotion/selectServe.vue
index a1c288f..521958e 100644
--- a/pages/promotion/selectServe.vue
+++ b/pages/promotion/selectServe.vue
@@ -2,7 +2,7 @@
 	<view class="select-serve">
 		<custom-navbar title="选择服务" backgroundColor="#FFFFFF"></custom-navbar>
 		<view class="select-tip">
-			<text style="color: #E8101E;">温馨提示：</text>您可自主勾选需推广的服务，灵活设置「比例」形式的推广佣金；
+			<text style="color: #FF4767;">温馨提示：</text>您可自主勾选需推广的服务，灵活设置「比例」形式的推广佣金；
 			配置完成后，服务将自动进入推广平台曝光，触达更多潜在客户；后续通过推广渠道（如达人链接、分享码）成功成交的订单，
 			系统会从该笔订单中，自动扣除您预设的佣金，全程无需手动操作。
 		</view>
@@ -85,7 +85,7 @@
 			&__btn {
 				width: 690rpx;
 				height: 78rpx;
-				background: #E8101E;
+				background: #FF4767;
 				border-radius: 798rpx;
 				display: flex;
 				align-items: center;
diff --git a/pages/promotion/setUpServe.vue b/pages/promotion/setUpServe.vue
index 0a06605..35f8dac 100644
--- a/pages/promotion/setUpServe.vue
+++ b/pages/promotion/setUpServe.vue
@@ -2,7 +2,7 @@
 	<view class="select-serve">
 		<custom-navbar title="设置佣金" backgroundColor="#FFFFFF"></custom-navbar>
 		<view class="select-tip">
-			<text style="color: #E8101E;">温馨提示：</text>支持 快速设置“百分比”（如每单返 2%）佣金，成功成交的订单，系统会按照实付金额*佣金比例进行扣减。
+			<text style="color: #FF4767;">温馨提示：</text>支持 按1%~30%区间设置佣金比例，订单成功成交后，系统将按实付金额 × 佣金比例自动扣减。
 		</view>
 		<view v-for="(item,index) in selectedItems" :key="index" class="serve-card">
 			<image :src="item.photo[0]" mode="aspectFill" class="serve-card__img"></image>
@@ -34,7 +34,7 @@
 
 		<uv-modal ref="modal" title="提示" width="620rpx">
 			<view class="slot-content">
-				预估佣金按<text style="color: #E8101E;">「订单实付金额 × 佣金比例」</text>计算。因服务实付金额受活动参与程度影响存在波动，最终佣金以订单实际结算结果为准。
+				预估佣金按<text style="color: #FF4767;">「订单实付金额 × 佣金比例」</text>计算。因服务实付金额受活动参与程度影响存在波动，最终佣金以订单实际结算结果为准。
 			</view>
 			<template v-slot:confirmButton>
 				<view type="default" @click="closeModal" class="closeModal">确定</view>
@@ -271,7 +271,7 @@
 					font-family: DINPro, DINPro;
 					font-weight: 500;
 					font-size: 22rpx;
-					color: #E8101E;
+					color: #FF4767;
 					line-height: 34rpx;
 					text-align: left;
 					font-style: normal;
@@ -328,7 +328,7 @@
 			&__btn {
 				width: 690rpx;
 				height: 78rpx;
-				background: #E8101E;
+				background: #FF4767;
 				border-radius: 798rpx;
 				display: flex;
 				align-items: center;
@@ -347,7 +347,7 @@
 	.closeModal {
 		width: 556rpx;
 		height: 80rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 40rpx;
 		font-weight: 500;
 		font-size: 28rpx;
diff --git a/pages/ruzhu/complete.vue b/pages/ruzhu/complete.vue
index 220fef5..41d1c7f 100644
--- a/pages/ruzhu/complete.vue
+++ b/pages/ruzhu/complete.vue
@@ -1386,7 +1386,7 @@
 	.title-bar {
 		width: 6rpx;
 		height: 48rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		margin-right: 16rpx;
 		border-radius: 3rpx;
 	}
@@ -1585,7 +1585,7 @@
 
 	.promise-title {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 400;
 		margin-bottom: 24rpx;
 		text-align: center;
@@ -1603,7 +1603,7 @@
 		width: 12rpx;
 		height: 12rpx;
 		border-radius: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		margin-right: 24rpx;
 	}
 
@@ -1711,8 +1711,8 @@
 	}
 
 	.checkbox.checked {
-		background-color: #E8101E;
-		border-color: #E8101E;
+		background-color: #FF4767;
+		border-color: #FF4767;
 	}
 
 	.check-icon {
@@ -1745,7 +1745,7 @@
 	}
 
 	.popup-btn.confirm {
-		background: linear-gradient(90deg, #E8101E 0%, #FF618F 100%);
+		background: linear-gradient(90deg, #FF4767 0%, #FF618F 100%);
 	}
 
 	.popup-btn .btn-text {
@@ -1783,7 +1783,7 @@
 	}
 
 	.region-tab.active {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -1795,7 +1795,7 @@
 		transform: translateX(-50%);
 		width: 40rpx;
 		height: 4rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 2rpx;
 	}
 
@@ -1858,7 +1858,7 @@
 
 	.confirm-text {
 		font-size: 32rpx;
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -1900,7 +1900,7 @@
 	}
 
 	.time-block.active .time-value {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.time-separator {
diff --git a/pages/ruzhu/qualification_sj copy.vue b/pages/ruzhu/qualification_sj copy.vue
new file mode 100644
index 0000000..b407e4c
--- /dev/null
+++ b/pages/ruzhu/qualification_sj copy.vue	
@@ -0,0 +1,2076 @@
+<template>
+  <view class="store-info-page">
+    <!-- 门店信息标题 -->
+    <view class="section-title">
+      <view class="title-bar"></view>
+      <text>门店信息</text>
+    </view>
+
+    <!-- 店铺logo -->
+    <view class="form-item box-cont">
+        <view class="label-wrapper">
+            <text class="label required">店铺logo</text>
+            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('head_photo')"></image>
+        </view>
+      <view class="upload-box" @click="chooseImage('head_photo')">
+        <image v-if="formData.head_photo" :src="formData.head_photo" mode="aspectFill" class="logo-image"></image>
+        <view class="upload-placeholder" v-else>
+          <image src="/static/images/upload-img.png" mode="aspectFit" class="upload-icon"></image>
+        </view>
+      </view>
+    </view>
+
+    <!-- 店铺名称 -->
+    <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+            <text class="label required">店铺名称</text>
+            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('name')"></image>
+        </view>
+      <input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" 
+             placeholder-class="placeholder" class="input" 
+             @input="saveFormDataToLocalDebounce" />
+    </view>
+
+    <!-- 营业时间 -->
+    <view class="form-item-two box-cont" @click="openTimePicker">
+      <text class="label required">营业时间</text>
+      <view class="picker-content">
+        <text :class="formData.business_time ? 'picker-value' : 'placeholder'">
+          {{formData.business_time || '请输入营业时间'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view>
+
+    <!-- 服务技能 -->
+    <view class="form-item-two box-cont" @click="showServicePopup">
+      <text class="label required">服务技能（多选）</text>
+      <view class="picker-content">
+        <text :class="formData.servers_kill.length > 0 ? 'picker-value' : 'placeholder'" v-if="formData.servers_kill">
+          {{selectedServicesText || '请选择'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view>
+
+    <!-- 门店所在地 -->
+    <view class="form-item-two box-cont" @click="showLocationPopup">
+      <text class="label required">门店所在地：</text>
+      <view class="picker-content">
+        <text :class="formData.dependency ? 'picker-value' : 'placeholder'">
+          {{formData.dependency || '请选择'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view>
+
+    <!-- 门店详细地址 -->
+    <view class="form-item-two box-cont" @click="getAddressInfo">
+      <text class="label required">门店详细地址：</text>
+      <view class="picker-content">
+        <text :class="formData.address ? 'picker-value' : 'placeholder'">
+          {{formData.address || '请选择'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view>
+
+    <!-- 其他信息标题 -->
+    <view class="section-title">
+      <view class="title-bar"></view>
+      <text>其他信息</text>
+    </view>
+
+    <!-- 获取消息方式 -->
+    <!-- <view class="form-item-two box-cont" @click="openMessageMethodPicker">
+      <text class="label required">获取消息方式：</text>
+      <view class="picker-content">
+        <text :class="formData.apply_state ? 'picker-value' : 'placeholder'">
+          {{messageMethodText || '请选择'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view> -->
+
+    <!-- 邀请码 -->
+    <view class="form-item-one-yqr box-cont invite-code-container">
+        <view class="invite-code-top">
+            <view class="label-wrapper">
+              <text class="label required">邀请码</text>
+            </view>
+            <input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码" 
+                  placeholder-class="placeholder" class="input" 
+                  @input="handleInviteCodeInput" />
+        </view>
+        
+        <!-- 分割线 -->
+        <view class="divider"></view>
+        
+        <!-- 邀请人信息 -->
+        <view class="invite-info-container">
+          <!-- 默认提示 -->
+          <text v-if="!formData.invite_code_other" class="invite-tip">
+            请填写邀请人的邀请码，若没有邀请人请填写13131313
+          </text>
+          
+          <!-- 验证中 -->
+          <view v-else-if="inviteCodeValidating" class="invite-validating">
+            <text>验证中...</text>
+          </view>
+          
+          <!-- 验证失败 -->
+          <view v-else-if="inviteCodeError" class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
+            <text>邀请码无效</text>
+          </view>
+          
+          <!-- 特殊邀请码13131313 -->
+          <view v-else-if="formData.invite_code_other === '13131313' && !inviterInfo" class="invite-tip">
+            请填写邀请人的邀请码，若没有邀请人请填写13131313
+          </view>
+          
+          <!-- 显示邀请人信息 -->
+          <view v-else-if="inviterInfo" class="inviter-info">
+            <text class="inviter-label">邀请人：</text>
+            <text class="inviter-name">{{ inviterInfo.name || inviterInfo.nick_name }}</text>
+            <text class="inviter-divider">/</text>
+            <text class="inviter-phone">{{ inviterInfo.account }}</text>
+          </view>
+          
+          <!-- 其他情况（接口返回成功但没有认证铁军的邀请码） -->
+          <view v-else class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
+              <text>邀请码无效</text>
+          </view>
+        </view>
+    </view>
+
+    <!-- 专业经验 -->
+    <view class="form-item-two box-cont" @click="openExperiencePicker">
+      <text class="label required">专业经验：</text>
+      <view class="picker-content">
+        <text :class="formData.major ? 'picker-value' : 'placeholder'">
+          {{experienceText || '请选择'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view>
+
+    <!-- 服务技能弹出框 -->
+    <view class="popup" :class="{ show: showServicePopupFlag }">
+      <view class="popup-mask" @click="hideServicePopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择服务技能</text>
+          <text class="popup-close" @click="hideServicePopup">×</text>
+        </view>
+        <view class="popup-body">
+          <view class="checkbox-list">
+            <view class="checkbox-item" v-for="(item, index) in serviceList" :key="index"
+                  @click="toggleServiceSelect(index)">
+              <view class="checkbox" :class="{ checked: item.checked }">
+                <image v-if="item.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png" mode="aspectFit"></image>
+              </view>
+              <text class="checkbox-label">{{item.title}}</text>
+            </view>
+          </view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideServicePopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmServiceSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 所在地选择弹出框 -->
+    <view class="popup" :class="{ show: showLocationPopupFlag }">
+      <view class="popup-mask" @click="hideLocationPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择所在地</text>
+          <text class="popup-close" @click="hideLocationPopup">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view @change="bindChangeLocation" class="picker-scroll"
+                      :indicator-style="indicatorStyle" :value="locationValue">
+            <picker-view-column>
+              <view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">
+                {{item.province}}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">
+                {{item.city}}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item,index) in locationAreas" :key="index">
+                {{item.area}}
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideLocationPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmLocationSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 营业时间选择器 -->
+    <view class="popup" :class="{ show: showTimePicker }">
+      <view class="popup-mask" @click="hideTimePopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="cancel-text" @click="hideTimePopup">取消</text>
+          <text class="title">选择营业时间</text>
+          <text class="confirm-text" @click="confirmTime">确定</text>
+        </view>
+        <view class="time-range">
+          <view class="time-block" :class="{ active: timeType === 'start' }"
+                @click="switchTimeType('start')">
+            <text class="time-value">{{formatTime(startTime)}}</text>
+            <text class="time-label">开始时间</text>
+          </view>
+          <text class="time-separator">至</text>
+          <view class="time-block" :class="{ active: timeType === 'end' }"
+                @click="switchTimeType('end')">
+            <text class="time-value">{{formatTime(endTime)}}</text>
+            <text class="time-label">结束时间</text>
+          </view>
+        </view>
+        <view class="region-body">
+          <picker-view :value="pickerValue" @change="handleTimeChange" class="picker-scroll"
+                      :indicator-style="indicatorStyle">
+            <picker-view-column>
+              <view class="picker-item" v-for="(hour, index) in hours" :key="index">
+                {{hour}}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
+                {{minute}}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item">-</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(hour, index) in hours" :key="index">
+                {{hour}}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
+                {{minute}}
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 提示信息弹窗 -->
+    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+      <view class="tip-popup-mask" @click="hideTipPopup"></view>
+      <view class="tip-popup-content">
+        <!-- 弹窗背景图片 -->
+        <image class="tip-popup-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770" mode="aspectFit"></image>
+        
+        <!-- 弹窗内容 -->
+        <view class="tip-popup-body">
+          <view class="tip-title">{{ tipTitle }}</view>
+          <view class="tip-image-container">
+            <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
+          </view>
+          <view class="tip-buttons">
+            <view class="tip-btn cancel" @click="hideTipPopup">
+              <text class="btn-text">取消</text>
+            </view>
+            <view class="tip-btn confirm" @click="hideTipPopup">
+              <text class="btn-text">我已了解</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import ChinaCitys from '../../static/data/ChinaCitys.json';
+import { debounce } from '@/utils/debounce.js';
+
+export default {
+  data() {
+    const loadedData = this.loadFormDataFromLocal();
+    
+    return {
+      formData: loadedData || {
+        head_photo: '',
+        name: '',
+        business_time: '',
+        servers_kill: [],
+        dependency: '',
+        address: '',
+        apply_state: '',
+        invite_code_other: '',
+        major: '',
+        dependency_code: '',        // 区code
+        dependency_province: '',    // 省code  
+        dependency_city: '',        // 市code
+        longitude: '',              // 经度
+        latitude: '',               // 纬度
+      },
+      ChinaCitys: ChinaCitys,
+      locatinCitys: [],
+      locationAreas: [],
+      locationValue: [0, 0, 0],
+      showServicePopupFlag: false,
+      serviceList: [],
+      selectedServicesText: '',
+      showLocationPopupFlag: false,
+      showTimePicker: false,
+      pickerValue: [8, 0, 0, 18, 0],
+      hours: Array.from({ length: 24 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
+      minutes: Array.from({ length: 60 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
+      timeType: 'start',
+      indicatorStyle: 'height: 68rpx;',
+      messageMethodText: '',
+      experienceText: '',
+      showTipPopupFlag: false,
+      tipTitle: '',
+      tipImage: '',
+      currentTipType: '',
+      userId: null,
+      identity: 2,
+      tipImagesPreloaded: false,
+      tipPopupBg: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770',
+      
+      // 邀请码相关字段
+      inviteCodeValidating: false,
+      inviteCodeError: false,
+      inviterInfo: null,
+      currentValidatingCode: '',
+      
+      fromAddressPage: false,
+      addressListener: null,
+
+      // 抖动效果控制
+      shakeInviteError: false,
+
+      inviteValidationTimer: null, // 邀请码验证定时器
+    }
+  },
+  
+  computed: {
+    startTime() {
+      return {
+        hour: this.hours[this.pickerValue[0]],
+        minute: this.minutes[this.pickerValue[1]]
+      }
+    },
+    endTime() {
+      return {
+        hour: this.hours[this.pickerValue[3]],
+        minute: this.minutes[this.pickerValue[4]]
+      }
+    }
+  },
+  
+  watch: {
+    'name'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.head_photo'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.invite_code_other'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.address'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    }
+  },
+  
+  onLoad() {
+    uni.$on('address-selected-for-sj', (addressData) => {
+      this.handleAddressSelected(addressData);
+    });
+  },
+
+  onUnload() {
+    uni.$off('address-selected-for-sj');
+  },
+  
+  mounted() {
+    this.getUserInfo();
+    this.preloadTipImages();
+
+    this.locatinCitys = this.ChinaCitys[0].citys;
+    this.locationAreas = this.locatinCitys[0].areas;
+    this.loadServiceSkills();
+    this.updateSelectedServicesText();
+
+    // 初始化消息方式和专业经验显示文本
+    if (this.formData.apply_state) {
+      const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
+      this.messageMethodText = methods[this.formData.apply_state - 1] || '';
+    }
+    
+    if (this.formData.major) {
+      const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+      this.experienceText = experiences[this.formData.major - 1] || '';
+    }
+    
+    this.setupAddressListener();
+    
+    if (this.formData.invite_code_other) {
+      this.validateInviteCode(this.formData.invite_code_other);
+    }
+  },
+
+  beforeDestroy() {
+    if (this.addressListener) {
+      uni.$off('address-selected', this.addressListener);
+    }
+  },
+
+  onShow() {
+    this.checkAddressData();
+    
+    const localData = this.loadFormDataFromLocal();
+    if (localData) {
+      Object.assign(this.formData, localData);
+
+      // 立即更新显示文本（即使在 serviceList 加载完成前）
+      this.updateSelectedServicesTextImmediately();
+
+      // 恢复服务技能的选中状态
+      if (this.serviceList.length > 0) {
+        this.restoreServiceSkillsSelection();
+      }
+      
+      // 恢复获取消息方式的显示文本
+      if (this.formData.apply_state) {
+        const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
+        this.messageMethodText = methods[this.formData.apply_state - 1] || '';
+      }
+      
+      // 恢复专业经验的显示文本
+      if (this.formData.major) {
+        const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+        this.experienceText = experiences[this.formData.major - 1] || '';
+      }
+
+    }
+
+    // 重新从本地存储加载邀请码验证状态
+    this.loadInviteStateFromLocal();
+    
+    this.checkGlobalData();
+
+    // 邀请码验证
+    if (this.formData.invite_code_other) {
+      this.validateInviteCode(this.formData.invite_code_other);
+    }
+  },
+
+  onHide() {
+    this.saveFormDataToLocal();
+  },
+  
+  onUnload() {
+    this.saveFormDataToLocal();
+  },
+  
+  methods: {
+    // 邀请码相关方法
+    // 从本地存储加载邀请码验证状态
+    loadInviteStateFromLocal() {
+      try {
+        const inviteState = uni.getStorageSync('store_invite_state');
+        if (inviteState) {
+          console.log('加载邀请码验证状态:', inviteState);
+          
+          // 恢复邀请码验证状态
+          this.inviterInfo = inviteState.inviterInfo || null;
+          this.inviteCodeError = inviteState.inviteCodeError || false;
+          this.currentValidatingCode = inviteState.currentValidatingCode || '';
+          
+          // 特殊处理：如果当前邀请码是13131313，确保状态正确
+          if (this.formData.invite_code_other === '13131313') {
+            console.log('检测到特殊邀请码13131313，重置验证状态');
+            this.inviteCodeError = false;
+            this.inviterInfo = null;
+            this.currentValidatingCode = '13131313';
+          }
+          
+          // 如果正在验证的邀请码与当前表单中的一致，保持验证状态
+          if (this.currentValidatingCode === this.formData.invite_code_other) {
+            // 状态已恢复，无需额外操作
+          } else {
+            // 如果不一致，重新验证
+            if (this.formData.invite_code_other && this.formData.invite_code_other.trim() !== '') {
+              console.log('邀请码不一致，重新验证:', this.formData.invite_code_other);
+              this.handleInviteCodeInput({ detail: { value: this.formData.invite_code_other } });
+            }
+          }
+        } else {
+          // 如果没有保存的状态，重置为初始状态
+          this.resetInviteCodeState();
+        }
+      } catch (e) {
+        console.log('加载邀请码验证状态失败:', e);
+        this.resetInviteCodeState();
+      }
+    },
+
+    // 新增方法：重置邀请码状态
+    resetInviteCodeState() {
+      this.inviteCodeValidating = false;
+      this.inviteCodeError = false;
+      this.inviterInfo = null;
+      this.currentValidatingCode = '';
+      this.shakeInviteError = false;
+    },
+
+    // 新增方法：专门保存邀请码验证状态
+    saveInviteStateToLocal() {
+      try {
+        const inviteState = {
+          inviterInfo: this.inviterInfo,
+          inviteCodeError: this.inviteCodeError,
+          currentValidatingCode: this.currentValidatingCode || this.formData.invite_code_other || ''
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+        
+        console.log('邀请码验证状态已保存:', {
+          hasInviterInfo: !!this.inviterInfo,
+          inviteCodeError: this.inviteCodeError,
+          currentValidatingCode: this.currentValidatingCode
+        });
+      } catch (e) {
+        console.log('保存邀请码验证状态失败:', e);
+      }
+    },
+    // 触发邀请码错误抖动效果
+    triggerInviteErrorShake() {
+      // 触发抖动效果
+      this.shakeInviteError = true;
+      
+      // 滚动到邀请码容器位置
+      this.$nextTick(() => {
+        // 使用uni.createSelectorQuery获取邀请码容器的位置
+        const query = uni.createSelectorQuery().in(this);
+        query.select('.invite-code-container').boundingClientRect((rect) => {
+          if (rect) {
+            // 获取当前窗口高度
+            const windowHeight = uni.getSystemInfoSync().windowHeight;
+            
+            // 判断邀请码容器是否已经在可视区域内
+            // 计算容器在屏幕中的位置比例（0-1之间）
+            const containerTopRatio = rect.top / windowHeight;
+            const containerBottomRatio = (rect.top + rect.height) / windowHeight;
+            
+            // 如果容器已经在屏幕中上部（顶部在屏幕中间以上），就不需要滚动
+            // 或者容器整体都在屏幕内，也不需要滚动
+            if (containerTopRatio >= 0 && containerTopRatio < 0.7 && 
+                containerBottomRatio <= 1) {
+              console.log('邀请码容器已在可视区域内，不需要滚动');
+              return;
+            }
+            
+            // 滚动到邀请码容器位置，减去一些偏移量让用户体验更好
+            uni.pageScrollTo({
+              scrollTop: rect.top - 50,
+              duration: 300
+            });
+          }
+        }).exec();
+      });
+
+      // 0.5秒后重置抖动状态
+      setTimeout(() => {
+        this.shakeInviteError = false;
+      }, 500);
+    },
+    
+    // 处理邀请码输入
+    handleInviteCodeInput(e) {
+      const code = e.detail ? e.detail.value : this.formData.invite_code_other;
+      
+      console.log('邀请码输入:', code);
+      
+      // 立即重置状态
+      this.inviteCodeValidating = false;
+      this.inviteCodeError = false;
+      this.inviterInfo = null;
+      
+      // 如果邀请码为空，不进行验证
+      if (!code || code.trim() === '') {
+        this.formData.invite_code_other = '';
+        this.saveFormDataToLocalDebounce();
+        // 保存空状态
+        this.saveInviteStateToLocal();
+        return;
+      }
+      
+      this.formData.invite_code_other = code;
+      this.saveFormDataToLocalDebounce();
+      
+      // 【关键修复】如果是13131313，立即通过验证并取消任何正在进行的验证
+      if (code === '13131313') {
+        console.log('检测到特殊邀请码13131313，立即通过');
+        
+        // 清除任何可能的定时器
+        if (this.inviteValidationTimer) {
+          clearTimeout(this.inviteValidationTimer);
+          this.inviteValidationTimer = null;
+        }
+        
+        // 立即更新状态
+        this.inviteCodeValidating = false;
+        this.inviteCodeError = false;
+        this.inviterInfo = null;
+        this.currentValidatingCode = code;
+        
+        // 特殊邀请码也需要保存状态
+        const inviteState = {
+          inviterInfo: null,
+          inviteCodeError: false,
+          currentValidatingCode: code
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+        
+        // 强制更新视图
+        this.$forceUpdate();
+        return;
+      }
+      
+      // 记录当前正在验证的邀请码
+      this.currentValidatingCode = code;
+      
+      // 立即保存状态（验证中）
+      this.saveInviteStateToLocal();
+      
+      // 清除之前的定时器
+      if (this.inviteValidationTimer) {
+        clearTimeout(this.inviteValidationTimer);
+        this.inviteValidationTimer = null;
+      }
+      
+      // 设置新的定时器
+      this.inviteValidationTimer = setTimeout(() => {
+        // 检查邀请码是否变化
+        if (this.formData.invite_code_other !== this.currentValidatingCode) {
+          console.log('邀请码已变化，取消验证');
+          return;
+        }
+        
+        // 再次检查是否是13131313（双重检查）
+        if (this.formData.invite_code_other === '13131313') {
+          console.log('双重检查：检测到特殊邀请码13131313');
+          this.inviteCodeValidating = false;
+          this.inviteCodeError = false;
+          this.inviterInfo = null;
+          this.currentValidatingCode = '13131313';
+          
+          const inviteState = {
+            inviterInfo: null,
+            inviteCodeError: false,
+            currentValidatingCode: '13131313'
+          };
+          uni.setStorageSync('store_invite_state', inviteState);
+          return;
+        }
+        
+        console.log('开始验证邀请码:', this.formData.invite_code_other);
+        this.validateInviteCode(this.formData.invite_code_other);
+        
+        // 清理定时器
+        this.inviteValidationTimer = null;
+      }, 600); // 适当增加延迟时间
+    },
+    
+    // 验证邀请码
+     async validateInviteCode(code) {
+      console.log('开始验证邀请码:', code);
+
+      // 特殊邀请码13131313直接通过
+      if (code === '13131313') {
+        console.log('特殊邀请码13131313，直接通过');
+        this.inviteCodeValidating = false;
+        this.inviteCodeError = false;
+        this.inviterInfo = null;
+        this.currentValidatingCode = code;
+        // 特殊邀请码也需要保存状态
+        const inviteState = {
+          inviterInfo: null,
+          inviteCodeError: false,
+          currentValidatingCode: code
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+
+        // 强制更新视图
+        this.$forceUpdate();
+        return;
+      }
+      
+      // 如果邀请码为空
+      if (!code || code.trim() === '') {
+        this.inviteCodeValidating = false;
+        this.inviteCodeError = false;
+        this.inviterInfo = null;
+        this.currentValidatingCode = '';
+        const inviteState = {
+          inviterInfo: null,
+          inviteCodeError: false,
+          currentValidatingCode: ''
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+        return;
+      }
+      
+      // 设置验证中状态
+      this.inviteCodeValidating = true;
+      this.inviteCodeError = false;
+      this.inviterInfo = null;
+      this.currentValidatingCode = code;
+      
+      try {
+        // 调用接口验证邀请码
+        const response = await request.post('/sj/user/getInvite', {
+          invite_code: code
+        });
+        
+        console.log('邀请码验证响应:', response);
+        
+        // 验证完成
+        this.inviteCodeValidating = false;
+        
+        if (response && response.code === 200 && response.data) {
+          const userData = response.data;
+
+          //检查返回的数据是否有效
+          if (userData.account) {
+              // 邀请码有效，保存邀请人信息
+              this.inviterInfo = userData;
+              this.inviteCodeError = false;
+              console.log('邀请码验证通过，邀请人:', userData);
+          } else {
+              // 接口返回数据但没有account字段，说明不是有效邀请人
+              console.log('接口返回数据无效，没有account字段:', userData);
+              this.inviterInfo = null;
+              this.inviteCodeError = true;
+          }
+        } else {
+          // 接口返回错误或数据为空
+          console.log('接口返回错误:', response?.msg || '未知错误');
+          this.inviterInfo = null;
+          this.inviteCodeError = true;
+        }
+      } catch (error) {
+        console.error('验证邀请码失败:', error);
+        this.inviteCodeValidating = false;
+        this.inviteCodeError = true;
+        this.inviterInfo = null;
+      } finally {
+        // 无论成功失败都保存状态
+        const inviteState = {
+          inviterInfo: this.inviterInfo,
+          inviteCodeError: this.inviteCodeError,
+          currentValidatingCode: this.currentValidatingCode
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+      }
+    },
+    
+    
+    // 从本地存储加载数据
+    loadFormDataFromLocal() {
+      try {
+        const stored = uni.getStorageSync('store_info_form_data');
+        if (stored) {
+          console.log('从本地存储加载门店数据:', stored);
+          
+          // 同时加载邀请码验证状态
+          const inviteState = uni.getStorageSync('store_invite_state');
+          if (inviteState) {
+            this.inviterInfo = inviteState.inviterInfo;
+            this.inviteCodeError = inviteState.inviteCodeError || false;
+            this.currentValidatingCode = inviteState.currentValidatingCode || '';
+            console.log('加载邀请码验证状态:', inviteState);
+          }
+          
+          return stored;
+        }
+      } catch (e) {
+        console.log('读取门店数据失败:', e);
+      }
+      return null;
+    },
+    
+    // 保存数据到本地存储
+    saveFormDataToLocal() {
+      try {
+        uni.setStorageSync('store_info_form_data', this.formData);
+
+        // 同时保存邀请码验证状态
+        const inviteState = {
+          inviterInfo: this.inviterInfo,
+          inviteCodeError: this.inviteCodeError,
+          currentValidatingCode: this.currentValidatingCode
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+        console.log('门店数据已保存到本地存储');
+      } catch (e) {
+        console.log('保存门店数据失败:', e);
+      }
+    },
+    
+    // 防抖保存
+    saveFormDataToLocalDebounce() {
+      // 使用debounce函数
+      if (!this._saveDebounce) {
+        this._saveDebounce = debounce(() => {
+          this.saveFormDataToLocal();
+        }, 500);
+      }
+      this._saveDebounce();
+    },
+    
+    // 清空本地存储
+    clearFormDataLocal() {
+      try {
+        uni.removeStorageSync('store_info_form_data');
+        console.log('已清空门店数据');
+      } catch (e) {
+        console.log('清空门店数据失败:', e);
+      }
+    },
+
+    // 立即更新已选择服务技能的显示文本（不依赖 serviceList）
+    updateSelectedServicesText() {
+      if (this.formData.servers_kill && this.formData.servers_kill.length > 0) {
+        if (this.serviceList.length > 0) {
+          const selectedServices = this.serviceList
+            .filter(item => this.formData.servers_kill.includes(item.id))
+            .map(item => {
+              item.checked = true;
+              return item.title;
+            });
+          this.selectedServicesText = selectedServices.join('、');
+        } else {
+          // serviceList 还未加载，显示数量
+          this.selectedServicesText = `已选择${this.formData.servers_kill.length}项`;
+        }
+      } else {
+        this.selectedServicesText = '';
+      }
+    },
+    
+
+    // 地址相关方法 
+
+    setupAddressListener() {
+      this.addressListener = (addressData) => {
+        this.handleAddressSelected(addressData);
+      };
+      uni.$on('address-selected', this.addressListener);
+    },
+    
+    // 检查地址数据
+    checkAddressData() {
+      try {
+        const sjAddress = uni.getStorageSync('sj_selected_address');
+        if (sjAddress) {
+          this.handleAddressSelected(sjAddress);
+          uni.removeStorageSync('sj_selected_address');
+          return;
+        }
+      } catch (e) {}
+      
+      if (getApp().globalData && getApp().globalData.selectedAddress) {
+        this.handleAddressSelected(getApp().globalData.selectedAddress);
+        delete getApp().globalData.selectedAddress;
+      }
+      
+      try {
+        const storedAddress = uni.getStorageSync('selectedAddress');
+        if (storedAddress) {
+          this.handleAddressSelected(storedAddress);
+          uni.removeStorageSync('selectedAddress');
+        }
+      } catch (e) {}
+    },
+    
+    // 处理地址选择结果
+    handleAddressSelected(addressData) {
+      if (!addressData) return
+
+      // 详细地址优先取 address，不再优先取完整地址 name
+      let detailAddress = ''
+      if (addressData.address) {
+        detailAddress = String(addressData.address).trim()
+      } else if (addressData.name) {
+        detailAddress = String(addressData.name).trim()
+
+        const regionParts = []
+        if (addressData.pname) regionParts.push(addressData.pname)
+        if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData.cityname)
+        if (addressData.adname) regionParts.push(addressData.adname)
+
+        const regionText = regionParts.join('')
+        const regionTextWithDash = regionParts.join('-')
+
+        if (regionText && detailAddress.indexOf(regionText) === 0) {
+          detailAddress = detailAddress.slice(regionText.length).trim()
+        } else if (regionTextWithDash && detailAddress.indexOf(regionTextWithDash) === 0) {
+          detailAddress = detailAddress.slice(regionTextWithDash.length).trim()
+        }
+
+        detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim()
+      }
+
+      this.formData.address = detailAddress
+
+      if (addressData.location) {
+        const [longitude, latitude] = String(addressData.location).split(',')
+        this.formData.longitude = longitude || ''
+        this.formData.latitude = latitude || ''
+      }
+
+      if (addressData.pname || addressData.cityname || addressData.adname) {
+        const locationParts = []
+        if (addressData.pname) locationParts.push(addressData.pname)
+        if (addressData.cityname) locationParts.push(addressData.cityname)
+        if (addressData.adname) locationParts.push(addressData.adname)
+        this.formData.dependency = locationParts.join('-')
+      }
+
+      this.formData.dependency_province = addressData.provinceCode || ''
+      this.formData.dependency_city = addressData.cityCode || ''
+      this.formData.dependency_code = addressData.districtCode || ''
+
+      this.saveFormDataToLocal()
+      this.$forceUpdate()
+    },
+    
+    
+    // 检查全局数据
+    checkGlobalData() {
+      if (getApp().globalData.storeInfoData) {
+        Object.assign(this.formData, getApp().globalData.storeInfoData);
+        this.saveFormDataToLocal();
+        // delete getApp().globalData.storeInfoData;
+        getApp().globalData.qualificationData = null;
+      }
+    },
+    
+    // 更新已选择服务技能的显示文本
+    updateSelectedServicesText() {
+      if (this.formData.servers_kill && this.formData.servers_kill.length > 0 && this.serviceList.length > 0) {
+        const selectedServices = this.serviceList
+          .filter(item => this.formData.servers_kill.includes(item.id))
+          .map(item => {
+            item.checked = true;
+            return item.title;
+          });
+        this.selectedServicesText = selectedServices.join('、');
+      }
+    },
+    
+    // 获取用户信息
+    getUserInfo() {
+      request.post('/sj/User/getUser').then(result => {
+        this.userId = result.data.id;
+      })
+    },
+    
+    getFormData() {
+      return this.formData;
+    },
+    
+    // 预加载提示弹窗图片
+    preloadTipImages() {
+      const images = [
+        this.tipPopupBg, // 弹窗背景图片
+        'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9', // 店铺logo提示图片
+        'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'  // 店铺名称提示图片
+      ];
+      
+      console.log('开始预加载提示弹窗图片...');
+      
+      // 使用 Promise.all 确保所有图片都加载完成
+      const loadPromises = images.map(src => this.loadImage(src));
+      
+      Promise.all(loadPromises)
+        .then(() => {
+          console.log('所有提示弹窗图片预加载完成');
+          this.tipImagesPreloaded = true;
+        })
+        .catch(error => {
+          console.warn('部分图片预加载失败:', error);
+          // 即使部分图片加载失败，也设置为预加载完成，避免影响用户操作
+          this.tipImagesPreloaded = true;
+        });
+    },
+    
+    // 加载单个图片
+    loadImage(src) {
+      return new Promise((resolve, reject) => {
+        const img = new Image();
+        img.onload = () => {
+          console.log('图片加载成功:', src);
+          resolve();
+        };
+        img.onerror = () => {
+          console.warn('图片加载失败:', src);
+          reject(new Error(`图片加载失败: ${src}`));
+        };
+        img.src = src;
+      });
+    },
+    
+    // 显示提示弹窗
+    showTipPopup(field) {
+      const tipConfig = {
+        'head_photo': {
+          title: '如何查看店铺logo',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9'
+        },
+        'name': {
+          title: '如何查看店铺名称',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
+        }
+      };
+      
+      if (tipConfig[field]) {
+        this.currentTipType = field; // 设置当前类型
+        this.tipTitle = tipConfig[field].title;
+        this.tipImage = tipConfig[field].image;
+        // 等待图片预加载完成后再显示弹窗
+      if (this.tipImagesPreloaded) {
+        this.showTipPopupFlag = true;
+      } else {
+        // 如果图片还没预加载完成，立即加载当前图片
+        console.log('图片还未预加载完成，立即加载当前图片');
+        this.loadImage(this.tipImage).then(() => {
+          this.showTipPopupFlag = true;
+        }).catch(() => {
+          // 即使加载失败也显示弹窗，避免用户无法操作
+          this.showTipPopupFlag = true;
+        });
+      }
+    }
+  }, 
+    
+    // 隐藏提示弹窗
+    hideTipPopup() {
+      this.showTipPopupFlag = false;
+    },
+    
+    // 加载服务技能列表
+    async loadServiceSkills() {
+      try {
+        const res = await request.post('/sj/firstclass');
+        this.serviceList = res.data.map(item => ({
+          ...item,
+          checked: false
+        }));
+        // 加载完成后立即恢复选中状态
+        this.restoreServiceSkillsSelection();
+        // 再次更新显示文本，确保显示具体的技能名称
+        this.updateSelectedServicesText();
+      } catch (error) {
+        console.error('加载服务技能失败:', error);
+      }
+    },
+    
+    // 恢复服务技能选择状态
+    restoreServiceSkillsSelection() {
+      if (this.formData.servers_kill && this.formData.servers_kill.length > 0) {
+        this.serviceList.forEach(item => {
+          item.checked = this.formData.servers_kill.includes(item.id);
+        });
+        this.updateSelectedServicesText();
+      }
+    },
+    
+    // 选择图片
+    chooseImage(type) {
+      this.openCamera(type);
+    },
+    
+    async openCamera(type) {
+      try {
+        const chooseResult = await new Promise((resolve, reject) => {
+          uni.chooseImage({
+            count: 1,
+            sizeType: ['compressed'],
+            sourceType: ['album', 'camera'],
+            success: resolve,
+            fail: reject
+          });
+        });
+        
+        if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) {
+          return;
+        }
+        
+        const tempFilePath = chooseResult.tempFilePaths[0];
+        const file = { path: tempFilePath, size: 0 };
+        const result = await this.directUpload(file, this.userId, this.identity + 1);
+        
+        if (result) {
+          this.formData[type] = result;
+          this.saveFormDataToLocal();
+        }
+      } catch (err) {
+        console.log('上传图片错误:', err);
+      }
+    },
+    
+    // 直接上传方法
+    async directUpload(file, userId, type) {
+      try {
+        let date = new Date().getTime();
+        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
+        
+        let fileExtension = 'jpg';
+        if (file.path.includes('.')) {
+          let parts = file.path.split('.');
+          let ext = parts[parts.length - 1].toLowerCase();
+          if (ext && ext.length <= 4) {
+            fileExtension = ext;
+          }
+        }
+        
+        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
+        const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
+        
+        return await new Promise((resolve, reject) => {
+          uni.uploadFile({
+            url: ossConfig.host,
+            filePath: file.path,
+            name: 'file',
+            formData: {
+              key: ossConfig.dir + name,
+              policy: ossConfig.policy,
+              OSSAccessKeyId: ossConfig.ossAccessKeyId,
+              success_action_status: '200',
+              signature: ossConfig.signature
+            },
+            success: (res) => {
+              if (res.statusCode === 200) {
+                const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
+                resolve(fileUrl);
+              } else {
+                reject(new Error('上传失败'));
+              }
+            },
+            fail: reject
+          });
+        });
+      } catch (error) {
+        console.error('直接上传失败:', error);
+        throw error;
+      }
+    },
+    
+    // 打开时间选择器
+    openTimePicker() {
+      this.showTimePicker = true;
+    },
+    
+    // 隐藏时间选择器
+    hideTimePopup() {
+      this.showTimePicker = false;
+    },
+    
+    // 切换时间类型
+    switchTimeType(type) {
+      this.timeType = type;
+    },
+    
+    // 处理时间变化
+    handleTimeChange(e) {
+      const values = e.detail.value;
+      this.pickerValue = values;
+    },
+    
+    // 格式化时间显示
+    formatTime(time) {
+      return `${time.hour}:${time.minute}`;
+    },
+    
+    // 确认时间选择
+    confirmTime() {
+      this.formData.business_time = `${this.formatTime(this.startTime)}-${this.formatTime(this.endTime)}`;
+      this.saveFormDataToLocal();
+      this.hideTimePopup();
+    },
+    
+    // 显示服务技能弹出框
+    showServicePopup() {
+      this.showServicePopupFlag = true;
+    },
+    
+    // 隐藏服务技能弹出框
+    hideServicePopup() {
+      this.showServicePopupFlag = false;
+    },
+    
+    // 切换服务技能选择状态
+    toggleServiceSelect(index) {
+      this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
+    },
+    
+    // 确认服务技能选择
+    confirmServiceSelect() {
+      const selectedServices = this.serviceList
+        .filter(item => item.checked)
+        .map(item => item.title);
+      const selectedServicesId = this.serviceList
+        .filter(item => item.checked)
+        .map(item => item.id);
+        
+      if (selectedServices.length === 0) {
+        uni.showToast({ title: '请至少选择一个服务技能', icon: 'none' });
+        return;
+      }
+      
+      this.formData.servers_kill = selectedServicesId;
+      this.selectedServicesText = selectedServices.join('、');
+      this.saveFormDataToLocal();
+      this.hideServicePopup();
+    },
+    
+    // 显示所在地选择弹出框
+    showLocationPopup() {
+      this.showLocationPopupFlag = true;
+    },
+    
+    // 隐藏所在地选择弹出框
+    hideLocationPopup() {
+      this.showLocationPopupFlag = false;
+    },
+    
+    // 所在地选择变化
+    bindChangeLocation(e) {
+      this.locationValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.locatinCitys = this.ChinaCitys[index1].citys;
+      this.locationAreas = this.locatinCitys[index2].areas;
+    },
+    
+    // 确认所在地选择
+    confirmLocationSelect() {
+      let valueArr = this.locationValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+      let province = this.ChinaCitys[index1].province;
+      let city = this.locatinCitys[index2].city;
+      let area = this.locationAreas[index3].area;
+      this.formData.dependency = province + '-' + city + '-' + area;
+
+      // 清空详细地址，因为所在地已经改变
+      this.formData.address = '';
+      this.formData.longitude = '';
+      this.formData.latitude = '';
+      
+      if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+        let provinceCode = this.ChinaCitys[index1].code.toString();
+        this.formData.dependency_province = provinceCode.substring(0, 6);
+      }
+      if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
+        let cityCode = this.locatinCitys[index2].code.toString();
+        this.formData.dependency_city = cityCode.substring(0, 6);
+      }
+      if (this.locationAreas[index3] && this.locationAreas[index3].code) {
+        let areaCode = this.locationAreas[index3].code.toString();
+        this.formData.dependency_code = areaCode.substring(0, 6);
+      }
+      
+      this.saveFormDataToLocal();
+      this.hideLocationPopup();
+    },
+
+    buildRegionTextForSearch() {
+      const dependency = String(this.formData.dependency || '').trim()
+      if (!dependency) return ''
+
+      const parts = dependency.split('-')
+      const province = parts[0] || ''
+      const city = parts[1] || ''
+      const district = parts[2] || ''
+
+      let regionText = ''
+      if (province) regionText += province
+      if (city && city !== province) regionText += city
+      if (district) regionText += district
+
+      return regionText
+    },
+
+    getAddressValueForSearch() {
+      const rawAddress = String(this.formData.address || '').trim()
+      if (!rawAddress) return ''
+
+      const dependencyText = String(this.formData.dependency || '').trim()
+      const regionText = this.buildRegionTextForSearch()
+
+      let detail = rawAddress
+
+      // 兼容老数据里 address 被存成完整地址的情况
+      if (regionText && detail.indexOf(regionText) === 0) {
+        detail = detail.slice(regionText.length).trim()
+      } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+        detail = detail.slice(dependencyText.length).trim()
+      }
+
+      detail = detail.replace(/^[\s,-]+/, '').trim()
+
+      return detail || rawAddress
+    },
+    
+    // 获取详细地址
+    getAddressInfo() {
+      this.saveFormDataToLocal()
+
+      const dependency = String(this.formData.dependency || '').trim()
+      const dependencyCode = String(this.formData.dependency_code || '').trim()
+      const address = this.getAddressValueForSearch()
+      const longitude = String(this.formData.longitude || '').trim()
+      const latitude = String(this.formData.latitude || '').trim()
+
+      const hasDependency = !!dependency
+      const hasAddress = !!address
+      const hasLocation = !!(longitude && latitude)
+
+      let params = 'source=sj_info'
+
+      // 已选所在地时，继续把地区传过去
+      if (hasDependency) {
+        params += `&dependency=${encodeURIComponent(dependency)}`
+        if (dependencyCode) {
+          params += `&dependency_code=${dependencyCode}`
+        }
+      }
+
+      // 已有详细地址时，把纯详细地址传过去，不带省市区
+      if (hasAddress) {
+        params += `&address=${encodeURIComponent(address)}`
+      }
+
+      // 已有坐标时，继续用已有坐标定位
+      if (hasLocation) {
+        params += `&longitude=${longitude}&latitude=${latitude}`
+      }
+
+      // 完全空白进入时：
+      // 已授权 -> 搜索页按当前定位初始化
+      // 未授权/拒绝 -> 搜索页静默失败后保持所在地、详细地址都为空
+      if (!hasDependency && !hasAddress && !hasLocation) {
+        params += '&init_current_location=1&silent_locate=1'
+      }
+
+      console.log('跳转URL参数:', params)
+
+      uni.navigateTo({
+        url: `/pages/address/search?${params}`
+      })
+    },
+    
+    // 打开获取消息方式选择器
+    openMessageMethodPicker() {
+      uni.showActionSheet({
+        itemList: ['朋友圈', '抖音', '地推', '朋友介绍', '微博'],
+        success: (res) => {
+          const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
+          this.formData.apply_state = res.tapIndex + 1;
+          this.messageMethodText = methods[res.tapIndex];
+          this.saveFormDataToLocal();
+        }
+      });
+    },
+    
+    // 打开专业经验选择器
+    openExperiencePicker() {
+      uni.showActionSheet({
+        itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
+        success: (res) => {
+          const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+          this.formData.major = res.tapIndex + 1;
+          this.experienceText = experiences[res.tapIndex];
+          this.saveFormDataToLocal();
+        }
+      });
+    },
+    
+    // 保存表单数据（用于提交前验证）
+    saveFormData() {
+      // 验证必填字段
+      if (!this.formData.head_photo) {
+        uni.showToast({
+          title: '请上传店铺logo',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.name) {
+        uni.showToast({
+          title: '请输入店铺名称',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.business_time) {
+        uni.showToast({
+          title: '请选择营业时间',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (this.formData.servers_kill.length === 0) {
+        uni.showToast({
+          title: '请选择服务技能',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.dependency) {
+        uni.showToast({
+          title: '请选择门店所在地',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.address) {
+        uni.showToast({
+          title: '请选择门店详细地址',
+          icon: 'none'
+        });
+        return false;
+      }
+      // if (!this.formData.apply_state) {
+      //   uni.showToast({
+      //     title: '请选择获取消息方式',
+      //     icon: 'none'
+      //   });
+      //   return false;
+      // }
+      if (!this.formData.invite_code_other) {
+        uni.showToast({
+          title: '请输入邀请码',
+          icon: 'none'
+        });
+        return false;
+      }
+      
+      // 邀请码有效性验证
+      if (this.inviteCodeValidating) {
+        uni.showToast({ title: '邀请码验证中，请稍候', icon: 'none' });
+        return false;
+      }
+      
+      // 特殊邀请码13131313直接通过
+      if (this.formData.invite_code_other === '13131313') {
+        // 直接通过
+      } else if (this.inviteCodeError || !this.inviterInfo) {
+        // 邀请码无效，触发抖动效果
+        this.triggerInviteErrorShake();
+        return false;
+      }
+      
+      if (!this.formData.major) {
+        uni.showToast({
+          title: '请选择专业经验',
+          icon: 'none'
+        });
+        return false;
+      }
+
+      // 将数据保存到全局，以便在下一步使用
+      getApp().globalData.storeInfoData = this.formData;
+      return true;
+    }
+  }
+}
+</script>
+
+<style scoped>
+.store-info-page {
+  /* padding: 28rpx 0; */
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30rpx;
+}
+
+.title-bar {
+  width: 6rpx;
+  height: 30rpx;
+  background-color: #FF4767;
+  margin-right: 7rpx;
+  border-radius: 5rpx;
+}
+
+.section-title text {
+  font-size: 32rpx;
+  color: #1D2129;
+  font-weight: 500;
+}
+
+.box-cont {
+  background: #ffffff;
+  border-radius: 20rpx;
+  margin-bottom: 24rpx;
+  margin-left: 8rpx;
+  margin-right: 8rpx;
+  box-shadow: none;
+}
+
+.form-item {
+  padding: 24rpx;
+}
+
+.label {
+  display: block;
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.required::before {
+  content: '*';
+  color: #FF0000;
+  margin-right: 4rpx;
+}
+
+.upload-box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 160rpx;
+  border-radius: 20rpx;
+}
+
+.upload-placeholder {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.upload-icon {
+  width: 120rpx;
+  height: 120rpx;
+}
+
+.upload-text {
+  font-size: 24rpx;
+  color: #999999;
+}
+
+.logo-image {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 20rpx;
+}
+
+.form-item-one {
+  display: flex;
+  align-items: center;
+  padding: 24rpx;
+}
+
+.form-item-one-yqr {
+  flex-direction: column;
+  align-items: stretch;
+  padding: 0;
+}
+
+/* 创建内部的上半部分 */
+.invite-code-top {
+  display: flex;
+  align-items: center;
+  padding: 24rpx;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+/* 分割线 */
+.divider {
+  height: 1rpx;
+  background-color: #00000013;
+  width: 100%;
+}
+
+/* 邀请信息容器 */
+.invite-info-container {
+  padding: 20rpx 24rpx;
+  width: 100%;
+  box-sizing: border-box;
+  min-height: 60rpx;
+}
+
+.label-wrapper {
+  display: inline-flex;
+  align-items: center;
+}
+
+.label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  line-height: 1;
+}
+
+.label-icon {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 8rpx;
+  align-items: center;
+}
+
+.form-item-two {
+		display: flex;
+		align-items: flex-start;
+		justify-content: space-between;
+		padding: 24rpx;
+	}
+
+	/* 左侧标签：固定宽度，不换行 */
+	.form-item-two > text.label {
+		flex-shrink: 0;
+		font-size: 28rpx;
+		color: #333333;
+		font-weight: 500;
+	}
+
+.input {
+  flex: 1;
+  font-size: 28rpx;
+  color: #333333;
+  text-align: right;
+}
+
+.placeholder {
+  color: #999999;
+}
+
+.picker-content {
+  display: flex;
+  align-items: center;
+}
+
+.picker-value,
+	.placeholder {
+		flex: 1;               /* 占据剩余宽度 */
+		text-align: right;     /* 文字右对齐 */
+		font-size: 28rpx;
+		word-break: break-all;
+		white-space: normal;
+		line-height: 1.4;
+	}
+
+.arrow-right {
+  width: 14rpx;
+  height: 26rpx;
+  margin-left: 16rpx;
+  flex-shrink: 0;
+}
+
+/* 邀请码相关样式 */
+.invite-tip {
+  font-size: 24rpx;
+  color: #666666;
+}
+
+.invite-validating {
+  font-size: 20rpx;
+  color: #999999;
+}
+
+.invite-error {
+  font-size: 24rpx;
+  color: #FF4767;
+}
+
+.inviter-info {
+  display: flex;
+  align-items: center;
+  font-size: 20rpx;
+}
+
+.inviter-label {
+  color: #666666;
+}
+
+.inviter-name {
+  color: #333333;
+  font-weight: 500;
+}
+
+.inviter-divider {
+  color: #666666;
+  margin: 0 5rpx;
+}
+
+.inviter-phone {
+  color: #666666;
+}
+
+/* 添加抖动动画样式 */
+@keyframes shake {
+  0%, 100% { transform: translateX(0); }
+  10%, 30%, 50%, 70%, 90% { transform: translateX(-7rpx); }
+  20%, 40%, 60%, 80% { transform: translateX(7rpx); }
+}
+
+.shake-animation {
+  animation: shake 0.5s ease-in-out;
+  color: #FF4767; /* 保持红色 */
+}
+
+/* 弹窗样式 */
+.popup {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.popup-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+  position: relative;
+  background-color: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+  padding: 32rpx;
+  transform: translateY(100%);
+  transition: transform 0.3s ease;
+}
+
+.popup.show .popup-content {
+  transform: translateY(0);
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20rpx;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999999;
+  padding: 16rpx;
+}
+
+.popup-body {
+  max-height: 600rpx;
+  overflow-y: auto;
+}
+
+.checkbox-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.checkbox-item {
+  width: 50%;
+  padding: 14rpx;
+  display: flex;
+  align-items: center;
+}
+
+.checkbox {
+  width: 40rpx;
+  height: 40rpx;
+  border: 2rpx solid #DDDDDD;
+  border-radius: 8rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16rpx;
+}
+
+.checkbox.checked {
+  background-color: #FF4767;
+  border-color: #FF4767;
+}
+
+.check-icon {
+  width: 42rpx;
+  height: 42rpx;
+}
+
+.checkbox-label {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.popup-footer {
+  display: flex;
+  margin-top: 32rpx;
+}
+
+.popup-btn {
+  flex: 1;
+  height: 88rpx;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 16rpx;
+}
+
+.popup-btn.cancel {
+  background-color: #F5F5F5;
+}
+
+.popup-btn.confirm {
+  background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+}
+
+.popup-btn .btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.popup-btn.cancel .btn-text {
+  color: #666666;
+}
+
+.popup-btn.confirm .btn-text {
+  color: #FFFFFF;
+}
+
+.region-body {
+  height: 400rpx;
+}
+
+.picker-scroll {
+  height: 400rpx;
+}
+
+.picker-item {
+  height: 68rpx;
+  line-height: 68rpx;
+  text-align: center;
+}
+
+/* 时间选择器样式 */
+.cancel-text {
+  font-size: 32rpx;
+  color: #666666;
+}
+
+.confirm-text {
+  font-size: 32rpx;
+  color: #FF4767;
+  font-weight: 500;
+}
+
+.time-range {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 32rpx;
+  background: #F8F9FC;
+}
+
+.time-block {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background: #FFFFFF;
+  border-radius: 12rpx;
+  padding: 24rpx 0;
+  transition: all 0.3s ease;
+}
+
+.time-block.active {
+  background: #ECF2FF;
+}
+
+.time-label {
+  font-size: 26rpx;
+  color: #999999;
+  margin-top: 8rpx;
+}
+
+.time-value {
+  font-size: 40rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.time-block.active .time-value {
+  color: #FF4767;
+}
+
+.time-separator {
+  font-size: 28rpx;
+  color: #999999;
+  margin: 0 24rpx;
+}
+
+/* 提示弹窗样式 */
+.tip-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.tip-popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.tip-popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.tip-popup-content {
+  position: relative;
+  width: 620rpx;
+  height: 810rpx;
+}
+
+.tip-popup-bg {
+  width: 620rpx;
+  height: 810rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.tip-popup-body {
+  position: relative;
+  flex-direction: column;
+  padding: 80rpx 20rpx 40rpx 20rpx;
+  box-sizing: border-box;
+}
+
+.tip-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  text-align: center;
+  margin-top: 107rpx;
+  margin-bottom: 37rpx;
+}
+
+.tip-image-container {
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 50rpx;
+}
+
+.tip-image {
+  width: 627rpx;
+  height: 327rpx;
+  margin-left: 13rpx; 
+}
+
+/* 店铺logo图片的特殊样式 */
+.tip-image.head_photo {
+  width: 582rpx;
+  height: 327rpx;
+  margin-right: 0;
+  margin-left: -15rpx;
+}
+
+/* 店铺名称图片的特殊样式 */
+.tip-image.store_name {
+  width: 627rpx;
+  height: 327rpx;
+  margin-left: 13rpx;
+}
+
+.tip-buttons {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 28rpx;
+}
+
+.tip-btn {
+  width: 250rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.tip-btn.cancel {
+  border: #FF4767 2rpx solid;
+  background-color: transparent;
+  color: #FF4767;
+}
+
+.tip-btn.confirm {
+  background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+  color: #FFFFFF;
+}
+
+.tip-btn .btn-text {
+  color: inherit;
+}
+</style>
\ No newline at end of file
diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue
index 921f2f0..b00858f 100644
--- a/pages/ruzhu/qualification_sj.vue
+++ b/pages/ruzhu/qualification_sj.vue
@@ -1,1963 +1,1751 @@
-<template>
-  <view class="qualification-page">
-    <!-- 营业执照部分 -->
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text class="title-text">营业执照</text>
-      </view>
-
-      <!-- 资质照片 -->
-      <view class="form-item box-cont">
-        <text class="label required">资质照片</text>
-        <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
-        <view class="upload-container">
-          <view class="upload-box" @click="chooseImage('uscc_photo')">
-            <view class="upload-camera license-upload">
-              <image v-if="formData.uscc_photo" :src="formData.uscc_photo" mode="aspectFill" class="preview-image"></image>
-              <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/92bd4268-b4d7-4725-8664-9e44f828c7d9" mode="aspectFit" class="camera-icon"></image>
-              <!-- 识别状态遮罩 -->
-              <!-- <view v-if="isRecognizing && recognizeType === 'uscc_photo'" class="recognize-overlay">
-                <view class="recognize-loading"></view>
-                <text class="recognize-text">识别中...</text>
-              </view> -->
-            </view>
-          </view>
-          <text class="upload-label required">请上传营业执照原件</text>
-        </view>
-      </view>
-
-      <!-- 商户类型 -->
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">商户类型</text>
-        </view>
-        <input type="text" v-model="formData.uscc_type" placeholder="请输入商户类型" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <!-- 营业执照信息 -->
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">证件号码</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_num')"></image>
-        </view>
-        <input type="text" v-model="formData.uscc_num" placeholder="请输入营业执照的证件号码" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">企业名称</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_name')"></image>
-        </view>
-        <input type="text" v-model="formData.uscc_name" placeholder="请输入营业执照的企业名称" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-    </view>
-
-    <!-- 法人信息部分 -->
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text>法人信息</text>
-      </view>
-
-    <!-- 身份证照片部分 -->
-    <view class="section">
-      <view class="box-cont">
-        <view class="form-item">
-          <text class="label required">身份证照片</text>
-          <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
-          
-          <view class="idcard-upload-vertical-container">
-            <!-- 身份证正面 -->
-            <view class="idcard-upload-vertical-item">
-              <view class="upload-box" @click="chooseImage('legal_idcard_positive')">
-                <view class="upload-camera idcard-front">
-                  <image v-if="formData.legal_idcard_positive" :src="formData.legal_idcard_positive" mode="aspectFill" class="preview-image"></image>
-                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/043b0c97-79c1-4f95-810f-c33e3d5269a3" mode="aspectFit" class="camera-icon"></image>
-                  <!-- 识别状态遮罩 -->
-                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_positive'" class="recognize-overlay">
-                    <view class="recognize-loading"></view>
-                    <text class="recognize-text">识别中...</text>
-                  </view> -->
-                </view>
-              </view>
-              <text class="upload-label required">请上传身份证正面（人像面）</text>
-            </view>
-            
-            <!-- 身份证反面 -->
-            <view class="idcard-upload-vertical-item">
-              <view class="upload-box" @click="chooseImage('legal_idcard_negative')">
-                <view class="upload-camera idcard-back">
-                  <image v-if="formData.legal_idcard_negative" :src="formData.legal_idcard_negative" mode="aspectFill" class="preview-image"></image>
-                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/203cfdf4-2501-44e6-8565-ad251c6bf0fa" mode="aspectFit" class="camera-icon"></image>
-                  <!-- 识别状态遮罩 -->
-                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_negative'" class="recognize-overlay">
-                    <view class="recognize-loading"></view>
-                    <text class="recognize-text">识别中...</text>
-                  </view> -->
-                </view>
-              </view>
-              <text class="upload-label required">请上传身份证反面（国徽面）</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">法人代表</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('legal_name')"></image>
-        </view>
-        <input type="text" v-model="formData.legal_name" placeholder="请输入营业执照的法人代表" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <text class="label required">法人联系方式</text>
-        <input type="number" v-model="formData.legal_phone" placeholder="请输入法人的联系方式" 
-              placeholder-class="placeholder" class="input" 
-              @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <text class="label required">法人身份证号</text>
-        <input type="idcard" v-model="formData.legal_idcard_num" placeholder="请输入法人身份证号" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <!-- 身份证有效期 -->
-      <view class="form-item box-cont">
-        <text class="label required">身份证有效期至</text>
-        <view class="radio-group">
-          <view class="radio-item" @click="setIdcardValidType('permanent')">
-            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
-              <image v-if="formData.legal_idcard_expiry_type === 'permanent'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
-            </view>
-            <text class="radio-label">长久有效</text>
-          </view>
-          <view class="radio-item" @click="setIdcardValidType('date')">
-            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
-              <image v-if="formData.legal_idcard_expiry_type === 'date'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
-            </view>
-            <text class="radio-label">指定日期有效</text>
-          </view>
-        </view>
-      </view>
-
-      <!-- 身份证有效期日期选择 -->
-      <view class="box-cont">
-        <view class="date-range-container">
-          <view class="date-item">
-            <text class="date-label">开始日期</text>
-            <view class="date-picker-box" @click="openDatePicker('idcard_start_date')">
-              <text :class="formData.idcard_start_date ? 'date-value' : 'placeholder'">
-                {{formatDateForDisplay(formData.idcard_start_date) || '请选择日期'}}
-              </text>
-              <view class="date-divider"></view>
-              <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649" class="date-arrow" mode="aspectFit"></image>
-            </view>
-          </view>
-          <view class="date-item">
-            <text class="date-label">结束日期</text>
-            <view class="date-picker-box" :class="{ disabled: formData.legal_idcard_expiry_type === 'permanent' }" 
-                  @click="formData.legal_idcard_expiry_type !== 'permanent' && openDatePicker('idcard_end_date')">
-              <text :class="formData.idcard_end_date ? 'date-value' : 'placeholder'">
-                {{formatDateForDisplay(formData.idcard_end_date) || '请选择日期'}}
-              </text>
-              <view class="date-divider"></view>
-              <image :src="formData.legal_idcard_expiry_type === 'permanent' ? 
-                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9a757f-a36c-46bb-a59f-2caddac5365b' : 
-                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649'" 
-                class="date-arrow" mode="aspectFit"></image>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-
-    <!-- 日期选择器 -->
-    <view class="popup" :class="{ show: showDatePickerFlag }">
-      <view class="popup-mask" @click="hideDatePicker"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="cancel-text" @click="hideDatePicker">取消</text>
-          <text class="title">选择日期</text>
-          <text class="confirm-text" @click="confirmDate">确定</text>
-        </view>
-        <view class="region-body">
-          <picker-view :value="dateValue" @change="bindDateChange" class="picker-scroll" 
-                      :indicator-style="indicatorStyle" mode="date" fields="day">
-            <picker-view-column>
-              <view class="picker-item" v-for="(year, index) in years" :key="index">{{year}}年</view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(month, index) in months" :key="index">{{month}}月</view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(day, index) in days" :key="index">{{day}}日</view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 提示信息弹窗 -->
-    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
-      <view class="tip-popup-mask" @click="hideTipPopup"></view>
-      <view class="tip-popup-content">
-        <!-- 弹窗背景图片 -->
-        <image class="tip-popup-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770" mode="aspectFit"></image>
-        
-        <!-- 弹窗内容 -->
-        <view class="tip-popup-body">
-          <view class="tip-title">{{ tipTitle }}</view>
-          <view class="tip-image-container">
-            <image class="tip-image" :src="tipImage" mode="widthFix"></image>
-          </view>
-          <view class="tip-buttons">
-            <view class="tip-btn cancel" @click="hideTipPopup">
-              <text class="btn-text">取消</text>
-            </view>
-            <view class="tip-btn confirm" @click="hideTipPopup">
-              <text class="btn-text">我已了解</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-
-  </view>
-</template>
-
-<script>
-import request from '../../utils/request';
-import { debounce } from '@/utils/debounce.js';
-import uploadImage from '../../utils/uploadImage';
-import permissionUtils from '../../utils/per';
-import locationService from '../../utils/locationService';
-import { recognizeIdCard, recognizeBusinessLicense, formatDateFromNumber, parseValidPeriod } from '../../utils/orc';
-
-export default {
-  data() {
-    const currentDate = new Date();
-    const currentYear = new Date().getFullYear();
-    const years = Array.from({length: 130}, (_, i) => 1970 + i);
-    const months = Array.from({length: 12}, (_, i) => i + 1);
-    const days = Array.from({length: 31}, (_, i) => i + 1);
-    
-    // 从本地存储加载数据
-    const loadedData = this.loadFormDataFromLocal();
-    
-    return {
-      userId: null,
-      // 使用本地存储初始化数据
-      formData: loadedData || {
-        uscc_type: '',
-        uscc_photo: '',
-        uscc_num: '',
-        uscc_name: '',
-        license_valid_type: '',
-        license_start_date: '',
-        license_end_date: '',
-        legal_name: '',
-        legal_phone: '',
-        legal_idcard_num: '',
-        legal_idcard_expiry_type: '',
-        idcard_start_date: '',
-        idcard_end_date: '',
-        legal_idcard_positive: '',
-        legal_idcard_negative: ''
-      },
-      showDatePickerFlag: false,
-      showTipPopupFlag: false, // 提示弹窗显示状态
-      currentDateField: '',
-      years,
-      months,
-      days,
-      dateValue: [currentYear - 1970, currentDate.getMonth(), currentDate.getDate() - 1], // 默认选中今天
-      indicatorStyle: 'height: 68rpx;',
-      tipTitle: '', // 提示弹窗标题
-      tipImage: '', // 提示弹窗图片
-      isSubmit: false, // 防止重复提交
-
-      // 识别状态
-      isRecognizing: false,
-      recognizeType: '', // 'legal_idcard_positive', 'legal_idcard_negative', 'uscc_photo'
-      identity: 2
-    }
-  },
-  computed: {
-    
-  },
-  
-  // 添加 watch 监听表单数据变化
-  watch: {
-    'formData.uscc_num'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.uscc_name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_phone'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_num'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.uscc_photo'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_positive'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_negative'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    }
-  },
-  
-  // 页面生命周期
-  onLoad(options) {
-	  console.log(1111112222)
-
-    // 获取用户信息，用于图片上传
-    this.getUserInfo();
-    
-    // 检查全局状态中是否有数据（从前一页面带过来的）
-    this.checkGlobalData();
-  },
-  
-  onShow() {
-    // 页面显示时重新从本地存储加载数据
-    const localData = this.loadFormDataFromLocal();
-    if (localData) {
-      // 合并数据，避免覆盖已有数据
-      this.formData = { ...this.formData, ...localData };
-    }
-    
-    // 检查全局状态
-    this.checkGlobalData();
-  },
-  
-  onHide() {
-    // 页面隐藏时保存数据
-    this.saveFormDataToLocal();
-  },
-  
-  onUnload() {
-    // 页面卸载时保存数据
-    this.saveFormDataToLocal();
-  },
-  
-  methods: {
-    // 检查全局数据
-    checkGlobalData() {
-      if (getApp().globalData.qualificationData) {
-        // 如果全局有数据，合并到当前表单
-        this.formData = { ...this.formData, ...getApp().globalData.qualificationData };
-        // 保存到本地存储
-        this.saveFormDataToLocal();
-        // 清空全局数据，避免重复使用
-        // delete getApp().globalData.qualificationData;
-        getApp().globalData.qualificationData = null;
-      }
-    },
-    
-    // 从本地存储加载数据
-    loadFormDataFromLocal() {
-      try {
-        const stored = uni.getStorageSync('qualification_form_data');
-        if (stored) {
-          console.log('从本地存储加载数据:', stored);
-          return stored;
-        }
-      } catch (e) {
-        console.log('读取本地存储失败:', e);
-      }
-      return null;
-    },
-    
-    // 保存数据到本地存储（带防抖）
-    saveFormDataToLocalDebounce: debounce(function() {
-      this.saveFormDataToLocal();
-    }, 500),
-    
-    // 保存数据到本地存储
-    saveFormDataToLocal() {
-      try {
-        uni.setStorageSync('qualification_form_data', this.formData);
-        console.log('数据已保存到本地存储');
-      } catch (e) {
-        console.log('保存数据失败:', e);
-      }
-    },
-    
-    // 清空本地存储（在表单提交成功后调用）
-    clearFormDataLocal() {
-      try {
-        uni.removeStorageSync('qualification_form_data');
-        console.log('已清空本地存储数据');
-      } catch (e) {
-        console.log('清空数据失败:', e);
-      }
-    },
-
-    // 获取用户信息
-    getUserInfo() {
-      return new Promise((resolve, reject) => {
-        request.post('/sj/user/getuser').then(result => {
-          if (result.state === 1) {
-            this.userId = result.data.id;
-            console.log('用户ID获取成功:', this.userId);
-            resolve(this.userId);
-          } else {
-            console.error('获取用户信息失败:', result.msg);
-            reject(result.msg);
-          }
-        }).catch(error => {
-          console.error('获取用户信息接口错误:', error);
-          reject(error);
-        });
-      });
-    },
-
-    getFormData() {
-        return {
-          ...this.formData,
-          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
-          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
-          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
-          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
-        };
-    },
-
-    // 添加日期格式化方法
-    formatDateForDisplay(dateStr) {
-      if (!dateStr) return '';
-      if (dateStr === '长久有效') return '长久有效';
-      
-      // 如果是 YYYY-MM-DD 格式，转换为 年月日 格式显示
-      if (dateStr.includes('-')) {
-        const [year, month, day] = dateStr.split('-');
-        return `${year}年${parseInt(month)}月${parseInt(day)}日`;
-      }
-      
-      return dateStr; // 如果已经是年月日格式，直接返回
-    },
-
-    // 将日期转换为后端需要的格式
-    formatDateForBackend(dateStr) {
-      if (!dateStr) return '';
-      if (dateStr === '长久有效') return 'permanent'; // 根据后端需求返回
-      
-      // 将 年月日 格式转换为 YYYY-MM-DD
-      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-      if (match) {
-        const year = match[1];
-        const month = match[2].padStart(2, '0');
-        const day = match[3].padStart(2, '0');
-        return `${year}-${month}-${day}`;
-      }
-      
-      return dateStr; // 如果已经是 YYYY-MM-DD 格式，直接返回
-    },
-
-    // 显示提示弹窗
-    showTipPopup(field) {
-      // 根据字段设置对应的标题和图片
-      const tipConfig = {
-        'uscc_num': {
-          title: '如何找到证件号码',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/72856aac-f0ac-49a1-a7f1-be3220ecb314'
-        },
-        'uscc_name': {
-          title: '如何找到企业名称',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
-        },
-        'legal_name': {
-          title: '如何找到法人代表',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/24859872-da37-4beb-8e33-7743813bb5a1'
-        }
-      };
-      
-      if (tipConfig[field]) {
-        this.tipTitle = tipConfig[field].title;
-        this.tipImage = tipConfig[field].image;
-        // 确保图片已加载再显示弹窗
-        this.ensureImageLoaded(this.tipImage).then(() => {
-          this.showTipPopupFlag = true;
-        }).catch(() => {
-          // 即使加载失败也显示弹窗，避免用户无法操作
-          this.showTipPopupFlag = true;
-        });
-      }
-    },
-
-    // 确保图片加载完成
-    ensureImageLoaded(src) {
-      return new Promise((resolve, reject) => {
-        const img = new Image();
-        img.onload = () => resolve();
-        img.onerror = () => reject();
-        img.src = src;
-        
-        // 设置超时，避免长时间等待
-        setTimeout(() => resolve(), 500);
-      });
-    },
-    
-    // 隐藏提示弹窗
-    hideTipPopup() {
-      this.showTipPopupFlag = false;
-    },
-
-
-    // 设置营业执照有效期类型
-    setLicenseValidType(type) {
-      this.formData.license_valid_type = type;
-      if (type === 'permanent') {
-        // 选择长久有效时，设置结束日期为"长久有效"
-        this.formData.license_end_date = '长久有效';
-      } else {
-        // 选择指定日期时，如果之前是长久有效，清空结束日期
-        if (this.formData.license_end_date === '长久有效') {
-          this.formData.license_end_date = '';
-        }
-      }
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    // 设置身份证有效期类型
-    setIdcardValidType(type) {
-      this.formData.legal_idcard_expiry_type = type;
-      if (type === 'permanent') {
-        // 选择长久有效时，设置结束日期为"长久有效"
-        this.formData.idcard_end_date = '长久有效';
-      } else {
-        // 选择指定日期时，如果之前是长久有效，清空结束日期
-        if (this.formData.idcard_end_date === '长久有效') {
-          this.formData.idcard_end_date = '';
-        }
-        // 如果已有开始日期，自动计算20年后的结束日期
-        if (this.formData.idcard_start_date && !this.formData.idcard_end_date) {
-          const match = this.formData.idcard_start_date.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const year = parseInt(match[1]) + 20;
-            const month = match[2];
-            const day = match[3];
-            this.formData.idcard_end_date = `${year}年${month}月${day}日`;
-          }
-        }
-      }
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    
-    // 选择商户类型
-    selectMerchantType(item) {
-      this.formData.uscc_type = item.value;
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    // 确认商户类型选择
-    confirmMerchantType() {
-      this.hideMerchantTypePicker();
-    },
-    
-    // 打开日期选择器
-    openDatePicker(field) {
-      this.currentDateField = field;
-      
-      // 设置日期选择器的初始值
-      const currentDate = new Date();
-      let initialDate = currentDate;
-      
-      // 如果该字段已经有值，解析该值作为初始值
-      if (this.formData[field]) {
-        const dateStr = this.formData[field];
-        const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-        if (match) {
-          initialDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-        }
-      }
-      
-      // 计算picker-view的value
-      const yearIndex = this.years.indexOf(initialDate.getFullYear());
-      const monthIndex = initialDate.getMonth();
-      const dayIndex = initialDate.getDate() - 1;
-      
-      this.dateValue = [
-        yearIndex >= 0 ? yearIndex : 0,
-        monthIndex,
-        dayIndex
-      ];
-      
-      this.showDatePickerFlag = true;
-    },
-    
-    // 隐藏日期选择器
-    hideDatePicker() {
-      this.showDatePickerFlag = false;
-    },
-    
-    // 日期选择变化
-    bindDateChange(e) {
-      this.dateValue = e.detail.value;
-    },
-
-    // 确认日期选择
-    confirmDate() {
-      const [yearIndex, monthIndex, dayIndex] = this.dateValue;
-      const year = this.years[yearIndex];
-      const month = this.months[monthIndex];
-      const day = this.days[dayIndex];
-      const dateStr = `${year}年${month}月${day}日`;
-      const selectedDate = new Date(year, month - 1, day);
-      const today = new Date();
-      today.setHours(0, 0, 0, 0);
-      
-      // 验证日期逻辑
-      if (this.currentDateField.endsWith('_start_date')) {
-        // 开始日期验证：不能选择今天之后的日期
-        if (selectedDate > today) {
-          uni.showToast({
-            title: '开始日期不能晚于今天',
-            icon: 'none'
-          });
-          return;
-        }
-        
-        // 如果对应的结束日期已经设置，检查开始日期是否晚于结束日期
-        const relatedEndField = this.currentDateField.replace('_start_date', '_end_date');
-        if (this.formData[relatedEndField] && this.formData[relatedEndField] !== '长久有效') {
-          const endDateStr = this.formData[relatedEndField];
-          const match = endDateStr.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const endDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-            if (selectedDate > endDate) {
-              uni.showToast({
-                title: '开始日期不能晚于结束日期',
-                icon: 'none'
-              });
-              return;
-            }
-          }
-        }
-        // 如果是身份证开始日期，自动计算结束日期
-        if (this.currentDateField === 'idcard_start_date') {
-          // 如果是"长久有效"类型，不自动设置结束日期
-          if (this.formData.legal_idcard_expiry_type === 'date') {
-            const endYear = year + 20;
-            const endDateStr = `${endYear}年${month}月${day}日`;
-            this.formData.idcard_end_date = endDateStr;
-          } else if (this.formData.legal_idcard_expiry_type === 'permanent') {
-            // 如果是"长久有效"类型，保持结束日期为"长久有效"
-            this.formData.idcard_end_date = '长久有效';
-          }
-        }
-
-      } else if (this.currentDateField.endsWith('_end_date')) {
-        const relatedStartField = this.currentDateField.replace('_end_date', '_start_date');
-        if (this.formData[relatedStartField]) {
-          const startDateStr = this.formData[relatedStartField];
-          const match = startDateStr.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const startDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-            if (selectedDate <= startDate) {
-              uni.showToast({
-                title: '结束日期必须晚于开始日期',
-                icon: 'none'
-              });
-              return;
-            }
-          }
-        } else {
-          // 如果没有设置开始日期，结束日期不能早于今天
-          if (selectedDate < today) {
-            uni.showToast({
-              title: '结束日期不能早于今天',
-              icon: 'none'
-            });
-            return;
-          }
-        }
-      }
-      
-      this.formData[this.currentDateField] = dateStr;
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-      this.hideDatePicker();
-    },
-    
-    // 选择图片
-    async chooseImage(type) {
-      try {
-        const systemInfo = uni.getSystemInfoSync()
-        
-        if (systemInfo.platform === 'ios') {
-          this.openCamera(type);
-        } else {
-          let xcpermission = '';
-          let xjpermission = '';
-          if (systemInfo.platform === 'ios') {
-            xcpermission = 'photo_library',
-            xjpermission = 'camera'
-          } else {
-            xcpermission = `android.permission.READ_EXTERNAL_STORAGE,android.permission.WRITE_EXTERNAL_STORAGE`
-            xjpermission = 'android.permission.CAMERA'
-          }
-          const xjfirstRequest = !plus.storage.getItem(`perm_${xjpermission}`)
-          const xcfirstRequest = !plus.storage.getItem(`perm_${xcpermission}`)
-          if (xcfirstRequest || xjfirstRequest) {
-            this.isShowPer = true;
-          }
-
-          // 检查权限
-          const xc = await permissionUtils.checkPermission('photo_library', '需要相册权限用于上传照片');
-          const xj = await permissionUtils.checkPermission('camera', '需要相机权限用于拍摄照片');
-          if (xc.granted && xj.granted) {
-            this.openCamera(type);
-            return;
-          }
-
-          // 请求权限
-          const result1 = await permissionUtils.requestPermission('photo_library', '我们需要访问您的相册以上传图片/视频');
-          const result2 = await permissionUtils.requestPermission('camera', '我们需要访问您的相机以上传图片/视频');
-          if (result1 && result2) {
-            this.openCamera(type);
-          } else {
-            locationService.openAppSettings();
-          }
-        }
-      } catch (err) {
-        console.log('选择图片出错:', err);
-        // 出错时也直接调用图片选择
-        this.openCamera(type);
-      }
-    },
-
-    async openCamera(type) {
-      try {
-        // 确保用户信息正确
-        if (!this.userId) {
-          console.log('重新获取用户信息...');
-          await this.getUserInfo();
-        }
-        
-        if (!this.identity) {
-          this.identity = getApp().globalData.artisanType;
-        }
-
-        // 直接使用 uni.chooseImage
-        const chooseResult = await new Promise((resolve, reject) => {
-          uni.chooseImage({
-            count: 1,
-            sizeType: ['compressed'],
-            sourceType: ['album', 'camera'],
-            success: resolve,
-            fail: reject
-          });
-        });
-
-        if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) {
-          uni.hideLoading();
-          return;
-        }
-
-        const tempFilePath = chooseResult.tempFilePaths[0];
-        
-        // 直接构造文件对象
-        const file = {
-          path: tempFilePath,
-          size: 0
-        };
-
-        // 显示上传loading
-        uni.showLoading({
-          title: '上传中...',
-          mask: true
-        });
-
-        // 手动调用上传
-        const result = await this.directUpload(file, this.userId, this.identity + 1);
-        
-        // 上传成功，更新loading显示为识别中
-        uni.hideLoading();
-        
-        if (result) {
-          this.formData[type] = result;
-          
-          // 上传成功后自动识别
-          if (type === 'uscc_photo') {
-            await this.recognizeBusinessLicense(result);
-          } else if (type === 'legal_idcard_positive') {
-            await this.recognizeIdCardFront(result);
-          } else if (type === 'legal_idcard_negative') {
-            await this.recognizeIdCardBack(result);
-          }
-          
-          // 保存到本地存储
-          this.saveFormDataToLocal();
-        }
-      } catch (err) {
-        uni.hideLoading();
-        console.log('上传图片错误:', err);
-        
-        if (!err.errMsg || !err.errMsg.includes('cancel')) {
-          uni.showToast({
-            title: '上传失败，请重试',
-            icon: 'none'
-          });
-        }
-      }
-    },
-
-    // 直接上传方法
-    async directUpload(file, userId, type) {
-      try {
-        let date = new Date().getTime();
-        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
-        
-        // 生成安全的文件名
-        let fileExtension = 'jpg';
-        if (file.path.includes('.')) {
-          let parts = file.path.split('.');
-          let ext = parts[parts.length - 1].toLowerCase();
-          if (ext && ext.length <= 4) {
-            fileExtension = ext;
-          }
-        }
-        
-        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
-        console.log('安全文件名:', name);
-
-        // 获取OSS配置
-        const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
-        
-        // 直接上传到OSS
-        return await new Promise((resolve, reject) => {
-          uni.uploadFile({
-            url: ossConfig.host,
-            filePath: file.path,
-            name: 'file',
-            formData: {
-              key: ossConfig.dir + name,
-              policy: ossConfig.policy,
-              OSSAccessKeyId: ossConfig.ossAccessKeyId,
-              success_action_status: '200',
-              signature: ossConfig.signature
-            },
-            success: (res) => {
-              if (res.statusCode === 200) {
-                const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
-                resolve(fileUrl);
-              } else {
-                reject(new Error('上传失败'));
-              }
-            },
-            fail: reject
-          });
-        });
-        
-      } catch (error) {
-        console.error('直接上传失败:', error);
-        throw error;
-      }
-    },
-
-    /**
-     * 识别营业执照
-     */
-    async recognizeBusinessLicense(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'uscc_photo';
-        // uni.showLoading({
-        //   title: '正在识别营业执照...',
-        //   mask: true
-        // });
-        
-        // 调用OCR接口
-        const result = await recognizeBusinessLicense(imageUrl);
-        console.log('营业执照识别结果:', result);
-
-        const hasRecognizedData = this.checkBusinessLicenseRecognition(result);
-        if (!hasRecognizedData) {
-          uni.showToast({
-            title: '未识别到营业执照信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 填充营业执照信息
-        let recognizedFields = 0;
-
-        // 企业名称：如果识别结果为"无"，就设置为空字符串
-        if (result.uscc_name && result.uscc_name.trim() && result.uscc_name !== '无') {
-          this.formData.uscc_name = result.uscc_name;
-          recognizedFields++;
-        } else {
-          // 如果是"无"或空值，设置为空字符串
-          this.formData.uscc_name = '';
-        }
-        
-        if (result.uscc_num && result.uscc_num.trim()) {
-          this.formData.uscc_num = result.uscc_num;
-          recognizedFields++;
-        }
-        
-        // 如果需要营业执照法人与法人代表关联则取消注释
-        // if (result.legal_name && result.legal_name.trim()) {
-        //   this.formData.legal_name = result.legal_name;
-        //   recognizedFields++;
-        // }
-
-        if (result.uscc_type && result.uscc_type.trim()) {
-          this.formData.uscc_type = result.uscc_type;
-          recognizedFields++;
-        }
-
-        // 根据识别的字段数量给出不同的提示
-        if (recognizedFields > 0) {
-        } else {
-          uni.showToast({
-            title: '识别完成，但未获取到有效信息',
-            icon: 'none',
-            duration: 3000
-          });
-        }
-        
-      } catch (error) {
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          // duration: 3000
-        });
-        console.error('营业执照识别失败:', error);
-        
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查营业执照识别结果是否有效
-    checkBusinessLicenseRecognition(result) {
-      const requiredFields = ['uscc_num', 'uscc_name', 'legal_name', 'uscc_type'];
-      
-      for (const field of requiredFields) {
-        if (result[field] && result[field].trim()) {
-          return true;
-        }
-      }
-      
-      return false;
-    },
-    
-    /**
-     * 识别身份证正面
-     */
-    async recognizeIdCardFront(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'legal_idcard_positive';
-        
-        uni.showLoading({
-          title: '正在识别身份证正面...',
-          mask: true
-        });
-        
-        // 调用OCR接口
-        const result = await recognizeIdCard(imageUrl, 1);
-
-        // 验证是否真的识别到了数据
-        const hasRecognizedData = this.checkIdCardFrontRecognition(result);
-        
-        if (!hasRecognizedData) {
-          uni.hideLoading();
-          uni.showToast({
-            title: '未识别到身份证信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 填充身份证正面信息
-        if (result.name) {
-          this.formData.legal_name = result.name;
-        }
-        
-        if (result.id_number) {
-          this.formData.legal_idcard_num = result.id_number;
-        }
-        
-        uni.showToast({
-          title: '身份证正面识别成功',
-          icon: 'none'
-        });
-        
-      } catch (error) {
-        console.error('身份证正面识别失败:', error);
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          duration: 3000
-        });
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查身份证正面识别结果是否有效
-    checkIdCardFrontRecognition(result) {
-      return (result.name && result.name.trim()) || (result.id_number && result.id_number.trim());
-    },
-    
-    /**
-     * 识别身份证反面
-     */
-    async recognizeIdCardBack(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'legal_idcard_negative';
-        
-        uni.showLoading({
-          title: '正在识别身份证反面...',
-          mask: true
-        });
-        
-        // 调用OCR接口
-        const result = await recognizeIdCard(imageUrl, 2);
-
-        // 验证是否真的识别到了数据
-        const hasRecognizedData = this.checkIdCardBackRecognition(result);
-        
-        if (!hasRecognizedData) {
-          uni.hideLoading();
-          uni.showToast({
-            title: '未识别到身份证有效期信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 解析有效期
-        const validPeriod = parseValidPeriod(result.start_date, result.end_date);
-        
-        // 填充有效期数据
-        if (validPeriod.startDate) {
-          this.formData.idcard_start_date = validPeriod.startDate;
-        }
-        
-        if (validPeriod.isPermanent) {
-          this.formData.legal_idcard_expiry_type = 'permanent';
-          this.formData.idcard_end_date = '长久有效';
-        } else if (validPeriod.endDate) {
-          this.formData.legal_idcard_expiry_type = 'date';
-          this.formData.idcard_end_date = validPeriod.endDate;
-        }
-        
-        // 如果是长期有效，自动选择对应的选项
-        if (validPeriod.isPermanent) {
-          this.setIdcardValidType('permanent');
-        } else {
-          this.setIdcardValidType('date');
-        }
-        
-        uni.showToast({
-          title: '身份证反面识别成功',
-          icon: 'none'
-        });
-        
-      } catch (error) {
-        console.error('身份证反面识别失败:', error);
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          duration: 3000
-        });
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查身份证反面识别结果是否有效
-    checkIdCardBackRecognition(result) {
-      return (result.start_date && result.start_date.trim()) || 
-            (result.end_date && result.end_date.trim());
-    },
-
-    // 验证表单数据
-    validateForm() {
-      // 按照表单从上到下的顺序定义验证规则
-      const validationRules = [
-        { field: 'uscc_photo', message: '请上传营业执照照片' },
-        { field: 'uscc_type', message: '请输入商户类型' },
-        { field: 'uscc_num', message: '请输入营业执照号码' },
-        { field: 'uscc_name', message: '请输入企业名称' },
-                { field: 'legal_idcard_positive', message: '请上传身份证正面照片' },
-        { field: 'legal_idcard_negative', message: '请上传身份证反面照片' },
-        { field: 'legal_name', message: '请输入法人代表' },
-        { field: 'legal_phone', message: '请输入法人联系方式' },
-        { field: 'legal_idcard_num', message: '请输入法人身份证号' },
-        { 
-          condition: () => !this.formData.legal_idcard_expiry_type, 
-          message: '请选择身份证有效期类型' 
-        },
-        { 
-          condition: () => !this.formData.idcard_start_date, 
-          message: '请选择身份证开始日期' 
-        },
-        {
-          condition: () => {
-            if (this.formData.legal_idcard_expiry_type === 'data' && !this.formData.idcard_end_date) {
-              return true;
-            }
-            // 如果选择长久有效，则不需要结束日期
-            return false;
-          },
-          message: '请选择身份证结束日期' 
-        },
-      ];
-
-      // 按顺序验证
-      for (let rule of validationRules) {
-        let isValid = true;
-        
-        if (rule.field) {
-          // 简单字段验证
-          if (!this.formData[rule.field]) {
-            isValid = false;
-          }
-        } else if (rule.condition) {
-          // 条件验证
-          if (rule.condition()) {
-            isValid = false;
-          }
-        }
-        
-        if (!isValid) {
-          uni.showToast({
-            title: rule.message,
-            icon: 'none'
-          });
-          return false;
-        }
-      }
-      
-      // 验证手机号格式
-      if (!/^1[3-9]\d{9}$/.test(this.formData.legal_phone)) {
-        uni.showToast({
-          title: '请输入正确的手机号码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      // 验证身份证格式
-      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.formData.legal_idcard_num)) {
-        uni.showToast({
-          title: '请输入正确的身份证号码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      return true;
-    },
-
-    // 将日期字符串转换为Date对象
-    parseDateString(dateStr) {
-      if (!dateStr) return null;
-      
-      // 处理年月日格式
-      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-      if (match) {
-        return new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-      }
-      
-      // 处理 YYYY-MM-DD 格式
-      if (dateStr.includes('-')) {
-        const dateParts = dateStr.split('-');
-        if (dateParts.length === 3) {
-          return new Date(parseInt(dateParts[0]), parseInt(dateParts[1]) - 1, parseInt(dateParts[2]));
-        }
-      }
-      
-      return null;
-    },
-
-    // 保存表单数据（在进入下一步时调用）
-    // 修改后的 saveFormData 方法
-    saveFormData() {
-      console.log('开始验证表单数据');
-      console.log('表单数据:', this.formData);
-      console.log('法人姓名:', this.formData.legal_name);
-      console.log('法人身份证号:', this.formData.legal_idcard_num);
-      
-      if (this.validateForm()) {
-        console.log('表单验证通过，开始验证法人信息');
-        
-        // 验证法人姓名与身份证号是否匹配
-        return this.checkIdCardAndName();
-      }
-      
-      console.log('表单验证失败');
-      return false;
-    },
-
-    // 修改后的 checkIdCardAndName 方法，添加详细调试
-    async checkIdCardAndName() {
-      if (this.isSubmit) {
-        console.log(' 重复提交被阻止 ');
-        return false;
-      }
-
-      this.isSubmit = true;
-
-      try {
-        console.log('开始调用身份验证接口');
-        console.log('请求参数:', {
-          name: this.formData.legal_name,
-          idcard: this.formData.legal_idcard_num
-        });
-        
-        uni.showLoading({
-          title: '验证身份信息...'
-        });
-
-        // 调用身份验证接口
-        const checkRes = await request.post('/user/check', {
-          name: this.formData.legal_name,
-          idcard: this.formData.legal_idcard_num
-        });
-
-        uni.hideLoading();
-        
-        console.log('身份验证接口返回结果 ');
-        console.log('完整响应:', checkRes);
-        console.log('响应Code:', checkRes.Code);
-        console.log('响应state:', checkRes.state);
-        console.log('响应msg:', checkRes.msg);
-        console.log('响应data:', checkRes.data);
-        console.log('响应ResultObject:', checkRes.ResultObject);
-        
-        if (checkRes.ResultObject) {
-          console.log('ResultObject.BizCode:', checkRes.ResultObject.BizCode);
-          console.log('ResultObject其他属性:', Object.keys(checkRes.ResultObject));
-        }
-
-        // 根据参考代码的验证逻辑，但需要先检查响应结构
-        if (checkRes.Code === '401') {
-          console.log(' Code 401 验证失败 ');
-          uni.showToast({
-            title: '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-        
-        // 检查多种可能的响应结构
-        if (checkRes.ResultObject) {
-          // 如果 ResultObject 有 BizCode 属性
-          if (checkRes.ResultObject.BizCode && checkRes.ResultObject.BizCode != '1') {
-            console.log(' BizCode 验证失败 ');
-            uni.showToast({
-              title: '您的身份证号与姓名不匹配',
-              icon: 'none',
-              duration: 3000
-            });
-            this.isSubmit = false;
-            return false;
-          }
-          
-          // 如果有其他表示失败的字段
-          if (checkRes.ResultObject.success === false || checkRes.ResultObject.result === false) {
-            console.log('success/result 验证失败');
-            uni.showToast({
-              title: '您的身份证号与姓名不匹配',
-              icon: 'none',
-              duration: 3000
-            });
-            this.isSubmit = false;
-            return false;
-          }
-        }
-        
-        // 检查直接返回的状态字段
-        if (checkRes.state && checkRes.state !== 1) {
-          console.log('state 验证失败');
-          uni.showToast({
-            title: checkRes.msg || '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-        
-        // 如果直接返回 success: false
-        if (checkRes.success === false) {
-          console.log('success 验证失败');
-          uni.showToast({
-            title: checkRes.message || '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-
-        console.log('身份验证通过 ');
-        
-        // 验证通过，创建提交给后端的数据副本，将日期转换为 YYYY-MM-DD 格式
-        const submitData = {
-          ...this.formData,
-          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
-          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
-          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
-          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
-        };
-
-        console.log('submitData:', submitData);
-
-        // 将表单数据保存到全局或本地存储，以便在下一步使用
-        getApp().globalData.qualificationData = submitData;
-        
-        this.isSubmit = false;
-        return true;
-
-      } catch (error) {
-        uni.hideLoading();
-        console.error('身份验证接口调用失败');
-        console.error('错误信息:', error);
-        console.error('错误详情:', error.response || error.message || error);
-        
-        // 根据错误类型显示不同的提示
-        let errorMessage = '身份验证失败';
-        
-        if (error.response) {
-          console.error('响应状态:', error.response.status);
-          console.error('响应数据:', error.response.data);
-          errorMessage = `服务器错误: ${error.response.status}`;
-        } else if (error.message) {
-          errorMessage = error.message;
-        } else if (error.errMsg) {
-          errorMessage = error.errMsg;
-        }
-        
-        uni.showToast({
-          title: errorMessage,
-          icon: 'none',
-          duration: 3000
-        });
-        
-        this.isSubmit = false;
-        return false;
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.qualification-page {
-  /* padding: 0rpx 0; */
-}
-
-.section {
-  margin-bottom: 30rpx;
-}
-
-.section-title {
-  display: flex;
-  align-items: center;
-  margin-bottom: 30rpx;
-}
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 7rpx;
-  border-radius: 5rpx;
-}
-
-.title-text {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #1D2129;
-  line-height: 48rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.section-title text {
-  font-size: 36rpx;
-  color: #1D2129;
-  font-weight: 500;
-}
-
-.box-cont {
-  background: #FFFFFF;
-  border-radius: 20rpx;
-  margin-bottom: 24rpx;
-  margin-left: 8rpx;
-  margin-right: 8rpx;
-  box-shadow: none;
-}
-
-.form-item {
-  padding: 24rpx 22rpx;
-}
-
-.form-item-one {
-  display: flex;
-  align-items: center;
-  padding: 24rpx;
-}
-
-.label-wrapper {
-  display: inline-flex;
-  align-items: center;
-}
-
-.label {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-  line-height: 1;
-}
-
-.label-icon {
-  width: 26rpx;
-  height: 26rpx;
-  margin-left: 8rpx;
-  align-items: center;
-}
-
-.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
-
-.upload-tip {
-  font-size: 26rpx;
-  color: #999;
-  margin: 16rpx 0 24rpx 0;
-  font-weight: 400;
-  font-family: PingFangSC, PingFang SC;
-  text-align: left;
-  font-style: normal;
-}
-
-.upload-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.upload-box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.upload-camera {
-  width: 446rpx;
-  height: 298rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 48rpx;
-  overflow: hidden;
-  background-color: #F8F9FD;
-  position: relative;
-}
-
-.idcard-upload-vertical-container {
-  display: flex;
-  flex-direction: column;
-  padding: 24rpx;
-}
-
-.idcard-upload-vertical-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-bottom: 40rpx;
-}
-
-.idcard-upload-vertical-item:last-child {
-  margin-bottom: 0;
-}
-
-.upload-label.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
-
-.license-upload {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.idcard-front {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.idcard-back {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.camera-icon {
-  width: 446rpx;
-  height: 298rpx;
-  border-radius: 48rpx;
-}
-
-.preview-image {
-  border-radius: 48rpx;
-  width: 100%;
-  height: 100%;
-}
-
-/* 识别状态样式 */
-.recognize-overlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.6);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  border-radius: 48rpx;
-}
-
-.recognize-loading {
-  width: 60rpx;
-  height: 60rpx;
-  border: 4rpx solid #fff;
-  border-top: 4rpx solid #E8101E;
-  border-radius: 50%;
-  animation: spin 1s linear infinite;
-  margin-bottom: 16rpx;
-}
-
-.recognize-text {
-  color: #fff;
-  font-size: 24rpx;
-}
-
-@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
-.picker-content {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  flex: 1;
-}
-
-.picker-content text {
-  margin-right: 19rpx;
-}
-
-/* 日期选择框竖线分隔符 */
-.date-divider {
-  width: 2rpx;
-  height: 30rpx;
-  background-color: #E9E9E9;
-  margin: 0 15rpx 0 0;
-}
-
-/* 置灰状态下的竖线 */
-.date-picker-box.disabled .date-divider {
-  background-color: #F3F3F3;
-}
-
-/* 确保日期文字区域可以自动扩展 */
-.date-picker-box text {
-  flex: 1;
-}
-
-.arrow-right {
-  width: 14rpx;
-  height: 26rpx;
-}
-
-
-.placeholder {
-  color: #999999;
-  font-size: 28rpx;
-}
-
-.picker-value {
-  font-size: 28rpx;
-  color: #333333;
-}
-
-.input {
-  flex: 1;
-  font-size: 28rpx;
-  color: #333333;
-  text-align: right;
-  margin-left: 20rpx;
-}
-
-.radio-group {
-  display: flex;
-  margin-top: 24rpx;
-  width: 100%;
-}
-
-.radio-item {
-  display: flex;
-  align-items: center;
-  margin-right: 130rpx;
-}
-
-.radio {
-  width: 30rpx;
-  height: 30rpx;
-  border: 2rpx solid #DDDDDD;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 16rpx;
-}
-
-.radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
-}
-
-.radio-icon-image {
-  width: 32rpx;
-  height: 32rpx;
-}
-
-.radio-label {
-  font-size: 28rpx;
-  color: #333333;
-}
-
-/* 日期范围容器样式 */
-.date-range-container {
-  padding: 24rpx;
-  display: flex;
-  justify-content: space-between;
-}
-
-.date-item {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-.date-item:first-child {
-  margin-right: 24rpx;
-}
-
-.date-label {
-  font-size: 28rpx;
-  color: #333333;
-  margin-bottom: 16rpx;
-  font-weight: 500;
-  margin-left: 8rpx;
-}
-
-.date-picker-box {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border: 2rpx solid #E9E9E9;
-  border-radius: 10rpx;
-  padding: 12rpx 19rpx;
-  background-color: transparent;
-}
-
-.date-picker-box.disabled {
-  border: 2rpx solid #F3F3F3;
-}
-
-.date-picker-box.disabled .date-value,
-.date-picker-box.disabled .placeholder {
-  color: #CCCCCC;
-}
-
-.date-value {
-  font-size: 28rpx;
-  color: #333;
-}
-
-.date-arrow {
-  width: 35rpx;
-  height: 33rpx;
-}
-
-.upload-label {
-  font-family: Helvetica;
-  font-size: 28rpx;
-  color: #999;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-  margin-top: 24rpx;
-}
-
-/* 弹出框样式 */
-.popup {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 999;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.popup-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.popup-content {
-  position: relative;
-  background-color: #FFFFFF;
-  border-radius: 24rpx 24rpx 0 0;
-  padding: 32rpx;
-  transform: translateY(100%);
-  transition: transform 0.3s ease;
-  max-height: 70vh;
-}
-
-.popup.show .popup-content {
-  transform: translateY(0);
-}
-
-.popup-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 32rpx;
-}
-
-.popup-title {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.popup-close {
-  font-size: 40rpx;
-  color: #999999;
-  padding: 16rpx;
-}
-
-.popup-body {
-  max-height: 400rpx;
-  overflow-y: auto;
-}
-
-.radio-list .radio-item {
-  margin-bottom: 32rpx;
-}
-
-.popup-footer {
-  margin-top: 32rpx;
-}
-
-.popup-btn {
-  height: 88rpx;
-  border-radius: 44rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-}
-
-.popup-btn .btn-text {
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #FFFFFF;
-}
-
-.cancel-text, .confirm-text {
-  font-size: 32rpx;
-  padding: 16rpx;
-}
-
-.cancel-text {
-  color: #666666;
-}
-
-.confirm-text {
-  color: #E8101E;
-  font-weight: 500;
-}
-
-.picker-scroll {
-  height: 400rpx;
-}
-
-.picker-item {
-  height: 68rpx;
-  line-height: 68rpx;
-  text-align: center;
-  font-size: 28rpx;
-}
-
-/* 提示弹窗样式 */
-.tip-popup {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 1000;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.tip-popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.tip-popup-mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.tip-popup-content {
-  position: relative;
-  width: 620rpx;
-  height: 810rpx;
-}
-
-.tip-popup-bg {
-  width: 620rpx;
-  height: 810rpx;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.tip-popup-body {
-  position: relative;
-  flex-direction: column;
-  padding: 80rpx 20rpx 40rpx 20rpx;
-  box-sizing: border-box;
-}
-
-.tip-title {
-  font-size: 36rpx;
-  font-weight: bold;
-  color: #333;
-  text-align: center;
-  margin-top: 107rpx;
-  margin-bottom: 37rpx;
-}
-
-.tip-image-container {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 50rpx;
-}
-
-.tip-image {
-  width: 90%;
-  max-height: 400rpx;
-}
-
-.tip-buttons {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 28rpx;
-}
-
-.tip-btn {
-  width: 250rpx;
-  height: 80rpx;
-  border-radius: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 32rpx;
-  font-weight: 500;
-}
-
-.tip-btn.cancel {
-  border: #E8101E 2rpx solid;
-  background-color: transparent;
-  color: #e8101e;
-}
-
-.tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-  color: #FFFFFF;
-}
-
-.tip-btn .btn-text {
-  color: inherit;
-}
+<template>
+    <view class="qualification-page">
+        <view class="section">
+            <view class="section-title">
+                <view class="title-bar"></view>
+                <text class="title-text">门店信息</text>
+            </view>
+
+            <view class="form-item-one box-cont">
+                <view class="label-wrapper">
+                    <text class="label required">店铺名称</text>
+                    <image class="label-icon"
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+                        mode="aspectFit" @click="showTipPopup('name')"></image>
+                </view>
+                <input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" placeholder-class="placeholder"
+                    class="input" @input="saveFormDataToLocalDebounce" />
+            </view>
+            <view class="form-item-two box-cont" @click="showLocationPopup">
+                <text class="label required">门店所在地</text>
+                <view class="picker-content">
+                    <text :class="formData.dependency ? 'picker-value' : 'placeholder'">
+                        {{ formData.dependency || '请选择' }}
+                    </text>
+                    <image
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+                        class="arrow-right" mode="aspectFit"></image>
+                </view>
+            </view>
+            <view class="form-item-two box-cont" @click="getAddressInfo">
+                <text class="label required">门店详细地址</text>
+                <view class="picker-content">
+                    <text :class="formData.address ? 'picker-value' : 'placeholder'">
+                        {{ formData.address || '请选择' }}
+                    </text>
+                    <image
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+                        class="arrow-right" mode="aspectFit"></image>
+                </view>
+            </view>
+        </view>
+
+        <view class="section">
+            <view class="section-title">
+                <view class="title-bar"></view>
+                <text class="title-text">联系人信息</text>
+            </view>
+
+            <view class="form-item box-cont">
+                <text class="label required">您的身份</text>
+                <view class="radio-group">
+                    <view class="radio-item" @click="setContactType('1')">
+                        <view class="radio" :class="{ checked: formData.contact_type === '1' }">
+                            <image v-if="formData.contact_type === '1'" src="/static/images/agree_y.png"
+                                class="radio-icon-image" mode="aspectFit"></image>
+                        </view>
+                        <text class="radio-label">法人</text>
+                    </view>
+                    <view class="radio-item" @click="setContactType('2')">
+                        <view class="radio" :class="{ checked: formData.contact_type === '2' }">
+                            <image v-if="formData.contact_type === '2'" src="/static/images/agree_y.png"
+                                class="radio-icon-image" mode="aspectFit"></image>
+                        </view>
+                        <text class="radio-label">其他</text>
+                    </view>
+                </view>
+            </view>
+
+            <view class="form-item-one box-cont">
+                <text class="label required">联系人</text>
+                <input type="text" v-model="formData.contact_name" placeholder="请输入" placeholder-class="placeholder"
+                    class="input" @input="saveFormDataToLocalDebounce" />
+            </view>
+
+            <view class="form-item-one box-cont">
+                <text class="label required">联系人电话</text>
+                <input type="number" v-model="formData.contact_phone" placeholder="请输入联系电话"
+                    placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
+            </view>
+
+            <view class="form-item-one box-cont">
+                <text class="label">备用联系人电话</text>
+                <input type="number" v-model="formData.backup_phone" placeholder="请输入备用联系电话"
+                    placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
+            </view>
+        </view>
+
+        <view class="form-item-one-yqr box-cont invite-code-container">
+            <view class="invite-code-top">
+                <view class="label-wrapper">
+                    <text class="label required">邀请码</text>
+                </view>
+                <input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码"
+                    placeholder-class="placeholder" class="input" @input="handleInviteCodeInput" />
+            </view>
+
+            <!-- 分割线 -->
+            <view class="divider"></view>
+
+            <!-- 邀请人信息 -->
+            <view class="invite-info-container">
+                <!-- 默认提示 -->
+                <text v-if="!formData.invite_code_other" class="invite-tip">
+                    请填写邀请人的邀请码，若没有邀请人请填写13131313
+                </text>
+
+                <!-- 验证中 -->
+                <view v-else-if="inviteCodeValidating" class="invite-validating">
+                    <text>验证中...</text>
+                </view>
+
+                <!-- 验证失败 -->
+                <view v-else-if="inviteCodeError" class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
+                    <text>邀请码无效</text>
+                </view>
+
+                <!-- 特殊邀请码13131313 -->
+                <view v-else-if="formData.invite_code_other === '13131313' && !inviterInfo" class="invite-tip">
+                    请填写邀请人的邀请码，若没有邀请人请填写13131313
+                </view>
+
+                <!-- 显示邀请人信息 -->
+                <view v-else-if="inviterInfo" class="inviter-info">
+                    <text class="inviter-label">邀请人：</text>
+                    <text class="inviter-name">{{ inviterInfo.name || inviterInfo.nick_name }}</text>
+                    <text class="inviter-divider">/</text>
+                    <text class="inviter-phone">{{ inviterInfo.account }}</text>
+                </view>
+
+                <!-- 其他情况（接口返回成功但没有认证铁军的邀请码） -->
+                <view v-else class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
+                    <text>邀请码无效</text>
+                </view>
+            </view>
+        </view>
+
+        <view class="popup" :class="{ show: showLocationPopupFlag }">
+            <view class="popup-mask" @click="hideLocationPopup"></view>
+            <view class="popup-content">
+                <view class="popup-header">
+                    <text class="popup-title">选择所在地</text>
+                    <text class="popup-close" @click="hideLocationPopup">×</text>
+                </view>
+                <view class="region-body">
+                    <picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
+                        :value="locationValue">
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
+                                {{ item.province }}
+                            </view>
+                        </picker-view-column>
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item, index) in locatinCitys" :key="index">
+                                {{ item.city }}
+                            </view>
+                        </picker-view-column>
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item, index) in locationAreas" :key="index">
+                                {{ item.area }}
+                            </view>
+                        </picker-view-column>
+                    </picker-view>
+                </view>
+                <view class="popup-footer">
+                    <view class="popup-btn confirm" @click="hideLocationPopup">
+                        <text class="btn-text">取消</text>
+                    </view>
+                    <view class="popup-btn confirm" @click="confirmLocationSelect">
+                        <text class="btn-text">确定</text>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+            <view class="tip-popup-mask" @click="hideTipPopup"></view>
+            <view class="tip-popup-content">
+                <image class="tip-popup-bg"
+                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
+                    mode="aspectFit"></image>
+
+                <view class="tip-popup-body">
+                    <view class="tip-title">{{ tipTitle }}</view>
+                    <view class="tip-image-container">
+                        <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
+                    </view>
+                    <view class="tip-buttons">
+                        <view class="tip-btn cancel" @click="hideTipPopup">
+                            <text class="btn-text">取消</text>
+                        </view>
+                        <view class="tip-btn confirm" @click="hideTipPopup">
+                            <text class="btn-text">我已了解</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <uni-popup ref="existingInvitePopup" type="center" :mask-click="false">
+            <view class="invite-popup-content">
+                <view class="invite-popup-header">
+                    <text class="invite-popup-title">请确认邀请信息</text>
+                </view>
+                <view class="invite-popup-body">
+                    <view class="invite-item">
+                        <text class="invite-label">邀请码</text>
+                        <text class="invite-value">{{ existingInviterInfo && (existingInviterInfo.invite_code ||
+                            existingInviterInfo.invite_code_other) }}</text>
+                    </view>
+                    <view class="invite-item">
+                        <text class="invite-label">邀请人</text>
+                        <text class="invite-value">{{ (existingInviterInfo && (existingInviterInfo.name ||
+                            existingInviterInfo.nick_name)) || '' }}</text>
+                    </view>
+                </view>
+                <view class="invite-popup-footer">
+                    <view class="invite-btn cancel" @click="cancelInviteConfirm">关闭</view>
+                    <view class="invite-btn confirm" @click="useExistingInviteCode">确认</view>
+                </view>
+            </view>
+        </uni-popup>
+
+    </view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import {
+    debounce
+} from '@/utils/debounce.js';
+import ChinaCitys from '../../static/data/ChinaCitys.json';
+
+export default {
+    data() {
+        const loadedData = this.loadFormDataFromLocal();
+
+        return {
+            userId: null,
+            userMobile: null, // 保存用户手机号用以查询邀请人
+            formData: loadedData || {
+                name: '',
+                contact_type: '1',
+                contact_name: '',
+                contact_phone: '',
+                backup_phone: '',
+                invite_code_other: '',
+                dependency: '',
+                address: '',
+                dependency_code: '',
+                dependency_province: '',
+                dependency_city: '',
+                longitude: '',
+                latitude: ''
+            },
+            showTipPopupFlag: false,
+            indicatorStyle: 'height: 68rpx;',
+            tipTitle: '',
+            tipImage: '',
+            currentTipType: '',
+            isSubmit: false,
+            identity: 2,
+
+            ChinaCitys: ChinaCitys,
+            locatinCitys: [],
+            locationAreas: [],
+            locationValue: [0, 0, 0],
+            showLocationPopupFlag: false,
+            // 抖动效果控制
+            shakeInviteError: false,
+
+            // 邀请码相关字段
+            inviteCodeValidating: false,
+            inviteCodeError: false,
+            inviterInfo: null,
+            currentValidatingCode: '',
+            inviteValidationTimer: null,
+
+            // 新增邀请码弹窗和替换逻辑需要的状态变量
+            existingInviterInfo: null,
+            hasExistingInviter: false,
+            hasAutoReplacedInvite: false,
+            confirmResolve: null // 存储 saveFormData 的 Promise resolve 方法
+        }
+    },
+    computed: {
+
+    },
+
+    watch: {
+        'formData.name'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.contact_name'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.contact_phone'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.backup_phone'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.invite_code_other'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.dependency'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.address'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        }
+    },
+
+    created() {
+        this.getUserInfo();
+        this.checkGlobalData();
+        this.setupAddressListener();
+    },
+
+    onShow() {
+        const localData = this.loadFormDataFromLocal();
+        if (localData) {
+            // 如果已经自动替换了邀请码，不要再覆盖
+            if (this.hasAutoReplacedInvite) {
+                const { invite_code_other, ...otherData } = localData;
+                Object.keys(otherData).forEach(key => {
+                    if (this.formData[key] !== undefined && key !== 'invite_code_other') {
+                        this.formData[key] = otherData[key];
+                    }
+                });
+            } else {
+                this.formData = {
+                    ...this.formData,
+                    ...localData
+                };
+            }
+        }
+
+        this.checkGlobalData();
+        this.checkAddressData();
+
+        this.loadInviteStateFromLocal();
+
+        if (this.formData.invite_code_other) {
+            this.validateInviteCode(this.formData.invite_code_other);
+        }
+    },
+
+    onUnload() {
+        this.saveFormDataToLocal();
+    },
+
+    beforeDestroy() {
+        if (this.addressListener) {
+            uni.$off('address-selected', this.addressListener);
+        }
+        if (this.sjAddressListener) {
+            uni.$off('address-selected-for-sj', this.sjAddressListener);
+        }
+    },
+
+    async mounted() {
+        this.locatinCitys = this.ChinaCitys[0].citys;
+        this.locationAreas = this.locatinCitys[0].areas;
+
+        // 先检查绑定邀请人信息
+        await this.forceUseExistingInviter();
+
+        if (!this.hasAutoReplacedInvite && this.formData.invite_code_other) {
+            this.validateInviteCode(this.formData.invite_code_other);
+        }
+    },
+
+    onHide() {
+        this.saveFormDataToLocal();
+    },
+
+    methods: {
+        // 强制使用已绑定的邀请人
+        async forceUseExistingInviter() {
+            if (this.hasAutoReplacedInvite) return false;
+
+            // 确保我们有手机号，如果没有则再获取一次
+            if (!this.userMobile) {
+                await this.getUserInfo();
+            }
+            if (!this.userMobile) {
+                console.log('用户手机号未获取，跳过强制替换');
+                return false;
+            }
+
+            try {
+                // 1. 调用查询已绑定的邀请码
+                const res = await request.post('/sj/User/getBInviteCode', {
+                    account: this.userMobile,
+                    type: 2 // 商家端类型
+                });
+
+                if (res && (res.code === 200 || res.state === 1) && res.data) {
+                    const oldInviteCode = res.data.invite_code || res.data.invite_code_other;
+
+                    if (oldInviteCode) {
+                        console.log('检测到已绑定邀请码:', oldInviteCode);
+
+                        // 2. 用邀请码获取完整的邀请人信息
+                        const inviteRes = await request.post('/sj/user/getInvite', {
+                            invite_code: oldInviteCode
+                        });
+
+                        if (inviteRes && (inviteRes.code === 200 || inviteRes.state === 1) && inviteRes.data && inviteRes.data.account) {
+                            const fullInviterInfo = inviteRes.data;
+
+                            // 强制填充
+                            this.formData.invite_code_other = oldInviteCode;
+                            this.hasExistingInviter = true;
+                            this.hasAutoReplacedInvite = true;
+                            this.inviteCodeError = false;
+                            this.inviterInfo = fullInviterInfo;
+                            this.currentValidatingCode = oldInviteCode;
+                            this.existingInviterInfo = fullInviterInfo;
+
+                            // 保存状态
+                            this.saveInviteStateToLocal();
+                            this.saveFormDataToLocal();
+
+                            return true;
+                        }
+                    }
+                }
+            } catch (error) {
+                console.error('强制替换邀请人失败:', error);
+            }
+            return false;
+        },
+
+        // 显示邀请码确认弹窗
+        showInviteConfirmPopup(inviterData) {
+            this.$nextTick(() => {
+                if (this.$refs.existingInvitePopup) {
+                    this.existingInviterInfo = inviterData;
+                    this.$refs.existingInvitePopup.open();
+                } else {
+                    uni.showModal({
+                        title: '请确认邀请信息',
+                        content: `邀请码：${inviterData?.invite_code || inviterData?.invite_code_other}\n邀请人：${inviterData?.name || inviterData?.nick_name}`,
+                        confirmText: '确认',
+                        cancelText: '取消',
+                        success: (res) => {
+                            if (res.confirm) {
+                                this.useExistingInviteCode();
+                            } else {
+                                this.cancelInviteConfirm();
+                            }
+                        }
+                    });
+                }
+            });
+        },
+
+        // 隐藏邀请码确认弹窗
+        hideExistingInviteTipPopup() {
+            if (this.$refs.existingInvitePopup) {
+                this.$refs.existingInvitePopup.close();
+            }
+        },
+
+        // 用户点击确认按钮使用邀请码
+        useExistingInviteCode() {
+            if (this.existingInviterInfo) {
+                const inviteState = {
+                    inviterInfo: this.existingInviterInfo,
+                    inviteCodeError: false,
+                    currentValidatingCode: this.existingInviterInfo.invite_code || this.existingInviterInfo.invite_code_other
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+                this.saveFormDataToLocal();
+            }
+            this.hideExistingInviteTipPopup();
+
+            // 触发 Promise 解决，以继续表单提交流程
+            if (this.confirmResolve) {
+                this.confirmResolve(true);
+                this.confirmResolve = null;
+            }
+        },
+
+        // 用户点击关闭/取消按钮
+        cancelInviteConfirm() {
+            this.hideExistingInviteTipPopup();
+            // 触发 Promise 拒绝拦截提交
+            if (this.confirmResolve) {
+                this.confirmResolve(false);
+                this.confirmResolve = null;
+            }
+        },
+
+        loadInviteStateFromLocal() {
+            try {
+                const inviteState = uni.getStorageSync('store_invite_state');
+                if (inviteState) {
+                    console.log('加载邀请码验证状态:', inviteState);
+
+                    // 恢复邀请码验证状态
+                    this.inviterInfo = inviteState.inviterInfo || null;
+                    this.inviteCodeError = inviteState.inviteCodeError || false;
+                    this.currentValidatingCode = inviteState.currentValidatingCode || '';
+
+                    // 特殊处理：如果当前邀请码是13131313，确保状态正确
+                    if (this.formData.invite_code_other === '13131313') {
+                        console.log('检测到特殊邀请码13131313，重置验证状态');
+                        this.inviteCodeError = false;
+                        this.inviterInfo = null;
+                        this.currentValidatingCode = '13131313';
+                    }
+
+                    // 如果正在验证的邀请码与当前表单中的一致，保持验证状态
+                    if (this.currentValidatingCode === this.formData.invite_code_other) {
+                        // 状态已恢复，无需额外操作
+                    } else {
+                        // 如果不一致，重新验证
+                        if (this.formData.invite_code_other && this.formData.invite_code_other.trim() !== '') {
+                            console.log('邀请码不一致，重新验证:', this.formData.invite_code_other);
+                            this.handleInviteCodeInput({
+                                detail: {
+                                    value: this.formData.invite_code_other
+                                }
+                            });
+                        }
+                    }
+                } else {
+                    // 如果没有保存的状态，重置为初始状态
+                    this.resetInviteCodeState();
+                }
+            } catch (e) {
+                console.log('加载邀请码验证状态失败:', e);
+                this.resetInviteCodeState();
+            }
+        },
+
+        // 新增方法：重置邀请码状态
+        resetInviteCodeState() {
+            this.inviteCodeValidating = false;
+            this.inviteCodeError = false;
+            this.inviterInfo = null;
+            this.currentValidatingCode = '';
+            this.shakeInviteError = false;
+        },
+
+        // 新增方法：专门保存邀请码验证状态
+        saveInviteStateToLocal() {
+            try {
+                const inviteState = {
+                    inviterInfo: this.inviterInfo,
+                    inviteCodeError: this.inviteCodeError,
+                    currentValidatingCode: this.currentValidatingCode || this.formData.invite_code_other || ''
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+
+                console.log('邀请码验证状态已保存:', {
+                    hasInviterInfo: !!this.inviterInfo,
+                    inviteCodeError: this.inviteCodeError,
+                    currentValidatingCode: this.currentValidatingCode
+                });
+            } catch (e) {
+                console.log('保存邀请码验证状态失败:', e);
+            }
+        },
+        // 触发邀请码错误抖动效果
+        triggerInviteErrorShake() {
+            // 触发抖动效果
+            this.shakeInviteError = true;
+
+            // 滚动到邀请码容器位置
+            this.$nextTick(() => {
+                // 使用uni.createSelectorQuery获取邀请码容器的位置
+                const query = uni.createSelectorQuery().in(this);
+                query.select('.invite-code-container').boundingClientRect((rect) => {
+                    if (rect) {
+                        // 获取当前窗口高度
+                        const windowHeight = uni.getSystemInfoSync().windowHeight;
+
+                        // 判断邀请码容器是否已经在可视区域内
+                        // 计算容器在屏幕中的位置比例（0-1之间）
+                        const containerTopRatio = rect.top / windowHeight;
+                        const containerBottomRatio = (rect.top + rect.height) / windowHeight;
+
+                        // 如果容器已经在屏幕中上部（顶部在屏幕中间以上），就不需要滚动
+                        // 或者容器整体都在屏幕内，也不需要滚动
+                        if (containerTopRatio >= 0 && containerTopRatio < 0.7 &&
+                            containerBottomRatio <= 1) {
+                            console.log('邀请码容器已在可视区域内，不需要滚动');
+                            return;
+                        }
+
+                        // 滚动到邀请码容器位置，减去一些偏移量让用户体验更好
+                        uni.pageScrollTo({
+                            scrollTop: rect.top - 50,
+                            duration: 300
+                        });
+                    }
+                }).exec();
+            });
+
+            // 0.5秒后重置抖动状态
+            setTimeout(() => {
+                this.shakeInviteError = false;
+            }, 500);
+        },
+
+        // 处理邀请码输入
+        handleInviteCodeInput(e) {
+            // 【改动】如果已经被强制替换为已有邀请人，禁止任何手动修改
+            if (this.hasAutoReplacedInvite) {
+                console.log('已强制使用原邀请人，禁止修改邀请码');
+                this.formData.invite_code_other = this.inviterInfo ? (this.inviterInfo.invite_code || this.inviterInfo.invite_code_other) : '';
+                return;
+            }
+
+            const code = e.detail ? e.detail.value : this.formData.invite_code_other;
+
+            console.log('邀请码输入:', code);
+
+            // 立即重置状态
+            this.inviteCodeValidating = false;
+            this.inviteCodeError = false;
+            this.inviterInfo = null;
+
+            // 如果邀请码为空，不进行验证
+            if (!code || code.trim() === '') {
+                this.formData.invite_code_other = '';
+                this.saveFormDataToLocalDebounce();
+                // 保存空状态
+                this.saveInviteStateToLocal();
+                return;
+            }
+
+            this.formData.invite_code_other = code;
+            this.saveFormDataToLocalDebounce();
+
+            // 【关键修复】如果是13131313，立即通过验证并取消任何正在进行的验证
+            if (code === '13131313') {
+                console.log('检测到特殊邀请码13131313，立即通过');
+
+                // 清除任何可能的定时器
+                if (this.inviteValidationTimer) {
+                    clearTimeout(this.inviteValidationTimer);
+                    this.inviteValidationTimer = null;
+                }
+
+                // 立即更新状态
+                this.inviteCodeValidating = false;
+                this.inviteCodeError = false;
+                this.inviterInfo = null;
+                this.currentValidatingCode = code;
+
+                // 特殊邀请码也需要保存状态
+                const inviteState = {
+                    inviterInfo: null,
+                    inviteCodeError: false,
+                    currentValidatingCode: code
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+
+                // 强制更新视图
+                this.$forceUpdate();
+                return;
+            }
+
+            // 记录当前正在验证的邀请码
+            this.currentValidatingCode = code;
+
+            // 立即保存状态（验证中）
+            this.saveInviteStateToLocal();
+
+            // 清除之前的定时器
+            if (this.inviteValidationTimer) {
+                clearTimeout(this.inviteValidationTimer);
+                this.inviteValidationTimer = null;
+            }
+
+            // 设置新的定时器
+            this.inviteValidationTimer = setTimeout(() => {
+                // 检查邀请码是否变化
+                if (this.formData.invite_code_other !== this.currentValidatingCode) {
+                    console.log('邀请码已变化，取消验证');
+                    return;
+                }
+
+                // 再次检查是否是13131313（双重检查）
+                if (this.formData.invite_code_other === '13131313') {
+                    console.log('双重检查：检测到特殊邀请码13131313');
+                    this.inviteCodeValidating = false;
+                    this.inviteCodeError = false;
+                    this.inviterInfo = null;
+                    this.currentValidatingCode = '13131313';
+
+                    const inviteState = {
+                        inviterInfo: null,
+                        inviteCodeError: false,
+                        currentValidatingCode: '13131313'
+                    };
+                    uni.setStorageSync('store_invite_state', inviteState);
+                    return;
+                }
+
+                console.log('开始验证邀请码:', this.formData.invite_code_other);
+                this.validateInviteCode(this.formData.invite_code_other);
+
+                // 清理定时器
+                this.inviteValidationTimer = null;
+            }, 600); // 适当增加延迟时间
+        },
+
+        // 验证邀请码
+        async validateInviteCode(code) {
+            console.log('开始验证邀请码:', code);
+
+            // 特殊邀请码13131313直接通过
+            if (code === '13131313') {
+                console.log('特殊邀请码13131313，直接通过');
+                this.inviteCodeValidating = false;
+                this.inviteCodeError = false;
+                this.inviterInfo = null;
+                this.currentValidatingCode = code;
+                // 特殊邀请码也需要保存状态
+                const inviteState = {
+                    inviterInfo: null,
+                    inviteCodeError: false,
+                    currentValidatingCode: code
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+
+                // 强制更新视图
+                this.$forceUpdate();
+                return;
+            }
+
+            // 如果邀请码为空
+            if (!code || code.trim() === '') {
+                this.inviteCodeValidating = false;
+                this.inviteCodeError = false;
+                this.inviterInfo = null;
+                this.currentValidatingCode = '';
+                const inviteState = {
+                    inviterInfo: null,
+                    inviteCodeError: false,
+                    currentValidatingCode: ''
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+                return;
+            }
+
+            // 设置验证中状态
+            this.inviteCodeValidating = true;
+            this.inviteCodeError = false;
+            this.inviterInfo = null;
+            this.currentValidatingCode = code;
+
+            try {
+                // 调用接口验证邀请码
+                const response = await request.post('/sj/user/getInvite', {
+                    invite_code: code
+                });
+
+                console.log('邀请码验证响应:', response);
+
+                // 验证完成
+                this.inviteCodeValidating = false;
+
+                if (response && (response.state === 1 || response.code === 200) && response.data) {
+                    const userData = response.data;
+
+                    if (userData.account) {
+                        // 邀请码有效，保存邀请人信息
+                        this.inviterInfo = userData;
+                        this.inviteCodeError = false;
+                        console.log('邀请码验证通过，邀请人:', userData);
+                    } else {
+                        // 接口返回数据但没有account字段，说明不是有效邀请人
+                        console.log('接口返回数据无效，没有account字段:', userData);
+                        this.inviterInfo = null;
+                        this.inviteCodeError = true;
+                    }
+                } else {
+                    // 接口返回错误或数据为空
+                    console.log('接口返回错误:', response?.msg || '未知错误');
+                    this.inviterInfo = null;
+                    this.inviteCodeError = true;
+                }
+            } catch (error) {
+                console.error('验证邀请码失败:', error);
+                this.inviteCodeValidating = false;
+                this.inviteCodeError = true;
+                this.inviterInfo = null;
+            } finally {
+                // 无论成功失败都保存状态
+                const inviteState = {
+                    inviterInfo: this.inviterInfo,
+                    inviteCodeError: this.inviteCodeError,
+                    currentValidatingCode: this.currentValidatingCode
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+            }
+        },
+        checkGlobalData() {
+            if (getApp().globalData.qualificationData) {
+                this.formData = {
+                    ...this.formData,
+                    ...getApp().globalData.qualificationData
+                };
+                this.saveFormDataToLocal();
+                getApp().globalData.qualificationData = null;
+            }
+        },
+
+        loadFormDataFromLocal() {
+            try {
+                const stored = uni.getStorageSync('qualification_form_data');
+                if (stored) {
+                    console.log('从本地存储加载数据:', stored);
+
+                    const inviteState = uni.getStorageSync('store_invite_state');
+                    if (inviteState) {
+                        this.inviterInfo = inviteState.inviterInfo;
+                        this.inviteCodeError = inviteState.inviteCodeError || false;
+                        this.currentValidatingCode = inviteState.currentValidatingCode || '';
+                        console.log('加载邀请码验证状态:', inviteState);
+                    }
+
+                    return stored;
+                }
+            } catch (e) {
+                console.log('读取本地存储失败:', e);
+            }
+            return null;
+        },
+
+        saveFormDataToLocalDebounce: debounce(function () {
+            this.saveFormDataToLocal();
+        }, 500),
+
+        saveFormDataToLocal() {
+            try {
+                uni.setStorageSync('qualification_form_data', this.formData);
+
+                const inviteState = {
+                    inviterInfo: this.inviterInfo,
+                    inviteCodeError: this.inviteCodeError,
+                    currentValidatingCode: this.currentValidatingCode
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+                console.log('数据已保存到本地存储');
+            } catch (e) {
+                console.log('保存数据失败:', e);
+            }
+        },
+
+        clearFormDataLocal() {
+            try {
+                uni.removeStorageSync('qualification_form_data');
+                console.log('已清空本地存储数据');
+            } catch (e) {
+                console.log('清空数据失败:', e);
+            }
+        },
+
+        getUserInfo() {
+            // 【改动】增加了对手机号的抓取并暴露至 data 内，以供给查询上级分销/邀请人使用
+            return new Promise((resolve, reject) => {
+                request.post('/sj/user/getuser').then(result => {
+                    if (result.state === 1) {
+                        this.userId = result.data.id;
+                        this.userMobile = result.data.mobile || result.data.account; // 记录手机号
+                        if (this.userMobile && getApp().globalData) {
+                            getApp().globalData.userMobile = this.userMobile;
+                        }
+                        console.log('用户ID获取成功:', this.userId);
+                        resolve(this.userId);
+                    } else {
+                        console.error('获取用户信息失败:', result.msg);
+                        reject(result.msg);
+                    }
+                }).catch(error => {
+                    console.error('获取用户信息接口错误:', error);
+                    reject(error);
+                });
+            });
+        },
+
+        getFormData() {
+            return {
+                ...this.formData
+            };
+        },
+
+        // 这里改造为了 Promise，以拦截并弹窗等待用户操作
+        saveFormData() {
+            return new Promise((resolve) => {
+                if (!this.formData.name) {
+                    uni.showToast({
+                        title: '请输入店铺名称',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!this.formData.dependency) {
+                    uni.showToast({
+                        title: '请选择门店所在地',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!this.formData.address) {
+                    uni.showToast({
+                        title: '请选择门店详细地址',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!this.formData.contact_name) {
+                    uni.showToast({
+                        title: '请输入联系人',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!this.formData.contact_phone) {
+                    uni.showToast({
+                        title: '请输入联系人电话',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!/^1[3-9]\d{9}$/.test(this.formData.contact_phone)) {
+                    uni.showToast({
+                        title: '请输入正确的手机号码',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!this.formData.invite_code_other) {
+                    uni.showToast({
+                        title: '请输入邀请码',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+
+                // 验证邀请码的有效性状态
+                if (this.inviteCodeValidating) {
+                    uni.showToast({ title: '邀请码验证中，请稍候', icon: 'none' });
+                    return resolve(false);
+                }
+
+                if (this.formData.invite_code_other === '13131313') {
+                    // 特殊跳过判断
+                } else if (this.inviteCodeError || !this.inviterInfo) {
+                    this.triggerInviteErrorShake();
+                    return resolve(false);
+                }
+
+                // 挂载 resolve，在确认弹窗触发后再予以抛出
+                this.confirmResolve = resolve;
+
+                if (this.formData.invite_code_other === '13131313') {
+                    this.showInviteConfirmPopup({ invite_code_other: '13131313', name: '暂无邀请人' });
+                } else if (this.inviterInfo && this.formData.invite_code_other) {
+                    this.showInviteConfirmPopup(this.inviterInfo);
+                } else {
+                    this.saveFormDataToLocal();
+                    resolve(true);
+                }
+            });
+        },
+
+        setContactType(type) {
+            this.$set(this.formData, 'contact_type', type);
+            this.saveFormDataToLocal();
+        },
+
+        showTipPopup(field) {
+            const tipConfig = {
+                'name': {
+                    title: '如何查看店铺名称',
+                    image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
+                }
+            };
+
+            if (tipConfig[field]) {
+                this.currentTipType = field;
+                this.tipTitle = tipConfig[field].title;
+                this.tipImage = tipConfig[field].image;
+                this.showTipPopupFlag = true;
+            }
+        },
+
+        hideTipPopup() {
+            this.showTipPopupFlag = false;
+        },
+
+        showLocationPopup() {
+            this.showLocationPopupFlag = true;
+        },
+
+        hideLocationPopup() {
+            this.showLocationPopupFlag = false;
+        },
+
+        bindChangeLocation(e) {
+            this.locationValue = e.detail.value;
+            let index1 = e.detail.value[0] || 0;
+            let index2 = e.detail.value[1] || 0;
+            this.locatinCitys = this.ChinaCitys[index1].citys;
+            this.locationAreas = this.locatinCitys[index2].areas;
+        },
+
+        confirmLocationSelect() {
+            let valueArr = this.locationValue;
+            let index1 = valueArr[0] || 0;
+            let index2 = valueArr[1] || 0;
+            let index3 = valueArr[2] || 0;
+            let province = this.ChinaCitys[index1].province;
+            let city = this.locatinCitys[index2].city;
+            let area = this.locationAreas[index3].area;
+            this.formData.dependency = province + '-' + city + '-' + area;
+
+            this.formData.address = '';
+            this.formData.longitude = '';
+            this.formData.latitude = '';
+
+            if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+                let provinceCode = this.ChinaCitys[index1].code.toString();
+                this.formData.dependency_province = provinceCode.substring(0, 6);
+            }
+            if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
+                let cityCode = this.locatinCitys[index2].code.toString();
+                this.formData.dependency_city = cityCode.substring(0, 6);
+            }
+            if (this.locationAreas[index3] && this.locationAreas[index3].code) {
+                let areaCode = this.locationAreas[index3].code.toString();
+                this.formData.dependency_code = areaCode.substring(0, 6);
+            }
+
+            this.saveFormDataToLocal();
+            this.hideLocationPopup();
+        },
+
+        buildRegionTextForSearch() {
+            const dependency = String(this.formData.dependency || '').trim();
+            if (!dependency) return '';
+
+            const parts = dependency.split('-');
+            const province = parts[0] || '';
+            const city = parts[1] || '';
+            const district = parts[2] || '';
+
+            let regionText = '';
+            if (province) regionText += province;
+            if (city && city !== province) regionText += city;
+            if (district) regionText += district;
+
+            return regionText;
+        },
+
+        getAddressValueForSearch() {
+            const rawAddress = String(this.formData.address || '').trim();
+            if (!rawAddress) return '';
+
+            const dependencyText = String(this.formData.dependency || '').trim();
+            const regionText = this.buildRegionTextForSearch();
+
+            let detail = rawAddress;
+
+            if (regionText && detail.indexOf(regionText) === 0) {
+                detail = detail.slice(regionText.length).trim();
+            } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+                detail = detail.slice(dependencyText.length).trim();
+            }
+
+            detail = detail.replace(/^[\s,-]+/, '').trim();
+
+            return detail || rawAddress;
+        },
+
+        getAddressInfo() {
+            this.saveFormDataToLocal();
+
+            const dependency = String(this.formData.dependency || '').trim();
+            const dependencyCode = String(this.formData.dependency_code || '').trim();
+            const address = this.getAddressValueForSearch();
+            const longitude = String(this.formData.longitude || '').trim();
+            const latitude = String(this.formData.latitude || '').trim();
+
+            const hasDependency = !!dependency;
+            const hasAddress = !!address;
+            const hasLocation = !!(longitude && latitude);
+
+            let params = 'source=sj_info';
+
+            if (hasDependency) {
+                params += `&dependency=${encodeURIComponent(dependency)}`;
+                if (dependencyCode) {
+                    params += `&dependency_code=${dependencyCode}`;
+                }
+            }
+
+            if (hasAddress) {
+                params += `&address=${encodeURIComponent(address)}`;
+            }
+
+            if (hasLocation) {
+                params += `&longitude=${longitude}&latitude=${latitude}`;
+            }
+
+            if (!hasDependency && !hasAddress && !hasLocation) {
+                params += '&init_current_location=1&silent_locate=1';
+            }
+
+            uni.navigateTo({
+                url: `/pages/address/search?${params}`
+            });
+        },
+
+        setupAddressListener() {
+            this.addressListener = (addressData) => {
+                this.handleAddressSelected(addressData);
+            };
+            this.sjAddressListener = (addressData) => {
+                this.handleAddressSelected(addressData);
+            };
+            uni.$on('address-selected', this.addressListener);
+            uni.$on('address-selected-for-sj', this.sjAddressListener);
+        },
+
+        checkAddressData() {
+            try {
+                const storedAddress = uni.getStorageSync('sj_selected_address');
+                if (storedAddress) {
+                    this.handleAddressSelected(storedAddress);
+                    uni.removeStorageSync('sj_selected_address');
+                    return;
+                }
+            } catch (e) { }
+
+            if (getApp().globalData && getApp().globalData.selectedAddress) {
+                this.handleAddressSelected(getApp().globalData.selectedAddress);
+                delete getApp().globalData.selectedAddress;
+            }
+
+            try {
+                const selectedAddress = uni.getStorageSync('selectedAddress');
+                if (selectedAddress) {
+                    this.handleAddressSelected(selectedAddress);
+                    uni.removeStorageSync('selectedAddress');
+                }
+            } catch (e) { }
+        },
+
+        handleAddressSelected(addressData) {
+            if (!addressData) return;
+
+            let detailAddress = '';
+            if (addressData.address) {
+                detailAddress = String(addressData.address).trim();
+            } else if (addressData.name) {
+                detailAddress = String(addressData.name).trim();
+
+                const regionParts = [];
+                if (addressData.pname) regionParts.push(addressData.pname);
+                if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData
+                    .cityname);
+                if (addressData.adname) regionParts.push(addressData.adname);
+
+                const regionText = regionParts.join('');
+
+                if (regionText && detailAddress.indexOf(regionText) === 0) {
+                    detailAddress = detailAddress.slice(regionText.length).trim();
+                }
+
+                detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
+            }
+
+            this.formData.address = detailAddress;
+
+            if (addressData.location) {
+                const [longitude, latitude] = String(addressData.location).split(',');
+                this.formData.longitude = longitude || '';
+                this.formData.latitude = latitude || '';
+            }
+
+            if (addressData.pname || addressData.cityname || addressData.adname) {
+                const locationParts = [];
+                if (addressData.pname) locationParts.push(addressData.pname);
+                if (addressData.cityname) locationParts.push(addressData.cityname);
+                if (addressData.adname) locationParts.push(addressData.adname);
+                this.formData.dependency = locationParts.join('-');
+            }
+
+            this.formData.dependency_province = addressData.provinceCode || '';
+            this.formData.dependency_city = addressData.cityCode || '';
+            this.formData.dependency_code = addressData.districtCode || '';
+
+            this.saveFormDataToLocal();
+            this.$forceUpdate();
+        }
+    }
+}
+</script>
+
+<style scoped>
+/* 继承你以前的所有原有样式 */
+.qualification-page {}
+
+.section {
+    margin-bottom: 30rpx;
+}
+
+.section-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 30rpx;
+}
+
+.title-bar {
+    width: 6rpx;
+    height: 30rpx;
+    background-color: #FF4767;
+    margin-right: 7rpx;
+    border-radius: 5rpx;
+}
+
+.title-text {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #1D2129;
+    line-height: 48rpx;
+    text-align: left;
+    font-style: normal;
+}
+
+.section-title text {
+    font-size: 36rpx;
+    color: #1D2129;
+    font-weight: 500;
+}
+
+.box-cont {
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    margin-bottom: 24rpx;
+    margin-left: 8rpx;
+    margin-right: 8rpx;
+    box-shadow: none;
+}
+
+.form-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24rpx;
+}
+
+.form-item-one {
+    display: flex;
+    align-items: center;
+    padding: 24rpx;
+}
+
+.form-item-two {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24rpx;
+}
+
+.form-item-two>text.label {
+    flex-shrink: 0;
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+}
+
+.invite-code-top {
+    display: flex;
+    align-items: center;
+    padding: 24rpx;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.label-wrapper {
+    display: inline-flex;
+    align-items: center;
+}
+
+.label {
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+    line-height: 1;
+}
+
+.label-icon {
+    width: 26rpx;
+    height: 26rpx;
+    margin-left: 8rpx;
+    align-items: center;
+}
+
+.required::before {
+    content: '*';
+    color: #FF0000;
+    margin-right: 4rpx;
+}
+
+.picker-content {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    flex: 1;
+}
+
+.picker-content text {
+    margin-right: 19rpx;
+}
+
+.arrow-right {
+    width: 14rpx;
+    height: 26rpx;
+}
+
+.placeholder {
+    color: #999999;
+    font-size: 28rpx;
+}
+
+.picker-value {
+    font-size: 28rpx;
+    color: #333333;
+}
+
+.input {
+    flex: 1;
+    font-size: 28rpx;
+    color: #333333;
+    text-align: right;
+    margin-left: 20rpx;
+}
+
+.radio-group {
+    display: flex;
+}
+
+.radio-item {
+    display: flex;
+    align-items: center;
+    margin-right: 130rpx;
+}
+
+.radio {
+    width: 30rpx;
+    height: 30rpx;
+    border: 2rpx solid #DDDDDD;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 16rpx;
+}
+
+.radio.checked {
+    background-color: #FF4767;
+    border-color: #FF4767;
+}
+
+.radio-icon-image {
+    width: 32rpx;
+    height: 32rpx;
+}
+
+.radio-label {
+    font-size: 28rpx;
+    color: #333333;
+}
+
+.invite-tip {
+    padding: 24rpx;
+}
+
+.invite-tip-text {
+    font-size: 26rpx;
+    color: #999999;
+    line-height: 40rpx;
+}
+
+.popup {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 999;
+    visibility: hidden;
+    opacity: 0;
+    transition: all 0.3s ease;
+}
+
+.popup.show {
+    visibility: visible;
+    opacity: 1;
+}
+
+.popup-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+    position: relative;
+    background-color: #FFFFFF;
+    border-radius: 24rpx 24rpx 0 0;
+    padding: 32rpx;
+    transform: translateY(100%);
+    transition: transform 0.3s ease;
+    max-height: 70vh;
+}
+
+.popup.show .popup-content {
+    transform: translateY(0);
+}
+
+.popup-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 32rpx;
+}
+
+.popup-title {
+    font-size: 32rpx;
+    color: #333333;
+    font-weight: 500;
+}
+
+.popup-close {
+    font-size: 40rpx;
+    color: #999999;
+    padding: 16rpx;
+}
+
+.popup-footer {
+    margin-top: 32rpx;
+    display: flex;
+    justify-content: space-between;
+    gap: 20rpx;
+    padding: 0 24rpx 24rpx;
+}
+
+.popup-btn {
+    flex: 1;
+    height: 88rpx;
+    border-radius: 44rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+}
+
+.popup-btn.cancel {
+    background-color: #F5F5F5;
+}
+
+.popup-btn.confirm {
+    background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+}
+
+.popup-btn .btn-text {
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #FFFFFF;
+}
+
+.popup-btn.cancel .btn-text {
+    color: #666666;
+}
+
+.popup-btn.confirm .btn-text {
+    color: #FFFFFF;
+}
+
+.region-body {
+    height: 400rpx;
+}
+
+.picker-scroll {
+    height: 400rpx;
+}
+
+.picker-item {
+    height: 68rpx;
+    line-height: 68rpx;
+    text-align: center;
+    font-size: 28rpx;
+}
+
+.tip-popup {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    visibility: hidden;
+    opacity: 0;
+    transition: all 0.3s ease;
+}
+
+.tip-popup.show {
+    visibility: visible;
+    opacity: 1;
+}
+
+.tip-popup-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+}
+
+.tip-popup-content {
+    position: relative;
+    width: 620rpx;
+    height: 810rpx;
+}
+
+.tip-popup-bg {
+    width: 620rpx;
+    height: 810rpx;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
+.tip-popup-body {
+    position: relative;
+    flex-direction: column;
+    padding: 80rpx 20rpx 40rpx 20rpx;
+    box-sizing: border-box;
+}
+
+.tip-title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333;
+    text-align: center;
+    margin-top: 107rpx;
+    margin-bottom: 37rpx;
+}
+
+.tip-image-container {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 50rpx;
+}
+
+.tip-image {
+    width: 90%;
+    max-height: 400rpx;
+}
+
+.tip-buttons {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 28rpx;
+}
+
+.tip-btn {
+    width: 250rpx;
+    height: 80rpx;
+    border-radius: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    font-weight: 500;
+}
+
+.tip-btn.cancel {
+    border: #FF4767 2rpx solid;
+    background-color: transparent;
+    color: #FF4767;
+}
+
+.tip-btn.confirm {
+    background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+    color: #FFFFFF;
+}
+
+.tip-btn .btn-text {
+    color: inherit;
+}
+
+.invite-info-container {
+    padding: 20rpx 24rpx;
+    width: 100%;
+    box-sizing: border-box;
+    min-height: 60rpx;
+}
+
+.invite-tip {
+    font-size: 24rpx;
+    color: #666666;
+}
+
+.invite-validating {
+    font-size: 20rpx;
+    color: #999999;
+}
+
+.invite-error {
+    font-size: 24rpx;
+    color: #FF4767;
+}
+
+.inviter-info {
+    display: flex;
+    align-items: center;
+    font-size: 20rpx;
+}
+
+.inviter-label {
+    color: #666666;
+}
+
+.inviter-name {
+    color: #333333;
+    font-weight: 500;
+}
+
+.inviter-divider {
+    color: #666666;
+    margin: 0 5rpx;
+}
+
+.inviter-phone {
+    color: #666666;
+}
+
+/* 邀请码和禁用样式 */
+/* 输入框禁用样式 */
+.input:disabled {
+    color: #999999;
+    background-color: #F5F5F5;
+}
+
+/* 邀请码确认弹窗样式 */
+.invite-popup-content {
+    width: 571rpx;
+    height: 535rpx;
+    background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6f130301-f3df-467c-8a1c-dc49f85e5295.png');
+    background-size: cover;
+    background-position: center;
+    border-radius: 30rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 40rpx;
+    box-sizing: border-box;
+}
+
+.invite-popup-header {
+    width: 100%;
+    text-align: center;
+    margin-bottom: 40rpx;
+}
+
+.invite-popup-title {
+    font-size: 36rpx;
+    font-weight: 500;
+    color: #333333;
+}
+
+.invite-popup-body {
+    flex: 1;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    gap: 24rpx;
+    margin-top: 20rpx;
+}
+
+.invite-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    background-color: rgba(255, 255, 255, 0.9);
+    border-radius: 16rpx;
+}
+
+.invite-label {
+    font-size: 28rpx;
+    color: #666666;
+}
+
+.invite-value {
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+}
+
+.invite-popup-footer {
+    width: 100%;
+    display: flex;
+    gap: 20rpx;
+    margin-top: 40rpx;
+}
+
+.invite-btn {
+    flex: 1;
+    height: 88rpx;
+    border-radius: 44rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    font-weight: 500;
+    margin: 0 5rpx;
+}
+
+.invite-btn.cancel {
+    background-color: #FFFFFF;
+    color: #FC437C;
+    border: 2rpx solid #FC437C;
+}
+
+.invite-btn.confirm {
+    background: linear-gradient(90deg, #FC437C 0%, #FF618F 100%);
+    color: #FFFFFF;
+}
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 39f2433..f8ef887 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -1,960 +1,868 @@
-<template>
-	<view class="ruzhu-page">
-		<!-- 顶部导航栏 - 根据身份动态显示标题 -->
-		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
-
-		<!-- 步骤切换 -->
-		<step-tab :currentStep="currentStep" :identity="identity"></step-tab>
-
-		<!-- 内容区域根据身份和步骤显示不同内容 -->
-		<view class="content">
-			<!-- 入驻协议内容 -->
-			<view class="xieyi_content" v-if="currentStep === 0">
-				<rich-text :nodes="textData.text"></rich-text>
-			</view>
-
-			<!-- 步骤1: 根据身份显示不同内容 -->
-			<view v-else-if="currentStep === 1">
-				<!-- 手艺人显示个人信息，商家显示资质信息 -->
-				<qualification-info ref="qualificationInfo"></qualification-info>
-			</view>
-			<!-- 步骤2: 根据身份显示不同内容 -->
-			<view v-else-if="currentStep === 2">
-				<!-- 手艺人显示资质信息，商家显示门店信息 -->
-				<store-info ref="storeInfo"></store-info>
-			</view>
-		</view>
-		<view class="kong"></view>
-
-		<!-- 底部按钮区域 -->
-		<view class="bottom-fixed">
-			<!-- 步骤0: 入驻协议 - 只显示下一步 -->
-			<view v-if="currentStep === 0" class="step-0-buttons">
-				<view class="agree">
-					<image v-if="!isAgree" src="/static/images/agree_n.png" class="agree-btn" mode="aspectFit"
-						@click="isAgree = true"></image>
-					<image v-else src="/static/images/agree_y.png" class="agree-btn" mode="aspectFit"
-						@click="isAgree = false"></image>
-					<text class="agree-tip">我已阅读并同意以上协议</text>
-				</view>
-				<view class="next-btn" @click="goNext">
-					<text class="next-text">下一步，填写资质信息</text>
-				</view>
-			</view>
-
-			<!-- 步骤1: 资质信息 - 显示上一步和下一步 -->
-			<view v-else-if="currentStep === 1" class="step-1-buttons">
-				<view class="button-row">
-					<view class="prev-btn" @click="goPrev">
-						<text class="prev-text">上一步</text>
-					</view>
-					<view class="next-btn" @click="goNext">
-						<text class="next-text">下一步，填写门店信息</text>
-					</view>
-				</view>
-			</view>
-
-			<!-- 步骤2: 门店信息 - 显示上一步和提交申请 -->
-			<view v-else-if="currentStep === 2" class="step-2-buttons">
-				<view class="button-row">
-					<view class="prev-btn" @click="goPrev">
-						<text class="prev-text">上一步</text>
-					</view>
-					<view class="submit-btn" @click="submitApplication">
-						<text class="submit-text">提交申请</text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import request from '../../utils/request';
-	import StepTab from '@/components/step-tab/step-tab.vue';
-	import QualificationInfo from './qualification_sj.vue';
-	import StoreInfo from './sj-info.vue';
-
-	export default {
-		components: {
-			StepTab,
-			QualificationInfo,
-			StoreInfo,
-		},
-		data() {
-			return {
-				currentStep: 0, // 当前步骤索引
-				isAgree: false,
-				identity: null,
-				textData: {},
-				loading: false,
-				error: null,
-				navTitle: '商家入驻', // 默认标题
-				qualificationData: null, // 新增：保存资质信息
-				storeInfoData: null, // 新增：保存门店信息
-				// 新增：缓存手艺人数据
-				artisanDataCache: {
-					personalInfo: null,
-					qualificationInfo: null
-				}
-			}
-		},
-		async onLoad(options) {
-			this.identity = 2;
-			await this.getUserInfoSync()
-			// 确保子组件也能访问到 identity
-			this.getXieyi(1);
-		},
-
-		onShow() {
-			console.log('入驻页面 onShow - 检查地址数据');
-			// 检查商家地址数据
-			this.checkAndPassAddressToSj();
-		},
-
-		methods: {
-			// 获取用户信息（复用不可服务时间页面的方法）
-			async getUserInfoSync() {
-				await request.post('/sj/userSjAuth/details', {
-					type: 1
-				}).then(result => {
-					if (result.code == 200 && result.data) {
-						let data = result.data
-						if (getApp().globalData.artisanType == 2) {
-
-							//储存已有的商家入驻信息
-							let qualification_form_data = {
-								"uscc_num": data.uscc_num,
-								"uscc_name": data.uscc_name,
-								"legal_name": data.legal_name,
-								"legal_phone": data.legal_phone,
-								"legal_idcard_num": data.legal_idcard_num,
-								"uscc_photo": data.uscc_photo,
-								"legal_idcard_positive": data.legal_idcard_positive,
-								"legal_idcard_negative": data.legal_idcard_negative,
-								"uscc_type": data.uscc_type,
-								"license_valid_type": data.uscc_expiry_type,
-							}
-							if (data.uscc_expiry) {
-								let expirys = data.uscc_expiry.split(' —— ')
-								qualification_form_data.license_start_date = expirys[0]
-								qualification_form_data.license_end_date = expirys[1]
-							}
-							if (data.legal_idcard_expiry) {
-								let expirys = data.legal_idcard_expiry.split(' —— ')
-								qualification_form_data.idcard_start_date = expirys[0]
-								if (expirys[1]) {
-									qualification_form_data.legal_idcard_expiry_type = "date"
-									qualification_form_data.idcard_end_date = expirys[1]
-								} else {
-									qualification_form_data.legal_idcard_expiry_type = "permanent"
-									qualification_form_data.idcard_end_date = ""
-								}
-
-							}
-							uni.setStorageSync('qualification_form_data', qualification_form_data);
-							let store_invite_state = {
-								"currentValidatingCode": data.invite_code_other
-							}
-							uni.setStorageSync('store_invite_state', store_invite_state);
-							let store_info_form_data = {
-								"head_photo": data.head_photo,
-								"name": data.name,
-								"business_time": data.business_time,
-								"servers_kill": data.servers_kill,
-								"dependency": data.dependency,
-								"address": data.address,
-								"apply_state": data.apply_state,
-								"invite_code_other": data.invite_code_other,
-								"major": data.major,
-								"dependency_code": data.dependency_code,
-								"dependency_province": data.dependency_province,
-								"dependency_city": data.dependency_city,
-								"longitude": data.longitude,
-								"latitude": data.latitude
-							}
-							console.log(111111111, store_info_form_data)
-							uni.setStorageSync('store_info_form_data', store_info_form_data);
-						}
-
-					}
-				}).catch(error => {
-					console.error('获取用户信息接口错误:', error);
-				});
-			},
-			/**
-			 * 解析身份证有效期字符串，转换为中文日期格式（兼容低版本iOS，支持结束日期为空/长期）
-			 * @param {string} expiryStr 原有效期字符串，格式如："2016-01-29 —— 2026-01-29" | "2016-01-29 —— " | "2016-01-29 —— 长期"
-			 * @returns {Object} 包含开始和结束日期的对象
-			 */
-			parseIdCardExpiry(expiryStr) {
-				// 初始化默认值
-				let id_card_start_date = '';
-				let id_card_end_date = '';
-
-				try {
-					// 1. 分割字符串：兼容多种分隔符（——、--、—、-），并去除前后空格
-					const dateParts = expiryStr.split(/\s*[-—]{1,2}\s*/).map(str => str.trim());
-					// 提取开始和结束日期部分（处理分割后长度不足的情况）
-					const startStr = dateParts[0] || '';
-					const endStr = dateParts[1] || '';
-
-					// 2. 日期解析函数（核心：兼容低版本iOS）
-					const formatDateToChinese = (dateStr) => {
-						// 若为空，直接返回空
-						if (!dateStr) return '';
-						// 若为“长期”，直接返回“长期”
-						if (dateStr === '长期') return '长期';
-
-						// 关键：低版本iOS不支持“yyyy-mm-dd”，替换为“yyyy/mm/dd”
-						const compatibleStr = dateStr.replace(/-/g, '/');
-						const date = new Date(compatibleStr);
-
-						// 检查日期是否有效
-						if (isNaN(date.getTime())) {
-							return ''; // 解析失败则返回空
-						}
-
-						// 获取年、月、日（去掉前导零）
-						const year = date.getFullYear();
-						const month = date.getMonth() + 1;
-						const day = date.getDate();
-
-						return `${year}年${month}月${day}日`;
-					};
-
-					// 3. 解析开始日期（必须有值，否则置空）
-					if (startStr) {
-						id_card_start_date = formatDateToChinese(startStr);
-					}
-
-					// 4. 解析结束日期（支持空、长期、正常日期）
-					id_card_end_date = formatDateToChinese(endStr);
-
-				} catch (err) {
-					console.error('解析身份证有效期失败：', err);
-				}
-
-				// 5. 返回结果
-				return {
-					id_card_start_date,
-					id_card_end_date
-				};
-			},
-			// 检查并传递地址给商家组件
-			checkAndPassAddressToSj() {
-				try {
-					const sjAddress = uni.getStorageSync('sj_selected_address');
-					if (sjAddress) {
-						console.log('找到商家地址数据，准备传递:', sjAddress);
-
-						// 延迟执行，确保组件已渲染
-						setTimeout(() => {
-							if (this.identity === 2 && this.$refs.storeInfo) {
-								console.log('传递地址给商家组件');
-
-								// 传递给商家组件
-								if (typeof this.$refs.storeInfo.handleAddressSelected === 'function') {
-									this.$refs.storeInfo.handleAddressSelected(sjAddress);
-								} else if (this.$refs.storeInfo.formData) {
-									// 直接设置数据
-									this.$refs.storeInfo.formData.address = sjAddress.address || sjAddress
-										.name;
-									this.$refs.storeInfo.formData.longitude = sjAddress.longitude;
-									this.$refs.storeInfo.formData.latitude = sjAddress.latitude;
-
-									// 设置省市区信息
-									if (sjAddress.pname || sjAddress.cityname || sjAddress.adname) {
-										const locationParts = [];
-										if (sjAddress.pname) locationParts.push(sjAddress.pname);
-										if (sjAddress.cityname) locationParts.push(sjAddress.cityname);
-										if (sjAddress.adname) locationParts.push(sjAddress.adname);
-										this.$refs.storeInfo.formData.dependency = locationParts.join('-');
-									}
-
-									this.$refs.storeInfo.saveFormDataToLocal();
-									this.$refs.storeInfo.$forceUpdate();
-								}
-
-								// 清理存储
-								uni.removeStorageSync('sj_selected_address');
-							}
-						}, 300);
-					}
-				} catch (e) {
-					console.error('处理商家地址失败:', e);
-				}
-			},
-
-			// 新增方法：检查并传递地址数据
-			checkAndPassAddressData() {
-				try {
-					const syrAddress = uni.getStorageSync('syr_selected_address');
-					if (syrAddress && this.$refs.personalInfo) {
-						console.log('步骤切换时发现地址数据，传递给组件');
-
-						// 传递给组件
-						if (typeof this.$refs.personalInfo.handleAddressSelected === 'function') {
-							this.$refs.personalInfo.handleAddressSelected(syrAddress);
-						} else {
-							// 直接设置
-							this.$refs.personalInfo.formData.detail_address = syrAddress.address;
-							this.$refs.personalInfo.formData.longitude = syrAddress.longitude;
-							this.$refs.personalInfo.formData.latitude = syrAddress.latitude;
-							this.$refs.personalInfo.saveFormDataToLocal();
-							this.$refs.personalInfo.$forceUpdate();
-						}
-
-						// 清理
-						uni.removeStorageSync('syr_selected_address');
-					}
-				} catch (e) {
-					console.error('检查地址数据失败:', e);
-				}
-			},
-
-			// 检查用户信息
-			checkUserInfo() {
-				console.log('检查用户信息...');
-
-				// 从多种可能的存储位置检查用户信息
-				const sources = [{
-						name: '本地存储-userInfo',
-						data: uni.getStorageSync('userInfo')
-					},
-					{
-						name: '本地存储-loginInfo',
-						data: uni.getStorageSync('loginInfo')
-					},
-					{
-						name: '本地存储-token',
-						data: uni.getStorageSync('token')
-					}
-				];
-
-				sources.forEach(source => {
-					console.log(`${source.name}:`, source.data);
-				});
-
-				// 检查是否有token（确认登录状态）
-				const token = uni.getStorageSync('token');
-				if (!token) {
-					console.warn('未检测到登录token');
-					uni.showToast({
-						title: '请先登录',
-						icon: 'none'
-					});
-				}
-			},
-
-			// 获取用户信息（复用不可服务时间页面的方法）
-			getUserInfo() {
-				return new Promise((resolve, reject) => {
-					request.post('/sj/User/getUser', {
-						type: 1
-					}).then(result => {
-						if (result.state == 1) {
-							// 保存用户信息到全局数据和本地存储
-							uni.setStorageSync('userInfo', result.data);
-							console.log('用户信息获取成功:', result.data);
-							resolve(result.data);
-						} else {
-							console.error('获取用户信息失败:', result.msg);
-							reject(result.msg);
-						}
-					}).catch(error => {
-						console.error('获取用户信息接口错误:', error);
-						reject(error);
-					});
-				});
-			},
-
-			// 检查并获取用户信息
-			async checkAndGetUserInfo() {
-				// 先检查是否已有用户信息
-				const existingUserInfo = uni.getStorageSync('userInfo');
-				if (existingUserInfo && existingUserInfo.account) {
-					console.log('已有用户信息:', existingUserInfo);
-					return existingUserInfo;
-				}
-
-				// 如果没有，则调用接口获取
-				try {
-					const userInfo = await this.getUserInfo();
-					return userInfo;
-				} catch (error) {
-					console.error('获取用户信息失败:', error);
-					uni.showModal({
-						title: '提示',
-						content: '获取用户信息失败，请重新登录',
-						showCancel: false,
-						success: () => {
-							uni.navigateTo({
-								url: '/pages/login/login'
-							});
-						}
-					});
-					return null;
-				}
-			},
-
-			// 审核提交方法
-			async submitForReview() {
-				// 提交前确保有用户信息
-				const userInfo = await this.checkAndGetUserInfo();
-				if (!userInfo) {
-					return;
-				}
-
-				uni.showLoading({
-					title: '提交中...'
-				});
-
-				try {
-					console.log('=== 提交审核调试信息 ===');
-					console.log('身份类型:', this.identity);
-					console.log('门店信息数据:', this.storeInfoData);
-					console.log('资质信息数据:', this.qualificationData);
-					console.log('个人信息数据:', this.personalInfoData);
-
-
-					let apiUrl = '';
-					let formData = {};
-
-
-
-					if (this.identity === 2) {
-						// 商家入驻
-						apiUrl = '/sj/userSjAuth/apply';
-
-						// 确保重新获取最新数据
-						if (this.$refs.storeInfo) {
-							if (!this.$refs.storeInfo.saveFormData()) {
-								uni.hideLoading();
-								return;
-							}
-							this.storeInfoData = this.$refs.storeInfo.getFormData();
-							console.log('重新获取的门店信息:', this.storeInfoData);
-						}
-
-						// 验证服务技能是否存在
-						if (!this.storeInfoData || !this.storeInfoData.servers_kill || this.storeInfoData
-							.servers_kill.length === 0) {
-							uni.hideLoading();
-							uni.showToast({
-								title: '请选择服务技能',
-								icon: 'none'
-							});
-							return;
-						}
-
-						formData = this.buildBusinessData(this.qualificationData, this.storeInfoData);
-					}
-
-					console.log('提交的数据:', formData);
-					console.log('API URL:', apiUrl);
-
-					formData.type = 1
-					formData.id_type = 1
-
-					const res = await request.post(apiUrl, formData);
-
-					uni.hideLoading();
-
-					if (res.state == 1  || res.code == 200) {
-						// 提交成功后清除缓存数据
-
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none',
-							duration: 1500,
-							success: () => {
-								setTimeout(() => {
-									uni.redirectTo({
-										url: `./submitres?identity=${this.identity}&applyState=1`
-									});
-								}, 1500);
-							}
-						});
-					} else {
-						uni.showToast({
-							title: res.msg || '提交失败',
-							icon: 'none'
-						});
-					}
-				} catch (error) {
-					uni.hideLoading();
-					console.error('提交审核失败:', error);
-					uni.showToast({
-						title: '提交失败，请重试',
-						icon: 'none'
-					});
-				}
-			},
-
-			// 优化日期格式化方法
-			formatDateForBackend(dateStr) {
-				if (!dateStr) return '';
-				if (dateStr === '长久有效' || dateStr === '长久有效') return '';
-
-				// 将 年月日 格式转换为 YYYY-MM-DD
-				const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-				if (match) {
-					const year = match[1];
-					const month = match[2].padStart(2, '0');
-					const day = match[3].padStart(2, '0');
-					return `${year}-${month}-${day}`;
-				}
-
-				// 如果已经是 YYYY-MM-DD 格式，直接返回
-				return dateStr;
-			},
-
-			// 构建商家数据
-			buildBusinessData(qualificationData, storeData) {
-				// 根据接口文档构建数据
-				const formData = {};
-
-				// 服务技能处理 - 添加更严格的验证
-				if (storeData && storeData.servers_kill && storeData.servers_kill.length > 0) {
-					// 确保 servers_kill 是数组
-					formData.servers_kill = Array.isArray(storeData.servers_kill) ?
-						storeData.servers_kill : [storeData.servers_kill];
-
-					console.log('服务技能数组:', formData.servers_kill);
-				} else {
-					console.warn('警告：没有服务技能数据');
-					formData.servers_kill = [];
-				}
-
-				// 营业执照信息
-				if (qualificationData.uscc_type) {
-					formData.uscc_type = qualificationData.uscc_type === 'individual' ? 1 : 2;
-				}
-				if (qualificationData.uscc_photo) {
-					formData.uscc_photo = qualificationData.uscc_photo;
-				}
-				if (qualificationData.uscc_num) {
-					formData.uscc_num = qualificationData.uscc_num;
-				}
-				if (qualificationData.uscc_name) {
-					formData.uscc_name = qualificationData.uscc_name;
-				}
-				if (qualificationData.license_valid_type) {
-					formData.uscc_expiry_type = qualificationData.license_valid_type === 'permanent' ? 1 : 2;
-				}
-
-				// 格式化有效期
-				if (qualificationData.license_start_date) {
-					const startDate = this.formatDateForBackend(qualificationData.license_start_date);
-
-					if (qualificationData.license_valid_type === 'permanent') {
-						// 长久有效格式：开始日期 + " ——        "
-						formData.uscc_expiry = `${startDate} ——        `;
-					} else if (qualificationData.license_end_date) {
-						// 指定日期格式：开始日期 + " —— " + 结束日期
-						const endDate = this.formatDateForBackend(qualificationData.license_end_date);
-						formData.uscc_expiry = `${startDate} —— ${endDate}`;
-					}
-				}
-
-				// 法人信息
-				if (qualificationData.legal_name) {
-					formData.legal_name = qualificationData.legal_name;
-				}
-				if (qualificationData.legal_phone) {
-					formData.legal_phone = qualificationData.legal_phone;
-				}
-				if (qualificationData.legal_idcard_num) {
-					formData.legal_idcard_num = qualificationData.legal_idcard_num;
-				}
-				if (qualificationData.legal_idcard_expiry_type) {
-					formData.legal_idcard_expiry_type = qualificationData.legal_idcard_expiry_type === 'permanent' ? 1 : 2;
-				}
-
-				// 格式化有效期
-				if (qualificationData.idcard_start_date) {
-					const idcardStartDate = this.formatDateForBackend(qualificationData.idcard_start_date);
-
-					if (qualificationData.legal_idcard_expiry_type === 'permanent') {
-						formData.legal_idcard_expiry = `${idcardStartDate} ——        `;
-					} else if (qualificationData.idcard_end_date) {
-						const idcardEndDate = this.formatDateForBackend(qualificationData.idcard_end_date);
-						formData.legal_idcard_expiry = `${idcardStartDate} —— ${idcardEndDate}`;
-					}
-				}
-
-				if (qualificationData.legal_idcard_positive) {
-					formData.legal_idcard_positive = qualificationData.legal_idcard_positive;
-				}
-				if (qualificationData.legal_idcard_negative) {
-					formData.legal_idcard_negative = qualificationData.legal_idcard_negative;
-				}
-
-				// 门店信息
-				if (storeData.head_photo) {
-					formData.head_photo = storeData.head_photo;
-				}
-				if (storeData.name) {
-					formData.name = storeData.name;
-				}
-				if (storeData.business_time) {
-					formData.business_time = storeData.business_time;
-				}
-				if (storeData.servers_kill && storeData.servers_kill.length > 0) {
-					// 直接传递数组
-					formData.servers_kill = storeData.servers_kill;
-					console.log('服务技能数组:', formData.servers_kill);
-				} else {
-					formData.servers_kill = [];
-					console.warn('警告：没有服务技能数据');
-				}
-
-				console.log('最终 formData 中的 servers_kill:', formData.servers_kill);
-				console.log('=== 调试结束 ===');
-
-				if (storeData.dependency) {
-					formData.dependency = storeData.dependency;
-
-					// 地址编码
-					if (storeData.dependency_code) {
-						formData.dependency_code = storeData.dependency_code;
-					}
-					if (storeData.dependency_province) {
-						formData.dependency_province = storeData.dependency_province;
-					}
-					if (storeData.dependency_city) {
-						formData.dependency_city = storeData.dependency_city;
-					}
-				}
-				if (storeData.address) {
-					formData.address = storeData.address;
-				}
-				// 经纬度
-				if (storeData.longitude) formData.longitude = storeData.longitude;
-				if (storeData.latitude) formData.latitude = storeData.latitude;
-
-				// 其他信息
-				if (storeData.apply_state) {
-					formData.get_msg_method = storeData.apply_state;
-				}
-				if (storeData.invite_code_other) {
-					formData.invite_code_other = storeData.invite_code_other;
-				}
-				if (storeData.major) {
-					formData.major = storeData.major;
-				}
-
-				// 账号信息 - 直接从登录时输入的手机号获取
-				// 注意：这里使用 qualificationData 或 storeData 中的手机号，或者从全局获取
-				const userInfo = uni.getStorageSync('userInfo');
-
-				if (userInfo && userInfo.account) {
-					formData.account = userInfo.account;
-				} else {
-					// 如果全局没有，尝试从本地存储的登录信息获取
-					const loginAccount = uni.getStorageSync('loginAccount');
-					if (loginAccount) {
-						formData.account = loginAccount;
-					} else {
-						// 最后尝试：从资质信息或门店信息中获取手机号
-						if (qualificationData.legal_phone) {
-							formData.account = qualificationData.legal_phone;
-						} else {
-							console.error('无法获取账号信息');
-							uni.showToast({
-								title: '无法获取用户账号',
-								icon: 'none'
-							});
-							return null;
-						}
-					}
-				}
-
-				console.log('使用的账号:', formData.account);
-				return formData;
-
-			},
-
-			async goNext() {
-				console.log('当前步骤:', this.currentStep);
-				console.log('身份类型:', this.identity);
-
-				// 步骤0需要同意协议
-				if (this.currentStep === 0 && !this.isAgree) {
-					uni.showToast({
-						title: '请阅读并同意以上协议',
-						icon: 'none'
-					});
-					return;
-				}
-
-				// 步骤1需要验证信息
-				if (this.currentStep === 1) {
-					console.log('商家验证资质信息');
-					// 商家验证资质信息
-					if (this.$refs.qualificationInfo) {
-						const isValid = await this.$refs.qualificationInfo.saveFormData();
-						if (!isValid) {
-							console.log('商家资质信息验证失败');
-							return;
-						}
-						this.qualificationData = this.$refs.qualificationInfo.getFormData();
-						console.log(' 商家资质信息验证通过 ');
-					}
-				}
-
-				// 步骤2需要验证信息
-				if (this.currentStep === 2) {
-					// 商家验证门店信息
-					if (this.$refs.storeInfo) {
-						const isValid = await this.$refs.storeInfo.saveFormData();
-						if (!isValid) {
-							console.log('商家门店信息验证失败');
-							return;
-						}
-						this.storeInfoData = this.$refs.storeInfo.getFormData();
-						console.log('商家门店信息验证通过');
-					}
-				}
-
-				if (this.currentStep < 2) {
-					this.currentStep++;
-					console.log('切换到步骤:', this.currentStep);
-
-					// 步骤切换后滚动到顶部
-					setTimeout(() => {
-						this.scrollToTop();
-					}, 100);
-
-				} else {
-					this.completeRegistration();
-				}
-			},
-
-			submitApplication() {
-				// 商家验证门店信息
-				if (this.$refs.storeInfo) {
-					if (!this.$refs.storeInfo.saveFormData()) {
-						return;
-					}
-					this.storeInfoData = this.$refs.storeInfo.getFormData();
-					console.log('商家门店信息数据:', this.storeInfoData);
-				}
-
-				// 执行提交逻辑
-				this.completeRegistration();
-			},
-
-			goPrev() {
-				if (this.currentStep > 0) {
-					this.currentStep--;
-				}
-			},
-			completeRegistration() {
-				// 提交审核的逻辑
-				this.submitForReview();
-			},
-			// 添加滚动到顶部的方法
-			scrollToTop() {
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 0
-				});
-			},
-			async getXieyi(type) {
-				this.loading = true;
-				this.error = null;
-				try {
-					const res = await request.post('/user/getsystemtext', {
-						type
-					});
-					this.textData = res.data;
-				} catch (err) {
-					console.error('获取协议失败:', err);
-					this.error = '获取协议内容失败，请重试';
-					uni.showToast({
-						title: '获取协议内容失败',
-						icon: 'none'
-					});
-				} finally {
-					this.loading = false;
-				}
-			},
-		}
-	}
-</script>
-
-<style>
-	.ruzhu-page {
-		background: #f5f5f5;
-	}
-
-	.content {
-		padding: 20rpx 20rpx 50rpx 20rpx;
-		box-sizing: border-box;
-	}
-
-	.xieyi_content {
-		padding: 20rpx;
-		background: #ffffff;
-		border-radius: 20rpx;
-	}
-
-	.ruzhu-cont {
-		padding: 24rpx;
-		background-color: #fff;
-	}
-
-	.ruzhu-text {
-		font-size: 28rpx;
-		color: #3D3D3D;
-		font-weight: 400;
-	}
-
-	.kong {
-		width: 100vw;
-		height: 180rpx;
-	}
-
-	/* 底部按钮区域样式 */
-	.bottom-fixed {
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		background-color: #ffffff;
-		padding: 24rpx 0;
-	}
-
-	/* 步骤0按钮布局 */
-	.step-0-buttons {
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	/* 步骤0中的下一步按钮*/
-	.step-0-buttons .next-btn {
-		width: 702rpx;
-		height: 98rpx !important;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-		border-radius: 49rpx;
-	}
-
-	.step-0-buttons .next-text {
-		color: #ffffff;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	/* 步骤1和步骤2按钮布局 */
-	.step-1-buttons,
-	.step-2-buttons {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	/* 步骤1中的按钮 */
-	.step-1-buttons .next-btn {
-		flex: 1;
-		height: 98rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-		border-radius: 49rpx;
-	}
-
-	.step-1-buttons .next-text {
-		color: #ffffff;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	/* 步骤2中的提交按钮 */
-	.step-2-buttons .submit-btn {
-		flex: 1;
-		height: 98rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-		border-radius: 49rpx;
-	}
-
-	.step-2-buttons .submit-text {
-		color: #ffffff;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	/* 上一步按钮 - 统一所有步骤中的样式 */
-	.prev-btn {
-		width: 249rpx;
-		height: 98rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background-color: #f8f8f8;
-		border-radius: 60rpx;
-	}
-
-	.prev-text {
-		color: #E8101E;
-		font-size: 36rpx;
-		font-weight: 500;
-	}
-
-	.button-row {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		width: 702rpx;
-		height: 147rpx;
-		gap: 20rpx;
-	}
-
-	.agree {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-		margin-bottom: 24rpx;
-	}
-
-	.agree-btn {
-		width: 32rpx;
-		height: 32rpx;
-		margin-right: 13rpx;
-	}
-
-	.agree-tip {
-		font-size: 26rpx;
-		font-weight: 400;
-		color: #666666;
-	}
-
-	.next-text {
-		color: #ffffff;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	.prev-text {
-		color: #333;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	.submit-text {
-		color: #ffffff;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
+<template>
+    <view class="ruzhu-page">
+        <!-- 顶部导航栏 - 根据身份动态显示标题 -->
+        <custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
+
+        <!-- 步骤切换 -->
+        <step-tab v-if="currentStep !== 2 && currentStep !== 4" :mappedStep="mappedStep"></step-tab>
+
+        <!-- 内容区域根据身份和步骤显示不同内容 -->
+        <view class="content">
+            <view class="xieyi_content" v-if="currentStep === 0">
+                <rich-text :nodes="textData.text"></rich-text>
+            </view>
+
+            <view v-else-if="currentStep === 1">
+                <qualification-info ref="qualificationInfo"></qualification-info>
+            </view>
+
+            <view v-else-if="currentStep === 2">
+                <successruzhu :data="successData" @stateChange="onStateChange"></successruzhu>
+            </view>
+
+            <view v-else-if="currentStep === 3">
+                <store-info ref="storeInfo"></store-info>
+            </view>
+
+            <view v-else-if="currentStep === 4">
+                <successruzhu :data="successData" @stateChange="onStateChange"></successruzhu>
+            </view>
+        </view>
+        <view class="kong"></view>
+
+        <!-- 底部按钮区域 -->
+        <view class="bottom-fixed">
+            <!-- 步骤0: 入驻协议 -->
+            <view v-if="currentStep === 0" class="step-0-buttons">
+                <view class="agree">
+                    <image v-if="!isAgree" src="/static/images/agree_n.png" class="agree-btn" mode="aspectFit"
+                        @click="isAgree = true"></image>
+                    <image v-else src="/static/images/agree_y.png" class="agree-btn" mode="aspectFit"
+                        @click="isAgree = false"></image>
+                    <text class="agree-tip">我已阅读并同意以上协议</text>
+                </view>
+                <view class="next-btn" @click="goNext">
+                    <text class="next-text">下一步，填写基本信息</text>
+                </view>
+            </view>
+
+            <!-- 步骤1: 资质信息 -->
+            <view v-else-if="currentStep === 1" class="step-1-buttons">
+                <view class="button-row">
+                    <view class="prev-btn" @click="goPrev">
+                        <text class="prev-text">上一步</text>
+                    </view>
+                    <view class="next-btn" @click="goNext">
+                        <text class="next-text">提交入驻</text>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 步骤2: 提交成功 -->
+            <view v-else-if="currentStep === 2" class="step-2-buttons">
+                <view class="button-row">
+                    <view class="prev-btn" @click="topt">
+                        <text class="prev-text">进入平台</text>
+                    </view>
+                    <view class="submit-btn" @click="goNext">
+                        <text class="submit-text">去完成资质认证</text>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 步骤3: 门店信息 -->
+            <view v-else-if="currentStep === 3" class="step-2-buttons">
+                <view class="button-row">
+                    <view v-if="!isRejected" class="prev-btn" @click="goPrev">
+                        <text class="prev-text">上一步</text>
+                    </view>
+                    <view class="submit-btn" @click="submitApplication">
+                        <text class="submit-text">提交申请</text>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 步骤4: 资质认证成功 -->
+            <view v-else-if="currentStep === 4" class="step-2-buttons">
+                <view v-if="isRejected" class="button-row">
+                    <view class="prev-btn" @click="resubmit">
+                        <text class="prev-text">重新提交</text>
+                    </view>
+                    <view class="showziliao1" @click="topt">
+                        <text class="showziliaotext1">进入平台</text>
+                    </view>
+                </view>
+                <view v-else class="button-row">
+                    <view class="showziliao" @click="topt">
+                        <text class="showziliaotext">进入平台</text>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import StepTab from '@/components/step-tab/step-tab.vue';
+import QualificationInfo from './qualification_sj.vue';
+import StoreInfo from './sj-info.vue';
+import successruzhu from './successruzhu.vue';
+
+export default {
+    components: {
+        StepTab,
+        QualificationInfo,
+        StoreInfo,
+        successruzhu
+    },
+    data() {
+        return {
+            currentStep: 0, // 当前步骤索引
+            isAgree: false,
+            identity: null,
+            textData: {},
+            loading: false,
+            error: null,
+            qualificationData: null, // 新增：保存资质信息
+            storeInfoData: null, // 新增：保存门店信息
+            successData: {}, //入驻提示
+            isRejected: false, // 是否审核失败
+            // 新增：缓存手艺人数据
+            artisanDataCache: {
+                personalInfo: null,
+                qualificationInfo: null
+            }
+        }
+    },
+    computed: {
+        mappedStep() {
+            if (this.currentStep === 0) return 0;
+            if (this.currentStep === 1) return 1;
+            if (this.currentStep === 3) return 2;
+            if (this.currentStep === 4) return 2;
+            return 0;
+        },
+        navTitle() {
+            return this.currentStep === 3 ? '资质认证' : '商家入驻';
+        }
+    },
+    async onLoad(options) {
+        console.log(options, 'options---');
+        if (options.type == 0 && options.step == 3) {
+            this.currentStep = 3
+            this.isRejected = true
+        }
+        if (options.type == 1) {
+            this.currentStep = 4
+        }
+        if (options.type == 2) {
+            this.currentStep = 2
+        }
+
+        // 如果首页传了 step 参数，就直接空降到对应的流程
+        if (options.step) {
+            this.currentStep = Number(options.step);
+        }
+
+        this.identity = 2;
+        await this.getUserInfoSync()
+        // 确保子组件也能访问到 identity
+        this.getXieyi(1);
+    },
+
+    onShow() {
+        console.log('入驻页面 onShow - 检查地址数据');
+        // 检查商家地址数据
+        this.checkAndPassAddressToSj();
+    },
+
+    methods: {
+        topt() {
+            uni.switchTab({
+                url: '/pages/home/home'
+            })
+        },
+        onStateChange(state) {
+            if (state === 3) {
+                this.isRejected = true;
+            }
+        },
+        resubmit() {
+            uni.navigateTo({
+                url: '/pages/ruzhu/ruzhu?type=0&step=3'
+            });
+        },
+        // 获取用户信息（复用不可服务时间页面的方法）
+        async getUserInfoSync() {
+            await request.post('/sj/userSjAuth/details', {
+                type: 1
+            }).then(result => {
+                if (result.code == 200 && result.data) {
+                    let data = result.data
+                    if (getApp().globalData.artisanType == 2) {
+
+                        let qualification_form_data = {
+                            "uscc_type": data.uscc_type || '',
+                            // "contact_identity": 'legal',
+                            // "contact_name": data.legal_name || data.contact_name || '',
+                            "contact_phone": data.legal_phone || data.contact_phone || '',
+                            "backup_phone": data.backup_phone || '',
+                            "invite_code": data.invite_code_other || '',
+                            "dependency": data.dependency || '',
+                            "address": data.address || '',
+                            "dependency_code": data.dependency_code || '',
+                            "dependency_province": data.dependency_province || '',
+                            "dependency_city": data.dependency_city || '',
+                            "longitude": data.longitude || '',
+                            "latitude": data.latitude || '',
+                            "name": data.name || '',
+                            "contact_type": data.contact_type || ''
+                        }
+                        uni.setStorageSync('qualification_form_data', qualification_form_data);
+                        let store_info_form_data = {
+                            "head_photo": data.head_photo,
+                            "name": data.name,
+                            "business_time": data.business_time,
+                            // "servers_kill": data.servers_kill,
+                            "apply_state": data.apply_state,
+                            "invite_code_other": data.invite_code_other,
+                            "major": data.major
+                        }
+                        console.log(111111111, store_info_form_data)
+                        uni.setStorageSync('store_info_form_data', store_info_form_data);
+                    }
+
+                }
+            }).catch(error => {
+                console.error('获取用户信息接口错误:', error);
+            });
+        },
+        // 检查并传递地址给商家组件
+        checkAndPassAddressToSj() {
+            try {
+                const sjAddress = uni.getStorageSync('sj_selected_address');
+                if (sjAddress) {
+                    console.log('找到商家地址数据，准备传递:', sjAddress);
+
+                    setTimeout(() => {
+                        if (this.identity === 2 && this.$refs.qualificationInfo) {
+                            console.log('传递地址给资质组件');
+                            if (typeof this.$refs.qualificationInfo.handleAddressSelected === 'function') {
+                                this.$refs.qualificationInfo.handleAddressSelected(sjAddress);
+                            }
+                        }
+                        uni.removeStorageSync('sj_selected_address');
+                    }, 300);
+                }
+            } catch (e) {
+                console.error('处理商家地址失败:', e);
+            }
+        },
+
+        // 新增方法：检查并传递地址数据
+        checkAndPassAddressData() {
+            try {
+                const syrAddress = uni.getStorageSync('syr_selected_address');
+                if (syrAddress && this.$refs.personalInfo) {
+                    console.log('步骤切换时发现地址数据，传递给组件');
+
+                    // 传递给组件
+                    if (typeof this.$refs.personalInfo.handleAddressSelected === 'function') {
+                        this.$refs.personalInfo.handleAddressSelected(syrAddress);
+                    } else {
+                        // 直接设置
+                        this.$refs.personalInfo.formData.detail_address = syrAddress.address;
+                        this.$refs.personalInfo.formData.longitude = syrAddress.longitude;
+                        this.$refs.personalInfo.formData.latitude = syrAddress.latitude;
+                        this.$refs.personalInfo.saveFormDataToLocal();
+                        this.$refs.personalInfo.$forceUpdate();
+                    }
+
+                    // 清理
+                    uni.removeStorageSync('syr_selected_address');
+                }
+            } catch (e) {
+                console.error('检查地址数据失败:', e);
+            }
+        },
+
+        // 检查用户信息
+        checkUserInfo() {
+            console.log('检查用户信息...');
+
+            // 从多种可能的存储位置检查用户信息
+            const sources = [{
+                name: '本地存储-userInfo',
+                data: uni.getStorageSync('userInfo')
+            },
+            {
+                name: '本地存储-loginInfo',
+                data: uni.getStorageSync('loginInfo')
+            },
+            {
+                name: '本地存储-token',
+                data: uni.getStorageSync('token')
+            }
+            ];
+
+            sources.forEach(source => {
+                console.log(`${source.name}:`, source.data);
+            });
+
+            // 检查是否有token（确认登录状态）
+            const token = uni.getStorageSync('token');
+            if (!token) {
+                console.warn('未检测到登录token');
+                uni.showToast({
+                    title: '请先登录',
+                    icon: 'none'
+                });
+            }
+        },
+
+        // 获取用户信息（复用不可服务时间页面的方法）
+        getUserInfo() {
+            return new Promise((resolve, reject) => {
+                request.post('/sj/User/getUser', {
+                    type: 1
+                }).then(result => {
+                    if (result.state == 1) {
+                        // 保存用户信息到全局数据和本地存储
+                        uni.setStorageSync('userInfo', result.data);
+                        console.log('用户信息获取成功:', result.data);
+                        resolve(result.data);
+                    } else {
+                        console.error('获取用户信息失败:', result.msg);
+                        reject(result.msg);
+                    }
+                }).catch(error => {
+                    console.error('获取用户信息接口错误:', error);
+                    reject(error);
+                });
+            });
+        },
+
+        // 检查并获取用户信息
+        async checkAndGetUserInfo() {
+            // 先检查是否已有用户信息
+            const existingUserInfo = uni.getStorageSync('userInfo');
+            if (existingUserInfo && existingUserInfo.account) {
+                console.log('已有用户信息:', existingUserInfo);
+                return existingUserInfo;
+            }
+
+            // 如果没有，则调用接口获取
+            try {
+                const userInfo = await this.getUserInfo();
+                return userInfo;
+            } catch (error) {
+                console.error('获取用户信息失败:', error);
+                uni.showModal({
+                    title: '提示',
+                    content: '获取用户信息失败，请重新登录',
+                    showCancel: false,
+                    success: () => {
+                        uni.navigateTo({
+                            url: '/pages/login/login'
+                        });
+                    }
+                });
+                return null;
+            }
+        },
+
+        // 审核提交方法
+        async submitForReview() {
+            const userInfo = await this.checkAndGetUserInfo();
+            if (!userInfo) {
+                return;
+            }
+
+            uni.showLoading({
+                title: '提交中...'
+            });
+
+            try {
+                let formData = this.buildBusinessData(this.qualificationData, {});
+                formData.type = 1;
+                formData.id_type = 1;
+                if (Array.isArray(formData.qualifications_sector)) {
+                    formData.qualifications_sector = JSON.stringify(formData.qualifications_sector);
+                }
+                if (Array.isArray(formData.qualifications_other)) {
+                    formData.qualifications_other = JSON.stringify(formData.qualifications_other);
+                }
+                const res = await request.post('/sj/userSjAuth/applyOne', formData);
+                uni.hideLoading();
+
+                if (res.state == 1 || res.code == 200) {
+                    this.successData = res.data.customer_service
+                    console.log(this.successData,
+                        'this.successDatathis.successDatathis.successDatathis.successData=======');
+                    uni.showToast({
+                        title: '提交成功',
+                        icon: 'none',
+                        duration: 1500
+                    });
+                    setTimeout(() => {
+                        this.currentStep = 2;
+                    }, 1500);
+                } else {
+                    uni.showToast({
+                        title: res.msg || '提交失败',
+                        icon: 'none'
+                    });
+                }
+            } catch (error) {
+                uni.hideLoading();
+                uni.showToast({
+                    title: '提交失败，请重试',
+                    icon: 'none'
+                });
+            }
+        },
+
+        // 构建商家数据
+        buildBusinessData(qualificationData, storeData) {
+            qualificationData = qualificationData || {};
+            storeData = storeData || {};
+            console.log(qualificationData, 'storeDatastoreDatastoreData');
+            const formData = {};
+            Object.assign(formData, storeData);
+
+            if (qualificationData.uscc_type) {
+                formData.uscc_type = qualificationData.uscc_type;
+            }
+            // if (qualificationData.contact_identity) {
+            // 	formData.contact_identity = qualificationData.contact_identity;
+            // }
+            // if (qualificationData.contact_name) {
+            // 	formData.contact_name = qualificationData.contact_name;
+            // }
+            if (qualificationData.contact_phone) {
+                formData.contact_phone = qualificationData.contact_phone;
+            }
+            if (qualificationData.backup_phone) {
+                formData.backup_phone = qualificationData.backup_phone;
+            }
+            if (qualificationData.contact_type) {
+                formData.contact_type = qualificationData.contact_type;
+            }
+            if (qualificationData.invite_code_other) {
+                formData.invite_code_other = qualificationData.invite_code_other;
+            }
+            if (qualificationData.contact_name) {
+                formData.contact_name = qualificationData.contact_name;
+            }
+
+            if (qualificationData.dependency) {
+                formData.dependency = qualificationData.dependency;
+            }
+            if (qualificationData.dependency_code) {
+                formData.dependency_code = qualificationData.dependency_code;
+            }
+            if (qualificationData.dependency_province) {
+                formData.dependency_province = qualificationData.dependency_province;
+            }
+            if (qualificationData.dependency_city) {
+                formData.dependency_city = qualificationData.dependency_city;
+            }
+            if (qualificationData.name) {
+                formData.name = qualificationData.name;
+            }
+            if (qualificationData.address) {
+                formData.address = qualificationData.address;
+            }
+            if (qualificationData.longitude) formData.longitude = qualificationData.longitude;
+            if (qualificationData.latitude) formData.latitude = qualificationData.latitude;
+
+            // if (storeData && storeData.servers_kill && storeData.servers_kill.length > 0) {
+            // 	// formData.servers_kill = Array.isArray(storeData.servers_kill) ?
+            // 	// 	storeData.servers_kill : [storeData.servers_kill];
+            // } else {
+            // 	formData.servers_kill = [];
+            // }
+            if (storeData.head_photo) {
+                formData.head_photo = storeData.head_photo;
+            }
+            if (storeData.name) {
+                formData.name = storeData.name;
+            }
+            if (storeData.business_time) {
+                formData.business_time = storeData.business_time;
+            }
+            if (storeData.apply_state) {
+                formData.get_msg_method = storeData.apply_state;
+            }
+            if (storeData.major) {
+                formData.major = storeData.major;
+            }
+
+
+            const userInfo = uni.getStorageSync('userInfo');
+            if (userInfo && userInfo.account) {
+                formData.account = userInfo.account;
+            } else {
+                const loginAccount = uni.getStorageSync('loginAccount');
+                if (loginAccount) {
+                    formData.account = loginAccount;
+                } else if (qualificationData.contact_phone) {
+                    formData.contact_name = qualificationData.contact_name;
+                } else {
+                    console.error('无法获取账号信息');
+                    uni.showToast({
+                        title: '无法获取用户账号',
+                        icon: 'none'
+                    });
+                    return null;
+                }
+            }
+
+            return formData;
+
+        },
+
+        async goNext() {
+            if (this.currentStep === 0 && !this.isAgree) {
+                uni.showToast({
+                    title: '请阅读并同意以上协议',
+                    icon: 'none'
+                });
+                return;
+            }
+
+            if (this.currentStep === 1) {
+                if (this.$refs.qualificationInfo) {
+                    const isValid = await this.$refs.qualificationInfo.saveFormData();
+                    if (!isValid) {
+                        return;
+                    }
+                    this.qualificationData = this.$refs.qualificationInfo.getFormData();
+                }
+                await this.submitForReview();
+                return;
+            }
+
+            if (this.currentStep < 3) {
+                this.currentStep++;
+                setTimeout(() => {
+                    this.scrollToTop();
+                }, 100);
+            }
+        },
+
+        async submitApplication() {
+            if (this.$refs.storeInfo) {
+                // 增加了 await 进行异步表单验证，等待弹窗确认结果
+                const isValid = await this.$refs.storeInfo.saveFormData();
+                if (!isValid) {
+                    return;
+                }
+                this.storeInfoData = this.$refs.storeInfo.getFormData();
+            }
+
+            uni.showLoading({
+                title: '提交中...'
+            });
+            try {
+                const formData = this.buildBusinessData(this.qualificationData, this.storeInfoData);
+                if (!formData) {
+                    uni.hideLoading();
+                    return;
+                }
+                formData.type = 1;
+                formData.id_type = 1;
+                console.log(formData, '-----------');
+                if (formData.legal_idcard_expiry_start && formData.legal_idcard_expiry_end) {
+                    formData.legal_idcard_expiry =
+                        formData.legal_idcard_expiry_end === '长久有效' ?
+                            `${formData.legal_idcard_expiry_start} —— 长久` :
+                            `${formData.legal_idcard_expiry_start} —— ${formData.legal_idcard_expiry_end}`;
+                }
+                delete formData.legal_idcard_expiry_start
+                delete formData.legal_idcard_expiry_end
+                delete formData.contact_phone
+                delete formData.contact_type
+                delete formData.contact_name
+                delete formData.invite_code_other
+                if (Array.isArray(formData.qualifications_sector)) {
+                    formData.qualifications_sector = JSON.stringify(formData.qualifications_sector);
+                }
+                if (Array.isArray(formData.qualifications_other)) {
+                    formData.qualifications_other = JSON.stringify(formData.qualifications_other);
+                }
+                console.log(formData, 'formData请求参数');
+                const res = await request.post('/sj/userSjAuth/apply', formData);
+                uni.hideLoading();
+                if (res.state == 1 || res.code == 200) {
+                    this.successData = res.data ? (res.data.customer_service || {}) : {};
+                    uni.showToast({
+                        title: '提交成功',
+                        icon: 'none'
+                    });
+                    setTimeout(() => {
+                        this.currentStep = 4;
+                    }, 1500);
+                } else {
+                    uni.showToast({
+                        title: res.msg || '提交失败了',
+                        icon: 'none'
+                    });
+                }
+            } catch (error) {
+                console.error('提交失败：', error);
+                uni.hideLoading();
+                uni.showToast({
+                    title: '提交失败，请重试',
+                    icon: 'none'
+                });
+            }
+        },
+
+        goPrev() {
+            if (this.currentStep > 0) {
+                this.currentStep--;
+            }
+        },
+        scrollToTop() {
+            uni.pageScrollTo({
+                scrollTop: 0,
+                duration: 0
+            });
+        },
+        async getXieyi(type) {
+            this.loading = true;
+            this.error = null;
+            try {
+                const res = await request.post('/user/getsystemtext', {
+                    type
+                });
+                this.textData = res.data;
+            } catch (err) {
+                console.error('获取协议失败:', err);
+                this.error = '获取协议内容失败，请重试';
+                uni.showToast({
+                    title: '获取协议内容失败',
+                    icon: 'none'
+                });
+            } finally {
+                this.loading = false;
+            }
+        },
+    }
+}
+</script>
+
+<style>
+/* ...与原来一致的代码... */
+.ruzhu-page {
+    background: #f5f5f5;
+}
+
+.content {
+    padding: 20rpx 20rpx 50rpx 20rpx;
+    box-sizing: border-box;
+}
+
+.xieyi_content {
+    padding: 20rpx;
+    background: #ffffff;
+    border-radius: 20rpx;
+}
+
+.ruzhu-cont {
+    padding: 24rpx;
+    background-color: #fff;
+}
+
+.ruzhu-text {
+    font-size: 28rpx;
+    color: #3D3D3D;
+    font-weight: 400;
+}
+
+.kong {
+    width: 100vw;
+    height: 180rpx;
+}
+
+/* 底部按钮区域样式 */
+.bottom-fixed {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    background-color: #ffffff;
+    padding: 24rpx 0;
+}
+
+/* 步骤0按钮布局 */
+.step-0-buttons {
+    display: flex;
+    flex-flow: column nowrap;
+    justify-content: center;
+    align-items: center;
+}
+
+/* 步骤0中的下一步按钮*/
+.step-0-buttons .next-btn {
+    width: 702rpx;
+    height: 98rpx !important;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #FF4767;
+    border-radius: 49rpx;
+}
+
+.step-0-buttons .next-text {
+    color: #ffffff;
+    font-size: 32rpx;
+    font-weight: 500;
+}
+
+/* 步骤1和步骤2按钮布局 */
+.step-1-buttons,
+.step-2-buttons {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+/* 步骤1中的按钮 */
+.step-1-buttons .next-btn {
+    flex: 1;
+    height: 98rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #FF4767;
+    border-radius: 49rpx;
+}
+
+.step-1-buttons .next-text {
+    color: #ffffff;
+    font-size: 32rpx;
+    font-weight: 500;
+}
+
+/* 步骤2中的提交按钮 */
+.step-2-buttons .submit-btn {
+    flex: 1;
+    height: 98rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+    border-radius: 49rpx;
+}
+
+.step-2-buttons .submit-text {
+    color: #ffffff;
+    font-size: 32rpx;
+    font-weight: 500;
+}
+
+/* 上一步按钮 - 统一所有步骤中的样式 */
+.prev-btn {
+    width: 249rpx;
+    height: 98rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: #f8f8f8;
+    border-radius: 60rpx;
+}
+
+.prev-text {
+    color: #FF4767;
+    font-size: 36rpx;
+    font-weight: 500;
+}
+
+.button-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 702rpx;
+    height: 147rpx;
+    gap: 20rpx;
+}
+
+.agree {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 24rpx;
+}
+
+.agree-btn {
+    width: 32rpx;
+    height: 32rpx;
+    margin-right: 13rpx;
+}
+
+.agree-tip {
+    font-size: 26rpx;
+    font-weight: 400;
+    color: #666666;
+}
+
+.next-text {
+    color: #ffffff;
+    font-size: 32rpx;
+    font-weight: 500;
+}
+
+.prev-text {
+    color: #333;
+    font-size: 32rpx;
+    font-weight: 500;
+}
+
+.submit-text {
+    color: #ffffff;
+    font-size: 32rpx;
+    font-weight: 500;
+}
+
+.showziliao {
+    width: 690rpx;
+    height: 98rpx;
+    background: #FF4767;
+    border-radius: 49rpx;
+}
+
+.showziliao1 {
+    width: 400rpx;
+    height: 98rpx;
+    background: #FF4767;
+    border-radius: 49rpx;
+}
+
+.showziliaotext {
+    height: 40rpx;
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #FFFFFF;
+    line-height: 96rpx;
+    font-style: normal;
+    margin: 0 0 0 281rpx;
+    align-items: center;
+}
+
+.showziliaotext1 {
+    height: 40rpx;
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #FFFFFF;
+    line-height: 96rpx;
+    font-style: normal;
+    margin: 0 0 0 140rpx;
+    align-items: center;
+}
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 39037df..0c4a4c6 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -1,2076 +1,1650 @@
-<template>
-  <view class="store-info-page">
-    <!-- 门店信息标题 -->
-    <view class="section-title">
-      <view class="title-bar"></view>
-      <text>门店信息</text>
-    </view>
-
-    <!-- 店铺logo -->
-    <view class="form-item box-cont">
-        <view class="label-wrapper">
-            <text class="label required">店铺logo</text>
-            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('head_photo')"></image>
-        </view>
-      <view class="upload-box" @click="chooseImage('head_photo')">
-        <image v-if="formData.head_photo" :src="formData.head_photo" mode="aspectFill" class="logo-image"></image>
-        <view class="upload-placeholder" v-else>
-          <image src="/static/images/upload-img.png" mode="aspectFit" class="upload-icon"></image>
-        </view>
-      </view>
-    </view>
-
-    <!-- 店铺名称 -->
-    <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-            <text class="label required">店铺名称</text>
-            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('name')"></image>
-        </view>
-      <input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" 
-             placeholder-class="placeholder" class="input" 
-             @input="saveFormDataToLocalDebounce" />
-    </view>
-
-    <!-- 营业时间 -->
-    <view class="form-item-two box-cont" @click="openTimePicker">
-      <text class="label required">营业时间</text>
-      <view class="picker-content">
-        <text :class="formData.business_time ? 'picker-value' : 'placeholder'">
-          {{formData.business_time || '请输入营业时间'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 服务技能 -->
-    <view class="form-item-two box-cont" @click="showServicePopup">
-      <text class="label required">服务技能（多选）</text>
-      <view class="picker-content">
-        <text :class="formData.servers_kill.length > 0 ? 'picker-value' : 'placeholder'" v-if="formData.servers_kill">
-          {{selectedServicesText || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 门店所在地 -->
-    <view class="form-item-two box-cont" @click="showLocationPopup">
-      <text class="label required">门店所在地：</text>
-      <view class="picker-content">
-        <text :class="formData.dependency ? 'picker-value' : 'placeholder'">
-          {{formData.dependency || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 门店详细地址 -->
-    <view class="form-item-two box-cont" @click="getAddressInfo">
-      <text class="label required">门店详细地址：</text>
-      <view class="picker-content">
-        <text :class="formData.address ? 'picker-value' : 'placeholder'">
-          {{formData.address || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 其他信息标题 -->
-    <view class="section-title">
-      <view class="title-bar"></view>
-      <text>其他信息</text>
-    </view>
-
-    <!-- 获取消息方式 -->
-    <!-- <view class="form-item-two box-cont" @click="openMessageMethodPicker">
-      <text class="label required">获取消息方式：</text>
-      <view class="picker-content">
-        <text :class="formData.apply_state ? 'picker-value' : 'placeholder'">
-          {{messageMethodText || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view> -->
-
-    <!-- 邀请码 -->
-    <view class="form-item-one-yqr box-cont invite-code-container">
-        <view class="invite-code-top">
-            <view class="label-wrapper">
-              <text class="label required">邀请码</text>
-            </view>
-            <input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码" 
-                  placeholder-class="placeholder" class="input" 
-                  @input="handleInviteCodeInput" />
-        </view>
-        
-        <!-- 分割线 -->
-        <view class="divider"></view>
-        
-        <!-- 邀请人信息 -->
-        <view class="invite-info-container">
-          <!-- 默认提示 -->
-          <text v-if="!formData.invite_code_other" class="invite-tip">
-            请填写邀请人的邀请码，若没有邀请人请填写13131313
-          </text>
-          
-          <!-- 验证中 -->
-          <view v-else-if="inviteCodeValidating" class="invite-validating">
-            <text>验证中...</text>
-          </view>
-          
-          <!-- 验证失败 -->
-          <view v-else-if="inviteCodeError" class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
-            <text>邀请码无效</text>
-          </view>
-          
-          <!-- 特殊邀请码13131313 -->
-          <view v-else-if="formData.invite_code_other === '13131313' && !inviterInfo" class="invite-tip">
-            请填写邀请人的邀请码，若没有邀请人请填写13131313
-          </view>
-          
-          <!-- 显示邀请人信息 -->
-          <view v-else-if="inviterInfo" class="inviter-info">
-            <text class="inviter-label">邀请人：</text>
-            <text class="inviter-name">{{ inviterInfo.name || inviterInfo.nick_name }}</text>
-            <text class="inviter-divider">/</text>
-            <text class="inviter-phone">{{ inviterInfo.account }}</text>
-          </view>
-          
-          <!-- 其他情况（接口返回成功但没有认证铁军的邀请码） -->
-          <view v-else class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
-              <text>邀请码无效</text>
-          </view>
-        </view>
-    </view>
-
-    <!-- 专业经验 -->
-    <view class="form-item-two box-cont" @click="openExperiencePicker">
-      <text class="label required">专业经验：</text>
-      <view class="picker-content">
-        <text :class="formData.major ? 'picker-value' : 'placeholder'">
-          {{experienceText || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 服务技能弹出框 -->
-    <view class="popup" :class="{ show: showServicePopupFlag }">
-      <view class="popup-mask" @click="hideServicePopup"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="popup-title">选择服务技能</text>
-          <text class="popup-close" @click="hideServicePopup">×</text>
-        </view>
-        <view class="popup-body">
-          <view class="checkbox-list">
-            <view class="checkbox-item" v-for="(item, index) in serviceList" :key="index"
-                  @click="toggleServiceSelect(index)">
-              <view class="checkbox" :class="{ checked: item.checked }">
-                <image v-if="item.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" mode="aspectFit"></image>
-              </view>
-              <text class="checkbox-label">{{item.title}}</text>
-            </view>
-          </view>
-        </view>
-        <view class="popup-footer">
-          <view class="popup-btn cancel" @click="hideServicePopup">
-            <text class="btn-text">取消</text>
-          </view>
-          <view class="popup-btn confirm" @click="confirmServiceSelect">
-            <text class="btn-text">确定</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 所在地选择弹出框 -->
-    <view class="popup" :class="{ show: showLocationPopupFlag }">
-      <view class="popup-mask" @click="hideLocationPopup"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="popup-title">选择所在地</text>
-          <text class="popup-close" @click="hideLocationPopup">×</text>
-        </view>
-        <view class="region-body">
-          <picker-view @change="bindChangeLocation" class="picker-scroll"
-                      :indicator-style="indicatorStyle" :value="locationValue">
-            <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">
-                {{item.province}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">
-                {{item.city}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in locationAreas" :key="index">
-                {{item.area}}
-              </view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-        <view class="popup-footer">
-          <view class="popup-btn cancel" @click="hideLocationPopup">
-            <text class="btn-text">取消</text>
-          </view>
-          <view class="popup-btn confirm" @click="confirmLocationSelect">
-            <text class="btn-text">确定</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 营业时间选择器 -->
-    <view class="popup" :class="{ show: showTimePicker }">
-      <view class="popup-mask" @click="hideTimePopup"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="cancel-text" @click="hideTimePopup">取消</text>
-          <text class="title">选择营业时间</text>
-          <text class="confirm-text" @click="confirmTime">确定</text>
-        </view>
-        <view class="time-range">
-          <view class="time-block" :class="{ active: timeType === 'start' }"
-                @click="switchTimeType('start')">
-            <text class="time-value">{{formatTime(startTime)}}</text>
-            <text class="time-label">开始时间</text>
-          </view>
-          <text class="time-separator">至</text>
-          <view class="time-block" :class="{ active: timeType === 'end' }"
-                @click="switchTimeType('end')">
-            <text class="time-value">{{formatTime(endTime)}}</text>
-            <text class="time-label">结束时间</text>
-          </view>
-        </view>
-        <view class="region-body">
-          <picker-view :value="pickerValue" @change="handleTimeChange" class="picker-scroll"
-                      :indicator-style="indicatorStyle">
-            <picker-view-column>
-              <view class="picker-item" v-for="(hour, index) in hours" :key="index">
-                {{hour}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
-                {{minute}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item">-</view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(hour, index) in hours" :key="index">
-                {{hour}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
-                {{minute}}
-              </view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 提示信息弹窗 -->
-    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
-      <view class="tip-popup-mask" @click="hideTipPopup"></view>
-      <view class="tip-popup-content">
-        <!-- 弹窗背景图片 -->
-        <image class="tip-popup-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770" mode="aspectFit"></image>
-        
-        <!-- 弹窗内容 -->
-        <view class="tip-popup-body">
-          <view class="tip-title">{{ tipTitle }}</view>
-          <view class="tip-image-container">
-            <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
-          </view>
-          <view class="tip-buttons">
-            <view class="tip-btn cancel" @click="hideTipPopup">
-              <text class="btn-text">取消</text>
-            </view>
-            <view class="tip-btn confirm" @click="hideTipPopup">
-              <text class="btn-text">我已了解</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-  </view>
-</template>
-
-<script>
-import request from '../../utils/request';
-import ChinaCitys from '../../static/data/ChinaCitys.json';
-import { debounce } from '@/utils/debounce.js';
-
-export default {
-  data() {
-    const loadedData = this.loadFormDataFromLocal();
-    
-    return {
-      formData: loadedData || {
-        head_photo: '',
-        name: '',
-        business_time: '',
-        servers_kill: [],
-        dependency: '',
-        address: '',
-        apply_state: '',
-        invite_code_other: '',
-        major: '',
-        dependency_code: '',        // 区code
-        dependency_province: '',    // 省code  
-        dependency_city: '',        // 市code
-        longitude: '',              // 经度
-        latitude: '',               // 纬度
-      },
-      ChinaCitys: ChinaCitys,
-      locatinCitys: [],
-      locationAreas: [],
-      locationValue: [0, 0, 0],
-      showServicePopupFlag: false,
-      serviceList: [],
-      selectedServicesText: '',
-      showLocationPopupFlag: false,
-      showTimePicker: false,
-      pickerValue: [8, 0, 0, 18, 0],
-      hours: Array.from({ length: 24 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
-      minutes: Array.from({ length: 60 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
-      timeType: 'start',
-      indicatorStyle: 'height: 68rpx;',
-      messageMethodText: '',
-      experienceText: '',
-      showTipPopupFlag: false,
-      tipTitle: '',
-      tipImage: '',
-      currentTipType: '',
-      userId: null,
-      identity: 2,
-      tipImagesPreloaded: false,
-      tipPopupBg: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770',
-      
-      // 邀请码相关字段
-      inviteCodeValidating: false,
-      inviteCodeError: false,
-      inviterInfo: null,
-      currentValidatingCode: '',
-      
-      fromAddressPage: false,
-      addressListener: null,
-
-      // 抖动效果控制
-      shakeInviteError: false,
-
-      inviteValidationTimer: null, // 邀请码验证定时器
-    }
-  },
-  
-  computed: {
-    startTime() {
-      return {
-        hour: this.hours[this.pickerValue[0]],
-        minute: this.minutes[this.pickerValue[1]]
-      }
-    },
-    endTime() {
-      return {
-        hour: this.hours[this.pickerValue[3]],
-        minute: this.minutes[this.pickerValue[4]]
-      }
-    }
-  },
-  
-  watch: {
-    'name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.head_photo'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.invite_code_other'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.address'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    }
-  },
-  
-  onLoad() {
-    uni.$on('address-selected-for-sj', (addressData) => {
-      this.handleAddressSelected(addressData);
-    });
-  },
-
-  onUnload() {
-    uni.$off('address-selected-for-sj');
-  },
-  
-  mounted() {
-    this.getUserInfo();
-    this.preloadTipImages();
-
-    this.locatinCitys = this.ChinaCitys[0].citys;
-    this.locationAreas = this.locatinCitys[0].areas;
-    this.loadServiceSkills();
-    this.updateSelectedServicesText();
-
-    // 初始化消息方式和专业经验显示文本
-    if (this.formData.apply_state) {
-      const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-      this.messageMethodText = methods[this.formData.apply_state - 1] || '';
-    }
-    
-    if (this.formData.major) {
-      const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-      this.experienceText = experiences[this.formData.major - 1] || '';
-    }
-    
-    this.setupAddressListener();
-    
-    if (this.formData.invite_code_other) {
-      this.validateInviteCode(this.formData.invite_code_other);
-    }
-  },
-
-  beforeDestroy() {
-    if (this.addressListener) {
-      uni.$off('address-selected', this.addressListener);
-    }
-  },
-
-  onShow() {
-    this.checkAddressData();
-    
-    const localData = this.loadFormDataFromLocal();
-    if (localData) {
-      Object.assign(this.formData, localData);
-
-      // 立即更新显示文本（即使在 serviceList 加载完成前）
-      this.updateSelectedServicesTextImmediately();
-
-      // 恢复服务技能的选中状态
-      if (this.serviceList.length > 0) {
-        this.restoreServiceSkillsSelection();
-      }
-      
-      // 恢复获取消息方式的显示文本
-      if (this.formData.apply_state) {
-        const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-        this.messageMethodText = methods[this.formData.apply_state - 1] || '';
-      }
-      
-      // 恢复专业经验的显示文本
-      if (this.formData.major) {
-        const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-        this.experienceText = experiences[this.formData.major - 1] || '';
-      }
-
-    }
-
-    // 重新从本地存储加载邀请码验证状态
-    this.loadInviteStateFromLocal();
-    
-    this.checkGlobalData();
-
-    // 邀请码验证
-    if (this.formData.invite_code_other) {
-      this.validateInviteCode(this.formData.invite_code_other);
-    }
-  },
-
-  onHide() {
-    this.saveFormDataToLocal();
-  },
-  
-  onUnload() {
-    this.saveFormDataToLocal();
-  },
-  
-  methods: {
-    // 邀请码相关方法
-    // 从本地存储加载邀请码验证状态
-    loadInviteStateFromLocal() {
-      try {
-        const inviteState = uni.getStorageSync('store_invite_state');
-        if (inviteState) {
-          console.log('加载邀请码验证状态:', inviteState);
-          
-          // 恢复邀请码验证状态
-          this.inviterInfo = inviteState.inviterInfo || null;
-          this.inviteCodeError = inviteState.inviteCodeError || false;
-          this.currentValidatingCode = inviteState.currentValidatingCode || '';
-          
-          // 特殊处理：如果当前邀请码是13131313，确保状态正确
-          if (this.formData.invite_code_other === '13131313') {
-            console.log('检测到特殊邀请码13131313，重置验证状态');
-            this.inviteCodeError = false;
-            this.inviterInfo = null;
-            this.currentValidatingCode = '13131313';
-          }
-          
-          // 如果正在验证的邀请码与当前表单中的一致，保持验证状态
-          if (this.currentValidatingCode === this.formData.invite_code_other) {
-            // 状态已恢复，无需额外操作
-          } else {
-            // 如果不一致，重新验证
-            if (this.formData.invite_code_other && this.formData.invite_code_other.trim() !== '') {
-              console.log('邀请码不一致，重新验证:', this.formData.invite_code_other);
-              this.handleInviteCodeInput({ detail: { value: this.formData.invite_code_other } });
-            }
-          }
-        } else {
-          // 如果没有保存的状态，重置为初始状态
-          this.resetInviteCodeState();
-        }
-      } catch (e) {
-        console.log('加载邀请码验证状态失败:', e);
-        this.resetInviteCodeState();
-      }
-    },
-
-    // 新增方法：重置邀请码状态
-    resetInviteCodeState() {
-      this.inviteCodeValidating = false;
-      this.inviteCodeError = false;
-      this.inviterInfo = null;
-      this.currentValidatingCode = '';
-      this.shakeInviteError = false;
-    },
-
-    // 新增方法：专门保存邀请码验证状态
-    saveInviteStateToLocal() {
-      try {
-        const inviteState = {
-          inviterInfo: this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode || this.formData.invite_code_other || ''
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        
-        console.log('邀请码验证状态已保存:', {
-          hasInviterInfo: !!this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode
-        });
-      } catch (e) {
-        console.log('保存邀请码验证状态失败:', e);
-      }
-    },
-    // 触发邀请码错误抖动效果
-    triggerInviteErrorShake() {
-      // 触发抖动效果
-      this.shakeInviteError = true;
-      
-      // 滚动到邀请码容器位置
-      this.$nextTick(() => {
-        // 使用uni.createSelectorQuery获取邀请码容器的位置
-        const query = uni.createSelectorQuery().in(this);
-        query.select('.invite-code-container').boundingClientRect((rect) => {
-          if (rect) {
-            // 获取当前窗口高度
-            const windowHeight = uni.getSystemInfoSync().windowHeight;
-            
-            // 判断邀请码容器是否已经在可视区域内
-            // 计算容器在屏幕中的位置比例（0-1之间）
-            const containerTopRatio = rect.top / windowHeight;
-            const containerBottomRatio = (rect.top + rect.height) / windowHeight;
-            
-            // 如果容器已经在屏幕中上部（顶部在屏幕中间以上），就不需要滚动
-            // 或者容器整体都在屏幕内，也不需要滚动
-            if (containerTopRatio >= 0 && containerTopRatio < 0.7 && 
-                containerBottomRatio <= 1) {
-              console.log('邀请码容器已在可视区域内，不需要滚动');
-              return;
-            }
-            
-            // 滚动到邀请码容器位置，减去一些偏移量让用户体验更好
-            uni.pageScrollTo({
-              scrollTop: rect.top - 50,
-              duration: 300
-            });
-          }
-        }).exec();
-      });
-
-      // 0.5秒后重置抖动状态
-      setTimeout(() => {
-        this.shakeInviteError = false;
-      }, 500);
-    },
-    
-    // 处理邀请码输入
-    handleInviteCodeInput(e) {
-      const code = e.detail ? e.detail.value : this.formData.invite_code_other;
-      
-      console.log('邀请码输入:', code);
-      
-      // 立即重置状态
-      this.inviteCodeValidating = false;
-      this.inviteCodeError = false;
-      this.inviterInfo = null;
-      
-      // 如果邀请码为空，不进行验证
-      if (!code || code.trim() === '') {
-        this.formData.invite_code_other = '';
-        this.saveFormDataToLocalDebounce();
-        // 保存空状态
-        this.saveInviteStateToLocal();
-        return;
-      }
-      
-      this.formData.invite_code_other = code;
-      this.saveFormDataToLocalDebounce();
-      
-      // 【关键修复】如果是13131313，立即通过验证并取消任何正在进行的验证
-      if (code === '13131313') {
-        console.log('检测到特殊邀请码13131313，立即通过');
-        
-        // 清除任何可能的定时器
-        if (this.inviteValidationTimer) {
-          clearTimeout(this.inviteValidationTimer);
-          this.inviteValidationTimer = null;
-        }
-        
-        // 立即更新状态
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = false;
-        this.inviterInfo = null;
-        this.currentValidatingCode = code;
-        
-        // 特殊邀请码也需要保存状态
-        const inviteState = {
-          inviterInfo: null,
-          inviteCodeError: false,
-          currentValidatingCode: code
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        
-        // 强制更新视图
-        this.$forceUpdate();
-        return;
-      }
-      
-      // 记录当前正在验证的邀请码
-      this.currentValidatingCode = code;
-      
-      // 立即保存状态（验证中）
-      this.saveInviteStateToLocal();
-      
-      // 清除之前的定时器
-      if (this.inviteValidationTimer) {
-        clearTimeout(this.inviteValidationTimer);
-        this.inviteValidationTimer = null;
-      }
-      
-      // 设置新的定时器
-      this.inviteValidationTimer = setTimeout(() => {
-        // 检查邀请码是否变化
-        if (this.formData.invite_code_other !== this.currentValidatingCode) {
-          console.log('邀请码已变化，取消验证');
-          return;
-        }
-        
-        // 再次检查是否是13131313（双重检查）
-        if (this.formData.invite_code_other === '13131313') {
-          console.log('双重检查：检测到特殊邀请码13131313');
-          this.inviteCodeValidating = false;
-          this.inviteCodeError = false;
-          this.inviterInfo = null;
-          this.currentValidatingCode = '13131313';
-          
-          const inviteState = {
-            inviterInfo: null,
-            inviteCodeError: false,
-            currentValidatingCode: '13131313'
-          };
-          uni.setStorageSync('store_invite_state', inviteState);
-          return;
-        }
-        
-        console.log('开始验证邀请码:', this.formData.invite_code_other);
-        this.validateInviteCode(this.formData.invite_code_other);
-        
-        // 清理定时器
-        this.inviteValidationTimer = null;
-      }, 600); // 适当增加延迟时间
-    },
-    
-    // 验证邀请码
-     async validateInviteCode(code) {
-      console.log('开始验证邀请码:', code);
-
-      // 特殊邀请码13131313直接通过
-      if (code === '13131313') {
-        console.log('特殊邀请码13131313，直接通过');
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = false;
-        this.inviterInfo = null;
-        this.currentValidatingCode = code;
-        // 特殊邀请码也需要保存状态
-        const inviteState = {
-          inviterInfo: null,
-          inviteCodeError: false,
-          currentValidatingCode: code
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-
-        // 强制更新视图
-        this.$forceUpdate();
-        return;
-      }
-      
-      // 如果邀请码为空
-      if (!code || code.trim() === '') {
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = false;
-        this.inviterInfo = null;
-        this.currentValidatingCode = '';
-        const inviteState = {
-          inviterInfo: null,
-          inviteCodeError: false,
-          currentValidatingCode: ''
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        return;
-      }
-      
-      // 设置验证中状态
-      this.inviteCodeValidating = true;
-      this.inviteCodeError = false;
-      this.inviterInfo = null;
-      this.currentValidatingCode = code;
-      
-      try {
-        // 调用接口验证邀请码
-        const response = await request.post('/user/user/getInvite', {
-          invite_code: code
-        });
-        
-        console.log('邀请码验证响应:', response);
-        
-        // 验证完成
-        this.inviteCodeValidating = false;
-        
-        if (response && response.code === 200 && response.data) {
-          const userData = response.data;
-
-          //检查返回的数据是否有效
-          if (userData.account) {
-              // 邀请码有效，保存邀请人信息
-              this.inviterInfo = userData;
-              this.inviteCodeError = false;
-              console.log('邀请码验证通过，邀请人:', userData);
-          } else {
-              // 接口返回数据但没有account字段，说明不是有效邀请人
-              console.log('接口返回数据无效，没有account字段:', userData);
-              this.inviterInfo = null;
-              this.inviteCodeError = true;
-          }
-        } else {
-          // 接口返回错误或数据为空
-          console.log('接口返回错误:', response?.msg || '未知错误');
-          this.inviterInfo = null;
-          this.inviteCodeError = true;
-        }
-      } catch (error) {
-        console.error('验证邀请码失败:', error);
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = true;
-        this.inviterInfo = null;
-      } finally {
-        // 无论成功失败都保存状态
-        const inviteState = {
-          inviterInfo: this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-      }
-    },
-    
-    
-    // 从本地存储加载数据
-    loadFormDataFromLocal() {
-      try {
-        const stored = uni.getStorageSync('store_info_form_data');
-        if (stored) {
-          console.log('从本地存储加载门店数据:', stored);
-          
-          // 同时加载邀请码验证状态
-          const inviteState = uni.getStorageSync('store_invite_state');
-          if (inviteState) {
-            this.inviterInfo = inviteState.inviterInfo;
-            this.inviteCodeError = inviteState.inviteCodeError || false;
-            this.currentValidatingCode = inviteState.currentValidatingCode || '';
-            console.log('加载邀请码验证状态:', inviteState);
-          }
-          
-          return stored;
-        }
-      } catch (e) {
-        console.log('读取门店数据失败:', e);
-      }
-      return null;
-    },
-    
-    // 保存数据到本地存储
-    saveFormDataToLocal() {
-      try {
-        uni.setStorageSync('store_info_form_data', this.formData);
-
-        // 同时保存邀请码验证状态
-        const inviteState = {
-          inviterInfo: this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        console.log('门店数据已保存到本地存储');
-      } catch (e) {
-        console.log('保存门店数据失败:', e);
-      }
-    },
-    
-    // 防抖保存
-    saveFormDataToLocalDebounce() {
-      // 使用debounce函数
-      if (!this._saveDebounce) {
-        this._saveDebounce = debounce(() => {
-          this.saveFormDataToLocal();
-        }, 500);
-      }
-      this._saveDebounce();
-    },
-    
-    // 清空本地存储
-    clearFormDataLocal() {
-      try {
-        uni.removeStorageSync('store_info_form_data');
-        console.log('已清空门店数据');
-      } catch (e) {
-        console.log('清空门店数据失败:', e);
-      }
-    },
-
-    // 立即更新已选择服务技能的显示文本（不依赖 serviceList）
-    updateSelectedServicesText() {
-      if (this.formData.servers_kill && this.formData.servers_kill.length > 0) {
-        if (this.serviceList.length > 0) {
-          const selectedServices = this.serviceList
-            .filter(item => this.formData.servers_kill.includes(item.id))
-            .map(item => {
-              item.checked = true;
-              return item.title;
-            });
-          this.selectedServicesText = selectedServices.join('、');
-        } else {
-          // serviceList 还未加载，显示数量
-          this.selectedServicesText = `已选择${this.formData.servers_kill.length}项`;
-        }
-      } else {
-        this.selectedServicesText = '';
-      }
-    },
-    
-
-    // 地址相关方法 
-
-    setupAddressListener() {
-      this.addressListener = (addressData) => {
-        this.handleAddressSelected(addressData);
-      };
-      uni.$on('address-selected', this.addressListener);
-    },
-    
-    // 检查地址数据
-    checkAddressData() {
-      try {
-        const sjAddress = uni.getStorageSync('sj_selected_address');
-        if (sjAddress) {
-          this.handleAddressSelected(sjAddress);
-          uni.removeStorageSync('sj_selected_address');
-          return;
-        }
-      } catch (e) {}
-      
-      if (getApp().globalData && getApp().globalData.selectedAddress) {
-        this.handleAddressSelected(getApp().globalData.selectedAddress);
-        delete getApp().globalData.selectedAddress;
-      }
-      
-      try {
-        const storedAddress = uni.getStorageSync('selectedAddress');
-        if (storedAddress) {
-          this.handleAddressSelected(storedAddress);
-          uni.removeStorageSync('selectedAddress');
-        }
-      } catch (e) {}
-    },
-    
-    // 处理地址选择结果
-    handleAddressSelected(addressData) {
-      if (!addressData) return
-
-      // 详细地址优先取 address，不再优先取完整地址 name
-      let detailAddress = ''
-      if (addressData.address) {
-        detailAddress = String(addressData.address).trim()
-      } else if (addressData.name) {
-        detailAddress = String(addressData.name).trim()
-
-        const regionParts = []
-        if (addressData.pname) regionParts.push(addressData.pname)
-        if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData.cityname)
-        if (addressData.adname) regionParts.push(addressData.adname)
-
-        const regionText = regionParts.join('')
-        const regionTextWithDash = regionParts.join('-')
-
-        if (regionText && detailAddress.indexOf(regionText) === 0) {
-          detailAddress = detailAddress.slice(regionText.length).trim()
-        } else if (regionTextWithDash && detailAddress.indexOf(regionTextWithDash) === 0) {
-          detailAddress = detailAddress.slice(regionTextWithDash.length).trim()
-        }
-
-        detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim()
-      }
-
-      this.formData.address = detailAddress
-
-      if (addressData.location) {
-        const [longitude, latitude] = String(addressData.location).split(',')
-        this.formData.longitude = longitude || ''
-        this.formData.latitude = latitude || ''
-      }
-
-      if (addressData.pname || addressData.cityname || addressData.adname) {
-        const locationParts = []
-        if (addressData.pname) locationParts.push(addressData.pname)
-        if (addressData.cityname) locationParts.push(addressData.cityname)
-        if (addressData.adname) locationParts.push(addressData.adname)
-        this.formData.dependency = locationParts.join('-')
-      }
-
-      this.formData.dependency_province = addressData.provinceCode || ''
-      this.formData.dependency_city = addressData.cityCode || ''
-      this.formData.dependency_code = addressData.districtCode || ''
-
-      this.saveFormDataToLocal()
-      this.$forceUpdate()
-    },
-    
-    
-    // 检查全局数据
-    checkGlobalData() {
-      if (getApp().globalData.storeInfoData) {
-        Object.assign(this.formData, getApp().globalData.storeInfoData);
-        this.saveFormDataToLocal();
-        // delete getApp().globalData.storeInfoData;
-        getApp().globalData.qualificationData = null;
-      }
-    },
-    
-    // 更新已选择服务技能的显示文本
-    updateSelectedServicesText() {
-      if (this.formData.servers_kill && this.formData.servers_kill.length > 0 && this.serviceList.length > 0) {
-        const selectedServices = this.serviceList
-          .filter(item => this.formData.servers_kill.includes(item.id))
-          .map(item => {
-            item.checked = true;
-            return item.title;
-          });
-        this.selectedServicesText = selectedServices.join('、');
-      }
-    },
-    
-    // 获取用户信息
-    getUserInfo() {
-      request.post('/sj/User/getUser').then(result => {
-        this.userId = result.data.id;
-      })
-    },
-    
-    getFormData() {
-      return this.formData;
-    },
-    
-    // 预加载提示弹窗图片
-    preloadTipImages() {
-      const images = [
-        this.tipPopupBg, // 弹窗背景图片
-        'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9', // 店铺logo提示图片
-        'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'  // 店铺名称提示图片
-      ];
-      
-      console.log('开始预加载提示弹窗图片...');
-      
-      // 使用 Promise.all 确保所有图片都加载完成
-      const loadPromises = images.map(src => this.loadImage(src));
-      
-      Promise.all(loadPromises)
-        .then(() => {
-          console.log('所有提示弹窗图片预加载完成');
-          this.tipImagesPreloaded = true;
-        })
-        .catch(error => {
-          console.warn('部分图片预加载失败:', error);
-          // 即使部分图片加载失败，也设置为预加载完成，避免影响用户操作
-          this.tipImagesPreloaded = true;
-        });
-    },
-    
-    // 加载单个图片
-    loadImage(src) {
-      return new Promise((resolve, reject) => {
-        const img = new Image();
-        img.onload = () => {
-          console.log('图片加载成功:', src);
-          resolve();
-        };
-        img.onerror = () => {
-          console.warn('图片加载失败:', src);
-          reject(new Error(`图片加载失败: ${src}`));
-        };
-        img.src = src;
-      });
-    },
-    
-    // 显示提示弹窗
-    showTipPopup(field) {
-      const tipConfig = {
-        'head_photo': {
-          title: '如何查看店铺logo',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9'
-        },
-        'name': {
-          title: '如何查看店铺名称',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
-        }
-      };
-      
-      if (tipConfig[field]) {
-        this.currentTipType = field; // 设置当前类型
-        this.tipTitle = tipConfig[field].title;
-        this.tipImage = tipConfig[field].image;
-        // 等待图片预加载完成后再显示弹窗
-      if (this.tipImagesPreloaded) {
-        this.showTipPopupFlag = true;
-      } else {
-        // 如果图片还没预加载完成，立即加载当前图片
-        console.log('图片还未预加载完成，立即加载当前图片');
-        this.loadImage(this.tipImage).then(() => {
-          this.showTipPopupFlag = true;
-        }).catch(() => {
-          // 即使加载失败也显示弹窗，避免用户无法操作
-          this.showTipPopupFlag = true;
-        });
-      }
-    }
-  }, 
-    
-    // 隐藏提示弹窗
-    hideTipPopup() {
-      this.showTipPopupFlag = false;
-    },
-    
-    // 加载服务技能列表
-    async loadServiceSkills() {
-      try {
-        const res = await request.post('/sj/firstclass');
-        this.serviceList = res.data.map(item => ({
-          ...item,
-          checked: false
-        }));
-        // 加载完成后立即恢复选中状态
-        this.restoreServiceSkillsSelection();
-        // 再次更新显示文本，确保显示具体的技能名称
-        this.updateSelectedServicesText();
-      } catch (error) {
-        console.error('加载服务技能失败:', error);
-      }
-    },
-    
-    // 恢复服务技能选择状态
-    restoreServiceSkillsSelection() {
-      if (this.formData.servers_kill && this.formData.servers_kill.length > 0) {
-        this.serviceList.forEach(item => {
-          item.checked = this.formData.servers_kill.includes(item.id);
-        });
-        this.updateSelectedServicesText();
-      }
-    },
-    
-    // 选择图片
-    chooseImage(type) {
-      this.openCamera(type);
-    },
-    
-    async openCamera(type) {
-      try {
-        const chooseResult = await new Promise((resolve, reject) => {
-          uni.chooseImage({
-            count: 1,
-            sizeType: ['compressed'],
-            sourceType: ['album', 'camera'],
-            success: resolve,
-            fail: reject
-          });
-        });
-        
-        if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) {
-          return;
-        }
-        
-        const tempFilePath = chooseResult.tempFilePaths[0];
-        const file = { path: tempFilePath, size: 0 };
-        const result = await this.directUpload(file, this.userId, this.identity + 1);
-        
-        if (result) {
-          this.formData[type] = result;
-          this.saveFormDataToLocal();
-        }
-      } catch (err) {
-        console.log('上传图片错误:', err);
-      }
-    },
-    
-    // 直接上传方法
-    async directUpload(file, userId, type) {
-      try {
-        let date = new Date().getTime();
-        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
-        
-        let fileExtension = 'jpg';
-        if (file.path.includes('.')) {
-          let parts = file.path.split('.');
-          let ext = parts[parts.length - 1].toLowerCase();
-          if (ext && ext.length <= 4) {
-            fileExtension = ext;
-          }
-        }
-        
-        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
-        const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
-        
-        return await new Promise((resolve, reject) => {
-          uni.uploadFile({
-            url: ossConfig.host,
-            filePath: file.path,
-            name: 'file',
-            formData: {
-              key: ossConfig.dir + name,
-              policy: ossConfig.policy,
-              OSSAccessKeyId: ossConfig.ossAccessKeyId,
-              success_action_status: '200',
-              signature: ossConfig.signature
-            },
-            success: (res) => {
-              if (res.statusCode === 200) {
-                const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
-                resolve(fileUrl);
-              } else {
-                reject(new Error('上传失败'));
-              }
-            },
-            fail: reject
-          });
-        });
-      } catch (error) {
-        console.error('直接上传失败:', error);
-        throw error;
-      }
-    },
-    
-    // 打开时间选择器
-    openTimePicker() {
-      this.showTimePicker = true;
-    },
-    
-    // 隐藏时间选择器
-    hideTimePopup() {
-      this.showTimePicker = false;
-    },
-    
-    // 切换时间类型
-    switchTimeType(type) {
-      this.timeType = type;
-    },
-    
-    // 处理时间变化
-    handleTimeChange(e) {
-      const values = e.detail.value;
-      this.pickerValue = values;
-    },
-    
-    // 格式化时间显示
-    formatTime(time) {
-      return `${time.hour}:${time.minute}`;
-    },
-    
-    // 确认时间选择
-    confirmTime() {
-      this.formData.business_time = `${this.formatTime(this.startTime)}-${this.formatTime(this.endTime)}`;
-      this.saveFormDataToLocal();
-      this.hideTimePopup();
-    },
-    
-    // 显示服务技能弹出框
-    showServicePopup() {
-      this.showServicePopupFlag = true;
-    },
-    
-    // 隐藏服务技能弹出框
-    hideServicePopup() {
-      this.showServicePopupFlag = false;
-    },
-    
-    // 切换服务技能选择状态
-    toggleServiceSelect(index) {
-      this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
-    },
-    
-    // 确认服务技能选择
-    confirmServiceSelect() {
-      const selectedServices = this.serviceList
-        .filter(item => item.checked)
-        .map(item => item.title);
-      const selectedServicesId = this.serviceList
-        .filter(item => item.checked)
-        .map(item => item.id);
-        
-      if (selectedServices.length === 0) {
-        uni.showToast({ title: '请至少选择一个服务技能', icon: 'none' });
-        return;
-      }
-      
-      this.formData.servers_kill = selectedServicesId;
-      this.selectedServicesText = selectedServices.join('、');
-      this.saveFormDataToLocal();
-      this.hideServicePopup();
-    },
-    
-    // 显示所在地选择弹出框
-    showLocationPopup() {
-      this.showLocationPopupFlag = true;
-    },
-    
-    // 隐藏所在地选择弹出框
-    hideLocationPopup() {
-      this.showLocationPopupFlag = false;
-    },
-    
-    // 所在地选择变化
-    bindChangeLocation(e) {
-      this.locationValue = e.detail.value;
-      let index1 = e.detail.value[0] || 0;
-      let index2 = e.detail.value[1] || 0;
-      this.locatinCitys = this.ChinaCitys[index1].citys;
-      this.locationAreas = this.locatinCitys[index2].areas;
-    },
-    
-    // 确认所在地选择
-    confirmLocationSelect() {
-      let valueArr = this.locationValue;
-      let index1 = valueArr[0] || 0;
-      let index2 = valueArr[1] || 0;
-      let index3 = valueArr[2] || 0;
-      let province = this.ChinaCitys[index1].province;
-      let city = this.locatinCitys[index2].city;
-      let area = this.locationAreas[index3].area;
-      this.formData.dependency = province + '-' + city + '-' + area;
-
-      // 清空详细地址，因为所在地已经改变
-      this.formData.address = '';
-      this.formData.longitude = '';
-      this.formData.latitude = '';
-      
-      if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
-        let provinceCode = this.ChinaCitys[index1].code.toString();
-        this.formData.dependency_province = provinceCode.substring(0, 6);
-      }
-      if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
-        let cityCode = this.locatinCitys[index2].code.toString();
-        this.formData.dependency_city = cityCode.substring(0, 6);
-      }
-      if (this.locationAreas[index3] && this.locationAreas[index3].code) {
-        let areaCode = this.locationAreas[index3].code.toString();
-        this.formData.dependency_code = areaCode.substring(0, 6);
-      }
-      
-      this.saveFormDataToLocal();
-      this.hideLocationPopup();
-    },
-
-    buildRegionTextForSearch() {
-      const dependency = String(this.formData.dependency || '').trim()
-      if (!dependency) return ''
-
-      const parts = dependency.split('-')
-      const province = parts[0] || ''
-      const city = parts[1] || ''
-      const district = parts[2] || ''
-
-      let regionText = ''
-      if (province) regionText += province
-      if (city && city !== province) regionText += city
-      if (district) regionText += district
-
-      return regionText
-    },
-
-    getAddressValueForSearch() {
-      const rawAddress = String(this.formData.address || '').trim()
-      if (!rawAddress) return ''
-
-      const dependencyText = String(this.formData.dependency || '').trim()
-      const regionText = this.buildRegionTextForSearch()
-
-      let detail = rawAddress
-
-      // 兼容老数据里 address 被存成完整地址的情况
-      if (regionText && detail.indexOf(regionText) === 0) {
-        detail = detail.slice(regionText.length).trim()
-      } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
-        detail = detail.slice(dependencyText.length).trim()
-      }
-
-      detail = detail.replace(/^[\s,-]+/, '').trim()
-
-      return detail || rawAddress
-    },
-    
-    // 获取详细地址
-    getAddressInfo() {
-      this.saveFormDataToLocal()
-
-      const dependency = String(this.formData.dependency || '').trim()
-      const dependencyCode = String(this.formData.dependency_code || '').trim()
-      const address = this.getAddressValueForSearch()
-      const longitude = String(this.formData.longitude || '').trim()
-      const latitude = String(this.formData.latitude || '').trim()
-
-      const hasDependency = !!dependency
-      const hasAddress = !!address
-      const hasLocation = !!(longitude && latitude)
-
-      let params = 'source=sj_info'
-
-      // 已选所在地时，继续把地区传过去
-      if (hasDependency) {
-        params += `&dependency=${encodeURIComponent(dependency)}`
-        if (dependencyCode) {
-          params += `&dependency_code=${dependencyCode}`
-        }
-      }
-
-      // 已有详细地址时，把纯详细地址传过去，不带省市区
-      if (hasAddress) {
-        params += `&address=${encodeURIComponent(address)}`
-      }
-
-      // 已有坐标时，继续用已有坐标定位
-      if (hasLocation) {
-        params += `&longitude=${longitude}&latitude=${latitude}`
-      }
-
-      // 完全空白进入时：
-      // 已授权 -> 搜索页按当前定位初始化
-      // 未授权/拒绝 -> 搜索页静默失败后保持所在地、详细地址都为空
-      if (!hasDependency && !hasAddress && !hasLocation) {
-        params += '&init_current_location=1&silent_locate=1'
-      }
-
-      console.log('跳转URL参数:', params)
-
-      uni.navigateTo({
-        url: `/pages/address/search?${params}`
-      })
-    },
-    
-    // 打开获取消息方式选择器
-    openMessageMethodPicker() {
-      uni.showActionSheet({
-        itemList: ['朋友圈', '抖音', '地推', '朋友介绍', '微博'],
-        success: (res) => {
-          const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-          this.formData.apply_state = res.tapIndex + 1;
-          this.messageMethodText = methods[res.tapIndex];
-          this.saveFormDataToLocal();
-        }
-      });
-    },
-    
-    // 打开专业经验选择器
-    openExperiencePicker() {
-      uni.showActionSheet({
-        itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
-        success: (res) => {
-          const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-          this.formData.major = res.tapIndex + 1;
-          this.experienceText = experiences[res.tapIndex];
-          this.saveFormDataToLocal();
-        }
-      });
-    },
-    
-    // 保存表单数据（用于提交前验证）
-    saveFormData() {
-      // 验证必填字段
-      if (!this.formData.head_photo) {
-        uni.showToast({
-          title: '请上传店铺logo',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.name) {
-        uni.showToast({
-          title: '请输入店铺名称',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.business_time) {
-        uni.showToast({
-          title: '请选择营业时间',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (this.formData.servers_kill.length === 0) {
-        uni.showToast({
-          title: '请选择服务技能',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.dependency) {
-        uni.showToast({
-          title: '请选择门店所在地',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.address) {
-        uni.showToast({
-          title: '请选择门店详细地址',
-          icon: 'none'
-        });
-        return false;
-      }
-      // if (!this.formData.apply_state) {
-      //   uni.showToast({
-      //     title: '请选择获取消息方式',
-      //     icon: 'none'
-      //   });
-      //   return false;
-      // }
-      if (!this.formData.invite_code_other) {
-        uni.showToast({
-          title: '请输入邀请码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      // 邀请码有效性验证
-      if (this.inviteCodeValidating) {
-        uni.showToast({ title: '邀请码验证中，请稍候', icon: 'none' });
-        return false;
-      }
-      
-      // 特殊邀请码13131313直接通过
-      if (this.formData.invite_code_other === '13131313') {
-        // 直接通过
-      } else if (this.inviteCodeError || !this.inviterInfo) {
-        // 邀请码无效，触发抖动效果
-        this.triggerInviteErrorShake();
-        return false;
-      }
-      
-      if (!this.formData.major) {
-        uni.showToast({
-          title: '请选择专业经验',
-          icon: 'none'
-        });
-        return false;
-      }
-
-      // 将数据保存到全局，以便在下一步使用
-      getApp().globalData.storeInfoData = this.formData;
-      return true;
-    }
-  }
-}
-</script>
-
-<style scoped>
-.store-info-page {
-  /* padding: 28rpx 0; */
-}
-
-.section-title {
-  display: flex;
-  align-items: center;
-  margin-bottom: 30rpx;
-}
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 7rpx;
-  border-radius: 5rpx;
-}
-
-.section-title text {
-  font-size: 32rpx;
-  color: #1D2129;
-  font-weight: 500;
-}
-
-.box-cont {
-  background: #ffffff;
-  border-radius: 20rpx;
-  margin-bottom: 24rpx;
-  margin-left: 8rpx;
-  margin-right: 8rpx;
-  box-shadow: none;
-}
-
-.form-item {
-  padding: 24rpx;
-}
-
-.label {
-  display: block;
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
-
-.upload-box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 160rpx;
-  border-radius: 20rpx;
-}
-
-.upload-placeholder {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.upload-icon {
-  width: 120rpx;
-  height: 120rpx;
-}
-
-.upload-text {
-  font-size: 24rpx;
-  color: #999999;
-}
-
-.logo-image {
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 20rpx;
-}
-
-.form-item-one {
-  display: flex;
-  align-items: center;
-  padding: 24rpx;
-}
-
-.form-item-one-yqr {
-  flex-direction: column;
-  align-items: stretch;
-  padding: 0;
-}
-
-/* 创建内部的上半部分 */
-.invite-code-top {
-  display: flex;
-  align-items: center;
-  padding: 24rpx;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-/* 分割线 */
-.divider {
-  height: 1rpx;
-  background-color: #00000013;
-  width: 100%;
-}
-
-/* 邀请信息容器 */
-.invite-info-container {
-  padding: 20rpx 24rpx;
-  width: 100%;
-  box-sizing: border-box;
-  min-height: 60rpx;
-}
-
-.label-wrapper {
-  display: inline-flex;
-  align-items: center;
-}
-
-.label {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-  line-height: 1;
-}
-
-.label-icon {
-  width: 26rpx;
-  height: 26rpx;
-  margin-left: 8rpx;
-  align-items: center;
-}
-
-.form-item-two {
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
-		padding: 24rpx;
-	}
-
-	/* 左侧标签：固定宽度，不换行 */
-	.form-item-two > text.label {
-		flex-shrink: 0;
-		font-size: 28rpx;
-		color: #333333;
-		font-weight: 500;
-	}
-
-.input {
-  flex: 1;
-  font-size: 28rpx;
-  color: #333333;
-  text-align: right;
-}
-
-.placeholder {
-  color: #999999;
-}
-
-.picker-content {
-  display: flex;
-  align-items: center;
-}
-
-.picker-value,
-	.placeholder {
-		flex: 1;               /* 占据剩余宽度 */
-		text-align: right;     /* 文字右对齐 */
-		font-size: 28rpx;
-		word-break: break-all;
-		white-space: normal;
-		line-height: 1.4;
-	}
-
-.arrow-right {
-  width: 14rpx;
-  height: 26rpx;
-  margin-left: 16rpx;
-  flex-shrink: 0;
-}
-
-/* 邀请码相关样式 */
-.invite-tip {
-  font-size: 24rpx;
-  color: #666666;
-}
-
-.invite-validating {
-  font-size: 20rpx;
-  color: #999999;
-}
-
-.invite-error {
-  font-size: 24rpx;
-  color: #E8101E;
-}
-
-.inviter-info {
-  display: flex;
-  align-items: center;
-  font-size: 20rpx;
-}
-
-.inviter-label {
-  color: #666666;
-}
-
-.inviter-name {
-  color: #333333;
-  font-weight: 500;
-}
-
-.inviter-divider {
-  color: #666666;
-  margin: 0 5rpx;
-}
-
-.inviter-phone {
-  color: #666666;
-}
-
-/* 添加抖动动画样式 */
-@keyframes shake {
-  0%, 100% { transform: translateX(0); }
-  10%, 30%, 50%, 70%, 90% { transform: translateX(-7rpx); }
-  20%, 40%, 60%, 80% { transform: translateX(7rpx); }
-}
-
-.shake-animation {
-  animation: shake 0.5s ease-in-out;
-  color: #E8101E; /* 保持红色 */
-}
-
-/* 弹窗样式 */
-.popup {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 999;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.popup-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.popup-content {
-  position: relative;
-  background-color: #FFFFFF;
-  border-radius: 24rpx 24rpx 0 0;
-  padding: 32rpx;
-  transform: translateY(100%);
-  transition: transform 0.3s ease;
-}
-
-.popup.show .popup-content {
-  transform: translateY(0);
-}
-
-.popup-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 20rpx;
-}
-
-.popup-title {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.popup-close {
-  font-size: 40rpx;
-  color: #999999;
-  padding: 16rpx;
-}
-
-.popup-body {
-  max-height: 600rpx;
-  overflow-y: auto;
-}
-
-.checkbox-list {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.checkbox-item {
-  width: 50%;
-  padding: 14rpx;
-  display: flex;
-  align-items: center;
-}
-
-.checkbox {
-  width: 40rpx;
-  height: 40rpx;
-  border: 2rpx solid #DDDDDD;
-  border-radius: 8rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 16rpx;
-}
-
-.checkbox.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
-}
-
-.check-icon {
-  width: 42rpx;
-  height: 42rpx;
-}
-
-.checkbox-label {
-  font-size: 28rpx;
-  color: #333333;
-}
-
-.popup-footer {
-  display: flex;
-  margin-top: 32rpx;
-}
-
-.popup-btn {
-  flex: 1;
-  height: 88rpx;
-  border-radius: 44rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin: 0 16rpx;
-}
-
-.popup-btn.cancel {
-  background-color: #F5F5F5;
-}
-
-.popup-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-}
-
-.popup-btn .btn-text {
-  font-size: 32rpx;
-  font-weight: 500;
-}
-
-.popup-btn.cancel .btn-text {
-  color: #666666;
-}
-
-.popup-btn.confirm .btn-text {
-  color: #FFFFFF;
-}
-
-.region-body {
-  height: 400rpx;
-}
-
-.picker-scroll {
-  height: 400rpx;
-}
-
-.picker-item {
-  height: 68rpx;
-  line-height: 68rpx;
-  text-align: center;
-}
-
-/* 时间选择器样式 */
-.cancel-text {
-  font-size: 32rpx;
-  color: #666666;
-}
-
-.confirm-text {
-  font-size: 32rpx;
-  color: #E8101E;
-  font-weight: 500;
-}
-
-.time-range {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 32rpx;
-  background: #F8F9FC;
-}
-
-.time-block {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  background: #FFFFFF;
-  border-radius: 12rpx;
-  padding: 24rpx 0;
-  transition: all 0.3s ease;
-}
-
-.time-block.active {
-  background: #ECF2FF;
-}
-
-.time-label {
-  font-size: 26rpx;
-  color: #999999;
-  margin-top: 8rpx;
-}
-
-.time-value {
-  font-size: 40rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.time-block.active .time-value {
-  color: #E8101E;
-}
-
-.time-separator {
-  font-size: 28rpx;
-  color: #999999;
-  margin: 0 24rpx;
-}
-
-/* 提示弹窗样式 */
-.tip-popup {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 1000;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.tip-popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.tip-popup-mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.tip-popup-content {
-  position: relative;
-  width: 620rpx;
-  height: 810rpx;
-}
-
-.tip-popup-bg {
-  width: 620rpx;
-  height: 810rpx;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.tip-popup-body {
-  position: relative;
-  flex-direction: column;
-  padding: 80rpx 20rpx 40rpx 20rpx;
-  box-sizing: border-box;
-}
-
-.tip-title {
-  font-size: 36rpx;
-  font-weight: bold;
-  color: #333;
-  text-align: center;
-  margin-top: 107rpx;
-  margin-bottom: 37rpx;
-}
-
-.tip-image-container {
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 50rpx;
-}
-
-.tip-image {
-  width: 627rpx;
-  height: 327rpx;
-  margin-left: 13rpx; 
-}
-
-/* 店铺logo图片的特殊样式 */
-.tip-image.head_photo {
-  width: 582rpx;
-  height: 327rpx;
-  margin-right: 0;
-  margin-left: -15rpx;
-}
-
-/* 店铺名称图片的特殊样式 */
-.tip-image.store_name {
-  width: 627rpx;
-  height: 327rpx;
-  margin-left: 13rpx;
-}
-
-.tip-buttons {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 28rpx;
-}
-
-.tip-btn {
-  width: 250rpx;
-  height: 80rpx;
-  border-radius: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 32rpx;
-  font-weight: 500;
-}
-
-.tip-btn.cancel {
-  border: #E8101E 2rpx solid;
-  background-color: transparent;
-  color: #e8101e;
-}
-
-.tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-  color: #FFFFFF;
-}
-
-.tip-btn .btn-text {
-  color: inherit;
-}
-</style>
\ No newline at end of file
+<template>
+  <view class="sj-info-page">
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">营业执照</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">资质照片</text>
+        <text class="upload-desc">请保证照片上的文字清晰、无遮挡、证件边角可见</text>
+        <view class="" @click="chooseImage('uscc_photo')">
+          <image v-if="formData.uscc_photo" :src="formData.uscc_photo" mode="aspectFill" class="upload-preview"></image>
+          <view class="" v-else>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa75ea1c-8f9d-4b2a-8d0c-b94de516afd0.png"
+              mode="widthFix" class="upload-camera-img"></image>
+          </view>
+        </view>
+        <text class="required placeholder1">请上传营业执照原件</text>
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">商户类型</text>
+        <input type="text" v-model="formData.uscc_type" placeholder="请输入商户类型" placeholder-class="placeholder"
+          class="input" />
+      </view>
+
+      <view class="form-item-two box-cont">
+        <view class="label-wrapper">
+          <text class="label required">证件号码</text>
+          <image class="label-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+            mode="aspectFit" @click="showTipPopup('uscc_num')"></image>
+        </view>
+        <input type="text" v-model="formData.uscc_num" placeholder="请输入营业执照的证件号码" placeholder-class="placeholder"
+          class="input" />
+      </view>
+
+      <view class="form-item-two box-cont">
+        <view class="label-wrapper">
+          <text class="label required">企业名称</text>
+          <image class="label-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+            mode="aspectFit" @click="showTipPopup('uscc_name')"></image>
+        </view>
+        <input type="text" v-model="formData.uscc_name" placeholder="请输入营业执照的企业名称" placeholder-class="placeholder"
+          class="input" />
+      </view>
+
+      <view class="form-item-two box-cont" @click="showRegionPicker">
+        <text class="label required">注册地区</text>
+        <view class="picker-content">
+          <text :class="formData.uscc_dependency ? 'picker-value' : 'placeholder1'">
+            {{ formData.uscc_dependency || '请选择' }}
+          </text>
+          <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+            class="arrow-right" mode="aspectFit"></image>
+        </view>
+      </view>
+
+      <view class="form-item-two box-cont" @click="getAddressInfo">
+        <text class="label required">注册详细地址</text>
+        <view class="picker-content">
+          <text :class="formData.uscc_address ? 'picker-value' : 'placeholder'">
+            {{ formData.uscc_address || '请选择' }}
+          </text>
+          <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+            class="arrow-right" mode="aspectFit"></image>
+        </view>
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">法人信息</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">身份证照片</text>
+        <text class="upload-desc">请保证照片上的文字清晰、无遮挡、证件边角可见</text>
+        <view class="upload-area" @click="chooseImage('legal_idcard_positive')">
+          <image v-if="formData.legal_idcard_positive" :src="formData.legal_idcard_positive" mode="aspectFill"
+            class="upload-preview">
+          </image>
+          <view class="" v-else>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa75ea1c-8f9d-4b2a-8d0c-b94de516afd0.png"
+              mode="widthFix" class="upload-camera-img" style="margin-left: -30rpx;"></image>
+          </view>
+          <text class="placeholder1 required">请上传身份证正面(人像面)</text>
+        </view>
+        <view class="upload-area" @click="chooseImage('legal_idcard_negative')" style="margin-top: 48rpx;">
+          <image v-if="formData.legal_idcard_negative" :src="formData.legal_idcard_negative" mode="aspectFill"
+            class="upload-preview">
+          </image>
+          <view class="" v-else>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa75ea1c-8f9d-4b2a-8d0c-b94de516afd0.png"
+              mode="widthFix" class="upload-camera-img" style="margin-left: -30rpx;"></image>
+          </view>
+          <text class="placeholder1 required">请上传身份证反面(国徽面)</text>
+        </view>
+      </view>
+
+      <view class="form-item-two box-cont">
+        <view class="label-wrapper">
+          <text class="label required">法人代表</text>
+          <image class="label-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+            mode="aspectFit" @click="showTipPopup('legal_name')"></image>
+        </view>
+        <input type="text" v-model="formData.legal_name" placeholder="请输入营业执照的法人代表" placeholder-class="placeholder"
+          class="input" />
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">法人联系方式</text>
+        <input type="number" v-model="formData.legal_phone" placeholder="请输入法人的联系方式" placeholder-class="placeholder"
+          class="input" />
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">法人身份证号</text>
+        <input type="text" v-model="formData.legal_idcard_num" placeholder="请输入法人的身份证号码" placeholder-class="placeholder"
+          class="input" />
+      </view>
+
+      <view class="form-item-column box-cont">
+        <text class="label required">身份证有效期：</text>
+        <view class="radio-group">
+          <view class="radio-item" @click="setIdcardExpiryType('1')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === '1' }">
+              <image v-if="formData.legal_idcard_expiry_type === '1'" src="/static/images/agree_y.png"
+                class="radio-icon-image" mode="aspectFit"></image>
+            </view>
+            <text class="radio-label">永久有效</text>
+          </view>
+          <view class="radio-item" @click="setIdcardExpiryType('2')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === '2' }">
+              <image v-if="formData.legal_idcard_expiry_type === '2'" src="/static/images/agree_y.png"
+                class="radio-icon-image" mode="aspectFit"></image>
+            </view>
+            <text class="radio-label">指定日期有效</text>
+          </view>
+        </view>
+      </view>
+      <view class="date-row box-cont">
+        <view class="date-col" @click="showDatePicker('start')">
+          <text class="date-label">开始日期</text>
+          <view class="date-input-box">
+            <text :class="formData.legal_idcard_expiry_start ? 'date-value' : 'date-placeholder'">
+              {{ formData.legal_idcard_expiry_start || '选择日期' }}
+            </text>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+              class="date-icon" mode="aspectFit"></image>
+          </view>
+        </view>
+        <view class="date-col" @click="showDatePicker('end')">
+          <text class="date-label">结束日期</text>
+          <view class="date-input-box">
+            <text :class="formData.legal_idcard_expiry_end ? 'date-value' : 'date-placeholder'">
+              {{ formData.legal_idcard_expiry_end || '选择日期' }}
+            </text>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+              class="date-icon" mode="aspectFit"></image>
+          </view>
+        </view>
+      </view>
+
+    </view>
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">其他信息</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label">行业资质</text>
+        <view class="image-list">
+          <view class="image-item" v-for="(img, index) in formData.qualifications_sector" :key="'industry-' + index">
+            <image :src="img" mode="aspectFill" class="qualification-image"></image>
+            <view class="image-delete" @click="removeImage('qualifications_sector', index)">×</view>
+          </view>
+          <view class="image-add" @click="chooseMultiImage('qualifications_sector')"
+            v-if="(formData.qualifications_sector || []).length < 9">
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png"
+              mode="aspectFit" class="upload-icon-small"></image>
+            <text class="add-text">添加照片</text>
+          </view>
+        </view>
+        <text class="label" style="margin-top: 30rpx;">其他资质</text>
+        <view class="image-list">
+          <view class="image-item" v-for="(img, index) in formData.qualifications_other" :key="'other-' + index">
+            <image :src="img" mode="aspectFill" class="qualification-image"></image>
+            <view class="image-delete" @click="removeImage('qualifications_other', index)">×</view>
+          </view>
+          <view class="image-add" @click="chooseMultiImage('qualifications_other')"
+            v-if="(formData.qualifications_other || []).length < 9">
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png"
+              mode="aspectFit" class="upload-icon-small"></image>
+            <text class="add-text">添加照片</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="popup" :class="{ show: showRegionPopupFlag }">
+      <view class="popup-mask" @click="hideRegionPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择注册地区</text>
+          <text class="popup-close" @click="hideRegionPopup">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view @change="bindChangeRegion" class="picker-scroll" :indicator-style="indicatorStyle"
+            :value="regionValue">
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
+                {{ item.province }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in regionCitys" :key="index">
+                {{ item.city }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in regionAreas" :key="index">
+                {{ item.area }}
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideRegionPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmRegionSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="popup" :class="{ show: showDatePickerFlag }">
+      <view class="popup-mask" @click="hideDatePicker"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">{{ currentPickerType === 'start' ? '选择开始日期' : '选择结束日期' }}</text>
+          <text class="popup-close" @click="hideDatePicker">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view :value="datePickerValue" @change="bindDateChange" class="picker-scroll"
+            :indicator-style="indicatorStyle">
+            <picker-view-column>
+              <view class="picker-item" v-for="(year, index) in years" :key="index">
+                {{ year }}年
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(month, index) in months" :key="index">
+                {{ month }}月
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(day, index) in days" :key="index">
+                {{ day }}日
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideDatePicker">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmDateSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+      <view class="tip-popup-mask" @click="hideTipPopup"></view>
+      <view class="tip-popup-content">
+        <image class="tip-popup-bg"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
+          mode="aspectFit"></image>
+
+        <view class="tip-popup-body">
+          <view class="tip-title">{{ tipTitle }}</view>
+          <view class="tip-image-container">
+            <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
+          </view>
+          <view class="tip-buttons">
+            <view class="tip-btn cancel" @click="hideTipPopup">
+              <text class="btn-text">取消</text>
+            </view>
+            <view class="tip-btn confirm" @click="hideTipPopup">
+              <text class="btn-text">我已了解</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import ChinaCitys from '../../static/data/ChinaCitys.json';
+import { recognizeIdCard, recognizeBusinessLicense, parseValidPeriod } from '../../utils/orc';
+
+export default {
+  data() {
+    return {
+      formData: {
+        uscc_photo: '',
+        uscc_type: '',
+        uscc_num: '',
+        uscc_name: '',
+        uscc_dependency: '',
+        uscc_address: '',
+        uscc_province: '',
+        uscc_city: '',
+        uscc_area: '',
+        longitude: '',
+        latitude: '',
+        legal_idcard_positive: '',
+        legal_idcard_negative: '',
+        legal_name: '',
+        legal_phone: '',
+        legal_idcard_num: '',
+        legal_idcard_expiry_type: '1',
+        legal_idcard_expiry_start: '',
+        legal_idcard_expiry_end: '',
+        qualifications_sector: [],
+        qualifications_other: []
+      },
+      ChinaCitys: ChinaCitys,
+      regionCitys: [],
+      regionAreas: [],
+      regionValue: [0, 0, 0],
+      showRegionPopupFlag: false,
+      showDatePickerFlag: false,
+      currentPickerType: 'start',
+      datePickerValue: [0, 0, 0],
+      indicatorStyle: 'height: 68rpx;',
+      isRecognizing: false,
+      recognizeType: '',
+      userId: null,
+      identity: 3,
+      addressListener: null,
+      sjAddressListener: null,
+      showTipPopupFlag: false,
+      tipTitle: '',
+      tipImage: '',
+      currentTipType: ''
+    }
+  },
+
+  computed: {
+    years() {
+      return Array.from({
+        length: 50
+      }, (_, i) => 2020 + i);
+    },
+    months() {
+      return Array.from({
+        length: 12
+      }, (_, i) => i + 1);
+    },
+    days() {
+      return Array.from({
+        length: 31
+      }, (_, i) => i + 1);
+    }
+  },
+
+  async mounted() {
+    await this.getUserInfo();
+    this.regionCitys = this.ChinaCitys[0].citys;
+    this.regionAreas = this.regionCitys[0].areas;
+    this.setupAddressListener();
+    await this.loadDetailsData();
+  },
+  beforeDestroy() {
+    this.removeAddressListener();
+  },
+
+  methods: {
+    getUserInfo() {
+      return request.post('/sj/User/getUser').then(result => {
+        this.userId = result.data.id;
+      }).catch(err => {
+        console.error('获取用户信息失败:', err);
+      });
+    },
+
+    async loadDetailsData() {
+      try {
+        const res = await request.post('/sj/userSjAuth/details', {
+          type: 1
+        });
+        if (res.code === 200 && res.data) {
+          const data = res.data;
+          this.$set(this.formData, 'uscc_photo', data.uscc_photo || '');
+          this.$set(this.formData, 'uscc_type', data.uscc_type || '');
+          this.$set(this.formData, 'uscc_num', data.uscc_num || '');
+          this.$set(this.formData, 'uscc_name', data.uscc_name || '');
+          this.$set(this.formData, 'uscc_dependency', data.uscc_dependency || '');
+          this.$set(this.formData, 'uscc_address', data.uscc_address || '');
+          this.$set(this.formData, 'uscc_province', data.uscc_province || '');
+          this.$set(this.formData, 'uscc_city', data.uscc_city || '');
+          this.$set(this.formData, 'uscc_area', data.uscc_area || '');
+          this.$set(this.formData, 'longitude', data.longitude || '');
+          this.$set(this.formData, 'latitude', data.latitude || '');
+          this.$set(this.formData, 'legal_idcard_positive', data.legal_idcard_positive || '');
+          this.$set(this.formData, 'legal_idcard_negative', data.legal_idcard_negative || '');
+          this.$set(this.formData, 'legal_name', data.legal_name || '');
+          this.$set(this.formData, 'legal_phone', data.legal_phone || '');
+          this.$set(this.formData, 'legal_idcard_num', data.legal_idcard_num || '');
+          // 处理身份证有效期：legal_idcard_expiry 拆分为 type、start、end
+          if (data.legal_idcard_expiry) {
+            const expiry = data.legal_idcard_expiry;
+            if (expiry === '长久' || expiry === '长久有效') {
+              this.$set(this.formData, 'legal_idcard_expiry_type', '1');
+              this.$set(this.formData, 'legal_idcard_expiry_end', '长久有效');
+            } else if (expiry.includes('——') || expiry.includes('--') || expiry.includes('-')) {
+              const separator = expiry.includes('——') ? '——' : (expiry.includes('--') ? '--' : '-');
+              const [startStr, endStr] = expiry.split(separator);
+              const startDate = startStr.trim();
+              const endDate = endStr.trim();
+              this.$set(this.formData, 'legal_idcard_expiry_start', startDate);
+              if (endDate === '长久' || !endDate) {
+                this.$set(this.formData, 'legal_idcard_expiry_type', '1');
+                this.$set(this.formData, 'legal_idcard_expiry_end', '长久有效');
+              } else {
+                this.$set(this.formData, 'legal_idcard_expiry_type', '2');
+                this.$set(this.formData, 'legal_idcard_expiry_end', endDate);
+              }
+            }
+          } else {
+            this.$set(this.formData, 'legal_idcard_expiry_type', data.legal_idcard_expiry_type || '1');
+            this.$set(this.formData, 'legal_idcard_expiry_start', data.legal_idcard_expiry_start || '');
+            this.$set(this.formData, 'legal_idcard_expiry_end', data.legal_idcard_expiry_end || '');
+          }
+          if (data.qualifications_sector) {
+            this.$set(this.formData, 'qualifications_sector', typeof data.qualifications_sector === 'string' ? JSON.parse(data.qualifications_sector) : data.qualifications_sector);
+          }
+          if (data.qualifications_other) {
+            this.$set(this.formData, 'qualifications_other', typeof data.qualifications_other === 'string' ? JSON.parse(data.qualifications_other) : data.qualifications_other);
+          }
+          console.log('sj-info 数据回显完成:', this.formData);
+        }
+      } catch (error) {
+        console.error('获取详情数据失败:', error);
+      }
+    },
+
+    chooseImage(type) {
+      uni.chooseImage({
+        count: 1,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: async (res) => {
+          if (!res.tempFilePaths || res.tempFilePaths.length === 0) return;
+          const tempFilePath = res.tempFilePaths[0];
+          const file = {
+            path: tempFilePath,
+            size: 0
+          };
+          const url = await this.directUpload(file, this.userId, 3);
+          if (url) {
+            this.$set(this.formData, type, url);
+            if (type === 'uscc_photo') {
+              await this.recognizeBusinessLicense(url);
+            } else if (type === 'legal_idcard_positive') {
+              await this.recognizeIdCardFront(url);
+            } else if (type === 'legal_idcard_negative') {
+              await this.recognizeIdCardBack(url);
+            }
+          }
+        }
+      });
+    },
+
+    chooseMultiImage(type) {
+      const current = this.formData[type] || [];
+      const remaining = 9 - current.length;
+      if (remaining <= 0) {
+        uni.showToast({
+          title: '最多上传9张图片',
+          icon: 'none'
+        });
+        return;
+      }
+      uni.chooseImage({
+        count: remaining,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: async (res) => {
+          if (!res.tempFilePaths || res.tempFilePaths.length === 0) return;
+          uni.showLoading({
+            title: '上传中...'
+          });
+          for (const tempFilePath of res.tempFilePaths) {
+            const file = {
+              path: tempFilePath,
+              size: 0
+            };
+            try {
+              const url = await this.directUpload(file, this.userId, 3);
+              if (url) {
+                current.push(url);
+              }
+            } catch (e) {
+              console.error('上传失败:', e);
+            }
+          }
+          this.$set(this.formData, type, current);
+          uni.hideLoading();
+        }
+      });
+    },
+
+    removeImage(type, index) {
+      const list = [...this.formData[type]];
+      list.splice(index, 1);
+      this.$set(this.formData, type, list);
+    },
+
+    async directUpload(file, userId, type) {
+      try {
+        let date = new Date().getTime();
+        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
+        let fileExtension = 'jpg';
+        if (file.path.includes('.')) {
+          let parts = file.path.split('.');
+          let ext = parts[parts.length - 1].toLowerCase();
+          if (ext && ext.length <= 4) fileExtension = ext;
+        }
+        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
+        const ossConfig = await request.post('/user/getalioss', {
+          type: type,
+          kind: 1
+        });
+        return await new Promise((resolve, reject) => {
+          uni.uploadFile({
+            url: ossConfig.host,
+            filePath: file.path,
+            name: 'file',
+            formData: {
+              key: ossConfig.dir + name,
+              policy: ossConfig.policy,
+              OSSAccessKeyId: ossConfig.ossAccessKeyId,
+              success_action_status: '200',
+              signature: ossConfig.signature
+            },
+            success: (res) => {
+              if (res.statusCode === 200) {
+                resolve(`${ossConfig.host}/${ossConfig.dir}${name}`);
+              } else {
+                reject(new Error('上传失败'));
+              }
+            },
+            fail: reject
+          });
+        });
+      } catch (error) {
+        console.error('上传失败:', error);
+        throw error;
+      }
+    },
+
+    showRegionPicker() {
+      this.showRegionPopupFlag = true;
+    },
+
+    hideRegionPopup() {
+      this.showRegionPopupFlag = false;
+    },
+
+    bindChangeRegion(e) {
+      this.regionValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.regionCitys = this.ChinaCitys[index1].citys;
+      this.regionAreas = this.regionCitys[index2].areas;
+    },
+
+    confirmRegionSelect() {
+      let valueArr = this.regionValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+      let province = this.ChinaCitys[index1].province;
+      let city = this.regionCitys[index2].city;
+      let area = this.regionAreas[index3].area;
+      this.formData.uscc_dependency = province + '-' + city + '-' + area;
+      if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+        this.formData.uscc_province = String(this.ChinaCitys[index1].code).substring(0, 6);
+      }
+      if (this.regionCitys[index2] && this.regionCitys[index2].code) {
+        this.formData.uscc_city = String(this.regionCitys[index2].code).substring(0, 6);
+      }
+      if (this.regionAreas[index3] && this.regionAreas[index3].code) {
+        this.formData.uscc_area = String(this.regionAreas[index3].code).substring(0, 6);
+      }
+      this.formData.uscc_address = '';
+      this.formData.longitude = '';
+      this.formData.latitude = '';
+      this.hideRegionPopup();
+    },
+
+    showHouseholdTypePicker() {
+      this.showRegionPopupFlag = true;
+    },
+
+    hideRegionPopup() {
+      this.showRegionPopupFlag = false;
+    },
+
+    setIdcardExpiryType(type) {
+      this.$set(this.formData, 'legal_idcard_expiry_type', type);
+      if (type === '1') {
+        this.formData.legal_idcard_expiry_end = '长久有效';
+      } else {
+        if (this.formData.legal_idcard_expiry_end === '长久有效') {
+          this.formData.legal_idcard_expiry_end = '';
+        }
+      }
+    },
+
+    showDatePicker(type) {
+      this.currentPickerType = type;
+      this.showDatePickerFlag = true;
+    },
+
+    hideDatePicker() {
+      this.showDatePickerFlag = false;
+    },
+
+    bindDateChange(e) {
+      this.datePickerValue = e.detail.value;
+    },
+
+    confirmDateSelect() {
+      const year = this.years[this.datePickerValue[0]];
+      const month = this.months[this.datePickerValue[1]];
+      const day = this.days[this.datePickerValue[2]];
+      const dateStr = `${year}年${month < 10 ? '0' + month : month}月${day < 10 ? '0' + day : day}日`;
+      if (this.currentPickerType === 'start') {
+        this.formData.legal_idcard_expiry_start = dateStr;
+      } else {
+        this.formData.legal_idcard_expiry_end = dateStr;
+      }
+      this.hideDatePicker();
+    },
+
+    buildRegionTextForSearch() {
+      const dependency = String(this.formData.uscc_dependency || '').trim();
+      if (!dependency) return '';
+      const parts = dependency.split('-');
+      const province = parts[0] || '';
+      const city = parts[1] || '';
+      const district = parts[2] || '';
+      let regionText = '';
+      if (province) regionText += province;
+      if (city && city !== province) regionText += city;
+      if (district) regionText += district;
+      return regionText;
+    },
+
+    getAddressValueForSearch() {
+      const rawAddress = String(this.formData.uscc_address || '').trim();
+      if (!rawAddress) return '';
+      const dependencyText = String(this.formData.uscc_dependency || '').trim();
+      const regionText = this.buildRegionTextForSearch();
+      let detail = rawAddress;
+      if (regionText && detail.indexOf(regionText) === 0) {
+        detail = detail.slice(regionText.length).trim();
+      } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+        detail = detail.slice(dependencyText.length).trim();
+      }
+      detail = detail.replace(/^[\s,-]+/, '').trim();
+      return detail || rawAddress;
+    },
+
+    getAddressInfo() {
+      const dependency = String(this.formData.uscc_dependency || '').trim();
+      const dependencyCode = String(this.formData.uscc_area || '').trim();
+      const address = this.getAddressValueForSearch();
+      const longitude = String(this.formData.longitude || '').trim();
+      const latitude = String(this.formData.latitude || '').trim();
+
+      const hasDependency = !!dependency;
+      const hasAddress = !!address;
+      const hasLocation = !!(longitude && latitude);
+
+      let params = 'source=sj_info';
+
+      if (hasDependency) {
+        params += `&dependency=${encodeURIComponent(dependency)}`;
+        if (dependencyCode) {
+          params += `&dependency_code=${dependencyCode}`;
+        }
+      }
+      if (hasAddress) {
+        params += `&address=${encodeURIComponent(address)}`;
+      }
+      if (hasLocation) {
+        params += `&longitude=${longitude}&latitude=${latitude}`;
+      }
+      if (!hasDependency && !hasAddress && !hasLocation) {
+        params += '&init_current_location=1&silent_locate=1';
+      }
+
+      uni.navigateTo({
+        url: `/pages/address/search?${params}`
+      });
+    },
+
+    setupAddressListener() {
+      this.addressListener = (addressData) => {
+        this.handleAddressSelected(addressData);
+      };
+      this.sjAddressListener = (addressData) => {
+        this.handleAddressSelected(addressData);
+      };
+      uni.$on('address-selected', this.addressListener);
+      uni.$on('address-selected-for-sj', this.sjAddressListener);
+    },
+
+    removeAddressListener() {
+      if (this.addressListener) {
+        uni.$off('address-selected', this.addressListener);
+        this.addressListener = null;
+      }
+      if (this.sjAddressListener) {
+        uni.$off('address-selected-for-sj', this.sjAddressListener);
+        this.sjAddressListener = null;
+      }
+    },
+
+    checkAddressData() {
+      try {
+        const storedAddress = uni.getStorageSync('sj_selected_address');
+        if (storedAddress) {
+          this.handleAddressSelected(storedAddress);
+          uni.removeStorageSync('sj_selected_address');
+          return;
+        }
+      } catch (e) { }
+
+      if (getApp().globalData && getApp().globalData.selectedAddress) {
+        this.handleAddressSelected(getApp().globalData.selectedAddress);
+        delete getApp().globalData.selectedAddress;
+      }
+
+      try {
+        const selectedAddress = uni.getStorageSync('selectedAddress');
+        if (selectedAddress) {
+          this.handleAddressSelected(selectedAddress);
+          uni.removeStorageSync('selectedAddress');
+        }
+      } catch (e) { }
+    },
+
+    handleAddressSelected(addressData) {
+      if (!addressData) return;
+
+      let detailAddress = '';
+      if (addressData.address) {
+        detailAddress = String(addressData.address).trim();
+      } else if (addressData.name) {
+        detailAddress = String(addressData.name).trim();
+        const regionParts = [];
+        if (addressData.pname) regionParts.push(addressData.pname);
+        if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData.cityname);
+        if (addressData.adname) regionParts.push(addressData.adname);
+        const regionText = regionParts.join('');
+        if (regionText && detailAddress.indexOf(regionText) === 0) {
+          detailAddress = detailAddress.slice(regionText.length).trim();
+        }
+        detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
+      }
+
+      this.$set(this.formData, 'uscc_address', detailAddress);
+
+      if (addressData.location) {
+        const [longitude, latitude] = String(addressData.location).split(',');
+        this.$set(this.formData, 'longitude', longitude || '');
+        this.$set(this.formData, 'latitude', latitude || '');
+      }
+
+      if (addressData.pname || addressData.cityname || addressData.adname) {
+        const locationParts = [];
+        if (addressData.pname) locationParts.push(addressData.pname);
+        if (addressData.cityname) locationParts.push(addressData.cityname);
+        if (addressData.adname) locationParts.push(addressData.adname);
+        this.$set(this.formData, 'uscc_dependency', locationParts.join('-'));
+      }
+
+      if (addressData.provinceCode) {
+        this.$set(this.formData, 'uscc_province', String(addressData.provinceCode).substring(0, 6));
+      }
+      if (addressData.cityCode) {
+        this.$set(this.formData, 'uscc_city', String(addressData.cityCode).substring(0, 6));
+      }
+      if (addressData.districtCode) {
+        this.$set(this.formData, 'uscc_area', String(addressData.districtCode).substring(0, 6));
+      }
+
+      this.$forceUpdate();
+    },
+
+    async recognizeBusinessLicense(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'uscc_photo';
+        uni.showLoading({ title: '正在识别营业执照...', mask: true });
+        const result = await recognizeBusinessLicense(imageUrl);
+        console.log('营业执照识别结果:', result);
+        const hasRecognizedData = this.checkBusinessLicenseRecognition(result);
+        if (!hasRecognizedData) {
+          uni.hideLoading();
+          uni.showToast({ title: '未识别到营业执照信息，请手动填写或重新拍摄', icon: 'none', duration: 3000 });
+          this.isRecognizing = false;
+          return;
+        }
+        let recognizedFields = 0;
+        if (result.uscc_name && result.uscc_name.trim() && result.uscc_name !== '无') {
+          this.$set(this.formData, 'uscc_name', result.uscc_name);
+          recognizedFields++;
+        }
+        if (result.uscc_num && result.uscc_num.trim()) {
+          this.$set(this.formData, 'uscc_num', result.uscc_num);
+          recognizedFields++;
+        }
+        if (result.uscc_type && result.uscc_type.trim()) {
+          this.$set(this.formData, 'uscc_type', result.uscc_type);
+          recognizedFields++;
+        }
+        uni.hideLoading();
+        if (recognizedFields > 0) {
+          uni.showToast({ title: '营业执照识别成功', icon: 'none', duration: 2000 });
+        } else {
+          uni.showToast({ title: '识别完成，但未获取到有效信息', icon: 'none', duration: 3000 });
+        }
+      } catch (error) {
+        console.error('营业执照识别失败:', error);
+        uni.hideLoading();
+        uni.showToast({ title: error.message || '识别失败，请手动填写', icon: 'none', duration: 3000 });
+      } finally {
+        this.isRecognizing = false;
+      }
+    },
+
+    checkBusinessLicenseRecognition(result) {
+      const requiredFields = ['uscc_num', 'uscc_name', 'uscc_type'];
+      for (const field of requiredFields) {
+        if (result[field] && result[field].trim()) return true;
+      }
+      return false;
+    },
+
+    async recognizeIdCardFront(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'legal_idcard_positive';
+        uni.showLoading({ title: '正在识别身份证正面...', mask: true });
+        const result = await recognizeIdCard(imageUrl, 1);
+        const hasRecognizedData = (result.name && result.name.trim()) || (result.id_number && result.id_number.trim());
+        if (!hasRecognizedData) {
+          uni.hideLoading();
+          uni.showToast({ title: '未识别到身份证信息，请手动填写或重新拍摄', icon: 'none', duration: 3000 });
+          this.isRecognizing = false;
+          return;
+        }
+        if (result.name) {
+          this.$set(this.formData, 'legal_name', result.name);
+        }
+        if (result.id_number) {
+          this.$set(this.formData, 'legal_idcard_num', result.id_number);
+        }
+        uni.hideLoading();
+        uni.showToast({ title: '身份证正面识别成功', icon: 'none' });
+      } catch (error) {
+        console.error('身份证正面识别失败:', error);
+        uni.hideLoading();
+        uni.showToast({ title: error.message || '识别失败，请手动填写', icon: 'none', duration: 3000 });
+      } finally {
+        this.isRecognizing = false;
+      }
+    },
+
+    async recognizeIdCardBack(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'legal_idcard_negative';
+        uni.showLoading({ title: '正在识别身份证反面...', mask: true });
+        const result = await recognizeIdCard(imageUrl, 2);
+        const hasRecognizedData = (result.start_date && result.start_date.trim()) || (result.end_date && result.end_date.trim());
+        if (!hasRecognizedData) {
+          uni.hideLoading();
+          uni.showToast({ title: '未识别到身份证有效期信息，请手动填写或重新拍摄', icon: 'none', duration: 3000 });
+          this.isRecognizing = false;
+          return;
+        }
+        const validPeriod = parseValidPeriod(result.start_date, result.end_date);
+        if (validPeriod.startDate) {
+          this.$set(this.formData, 'legal_idcard_expiry_start', validPeriod.startDate);
+        }
+        if (validPeriod.isPermanent) {
+          this.$set(this.formData, 'legal_idcard_expiry_type', '1');
+          this.$set(this.formData, 'legal_idcard_expiry_end', '长久有效');
+        } else if (validPeriod.endDate) {
+          this.$set(this.formData, 'legal_idcard_expiry_type', '2');
+          this.$set(this.formData, 'legal_idcard_expiry_end', validPeriod.endDate);
+        }
+        uni.hideLoading();
+        uni.showToast({ title: '身份证反面识别成功', icon: 'none' });
+      } catch (error) {
+        console.error('身份证反面识别失败:', error);
+        uni.hideLoading();
+        uni.showToast({ title: error.message || '识别失败，请手动填写', icon: 'none', duration: 3000 });
+      } finally {
+        this.isRecognizing = false;
+      }
+    },
+
+    showTipPopup(field) {
+      const tipConfig = {
+        'uscc_num': {
+          title: '如何查看证件号码',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c5d8d00b-de1e-414f-b310-0a3f99ed8ddb.png'
+        },
+        'uscc_name': {
+          title: '如何查看企业名称',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b8df241d-899f-4f8e-89c5-b61b61a9f1b1.png'
+        },
+        'legal_name': {
+          title: '如何查看法定代表人',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b8df241d-899f-4f8e-89c5-b61b61a9f1b1.png'
+        }
+      };
+
+      if (tipConfig[field]) {
+        this.currentTipType = field;
+        this.tipTitle = tipConfig[field].title;
+        this.tipImage = tipConfig[field].image;
+        this.showTipPopupFlag = true;
+      }
+    },
+
+    hideTipPopup() {
+      this.showTipPopupFlag = false;
+    },
+
+    getFormData() {
+      return this.formData;
+    },
+
+    setData(data) {
+      if (!data) return;
+      const keys = Object.keys(this.formData);
+      keys.forEach(key => {
+        if (data[key] !== undefined && data[key] !== null) {
+          this.$set(this.formData, key, data[key]);
+        }
+      });
+    },
+
+    saveFormData() {
+      if (!this.formData.uscc_photo) {
+        uni.showToast({
+          title: '请上传营业执照',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.uscc_type) {
+        uni.showToast({
+          title: '请选择户主类型',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.uscc_num) {
+        uni.showToast({
+          title: '请输入证件号码',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.uscc_name) {
+        uni.showToast({
+          title: '请输入企业名称',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.uscc_dependency) {
+        uni.showToast({
+          title: '请选择注册地区',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.uscc_address) {
+        uni.showToast({
+          title: '请输入注册详细地址',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_idcard_positive) {
+        uni.showToast({
+          title: '请上传法人身份证正面',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_idcard_negative) {
+        uni.showToast({
+          title: '请上传法人身份证反面',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_name) {
+        uni.showToast({
+          title: '请输入法人代表',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_phone) {
+        uni.showToast({
+          title: '请输入法人联系方式',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!/^1[3-9]\d{9}$/.test(this.formData.legal_phone)) {
+        uni.showToast({
+          title: '请输入正确的手机号码',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_idcard_num) {
+        uni.showToast({
+          title: '请输入法人身份证号',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_idcard_expiry_start) {
+        uni.showToast({
+          title: '请选择开始日期',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_idcard_expiry_end) {
+        uni.showToast({
+          title: '请选择结束日期',
+          icon: 'none'
+        });
+        return false;
+      }
+      return true;
+    }
+  }
+}
+</script>
+
+<style scoped>
+.sj-info-page {}
+
+.section {
+  margin-bottom: 30rpx;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  padding-bottom: 20rpx;
+  padding-top: 16rpx;
+}
+
+.title-bar {
+  width: 8rpx;
+  height: 32rpx;
+  background-color: #FF4767;
+  border-radius: 4rpx;
+  margin-right: 12rpx;
+}
+
+.title-text {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #1D2129;
+}
+
+.box-cont {
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  margin-bottom: 24rpx;
+  margin-left: 8rpx;
+  margin-right: 8rpx;
+  box-shadow: none;
+}
+
+.form-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+}
+
+.form-item-one {
+  display: flex;
+  flex-direction: column;
+  padding: 24rpx;
+}
+
+.form-item-two {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+}
+
+.form-item-column {
+  display: flex;
+  flex-direction: column;
+  padding: 24rpx;
+}
+
+.form-item-column .label {
+  margin-bottom: 24rpx;
+}
+
+.date-row {
+  display: flex;
+  padding: 24rpx;
+}
+
+.date-col {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.date-col:first-child {
+  margin-right: 24rpx;
+}
+
+.date-label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  margin-bottom: 16rpx;
+}
+
+.date-input-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border: 2rpx solid #E8E8E8;
+  border-radius: 12rpx;
+  padding: 0 20rpx;
+  height: 76rpx;
+}
+
+.date-value {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.date-placeholder {
+  font-size: 28rpx;
+  color: #CCCCCC;
+}
+
+.date-icon {
+  width: 36rpx;
+  height: 36rpx;
+  flex-shrink: 0;
+}
+
+.label-wrapper {
+  display: inline-flex;
+  align-items: center;
+}
+
+.label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  line-height: 1;
+}
+
+.label-icon {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 8rpx;
+}
+
+.label.required::before {
+  content: '*';
+  color: #FF4767;
+  margin-right: 4rpx;
+}
+
+.input {
+  font-size: 28rpx;
+  color: #333333;
+  text-align: right;
+  flex: 1;
+}
+
+.placeholder {
+  font-size: 28rpx;
+  color: #CCCCCC;
+  margin-left: -20rpx;
+}
+
+.placeholder1 {
+  text-align: center;
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.placeholder1.required::before {
+  content: '*';
+  color: #FF4767;
+  margin-right: 4rpx;
+}
+
+.picker-content {
+  display: flex;
+  align-items: center;
+  flex: 1;
+  justify-content: flex-end;
+}
+
+.picker-value {
+  font-size: 28rpx;
+  color: #333333;
+  margin-right: 8rpx;
+}
+
+.arrow-right {
+  width: 24rpx;
+  height: 24rpx;
+  flex-shrink: 0;
+}
+
+.radio-group {
+  display: flex;
+  align-items: center;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 130rpx;
+}
+
+.radio {
+  width: 30rpx;
+  height: 30rpx;
+  border: 2rpx solid #DDDDDD;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16rpx;
+}
+
+.radio.checked {
+  background-color: #FF4767;
+  border-color: #FF4767;
+}
+
+.radio-icon-image {
+  width: 32rpx;
+  height: 32rpx;
+}
+
+.radio-label {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.upload-area {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.upload-preview {
+  width: 100%;
+  height: 300rpx;
+  border-radius: 12rpx;
+  margin-bottom: 16rpx;
+}
+
+.upload-placeholder {
+  width: 100%;
+  height: 300rpx;
+  background: #F7F8FA;
+  border-radius: 12rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 16rpx;
+  border: 2rpx dashed #DDDDDD;
+}
+
+.upload-icon {
+  width: 80rpx;
+  height: 80rpx;
+}
+
+.upload-hint {
+  font-size: 24rpx;
+  /* color: #FF4767; */
+  text-align: center;
+}
+
+.upload-desc {
+  font-size: 24rpx;
+  color: #999999;
+  margin-bottom: 20rpx;
+  margin-top: 12rpx;
+}
+
+.upload-dashed {
+  width: 100%;
+  border: 2rpx dashed #DDDDDD;
+  border-radius: 16rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 30rpx;
+  margin-bottom: 16rpx;
+  background: #FAFBFC;
+}
+
+.upload-camera-img {
+  width: 446rpx;
+  height: 298rpx;
+  margin-left: 100rpx;
+}
+
+.image-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+  margin-top: 16rpx;
+}
+
+.image-item {
+  position: relative;
+  width: 200rpx;
+  height: 200rpx;
+}
+
+.qualification-image {
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 12rpx;
+}
+
+.image-delete {
+  position: absolute;
+  top: -10rpx;
+  right: -10rpx;
+  width: 36rpx;
+  height: 36rpx;
+  background: #FF4767;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #FFFFFF;
+  font-size: 28rpx;
+}
+
+.image-add {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border: 2rpx dashed #DDDDDD;
+  width: 214rpx;
+  height: 214rpx;
+  background: #F5F5F5;
+  border-radius: 20rpx;
+}
+
+.upload-icon-small {
+  width: 48rpx;
+  height: 48rpx;
+  margin-bottom: 8rpx;
+}
+
+.add-text {
+  font-size: 22rpx;
+  color: #999999;
+}
+
+.popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  visibility: hidden;
+  transition: visibility 0.3s;
+}
+
+.popup.show {
+  visibility: visible;
+}
+
+.popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx 30rpx;
+  border-bottom: 1rpx solid #F0F0F0;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333333;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999999;
+}
+
+.region-body {
+  height: 500rpx;
+}
+
+.picker-scroll {
+  width: 100%;
+  height: 100%;
+}
+
+.picker-item {
+  line-height: 68rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.popup-footer {
+  display: flex;
+  padding: 20rpx 30rpx;
+  gap: 20rpx;
+}
+
+.popup-btn {
+  flex: 1;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 12rpx;
+}
+
+.popup-btn.cancel {
+  background: #F5F5F5;
+}
+
+.popup-btn.confirm {
+  background: #FF4767;
+}
+
+.popup-btn .btn-text {
+  font-size: 28rpx;
+}
+
+.popup-btn.cancel .btn-text {
+  color: #666666;
+}
+
+.popup-btn.confirm .btn-text {
+  color: #FFFFFF;
+}
+
+.picker-list {
+  padding: 20rpx 0;
+}
+
+.picker-item-row {
+  padding: 24rpx 30rpx;
+  font-size: 28rpx;
+  color: #333333;
+  text-align: center;
+}
+
+.picker-item-row text.active {
+  color: #FF4767;
+}
+
+.tip-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.tip-popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.tip-popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.tip-popup-content {
+  position: relative;
+  width: 620rpx;
+  height: 810rpx;
+}
+
+.tip-popup-bg {
+  width: 620rpx;
+  height: 810rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.tip-popup-body {
+  position: relative;
+  flex-direction: column;
+  padding: 80rpx 20rpx 40rpx 20rpx;
+  box-sizing: border-box;
+}
+
+.tip-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  text-align: center;
+  margin-top: 107rpx;
+  margin-bottom: 37rpx;
+}
+
+.tip-image-container {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 50rpx;
+}
+
+.tip-image {
+  width: 90%;
+  max-height: 400rpx;
+}
+
+.tip-buttons {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 28rpx;
+}
+
+.tip-btn {
+  width: 250rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.tip-btn.cancel {
+  border: #FF4767 2rpx solid;
+  background-color: transparent;
+  color: #FF4767;
+}
+
+.tip-btn.confirm {
+  background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+  color: #FFFFFF;
+}
+
+.tip-btn .btn-text {
+  color: inherit;
+}
+</style>
diff --git a/pages/ruzhu/stopuse.vue b/pages/ruzhu/stopuse.vue
index 35d8ad8..1de2e1b 100644
--- a/pages/ruzhu/stopuse.vue
+++ b/pages/ruzhu/stopuse.vue
@@ -73,7 +73,7 @@
 }
 .btn-wallet {
 	font-size: 24rpx;
-	color: #E8101E;
+	color: #FF4767;
 	margin-top: 40rpx;
 }
 .btn-contact {
diff --git a/pages/ruzhu/submitres.vue b/pages/ruzhu/submitres.vue
index 3e1ec69..c43127c 100644
--- a/pages/ruzhu/submitres.vue
+++ b/pages/ruzhu/submitres.vue
@@ -135,31 +135,30 @@ export default {
         return;
       }
       
-      // 重新确定 type 值
-      let type;
-      if (this.identity == 1) {
-        type = 2; // 手艺人
-      } else if (this.identity == 2) {
-        type = 3; // 商家
-      } else {
-        console.error('未知的用户类型identity:', this.identity);
-        this.backMag = '用户类型错误，请联系客服';
-        return;
-      }
-      
-      console.log('请求参数 type:', type);
-      
-      request.post('/user/getuser', {type}).then(result => {
-        console.log('接口返回数据:', result);
-        if (result.data && result.data.back_text) {
-          this.backMag = result.data.back_text;
-          console.log('设置backMag为:', this.backMag);
+      request.post('/sj/userSjAuth/details', {
+        type: this.identity // 1=手艺人，2=商家
+      }).then(result => {
+        console.log('申请详情接口返回数据:', result);
+        if (result.code === 200) {
+          if (result.data) {
+            if (result.data.back_text) {
+              this.backMag = result.data.back_text;
+              console.log('设置backMag为:', this.backMag);
+            } else {
+              this.backMag = '未知原因，请联系客服';
+              console.log('接口返回无back_text字段');
+            }
+          } else {
+            // 接口返回成功但数据为空，可能没有申请记录
+            console.log('接口返回成功但data为空');
+            this.backMag = '暂无驳回原因信息';
+          }
         } else {
-          this.backMag = '未知原因，请联系客服';
-          console.log('接口返回无back_text字段');
+          this.backMag = '获取驳回原因失败，请联系客服';
+          console.log('接口返回错误:', result?.msg || '未知错误');
         }
       }).catch(err => {
-        console.error('获取用户信息失败:', err);
+        console.error('获取申请详情失败:', err);
         this.backMag = '获取驳回原因失败，请联系客服';
       }).finally(() => {
         console.log('getUserInfo执行完成');
@@ -248,7 +247,7 @@ export default {
 .btn-back {
   width: 630rpx;
   height: 96rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 48rpx;
   display: flex;
   align-items: center;
@@ -268,11 +267,11 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  border: 1rpx solid #E8101E;
+  border: 1rpx solid #FF4767;
   margin-top: 32rpx;
 }
 .fail-back-btn .btn-text {
-	color: #E8101E;
+	color: #FF4767;
 }
 
 .submitres-page /deep/ .back-btn {
diff --git a/pages/ruzhu/successruzhu.vue b/pages/ruzhu/successruzhu.vue
new file mode 100644
index 0000000..901b8f6
--- /dev/null
+++ b/pages/ruzhu/successruzhu.vue
@@ -0,0 +1,131 @@
+<template>
+	<view class="pages">
+		<custom-navbar :title="infoData.top" :showBack="true"></custom-navbar>
+		<view class="title-icon">{{ infoData.title }}</view>
+		<view class="title-content">{{ infoData.notice }}</view>
+		<view class="erweimabox">
+			<view class="erweimab">
+				<image :src="infoData.photo" mode="widthFix"
+					style="width: 404rpx;border-radius:25rpx ;margin: 37rpx 0 0 36rpx;"></image>
+			</view>
+			<view class="kefubtn">扫码联系专属客服</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import request from '../../utils/request';
+
+export default {
+	props: {
+		data: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	data() {
+		return {
+			infoData: {}
+		}
+	},
+	mounted() {
+		this.getCustomerService();
+	},
+	methods: {
+		async getCustomerService() {
+			try {
+				const res = await request.post('/sj/userSjAuth/getCustomerService');
+				console.log('客服接口返回：', res);
+				if (res && (res.state == 1 || res.code == 200)) {
+					if (res.data.state != 3) {
+						this.infoData = res.data || {};
+					} else {
+						this.infoData = {
+							top: '审核结果',
+							title: '审核未通过',
+							photo: res.data.photo
+						};
+						this.$emit('stateChange', 3);
+						request.post('/sj/userSjAuth/details', {
+							type: 1
+						}).then(res => {
+							if (res && (res.state == 1 || res.code == 200)) {
+								console.log(res.data.back_text, '驳回res')
+								this.infoData = {
+									...this.infoData,
+									notice: res.data.back_text || '您的入驻申请未通过，请重新提交申请'
+								};
+							}
+						})
+					}
+				}
+			} catch (e) {
+				console.error('获取客服信息失败：', e);
+			}
+		}
+	}
+}
+</script>
+
+<style>
+.kefubtn {
+	height: 42rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	font-size: 30rpx;
+	color: #5A5A5A;
+	line-height: 42rpx;
+	text-align: center;
+	font-style: normal;
+	margin-top: 23rpx;
+}
+
+.pages {
+	background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/467f6b5f-32dc-4ba3-847a-22be4569c45e.png');
+	background-size: 100%;
+	background-repeat: no-repeat;
+}
+
+.erweimab {
+	margin: 70rpx 0 0 103rpx;
+	width: 477rpx;
+	height: 477rpx;
+	background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e5461570-10e3-4e11-a6ca-8543f106639a.png');
+	background-size: 100%;
+	background-repeat: no-repeat;
+}
+
+.erweimabox {
+	margin: 71rpx 0 0 6rpx;
+	width: 690rpx;
+	height: 690rpx;
+	background: #FFFFFF;
+	border-radius: 62rpx;
+	border: 1rpx solid #F2F4F6;
+}
+
+.title-icon {
+	/* margin-left: 283rpx; */
+	height: 67rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 500;
+	font-size: 48rpx;
+	color: #333333;
+	line-height: 67rpx;
+	text-align: center;
+	font-style: normal;
+	margin-top: -40rpx;
+}
+
+.title-content {
+	margin: 14rpx 0 0 0rpx;
+	height: 42rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	font-size: 30rpx;
+	color: #666666;
+	line-height: 42rpx;
+	text-align: center;
+	font-style: normal;
+}
+</style>
\ No newline at end of file
diff --git a/pages/search/components/confirm-modal.vue b/pages/search/components/confirm-modal.vue
index 05347c5..a370d78 100644
--- a/pages/search/components/confirm-modal.vue
+++ b/pages/search/components/confirm-modal.vue
@@ -116,6 +116,6 @@ export default {
 }
 
 .delete {
-  color: #e8101e;
+  color: #FF4767;
 }
 </style>
diff --git a/pages/search/components/filter.vue b/pages/search/components/filter.vue
index ae2ef4b..6e5c5fb 100644
--- a/pages/search/components/filter.vue
+++ b/pages/search/components/filter.vue
@@ -279,10 +279,10 @@
 			
 			getIconColor(index) {
 				if (this.activeIndex === index) {
-					return '#E8101E';
+					return '#FF4767';
 				}
 				if (this.hasValue(this.filterTabs[index].key)) {
-					return '#E8101E';
+					return '#FF4767';
 				}
 				return '#666';
 			},
@@ -527,7 +527,7 @@
 			}
 			
 			&.active {
-				color: #E8101E;
+				color: #FF4767;
 			}
 			
 			.check-icon {
@@ -567,7 +567,7 @@
 			}
 			&.active {
 				background: #FFECF0;
-				color: #E8101E;
+				color: #FF4767;
 			}
 		}
 		
@@ -620,7 +620,7 @@
 					height: 100%;
 					
 					.custom-price-container.active & {
-						color: #E8101E;
+						color: #FF4767;
 					}
 				}
 				
diff --git a/pages/search/components/search-box.vue b/pages/search/components/search-box.vue
index 7753540..e47bb5d 100644
--- a/pages/search/components/search-box.vue
+++ b/pages/search/components/search-box.vue
@@ -192,7 +192,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+  background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
   background-size: cover;
   color: #fff;
   font-size: 26rpx;
diff --git a/pages/search/components/search_box_result.vue b/pages/search/components/search_box_result.vue
index 0f84257..368d17a 100644
--- a/pages/search/components/search_box_result.vue
+++ b/pages/search/components/search_box_result.vue
@@ -52,7 +52,7 @@ export default {
     },
 	bgClor: {
       type: String,
-	   default: "linear-gradient(134deg, #f52540 0%, #e8101e 100%)",
+	   default: "linear-gradient(134deg, #f52540 0%, #FF4767 100%)",
     },
   },
   data() {
@@ -126,7 +126,7 @@ export default {
   justify-content: center;
   align-items: center;
   position: relative;
-  background: linear-gradient(134deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(134deg, #f52540 0%, #FF4767 100%);
   transform: translateY(0rpx);
 }
 
@@ -197,7 +197,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+  background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
   background-size: cover;
   color: #fff;
   font-size: 26rpx;
diff --git a/pages/search/components/serviceCardList.vue b/pages/search/components/serviceCardList.vue
index 3f37322..186a368 100644
--- a/pages/search/components/serviceCardList.vue
+++ b/pages/search/components/serviceCardList.vue
@@ -309,7 +309,7 @@
 			padding: 0 8rpx;
 			height: 38rpx;
 			line-height: 38rpx;
-			background: linear-gradient(124deg, #f52540 0%, #e8101e 100%);
+			background: linear-gradient(124deg, #f52540 0%, #FF4767 100%);
 			border-radius: 12rpx 2rpx 12rpx 2rpx;
 			font-size: 22rpx;
 			color: #ffffff;
@@ -405,7 +405,7 @@
 		.price {
 			font-weight: 700;
 			font-size: 26rpx;
-			color: #e8101e;
+			color: #FF4767;
 			font-family: DINPro, DINPro;
 		}
 
@@ -454,7 +454,7 @@
 		line-height: 60rpx;
 		height: 60rpx;
 		padding: 0rpx 20rpx;
-		background: linear-gradient(107deg, #f84c63 0%, #e8101e 100%);
+		background: linear-gradient(107deg, #f84c63 0%, #FF4767 100%);
 		border-radius: 30rpx;
 		text-align: center;
 		color: #fff;
diff --git a/pages/search/components/shopCard.vue b/pages/search/components/shopCard.vue
index cfea6ba..eea4a8c 100644
--- a/pages/search/components/shopCard.vue
+++ b/pages/search/components/shopCard.vue
@@ -131,7 +131,7 @@
 
 					&__tip {
 						padding: 0 8rpx;
-						background: linear-gradient(160deg, #fc5e72 0%, #e8101e 100%);
+						background: linear-gradient(160deg, #fc5e72 0%, #FF4767 100%);
 						border-radius: 6rpx;
 						font-weight: 500;
 						font-size: 20rpx;
@@ -147,7 +147,7 @@
 					font-family: DINPro, DINPro;
 					font-weight: 500;
 					font-size: 26rpx;
-					color: #e8101e;
+					color: #FF4767;
 					line-height: 33rpx;
 					text-align: left;
 					font-style: normal;
diff --git a/pages/search/components/syrCardList.vue b/pages/search/components/syrCardList.vue
index da60a08..dc88cad 100644
--- a/pages/search/components/syrCardList.vue
+++ b/pages/search/components/syrCardList.vue
@@ -229,7 +229,7 @@ export default {
   background: #fdf3f5;
   border-radius: 20rpx;
   font-size: 22rpx;
-  color: #e8101e;
+  color: #FF4767;
   padding: 2rpx 12rpx;
 }
 
@@ -246,7 +246,7 @@ export default {
   padding: 0rpx 30rpx;
   height: 60rpx;
   line-height: 60rpx;
-  background: linear-gradient(107deg, #f84c63 0%, #e8101e 100%);
+  background: linear-gradient(107deg, #f84c63 0%, #FF4767 100%);
   border-radius: 30rpx;
   text-align: center;
   color: #fff;
diff --git a/pages/search/search-result.vue b/pages/search/search-result.vue
index 3b1b2e1..608d86a 100644
--- a/pages/search/search-result.vue
+++ b/pages/search/search-result.vue
@@ -2,7 +2,7 @@
 	<view class="search-page">
 		<!-- 自定义导航栏 -->
 		<custom-navbar title="搜索" :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e8f7c37f-b446-41da-b578-59098a56bc4d.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"
 			borderBottom="none"></custom-navbar>
 		
 		<!-- 顶部搜索和标签区域 -->
@@ -859,7 +859,7 @@
 		.tabItem_active {
 			font-weight: 500;
 			font-size: 30rpx;
-			color: #E8101E;
+			color: #FF4767;
 			line-height: 42rpx;
 			text-align: left;
 			font-style: normal;
@@ -875,7 +875,7 @@
 			transform: translateX(-50%);
 			width: 34rpx;
 			height: 6rpx;
-			background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+			background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
 			border-radius: 2rpx;
 		}
 	}
@@ -902,7 +902,7 @@
 		width: 60rpx;
 		height: 60rpx;
 		border: 4rpx solid #f3f3f3;
-		border-top: 4rpx solid #E8101E;
+		border-top: 4rpx solid #FF4767;
 		border-radius: 50%;
 		animation: spin 1s linear infinite;
 		margin-bottom: 24rpx;
diff --git a/pages/search_common/search.vue b/pages/search_common/search.vue
new file mode 100644
index 0000000..d4e3393
--- /dev/null
+++ b/pages/search_common/search.vue
@@ -0,0 +1,454 @@
+<template>
+  <view class="search-page">
+    <view class="search-header" :style="{ paddingTop: statusBarHeight + 'px' }">
+      <view class="header-content">
+        <image class="back-icon" src="/static/images/back.png" @tap="goBack"></image>
+
+        <view class="search-box">
+          <input class="search-input" v-model="keyword" :placeholder="placeholderText"
+            placeholder-class="search-placeholder" focus confirm-type="search" @confirm="handleSearch" />
+          <text class="search-btn" @tap="handleSearch">搜索</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view>
+
+    <view class="result-container">
+
+      <view class="sort-bar"
+        v-if="hasSearched && ['brand', 'skill', 'collection_brand', 'collection_course'].includes(searchType)">
+        <view class="sort-item" @tap="toggleSort('time')">
+          <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
+          <view class="arrows">
+            <image class="arrow-icon" :src="orderType === 2 ? iconPinkUp : iconGreyUp"></image>
+            <image class="arrow-icon" :src="orderType === 1 ? iconPinkDown : iconGreyDown"></image>
+          </view>
+        </view>
+
+        <view class="sort-item" @tap="toggleSort('view')">
+          <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
+          <view class="arrows">
+            <image class="arrow-icon" :src="orderType === 4 ? iconPinkUp : iconGreyUp"></image>
+            <image class="arrow-icon" :src="orderType === 3 ? iconPinkDown : iconGreyDown"></image>
+          </view>
+        </view>
+      </view>
+
+      <view v-if="loading && page === 1" class="loading-tips">加载中...</view>
+
+      <view v-else-if="searchType === 'notice' && resultList.length > 0">
+        <notice-card v-for="item in resultList" :key="item.id" :item="item" @click="goToDetail(item)" />
+      </view>
+
+      <view v-else-if="(searchType === 'brand' || searchType === 'collection_brand') && resultList.length > 0"
+        class="brand-grid">
+        <brand-card class="brand-card-wrap" v-for="item in resultList" :key="item.id" :item="item"
+          :tagKeys="item.tagKeys || []" @click="goToDetail(item)" />
+      </view>
+
+      <view v-else-if="(searchType === 'skill' || searchType === 'collection_course') && resultList.length > 0"
+        class="course-list">
+        <skill-card v-for="item in resultList" :key="item.id" :item="item" @click="goToDetail(item)" />
+      </view>
+
+      <view v-else-if="!loading && hasSearched && resultList.length === 0" class="empty-state">
+        <image class="empty-icon"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4e4320d1-cc5c-4312-890c-f1eb8381fdd2.png">
+        </image>
+        <text>未搜索到相关内容哦~</text>
+      </view>
+
+      <view v-if="resultList.length > 0" class="load-more-text">
+        <text v-if="loading && page > 1">正在加载更多...</text>
+        <text v-else-if="!hasMore">没有更多了</text>
+      </view>
+
+    </view>
+  </view>
+</template>
+
+<script>
+import BrandCard from "@/pages/home/components/brand-card.vue";
+import SkillCard from "@/pages/home/components/skill-card.vue";
+import NoticeCard from "@/pages/home/components/notice-card.vue";
+import request from '@/utils/request';
+
+export default {
+  components: {
+    BrandCard,
+    SkillCard,
+    NoticeCard
+  },
+  data() {
+    return {
+      statusBarHeight: 0,
+      navHeight: 0,
+      searchType: '',
+      keyword: '',
+      resultList: [],
+
+      loading: false,
+      hasSearched: false,
+
+      // 分页相关
+      page: 1,
+      limit: 10,
+      hasMore: true,
+
+      // 排序参数：0代表无排序(全灰)，1/2发布时间，3/4浏览量
+      orderType: 0,
+
+      // 排序图标资源
+      iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
+      iconGreyDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfffb601-6877-4608-a3eb-88695b05c6c2.png',
+      iconPinkUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bc84dff-e120-4d4b-a33e-25d68e065654.png',
+      iconPinkDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ff2c2c9d-694a-4adf-b737-66b07f4a63ae.png',
+    };
+  },
+  computed: {
+    placeholderText() {
+      const map = {
+        'notice': '搜索公告通知',
+        'brand': '搜索精选品牌',
+        'skill': '搜索技能课程',
+        'collection_brand': '搜索收藏品牌的内容',
+        'collection_course': '搜索收藏课程的内容'
+      };
+      return map[this.searchType] || '请输入搜索内容';
+    }
+  },
+  onLoad(options) {
+    const systemInfo = uni.getSystemInfoSync();
+    this.statusBarHeight = systemInfo.statusBarHeight;
+    this.navHeight = this.statusBarHeight + 44;
+
+    if (options.type) {
+      this.searchType = options.type;
+    }
+  },
+  onReachBottom() {
+    if (this.hasMore && !this.loading) {
+      this.page++;
+      this.loadData(false);
+    }
+  },
+  methods: {
+    goBack() {
+      uni.navigateBack();
+    },
+
+    clearSearch() {
+      this.keyword = '';
+      this.resultList = [];
+      this.hasSearched = false;
+      this.page = 1;
+      this.hasMore = true;
+      this.orderType = 0; // 清除搜索时重置排序
+    },
+
+    // 切换排序
+    toggleSort(type) {
+      if (type === 'time') {
+        if (this.orderType === 1) {
+          this.orderType = 2;
+        } else if (this.orderType === 2) {
+          this.orderType = 0;
+        } else {
+          this.orderType = 1;
+        }
+      } else if (type === 'view') {
+        if (this.orderType === 3) {
+          this.orderType = 4;
+        } else if (this.orderType === 4) {
+          this.orderType = 0;
+        } else {
+          this.orderType = 3;
+        }
+      }
+
+      // 切换排序直接重新加载当前结果
+      if (this.hasSearched) {
+        this.page = 1;
+        this.hasMore = true;
+        this.loadData(true);
+      }
+    },
+
+    handleSearch() {
+      if (!this.keyword.trim()) {
+        return uni.showToast({ title: '请输入搜索内容', icon: 'none' });
+      }
+
+      // 每次发起新的关键字搜索时，重置为全灰无排序状态
+      this.orderType = 0;
+      this.hasSearched = true;
+      this.page = 1;
+      this.hasMore = true;
+      this.loadData(true);
+    },
+
+    async loadData(isReset) {
+      this.loading = true;
+
+      try {
+        let apiUrl = '';
+        let params = { page: this.page, limit: this.limit };
+
+        // 仅在有排序选择时（orderType !== 0）才传入 order_type 参数
+        if (['brand', 'skill', 'collection_brand', 'collection_course'].includes(this.searchType)) {
+          if (this.orderType !== 0) {
+            params.order_type = this.orderType;
+          }
+        }
+
+        switch (this.searchType) {
+          case 'notice':
+            apiUrl = '/sj/notice/list';
+            params.title = this.keyword;
+            break;
+          case 'brand':
+            apiUrl = '/sj/brand/list';
+            params.name = this.keyword;
+            break;
+          case 'skill':
+            apiUrl = '/sj/skill/list';
+            params.name = this.keyword;
+            break;
+          case 'collection_brand':
+            apiUrl = '/sj/brand/collectList';
+            params.name = this.keyword;
+            break;
+          case 'collection_course':
+            apiUrl = '/sj/skill/collectList';
+            params.name = this.keyword;
+            break;
+          default:
+            throw new Error('未知的搜索类型');
+        }
+
+        const res = await request.post(apiUrl, params);
+
+        if (res.code === 200 && res.data) {
+          const list = res.data.list || [];
+          const totalCount = res.data.count || 0;
+
+          let formattedList = list;
+
+          if (this.searchType === 'brand' || this.searchType === 'collection_brand') {
+            formattedList = list.map(item => {
+              let tags = [];
+              if (item.franchise_state === 1) tags.push('franchise');
+              if (item.student_state === 1) tags.push('recruit');
+              if (tags.length === 0) tags.push('more');
+              return {
+                ...item,
+                name: item.name,
+                bgSrc: item.cover_img || 'https://dummyimage.com/300x200/ccc/fff.png',
+                avatar: item.logo_img || 'https://dummyimage.com/100x100/ccc/fff.png',
+                tagKeys: tags
+              };
+            });
+          } else if (this.searchType === 'skill' || this.searchType === 'collection_course') {
+            formattedList = list.map(item => ({
+              ...item,
+              title: item.name,
+              coverSrc: item.cover_img || 'https://dummyimage.com/300x200/ccc/fff.png',
+              type: item.link_name || (item.link_type === 1 ? '平台课程' : '品牌课程'),
+              views: item.browse_num || 0,
+              typeIcon: item.link_logo || '',
+              time: item.create_time ? item.create_time.split(' ')[0] : '',
+              video: item.video || ''
+            }));
+          }
+
+          if (isReset) {
+            this.resultList = formattedList;
+          } else {
+            this.resultList = [...this.resultList, ...formattedList];
+          }
+
+          this.hasMore = this.resultList.length < totalCount;
+
+        } else {
+          if (isReset) this.resultList = [];
+          this.hasMore = false;
+        }
+      } catch (e) {
+        console.error('搜索异常:', e);
+        uni.showToast({ title: '搜索失败，请重试', icon: 'none' });
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    goToDetail(item) {
+      if (!item.id) return;
+
+      if (this.searchType === 'notice') {
+        uni.navigateTo({ url: `/pages/notice/detail?id=${item.id}` });
+      } else if (this.searchType === 'brand' || this.searchType === 'collection_brand') {
+        uni.navigateTo({ url: `/pages/brand/detail?id=${item.id}` });
+      } else if (this.searchType === 'skill' || this.searchType === 'collection_course') {
+        uni.navigateTo({ url: `/pages/skill/detail?id=${item.id}` });
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.search-page {
+  min-height: 100vh;
+  background: #fff;
+}
+
+.search-header {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  background-color: #fff;
+  z-index: 999;
+
+  .header-content {
+    height: 44px;
+    display: flex;
+    align-items: center;
+    padding: 0 24rpx;
+
+    .back-icon {
+      width: 28rpx;
+      height: 28rpx;
+      padding-right: 20rpx;
+    }
+
+    .search-box {
+      flex: 1;
+      height: 74rpx;
+      background: #f5f5f5;
+      border-radius: 37rpx;
+      display: flex;
+      align-items: center;
+      padding: 0 6rpx 0 24rpx;
+
+      .search-input {
+        flex: 1;
+        font-size: 28rpx;
+      }
+
+      .search-placeholder {
+        color: #CCCCCC;
+      }
+
+      .clear-icon {
+        font-size: 28rpx;
+        color: #999;
+        padding: 10rpx 20rpx;
+      }
+    }
+
+    .search-btn {
+      width: 110rpx;
+      height: 62rpx;
+      line-height: 62rpx;
+      background: #FF4767;
+      border-radius: 31rpx;
+      font-size: 28rpx;
+      color: #fff;
+      text-align: center;
+    }
+  }
+}
+
+.result-container {
+  padding: 24rpx;
+}
+
+.sort-bar {
+  display: flex;
+  align-items: center;
+  padding: 10rpx 0 24rpx;
+  gap: 100rpx;
+
+  .sort-item {
+    display: flex;
+    align-items: center;
+
+    .sort-text {
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #666666;
+      line-height: 37rpx;
+      margin-right: 6rpx;
+
+      &.active {
+        color: #FF4767;
+        font-weight: 500;
+      }
+    }
+
+    .arrows {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+
+      .arrow-icon {
+        width: 13rpx;
+        height: 8rpx;
+        margin: 2rpx 0;
+      }
+    }
+  }
+}
+
+.loading-tips {
+  text-align: center;
+  padding: 100rpx 0;
+  color: #999;
+  font-size: 28rpx;
+}
+
+.brand-grid {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+
+  .brand-card-wrap {
+    width: 48.5%;
+    margin-bottom: 24rpx;
+  }
+}
+
+.course-list {
+  display: flex;
+  flex-direction: column;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 200rpx 0;
+
+  .empty-icon {
+    width: 300rpx;
+    height: 300rpx;
+    margin-bottom: 20rpx;
+  }
+
+  text {
+    font-size: 28rpx;
+    color: #999;
+  }
+}
+
+.load-more-text {
+  text-align: center;
+  padding: 30rpx 0;
+  font-size: 24rpx;
+  color: #999;
+}
+</style>
diff --git a/pages/selfOperated/addWe.vue b/pages/selfOperated/addWe.vue
index e8afceb..16049e6 100644
--- a/pages/selfOperated/addWe.vue
+++ b/pages/selfOperated/addWe.vue
@@ -337,7 +337,7 @@
 		.agreement-btn {
 			width: 690rpx;
 			height: 78rpx;
-			background: #e8101e;
+			background: #FF4767;
 			border-radius: 798rpx;
 			font-weight: 400;
 			font-size: 30rpx;
diff --git a/pages/selfOperated/agreement.vue b/pages/selfOperated/agreement.vue
index 2696aca..9bf64d8 100644
--- a/pages/selfOperated/agreement.vue
+++ b/pages/selfOperated/agreement.vue
@@ -180,7 +180,7 @@
 		.agreement-btn {
 			width: 690rpx;
 			height: 78rpx;
-			background: #e8101e;
+			background: #FF4767;
 			border-radius: 798rpx;
 			font-weight: 400;
 			font-size: 30rpx;
diff --git a/pages/selfOperated/components/select-adress.vue b/pages/selfOperated/components/select-adress.vue
index 5f52d8a..d783e54 100644
--- a/pages/selfOperated/components/select-adress.vue
+++ b/pages/selfOperated/components/select-adress.vue
@@ -372,7 +372,7 @@
 				padding-right: 20rpx;
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
diff --git a/pages/selfOperated/components/self-card-list.vue b/pages/selfOperated/components/self-card-list.vue
index a68c39e..8b460d1 100644
--- a/pages/selfOperated/components/self-card-list.vue
+++ b/pages/selfOperated/components/self-card-list.vue
@@ -68,7 +68,7 @@ export default {
       width: 80rpx;
       height: 49rpx;
 	  z-index: 1;
-      background: linear-gradient( 124deg, #F52540 0%, #E8101E 100%);
+      background: linear-gradient( 124deg, #F52540 0%, #FF4767 100%);
       border-radius: 20rpx 2rpx 20rpx 2rpx;
 	  font-weight: 400;
 	  font-size: 26rpx;
@@ -109,7 +109,7 @@ export default {
         font-family: DINPro, DINPro;
         font-weight: 500;
         font-size: 28rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 36rpx;
         text-align: left;
         font-style: normal;
diff --git a/pages/selfOperated/components/self-pay.vue b/pages/selfOperated/components/self-pay.vue
index 3e75a88..94ecd97 100644
--- a/pages/selfOperated/components/self-pay.vue
+++ b/pages/selfOperated/components/self-pay.vue
@@ -89,7 +89,7 @@
 								<image :src="item.icon" mode="aspectFit" class="method-icon"></image>
 								<text class="method-name">{{ item.name }}</text>
 							</view>
-							<agree-radio :isAgree="item.selected" :yesImg="`/static/images/icons/yes_icon.png`"
+							<agree-radio :isAgree="item.selected" :yesImg="`/static/images/agree_y.png`"
 								:radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
 						</view>
 					</view>
@@ -770,7 +770,7 @@
 						font-family: DINPro, DINPro;
 						font-weight: 500;
 						font-size: 52rpx;
-						color: #e8101e;
+						color: #FF4767;
 						line-height: 67rpx;
 						text-align: left;
 						font-style: normal;
@@ -780,7 +780,7 @@
 				.pop-submit-btn {
 					width: 226rpx;
 					height: 82rpx;
-					background: #e8101e;
+					background: #FF4767;
 					border-radius: 41rpx;
 
 					.pop-submit-btn-text {
diff --git a/pages/selfOperated/detail.nvue b/pages/selfOperated/detail.nvue
index e1936e9..6a331e9 100644
--- a/pages/selfOperated/detail.nvue
+++ b/pages/selfOperated/detail.nvue
@@ -1091,7 +1091,7 @@
 		margin: 27rpx;
 		width: 130rpx;
 		height: 56rpx;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		display: flex;
 		flex-flow: row nowrap;
 		justify-content: center;
@@ -1101,7 +1101,7 @@
 
 	.look-text {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* 评论区域 */
@@ -1170,7 +1170,7 @@
 		font-size: 16rpx;
 		padding: 0 8rpx;
 		border-radius: 12rpx;
-		color: #E8101E;
+		color: #FF4767;
 		background-color: rgba(255, 148, 180, 0.50);
 		margin-right: 8rpx;
 	}
@@ -1289,7 +1289,7 @@
 	.submit-btn {
 		width: 670rpx;
 		height: 86rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 50rpx;
 		font-weight: 400;
 		font-size: 34rpx;
@@ -1303,7 +1303,7 @@
 
 	.disabled-btn {
 		opacity: 0.5 !important;
-		background-color: #E8101E; /* 保持原有颜色，只是降低透明度 */
+		background-color: #FF4767; /* 保持原有颜色，只是降低透明度 */
 	}
 
 	.cannot-submit {
diff --git a/pages/selfOperated/list.vue b/pages/selfOperated/list.vue
index 3899988..59589e8 100644
--- a/pages/selfOperated/list.vue
+++ b/pages/selfOperated/list.vue
@@ -4,7 +4,7 @@
       title="平台自营服务列表"
       :leftImg="'/static/images/whiteBack.png'"
       :showUser="true"
-      backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)"
+      backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
       headleSrc="/static/images/recruit/guide.png"
       :showHeadle="true"
       titleColor="#fff"
@@ -218,7 +218,7 @@ export default {
       /* 预先设置透明边框，防止切换时布局跳动 */
 
       &.active {
-        color: #e8101e;
+        color: #FF4767;
         font-weight: 500;
         position: relative;
 
@@ -232,7 +232,7 @@ export default {
           /* 激活时显示红色边框 */
           width: 34rpx;
           height: 6rpx;
-          background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+          background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
           border-radius: 3rpx;
         }
       }
@@ -279,10 +279,10 @@ export default {
       width: 246rpx;
       height: 80rpx;
       border-radius: 40rpx;
-      border: 2rpx solid #e8101e;
+      border: 2rpx solid #FF4767;
       font-weight: 500;
       font-size: 28rpx;
-      color: #e8101e;
+      color: #FF4767;
       text-align: left;
       font-style: normal;
       display: flex;
@@ -292,7 +292,7 @@ export default {
     .pop-content-sure {
       width: 246rpx;
       height: 80rpx;
-      background: #e8101e;
+      background: #FF4767;
       border-radius: 40rpx;
       font-weight: 500;
       font-size: 28rpx;
@@ -347,7 +347,7 @@ export default {
         .list-item-left-price-text {
           font-weight: 500;
           font-size: 40rpx;
-          color: #e8101e;
+          color: #FF4767;
           line-height: 48rpx;
           text-align: left;
           font-style: normal;
diff --git a/pages/selfOperated/selectSyr.vue b/pages/selfOperated/selectSyr.vue
index b7ff011..9ba0760 100644
--- a/pages/selfOperated/selectSyr.vue
+++ b/pages/selfOperated/selectSyr.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="selectSyr">
 		<custom-navbar title="选择手艺人" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"
 			borderBottom="none"></custom-navbar>
 		<searchBox placeholder="搜索手艺人名称" v-model="queryData.name" @confirm="searchConfrim" @search="searchConfrim">
 		</searchBox>
@@ -575,7 +575,7 @@
 			margin: 0 21rpx;
 			width: 648rpx;
 			height: 94rpx;
-			background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+			background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
 			border-radius: 48rpx;
 			font-weight: 400;
 			font-size: 30rpx;
@@ -794,7 +794,7 @@
 
 		/* 选中状态样式 */
 		.sj-pop-item.active {
-			color: #E8101E ;
+			color: #FF4767 ;
 		}
 	}
 
diff --git a/pages/selfOperated/serveList.vue b/pages/selfOperated/serveList.vue
index b438936..04cbce1 100644
--- a/pages/selfOperated/serveList.vue
+++ b/pages/selfOperated/serveList.vue
@@ -56,7 +56,7 @@
 
 					<view class="serveList-tabs">
 						<serviecFirstTab :tabs="tabs" bgColor="transparent" :activeId="queryData.first_class"
-							activeColor="#E8101E" @tab-click="tabClick">
+							activeColor="#FF4767" @tab-click="tabClick">
 						</serviecFirstTab>
 						<view class="icon-tabs">
 							<view v-for="(item, idx) in iconTabs" :key="item.id" class="icon-tab flex-row-center-center"
@@ -321,7 +321,7 @@
 
 						.icon-text {
 							font-weight: 500;
-							color: #E8101E;
+							color: #FF4767;
 						}
 					}
 				}
diff --git a/pages/service/appointment.vue b/pages/service/appointment.vue
index 14b1381..632bf70 100644
--- a/pages/service/appointment.vue
+++ b/pages/service/appointment.vue
@@ -4,7 +4,7 @@
       title="预约到家"
       :leftImg="'/static/images/whiteBack.png'"
       :showUser="true"
-      backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)"
+      backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
       titleColor="#fff"
       borderBottom="none"
     ></custom-navbar>
@@ -12,7 +12,7 @@
     <serviecFirstTab
       :tabs="tabs"
       :activeId="activeId"
-      activeColor="#E8101E"
+      activeColor="#FF4767"
       @tab-click="tabClick"
       bgColor="#fff"
     ></serviecFirstTab>
diff --git a/pages/service/class.vue b/pages/service/class.vue
index c8e438c..43e1bcb 100644
--- a/pages/service/class.vue
+++ b/pages/service/class.vue
@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<custom-navbar title="分类" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff"></custom-navbar>
-		<serviecFirstTab :tabs="tabs" :activeId="activeId" activeColor="#E8101E" @tab-click="tabClick" bgColor="#fff">
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"></custom-navbar>
+		<serviecFirstTab :tabs="tabs" :activeId="activeId" activeColor="#FF4767" @tab-click="tabClick" bgColor="#fff">
 		</serviecFirstTab>
 
 		<!-- <FilterPanel @filterConfirm="handleFilter"></FilterPanel> -->
@@ -253,11 +253,11 @@
 	}
 
 	.icon-tab.active .icon-text {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.icon-tab.active .icon-img {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 	}
 	
 	::v-deep .list-scroll{
diff --git a/pages/service/components/filter.vue b/pages/service/components/filter.vue
index ae2ef4b..6e5c5fb 100644
--- a/pages/service/components/filter.vue
+++ b/pages/service/components/filter.vue
@@ -279,10 +279,10 @@
 			
 			getIconColor(index) {
 				if (this.activeIndex === index) {
-					return '#E8101E';
+					return '#FF4767';
 				}
 				if (this.hasValue(this.filterTabs[index].key)) {
-					return '#E8101E';
+					return '#FF4767';
 				}
 				return '#666';
 			},
@@ -527,7 +527,7 @@
 			}
 			
 			&.active {
-				color: #E8101E;
+				color: #FF4767;
 			}
 			
 			.check-icon {
@@ -567,7 +567,7 @@
 			}
 			&.active {
 				background: #FFECF0;
-				color: #E8101E;
+				color: #FF4767;
 			}
 		}
 		
@@ -620,7 +620,7 @@
 					height: 100%;
 					
 					.custom-price-container.active & {
-						color: #E8101E;
+						color: #FF4767;
 					}
 				}
 				
diff --git a/pages/service/components/intmentFilter.vue b/pages/service/components/intmentFilter.vue
index 63490d9..0ad411e 100644
--- a/pages/service/components/intmentFilter.vue
+++ b/pages/service/components/intmentFilter.vue
@@ -267,7 +267,7 @@
 							&.active {
 								background-color: #ffecf0;
 								font-weight: 500;
-								color: #e8101e;
+								color: #FF4767;
 								border-color: @primary-color;
 							}
 						}
diff --git a/pages/service/components/search-box.vue b/pages/service/components/search-box.vue
index 0f84257..368d17a 100644
--- a/pages/service/components/search-box.vue
+++ b/pages/service/components/search-box.vue
@@ -52,7 +52,7 @@ export default {
     },
 	bgClor: {
       type: String,
-	   default: "linear-gradient(134deg, #f52540 0%, #e8101e 100%)",
+	   default: "linear-gradient(134deg, #f52540 0%, #FF4767 100%)",
     },
   },
   data() {
@@ -126,7 +126,7 @@ export default {
   justify-content: center;
   align-items: center;
   position: relative;
-  background: linear-gradient(134deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(134deg, #f52540 0%, #FF4767 100%);
   transform: translateY(0rpx);
 }
 
@@ -197,7 +197,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+  background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
   background-size: cover;
   color: #fff;
   font-size: 26rpx;
diff --git a/pages/service/components/self-pay.vue b/pages/service/components/self-pay.vue
index d8c1a8c..ccb18d4 100644
--- a/pages/service/components/self-pay.vue
+++ b/pages/service/components/self-pay.vue
@@ -89,7 +89,7 @@
 								<image :src="item.icon" mode="aspectFit" class="method-icon"></image>
 								<text class="method-name">{{ item.name }}</text>
 							</view>
-							<agree-radio :isAgree="item.selected" :yesImg="`/static/images/icons/yes_icon.png`"
+							<agree-radio :isAgree="item.selected" :yesImg="`/static/images/agree_y.png`"
 								:radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
 						</view>
 					</view>
@@ -793,7 +793,7 @@
 						font-family: DINPro, DINPro;
 						font-weight: 500;
 						font-size: 52rpx;
-						color: #e8101e;
+						color: #FF4767;
 						line-height: 67rpx;
 						text-align: left;
 						font-style: normal;
@@ -803,7 +803,7 @@
 				.pop-submit-btn {
 					width: 226rpx;
 					height: 82rpx;
-					background: #e8101e;
+					background: #FF4767;
 					border-radius: 41rpx;
 
 					.pop-submit-btn-text {
diff --git a/pages/service/components/shopCard.vue b/pages/service/components/shopCard.vue
index 4e2cfd5..218660b 100644
--- a/pages/service/components/shopCard.vue
+++ b/pages/service/components/shopCard.vue
@@ -165,7 +165,7 @@ export default {
         font-style: normal;
         &__tip {
           padding: 0 8rpx;
-          background: linear-gradient(160deg, #fc5e72 0%, #e8101e 100%);
+          background: linear-gradient(160deg, #fc5e72 0%, #FF4767 100%);
           border-radius: 6rpx;
           font-weight: 500;
           font-size: 20rpx;
@@ -180,7 +180,7 @@ export default {
         font-family: DINPro, DINPro;
         font-weight: 500;
         font-size: 26rpx;
-        color: #e8101e;
+        color: #FF4767;
         line-height: 33rpx;
         text-align: left;
         font-style: normal;
diff --git a/pages/service/detail.nvue b/pages/service/detail.nvue
index 80e19e7..ef223f5 100644
--- a/pages/service/detail.nvue
+++ b/pages/service/detail.nvue
@@ -985,14 +985,14 @@
 		margin: 27rpx;
 		padding: 0 18rpx;
 		height: 56rpx;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 
 		border-radius: 28rpx;
 	}
 
 	.look-text {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 56rpx;
 	}
 
@@ -1062,7 +1062,7 @@
 		font-size: 16rpx;
 		padding: 0 8rpx;
 		border-radius: 12rpx;
-		color: #E8101E;
+		color: #FF4767;
 		background-color: rgba(255, 148, 180, 0.50);
 		margin-right: 8rpx;
 	}
diff --git a/pages/service/store-list.vue b/pages/service/store-list.vue
index 10a4bb6..599e8d4 100644
--- a/pages/service/store-list.vue
+++ b/pages/service/store-list.vue
@@ -4,7 +4,7 @@
       title="附近门店"
       :leftImg="'/static/images/whiteBack.png'"
       :showUser="true"
-      backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)"
+      backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
       titleColor="#fff"
 	  borderBottom="none"
     ></custom-navbar>
@@ -12,7 +12,7 @@
       <serviecFirstTab
       :tabs="tabs"
       :activeId="activeId"
-      activeColor="#E8101E"
+      activeColor="#FF4767"
       @tab-click="tabClick"
 
     ></serviecFirstTab>
diff --git a/pages/settings/password.vue b/pages/settings/password.vue
index 298518c..88d79af 100644
--- a/pages/settings/password.vue
+++ b/pages/settings/password.vue
@@ -8,7 +8,7 @@
 		</view>
 
 		<view class="password-tip">
-			<text>登录密码用于美融融商家登录，密码<text style="color: #E8101E;">至少6个字符，不能全是字母或者数字</text></text>
+			<text>登录密码用于美融融商家登录，密码<text style="color: #FF4767;">至少6个字符，不能全是字母或者数字</text></text>
 		</view>
 
 		<!-- 新密码输入区域 -->
@@ -286,7 +286,7 @@
 		.pwd-error {
 			display: block;
 			font-size: 24rpx;
-			color: #E8101E;
+			color: #FF4767;
 			margin-left: 30rpx;
 			margin-top: 10rpx;
 			line-height: 1.2;
@@ -319,7 +319,7 @@
 			}
 
 			.active {
-				background: #E8101E;
+				background: #FF4767;
 
 				&:active {
 					opacity: 0.9; // 点击反馈
diff --git a/pages/settings/paypsd.vue b/pages/settings/paypsd.vue
index b024be0..cfb4fa9 100644
--- a/pages/settings/paypsd.vue
+++ b/pages/settings/paypsd.vue
@@ -133,7 +133,7 @@ page {
 .code-btn {
 	font-size: 28rpx;
 	font-weight: 400;
-	color: #E8101E;
+	color: #FF4767;
 }
 .pay-cont {
 	padding-top: 168rpx;
diff --git a/pages/share/syrandsjshare.vue b/pages/share/syrandsjshare.vue
index 167eed3..3fcd6bc 100644
--- a/pages/share/syrandsjshare.vue
+++ b/pages/share/syrandsjshare.vue
@@ -141,7 +141,7 @@ import request from '../../utils/request'
 	width: 360rpx;
 	height: 360rpx;
 	border-radius: 16rpx;
-	border: 6rpx solid #E8101E;
+	border: 6rpx solid #FF4767;
 	margin-top: 34rpx;
 }
 .invite-lists {
diff --git a/pages/share/usershare.vue b/pages/share/usershare.vue
index a84ba66..179ccf4 100644
--- a/pages/share/usershare.vue
+++ b/pages/share/usershare.vue
@@ -107,7 +107,7 @@ import request from '../../utils/request'
 	width: 360rpx;
 	height: 360rpx;
 	border-radius: 16rpx;
-	border: 6rpx solid #E8101E;
+	border: 6rpx solid #FF4767;
 	margin-top: 34rpx;
 	background-color: #fff;
 }
diff --git a/pages/shop/SellerDetail.vue b/pages/shop/SellerDetail.vue
index 740c86b..50a056e 100644
--- a/pages/shop/SellerDetail.vue
+++ b/pages/shop/SellerDetail.vue
@@ -25,11 +25,11 @@
 						}}</text>
 								<text class="service-name-num">×1</text>
 							</view>
-							<text class="service-subtitle white-space-nowrap">{{identity==0?'使用场景':'服务范围'}}：{{
+						<!-- 	<text class="service-subtitle white-space-nowrap">{{identity==0?'使用场景':'服务范围'}}：{{
                   orderInfo.first_class_title +
                   "   " +
                   orderInfo.second_class_title
-                }}</text>
+                }}</text> -->
 						</view>
 						<view class="service-price">
 							<text>单价：{{ orderInfo.price }}元/10分钟</text>
@@ -74,7 +74,7 @@
 				<view class="card_title" v-if="identity==0">顾客信息</view>
 				<view class="card_title" v-if="identity==1">店铺信息</view>
 				<view class="shop_title_box">
-					<image class="shop_photo" :src="orderInfo.head_photo" />
+					<image class="shop_photo" :src="orderInfo.head_photo" mode="aspectFill" />
 					<view class="left-section">
 						<view class="shop_title">{{ orderInfo.name }}</view>
 						<text class="shop_phone" @click="contactService(orderInfo.phone)">
@@ -131,7 +131,7 @@
 
 				<!-- <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_money">
 					<text class="label">支付小计</text>
-					<text class="value" style="color: #E8101E">{{ orderInfo.order_money }}元</text>
+					<text class="value" style="color: #FF4767">{{ orderInfo.order_money }}元</text>
 				</view> -->
 				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_time">
 					<text class="label">支付时间</text>
@@ -240,7 +240,7 @@
 			}
 
 			if (options.identity) {
-				this.identity = options.identity;
+				this.identity = parseInt(options.identity);
 			}
 			if (options.order_id) {
 				// 请求订单详情
@@ -377,15 +377,17 @@
 					})
 					.then((res) => {
 						if (this.identity == 0) {
+							const userSyr = res.data.user_syr || {};  // 避免 null 展开报错
 							this.orderInfo = res.data ? {
 								...res.data.order,
 								...res.data.work_seat,
-								...res.data.user_syr,
+								...userSyr,
 								work_hour_id: res.data.work_seat.id,
 								order_id: res.data.order.id,
-								user_sj_id: res.data.user_syr.id,
+								syr_id: userSyr.id,           // 用于判断是否有手艺人/顾客信息
 							} : {};
 						} else if (this.identity == 1) {
+							 // 手艺人视角
 							this.orderInfo = res.data ? {
 								...res.data.order,
 								...res.data.work_hour,
@@ -547,6 +549,7 @@
 						server_code: code,
 					})
 					.then((res) => {
+						console.log('API Response:', res);
 						if (res.code == 200) {
 							uni.showToast({
 								title: res.msg,
@@ -559,10 +562,19 @@
 								prevPage.$vm.getOrderNumber();
 								prevPage.$vm.getOrderList();
 							}
+						} else if (res.state == 1) {
+							uni.showToast({
+								title: res.msg,
+								icon: "none"
+							});
+							this.getOrderDetail();
+							const pages = getCurrentPages();
+							const prevPage = pages[pages.length - 2];
+							if (prevPage) {
+								prevPage.$vm.getOrderNumber();
+								prevPage.$vm.getOrderList();
+							}
 						}
-						// else if (res.state == 2) {
-						//   uni.showToast({ title: res.msg, icon: "none" });
-						// }
 						this.handelOrder = {};
 					}).finally(() => {
 						this.clickType = false
@@ -837,7 +849,7 @@
 	.real-price {
 		font-size: 42rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 		transform: translateY(-5rpx);
 
 		.icon {
@@ -894,6 +906,8 @@
 			.shop_photo {
 				width: 70rpx;
 				height: 70rpx;
+				min-width: 70rpx;
+				min-height: 70rpx;
 				border-radius: 50%;
 				flex-shrink: 0;
 			}
@@ -1016,14 +1030,14 @@
 	}
 
 	.btn-border {
-		border: 1rpx solid #979797;
+		border: 2rpx solid #979797;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 30rpx;
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
@@ -1061,4 +1075,4 @@
 	.mt_10 {
 		margin-top: 10rpx;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/shop/add-img-text.vue b/pages/shop/add-img-text.vue
index 97f24fc..0627272 100644
--- a/pages/shop/add-img-text.vue
+++ b/pages/shop/add-img-text.vue
@@ -12,7 +12,8 @@
 				<!-- <rich-text :nodes="item.value" v-if="item.type==1"></rich-text> -->
 				<uv-divider dashed v-if="item.type == 1"></uv-divider>
 				<view class="addTextAndImg-content-card-text" v-if="item.type == 2">{{ item.value }}</view>
-				<image style="width: 100%;" mode="widthFix" :src="item.value" v-else-if="item.type == 3 || item.type == 4">
+				<image style="width: 100%;" mode="widthFix" :src="item.value"
+					v-else-if="item.type == 3 || item.type == 4">
 				</image>
 				<view class="addTextAndImg-content-card-btns">
 					<view class="addTextAndImg-content-card-btns-btn" v-for="item2 in btns" :key="item2.id"
diff --git a/pages/shop/add-service.vue b/pages/shop/add-service.vue
index d7848d8..a3bdb51 100644
--- a/pages/shop/add-service.vue
+++ b/pages/shop/add-service.vue
@@ -444,9 +444,16 @@ export default {
 			let that = this;
 			let value = e.detail.value;
 
+			// 1. 移除非数字和小数点
+			value = value.replace(/[^\d.]/g, '');
 			// 1. 移除非数字和小数点
 			value = value.replace(/[^\d.]/g, '');
 
+			// 2. 确保只有一个小数点
+			const parts = value.split('.');
+			if (parts.length > 2) {
+				value = parts[0] + '.' + parts.slice(1).join('');
+			}
 			// 2. 确保只有一个小数点
 			const parts = value.split('.');
 			if (parts.length > 2) {
@@ -464,6 +471,27 @@ export default {
 			that.$set(that.formData, 'line_price', value);
 		},
 		// 服务简介部分
+		initDetailForm(detail = []) {
+			// 先重置 detailForm 为空
+			this.detailForm = {
+				effect: "",
+				crowd: "",
+				product: "",
+				scope: "",
+				tips: "",
+			};
+			this.detailOtherList = [];
+			// 3. 限制小数点后最多一位
+			if (parts.length > 1) {
+				value = parts[0] + '.' + parts[1].slice(0, 2);
+			}
+			// 4. 如果以小数点开头，前面补0
+			if (value.startsWith('.')) {
+				value = '0' + value;
+			}
+			that.$set(that.formData, 'line_price', value);
+		},
+		// 服务简介部分
 		initDetailForm(detail = []) {
 			// 先重置 detailForm 为空
 			this.detailForm = {
@@ -475,6 +503,12 @@ export default {
 			};
 			this.detailOtherList = [];
 
+			// 优先从后端返回的新字段赋值
+			if (this.formData.efficacy) this.detailForm.effect = this.formData.efficacy;
+			if (this.formData.crowd) this.detailForm.crowd = this.formData.crowd;
+			if (this.formData.product) this.detailForm.product = this.formData.product;
+			if (this.formData.scope) this.detailForm.scope = this.formData.scope;
+			if (this.formData.prompt) this.detailForm.tips = this.formData.prompt;
 			// 优先从后端返回的新字段赋值
 			if (this.formData.efficacy) this.detailForm.effect = this.formData.efficacy;
 			if (this.formData.crowd) this.detailForm.crowd = this.formData.crowd;
@@ -718,9 +752,16 @@ export default {
 			let that = this;
 			let value = e.detail.value;
 
+			// 1. 移除非数字和小数点
+			value = value.replace(/[^\d.]/g, "");
 			// 1. 移除非数字和小数点
 			value = value.replace(/[^\d.]/g, "");
 
+			// 2. 确保只有一个小数点
+			const parts = value.split(".");
+			if (parts.length > 2) {
+				value = parts[0] + "." + parts.slice(1).join("");
+			}
 			// 2. 确保只有一个小数点
 			const parts = value.split(".");
 			if (parts.length > 2) {
@@ -764,6 +805,10 @@ export default {
 			this.nowQer = val;
 		},
 
+		// 删除视频
+		deleteVideo() {
+			this.formData.video = "";
+		},
 		// 删除视频
 		deleteVideo() {
 			this.formData.video = "";
@@ -804,259 +849,301 @@ export default {
 				}
 				return !value;
 			});
-
-			if (isEmpty) {
-				uni.showToast({
-					title: "请至少填写一项内容",
-					icon: "none",
+			// 保存草稿
+			saveDraft: debounce(function () {
+				if (this.isDraft) return;
+				this.syncDetailForm();
+				const {
+					title,
+					server_price,
+					line_price,
+					server_time,
+					first_class_id,
+					second_class_id,
+					detail,
+					process,
+					video,
+					photo,
+				} = this.formData;
+				let item = {
+					title,
+					server_price,
+					line_price,
+					server_time,
+					first_class_id,
+					second_class_id,
+					detail,
+					process,
+					video,
+					photo,
+				};
+				// 检查是否所有字段都为空
+				const isEmpty = Object.values(item).every((value) => {
+					if (Array.isArray(value)) {
+						return value.length === 0;
+					}
+					return !value;
 				});
-				return;
-			}
 
-			// 实现保存草稿逻辑
-			this.formData.state = 0;
-			const submitData = this.buildSubmitData();
-			submitData.state = 0;
-			let url = null;
-			if (!this.formData.id) {
-				url = "/user/serveradd";
-			} else {
-				url = "/user/serverchange";
-			}
-			request.post(url, submitData).then((res) => {
-				if (res.state == 1) {
-					this.isDraft = true;
-					const pages = getCurrentPages();
-					const prevPage = pages[pages.length - 2]; // 上一个页面
+				if (isEmpty) {
 					uni.showToast({
-						title: res.msg,
-						icon: "success",
-						duration: 1000,
-					});
-					setTimeout(() => {
-						uni.navigateBack({
-							delta: 1,
-							success: () => {
-								prevPage.$vm.currentTab = 3;
-								prevPage.$vm.state = 0;
-								prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
-							},
-						});
-					}, 500);
-				} else {
-					uni.showToast({
-						title: res.msg,
+						title: "请至少填写一项内容",
 						icon: "none",
 					});
-					this.isDraft = false;
+					return;
 				}
-			});
-		}, 500),
-
-		// 验证动态表单字段
-		validateDynamicForm() {
-			// 遍历 formGroups（分组结构）按顺序验证必填项
-			for (let i = 0; i < this.formFields.length; i++) {
-				const group = this.formFields[i];
-				const fieldsToCheck = [];
-				if (group.type === 'single' && group.field) {
-					fieldsToCheck.push(group.field);
-				} else if (group.type === 'section' && group.fields) {
-					fieldsToCheck.push(...group.fields);
+				if (isEmpty) {
+					uni.showToast({
+						title: "请至少填写一项内容",
+						icon: "none",
+					});
+					return;
 				}
 
-				for (let j = 0; j < fieldsToCheck.length; j++) {
-					const field = fieldsToCheck[j];
-					if (!field.is_required) continue;
-
-					const value = this.formData[field.key];
-					const isEmpty = value === undefined || value === null || value === '' ||
-						(Array.isArray(value) && value.length === 0);
-
-					if (isEmpty) {
-						// 根据字段类型显示不同的提示语
-						const prefix = (field.type === 'image_multi' || field.type === 'video') ? '请上传' : '请输入';
+				// 实现保存草稿逻辑
+				this.formData.state = 0;
+				const submitData = this.buildSubmitData();
+				submitData.state = 0;
+				let url = null;
+				if (!this.formData.id) {
+					url = "/user/serveradd";
+				} else {
+					url = "/user/serverchange";
+				}
+				request.post(url, submitData).then((res) => {
+					if (res.state == 1) {
+						this.isDraft = true;
+						const pages = getCurrentPages();
+						const prevPage = pages[pages.length - 2]; // 上一个页面
 						uni.showToast({
-							title: `${prefix}${field.label}`,
+							title: res.msg,
+							icon: "success",
+							duration: 1000,
+						});
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1,
+								success: () => {
+									prevPage.$vm.currentTab = 3;
+									prevPage.$vm.state = 0;
+									prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
+								},
+							});
+						}, 500);
+					} else {
+						uni.showToast({
+							title: res.msg,
 							icon: "none",
 						});
-						return false;
+						this.isDraft = false;
+					}
+				});
+			}, 500),
+
+				// 验证动态表单字段
+				validateDynamicForm() {
+				// 遍历 formGroups（分组结构）按顺序验证必填项
+				for (let i = 0; i < this.formFields.length; i++) {
+					const group = this.formFields[i];
+					const fieldsToCheck = [];
+					if (group.type === 'single' && group.field) {
+						fieldsToCheck.push(group.field);
+					} else if (group.type === 'section' && group.fields) {
+						fieldsToCheck.push(...group.fields);
 					}
 
-					// 服务时长特殊验证
-					if (field.key === 'server_time') {
-						if (value < 10) {
+					for (let j = 0; j < fieldsToCheck.length; j++) {
+						const field = fieldsToCheck[j];
+						if (!field.is_required) continue;
+
+						const value = this.formData[field.key];
+						const isEmpty = value === undefined || value === null || value === '' ||
+							(Array.isArray(value) && value.length === 0);
+
+						if (isEmpty) {
+							// 根据字段类型显示不同的提示语
+							const prefix = (field.type === 'image_multi' || field.type === 'video') ? '请上传' : '请输入';
 							uni.showToast({
-								title: "服务时长最短为10分钟",
+								title: `${prefix}${field.label}`,
 								icon: "none",
 							});
 							return false;
 						}
-						if (value > 240) {
-							uni.showToast({
-								title: "服务时长最长为240分钟",
-								icon: "none",
-							});
-							return false;
+
+						// 服务时长特殊验证
+						if (field.key === 'server_time') {
+							if (value < 10) {
+								uni.showToast({
+									title: "服务时长最短为10分钟",
+									icon: "none",
+								});
+								return false;
+							}
+							if (value > 240) {
+								uni.showToast({
+									title: "服务时长最长为240分钟",
+									icon: "none",
+								});
+								return false;
+							}
 						}
 					}
 				}
-			}
-			return true;
-		},
-		// 构建提交数据：有key的字段直接作为参数，没有key的字段放入intro数组
-		buildSubmitData() {
-			const submitData = {};
-			const introArr = [];
-			console.log(this.formData, '=-=-=-=-=-=');
-			// 添加固定字段
-			if (this.formData.publish_user_id) {
-				if (this.formData.id) {
-					submitData.id = this.formData.id;
+				return true;
+			},
+			// 构建提交数据：有key的字段直接作为参数，没有key的字段放入intro数组
+			buildSubmitData() {
+				const submitData = {};
+				const introArr = [];
+				console.log(this.formData, '=-=-=-=-=-=');
+				// 添加固定字段
+				if (this.formData.publish_user_id) {
+					if (this.formData.id) {
+						submitData.id = this.formData.id;
+					}
+					submitData.publish_user_id = this.formData.publish_user_id || uni.getStorageSync('userId') || '';
+					submitData.first_class_id = this.formData.first_class_id || '';
+					submitData.second_class_id = this.formData.second_class_id || '';
+					submitData.server_kind = this.formData.server_kind || getApp().globalData.artisanType;
 				}
-				submitData.publish_user_id = this.formData.publish_user_id || uni.getStorageSync('userId') || '';
-				submitData.first_class_id = this.formData.first_class_id || '';
-				submitData.second_class_id = this.formData.second_class_id || '';
-				submitData.server_kind = this.formData.server_kind || getApp().globalData.artisanType;
-			}
 
-			// 视频字段（独立上传组件）
-			if (this.formData.video) {
-				submitData.video = this.formData.video;
-			}
-
-			// 遍历分组，按顺序处理字段
-			for (let i = 0; i < this.formFields.length; i++) {
-				const group = this.formFields[i];
-				let fieldsToProcess = [];
-				if (group.type === 'single' && group.field) {
-					fieldsToProcess.push(group.field);
-				} else if (group.type === 'section' && group.fields) {
-					fieldsToProcess = group.fields;
+				// 视频字段（独立上传组件）
+				if (this.formData.video) {
+					submitData.video = this.formData.video;
 				}
-				for (let j = 0; j < fieldsToProcess.length; j++) {
-					const field = fieldsToProcess[j];
-					const value = this.formData[field.key];
-					if (value === undefined || value === null || value === '') continue;
-					if (Array.isArray(value) && value.length === 0) continue;
 
-					if (field._hasOriginalKey) {
-						// 有key的字段直接作为请求参数
-						// 图片字段确保为纯URL字符串数组
-						if (field.type === 'image_multi' && Array.isArray(value)) {
-							submitData[field.key] = value.map(function (item) {
-								return typeof item === 'string' ? item : (item && item.url ? item.url : item);
-							});
+				// 遍历分组，按顺序处理字段
+				for (let i = 0; i < this.formFields.length; i++) {
+					const group = this.formFields[i];
+					let fieldsToProcess = [];
+					if (group.type === 'single' && group.field) {
+						fieldsToProcess.push(group.field);
+					} else if (group.type === 'section' && group.fields) {
+						fieldsToProcess = group.fields;
+					}
+					for (let j = 0; j < fieldsToProcess.length; j++) {
+						const field = fieldsToProcess[j];
+						const value = this.formData[field.key];
+						if (value === undefined || value === null || value === '') continue;
+						if (Array.isArray(value) && value.length === 0) continue;
+
+						if (field._hasOriginalKey) {
+							// 有key的字段直接作为请求参数
+							// 图片字段确保为纯URL字符串数组
+							if (field.type === 'image_multi' && Array.isArray(value)) {
+								submitData[field.key] = value.map(function (item) {
+									return typeof item === 'string' ? item : (item && item.url ? item.url : item);
+								});
+							} else {
+								submitData[field.key] = value;
+							}
 						} else {
-							submitData[field.key] = value;
+							// 没有key的字段放入intro数组
+							introArr.push({
+								id: field._original ? field._original.id : field.key,
+								title: field.label,
+								type: field._fieldType || field.type,
+								value: value,
+							});
 						}
-					} else {
-						// 没有key的字段放入intro数组
-						introArr.push({
-							id: field._original ? field._original.id : field.key,
-							title: field.label,
-							type: field._fieldType || field.type,
-							value: value,
-						});
 					}
 				}
-			}
 
-			if (introArr.length > 0) {
-				submitData.intro = JSON.stringify(introArr);
-			}
+				if (introArr.length > 0) {
+					submitData.intro = JSON.stringify(introArr);
+				}
 
-			// 服务步骤：有key时作为独立参数，无key时放入intro数组
-			if (this.formData.process && this.formData.process.length > 0) {
-				const processArr = this.formData.process
-					.filter(item => item.text && item.text.trim())
-					.map(item => ({ text: item.text.trim() }));
-				if (processArr.length > 0) {
-					if (this.processFieldKey) {
-						submitData[this.processFieldKey] = JSON.stringify(processArr);
-					} else {
-						let introList = [];
-						try {
-							introList = submitData.intro ? JSON.parse(submitData.intro) : [];
-						} catch (e) {
-							introList = [];
+				// 服务步骤：有key时作为独立参数，无key时放入intro数组
+				if (this.formData.process && this.formData.process.length > 0) {
+					const processArr = this.formData.process
+						.filter(item => item.text && item.text.trim())
+						.map(item => ({ text: item.text.trim() }));
+					if (processArr.length > 0) {
+						if (this.processFieldKey) {
+							submitData[this.processFieldKey] = JSON.stringify(processArr);
+						} else {
+							let introList = [];
+							try {
+								introList = submitData.intro ? JSON.parse(submitData.intro) : [];
+							} catch (e) {
+								introList = [];
+							}
+							introList.push({
+								id: 'service_step',
+								title: '服务流程',
+								value: processArr,
+							});
+							submitData.intro = JSON.stringify(introList);
 						}
-						introList.push({
-							id: 'service_step',
-							title: '服务流程',
-							value: processArr,
-						});
-						submitData.intro = JSON.stringify(introList);
 					}
 				}
-			}
 
-			return submitData;
-		},
+				return submitData;
+			},
 
-		// 提交表单
-		submitForm: debounce(function () {
-			if (this.isAdd) return;
+			// 提交表单
+			submitForm: debounce(function () {
+				if (this.isAdd) return;
 
-			// 先同步服务简介数据到formData
-			this.syncDetailForm();
+				// 先同步服务简介数据到formData
+				this.syncDetailForm();
 
-			// 验证动态表单字段
-			if (!this.validateDynamicForm()) {
-				return;
-			}
+				// 验证动态表单字段
+				if (!this.validateDynamicForm()) {
+					return;
+				}
 
-			if (this.artisanType == 2) {
-				delete this.formData.sj_see;
-			}
-			// 提交表单逻辑
-			delete this.formData.state;
-			let url = null;
-			if (!this.formData.id) {
-				url = "/user/serveradd";
-			} else {
-				url = "/user/serverupdate";
-			}
-			console.log(this.formData, '-0-0-0-0-0-');
-			const submitData = this.buildSubmitData();
-			submitData.publish_user_id = this.formData.publish_user_id;
-			submitData.second_class_id = this.formData.second_class_id;
-			submitData.photo = Object.values(this.formData.photo || {});
-			console.log(submitData, 'submitData');
-			submitData.publish_user_id = this.postid
-			submitData.server_kind = 2
-			submitData.first_class_id = this.formData.first_class_id
-
-			request.post(url, submitData).then((res) => {
-				if (res.state == 1) {
-					const pages = getCurrentPages();
-					const prevPage = pages[pages.length - 2]; // 上一个页面
-					uni.showToast({
-						title: res.msg,
-						icon: "success",
-						duration: 600,
-						mask: true,
-					});
-					this.isAdd = true;
-					setTimeout(() => {
-						uni.navigateBack({
-							delta: 1,
-							success: () => {
-								prevPage.$vm.currentTab = 1;
-								prevPage.$vm.state = 1;
-								prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
-							},
-						});
-					}, 500);
+				if (this.artisanType == 2) {
+					delete this.formData.sj_see;
+				}
+				// 提交表单逻辑
+				delete this.formData.state;
+				let url = null;
+				if (!this.formData.id) {
+					url = "/user/serveradd";
 				} else {
-					uni.showToast({
-						title: res.msg,
-						icon: "none",
-					});
-					this.isAdd = false;
+					url = "/user/serverupdate";
 				}
-			});
-		}, 500),
+				console.log(this.formData, '-0-0-0-0-0-');
+				const submitData = this.buildSubmitData();
+				submitData.publish_user_id = this.formData.publish_user_id;
+				submitData.second_class_id = this.formData.second_class_id;
+				submitData.photo = Object.values(this.formData.photo || {});
+				console.log(submitData, 'submitData');
+				submitData.publish_user_id = this.postid
+				submitData.server_kind = 2
+				submitData.first_class_id = this.formData.first_class_id
+
+				request.post(url, submitData).then((res) => {
+					if (res.state == 1) {
+						const pages = getCurrentPages();
+						const prevPage = pages[pages.length - 2]; // 上一个页面
+						uni.showToast({
+							title: res.msg,
+							icon: "success",
+							duration: 600,
+							mask: true,
+						});
+						this.isAdd = true;
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1,
+								success: () => {
+									prevPage.$vm.currentTab = 1;
+									prevPage.$vm.state = 1;
+									prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
+								},
+							});
+						}, 500);
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "none",
+						});
+						this.isAdd = false;
+					}
+				});
+			}, 500),
 	},
 };
 </script>
@@ -1067,6 +1154,15 @@ export default {
 	box-sizing: border-box;
 }
 
+.add-service {
+	padding: 24rpx 24rpx 0;
+	box-sizing: border-box;
+}
+
+.form-container {
+	margin-top: 20rpx;
+}
+
 .form-container {
 	margin-top: 20rpx;
 }
@@ -1083,10 +1179,37 @@ export default {
 	margin-bottom: 24rpx;
 }
 
+.form-item {
+	background-color: #fff;
+	padding: 24rpx;
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: space-between;
+	align-items: center;
+	box-sizing: border-box;
+	border-radius: 10rpx;
+	margin-bottom: 24rpx;
+}
+
 .price-tip {
 	width: 100%;
 	margin-top: 40rpx;
 
+	.price-tip {
+		width: 100%;
+		margin-top: 40rpx;
+
+		.price-tip-card {
+			padding: 8rpx 12rpx;
+			background: #FDF0F0;
+			border-radius: 8rpx;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #EE4853;
+			line-height: 33rpx;
+		}
+	}
+
 	.price-tip-card {
 		padding: 8rpx 12rpx;
 		background: #FDF0F0;
@@ -1104,6 +1227,20 @@ export default {
 	align-items: space-between;
 }
 
+.shopsale-box {
+	flex-flow: column;
+	justify-content: space-between;
+	align-items: space-between;
+}
+
+.shopsale-change {
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: 24rpx;
+}
+
 .shopsale-change {
 	display: flex;
 	flex-flow: row nowrap;
@@ -1119,6 +1256,17 @@ export default {
 	align-items: center;
 }
 
+.shopsale-option {
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: center;
+	align-items: center;
+}
+
+.shopsale-option:last-child {
+	margin-left: 220rpx;
+}
+
 .shopsale-option:last-child {
 	margin-left: 220rpx;
 }
@@ -1127,6 +1275,22 @@ export default {
 	padding-left: 16rpx;
 }
 
+.option-text {
+	padding-left: 16rpx;
+}
+
+.form-item-up {
+	background-color: #fff;
+	padding: 24rpx;
+	display: flex;
+	flex-flow: column nowrap;
+	justify-content: space-between;
+	align-items: flex-start;
+	box-sizing: border-box;
+	border-radius: 10rpx;
+	margin-bottom: 24rpx;
+}
+
 .form-item-up {
 	background-color: #fff;
 	padding: 24rpx;
@@ -1144,6 +1308,11 @@ export default {
 	color: #333333;
 }
 
+.form-label {
+	font-size: 28rpx;
+	color: #333333;
+}
+
 .form-input {
 	flex: 1;
 	height: 40rpx;
@@ -1153,6 +1322,21 @@ export default {
 	text-align: center;
 }
 
+.form-input {
+	flex: 1;
+	height: 40rpx;
+	font-size: 28rpx;
+	color: #333333;
+	align-items: center;
+	text-align: center;
+}
+
+.form-right {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
 .form-right {
 	display: flex;
 	justify-content: space-between;
@@ -1183,10 +1367,29 @@ export default {
 	color: #999999;
 }
 
+.placeholder {
+	font-weight: 400;
+	font-size: 28rpx;
+	color: #999999;
+}
+
 .textarea-item {
 	padding-bottom: 30rpx;
 }
 
+.textarea-item {
+	padding-bottom: 30rpx;
+}
+
+.form-textarea {
+	flex: 1;
+	height: 198rpx;
+	font-size: 28rpx;
+	color: #333333;
+	line-height: 1.5;
+	margin-left: 32rpx;
+}
+
 .form-textarea {
 	flex: 1;
 	height: 198rpx;
@@ -1200,6 +1403,16 @@ export default {
 	padding-bottom: 30rpx;
 }
 
+.upload-item {
+	padding-bottom: 30rpx;
+}
+
+.upload-tip {
+	font-size: 24rpx;
+	color: #999999;
+	margin-left: 10rpx;
+}
+
 .upload-tip {
 	font-size: 24rpx;
 	color: #999999;
@@ -1211,6 +1424,26 @@ export default {
 	position: relative;
 }
 
+.upload-content {
+	margin-top: 20rpx;
+	position: relative;
+}
+
+.progress-box {
+	width: 204rpx;
+	height: 204rpx;
+	background-color: rgba(0, 0, 0, 0.5);
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 99;
+	display: flex;
+	flex-flow: column nowrap;
+	justify-content: center;
+	align-items: center;
+}
+
 .progress-box {
 	width: 204rpx;
 	height: 204rpx;
@@ -1232,11 +1465,30 @@ export default {
 	font-weight: 500;
 }
 
+.progress-text {
+	font-size: 42rpx;
+	color: #ffffff;
+	font-weight: 500;
+}
+
 .progress-lable {
 	font-size: 28rpx;
 	color: #ffffff;
 }
 
+.progress-lable {
+	font-size: 28rpx;
+	color: #ffffff;
+}
+
+.progress-box progress {
+	/* width: 204rpx; */
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+}
+
 .progress-box progress {
 	/* width: 204rpx; */
 	position: absolute;
@@ -1255,6 +1507,23 @@ export default {
 	position: relative;
 }
 
+.video-preview,
+.image-preview,
+.upload-btn {
+	width: 200rpx;
+	height: 200rpx;
+	margin-right: 10rpx;
+	margin-bottom: 20rpx;
+	position: relative;
+}
+
+.preview-video,
+.preview-image {
+	width: 200rpx;
+	height: 200rpx;
+	border-radius: 8rpx;
+}
+
 .preview-video,
 .preview-image {
 	width: 200rpx;
@@ -1270,6 +1539,19 @@ export default {
 	align-items: center;
 }
 
+.upload-btn {
+	border: 2rpx dashed #dddddd;
+	border-radius: 8rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.plus-icon {
+	font-size: 60rpx;
+	color: #999999;
+}
+
 .plus-icon {
 	font-size: 60rpx;
 	color: #999999;
@@ -1290,6 +1572,23 @@ export default {
 	font-size: 32rpx;
 }
 
+.delete-btn {
+	position: absolute;
+	top: -20rpx;
+	right: -20rpx;
+	width: 40rpx;
+	height: 40rpx;
+	background-color: rgba(0, 0, 0, 0.5);
+	border-radius: 50%;
+	color: #ffffff;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 32rpx;
+}
+
+.bottom-buttons {
+	/* position: fixed;
 .bottom-buttons {
 	/* position: fixed;
   left: 0;
@@ -1304,6 +1603,26 @@ export default {
 	align-items: center;
 }
 
+height: 100rpx;
+padding: 40rpx 0 64rpx;
+box-sizing: border-box;
+display: flex;
+flex-flow: row nowrap;
+justify-content: space-between;
+align-items: center;
+}
+
+.btn-draft,
+.btn-submit {
+	width: 334rpx;
+	height: 76rpx;
+	line-height: 76rpx;
+	text-align: center;
+	font-size: 28rpx;
+	border-radius: 40rpx;
+	margin: 0 24rpx;
+}
+
 .btn-draft,
 .btn-submit {
 	width: 334rpx;
@@ -1334,10 +1653,27 @@ export default {
 	margin-bottom: 24rpx;
 }
 
+.form-step {
+	background-color: #fff;
+	margin-bottom: 24rpx;
+}
+
 .form-step .form-item {
 	margin-bottom: 0;
 }
 
+.form-step .form-item {
+	margin-bottom: 0;
+}
+
+.step {
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: space-between;
+	align-items: center;
+	padding: 0 24rpx 24rpx;
+}
+
 .step {
 	display: flex;
 	flex-flow: row nowrap;
@@ -1355,6 +1691,25 @@ export default {
 	background-color: rgba(230, 230, 230, 0.5);
 }
 
+.step-inp {
+	flex: 1;
+	font-size: 28rpx;
+	color: #333333;
+	margin-left: 38rpx;
+	padding: 0 24rpx;
+	background-color: rgba(230, 230, 230, 0.5);
+}
+
+.step-textarea {
+	font-size: 24rpx;
+	flex: 1;
+	height: 70rpx;
+	border-radius: 6rpx;
+	margin-left: 38rpx;
+	padding: 24rpx;
+	background-color: rgba(230, 230, 230, 0.5);
+}
+
 .step-textarea {
 	font-size: 24rpx;
 	flex: 1;
@@ -1376,6 +1731,22 @@ export default {
 	margin-bottom: 24rpx;
 }
 
+/* 选择器触发按钮样式 */
+.picker-trigger {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 24rpx 32rpx;
+	background-color: #ffffff;
+	border-radius: 12rpx;
+	margin-bottom: 24rpx;
+}
+
+.picker-label {
+	font-size: 28rpx;
+	color: #333333;
+}
+
 .picker-label {
 	font-size: 28rpx;
 	color: #333333;
@@ -1386,6 +1757,17 @@ export default {
 	color: #666666;
 }
 
+.picker-value {
+	font-size: 28rpx;
+	color: #666666;
+}
+
+.picker-arrow {
+	width: 32rpx;
+	height: 32rpx;
+	margin-left: 16rpx;
+}
+
 .picker-arrow {
 	width: 32rpx;
 	height: 32rpx;
@@ -1398,6 +1780,16 @@ export default {
 	margin-left: 24rpx;
 }
 
+.delete-icon {
+	width: 32rpx;
+	height: 32rpx;
+	margin-left: 24rpx;
+}
+
+.form-detail {
+	position: relative;
+}
+
 .form-detail {
 	position: relative;
 }
@@ -1408,6 +1800,17 @@ export default {
 	margin-right: 4rpx;
 }
 
+.required::before {
+	content: "*";
+	color: #ff0000;
+	margin-right: 4rpx;
+}
+
+.step-inp,
+.form-input {
+	height: 60rpx;
+}
+
 .step-inp,
 .form-input {
 	height: 60rpx;
@@ -1423,10 +1826,31 @@ export default {
 	overflow: hidden;
 }
 
+// 服务简介相关
+.detail-card {
+	background: #ffffff;
+	border-radius: 20rpx;
+	padding: 0 24rpx 8rpx;
+	margin-bottom: 24rpx;
+	box-sizing: border-box;
+	overflow: hidden;
+}
+
 .detail-title {
 	padding: 24rpx 0 25rpx;
 }
 
+.detail-title {
+	padding: 24rpx 0 25rpx;
+}
+
+.detail-title .form-label {
+	font-size: 30rpx;
+	font-weight: 500;
+	color: #333;
+	line-height: 40rpx;
+}
+
 .detail-title .form-label {
 	font-size: 30rpx;
 	font-weight: 500;
@@ -1438,6 +1862,16 @@ export default {
 	padding: 0 0 36rpx;
 }
 
+.detail-row {
+	padding: 0 0 36rpx;
+}
+
+.detail-row .form-label {
+	display: block;
+	margin-bottom: 20rpx;
+	line-height: 40rpx;
+}
+
 .detail-row .form-label {
 	display: block;
 	margin-bottom: 20rpx;
@@ -1452,6 +1886,28 @@ export default {
 	box-sizing: border-box;
 }
 
+.detail-textarea-wrap {
+	position: relative;
+	background: #f7f7f7;
+	border-radius: 16rpx;
+	padding: 24rpx 24rpx 52rpx;
+	box-sizing: border-box;
+}
+
+.detail-textarea {
+	width: 100%;
+	height: 108rpx;
+	min-height: 108rpx;
+	margin: 0;
+	padding: 0;
+	background: transparent;
+	border: 0;
+	font-size: 28rpx;
+	line-height: 40rpx;
+	color: #333333;
+	box-sizing: border-box;
+}
+
 .detail-textarea {
 	width: 100%;
 	height: 108rpx;
@@ -1475,8 +1931,24 @@ export default {
 	line-height: 32rpx;
 }
 
+.detail-count {
+	position: absolute;
+	right: 24rpx;
+	bottom: 16rpx;
+	font-size: 22rpx;
+	color: #999999;
+	line-height: 32rpx;
+}
+
 /* 平台特定样式 */
 /* #ifdef H5 */
+/* 平台特定样式 */
+/* #ifdef H5 */
+
+.form-input,
+.form-textarea {
+	outline: none;
+}
 
 .form-input,
 .form-textarea {
@@ -1487,7 +1959,17 @@ export default {
 	cursor: pointer;
 }
 
+.upload-btn {
+	cursor: pointer;
+}
+
 /* #endif */
+/* #endif */
+
+/* #ifdef APP-PLUS */
+.form-input {
+	height: 90rpx;
+}
 
 /* #ifdef APP-PLUS */
 .form-input {
@@ -1500,6 +1982,13 @@ export default {
 	visibility: visible;
 }
 
+.permission.transform {
+	top: calc(var(--status-bar-height) + 88rpx + 30rpx);
+	opacity: 1;
+	visibility: visible;
+}
+
+/* #endif */
 /* #endif */
 
 /* #ifdef MP-WEIXIN */
@@ -1507,6 +1996,15 @@ export default {
 	height: 80rpx;
 }
 
+/* #ifdef MP-WEIXIN */
+.form-input {
+	height: 80rpx;
+}
+
+.bottom-buttons {
+	padding-bottom: env(safe-area-inset-bottom);
+}
+
 .bottom-buttons {
 	padding-bottom: env(safe-area-inset-bottom);
 }
@@ -1522,7 +2020,27 @@ export default {
 	text-align: left;
 	font-style: normal;
 
-	text-align: center;
+	/* #endif */
+	.tip {
+		padding: 20rpx 30rpx;
+		background: #feefec;
+		font-weight: 400;
+		font-size: 30rpx;
+		color: #f31d2f;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+
+		text-align: center;
+		text-align: center;
+
+		.tip-icon {
+			width: 34rpx;
+			height: 34rpx;
+			margin-right: 10rpx;
+			transform: translateY(6rpx);
+		}
+	}
 
 	.tip-icon {
 		width: 34rpx;
@@ -1538,11 +2056,35 @@ export default {
 	transition: opacity 0.3s;
 }
 
+/* 淡入淡出动画 */
+.fade-enter-active,
+.fade-leave-active {
+	transition: opacity 0.3s;
+}
+
 .fade-enter,
 .fade-leave-to {
 	opacity: 0;
 }
 
+.fade-enter,
+.fade-leave-to {
+	opacity: 0;
+}
+
+.popup-mask2 {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	// z-index: 1000;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
 .popup-mask2 {
 	position: fixed;
 	top: 0;
@@ -1565,6 +2107,23 @@ export default {
 	box-sizing: border-box;
 }
 
+.popup-content2 {
+	width: 600rpx;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	overflow: hidden;
+	padding: 40rpx 30rpx;
+	box-sizing: border-box;
+}
+
+.popup-title {
+	font-size: 36rpx;
+	font-weight: 600;
+	color: #333333;
+	text-align: center;
+	margin-bottom: 20rpx;
+}
+
 .popup-title {
 	font-size: 36rpx;
 	font-weight: 600;
@@ -1582,6 +2141,15 @@ export default {
 	line-height: 1.5;
 }
 
+.popup-message {
+	font-size: 30rpx;
+	color: #666666;
+	text-align: center;
+	margin-top: 40rpx;
+	margin-bottom: 30rpx;
+	line-height: 1.5;
+}
+
 .popup-buttons {
 	display: flex;
 	flex-flow: row nowrap;
@@ -1590,6 +2158,23 @@ export default {
 	gap: 60rpx;
 }
 
+.popup-buttons {
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: space-between;
+	padding: 20rpx 0 0 0;
+	gap: 60rpx;
+}
+
+.popup-btn {
+	flex: 1;
+	height: 80rpx;
+	line-height: 80rpx;
+	text-align: center;
+	font-size: 26rpx;
+	border-radius: 40rpx;
+}
+
 .popup-btn {
 	flex: 1;
 	height: 80rpx;
diff --git a/pages/shop/business-time.vue b/pages/shop/business-time.vue
index fdc0739..a1563e1 100644
--- a/pages/shop/business-time.vue
+++ b/pages/shop/business-time.vue
@@ -1,31 +1,116 @@
 <template>
   <view class="service-time-page">
-    <!-- 顶部导航栏 -->
-    <custom-navbar title="营业时间" :showBack="true"></custom-navbar>
-    
-    <!-- 内容区域 -->
+    <custom-navbar title="营业设置" :showBack="true"></custom-navbar>
+
     <view class="content">
-      <!--营业时间卡片 -->
-      <view class="section-card">
-        <view class="section-header">
-          <view class="title-bar"></view>
-          <text class="section-title">营业时间</text>
+
+      <view class="setting-row">
+        <text class="setting-label">当前接单状态</text>
+        <view class="custom-switch" :class="{ 'is-on': isOpenStore }" @click="toggleStatus">
+          <text class="switch-text text-on">接单中</text>
+          <text class="switch-text text-off">不接单</text>
+          <view class="switch-dot"></view>
         </view>
-        
-        <!-- 时间显示 -->
-        <view class="time-display-section">
-          <view class = "time-value-box">
-          <text class="time-value">营业时间</text>
-          <text class="time-value2">{{ currentTime }}</text>
+      </view>
+
+      <view class="service-time-card" v-if="hasBusinessTime">
+        <view class="time-content">
+          <view class="time-blocks-container">
+            <view class="t-block">
+              <text class="t-time">{{ formatTime(startTime) }}</text>
+              <text class="t-label">开始时间</text>
+            </view>
+            <text class="t-separator">至</text>
+            <view class="t-block">
+              <text class="t-time">{{ formatTime(endTime) }}</text>
+              <text class="t-label">结束时间</text>
+            </view>
           </view>
-          <view class="change-button" @click="showTimePicker" v-if="!showBottomActions && !showTimePickerFlag">
-            <text class="change-text">信息变更 </text>
-            <image class="arrow-right" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b87d4918-4282-4f51-931c-292435ba5d36" mode="aspectFit"></image>
+
+          <view class="modify-btn-outline" @click="showTimePicker" v-if="!showBottomActions && !showTimePickerFlag">
+            <image class="edit-icon"
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d67adcda-d334-440f-87d4-d709983b0101.png">
+            </image>
+            <text>修改服务时间</text>
+          </view>
+        </view>
+      </view>
+
+      <view class="service-time-card1" v-if="!hasBusinessTime">
+
+        <view class="modify-btn-outline1" @click="showTimePicker">
+          <image class="edit-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/176a8b35-14bd-4cd1-a187-4165d07c0dcb.png">
+          </image>
+          <text>设置服务时间</text>
+        </view>
+      </view>
+
+      <view class="setup-modal-mask" v-if="showSetupModal" catchtouchmove="true">
+        <view class="setup-modal-content">
+          <image class="modal-bg"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ac2cb4aa-a7c5-4776-98f4-b77e9c0cfa85.png">
+          </image>
+
+          <view class="modal-header">
+            <text>温馨提示</text>
+          </view>
+
+          <view class="modal-body">
+            <text class="modal-subtitle">发布服务请完善以下资料：</text>
+
+            <view class="missing-list">
+              <view class="missing-item" v-if="!hasBusinessTime">
+                <view class="item-left">
+                  <image class="item-icon"
+                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+                  </image>
+                  <view class="item-texts">
+                    <text class="item-title">营业时间未配置</text>
+                    <text class="item-desc">请完善店铺的营业时间</text>
+                  </view>
+                </view>
+                <view class="item-right orange" @tap="goToBusinessTime">去配置</view>
+              </view>
+
+              <view class="missing-item" v-if="!hasServiceSkill">
+                <view class="item-left">
+                  <image class="item-icon"
+                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+                  </image>
+                  <view class="item-texts">
+                    <text class="item-title">服务技能未配置</text>
+                    <text class="item-desc">请完善服务技能</text>
+                  </view>
+                </view>
+                <view class="item-right orange" @tap="goToServiceSkill">去配置</view>
+              </view>
+
+              <view class="missing-item" v-if="!isCertified">
+                <view class="item-left">
+                  <image class="item-icon"
+                    :src="isUnderReview ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'">
+                  </image>
+                  <view class="item-texts">
+                    <text class="item-title" :class="{ 'blue-text': isUnderReview }">{{ isUnderReview ? '资质认证中' :
+                      '资质未认证'
+                    }}</text>
+                    <text class="item-desc">请完成资质认证</text>
+                  </view>
+                </view>
+                <view class="item-right" :class="isUnderReview ? 'grey' : 'light-green'" @tap="goToAuth">
+                  {{ isUnderReview ? '查看进度' : '去认证' }}
+                </view>
+              </view>
+            </view>
+          </view>
+
+          <view class="modal-footer">
+            <view class="btn-know" @tap="closeSetupModal">知道了</view>
           </view>
         </view>
       </view>
 
-      <!-- 营业时间选择器（五列选择器） -->
       <view class="popup" :class="{ show: showTimePickerFlag }">
         <view class="popup-mask" @click="hideTimePicker"></view>
         <view class="popup-content">
@@ -35,29 +120,27 @@
             <text class="confirm-text" @click="confirmTime">确定</text>
           </view>
           <view class="time-range">
-            <view class="time-block" :class="{ active: timeType === 'start' }"
-                  @click="switchTimeType('start')">
-              <text class="time-value-picker">{{formatTime(startTime)}}</text>
+            <view class="time-block" :class="{ active: timeType === 'start' }" @click="switchTimeType('start')">
+              <text class="time-value-picker">{{ formatTime(startTime) }}</text>
               <text class="time-label">开始时间</text>
             </view>
             <text class="time-separator">至</text>
-            <view class="time-block" :class="{ active: timeType === 'end' }"
-                  @click="switchTimeType('end')">
-              <text class="time-value-picker">{{formatTime(endTime)}}</text>
+            <view class="time-block" :class="{ active: timeType === 'end' }" @click="switchTimeType('end')">
+              <text class="time-value-picker">{{ formatTime(endTime) }}</text>
               <text class="time-label">结束时间</text>
             </view>
           </view>
           <view class="region-body">
             <picker-view :value="pickerValue" @change="handleTimeChange" class="picker-scroll"
-                        :indicator-style="indicatorStyle">
+              :indicator-style="indicatorStyle">
               <picker-view-column>
                 <view class="picker-item" v-for="(hour, index) in hours" :key="index">
-                  {{hour}}
+                  {{ hour }}
                 </view>
               </picker-view-column>
               <picker-view-column>
                 <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
-                  {{minute}}
+                  {{ minute }}
                 </view>
               </picker-view-column>
               <picker-view-column>
@@ -65,12 +148,12 @@
               </picker-view-column>
               <picker-view-column>
                 <view class="picker-item" v-for="(hour, index) in hours" :key="index">
-                  {{hour}}
+                  {{ hour }}
                 </view>
               </picker-view-column>
               <picker-view-column>
                 <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
-                  {{minute}}
+                  {{ minute }}
                 </view>
               </picker-view-column>
             </picker-view>
@@ -78,7 +161,6 @@
         </view>
       </view>
 
-      <!-- 底部操作按钮（在选择时间后显示） -->
       <view class="bottom-actions" v-if="showBottomActions">
         <view class="action-buttons">
           <button class="btn-cancel-large" @click="cancelChange">取消</button>
@@ -100,14 +182,14 @@ export default {
       tempTime: '', // 临时存储选择的时间
       showTimePickerFlag: false,
       showBottomActions: false, // 控制底部按钮显示
-      
+
       // 五列选择器相关数据
       pickerValue: [8, 0, 0, 18, 0],
       hours: Array.from({ length: 24 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
       minutes: Array.from({ length: 60 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
       timeType: 'start',
       indicatorStyle: 'height: 68rpx;',
-      
+
       startTime: {
         hour: '09',
         minute: '00'
@@ -115,22 +197,80 @@ export default {
       endTime: {
         hour: '21',
         minute: '00'
+      },
+
+      // 以下为首页同步过来的弹窗与状态判定数据
+      userInfo: {},
+      authDetails: null,
+      sjId: null,
+      showSetupModal: false,
+      isExpandTime: true, // 默认展开服务时间
+      isLogin: true // 默认已登录
+    }
+  },
+  computed: {
+    // 依据后端详情判断是否真实处于审核中
+    isUnderReview() {
+      if (!this.isLogin) return false;
+      if (this.authDetails && Object.keys(this.authDetails).length > 0) {
+        return true;
       }
+      return false;
+    },
+    // 判断是否具备接单的大前提条件
+    canOpenStore() {
+      return this.hasBusinessTime && this.hasServiceSkill && this.isCertified;
+    },
+    // 判定服务技能
+    hasServiceSkill() {
+      const fromUser = this.userInfo && Array.isArray(this.userInfo.servers_kill) && this.userInfo.servers_kill.length > 0;
+      const fromAuth = this.authDetails && Array.isArray(this.authDetails.servers_kill) && this.authDetails.servers_kill.length > 0;
+      return this.isLogin && (fromUser || fromAuth);
+    },
+    // 当前开关状态显示
+    isOpenStore() {
+      if (!this.canOpenStore) {
+        return false;
+      }
+      return this.userInfo.order_taking == 1;
+    },
+    isSettled() {
+      if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+      return this.userInfo.id_type !== 0;
+    },
+    isCertified() {
+      if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+      if (typeof this.userInfo.credentials_state !== 'undefined' && this.userInfo.credentials_state !== null) {
+        const credentialsState = Number(this.userInfo.credentials_state);
+        if (!Number.isNaN(credentialsState)) {
+          return credentialsState === 2 || (this.userInfo.id_type > 0 && credentialsState === 0);
+        }
+      }
+      return this.userInfo.id_type > 0;
+    },
+    hasBusinessTime() {
+      const timeFromUser = this.userInfo && this.userInfo.business_time;
+      const timeFromAuth = this.authDetails && this.authDetails.business_time;
+      return this.isLogin && !!(timeFromUser || timeFromAuth);
     }
   },
   onLoad() {
     this.loadCurrentTime();
   },
   methods: {
-    // 加载当前营业时间
+    // 加载当前营业时间 (合并了首页获取用户信息的逻辑)
     async loadCurrentTime() {
       try {
-        const res = await request.post('/user/getuser', {
+        const res = await request.post('/sj/user/getuser', {
           type: 3 // 商家类型
         })
         console.log('获取用户信息响应:', res)
 
         if (res.state === 1 && res.data) {
+          // 同步给页面 userInfo 对象，以驱动计算属性与弹窗开关
+          this.userInfo = res.data;
+          this.sjId = res.data.id;
+
           // 检查营业时间字段
           if (res.data.business_time) {
             this.currentTime = res.data.business_time
@@ -144,6 +284,11 @@ export default {
             this.originalTime = '09:00-21:00'
             this.parseTimeString('09:00-21:00')
           }
+
+          // 如果已经开启入驻，顺便拉取一下详情用于判定服务技能等
+          if (this.isSettled) {
+            this.fetchAuthDetails();
+          }
         } else {
           throw new Error(res.msg || '获取用户信息失败')
         }
@@ -153,7 +298,7 @@ export default {
         this.currentTime = '09:00-21:00'
         this.originalTime = '09:00-21:00'
         this.parseTimeString('09:00-21:00')
-        
+
         // uni.showToast({
         //   title: '加载营业时间失败，使用默认时间',
         //   icon: 'none'
@@ -161,13 +306,99 @@ export default {
       }
     },
 
+    // 弹窗路由：获取入驻详情
+    fetchAuthDetails() {
+      request.post("/sj/userSjAuth/details", {
+        type: 1,
+        id_type: '1'
+      }).then(res => {
+        if (res.code == 200 && res.data) {
+          this.authDetails = res.data;
+          if (!this.userInfo.business_time && res.data.business_time) {
+            this.currentTime = res.data.business_time;
+            this.originalTime = res.data.business_time;
+            this.parseTimeString(res.data.business_time);
+          }
+        }
+      });
+    },
+
+    // 弹窗路由：关闭弹窗
+    closeSetupModal() {
+      this.showSetupModal = false;
+    },
+    // 弹窗路由：去配置营业时间
+    goToBusinessTime() {
+      this.showSetupModal = false;
+      uni.showToast({ title: '您当前正在营业时间页面', icon: 'none' });
+    },
+    // 弹窗路由：去配置服务技能
+    goToServiceSkill() {
+      this.showSetupModal = false;
+      uni.navigateTo({ url: '/pages/shop/service-skills' });
+    },
+    // 弹窗路由：去认证
+    goToAuth() {
+      this.showSetupModal = false;
+      if (this.isUnderReview) {
+        uni.navigateTo({ url: '/pages/ruzhu/submitres' });
+      } else {
+        this.navigateToForm();
+      }
+    },
+    // 提取公共的【去填表】路由
+    navigateToForm() {
+      if (this.isSettled) {
+        uni.navigateTo({ url: '/pages/ruzhu/ruzhu?step=3' });
+      } else {
+        uni.navigateTo({ url: '/pages/ruzhu/ruzhu' });
+      }
+    },
+
+    // 核心切换逻辑：营业中 / 休息中
+    toggleStatus() {
+      if (!this.isCertified) {
+        uni.showToast({ title: '请完成资质认证', icon: 'none' });
+        return;
+      }
+
+      // 未入驻状态不允许切换接单状态
+      if (!this.isSettled) {
+        uni.showToast({ title: '请先完成入驻', icon: 'none' });
+        return;
+      }
+
+      // 以页面展示状态为准，避免资料未完成时后端仍为接单中导致首次点击变成停止接单
+      let newStatus = this.isOpenStore ? 2 : 1;
+
+      if (newStatus === 1 && !this.canOpenStore) {
+        uni.showToast({ title: '当前资料不完善，无法开启接单', icon: 'none' });
+        return;
+      }
+
+      uni.showLoading({ title: '切换中...', mask: true });
+
+      request.post("/sj/sjordertaking", {
+        order_taking: newStatus,
+        sjid: this.sjId
+      }).then((res) => {
+        uni.hideLoading();
+        this.userInfo.order_taking = newStatus; // 本地状态切换
+        this.loadCurrentTime(); // 重新拉取确认最新数据
+        uni.showToast({ title: newStatus == 1 ? '已开启接单' : '已停止接单', icon: 'none' });
+      }).catch(() => {
+        uni.hideLoading();
+        uni.showToast({ title: '网络异常，切换失败', icon: 'none' });
+      });
+    },
+
     // 解析时间字符串到开始和结束时间
     parseTimeString(timeStr) {
       const times = timeStr.split('-')
       if (times.length === 2) {
         const startParts = times[0].split(':')
         const endParts = times[1].split(':')
-        
+
         if (startParts.length === 2) {
           this.startTime.hour = startParts[0]
           this.startTime.minute = startParts[1]
@@ -176,7 +407,7 @@ export default {
           this.endTime.hour = endParts[0]
           this.endTime.minute = endParts[1]
         }
-        
+
         this.updatePickerValue()
       }
     },
@@ -187,7 +418,7 @@ export default {
       const startMinuteIndex = this.minutes.indexOf(this.startTime.minute)
       const endHourIndex = this.hours.indexOf(this.endTime.hour)
       const endMinuteIndex = this.minutes.indexOf(this.endTime.minute)
-      
+
       this.pickerValue = [
         startHourIndex >= 0 ? startHourIndex : 8,
         startMinuteIndex >= 0 ? startMinuteIndex : 0,
@@ -218,11 +449,11 @@ export default {
     handleTimeChange(e) {
       const values = e.detail.value;
       this.pickerValue = values;
-      
+
       // 更新开始时间
       this.startTime.hour = this.hours[values[0]]
       this.startTime.minute = this.minutes[values[1]]
-      
+
       // 更新结束时间
       this.endTime.hour = this.hours[values[3]]
       this.endTime.minute = this.minutes[values[4]]
@@ -233,12 +464,10 @@ export default {
       return `${time.hour}:${time.minute}`
     },
 
-    // 确认时间选择
+    // 确认时间选择 - 直接提交
     confirmTime() {
       const newTime = `${this.formatTime(this.startTime)}-${this.formatTime(this.endTime)}`
 
-      console.log('选择的时间:', newTime) // 调试日志
-      
       // 验证时间合理性
       if (!this.validateTime(this.startTime, this.endTime)) {
         uni.showToast({
@@ -247,20 +476,18 @@ export default {
         })
         return
       }
-      
+
       this.tempTime = newTime
-      this.showBottomActions = true
-      this.hideTimePicker()
-      
-      // 立即更新页面显示
       this.currentTime = newTime
-      console.log('临时存储的时间:', this.tempTime) // 调试日志
+      this.hideTimePicker()
+      this.submitChange()
     },
 
     // 取消变更
     cancelChange() {
       // 恢复原来的时间
       this.currentTime = this.originalTime
+      this.parseTimeString(this.originalTime) // 同步将方块内的时间退回
       this.showBottomActions = false
       this.tempTime = ''
     },
@@ -274,7 +501,7 @@ export default {
         })
         return
       }
-      
+
       try {
         // uni.showLoading({
         //   title: '提交中...'
@@ -288,24 +515,32 @@ export default {
         console.log('请求URL:', '/sj/userSjAuth/apply')
 
         const res = await request.post('/sj/userSjAuth/apply', params)
-        
+
         uni.hideLoading()
         console.log('提交接口响应:', res)
-        
+
         // 根据接口文档，使用 code 判断成功
         if (res.code === 200) {
+          const savedTime = this.currentTime;
           this.showBottomActions = false
           this.tempTime = ''
-          this.originalTime = this.currentTime // 更新原始时间
-          
+          this.originalTime = savedTime // 更新原始时间
+          this.userInfo = {
+            ...(this.userInfo || {}),
+            business_time: savedTime
+          }
+          if (this.authDetails) {
+            this.authDetails = {
+              ...this.authDetails,
+              business_time: savedTime
+            }
+          }
+          this.parseTimeString(savedTime)
+
           uni.showToast({
             title: '营业时间更新成功',
             icon: 'none'
           })
-          
-          setTimeout(() => {
-            uni.navigateBack()
-          }, 1500)
         } else {
           uni.showToast({
             title: res.msg || '提交失败',
@@ -322,7 +557,6 @@ export default {
       }
     },
 
-
     // 验证时间合理性
     validateTime(startTime, endTime) {
       const start = new Date(`2000/01/01 ${startTime.hour}:${startTime.minute}`)
@@ -340,84 +574,335 @@ export default {
 }
 
 .content {
-  padding: 20rpx;
+  padding: 40rpx 24rpx 24rpx 24rpx;
 }
 
-.section-card {
-  background: white;
-  border-radius: 20rpx;
-  padding: 22rpx;
-  margin-bottom: 20rpx;
-}
-
-.section-header {
-  display: flex;
-  align-items: center;
-  margin-bottom: 20rpx;
-}
-
-.section-title {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #1D2129;
-  line-height: 48rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 10rpx;
-  border-radius: 5rpx;
-}
-
-.time-display-section {
+/* 接单状态开关行样式 (依据设计图定制) */
+.setting-row {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 20rpx 0 10rpx 0 ;
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 18rpx 24rpx;
+  margin-bottom: 34rpx;
 }
 
-.time-value-box {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #333333;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-  margin-left: 16rpx;
-} 
-
-.time-value {
-  margin-right: 15rpx;
-}
-.time-value2 {
+.setting-label {
+  font-size: 30rpx;
+  color: #333;
   font-weight: 500;
 }
 
-.change-button {
+.custom-switch {
+  width: 140rpx;
+  height: 56rpx;
+  border-radius: 28rpx;
+  background-color: #D3D3D3;
+  position: relative;
   display: flex;
   align-items: center;
+  transition: background-color 0.3s;
+  box-sizing: border-box;
+
+  &.is-on {
+    background-color: #FF4767;
+  }
+
+  .switch-text {
+    font-size: 24rpx;
+    color: #FFFFFF;
+    position: absolute;
+    transition: opacity 0.3s;
+    font-weight: 500;
+  }
+
+  .text-on {
+    left: 12rpx;
+    opacity: 0;
+  }
+
+  .text-off {
+    right: 12rpx;
+    opacity: 1;
+  }
+
+  &.is-on .text-on {
+    opacity: 1;
+  }
+
+  &.is-on .text-off {
+    opacity: 0;
+  }
+
+  .switch-dot {
+    width: 48rpx;
+    height: 48rpx;
+    background-color: #FFFFFF;
+    border-radius: 50%;
+    position: absolute;
+    left: 4rpx;
+    transition: transform 0.3s cubic-bezier(0.25, 1, 0.5, 1);
+    box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.15);
+  }
+
+  &.is-on .switch-dot {
+    transform: translateX(84rpx);
+  }
+}
+
+/* 展开折叠服务时间卡片样式 */
+.service-time-card {
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 24rpx 24rpx;
+}
+
+.service-time-card1 {
+  width: 710rpx;
+  height: 80rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+}
+
+.card-header-flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 
-.change-text {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #E8101E;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
+.header-title {
+  font-size: 30rpx;
+  color: #333;
+  font-weight: 500;
+  transition: all 0.3s ease-in-out;
 }
 
-.arrow-right {
-  margin-left: 10rpx;
-  width: 11rpx;
-  height: 22rpx;
+.arrow-icon {
+  width: 16rpx;
+  height: 9rpx;
+  transition: transform 0.3s;
+  transform: rotate(-360deg);
+  /* 默认朝下 */
+}
+
+.arrow-icon.rotated {
+  transform: rotate(180deg);
+  /* 展开朝上 */
+}
+
+.time-blocks-container {
+  margin-top: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.t-block {
+  width: 280rpx;
+  height: 150rpx;
+  background: #F5F5F5;
+  border-radius: 16rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.t-time {
+  font-size: 42rpx;
+  color: #333;
+  font-weight: 500;
+}
+
+.t-label {
+  font-size: 24rpx;
+  color: #999;
+  margin-top: 12rpx;
+}
+
+.t-separator {
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #999999;
+  line-height: 40rpx;
+}
+
+.modify-btn-outline {
+  margin-top: 50rpx;
+  height: 78rpx;
+  border-radius: 50rpx;
+  border: 1rpx solid #FF4767;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #FF4767;
+  font-size: 28rpx;
+  margin-bottom: 10rpx;
+}
+
+.modify-btn-outline1 {
+  margin-top: 50rpx;
+  height: 78rpx;
+  border-radius: 50rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  margin-bottom: 10rpx;
+}
+
+.edit-icon {
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 12rpx;
+}
+
+/* ============ 提示弹窗样式 (完全一致) ============ */
+.setup-modal-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .setup-modal-content {
+    width: 630rpx;
+    height: 775rpx;
+    background: #FFFFFF;
+    border-radius: 32rpx;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+
+    .modal-bg {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 630rpx;
+      height: 265rpx;
+      z-index: 0;
+    }
+
+    .modal-header {
+      position: relative;
+      z-index: 1;
+      height: 150rpx;
+      display: flex;
+      align-items: flex-end;
+      justify-content: center;
+      padding-bottom: 20rpx;
+
+      text {
+        font-size: 36rpx;
+        font-weight: bold;
+        color: #333333;
+        letter-spacing: 2rpx;
+      }
+    }
+
+    .modal-body {
+      position: relative;
+      z-index: 1;
+      flex: 1;
+      padding: 24rpx 40rpx;
+
+      .modal-subtitle {
+        font-size: 28rpx;
+        color: #333333;
+        margin-bottom: 40rpx;
+        display: block;
+      }
+
+      .missing-list {
+        display: flex;
+        flex-direction: column;
+        gap: 46rpx;
+
+        .missing-item {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+
+          .item-left {
+            display: flex;
+            align-items: flex-start;
+
+            .item-icon {
+              width: 32rpx;
+              height: 32rpx;
+              margin-right: 16rpx;
+              flex-shrink: 0;
+              margin-top: 6rpx;
+            }
+
+            .item-texts {
+              display: flex;
+              flex-direction: column;
+
+              .item-title {
+                font-size: 30rpx;
+                color: #333333;
+                font-weight: 500;
+                margin-bottom: 8rpx;
+
+                &.blue-text {
+                  color: #2b85e4;
+                }
+              }
+
+              .item-desc {
+                font-size: 24rpx;
+                color: #999999;
+              }
+            }
+          }
+
+          .item-right {
+            font-size: 26rpx;
+            font-weight: 400;
+            margin-top: -45rpx;
+
+            &.orange {
+              color: #FF7B00;
+            }
+
+            &.grey {
+              color: #999999;
+            }
+
+            &.light-green {
+              color: #18b566;
+            }
+          }
+        }
+      }
+    }
+
+    .modal-footer {
+      position: relative;
+      z-index: 1;
+      padding: 0 50rpx 50rpx;
+
+      .btn-know {
+        width: 100%;
+        height: 88rpx;
+        background: #FF4767;
+        border-radius: 44rpx;
+        color: #FFFFFF;
+        font-size: 32rpx;
+        font-weight: 500;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+  }
 }
 
 /* 五列选择器样式 */
@@ -474,7 +959,7 @@ export default {
 
 .confirm-text {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -511,8 +996,10 @@ export default {
 }
 
 .time-label {
+  font-weight: 400;
   font-size: 26rpx;
   color: #999999;
+  line-height: 37rpx;
   margin-top: 8rpx;
 }
 
@@ -524,7 +1011,7 @@ export default {
 }
 
 .time-block.active .time-value-picker {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .time-separator {
@@ -560,7 +1047,8 @@ export default {
   gap: 50rpx;
 }
 
-.btn-cancel-large, .btn-confirm-large {
+.btn-cancel-large,
+.btn-confirm-large {
   font-size: 34rpx;
   flex: 1;
   font-weight: 400;
@@ -570,7 +1058,7 @@ export default {
   border: none;
   width: 290rpx;
   height: 86rpx;
-  background: linear-gradient( 180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(135deg, #FF4767, #FF6B8A);
   border-radius: 43rpx;
 }
 
@@ -590,7 +1078,7 @@ export default {
 }
 
 .btn-confirm-large {
-  background: #E8101E;
+  background: linear-gradient(135deg, #FF4767, #FF6B8A);
   color: white;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue
index d42af13..534ac96 100644
--- a/pages/shop/buy-order.vue
+++ b/pages/shop/buy-order.vue
@@ -13,32 +13,41 @@
 			<scroll-view scroll-y class="order-scroll" @scrolltolower="loadMore" refresher-enabled
 				:refresher-triggered="isRefreshing" @refresherrefresh="onRefresh">
 				<view class="order-item" v-for="(order, index) in orderList" :key="index">
-					<!-- 订单编号和状态 -->
-					<view class="order-header">
-						<view class="order-tag">
-							<text
-								class="order-tag-text">{{order.order_kind == 1 ? '到家' : order.order_kind == 2 ? '到店' : ''}}</text>
+					<!-- 顶部：订单编号 + 状态 -->
+					<view class="order-top">
+						<text class="order-number">服务时段：{{getPeriodTime(order)}}</text>
+						<view class="order-status-badge" :class="{
+							'order-status-badge2': order.state > 4 && order.state !== 7,
+							'order-status-badge3': order.state === 7
+						}">
+							{{ getStatusText(order.state) }}
 						</view>
-						<text class="order-number">订单编号：{{order.number}}</text>
-						<text class="order-status"
-							:class="order.statusClass">{{order.state == 1 ? '待支付' : order.state == 2 ? '待接单' : order.state == 3 ? '待服务' : order.state == 4 ? '待完成' : order.state == 5 ? '已完成' : order.state == 6 ? '待评价' : order.state == 7 ? '已取消' : ''}}</text>
 					</view>
 
 					<!-- 订单内容 -->
 					<view class="order-content" @click="goDetail(order)">
-						<image v-if="order.order_photo" :src="order.order_photo[0]" mode="aspectFill"
-							class="service-image"></image>
+						<image v-if="order.order_photo && order.order_photo.length" :src="order.order_photo[0]"
+							mode="aspectFill" class="service-image"></image>
 						<view class="service-image" v-else></view>
+
 						<view class="service-info">
-							<text class="service-name">{{order.server_title}}</text>
-							<view class="service-time" v-if="order.order_kind == 1">
-								<image src="/static/images/time_icon.png" class="time-icon"></image>
-								<text>{{order.reservation_time}}</text>
+							<view class="service-name">{{order.server_title}}</view>
+
+							<view class="service-time" v-if="getDisplayTime(order)">
+								<text class="label-text">下单时间:</text>
+								<text class="value-text">{{ getDisplayTime(order) }}</text>
 							</view>
-							<view class="service-address" v-if="order.order_kind == 1">
+
+							<view class="service-address" v-if="order.order_kind == 1 && getFullAddress(order)">
 								<image src="/static/images/position_icon.png" class="location-icon"></image>
-								<text>{{Object.assign({},order.reservation_address_arr).dependency}}{{Object.assign({},order.reservation_address_arr).address}}
-								</text>
+								<text class="address-text">{{ getFullAddress(order) }}</text>
+							</view>
+
+							<view class="price-row">
+								<text class="price-symbol">¥</text>
+								<text class="price-now">{{ getDisplayPrice(order) }}</text>
+								<text class="price-old"
+									v-if="getOriginalPrice(order)">{{ getOriginalPrice(order) }}</text>
 							</view>
 						</view>
 					</view>
@@ -50,26 +59,32 @@
 								v-if="order.state == 5 || order.state == 6 || order.state == 7"></image>
 						</view>
 						<view class="action-right">
-							<text class="action-btn contact" @click="cancelService(order)"
-								v-if="order.state == 1">取消订单</text>
-							<text class="action-btn contact" @click="refoundService(order)"
-								v-if="order.state == 2 || order.state == 3">申请退款</text>
-							<text class="action-btn contact" @click="contactService(order.order_shopphone)"
-								v-if="order.state != 7 || order.state!=2">联系客服</text>
-							<text class="action-btn primary" v-if="order.state == 1"
-								@click="payOrder(order)">立即支付</text>
-							<text class="action-btn review" v-if="order.state == 6"
-								@click="reviewOrder(order)">评价</text>
-							<text class="action-btn again"
+							<text class="action-btn gray-btn" @click="cancelService(order)" v-if="order.state == 1">
+								取消订单
+							</text>
+							<text class="action-btn gray-btn" @click="refoundService(order)"
+								v-if="order.state == 2 || order.state == 3">
+								申请退款
+							</text>
+							<!-- <text class="action-btn gray-btn" @click="contactService(order.order_shopphone)"
+								v-if="order.state != 7 && order.state != 2">
+								联系客服
+							</text> -->
+							<text class="action-btn red-btn" v-if="order.state == 1" @click="payOrder(order)">
+								立即支付
+							</text>
+							<text class="action-btn red-btn" v-if="order.state == 6" @click="reviewOrder(order)">
+								评价
+							</text>
+							<text class="action-btn gray-btn"
 								v-if="order.state == 5 || order.state == 6 || order.state == 7"
-								@click="orderAgain(order)">再来一单</text>
-							<!-- <text 
-              class="action-btn again" 
-              v-if="order.state == 5 && order.appeal == 1"
-              @click="addComplaint(order)"
-            >投诉</text> -->
-							<text class="action-btn again" v-if="order.state == 5 && order.appeal == 2"
-								@click="lookComplaint(order)">查看投诉</text>
+								@click="orderAgain(order)">
+								再次购买
+							</text>
+							<text class="action-btn gray-btn" v-if="order.state == 5 && order.appeal == 2"
+								@click="lookComplaint(order)">
+								查看投诉
+							</text>
 						</view>
 					</view>
 				</view>
@@ -86,14 +101,13 @@
 				</view>
 			</scroll-view>
 		</view>
+
 		<view class="nologin_part" v-else>
 			<image src="/static/images/no_login.png" class="nologin_icon" mode="aspectFit"></image>
 			<view class="btn-login">
 				<text class="login-text" @click="goLogin">前去登录</text>
 			</view>
 		</view>
-
-
 	</view>
 </template>
 
@@ -104,6 +118,7 @@
 	import {
 		debounce
 	} from '@/utils/debounce.js'
+
 	export default {
 		data() {
 			return {
@@ -131,7 +146,6 @@
 					id: 7,
 					title: '已取消'
 				}],
-				// ,{id: 6,title: '待评价'}
 				currentTab: 0,
 				isRefreshing: false,
 				hasMore: true,
@@ -145,7 +159,6 @@
 		},
 		onLoad() {
 			// this.loadOrders();
-
 		},
 		async onShow() {
 			this.isLogin = uni.getStorageSync('accessToken') ? true : false;
@@ -160,12 +173,42 @@
 			this.loadOrders();
 		},
 		methods: {
+			getPeriodTime(order) {
+				const reservationTime = order.reservation_time;
+				const serverTime = order.server_time;
+
+				if (!reservationTime || !serverTime) {
+					return order.create_time || order.createtime || order.add_time || '';
+				}
+
+				// 兼容 iOS：将 "2026-04-29 15:50:00" 转换为 "2026/04/29 15:50:00"
+				const formattedTime = reservationTime.replace(/-/g, '/');
+				const startDate = new Date(formattedTime);
+
+				if (isNaN(startDate.getTime())) {
+					return order.create_time || order.createtime || order.add_time || '';
+				}
+
+				// 格式化开始时间
+				const year = startDate.getFullYear();
+				const month = String(startDate.getMonth() + 1).padStart(2, '0');
+				const day = String(startDate.getDate()).padStart(2, '0');
+				const startHour = String(startDate.getHours()).padStart(2, '0');
+				const startMinute = String(startDate.getMinutes()).padStart(2, '0');
+
+				// 计算结束时间
+				const endDate = new Date(startDate.getTime() + serverTime * 60 * 1000);
+				const endHour = String(endDate.getHours()).padStart(2, '0');
+				const endMinute = String(endDate.getMinutes()).padStart(2, '0');
+
+				// 返回格式：YYYY-MM-DD HH:mm - HH:mm
+				return `${year}-${month}-${day} ${startHour}:${startMinute} - ${endHour}:${endMinute}`;
+			},
 			// 切换标签
 			switchTab(index) {
 				this.currentTab = index;
 				this.orderList = [];
 				this.formData.page = 1;
-				// TODO: 根据当前标签加载对应订单数据
 				if (this.currentTab != 0) {
 					this.formData.state = this.currentTab;
 				} else {
@@ -193,13 +236,13 @@
 				this.isRefreshing = true
 				this.formData.page = 1;
 				this.orderList = [];
+				this.hasMore = true;
 				this.loadOrders()
 			},
 
 			// 加载更多
 			loadMore() {
 				if (!this.hasMore) return
-				// TODO: 加载更多订单数据
 				this.loadOrders();
 			},
 
@@ -211,6 +254,45 @@
 				})
 			},
 
+			getStatusText(state) {
+				const map = {
+					1: '待支付',
+					2: '待接单',
+					3: '待服务',
+					4: '服务中',
+					5: '已完成',
+					6: '待评价',
+					7: '已取消'
+				}
+				return map[state] || ''
+			},
+
+			getDisplayTime(order) {
+				return order.create_time || order.createtime || order.add_time || order.reservation_time || ''
+			},
+
+			getDisplayPrice(order) {
+				const price = Number(order.pay_money) || Number(order.order_money) || 0
+				
+				return Number(price).toFixed(2)
+			},
+
+			getOriginalPrice(order) {
+				const orderMoney = Number(order.order_money || 0)
+				const payMoney = Number(order.pay_money || 0)
+				if (orderMoney > 0 && payMoney > 0 && orderMoney !== payMoney) {
+					return orderMoney.toFixed(2)
+				}
+				return ''
+			},
+
+			getFullAddress(order) {
+				const arr = order.reservation_address_arr || {}
+				const dependency = arr.dependency || ''
+				const address = arr.address || ''
+				return `${dependency}${address}`
+			},
+
 			// 删除订单
 			deleteOrder: debounce(async function(order) {
 				uni.showModal({
@@ -218,7 +300,6 @@
 					content: '确定要删除该订单吗？',
 					success: (res) => {
 						if (res.confirm) {
-							// TODO: 删除订单
 							request.post('/sj/deleteorder', {
 								id: order.id,
 								sjid: this.sjid
@@ -229,6 +310,7 @@
 								})
 								this.formData.page = 1;
 								this.orderList = [];
+								this.hasMore = true;
 								this.loadOrders();
 							})
 						}
@@ -249,63 +331,14 @@
 					});
 				});
 			},
+
 			// 联系客服
 			async contactService(phone) {
-				// TODO: 实现联系客服功能
 				uni.navigateTo({
 					url: '/pages/contact/contact'
 				})
-				//  const systemInfo = uni.getSystemInfoSync()
-				//  if(systemInfo.platform === 'ios') {
-				//  	uni.makePhoneCall({
-				//  		phoneNumber: phone //仅为示例
-				//  	})
-				//  }else {
-				//  	let permission = '';
-				//  	if(systemInfo.platform === 'ios') {
-				//  		permission = 'phone'
-				//  	}else {
-				//  		permission = 'android.permission.CALL_PHONE'
-				//  	}
-				// this.isShowPer = true;
-				//  	const firstRequest = !plus.storage.getItem(`perm_${permission}`)
-				//  	if(firstRequest) {
-				//  		this.isShowPer = true;
-				//  	}
-				//  	// 1. 检查权限
-				//  	const { granted } = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-				//  	if (granted) {
-				//   this.isShowPer = false;
-				//  	  uni.makePhoneCall({
-				//  	  	phoneNumber: phone //仅为示例
-				//  	  })
-				//  	  return;
-				//  	}
-				//  	this.isShowPer = false;
-				//  	// 2. 显示权限说明弹窗
-				//  	const confirm = await this.showPermissionDialog(
-				//  	  '拨打电话权限申请',
-				//  	  '我们需要拨打电话权限，方便您联系商家或平台'
-				//  	);
-
-				//  	if (!confirm) return;
-
-				//  	// 3. 请求权限
-				//  	const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-				//  	console.log('result',result)
-				//  	if (result) {
-				//  	  uni.makePhoneCall({
-				//  	  	phoneNumber: phone //仅为示例
-				//  	  })
-				//  	  return;
-				//  	} else {
-				//  	  locationService.openAppSettings();
-				//  	  return;
-				//  	  // uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-				//  	}
-				//  }
-
 			},
+
 			// 取消订单
 			async cancelService(order) {
 				console.log(order)
@@ -314,7 +347,6 @@
 					content: '确定要取消该订单吗？',
 					success: (res) => {
 						if (res.confirm) {
-							// TODO: 取消订单
 							let data = {
 								orderNo: order.number,
 								amount: order.pay_money,
@@ -327,6 +359,7 @@
 								})
 								this.formData.page = 1;
 								this.orderList = [];
+								this.hasMore = true;
 								this.loadOrders();
 							}).catch(err => {
 								console.log(err)
@@ -335,6 +368,7 @@
 					}
 				})
 			},
+
 			// 申请退款
 			async refoundService(order) {
 				uni.showModal({
@@ -342,7 +376,6 @@
 					content: '确定申请退款？退款后则订单取消！',
 					success: (res) => {
 						if (res.confirm) {
-							// TODO: 申请退款
 							let data = {
 								orderNo: order.number,
 								amount: order.pay_money,
@@ -365,6 +398,7 @@
 								})
 								this.formData.page = 1;
 								this.orderList = [];
+								this.hasMore = true;
 								this.loadOrders();
 							}).catch(err => {
 								console.log(err)
@@ -376,7 +410,6 @@
 
 			// 支付订单
 			payOrder(order) {
-				// TODO: 实现支付功能
 				uni.navigateTo({
 					url: `/pages/shop/pay-order?id=${order.id}&money=${order.order_money}&title=${order.server_title}&number=${order.number}`
 				})
@@ -391,25 +424,26 @@
 
 			// 再次下单
 			orderAgain(order) {
-				// TODO: 实现再次下单功能
 				uni.navigateTo({
 					url: '/pages/shop/service-detail?id=' + order.server_id
 				})
 			},
+
 			// 投诉
 			addComplaint(order) {
 				uni.navigateTo({
 					url: '/pages/complaint/add-complaint?number=' + order.number
 				})
 			},
+
 			// 查看投诉
 			lookComplaint(order) {
 				uni.navigateTo({
 					url: '/pages/complaint/detail?number=' + order.number
 				})
 			},
+
 			goLogin() {
-				// uni.oprPresentLogin()
 				uni.navigateTo({
 					url: '/pages/blogPopup/blogPopup'
 				});
@@ -457,7 +491,7 @@
 		left: 50%;
 		bottom: 0;
 		transform: translateX(-50%);
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
@@ -471,113 +505,155 @@
 
 	.order-item {
 		background-color: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		margin-bottom: 24rpx;
 		padding: 24rpx;
 		box-sizing: border-box;
+		position: relative;
 	}
 
-	.order-header {
-		display: flex;
-		align-items: center;
-		margin-bottom: 34rpx;
-	}
-
-	.order-tag {
-		width: 74rpx;
-		height: 38rpx;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-		border-radius: 19rpx;
-		margin-right: 8rpx;
-		background-color: rgba(232, 16, 30, 0.2);
-	}
-
-	.order-tag-text {
-		color: #E8101E;
-		font-size: 24rpx;
+	.order-top {
+		position: relative;
+		padding-right: 120rpx;
+		min-height: 40rpx;
 	}
 
 	.order-number {
-		flex: 1;
-		font-size: 24rpx;
-		color: #666666;
-	}
-
-	.order-status {
+		display: block;
 		font-size: 28rpx;
-		font-weight: 500;
-		background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5349af61-d67a-4ecf-91ce-6e4f05ad5edb.png');
+		color: #333333;
+		line-height: 40rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.order-status-badge {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #FF4767;
+		text-align: left;
+		font-style: normal;
+		position: absolute;
+		right: -24rpx;
+		top: -24rpx;
+		background-image: url("/static/images/icons/tabBj.png");
+		background-size: 100% auto;
+		background-position: center top;
 		background-repeat: no-repeat;
-		background-size: 100%;
-		height: 49rpx;
 		width: 128rpx;
-		padding-left: 30rpx;
+		height: 49rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
 	}
 
-	.status-pending {
-		color: #E8101E;
+	.order-status-badge2 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #333333;
 	}
 
-	.status-cancelled {
-		color: #E8101E;
-	}
-
-	.status-completed {
-		color: #E8101E;
+	.order-status-badge3 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #999999 !important;
 	}
 
 	.order-content {
 		display: flex;
-		margin-bottom: 24rpx;
+		align-items: flex-start;
+		margin-top: 20rpx;
 	}
 
 	.service-image {
-		width: 182rpx;
-		height: 182rpx;
-		border-radius: 16rpx;
-		margin-right: 24rpx;
-		background-color: #000000;
+		width: 162rpx;
+		height: 162rpx;
+		border-radius: 24rpx;
+		margin-right: 20rpx;
+		background-color: #F5F5F5;
+		flex-shrink: 0;
 	}
 
 	.service-info {
 		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-start;
 	}
 
 	.service-name {
-		font-size: 24rpx;
+		font-size: 30rpx;
 		color: #333333;
-		font-weight: 500;
+		line-height: 42rpx;
+		margin-bottom: 12rpx;
+		word-break: break-all;
 	}
 
-	.service-time,
-	.service-address {
+	.service-time {
 		display: flex;
 		align-items: center;
 		font-size: 24rpx;
+		line-height: 34rpx;
+		margin-bottom: 8rpx;
+	}
+
+	.label-text {
+		color: #666666;
+	}
+
+	.value-text {
 		color: #999999;
-		font-weight: 500;
-		margin-top: 8rpx;
+		margin-left: 8rpx;
+	}
+
+	.service-address {
+		display: flex;
 		align-items: flex-start;
+		margin-bottom: 10rpx;
 	}
 
-	.text-overflow-1 {
-		white-space: normal !important;
-		word-break: break-word !important;
-		overflow: visible !important;
-		text-overflow: clip !important;
-		flex: 1;
-	}
-
-	.time-icon,
 	.location-icon {
 		width: 24rpx;
 		height: 24rpx;
-		margin-right: 4rpx;
-		flex-shrink: 0;
+		margin-right: 6rpx;
 		margin-top: 4rpx;
+		flex-shrink: 0;
+	}
+
+	.address-text {
+		font-size: 24rpx;
+		color: #999999;
+		line-height: 34rpx;
+		word-break: break-all;
+	}
+
+	.price-row {
+		display: flex;
+		align-items: baseline;
+		margin-top: 6rpx;
+	}
+
+	.price-symbol {
+		font-size: 24rpx;
+		color: #FF0037;
+		line-height: 1;
+	}
+
+	.price-now {
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #FF0037;
+		line-height: 1;
+		margin-left: 2rpx;
+	}
+
+	.price-old {
+		font-size: 22rpx;
+		color: #999999;
+		text-decoration: line-through;
+		margin-left: 10rpx;
+		line-height: 1;
 	}
 
 	.order-actions {
@@ -586,6 +662,12 @@
 		align-items: center;
 		border-top: 1rpx solid #EEEEEE;
 		padding-top: 24rpx;
+		margin-top: 24rpx;
+	}
+
+	.action-left {
+		display: flex;
+		align-items: center;
 	}
 
 	.delete-icon {
@@ -596,41 +678,33 @@
 	.action-right {
 		display: flex;
 		align-items: center;
+		flex-wrap: wrap;
+		justify-content: flex-end;
 	}
 
 	.action-btn {
-		display: inline-block;
-		width: 128rpx;
-		height: 48rpx;
-		line-height: 48rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		min-width: 128rpx;
+		height: 60rpx;
+		padding: 0 28rpx;
 		margin-left: 16rpx;
-		text-align: center;
-		font-size: 28rpx;
-		border-radius: 24rpx;
+		border-radius: 30rpx;
 		font-size: 24rpx;
+		box-sizing: border-box;
 	}
 
-	.action-btn.contact {
+	.gray-btn {
 		background-color: #FFFFFF;
 		border: 1rpx solid #999999;
 		color: #333333;
 	}
 
-	.action-btn.primary {
-		background-color: #E8101E;
-		color: #FFFFFF;
-	}
-
-	.action-btn.review {
-		background-color: rgba(252, 67, 124, 0.40);
-		border: 1rpx solid #E8101E;
-		color: #FFFFFF;
-	}
-
-	.action-btn.again {
+	.red-btn {
 		background-color: #FFFFFF;
-		border: 1rpx solid #999999;
-		color: #666666;
+		border: 1rpx solid #FF4767;
+		color: #FF4767;
 	}
 
 	.nologin_part {
@@ -688,10 +762,11 @@
 	}
 
 	/* #endif */
+
 	/* 平台适配 */
 	/* #ifdef H5 */
 	/* .order-list {
-  padding-bottom: env(safe-area-inset-bottom);
-} */
+		padding-bottom: env(safe-area-inset-bottom);
+	} */
 	/* #endif */
 </style>
\ No newline at end of file
diff --git a/pages/shop/buy-service.vue b/pages/shop/buy-service.vue
index a2918dc..714cc1a 100644
--- a/pages/shop/buy-service.vue
+++ b/pages/shop/buy-service.vue
@@ -523,7 +523,7 @@
 	}
 
 	.main-tab.active .tab-text {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -535,7 +535,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 3rpx;
 	}
 
@@ -570,11 +570,11 @@
 	}
 
 	.icon-tab.active .icon-text {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.icon-tab.active .icon-img {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 	}
 
 	.service-list {
@@ -633,7 +633,7 @@
 	}
 
 	.time-option.active .time-text {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -644,7 +644,7 @@
 
 	.time-discount {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		padding: 4rpx 12rpx;
 		background-color: #fff5f6;
 		border-radius: 20rpx;
@@ -685,7 +685,7 @@
 	}
 
 	.filter-item.active .filter-item-text {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.sq-icon {
@@ -750,7 +750,7 @@
 		text-align: center;
 		line-height: 50rpx;
 		border-radius: 26rpx;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		font-size: 24rpx;
 		color: #3d3d3d;
 		box-sizing: border-box;
@@ -759,9 +759,9 @@
 	.price-tag.active,
 	.sort-tag.active,
 	.star-tag.active {
-		background-color: #E8101E;
+		background-color: #FF4767;
 		color: #ffffff;
-		border-color: #E8101E;
+		border-color: #FF4767;
 	}
 
 	.price-input {
@@ -776,7 +776,7 @@
 		height: 52rpx;
 		line-height: 50rpx;
 		text-align: center;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		border-radius: 26rpx;
 		font-size: 24rpx;
 		color: #3d3d3d;
@@ -806,12 +806,12 @@
 
 	.reset-btn {
 		background-color: #ffffff;
-		border: 1rpx solid #E8101E;
-		color: #E8101E;
+		border: 1rpx solid #FF4767;
+		color: #FF4767;
 	}
 
 	.confirm-btn {
-		background-color: #E8101E;
+		background-color: #FF4767;
 		color: #ffffff;
 	}
 
diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue
index 3e9439d..3a4a8b3 100644
--- a/pages/shop/buyorder-detail.vue
+++ b/pages/shop/buyorder-detail.vue
@@ -1,851 +1,1044 @@
 <template>
-  <view class="detail-page">
-    <!-- 顶部导航栏 -->
-    <custom-navbar 
-      title="订单详情" 
-      :show-back="true"
-	  title-color="#333333"
-	  backgroundColor="transparent"
-    ></custom-navbar>
-    <view class="content-part">
-    <!-- 订单状态 -->
-    <view class="status-section">
-      <text class="status-text">{{orderInfo.state == 1 ? '待支付' : orderInfo.state == 2 ? '待接单' : orderInfo.state == 3 ? '待服务' : orderInfo.state == 4 ? '待完成' : orderInfo.state == 5 ? '已完成' : orderInfo.state == 6 ? '待评价' : orderInfo.state == 7 ? '已取消' : ''}}</text>
-    </view>
-    
-    <!-- 到家订单 客户以及手艺人信息 -->
-    <view class="service-card">
-      <view class="location-info">
-        <image src="/static/images/gohome_location.png" class="location-icon"></image>
-        <view class="address-info">
-          <view class="name-phone">
-            <text class="name">{{userInfo.name}}</text>
-            <text class="phone">{{userInfo.account}}</text>
-          </view>
-          <text class="address">{{userInfo.dependency}}{{userInfo.address}}</text>
-        </view>
-      </view>
-	  <image src="/static/images/boder_icon.png"
-			 mode="aspectFill"
-			 class="divider"></image>
-      <view class="staff-info">
-        <image :src="user_syr.head_photo" mode="aspectFill" class="staff-avatar"></image>
-        <view class="staff-detail">
-          <text class="staff-name">{{user_syr.name}}</text>
-          <view class="rating">
-            <!-- <image 
+	<view class="detail-page">
+		<!-- 顶部导航栏 -->
+		<custom-navbar title="订单详情" :show-back="true" title-color="#333333"
+			backgroundColor="transparent"></custom-navbar>
+		<view class="content-part">
+			<!-- 订单状态 -->
+			<view class="status-section2" v-if="orderInfo.state == '2' || orderInfo.state == '3'">
+				<view class="service-code">
+					<text class="service-code-value">{{ orderInfo.server_code }}</text>
+					<image class="service-code-label" mode="widthFix"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e306ce60-c10c-4eec-a8bf-1b064fc21a32.png" />
+				</view>
+				<view class="status-row">
+					<image class="status-section-image" mode="widthFix"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/27783709-3bda-472a-ab6a-824ed4b11d2a.png" />
+					<text class="status-text-red">
+						{{ stateItem.text }}
+						<text v-if="orderInfo.team_buy_order_state">{{
+			            ` (${getGroupType(orderInfo.team_buy_order_state)})`
+			          }}</text>
+						<text class="status-text-normal">，请上门/到店后出示服务码</text>
+					</text>
+				</view>
+			</view>
+			<view v-else class="status-section">
+				<image class="status-section-image" mode="widthFix" :src="stateItem.icon" />
+				<text class="status-text">{{ stateItem.text }}
+					<text v-if="orderInfo.team_buy_order_state">{{
+			            ` (${getGroupType(orderInfo.team_buy_order_state)})`
+			          }}</text>
+				</text>
+			</view>
+
+			<!-- 到家订单 客户以及手艺人信息 -->
+			<view class="service-card">
+				<view class="location-info">
+					<image src="/static/images/gohome_location.png" class="location-icon"></image>
+					<view class="address-info">
+						<view class="name-phone">
+							<text class="name">{{userInfo.name}}</text>
+							<text class="phone">{{userInfo.account}}</text>
+						</view>
+						<text class="address">{{userInfo.dependency}}{{userInfo.address}}</text>
+					</view>
+				</view>
+				<image src="/static/images/boder_icon.png" mode="aspectFill" class="divider"></image>
+				<view class="staff-info">
+					<image :src="user_syr.head_photo" mode="aspectFill" class="staff-avatar"></image>
+					<view class="staff-detail">
+						<text class="staff-name">{{user_syr.name}}</text>
+						<view class="rating">
+							<!-- <image 
               v-for="(star, index) in 5" 
               :key="index"
               src="/static/images/star.png" 
               class="star-icon"
             ></image> -->
-          </view>
-        </view>
-        <!-- <image src="/static/images/order_phone.png" class="phone-btn" @click="contactService(user_syr.account)"></image> -->
-      </view>
-    </view>
-	
-	
-    <!-- 预约信息 -->
-    <view class="booking-card">
-      <view class="card-header" v-if="orderInfo.order_kind == 1">
-        <text class="card-title">预约信息</text>
-		<view>
-			<text class="update-time">{{orderInfo.reservation_time}}</text>
-			<!-- <text class="update-change">更改时间</text> -->
-		</view>
-      </view>
-      <view class="service-item">
-        <image
-			:src="orderInfo.server_photo[0]"
-			v-if="orderInfo.server_photo && orderInfo.server_photo.length != 0"
-			mode="aspectFill"
-			class="service-image"></image>
-        <view class="service-info">
-          <text class="service-name text-overflow">{{orderInfo.server_title}}</text>
-          <text class="service-price">¥{{orderInfo.order_money}}</text>
-        </view>
-        <text class="service-count">×1</text>
-      </view>
-	  <view class="service-real">
-		<text class="real-lable">实际支付金额：</text>
-		<text class="real-price">￥{{orderInfo.pay_money}}</text>
-	  </view>
-    </view>
-    
-    <!-- 订单信息 -->
-    <view class="order-card">
-      <text class="card-title">订单信息</text>
-      <view class="info-item">
-        <text class="label">服务码</text>
-        <text class="value">{{orderInfo.server_code}}</text>
-      </view>
-      <view class="info-item">
-        <text class="label">订单编号</text>
-        <text class="value">{{orderInfo.number}}</text>
-      </view>
-      <view class="info-item">
-        <text class="label">下单时间</text>
-        <text class="value">{{orderInfo.add_time}}</text>
-      </view>
-      <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 7">
-        <text class="label">开始服务时间</text>
-        <text class="value">{{orderInfo.server_start_time}}</text>
-      </view>
-      <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 4 && orderInfo.state != 7">
-        <text class="label">服务完成时间</text>
-        <text class="value">{{orderInfo.server_end_time}}</text>
-      </view>
-    </view>
-    </view>
-    <!-- 底部按钮 -->
-	<view class="bottom-buttons">
-		<view class="contact-button">
-		  <!-- <image src="/static/images/tell_icon.png" class="tell-icon"></image>
-		  <text class="contact-text">联系TA</text> -->
-		</view>
-		<view class="handel-button btn-border"
-			  @click="cancelService"
-			   v-if="orderInfo.state == 1">
-		  <text class="button-text">取消订单</text>
-		</view>
-		<view class="handel-button btn-border"
-			  @click="refoundService"
-			   v-if="orderInfo.state == 2 || orderInfo.state == 3">
-		  <text class="button-text">申请退款</text>
-		</view>
-		<view class="handel-button btn-bg"
-			  @click="payOrder"
-			   v-if="orderInfo.state == 1">
-		  <text class="button-text">立即支付</text>
-		</view>
-		<view class="handel-button btn-bg"
-			  @click="reviewOrder"
-			   v-if="orderInfo.state == 6">
-		  <text class="button-text">评价</text>
-		</view>
-		<view class="handel-button btn-bg"
-			  @click="orderAgain"
-			   v-if="orderInfo.state == 5 || orderInfo.state == 6">
-		  <text class="button-text">再来一单</text>
-		</view>
-	</view>
-	
-	<!-- 获取权限提示匡内容 -->
-	<view class="permission"
-		  :class="{ transform: isShowPer }">
-		<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
-		<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
-	</view>
+						</view>
+					</view>
+					<!-- <image src="/static/images/order_phone.png" class="phone-btn" @click="contactService(user_syr.account)"></image> -->
+				</view>
+			</view>
 
-  </view>
+
+			<!-- 预约信息 -->
+			<view class="booking-card">
+				<view class="card-header" v-if="orderInfo.order_kind == 1">
+					<text class="card-title">预约信息</text>
+					<view>
+						<text class="update-time">{{orderInfo.reservation_time}}</text>
+						<!-- <text class="update-change">更改时间</text> -->
+					</view>
+				</view>
+				<view class="service-item">
+					<image :src="orderInfo.server_photo[0]"
+						v-if="orderInfo.server_photo && orderInfo.server_photo.length != 0" mode="aspectFill"
+						class="service-image"></image>
+					<view class="service-info">
+						<text class="service-name text-overflow">{{orderInfo.server_title}}</text>
+						<text class="service-price">¥{{orderInfo.order_money}}</text>
+					</view>
+					<text class="service-count">×1</text>
+				</view>
+				<view class="service-real" v-if="orderInfo.state==7 || orderInfo.state==1">
+					<text class="real-lable">应付金额：</text>
+					<text class="real-price">￥{{orderInfo.order_money}}</text>
+				</view>
+				<view class="service-real" v-else>
+					<text class="real-lable">实际支付金额：</text>
+					<text class="real-price">￥{{orderInfo.pay_money}}</text>
+				</view>
+			</view>
+
+			<!-- 订单信息 -->
+			<view class="order-card">
+				<text class="card-title">订单信息</text>
+				<view class="info-item">
+					<text class="label">订单编号</text>
+					<text class="value">{{orderInfo.number}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">下单时间</text>
+					<text class="value">{{orderInfo.add_time}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">服务时长</text>
+					<text class="value">{{ orderInfo.server_time }}分钟</text>
+				</view>
+				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_kind">
+					<text class="label">支付方式</text>
+					<text class="value">{{
+						orderInfo.pay_kind == 1
+						? "账户余额"
+						: orderInfo.pay_kind == 2
+						? "微信支付"
+						: orderInfo.pay_kind == 3
+						? "支付宝支付"
+						: ""
+					}}</text>
+				</view>
+				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_time">
+					<text class="label">支付时间</text>
+					<text class="value">{{ orderInfo.pay_time }}</text>
+				</view>
+				<view class="info-item" v-if="orderInfo.state >= 3 && orderInfo.get_time">
+					<text class="label">接单时间</text>
+					<text class="value">{{ orderInfo.get_time }}</text>
+				</view>
+				<view class="info-item"
+					v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 7">
+					<text class="label">开始服务时间</text>
+					<text class="value">{{orderInfo.server_start_time}}</text>
+				</view>
+				<view class="info-item"
+					v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 4 && orderInfo.state != 7">
+					<text class="label">服务完成时间</text>
+					<text class="value">{{orderInfo.server_end_time}}</text>
+				</view>
+			</view>
+		</view>
+		<!-- 底部按钮 -->
+		<view class="bottom-buttons">
+			<view class="contact-button">
+				<!-- <image src="/static/images/tell_icon.png" class="tell-icon"></image>
+		  <text class="contact-text">联系TA</text> -->
+			</view>
+			<view class="handel-button btn-border" @click="cancelService" v-if="orderInfo.state == 1">
+				<text class="button-text">取消订单</text>
+			</view>
+			<view class="handel-button btn-border" @click="refoundService"
+				v-if="orderInfo.state == 2 || orderInfo.state == 3">
+				<text class="button-text">申请退款</text>
+			</view>
+			<view class="handel-button btn-bg" @click="payOrder" v-if="orderInfo.state == 1">
+				<text class="button-text">立即支付</text>
+			</view>
+			<view class="handel-button btn-bg" @click="reviewOrder" v-if="orderInfo.state == 6">
+				<text class="button-text">评价</text>
+			</view>
+			<view class="handel-button btn-bg" @click="orderAgain" v-if="orderInfo.state == 5 || orderInfo.state == 6">
+				<text class="button-text">再次购买</text>
+			</view>
+		</view>
+
+		<!-- 获取权限提示匡内容 -->
+		<view class="permission" :class="{ transform: isShowPer }">
+			<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
+			<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
+		</view>
+
+	</view>
 </template>
 
 <script>
-import request from '../../utils/request'
-import _public from '../../utils/public'
-import locationService from '../../utils/locationService';
-import permissionUtils from '../../utils/per'
-export default {
-  data() {
-    return {
-	  isShowPer: false,
-	  id: '',
-      staffInfo: {
-        avatar: '/static/images/staff.jpg',
-        name: '中医理疗谢飞',
-        rating: 5
-      },
-	  userInfo: {},
-      orderInfo: {},
-	  user_syr: {}
-    }
-  },
-  async onLoad(options) {
-	this.id = options.id
-	if(this.id) {
-		const userInfo = await request.post('/user/getuser',{type: 3});
-		this.userInfo = userInfo.data;
-		// 请求订单详情
-		this.getOrderDetail()
-	}
-  	
-  },
-  methods: {
-	getOrderDetail() {
-	  request.post('/sj/sjorderdetail',{id: this.id,sjid: this.userInfo.id}).then(res=>{
-	  	this.orderInfo = res.data;
-	  	this.user_syr = res.data.user_syr;
-	  	console.log(this.orderInfo)
-	  })
-	},
-	// 显示权限说明弹窗
-	showPermissionDialog(title, content) {
-	  return new Promise((resolve) => {
-		uni.showModal({
-		  title,
-		  content,
-		  confirmText: '去开启',
-		  success(res) {
-			resolve(res.confirm);
-		  }
-		});
-	  });
-	},
-    // 拨打电话
-    async makeCall() {
-	  const systemInfo = uni.getSystemInfoSync()
-	  if(systemInfo.platform === 'ios') {
-	  	uni.makePhoneCall({
-	  		phoneNumber: this.orderInfo.customer.phone //仅为示例
-	  	})
-	  }else {
-	  	let permission = '';
-	  	if(systemInfo.platform === 'ios') {
-	  		permission = 'phone'
-	  	}else {
-	  		permission = 'android.permission.CALL_PHONE'
-	  	}
-	  	// const firstRequest = !plus.storage.getItem(`perm_${permission}`)
-	  	// if(firstRequest) {
-	  	// 	this.isShowPer = true;
-	  	// }
-		this.isShowPer = true;
-	  	// 1. 检查权限
-	  	const { granted } = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-	  	if (granted) {
-	  	  uni.makePhoneCall({
-	  	  	phoneNumber: this.orderInfo.customer.phone //仅为示例
-	  	  })
-	  	  return;
-	  	}
-	  	this.isShowPer = false;
-	  	// 2. 显示权限说明弹窗
-	  	const confirm = await this.showPermissionDialog(
-	  	  '拨打电话权限申请',
-	  	  '我们需要拨打电话权限，方便您联系商家或平台'
-	  	);
-	  	
-	  	if (!confirm) return;
-	  	
-	  	// 3. 请求权限
-	  	const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-	  	console.log('result',result)
-	  	if (result) {
-	  	  uni.makePhoneCall({
-	  	  	phoneNumber: this.orderInfo.customer.phone //仅为示例
-	  	  })
-	  	  return;
-	  	} else {
-	  	  locationService.openAppSettings();
-	  	  return;
-	  	  // uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-	  	}
-	  }
-	  
-      // uni.makePhoneCall({
-      //   phoneNumber: this.orderInfo.customer.phone
-      // })
-    },
-	// 联系客服
-	async contactService(phone) {
-	  // TODO: 实现联系客服功能
-	  // uni.navigateTo({
-	  // 	url: '/pages/contact/contact?phone='+phone
-	  // })
-	  const systemInfo = uni.getSystemInfoSync()
-	  if(systemInfo.platform === 'ios') {
-	  	uni.makePhoneCall({
-	  		phoneNumber: phone //仅为示例
-	  	})
-	  }else {
-	  	let permission = '';
-	  	if(systemInfo.platform === 'ios') {
-	  		permission = 'phone'
-	  	}else {
-	  		permission = 'android.permission.CALL_PHONE'
-	  	}
-		
-		this.isShowPer = true;
-	  	// const firstRequest = !plus.storage.getItem(`perm_${permission}`)
-	  	// if(firstRequest) {
-	  	// 	this.isShowPer = true;
-	  	// }
-	  	// 1. 检查权限
-	  	const { granted } = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-	  	if (granted) {
-	  	  uni.makePhoneCall({
-	  	  	phoneNumber: phone //仅为示例
-	  	  })
-	  	  this.isShowPer = false;
-	  	  return;
-	  	}
-	  	this.isShowPer = false;
-	  	// 2. 显示权限说明弹窗
-	  	const confirm = await this.showPermissionDialog(
-	  	  '拨打电话权限申请',
-	  	  '我们需要拨打电话权限，方便您联系商家或平台'
-	  	);
-	  	
-	  	if (!confirm) return;
-	  	
-	  	// 3. 请求权限
-	  	const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-	  	console.log('result',result)
-	  	if (result) {
-	  	  uni.makePhoneCall({
-	  	  	phoneNumber: phone //仅为示例
-	  	  })
-	  	  return;
-	  	} else {
-	  	  locationService.openAppSettings();
-	  	  return;
-	  	  // uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-	  	}
-	  }
-	  
-	  
-	},
-	// 取消订单
-	cancelService() {
-		uni.showModal({
-		  title: '取消订单',
-		  content: '确定要取消该订单吗？',
-		  success: (res) => {
-		    if (res.confirm) {
-		      // TODO: 取消订单
-			  let data = {
-				orderNo: this.orderInfo.number,
-				amount: this.orderInfo.pay_money,
-			  	sjid: this.userInfo.id
-			  }
-			  request.post('/sj/cancelorder',data).then(res=>{
-				if(res.state == 1) {
-				  uni.showToast({
-				  	title: '取消成功！',
-				  	icon: 'none'
-				  })
-				  this.getOrderDetail();
-				}else {
-				  uni.showToast({
-				  	title: res.msg,
-				  	icon: 'none'
-				  })
-				}
-			  	
-			  }).catch(err=>{
-				console.log(err)
-			  })
-		    }
-		  }
-		})
-		
-	},
-	
-	// 申请退款
-	refoundService() {
-		
-		uni.showModal({
-		  title: '申请退款',
-		  content: '确定申请退款？退款后则订单取消！',
-		  success: (res) => {
-		    if (res.confirm) {
-		      // TODO: 申请退款
-			  let data = {
-				orderNo: this.orderInfo.number,
-				amount: this.orderInfo.pay_money,
-			  	sjid: this.userInfo.id
-			  }
-			  let url = '';
-			  if(this.orderInfo.pay_kind == 1) {
-				url = ''
-			  }else if(this.orderInfo.pay_kind == 2) {
-				url = '/sj/selfwechatrefund'
-			  }else if(this.orderInfo.pay_kind == 3) {
-				url = '/sj/selfalirefund'
-			  }
-			  request.post(url,data).then(res=>{
-				console.log('申请退款接口',res)
-				uni.showToast({
-					title: '申请退款成功！',
-					icon: 'none'
+	import request from '../../utils/request'
+	import _public from '../../utils/public'
+	import locationService from '../../utils/locationService';
+	import permissionUtils from '../../utils/per'
+	export default {
+		data() {
+			return {
+				isShowPer: false,
+				id: '',
+				staffInfo: {
+					avatar: '/static/images/staff.jpg',
+					name: '中医理疗谢飞',
+					rating: 5
+				},
+				userInfo: {},
+				orderInfo: {},
+				user_syr: {}
+			}
+		},
+		async onLoad(options) {
+			this.id = options.id
+			if (this.id) {
+				const userInfo = await request.post('/user/getuser', {
+					type: 3
+				});
+				this.userInfo = userInfo.data;
+				// 请求订单详情
+				this.getOrderDetail()
+			}
+
+		},
+		computed: {
+			stateItem() {
+				const list = [{
+						text: "待支付",
+						icon: "/static/images/icons/pay.png",
+						state: "1"
+					},
+					{
+						text: "待接单",
+						icon: "/static/images/icons/pending.png",
+						state: "2",
+					},
+					{
+						text: "待服务",
+						icon: "/static/images/icons/pendingService.png",
+						state: "3",
+					},
+					{
+						text: "服务中",
+						icon: "/static/images/icons/pendingService.png",
+						state: "4",
+					},
+					{
+						text: "已完成",
+						icon: "/static/images/icons/payOk.png",
+						state: "5"
+					},
+					{
+						text: "待评价",
+						icon: "/static/images/icons/pending.png",
+						state: "6",
+					},
+					{
+						text: "已取消",
+						icon: "/static/images/evaluate/cancel.png",
+						state: "7"
+					},
+				];
+				const item = list.find((it) => it.state == this.orderInfo.state) || {};
+				return item;
+			},
+		},
+		methods: {
+			getGroupType(teamBuyOrderState) {
+				let list = [
+					{ id: 1, text: "拼团中" },
+					{ id: 2, text: "已成团" },
+					{ id: 3, text: "拼团失败" }
+				];
+				let name = list.find((it) => it.id == teamBuyOrderState)?.text;
+				return name;
+			},
+			getOrderDetail() {
+				request.post('/sj/sjorderdetail', {
+					id: this.id,
+					sjid: this.userInfo.id
+				}).then(res => {
+					this.orderInfo = res.data;
+					this.user_syr = res.data.user_syr;
+					console.log(this.orderInfo)
 				})
-				this.orderInfo = {};
-				this.getOrderDetail();
-			  }).catch(err=>{
-				console.log(err)
-			  })
-		    }
-		  }
-		})
-		
-	},
-	
-	// 支付订单
-	payOrder() {
-	  // TODO: 实现支付功能
-	  uni.navigateTo({
-	    url: `/pages/shop/pay-order?id=${this.orderInfo.id}&money=${this.orderInfo.order_money}&title=${this.orderInfo.server_title}&number=${this.orderInfo.number}`
-	  })
-	},
-	
-	// 评价订单
-	reviewOrder() {
-	  // uni.navigateTo({
-	  //   url: `/pages/order/pay?id=${this.orderInfo.id}`
-	  // })
-	},
-	
-	// 再次下单
-	orderAgain() {
-	  // TODO: 实现再次下单功能
-	  uni.navigateTo({
-	  	url: '/pages/shop/service-detail?id='+this.orderInfo.server_id
-	  })
+			},
+			// 显示权限说明弹窗
+			showPermissionDialog(title, content) {
+				return new Promise((resolve) => {
+					uni.showModal({
+						title,
+						content,
+						confirmText: '去开启',
+						success(res) {
+							resolve(res.confirm);
+						}
+					});
+				});
+			},
+			// 拨打电话
+			async makeCall() {
+				const systemInfo = uni.getSystemInfoSync()
+				if (systemInfo.platform === 'ios') {
+					uni.makePhoneCall({
+						phoneNumber: this.orderInfo.customer.phone //仅为示例
+					})
+				} else {
+					let permission = '';
+					if (systemInfo.platform === 'ios') {
+						permission = 'phone'
+					} else {
+						permission = 'android.permission.CALL_PHONE'
+					}
+					// const firstRequest = !plus.storage.getItem(`perm_${permission}`)
+					// if(firstRequest) {
+					// 	this.isShowPer = true;
+					// }
+					this.isShowPer = true;
+					// 1. 检查权限
+					const {
+						granted
+					} = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
+					if (granted) {
+						uni.makePhoneCall({
+							phoneNumber: this.orderInfo.customer.phone //仅为示例
+						})
+						return;
+					}
+					this.isShowPer = false;
+					// 2. 显示权限说明弹窗
+					const confirm = await this.showPermissionDialog(
+						'拨打电话权限申请',
+						'我们需要拨打电话权限，方便您联系商家或平台'
+					);
+
+					if (!confirm) return;
+
+					// 3. 请求权限
+					const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
+					console.log('result', result)
+					if (result) {
+						uni.makePhoneCall({
+							phoneNumber: this.orderInfo.customer.phone //仅为示例
+						})
+						return;
+					} else {
+						locationService.openAppSettings();
+						return;
+						// uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
+					}
+				}
+
+				// uni.makePhoneCall({
+				//   phoneNumber: this.orderInfo.customer.phone
+				// })
+			},
+			// 联系客服
+			async contactService(phone) {
+				// TODO: 实现联系客服功能
+				// uni.navigateTo({
+				// 	url: '/pages/contact/contact?phone='+phone
+				// })
+				const systemInfo = uni.getSystemInfoSync()
+				if (systemInfo.platform === 'ios') {
+					uni.makePhoneCall({
+						phoneNumber: phone //仅为示例
+					})
+				} else {
+					let permission = '';
+					if (systemInfo.platform === 'ios') {
+						permission = 'phone'
+					} else {
+						permission = 'android.permission.CALL_PHONE'
+					}
+
+					this.isShowPer = true;
+					// const firstRequest = !plus.storage.getItem(`perm_${permission}`)
+					// if(firstRequest) {
+					// 	this.isShowPer = true;
+					// }
+					// 1. 检查权限
+					const {
+						granted
+					} = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
+					if (granted) {
+						uni.makePhoneCall({
+							phoneNumber: phone //仅为示例
+						})
+						this.isShowPer = false;
+						return;
+					}
+					this.isShowPer = false;
+					// 2. 显示权限说明弹窗
+					const confirm = await this.showPermissionDialog(
+						'拨打电话权限申请',
+						'我们需要拨打电话权限，方便您联系商家或平台'
+					);
+
+					if (!confirm) return;
+
+					// 3. 请求权限
+					const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
+					console.log('result', result)
+					if (result) {
+						uni.makePhoneCall({
+							phoneNumber: phone //仅为示例
+						})
+						return;
+					} else {
+						locationService.openAppSettings();
+						return;
+						// uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
+					}
+				}
+
+
+			},
+			// 取消订单
+			cancelService() {
+				uni.showModal({
+					title: '取消订单',
+					content: '确定要取消该订单吗？',
+					success: (res) => {
+						if (res.confirm) {
+							// TODO: 取消订单
+							let data = {
+								orderNo: this.orderInfo.number,
+								amount: this.orderInfo.pay_money,
+								sjid: this.userInfo.id
+							}
+							request.post('/sj/cancelorder', data).then(res => {
+								if (res.state == 1) {
+									uni.showToast({
+										title: '取消成功！',
+										icon: 'none'
+									})
+									this.getOrderDetail();
+								} else {
+									uni.showToast({
+										title: res.msg,
+										icon: 'none'
+									})
+								}
+
+							}).catch(err => {
+								console.log(err)
+							})
+						}
+					}
+				})
+
+			},
+
+			// 申请退款
+			refoundService() {
+
+				uni.showModal({
+					title: '申请退款',
+					content: '确定申请退款？退款后则订单取消！',
+					success: (res) => {
+						if (res.confirm) {
+							// TODO: 申请退款
+							let data = {
+								orderNo: this.orderInfo.number,
+								amount: this.orderInfo.pay_money,
+								sjid: this.userInfo.id
+							}
+							let url = '';
+							if (this.orderInfo.pay_kind == 1) {
+								url = ''
+							} else if (this.orderInfo.pay_kind == 2) {
+								url = '/sj/selfwechatrefund'
+							} else if (this.orderInfo.pay_kind == 3) {
+								url = '/sj/selfalirefund'
+							}
+							request.post(url, data).then(res => {
+								console.log('申请退款接口', res)
+								uni.showToast({
+									title: '申请退款成功！',
+									icon: 'none'
+								})
+								this.orderInfo = {};
+								this.getOrderDetail();
+							}).catch(err => {
+								console.log(err)
+							})
+						}
+					}
+				})
+
+			},
+
+			// 支付订单
+			payOrder() {
+				// TODO: 实现支付功能
+				uni.navigateTo({
+					url: `/pages/shop/pay-order?id=${this.orderInfo.id}&money=${this.orderInfo.order_money}&title=${this.orderInfo.server_title}&number=${this.orderInfo.number}`
+				})
+			},
+
+			// 评价订单
+			reviewOrder() {
+				// uni.navigateTo({
+				//   url: `/pages/order/pay?id=${this.orderInfo.id}`
+				// })
+			},
+
+			// 再次下单
+			orderAgain() {
+				// TODO: 实现再次下单功能
+				uni.navigateTo({
+					url: '/pages/shop/service-detail?id=' + this.orderInfo.server_id
+				})
+			}
+		}
 	}
-  }
-}
 </script>
 
-<style>
-page {
-	position: relative;
-	background-color: #fff;
-}
-.detail-page::before {
-  content: '';
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 1200rpx !important;
-  background-image: url('/static/images/bg.png');
-  background-size: cover;
-  background-position: center top;
-  background-repeat: no-repeat;
-  z-index: 1;
-}
-.content-part {
-	position: relative;
-	left: 0;
-	right: 0;
-	z-index: 9;
-}
-/* 导航栏样式 */
-.custom-nav {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 88rpx;
-  background-color: transparent;
-  display: flex;
-  align-items: center;
-  padding: 0 32rpx;
-  z-index: 100;
-  /* #ifdef H5 */
-  padding-top: 0;
-  /* #endif */
-  /* #ifdef APP-PLUS || MP-WEIXIN */
-  padding-top: var(--status-bar-height);
-  /* #endif */
-}
+<style lang="less">
+	page {
+		position: relative;
+		background-color: #fff;
+	}
 
-.nav-back {
-  width: 48rpx;
-  height: 48rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+	.detail-page::before {
+		content: '';
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 1200rpx !important;
+		background-image: url('/static/images/bg.png');
+		background-size: cover;
+		background-position: center top;
+		background-repeat: no-repeat;
+		z-index: 1;
+	}
 
-.back-icon {
-  width: 32rpx;
-  height: 32rpx;
-}
+	.content-part {
+		position: relative;
+		left: 0;
+		right: 0;
+		z-index: 9;
+	}
 
-.nav-title {
-  flex: 1;
-  text-align: center;
-  font-size: 36rpx;
-  font-weight: 500;
-  color: #FFFFFF;
-}
+	/* 导航栏样式 */
+	.custom-nav {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 88rpx;
+		background-color: transparent;
+		display: flex;
+		align-items: center;
+		padding: 0 32rpx;
+		z-index: 100;
+		/* #ifdef H5 */
+		padding-top: 0;
+		/* #endif */
+		/* #ifdef APP-PLUS || MP-WEIXIN */
+		padding-top: var(--status-bar-height);
+		/* #endif */
+	}
 
-/* 状态区域 */
-.status-section {
-  /* background: linear-gradient(135deg, #FF6B9D 0%, #FF4D6B 100%); */
-  height: 160rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  /* padding-top: 88rpx; */
-  /* #ifdef APP-PLUS || MP-WEIXIN */
-  /* padding-top: calc(88rpx + var(--status-bar-height)); */
-  /* #endif */
-}
- 
- 
+	.nav-back {
+		width: 48rpx;
+		height: 48rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
+	.back-icon {
+		width: 32rpx;
+		height: 32rpx;
+	}
 
-.status-text {
-  font-size: 40rpx;
-  color: #FFFFFF;
-  font-weight: 500;
-}
+	.nav-title {
+		flex: 1;
+		text-align: center;
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
 
- /* 服务人员卡片 */
-.service-card {
-  margin: 24rpx;
-  background-color: #FFFFFF;
-  border-radius: 16rpx;
-  padding: 24rpx 0;
-  box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
-}
+	/* 状态区域 */
+	/* 状态区域 */
+	.status-section {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 20rpx;
+		padding-top: 55rpx;
+		padding-bottom: 50rpx;
 
-.location-info {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-start;
-  align-items: center;
-  padding: 0 24rpx;
-}
+		.status-section-image {
+			width: 52rpx;
+		}
+	}
+	
+	.status-text {
+		font-size: 44rpx;
+		color: #333333;
+		font-weight: 600;
+	}
 
-.location-icon {
-  width: 60rpx;
-  height: 60rpx;
-  margin-right: 32rpx;
-}
+	/* 服务码状态区域 */
+	.status-section2 {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding-top: 55rpx;
+		padding-bottom: 20rpx;
+		gap: 20rpx;
 
-.address-info {
-  flex: 1;
-}
+		.status-row {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: auto;
+		}
 
-.name-phone {
-  display: flex;
-  align-items: center;
-  margin-bottom: 8rpx;
-}
+		.status-section-image {
+			width: 27rpx;
+			height: auto;
+			margin-right: 6rpx;
+			margin-top: -4rpx;
+		}
 
-.name {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-  margin-right: 16rpx;
-}
+		.service-code {
+			display: flex;
+			align-items: baseline;
+			justify-content: center;
+			width: auto;
+			padding-bottom: 20rpx;
 
-.phone {
-  font-size: 28rpx;
-  color: #666666;
-}
+			.service-code-label {
+				width: 96rpx;
+				height: 41rpx;
+				margin-left: 6rpx;
+				position: relative;
+				top: -45rpx;
+			}
 
-.address {
-  font-size: 28rpx;
-  color: #666666;
-}
+			.service-code-value {
+				font-family: DINPro, DINPro;
+				font-weight: bold;
+				font-size: 80rpx;
+				color: #333333;
+				line-height: 103rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
 
-.divider {
-  width: 702rpx;
-  height: 4rpx;
-}
+		.status-text-red {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #DC232F;
+			line-height: 37rpx;
+			text-align: left;
+			font-style: normal;
+		}
 
-.staff-info {
-  display: flex;
-  align-items: center;
-  padding: 32rpx 24rpx 0;
-}
+		.status-text-normal {
+			color: #333333;
+		}
+	}
+	
 
-.staff-avatar {
-  width: 80rpx;
-  height: 80rpx;
-  border-radius: 44rpx;
-  margin-right: 16rpx;
-  background-color: #333333;
-}
+	/* 服务人员卡片 */
+	.service-card {
+		margin: 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 24rpx 0;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
+	}
 
-.staff-detail {
-  flex: 1;
-}
+	.location-info {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-start;
+		align-items: center;
+		padding: 0 24rpx;
+	}
 
-.staff-name {
-  font-size: 32rpx;
-  color: #3D3D3D;
-  font-weight: 500;
-}
+	.location-icon {
+		width: 60rpx;
+		height: 60rpx;
+		margin-right: 32rpx;
+	}
 
-.rating {
-  display: flex;
-  align-items: center;
-}
+	.address-info {
+		flex: 1;
+	}
 
-.star-icon {
-  width: 24rpx;
-  height: 24rpx;
-  margin-right: 4rpx;
-}
+	.name-phone {
+		display: flex;
+		align-items: center;
+		margin-bottom: 8rpx;
+	}
 
-.phone-btn {
-  width: 64rpx;
-  height: 64rpx;
-  background-color: #E8101E;
-  border-radius: 32rpx;
-}
-/* 门店信息 */
-.service-shop {
-  margin: 24rpx;
-  background-color: #FFFFFF;
-  border-radius: 16rpx;
-  padding: 24rpx;
-  box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-start;
-  align-items: center;
-}
-.shop-info {
-  flex: 1;
-}
-.shop-info1 {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-start;
-  align-items: center;
-}
-.shop-logo {
-  width: 96rpx;
-  height: 96rpx;
-  border-radius: 48rpx;
-  margin-right: 18rpx;
-}
-.shop-name {
-  font-size: 24rpx;
-  font-weight: 500;
-  color: #3D3D3D;
-}
-.shop-info2 {
-  display: flex;
-  flex-flow: column wrap;
-  justify-content: flex-start;
-  align-items: flex-start;
-  margin-top: 16rpx;
-}
-.shop-time {
-  margin-bottom: 8rpx;
-}
-.shop-time,.shop-address {
-  font-size: 24rpx;
-  color: #999999;
-}
-.shop-btns {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-end;
-  align-items: center;
-}
-.btn-map,.btn-phone {
-  width: 64rpx;
-  height: 64rpx;
-}
-.btn-map {
-  margin-right: 48rpx;
-}
-/* 预约信息卡片 */
-.booking-card {
-  margin: 24rpx;
-  background-color: #FFFFFF;
-  border-radius: 16rpx;
-  padding: 24rpx;
-  box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
-}
+	.name {
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: 500;
+		margin-right: 16rpx;
+	}
 
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 24rpx;
-}
+	.phone {
+		font-size: 28rpx;
+		color: #666666;
+	}
 
-.card-title {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-}
+	.address {
+		font-size: 28rpx;
+		color: #666666;
+	}
 
-.update-time {
-  font-size: 28rpx;
-  color: #333333;
-  padding-right: 4rpx;
-}
-.update-change {
-  font-size: 28rpx;
-  color: #666666;
-}
-.service-item {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-start;
-  align-items: center;
-  margin-bottom: 24rpx;
-}
+	.divider {
+		width: 702rpx;
+		height: 4rpx;
+	}
 
-.service-image {
-  width: 160rpx;
-  height: 160rpx;
-  border-radius: 16rpx;
-  margin-right: 24rpx;
-  background-color: #e2e2e2;
-}
+	.staff-info {
+		display: flex;
+		align-items: center;
+		padding: 32rpx 24rpx 0;
+	}
 
-.service-info {
-  flex: 1;
-  height: 160rpx;
-  display: flex;
-  flex-flow: column nowrap;
-  justify-content: space-between;
-  align-items: flex-start;
-  margin-right: 24rpx;
-}
+	.staff-avatar {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 44rpx;
+		margin-right: 16rpx;
+		background-color: #333333;
+	}
 
-.service-name {
-  font-size: 28rpx;
-  color: #333333;
-  margin-bottom: 8rpx;
-}
+	.staff-detail {
+		flex: 1;
+	}
 
-.service-price {
-  font-size: 32rpx;
-  color: #FF4D6B;
-  font-weight: 500;
-}
+	.staff-name {
+		font-size: 32rpx;
+		color: #3D3D3D;
+		font-weight: 500;
+	}
 
-.service-count {
-  font-size: 28rpx;
-  color: #666666;
-}
+	.rating {
+		display: flex;
+		align-items: center;
+	}
 
-.service-real {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-end;
-  align-items: baseline;
-  padding-top: 24rpx;
-  border-top: 1rpx solid rgba(0, 0, 0, 0.05);
-}
-.real-lable {
-  font-size: 24rpx;
-  color: #333333;
-}
-.real-price {
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #E8101E;
-}
-/* 订单信息卡片 */
-.order-card {
-  margin: 24rpx;
-  background-color: #FFFFFF;
-  border-radius: 16rpx;
-  padding: 24rpx;
-  box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
-}
+	.star-icon {
+		width: 24rpx;
+		height: 24rpx;
+		margin-right: 4rpx;
+	}
 
-.info-item {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 16rpx;
-}
+	.phone-btn {
+		width: 64rpx;
+		height: 64rpx;
+		background-color: #FF4767;
+		border-radius: 32rpx;
+	}
 
-.label {
-  font-size: 28rpx;
-  color: #999999;
-}
+	/* 门店信息 */
+	.service-shop {
+		margin: 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 24rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-start;
+		align-items: center;
+	}
 
-.value {
-  font-size: 28rpx;
-  color: #333333;
-}
+	.shop-info {
+		flex: 1;
+	}
 
-/* 底部按钮 */
-.bottom-buttons {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  height: 128rpx;
-  background-color: #FFFFFF;
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
-  justify-content: space-between;
-  box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
-  padding: 0 24rpx 0 78rpx;
-  /* #ifdef H5 */
-  padding-bottom: env(safe-area-inset-bottom);
-  /* #endif */
-  z-index: 999;
-}
-.contact-button {
-  display: flex;
-  flex-flow: column nowrap;
-  justify-content: center;
-  align-items: center;
-}
-.contact-text {
-  font-size: 24rpx;
-  color: #666666;
-}
-.tell-icon {
-  width: 36rpx;
-  height: 36rpx;
-  margin-right: 8rpx;
-}
-.handel-button {
-  width: 240rpx;
-  height: 64rpx;
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: center;
-  align-items: center;
-  border-radius: 32rpx;
-}
-.btn-border {
-  border: 1rpx solid #E8101E;
-  background-color: #fff;
-  box-sizing: border-box;
-  margin-left: 20rpx;
-}
-.btn-bg {
-  background-color: #E8101E;
-}
-.button-text {
-  font-size: 28rpx;
-  font-weight: 400;
-  color: #FFFFFF;
-}
-.btn-border .button-text {
-  font-size: 28rpx;
-  font-weight: 400;
-  color: #E8101E;
-}
-/* APP适配 */
-/* #ifdef APP-PLUS */
-.permission.transform {
-	top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-	opacity: 1;
-	visibility: visible;
-}
-/* #endif */
-/* 平台适配 */
-/* #ifdef H5 */
-.detail-page {
-  padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
-}
-/* #endif */
+	.shop-info1 {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-start;
+		align-items: center;
+	}
 
-/* #ifdef MP-WEIXIN */
-.custom-nav {
-  padding-top: calc(var(--status-bar-height) + constant(safe-area-inset-top));
-  padding-top: calc(var(--status-bar-height) + env(safe-area-inset-top));
-}
-/* #endif */
-</style> 
\ No newline at end of file
+	.shop-logo {
+		width: 96rpx;
+		height: 96rpx;
+		border-radius: 48rpx;
+		margin-right: 18rpx;
+	}
+
+	.shop-name {
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #3D3D3D;
+	}
+
+	.shop-info2 {
+		display: flex;
+		flex-flow: column wrap;
+		justify-content: flex-start;
+		align-items: flex-start;
+		margin-top: 16rpx;
+	}
+
+	.shop-time {
+		margin-bottom: 8rpx;
+	}
+
+	.shop-time,
+	.shop-address {
+		font-size: 24rpx;
+		color: #999999;
+	}
+
+	.shop-btns {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-end;
+		align-items: center;
+	}
+
+	.btn-map,
+	.btn-phone {
+		width: 64rpx;
+		height: 64rpx;
+	}
+
+	.btn-map {
+		margin-right: 48rpx;
+	}
+
+	/* 预约信息卡片 */
+	.booking-card {
+		margin: 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 24rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
+	}
+
+	.card-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 24rpx;
+	}
+
+	.card-title {
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: 500;
+	}
+
+	.update-time {
+		font-size: 28rpx;
+		color: #333333;
+		padding-right: 4rpx;
+	}
+
+	.update-change {
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+	.service-item {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-start;
+		align-items: center;
+		margin-bottom: 24rpx;
+	}
+
+	.service-image {
+		width: 160rpx;
+		height: 160rpx;
+		border-radius: 16rpx;
+		margin-right: 24rpx;
+		background-color: #e2e2e2;
+	}
+
+	.service-info {
+		flex: 1;
+		height: 160rpx;
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: space-between;
+		align-items: flex-start;
+		margin-right: 24rpx;
+	}
+
+	.service-name {
+		font-size: 28rpx;
+		color: #333333;
+		margin-bottom: 8rpx;
+	}
+
+	.service-price {
+		font-size: 32rpx;
+		color: #FF4D6B;
+		font-weight: 500;
+	}
+
+	.service-count {
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+	.service-real {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding-top: 24rpx;
+		border-top: 1rpx solid rgba(0, 0, 0, 0.05);
+	}
+
+	.real-lable {
+		font-size: 24rpx;
+		color: #333333;
+	}
+
+	.real-price {
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #FF4767;
+	}
+
+	/* 订单信息卡片 */
+	.order-card {
+		margin: 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 24rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
+	}
+
+	.info-item {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 16rpx;
+	}
+
+	.label {
+		font-size: 28rpx;
+		color: #999999;
+	}
+
+	.value {
+		font-size: 28rpx;
+		color: #333333;
+	}
+
+	/* 底部按钮 */
+	.bottom-buttons {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 128rpx;
+		background-color: #FFFFFF;
+		display: flex;
+		flex-flow: row nowrap;
+		align-items: center;
+		justify-content: space-between;
+		box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
+		padding: 0 24rpx 0 78rpx;
+		/* #ifdef H5 */
+		padding-bottom: env(safe-area-inset-bottom);
+		/* #endif */
+		z-index: 999;
+	}
+
+	.contact-button {
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.contact-text {
+		font-size: 24rpx;
+		color: #666666;
+	}
+
+	.tell-icon {
+		width: 36rpx;
+		height: 36rpx;
+		margin-right: 8rpx;
+	}
+
+	.handel-button {
+		width: 240rpx;
+		height: 64rpx;
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: center;
+		align-items: center;
+		border-radius: 32rpx;
+	}
+
+	.btn-border {
+		border: 1rpx solid #FF4767;
+		background-color: #fff;
+		box-sizing: border-box;
+		margin-left: 20rpx;
+	}
+
+	.btn-bg {
+		background-color: #FF4767;
+	}
+
+	.button-text {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+	}
+
+	.btn-border .button-text {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #FF4767;
+	}
+
+	/* APP适配 */
+	/* #ifdef APP-PLUS */
+	.permission.transform {
+		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
+		opacity: 1;
+		visibility: visible;
+	}
+
+	.detail-page {
+		padding-bottom: 140rpx;
+	}
+
+	/* #endif */
+	/* 平台适配 */
+	/* #ifdef H5 */
+	.detail-page {
+		padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
+	}
+
+	/* #endif */
+
+	/* #ifdef MP-WEIXIN */
+	.custom-nav {
+		padding-top: calc(var(--status-bar-height) + constant(safe-area-inset-top));
+		padding-top: calc(var(--status-bar-height) + env(safe-area-inset-top));
+	}
+
+	/* #endif */
+</style>
\ No newline at end of file
diff --git a/pages/shop/components/orderCard.vue b/pages/shop/components/orderCard.vue
index 9194278..3abeb1b 100644
--- a/pages/shop/components/orderCard.vue
+++ b/pages/shop/components/orderCard.vue
@@ -3,39 +3,33 @@
 		<!-- 订单编号 -->
 		<view class="orderNumBox">
 			<view class="order-id white-space-nowrap">订单编号：{{ dataItem.number }}</view>
-			<view class="stateText" :class="{
-			stateText2: dataItem.state > 4 && dataItem.state !== 7,  // 排除已取消
-			stateText3: dataItem.state === 7  // 已取消状态单独处理
-			}"  v-if="showState">
-		{{ stateText }}
-		</view>
-			<image class="rightArrow" src="/static/images/shop/pintuan/rightArrow.png" v-else
-				@click="$emit('goOrderDetail', dataItem)"></image>
+
+
 		</view>
 
 		<!-- 服务信息区域 -->
-		<view class="service-container" @click="$emit('goOrderDetail', dataItem)" :class="{noFotter:(!dataItem.reservation_time && !dataItem.reserve_end_time) || haveButton }">
-			<image class="service-img" 
-			
-			:src=" dataItem.order_photo ? dataItem.order_photo[0] : JSON.parse(dataItem.photo)[0]
-        " mode="aspectFill"></image>
+		<view class="service-container" @click="$emit('goOrderDetail', dataItem)"
+			:class="{ noFotter: (!dataItem.reservation_time && !dataItem.reserve_end_time) || haveButton }">
+			<image class="service-img" :src="dataItem.order_photo ? dataItem.order_photo[0] : JSON.parse(dataItem.photo)[0]
+				" mode="aspectFill"></image>
 			<view class="service-info">
 				<view>
 					<view class="service-type">
 						<view class="service-name-type" v-if="dataItem.team_buy_id">
-							{{getGroupType}}
+							{{ getGroupType }}
 						</view>
 						<text class="service-name-text">
 							{{ dataItem.server_title }}
 						</text>
 
 					</view>
-					<view class="service-time" v-if="dataItem.add_time && dataItem.state!=7">下单时间: {{ dataItem.add_time }}</view>
+					<view class="service-time" v-if="dataItem.add_time && dataItem.state != 7">下单时间:
+						{{ dataItem.add_time }}</view>
 				</view>
-				<view class="service-price" >
-					<text v-if="dataItem.team_buy_id">{{`团购价: `}}</text>¥<text
-						style="font-size: 34rpx;">{{ dataItem.order_money }}</text>
-						<text  class="service-price-line">{{ dataItem.line_money }}</text>
+				<view class="service-price">
+					<text v-if="dataItem.team_buy_id">{{ `团购价: ` }}</text>¥<text style="font-size: 34rpx;">{{
+						dataItem.order_money }}</text>
+					<text class="service-price-line">{{ dataItem.line_money }}</text>
 				</view>
 
 			</view>
@@ -61,358 +55,378 @@
 </template>
 
 <script>
-	export default {
-		name: "OrderCard",
-		props: {
-			dataItem: {
-				type: Object,
-			},
-			typeId: {
-				type: Number,
-			},
-			showState: {
-				type: Boolean,
-				default: true,
-			},
-			haveButton: {
-				type: Boolean,
-				default: true,
-			},
+export default {
+	name: "OrderCard",
+	props: {
+		dataItem: {
+			type: Object,
 		},
-		computed: {
-			useTime() {
-				const start = this.dataItem.reservation_time;
-				const server_time = this.dataItem.server_time || 0;
-			
-				// 格式化时间范围：输出 2025年05月29 12:30-13:30 格式
-				function formatTimeRange(startTimeStr, serviceMinutes) {
-					// 1. 空值兜底：避免无开始时间时报错
-					if (!startTimeStr) return "";
-			
-					// 2. 兼容低版本iOS：iOS不识别 "-" 分隔的日期，必须替换为 "/"
-					const iosSafeTimeStr = startTimeStr.replace(/-/g, "/");
-					const startTime = new Date(iosSafeTimeStr);
-			
-					// 校验时间有效性
-					if (isNaN(startTime.getTime())) {
-						console.error("无效的开始时间格式:", startTimeStr);
-						return "";
-					}
-			
-					// 3. 计算结束时间（开始时间 + 服务分钟数）
-					const endTime = new Date(startTime.getTime() + serviceMinutes * 60 * 1000);
-			
-					// 格式化年份：YYYY年
-					const formatYear = (date) => {
-						return date.getFullYear() + '年';
-					};
-			
-					// 格式化月份和日期：MM月DD（补零）
-					const formatMonthDay = (date) => {
-						const month = String(date.getMonth() + 1).padStart(2, "0");
-						const day = String(date.getDate()).padStart(2, "0");
-						return `${month}月${day}`;
-					};
-			
-					// 格式化时间部分：HH:MM（补零）
-					const formatTimePart = (date) => {
-						const hours = String(date.getHours()).padStart(2, "0");
-						const minutes = String(date.getMinutes()).padStart(2, "0");
-						return `${hours}:${minutes}`;
-					};
-			
-					// 4. 判断是否同一天
-					const isSameDay = startTime.getFullYear() === endTime.getFullYear() &&
-									  startTime.getMonth() === endTime.getMonth() &&
-									  startTime.getDate() === endTime.getDate();
-			
-					// 5. 拼接最终格式
-					if (isSameDay) {
-						// 同一天：2025年05月29 12:30-13:30
-						return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatTimePart(endTime)}`;
-					} else {
-						// 跨天：2025年05月29 12:30-2025年05月30 13:30
-						return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatYear(endTime)}${formatMonthDay(endTime)} ${formatTimePart(endTime)}`;
-					}
-				}
-			
-				// 兜底：如果start为空，返回空字符串避免报错
-				return start ? formatTimeRange(start, server_time) : "";
-			},
-			stateText() {
-				const textList = [
-					"",
-					"待支付",
-					"待接单",
-					"待开始",
-					"待完成",
-					"已完成",
-					"已评价",
-					"已取消",
-				];
-				return textList[this.dataItem.state];
-			},
-			//获取拼团状态文字
-			getGroupType() {
-				let list = [{
-						id: 1,
-						text: "团购中",
-					},
-					{
-						id: 2,
-						text: "已成团",
-					},
-					{
-						id: 3,
-						text: "拼团失败",
-					},
-				];
-				let name = list.find((it) => it.id == this.dataItem.team_buy_order_state)?.text;
-				return name;
-			},
+		typeId: {
+			type: Number,
 		},
-		methods: {
+		showState: {
+			type: Boolean,
+			default: true,
+		},
+		haveButton: {
+			type: Boolean,
+			default: true,
+		},
+	},
+	computed: {
+		useTime() {
+			const start = this.dataItem.reservation_time;
+			const server_time = this.dataItem.server_time || 0;
 
-			// 触发取消事件
-			emitCancel() {
-				this.$emit("cancel");
-			},
-			// 触发接单事件
-			emitAccept() {
-				this.$emit("accept");
-			},
-			emitStart() {
-				this.$emit("start");
-			},
-			emitDone() {
-				this.$emit("done");
-			},
+			// 格式化时间范围：输出 2025年05月29 12:30-13:30 格式
+			function formatTimeRange(startTimeStr, serviceMinutes) {
+				// 1. 空值兜底：避免无开始时间时报错
+				if (!startTimeStr) return "";
+
+				// 2. 兼容低版本iOS：iOS不识别 "-" 分隔的日期，必须替换为 "/"
+				const iosSafeTimeStr = startTimeStr.replace(/-/g, "/");
+				const startTime = new Date(iosSafeTimeStr);
+
+				// 校验时间有效性
+				if (isNaN(startTime.getTime())) {
+					console.error("无效的开始时间格式:", startTimeStr);
+					return "";
+				}
+
+				// 3. 计算结束时间（开始时间 + 服务分钟数）
+				const endTime = new Date(startTime.getTime() + serviceMinutes * 60 * 1000);
+
+				// 格式化年份：YYYY年
+				const formatYear = (date) => {
+					return date.getFullYear() + '年';
+				};
+
+				// 格式化月份和日期：MM月DD（补零）
+				const formatMonthDay = (date) => {
+					const month = String(date.getMonth() + 1).padStart(2, "0");
+					const day = String(date.getDate()).padStart(2, "0");
+					return `${month}月${day}`;
+				};
+
+				// 格式化时间部分：HH:MM（补零）
+				const formatTimePart = (date) => {
+					const hours = String(date.getHours()).padStart(2, "0");
+					const minutes = String(date.getMinutes()).padStart(2, "0");
+					return `${hours}:${minutes}`;
+				};
+
+				// 4. 判断是否同一天
+				const isSameDay = startTime.getFullYear() === endTime.getFullYear() &&
+					startTime.getMonth() === endTime.getMonth() &&
+					startTime.getDate() === endTime.getDate();
+
+				// 5. 拼接最终格式
+				if (isSameDay) {
+					// 同一天：2025年05月29 12:30-13:30
+					return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatTimePart(endTime)}`;
+				} else {
+					// 跨天：2025年05月29 12:30-2025年05月30 13:30
+					return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatYear(endTime)}${formatMonthDay(endTime)} ${formatTimePart(endTime)}`;
+				}
+			}
+
+			// 兜底：如果start为空，返回空字符串避免报错
+			return start ? formatTimeRange(start, server_time) : "";
 		},
-	};
+		stateText() {
+			const textList = [
+				"",
+				"待支付",
+				"待接单",
+				"待开始",
+				"待完成",
+				"已完成",
+				"已评价",
+				"已取消",
+			];
+			return textList[this.dataItem.state];
+		},
+		//获取拼团状态文字
+		getGroupType() {
+			let list = [{
+				id: 1,
+				text: "团购中",
+			},
+			{
+				id: 2,
+				text: "已成团",
+			},
+			{
+				id: 3,
+				text: "拼团失败",
+			},
+			];
+			let name = list.find((it) => it.id == this.dataItem.team_buy_order_state)?.text;
+			return name;
+		},
+	},
+	methods: {
+
+		// 触发取消事件
+		emitCancel() {
+			this.$emit("cancel");
+		},
+		// 触发接单事件
+		emitAccept() {
+			this.$emit("accept");
+		},
+		emitStart() {
+			this.$emit("start");
+		},
+		emitDone() {
+			this.$emit("done");
+		},
+	},
+};
 </script>
 
 <style scoped lang="less">
-	.order-card {
-		padding: 20rpx 30rpx 10rpx 30rpx;
-		margin: 0rpx 30rpx 20rpx 30rpx;
-		background-color: #fff;
-		border-radius: 12px;
-		/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
-		position: relative;
-	}
+.order-card {
+	padding: 20rpx 30rpx 10rpx 30rpx;
+	margin: 0rpx 30rpx 20rpx 30rpx;
+	background-color: #fff;
+	border-radius: 12px;
+	/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
+	position: relative;
+}
 
-	/* 订单编号 */
-	.order-id {
-		width: 530rpx;
-		font-size: 28rpx;
-		color: #333333;
-	}
+/* 订单编号 */
+.order-id {
+	width: 630rpx;
+	font-size: 28rpx;
+	color: #333333;
+}
 
-	.orderNumBox {
+.orderNumBox {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 40rpx;
+
+	.stateText {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #FF4767;
+		text-align: left;
+		font-style: normal;
+		position: absolute;
+		right: 0;
+		top: 0;
+		background-image: url("/static/images/icons/tabBj.png");
+		background-size: 100% auto;
+		background-position: center top;
+		background-repeat: no-repeat;
+		width: 128rpx;
+		height: 49rpx;
 		display: flex;
 		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 40rpx;
-
-		.stateText {
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #E8101E;
-			text-align: left;
-			font-style: normal;
-			position: absolute;
-			right: 0;
-			top: 0;
-			background-image: url("/static/images/icons/tabBj.png");
-			background-size: 100% auto;
-			background-position: center top;
-			background-repeat: no-repeat;
-			width: 128rpx;
-			height: 49rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-		
-		.stateText2{
-			background-image: url("/static/images/icons/tabBj2.png");
-			color: #333;
-		}
-		.stateText3{
-			background-image: url("/static/images/icons/tabBj2.png");
-			color: #999999 !important;
-		}
-
-		.rightArrow {
-			width: 12rpx;
-			height: 24rpx;
-		}
+		justify-content: center;
 	}
 
-
-	/* 服务信息容器 */
-	.service-container {
-		display: flex;
-		padding-bottom: 24rpx;
-		border-bottom: 1px solid #f6f5f5;
-	}
-	
-	.noFotter{
-		border-bottom: none;
-		padding-bottom: 0rpx;
+	.stateText2 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #333;
 	}
 
-	/* 服务图片 */
-	.service-img {
-		width: 172rpx;
-		height: 168rpx;
-		border-radius: 24rpx;
-		margin-right: 30rpx;
-		flex-shrink: 0;
+	.stateText3 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #999999 !important;
 	}
 
-	/* 服务信息 */
-	.service-info {
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
+	.rightArrow {
+		width: 12rpx;
+		height: 24rpx;
 	}
+}
 
-	.service-price {
-		font-family: DINPro, DINPro;
-		font-weight: 500;
+
+/* 服务信息容器 */
+.service-container {
+	display: flex;
+	padding-bottom: 24rpx;
+	border-bottom: 1px solid #f6f5f5;
+}
+
+.noFotter {
+	border-bottom: none;
+	padding-bottom: 0rpx;
+}
+
+/* 服务图片 */
+.service-img {
+	width: 172rpx;
+	height: 168rpx;
+	border-radius: 24rpx;
+	margin-right: 30rpx;
+	flex-shrink: 0;
+}
+
+/* 服务信息 */
+.service-info {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.service-price {
+	font-family: DINPro, DINPro;
+	font-weight: 500;
+	font-size: 24rpx;
+	color: #FF4767;
+	line-height: 34rpx;
+	text-align: left;
+	font-style: normal;
+
+	.service-price-line {
+		font-weight: 400;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #999999;
 		line-height: 34rpx;
+		margin-left: 10rpx;
+		text-decoration: line-through;
+	}
+}
+
+.service-type {
+	width: 400rpx;
+	font-weight: 500;
+	font-size: 30rpx;
+	color: #333333;
+	line-height: 34rpx;
+	text-align: left;
+	font-style: normal;
+	display: flex;
+	align-items: center;
+	margin-bottom: 22rpx;
+
+	.service-name-type {
+		/* #ifdef APP-PLUS */
+		font-family: 'shuHeiTi';
+		/* #endif */
+		font-size: 24rpx;
+		color: #FFFFFF;
+		line-height: 27rpx;
+		letter-spacing: 2px;
 		text-align: left;
 		font-style: normal;
-		.service-price-line {
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #999999;
-			line-height: 34rpx;
-			margin-left: 10rpx;
-			text-decoration: line-through;
-		}
+		background: linear-gradient(166deg, #FC5E72 0%, #FF4767 100%);
+		border-radius: 6rpx;
+		padding: 4rpx 4rpx 4rpx 8rpx;
+		margin-right: 13rpx;
+		letter-spacing: 2rpx;
 	}
 
-	.service-type {
-		width: 400rpx;
-		font-weight: 500;
-		font-size: 30rpx;
+	.service-name-text {
+		flex: 1;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+}
+
+.service-time {
+
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #999999;
+	line-height: 33rpx;
+	text-align: left;
+	font-style: normal;
+}
+
+/* 时间信息 */
+.time-info {
+	font-size: 30rpx;
+	color: #333;
+	margin-bottom: 10rpx;
+	margin-top: 28rpx;
+	display: flex;
+	align-items: center;
+
+	.time-info-img {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 10rpx;
+		border-radius: 50%;
+	}
+
+	.time-info-name {
+		font-weight: 400;
+		font-size: 26rpx;
 		color: #333333;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
-		display: flex;
-		align-items: center;
-		margin-bottom: 22rpx;
+		margin-right: 20rpx;
+		max-width: 110rpx;
+		overflow: hidden;
+		word-break: break-all;
+		/* break-all(允许在单词内换行。) */
+		text-overflow: ellipsis;
+		/* 超出部分省略号 */
+		display: -webkit-box;
+		/** 对象作为伸缩盒子模型显示 **/
+		-webkit-box-orient: vertical;
+		/** 设置或检索伸缩盒对象的子元素的排列方式 **/
+		-webkit-line-clamp: 1;
+		/** 显示的行数 **/
 
-		.service-name-type {
-			/* #ifdef APP-PLUS */
-			font-family: 'shuHeiTi';
-			/* #endif */
-			font-size: 24rpx;
-			color: #FFFFFF;
-			line-height: 27rpx;
-			letter-spacing: 2px;
-			text-align: left;
-			font-style: normal;
-			background: linear-gradient(166deg, #FC5E72 0%, #E8101E 100%);
-			border-radius: 6rpx;
-			padding: 4rpx 4rpx 4rpx 8rpx;
-			margin-right: 13rpx;
-			letter-spacing: 2rpx;
-		}
-
-		.service-name-text {
-			flex: 1;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
 	}
 
-	.service-time {
-
+	.time-info-text1 {
 		font-weight: 400;
 		font-size: 26rpx;
 		color: #999999;
-		line-height: 33rpx;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+		// margin-right: 20rpx;
+		white-space: nowrap;
+	}
+
+	.time-info-text2 {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #333333;
+		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
 	}
+}
 
-	/* 时间信息 */
-	.time-info {
-		font-size: 30rpx;
-		color: #333;
-		margin-bottom: 10rpx;
-		margin-top: 28rpx;
-		display: flex;
-		align-items: center;
-		.time-info-img{
-			width: 40rpx;
-			height: 40rpx;
-			margin-right: 10rpx;
-			border-radius: 50%;
-		}
-		.time-info-name{
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #333333;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-			margin-right: 20rpx;
-		}
-		.time-info-text1{
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #999999;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-			// margin-right: 20rpx;
-		}
-		.time-info-text2{
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #333333;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-		}
-	}
+/* 按钮组 */
+.button-group {
+	display: flex;
+	justify-content: flex-end;
+	gap: 30rpx;
+	margin-bottom: 20rpx;
+}
 
-	/* 按钮组 */
-	.button-group {
-		display: flex;
-		justify-content: flex-end;
-		gap: 30rpx;
-		margin-bottom: 20rpx;
-	}
+/* 通用按钮样式 */
+.btn {
+	// width: 80rpx;
+	height: 32rpx;
+	border-radius: 64rpx;
+	font-size: 26rpx;
+	background-color: #fff;
+	white-space: nowrap;
+	margin-top: 40rpx;
+}
 
-	/* 通用按钮样式 */
-	.btn {
-		// width: 80rpx;
-		height: 32rpx;
-		border-radius: 64rpx;
-		font-size: 26rpx;
-		background-color: #fff;
-		white-space: nowrap;
-		margin-top: 40rpx;
-	}
+/* 取消按钮 */
+.cancel-btn {
+	border: 2rpx solid #979797;
+	color: #333333;
+}
 
-	/* 取消按钮 */
-	.cancel-btn {
-		border: 2rpx solid #979797;
-		color: #333333;
-	}
-
-	/* 接单按钮 */
-	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
-	}
+/* 接单按钮 */
+.accept-btn {
+	border: 2rpx solid #FF4767;
+	color: #FF4767;
+}
 </style>
\ No newline at end of file
diff --git a/pages/shop/components/orderCard2.vue b/pages/shop/components/orderCard2.vue
index 57602ea..bcd9f68 100644
--- a/pages/shop/components/orderCard2.vue
+++ b/pages/shop/components/orderCard2.vue
@@ -205,7 +205,7 @@
 		.stateText {
 			font-weight: 400;
 			font-size: 26rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: left;
 			font-style: normal;
 			position: absolute;
@@ -255,7 +255,7 @@
 	.service-price {
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -291,7 +291,7 @@
 			letter-spacing: 2px;
 			text-align: left;
 			font-style: normal;
-			background: linear-gradient(166deg, #FC5E72 0%, #E8101E 100%);
+			background: linear-gradient(166deg, #FC5E72 0%, #FF4767 100%);
 			border-radius: 6rpx;
 			padding: 4rpx 4rpx 4rpx 8rpx;
 			margin-right: 13rpx;
@@ -387,8 +387,8 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 
 	.order-address {
diff --git a/pages/shop/create-order.vue b/pages/shop/create-order.vue
index c900ed6..7052a2e 100644
--- a/pages/shop/create-order.vue
+++ b/pages/shop/create-order.vue
@@ -500,7 +500,7 @@ export default {
   height: 28rpx;
   border: 3rpx;
   margin-right: 16rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
 }
 .service-item {
   padding-top: 24rpx;
@@ -636,7 +636,7 @@ export default {
 .price-total .price {
   font-size: 28rpx;
   font-weight: 500;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .amount-lable {
@@ -646,7 +646,7 @@ export default {
 .submit-btn {
   width: 492rpx;
   height: 64rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 32rpx;
   color: #ffffff;
   font-size: 28rpx;
diff --git a/pages/shop/groupBuying/addGroupBuying.vue b/pages/shop/groupBuying/addGroupBuying.vue
index 8a6b0a1..043b1a5 100644
--- a/pages/shop/groupBuying/addGroupBuying.vue
+++ b/pages/shop/groupBuying/addGroupBuying.vue
@@ -67,7 +67,7 @@
 				<view class="form-radio-box">
 					<uv-radio-group v-model="formData.quota_type" placement="row" :labelColor="`#333333`"
 						:labelSize="`28rpx`" :disabled="disabled">
-						<uv-radio :name="1" activeColor="#E8101E" label="限购">
+						<uv-radio :name="1" activeColor="#FF4767" label="限购">
 
 							<template #icon>
 
@@ -77,7 +77,7 @@
 
 							</template>
 						</uv-radio>
-						<uv-radio :name="2" activeColor="#E8101E" label="不限购" @change="formData.person_quota = null">
+						<uv-radio :name="2" activeColor="#FF4767" label="不限购" @change="formData.person_quota = null">
 							<template #icon>
 
 								<image src="/static/images/shop/pintuan/yes.png" class="radioYes"
@@ -105,7 +105,7 @@
 				<view class="form-radio-box2">
 					<uv-radio-group v-model="formData.time_quota" placement="row" :labelColor="`#333333`"
 						:labelSize="`28rpx`" :disabled="disabled">
-						<uv-radio :name="12" activeColor="#E8101E" label="12小时">
+						<uv-radio :name="12" activeColor="#FF4767" label="12小时">
 							<template #icon>
 
 								<image src="/static/images/shop/pintuan/yes.png" class="radioYes"
@@ -114,7 +114,7 @@
 
 							</template>
 						</uv-radio>
-						<uv-radio :name="24" activeColor="#E8101E" label="24小时">
+						<uv-radio :name="24" activeColor="#FF4767" label="24小时">
 							<template #icon>
 
 								<image src="/static/images/shop/pintuan/yes.png" class="radioYes"
@@ -123,7 +123,7 @@
 
 							</template>
 						</uv-radio>
-						<uv-radio :name="48" activeColor="#E8101E" label="48小时">
+						<uv-radio :name="48" activeColor="#FF4767" label="48小时">
 							<template #icon>
 
 								<image src="/static/images/shop/pintuan/yes.png" class="radioYes"
@@ -417,7 +417,7 @@
 	.redTip {
 		font-weight: 400;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
@@ -571,7 +571,7 @@
 		&__btn {
 			width: 690rpx;
 			height: 78rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 798rpx;
 			display: flex;
 			align-items: center;
diff --git a/pages/shop/groupBuying/components/listCard.vue b/pages/shop/groupBuying/components/listCard.vue
index c7e4cf3..532975c 100644
--- a/pages/shop/groupBuying/components/listCard.vue
+++ b/pages/shop/groupBuying/components/listCard.vue
@@ -154,7 +154,7 @@ export default {
     border-radius: 0rpx 20rpx 0rpx 20rpx;
     font-weight: 400;
     font-size: 26rpx;
-    color: #E8101E;
+    color: #FF4767;
     line-height: 37rpx;
     text-align: left;
     font-style: normal;
diff --git a/pages/shop/groupBuying/components/serveCard.vue b/pages/shop/groupBuying/components/serveCard.vue
index cbb9f84..b88f92c 100644
--- a/pages/shop/groupBuying/components/serveCard.vue
+++ b/pages/shop/groupBuying/components/serveCard.vue
@@ -14,7 +14,7 @@
 				<view>
 					<view class="serve-card-right__content__title">{{info.title}}</view>
 					<view class="serve-card-right__content__price"><text
-							style="color: #E8101E;font-weight: 500;">¥{{info.server_price}} </text> {{' '}}|
+							style="color: #FF4767;font-weight: 500;">¥{{info.server_price}} </text> {{' '}}|
 						{{info.server_time}}分钟
 					</view>
 				</view>
diff --git a/pages/shop/groupBuying/list.vue b/pages/shop/groupBuying/list.vue
index 7084609..678dfad 100644
--- a/pages/shop/groupBuying/list.vue
+++ b/pages/shop/groupBuying/list.vue
@@ -62,11 +62,11 @@
       :sureText="'确定'"
     >
       <text v-if="tipsState == 6"
-        >您当前操作为<text style="color: #E8101E">结束拼团活动</text
+        >您当前操作为<text style="color: #FF4767">结束拼团活动</text
         >，根据平台规则，此操作需提交平台审核（审核通过后方可生效），请问您是否确认发起该申请？</text
       >
       <text v-else
-        >您当前操作为<text style="color: #E8101E">结束拼团活动</text
+        >您当前操作为<text style="color: #FF4767">结束拼团活动</text
         >，请问您是否确认此操作吗？</text
       >
     </tipsPopup>
@@ -413,7 +413,7 @@ export default {
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 3rpx;
 }
 
diff --git a/pages/shop/groupBuying/selectServe.vue b/pages/shop/groupBuying/selectServe.vue
index 2cc7816..8aca99f 100644
--- a/pages/shop/groupBuying/selectServe.vue
+++ b/pages/shop/groupBuying/selectServe.vue
@@ -89,7 +89,7 @@ export default {
     &__btn {
       width: 690rpx;
       height: 78rpx;
-      background: #E8101E;
+      background: #FF4767;
       border-radius: 798rpx;
       display: flex;
       align-items: center;
diff --git a/pages/shop/manHour/addManHour.vue b/pages/shop/manHour/addManHour.vue
index 7dbbd57..d3f5976 100644
--- a/pages/shop/manHour/addManHour.vue
+++ b/pages/shop/manHour/addManHour.vue
@@ -698,13 +698,13 @@ export default {
 
 .btn-draft {
   background-color: #ffffff;
-  color: #E8101E;
-  border: 2rpx solid #E8101E;
+  color: #FF4767;
+  border: 2rpx solid #FF4767;
   box-sizing: border-box;
 }
 
 .btn-submit {
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
 }
 .form-step {
@@ -854,7 +854,7 @@ export default {
 /* #endif */
 
 .redTip {
-  color: #E8101E;
+  color: #FF4767;
   font-size: 24rpx;
   margin-left: 10rpx;
 }
diff --git a/pages/shop/manHour/buyManHour.vue b/pages/shop/manHour/buyManHour.vue
index c1107bd..e8aebc6 100644
--- a/pages/shop/manHour/buyManHour.vue
+++ b/pages/shop/manHour/buyManHour.vue
@@ -713,7 +713,7 @@ export default {
 
     .filter__left__select__item.active {
       .filter__left__select__item__title {
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -819,7 +819,7 @@ export default {
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 3rpx;
 }
 
@@ -855,11 +855,11 @@ export default {
 }
 
 .icon-tab.active .icon-text {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .icon-tab.active .icon-img {
-  border: 2rpx solid #E8101E;
+  border: 2rpx solid #FF4767;
 }
 
 .service-list {
diff --git a/pages/shop/manHour/components/buyOrderCard.vue b/pages/shop/manHour/components/buyOrderCard.vue
index 19e4a4d..7c2df91 100644
--- a/pages/shop/manHour/components/buyOrderCard.vue
+++ b/pages/shop/manHour/components/buyOrderCard.vue
@@ -146,14 +146,14 @@
 						justify-content: center;
 						font-weight: 400;
 						font-size: 26rpx;
-						color: #E8101E;
+						color: #FF4767;
 						line-height: 37rpx;
 						text-align: left;
 						font-style: normal;
 						width: 160rpx;
 						height: 58rpx;
 						border-radius: 32rpx;
-						border: 2rpx solid #E8101E;
+						border: 2rpx solid #FF4767;
 					}
 				}
 			}
diff --git a/pages/shop/manHour/components/class_select.vue b/pages/shop/manHour/components/class_select.vue
index 72ec610..597c3e8 100644
--- a/pages/shop/manHour/components/class_select.vue
+++ b/pages/shop/manHour/components/class_select.vue
@@ -184,7 +184,7 @@ export default {
         color: #333333;
       }
       .activeText {
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -212,9 +212,9 @@ export default {
         border: 2rpx solid transparent;
       }
       .secondClassItemActive {
-        border: 1rpx solid #E8101E;
+        border: 1rpx solid #FF4767;
         background: rgba(252, 67, 124, 0.1);
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -224,7 +224,7 @@ export default {
     margin-top: 30rpx;
     font-size: 26rpx;
     .red {
-      color: #E8101E;
+      color: #FF4767;
     }
   }
   .fixBottomBtn {
@@ -241,10 +241,10 @@ export default {
     .btn {
       width: 100%;
       height: 39rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
       border-radius: 39rpx;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
     }
   }
 }
diff --git a/pages/shop/manHour/components/manHourCard.vue b/pages/shop/manHour/components/manHourCard.vue
index d14b856..1933485 100644
--- a/pages/shop/manHour/components/manHourCard.vue
+++ b/pages/shop/manHour/components/manHourCard.vue
@@ -272,7 +272,7 @@ export default {
   top: 0;
   width: 160rpx;
   height: 100%;
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
   display: flex;
   justify-content: center;
@@ -326,17 +326,17 @@ export default {
 
 .price-symbol {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-value {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-unit {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .status-tag {
@@ -356,7 +356,7 @@ export default {
   background-color: rgba(255, 0, 55, 0.2);
 }
 .status-tag.state2 .status-text {
-  color: #E8101E;
+  color: #FF4767;
 }
 /* 审核中 */
 .status-tag.state1 {
diff --git a/pages/shop/manHour/components/orderCard.vue b/pages/shop/manHour/components/orderCard.vue
index f130e57..a2cada2 100644
--- a/pages/shop/manHour/components/orderCard.vue
+++ b/pages/shop/manHour/components/orderCard.vue
@@ -40,6 +40,8 @@
 
 		<!-- 时间信息 -->
 		<!-- <view class="time-info"><text style="color:#999999 ;">服务时段：</text>{{ useTime }}</view> -->
+		 <!-- 上门地址 -->
+		 <view class="order-address" v-if="dataItem.user_sj.address">上门地址：{{ dataItem.user_sj.address }}</view>
 
 		<!-- 操作按钮 -->
 		<view class="button-group">
@@ -193,7 +195,7 @@
 		.stateText {
 			font-weight: 400;
 			font-size: 26rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: left;
 			font-style: normal;
 			position: absolute;
@@ -281,7 +283,7 @@
 			font-family: DINPro, DINPro;
 			font-weight: 500;
 			font-size: 36rpx;
-			color: #E8101E;
+			color: #FF4767;
 			line-height: 34rpx;
 			text-align: left;
 			font-style: normal;
@@ -304,6 +306,16 @@
 		font-style: normal;
 	}
 
+	.order-address {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 24rpx;
+	}
+
 	/* 时间信息 */
 	.time-info {
 		font-weight: 400;
@@ -321,7 +333,7 @@
 		display: flex;
 		justify-content: flex-end;
 		gap: 30rpx;
-		padding-top: 20rpx;
+		// padding-top: 20rpx;
 		padding-bottom: 30rpx;
 	}
 
@@ -355,7 +367,7 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/manHour/list.vue b/pages/shop/manHour/list.vue
index 469437c..4f5a91f 100644
--- a/pages/shop/manHour/list.vue
+++ b/pages/shop/manHour/list.vue
@@ -310,7 +310,7 @@ export default {
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 3rpx;
 }
 
diff --git a/pages/shop/manHour/manHourDetail.vue b/pages/shop/manHour/manHourDetail.vue
index 294a88d..b4660cd 100644
--- a/pages/shop/manHour/manHourDetail.vue
+++ b/pages/shop/manHour/manHourDetail.vue
@@ -167,7 +167,7 @@ export default {
         &__price {
           font-weight: 500;
           font-size: 36rpx;
-          color: #E8101E;
+          color: #FF4767;
           line-height: 50rpx;
           text-align: left;
           font-style: normal;
@@ -247,10 +247,10 @@ export default {
       width: 696rpx;
       height: 78rpx;
       border-radius: 798rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
       font-weight: 400;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
       line-height: 39rpx;
       text-align: right;
       font-style: normal;
diff --git a/pages/shop/manHour/manHourOrder.vue b/pages/shop/manHour/manHourOrder.vue
index 70200f4..25c05d1 100644
--- a/pages/shop/manHour/manHourOrder.vue
+++ b/pages/shop/manHour/manHourOrder.vue
@@ -236,7 +236,7 @@ export default {
           margin-top: 38rpx;
           font-weight: 500;
           font-size: 28rpx;
-          color: #E8101E;
+          color: #FF4767;
           line-height: 34rpx;
           text-align: left;
           font-style: normal;
@@ -289,7 +289,7 @@ export default {
       &__price {
         font-weight: 500;
         font-size: 42rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 59rpx;
         font-style: normal;
       }
@@ -297,7 +297,7 @@ export default {
     &__right {
       width: 188rpx;
       height: 68rpx;
-      background: linear-gradient(73deg, #fe78b3 0%, #E8101E 100%);
+      background: linear-gradient(73deg, #fe78b3 0%, #FF4767 100%);
       border-radius: 798rpx;
       font-weight: 400;
       font-size: 30rpx;
diff --git a/pages/shop/manHour/saleList.vue b/pages/shop/manHour/saleList.vue
index 1a6741a..f7d0b45 100644
--- a/pages/shop/manHour/saleList.vue
+++ b/pages/shop/manHour/saleList.vue
@@ -57,10 +57,10 @@ export default {
           text: "全部",
         },
 
-        // {
-        //   id: 1,
-        //   text: "待支付",
-        // },
+        {
+          id: 1,
+          text: "待支付",
+        },
         {
           id: 2,
           text: "待接单",
@@ -290,7 +290,7 @@ export default {
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 3rpx;
 }
 
diff --git a/pages/shop/manHourDetail.vue b/pages/shop/manHourDetail.vue
index 100bdd9..5d9d04a 100644
--- a/pages/shop/manHourDetail.vue
+++ b/pages/shop/manHourDetail.vue
@@ -5,7 +5,22 @@
 			:backgroundColor="backgroundColor"></custom-navbar>
 		<view class="content-part">
 			<!-- 订单状态 -->
-			<view class="status-section">
+			<view class="status-section2" v-if="orderInfo.state == '2' || orderInfo.state == '3'">
+				<view class="service-code">
+					<text class="service-code-value">{{ orderInfo.server_code }}</text>
+					<image class="service-code-label" mode="widthFix"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e306ce60-c10c-4eec-a8bf-1b064fc21a32.png" />
+				</view>
+				<view class="status-row">
+					<image class="status-section-image" mode="widthFix"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/27783709-3bda-472a-ab6a-824ed4b11d2a.png" />
+					<text class="status-text-red">
+						{{ stateItem.text }}
+						<text class="status-text-normal">，请上门/到店后出示服务码</text>
+					</text>
+				</view>
+			</view>
+			<view v-else class="status-section">
 				<image class="status-section-image" mode="widthFix" :src="stateItem.icon" />
 				<text class="status-text">{{ stateItem.text }}</text>
 			</view>
@@ -119,7 +134,7 @@
 
 				<!-- <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_money">
 					<text class="label">支付小计</text>
-					<text class="value" style="color: #E8101E">{{ orderInfo.order_money }}元</text>
+					<text class="value" style="color: #FF4767">{{ orderInfo.order_money }}元</text>
 				</view> -->
 				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_time">
 					<text class="label">支付时间</text>
@@ -396,13 +411,14 @@
 					})
 					.then((res) => {
 						if (this.identity == 0) {
+							const userSyr = res.data.user_syr || {};  // 避免 null 展开报错
 							this.orderInfo = res.data ? {
 								...res.data.order,
 								...res.data.work_hour,
-								...res.data.user_syr,
+								...userSyr,                     // 有手艺人就展开，没有就是空对象
 								work_hour_id: res.data.work_hour.id,
 								order_id: res.data.order.id,
-								user_sj_id: res.data.user_syr.id,
+								syr_id: userSyr.id,             // 手艺人ID（无手艺人时为 undefined）
 							} : {};
 							console.log(this.orderInfo, '----------------------------------')
 						} else if (this.identity == 1) {
@@ -686,6 +702,69 @@
 		font-weight: 600;
 	}
 
+	/* 服务码状态区域 */
+	.status-section2 {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding-top: 55rpx;
+		padding-bottom: 20rpx;
+		gap: 20rpx;
+
+		.status-row {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: auto;
+		}
+
+		.status-section-image {
+			width: 27rpx;
+			margin-right: 6rpx;
+			margin-top: -4rpx;
+		}
+
+		.service-code {
+			display: flex;
+			align-items: baseline;
+			justify-content: center;
+			width: auto;
+			padding-bottom: 20rpx;
+
+			.service-code-label {
+				width: 96rpx;
+				height: 41rpx;
+				margin-left: 6rpx;
+				position: relative;
+				top: -45rpx;
+			}
+
+			.service-code-value {
+				font-family: DINPro, DINPro;
+				font-weight: bold;
+				font-size: 80rpx;
+				color: #333333;
+				line-height: 103rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		.status-text-red {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #DC232F;
+			line-height: 37rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.status-text-normal {
+			color: #333333;
+		}
+	}
+
 	/* 预约手艺人信息卡片 */
 	.syr-card {
 		margin: 30rpx;
@@ -844,7 +923,7 @@
 	.real-price {
 		font-size: 42rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 		transform: translateY(-5rpx);
 
 		.icon {
@@ -988,14 +1067,14 @@
 	}
 
 	.btn-border {
-		border: 1rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 60rpx;
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
@@ -1007,7 +1086,7 @@
 	.btn-border .button-text {
 		font-size: 28rpx;
 		font-weight: 400;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* 权限提示 */
diff --git a/pages/shop/pay-order.vue b/pages/shop/pay-order.vue
index 06887d8..94a2717 100644
--- a/pages/shop/pay-order.vue
+++ b/pages/shop/pay-order.vue
@@ -330,13 +330,13 @@ export default {
 
 .symbol {
   font-size: 28rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
 .value {
   font-size: 40rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 700;
 }
 
@@ -392,13 +392,13 @@ export default {
 .total-amount .symbol {
   font-size: 24rpx;
   font-weight: 500;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .total-amount .amount {
   font-size: 28rpx;
   font-weight: 500;
-  color: #E8101E;
+  color: #FF4767;
 }
 .amount-lable {
 	font-size: 24rpx;
@@ -407,7 +407,7 @@ export default {
 .pay-btn {
   width: 492rpx;
   height: 64rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 32rpx;
   color: #FFFFFF;
   font-size: 28rpx;
diff --git a/pages/shop/pay.vue b/pages/shop/pay.vue
index 9d76ba8..1e07185 100644
--- a/pages/shop/pay.vue
+++ b/pages/shop/pay.vue
@@ -24,7 +24,7 @@
 						<image :src="item.icon" mode="aspectFit" class="method-icon"></image>
 						<text class="method-name">{{ item.name }}</text>
 					</view>
-					<agree-radio :isAgree="item.selected" :yesImg="`/static/images/icons/yes_icon.png`"
+					<agree-radio :isAgree="item.selected" :yesImg="`/static/images/agree_y.png`"
 						:radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
 				</view>
 			</view>
@@ -267,7 +267,7 @@
 											console.log("查询状态", err);
 										});
 								},
-								fail: function(err) {
+								fail: function(err) {
 									console.log(err,'erererererer');
 									uni.showModal({
 										title: "提示",
@@ -530,13 +530,13 @@
 	.total-amount .symbol {
 		font-size: 24rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.total-amount .amount {
 		font-size: 28rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.amount-lable {
@@ -547,7 +547,7 @@
 	.pay-btn {
 		width: 680rpx;
 		height: 88rpx;
-		background: linear-gradient(180deg, #F52540 0%, #E8101E 100%);
+		background: linear-gradient(180deg, #F52540 0%, #FF4767 100%);
 		border-radius: 43rpx;
 		font-weight: 500;
 		font-size: 30rpx;
diff --git a/pages/shop/photoAlbum/addPhoto.vue b/pages/shop/photoAlbum/addPhoto.vue
index 6c36e5c..3746216 100644
--- a/pages/shop/photoAlbum/addPhoto.vue
+++ b/pages/shop/photoAlbum/addPhoto.vue
@@ -12,7 +12,7 @@
 		</view>
 		<view class="review" v-if="imgItem.apply_state==2">
 			<view class="review-title">
-				<text class="review-title-text">审核成功<text style="color: #E8101E;">、线上展示中</text></text>
+				<text class="review-title-text">审核成功<text style="color: #FF4767;">、线上展示中</text></text>
 			</view>
 		</view>
 		<view class="review" v-if="imgItem.apply_state==3">
@@ -220,14 +220,16 @@
 				// uni.navigateTo({
 				// 	url: `/pages/album/list?urls=${encodeURIComponent(JSON.stringify(urls))}`
 				// });
-				this.videoPlay = true; // 显示播放盒子
-				this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 必传
-				this.videoUrl = this.formData.url;
-				this.videoContext.requestFullScreen({
-					direction: 90
-				});
-				this.videoContext.play();
-
+				// this.videoPlay = true; // 显示播放盒子
+				// this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 必传
+				// this.videoUrl = this.formData.url;
+				// this.videoContext.requestFullScreen({
+				// 	direction: 90
+				// });
+				// this.videoContext.play();
+				uni.navigateTo({
+					url: '/pages/shop/photoAlbum/videoplayer?url=' + this.formData.url
+				})
 
 			},
 			async submitPhoto() {
@@ -408,9 +410,9 @@
 				let res = null
 
 				try {
-					uni.showLoading({
-						title: '上传中'
-					})
+					// uni.showLoading({
+					// 	title: '上传中'
+					// })
 					console.log(this.formData, '=============================');
 					if (this.formData.type == 1) {
 						res = await uploadImage.handleUpload(this.userInfo.id, 3);
@@ -421,11 +423,19 @@
 					console.log('上传单张图片', res)
 					this.formData.url = res;
 				} catch (err) {
-					console.log(err)
-					uni.showToast({
-						title: '上传失败',
-						icon: 'none'
-					}); // 新增：上传失败提示
+					if (err.errMsg && (err.errMsg.includes('cancel')||err.errMsg.includes('取消'))) {
+						uni.showToast({
+							title: '取消上传',
+							icon: 'none'
+						});
+					} else {
+						console.error('上传失败：', err.errMsg);
+						uni.showToast({
+							title: err.errMsg || '上传失败',
+							icon: 'none'
+						}); // 新增：上传失败提示
+					}
+
 				} finally {
 					uni.hideLoading(); // 移到这里，必执行
 				}
@@ -523,7 +533,7 @@
 				.review-title-text {
 					font-weight: 500;
 					font-size: 28rpx;
-					color: #E8101E;
+					color: #FF4767;
 					line-height: 40rpx;
 					text-align: left;
 					font-style: normal;
@@ -714,10 +724,10 @@
 				width: 278rpx;
 				height: 98rpx;
 				border-radius: 49rpx;
-				border: 1rpx solid #E8101E;
+				border: 1rpx solid #FF4767;
 				font-weight: 400;
 				font-size: 32rpx;
-				color: #E8101E;
+				color: #FF4767;
 				text-align: center;
 				font-style: normal;
 			}
@@ -725,7 +735,7 @@
 			.container-buttons-sure {
 				width: 278rpx;
 				height: 98rpx;
-				background: #E8101E;
+				background: #FF4767;
 				border-radius: 49rpx;
 				font-weight: 400;
 				font-size: 32rpx;
@@ -737,7 +747,7 @@
 			.container-buttons-sure2 {
 				width: 710rpx;
 				height: 98rpx;
-				background: #E8101E;
+				background: #FF4767;
 				border-radius: 49rpx;
 				font-weight: 400;
 				font-size: 38rpx;
diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue
index 3bf736b..6d3d7a6 100644
--- a/pages/shop/photoAlbum/photoManage.vue
+++ b/pages/shop/photoAlbum/photoManage.vue
@@ -5,7 +5,7 @@
 		<view class="container-titles flex-row-center-between">
 			<view class="titles-left">
 				<view class="titles-bar"></view>
-				<text class="titles-title">商家相册</text>
+				<text class="titles-title">{{ titleList[type].title2 }}</text>
 			</view>
 			<view class="titles-right" @click="todetail">
 				<text class="titles-text">展示位置及拍摄技巧</text>
@@ -112,6 +112,16 @@
 						}
 					],
 				},
+				titleList: {
+					1: {
+						title: "商家图片",
+						title2: "商家相册"
+					},
+					2: {
+						title: "视频作品",
+						title2: "商家视频"
+					},
+				},
 				imgVideoList: {
 
 				},
@@ -136,8 +146,11 @@
 		methods: {
 			todetail() {
 				console.log('详情');
+				// uni.navigateTo({
+				// 	url: '/pages/shop/skill-detail'
+				// })
 				uni.navigateTo({
-					url: '/pages/shop/skill-detail'
+					url: `/pages/agreement/agreement?type=${this.type==1?22:23}&title=${this.type==1?`相册配置说明`:`视频配置说明`}`
 				})
 			},
 			getItem(item) {
@@ -154,7 +167,7 @@
 				}
 				if (item.id == 0) {
 					obj.url = item.url || item.auth_url
-					obj.name = item.name || item.auth_name
+					obj.name = item.name || item.name
 				}
 				if (item.type == 2) {
 					obj.url = obj.url + `?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`
@@ -176,25 +189,28 @@
 				// });
 			},
 			goAdd(id, item) {
-				if (this.type == 1) {
-					if (this.imgVideoList[id] && this.imgVideoList[id].length >= 21) {
-						uni.showToast({
-							title: '最多上传20张图片',
-							icon: 'none',
-							duration: 2000
-						});
-						return
-					}
-				} else if (this.type == 2) {
-					if (this.imgVideoList[id] && this.imgVideoList[id].length >= 11) {
-						uni.showToast({
-							title: '最多上个10张视频',
-							icon: 'none',
-							duration: 2000
-						});
-						return
+				if (!item) {
+					if (this.type == 1) {
+						if (this.imgVideoList[id] && this.imgVideoList[id].length >= 20) {
+							uni.showToast({
+								title: '最多上传20张图片',
+								icon: 'none',
+								duration: 2000
+							});
+							return
+						}
+					} else if (this.type == 2) {
+						if (this.imgVideoList[id] && this.imgVideoList[id].length >= 10) {
+							uni.showToast({
+								title: '最多上个10张视频',
+								icon: 'none',
+								duration: 2000
+							});
+							return
+						}
 					}
 				}
+
 				// 1. 原有逻辑：分类id为空，拦截提示
 				if (!id) {
 					uni.showToast({
@@ -259,7 +275,7 @@
 				.titles-bar {
 					width: 6rpx;
 					height: 30rpx;
-					background-color: #E8101E;
+					background-color: #FF4767;
 					margin-right: 10rpx;
 					border-radius: 5rpx;
 				}
diff --git a/pages/shop/photoAlbum/videoList.vue b/pages/shop/photoAlbum/videoList.vue
index e2445bb..0d11f06 100644
--- a/pages/shop/photoAlbum/videoList.vue
+++ b/pages/shop/photoAlbum/videoList.vue
@@ -24,7 +24,7 @@
 					@click="isManage ? toggleSelect(index2) : goAdd(class_type,item2)">
 					<!-- 选择框 -->
 					<image class="content-photo-select" v-if="isManage"
-						:src="selectedItems.includes(index2) ? '/static/images/icons/yes_icon.png' : '/static/images/icons/no_icon2.png'">
+						:src="selectedItems.includes(index2) ? '/static/images/agree_y.png' : '/static/images/icons/no_icon2.png'">
 					</image>
 					<image class="content-photo-img" mode="aspectFill" :src="getItem(item2).url"></image>
 					<view class="content-photo-title">
@@ -47,7 +47,7 @@
 					v-if="imgVideoList" @click="isManage ? toggleSelect(index2) : goAdd(class_type,item2)">
 					<!-- 选择框 -->
 					<image class="content-photo-select" v-if="isManage"
-						:src="selectedItems.includes(index2) ? '/static/images/icons/yes_icon.png' : '/static/images/icons/no_icon2.png'">
+						:src="selectedItems.includes(index2) ? '/static/images/agree_y.png' : '/static/images/icons/no_icon2.png'">
 					</image>
 					<image class="content-photo-video" mode="aspectFill" :src="getItem(item2).url"></image>
 					<view class="content-photo-title">
@@ -171,25 +171,28 @@
 			},
 			goAdd(id, item) {
 				if (this.isManage) return; // 管理模式下禁止跳转
-				if (this.type == 1) {
-					if (this.imgVideoList.length >= 21) {
-						uni.showToast({
-							title: '最多上传20张图片',
-							icon: 'none',
-							duration: 2000
-						});
-						return
-					}
-				} else if (this.type == 2) {
-					if (this.imgVideoList.length >= 11) {
-						uni.showToast({
-							title: '最多上10个视频',
-							icon: 'none',
-							duration: 2000
-						});
-						return
+				if(!item){
+					if (this.type == 1) {
+						if (this.imgVideoList.length >= 20) {
+							uni.showToast({
+								title: '最多上传20张图片',
+								icon: 'none',
+								duration: 2000
+							});
+							return
+						}
+					} else if (this.type == 2) {
+						if (this.imgVideoList.length >= 10) {
+							uni.showToast({
+								title: '最多上10个视频',
+								icon: 'none',
+								duration: 2000
+							});
+							return
+						}
 					}
 				}
+				
 				if (!id) {
 					uni.showToast({
 						title: '参数异常，无法上传',
@@ -471,10 +474,10 @@
 			width: 278rpx;
 			height: 98rpx;
 			border-radius: 49rpx;
-			border: 1rpx solid #E8101E;
+			border: 1rpx solid #FF4767;
 			font-weight: 400;
 			font-size: 32rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: center;
 			font-style: normal;
 		}
@@ -482,7 +485,7 @@
 		.container-buttons-sure {
 			width: 278rpx;
 			height: 98rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 49rpx;
 			font-weight: 400;
 			font-size: 32rpx;
@@ -494,7 +497,7 @@
 		.container-buttons-sure2 {
 			width: 710rpx;
 			height: 98rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 49rpx;
 			font-weight: 400;
 			font-size: 38rpx;
diff --git a/pages/shop/photoAlbum/videoplayer.vue b/pages/shop/photoAlbum/videoplayer.vue
new file mode 100644
index 0000000..9ae18ef
--- /dev/null
+++ b/pages/shop/photoAlbum/videoplayer.vue
@@ -0,0 +1,106 @@
+<template>
+	<view class="video-page">
+		<!-- 原生视频组件：全端兼容 -->
+		<video id="fullVideo" class="video-box" :src="videoUrl" controls show-fullscreen-btn enable-progress-gesture
+			:autoplay="true" :loop="false" :muted="false" @play="onPlay" @pause="onPause" object-fit="cover" :direction="90"
+			@fullscreenchange="handleFullScreenChange" @ended="onVideoEnd" @fullscreenclick="tapback"></video>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				videoUrl: "",
+				videoContext: null
+			};
+		},
+		onLoad(options) {
+			console.log(options, '页面参数');
+			// 接收视频地址
+			if (options.url) {
+				this.videoUrl = options.url;
+			}
+		},
+		onReady() {
+			// #ifdef APP-PLUS
+			//plus.screen.unlockOrientation(); //解除屏幕方向的锁定，但是不一定是竖屏；
+			
+			// #endif
+			// 初始化视频实例（唯一正确位置）
+			this.videoContext = uni.createVideoContext("fullVideo", this);
+			// 页面渲染完成后 安全触发自动全屏
+			//this.autoFullScreen();
+		},
+		methods: {
+			tapback(e) {
+				console.log('点击全屏按钮');
+				// if (e.target.fullScreen) {
+				// 	plus.screen.lockOrientation('landscape'); //锁死屏幕方向为竖屏
+				// }else{
+				// 	plus.screen.lockOrientation('portrait'); //锁死屏幕方向为竖屏
+				// }
+			},
+			// 自动全屏（核心：修复iOS方向错乱）
+			autoFullScreen() {
+				if (!this.videoContext) return;
+
+				// 区分平台设置方向：iOS用0自适应，安卓用90横屏
+				const direction = uni.getSystemInfoSync().platform === 'ios' ? 0 : 90;
+
+				// 延迟执行，避免视频未加载完成导致全屏失败
+				setTimeout(() => {
+					this.videoContext.requestFullScreen({
+						direction: direction
+					});
+				}, 300)
+			},
+			// 手动横屏全屏
+			openFullScreen() {
+				if (!this.videoContext) return;
+				const direction = uni.getSystemInfoSync().platform === 'ios' ? 0 : 90;
+				this.videoContext.requestFullScreen({
+					direction
+				});
+			},
+			// 退出全屏
+			closeFullScreen() {
+				if (!this.videoContext) return;
+				this.videoContext.exitFullScreen();
+			},
+			// 播放监听
+			onPlay() {
+				console.log("视频开始播放");
+			},
+			// 暂停监听
+			onPause() {
+				console.log("视频暂停");
+			},
+			// 全屏状态切换
+			handleFullScreenChange(e) {
+				// 全屏隐藏导航栏，退出显示
+				// uni.setNavigationBarHidden(!!e.detail.fullScreen);
+				console.log("全屏状态：", e.detail.fullScreen);
+			},
+			// 视频播放完毕
+			onVideoEnd() {
+				this.closeFullScreen();
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.video-page {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+	}
+
+	.video-box {
+		width: 100%;
+		/* 自适应高度，避免拉伸 */
+		height: 100%;
+		object-fit: cover;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shop/qualification_sj_change.vue b/pages/shop/qualification_sj_change.vue
index 96630ee..b028216 100644
--- a/pages/shop/qualification_sj_change.vue
+++ b/pages/shop/qualification_sj_change.vue
@@ -6,7 +6,7 @@
     <view class="change-tip" v-if="editable">
       <text>请变更您需要变更的信息</text>
     </view>
-    
+
     <!-- 页面内容容器 -->
     <view class="content-area" :style="{ paddingBottom: buttonAreaHeight + 'px' }">
       <!-- 营业执照部分 -->
@@ -23,8 +23,11 @@
           <view class="upload-container">
             <view class="upload-box" @click="editable && chooseImage('uscc_photo')">
               <view class="upload-camera license-upload">
-                <image v-if="displayData.uscc_photo" :src="displayData.uscc_photo" mode="aspectFill" class="preview-image"></image>
-                <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/92bd4268-b4d7-4725-8664-9e44f828c7d9" mode="aspectFit" class="camera-icon"></image>
+                <image v-if="displayData.uscc_photo" :src="displayData.uscc_photo" mode="aspectFill"
+                  class="preview-image"></image>
+                <image v-else
+                  src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/92bd4268-b4d7-4725-8664-9e44f828c7d9"
+                  mode="aspectFit" class="camera-icon"></image>
               </view>
             </view>
             <text class="upload-label required">请上传营业执照原件</text>
@@ -36,27 +39,57 @@
           <view class="label-wrapper">
             <text class="label required">商户类型</text>
           </view>
-          <input type="text" v-model="displayData.uscc_type" placeholder="请输入商户类型" 
-                 :disabled="!editable" placeholder-class="placeholder" class="input" />
+          <input type="text" v-model="displayData.uscc_type" placeholder="请输入商户类型" :disabled="!editable"
+            placeholder-class="placeholder" class="input" />
         </view>
 
         <!-- 营业执照信息 -->
         <view class="form-item-one box-cont">
           <view class="label-wrapper">
             <text class="label required">证件号码</text>
-            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_num')"></image>
+            <image class="label-icon"
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+              mode="aspectFit" @click="showTipPopup('uscc_num')"></image>
           </view>
-          <input type="text" v-model="displayData.uscc_num" placeholder="请输入营业执照的证件号码" 
-                 :disabled="!editable" placeholder-class="placeholder" class="input" />
+          <input type="text" v-model="displayData.uscc_num" placeholder="请输入营业执照的证件号码" :disabled="!editable"
+            placeholder-class="placeholder" class="input" />
         </view>
 
         <view class="form-item-one box-cont">
           <view class="label-wrapper">
             <text class="label required">企业名称</text>
-            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_name')"></image>
+            <image class="label-icon"
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+              mode="aspectFit" @click="showTipPopup('uscc_name')"></image>
+          </view>
+          <input type="text" v-model="displayData.uscc_name" placeholder="请输入营业执照的企业名称" :disabled="!editable"
+            placeholder-class="placeholder" class="input" />
+        </view>
+
+        <view class="form-item-one box-cont" @click="editable && showRegionPicker()">
+          <view class="label-wrapper">
+            <text class="label required">注册地区</text>
+          </view>
+          <view class="picker-content">
+            <text :class="displayData.uscc_dependency ? 'picker-value' : 'placeholder'">
+              {{ displayData.uscc_dependency || '请选择' }}
+            </text>
+            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+              class="arrow-right" mode="aspectFit"></image>
+          </view>
+        </view>
+
+        <view class="form-item-one box-cont" @click="editable && getAddressInfo()">
+          <view class="label-wrapper">
+            <text class="label required">注册详细地址</text>
+          </view>
+          <view class="picker-content">
+            <text :class="displayData.uscc_address ? 'picker-value' : 'placeholder'">
+              {{ displayData.uscc_address || '请选择' }}
+            </text>
+            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+              class="arrow-right" mode="aspectFit"></image>
           </view>
-          <input type="text" v-model="displayData.uscc_name" placeholder="请输入营业执照的企业名称" 
-                 :disabled="!editable" placeholder-class="placeholder" class="input" />
         </view>
       </view>
 
@@ -73,25 +106,31 @@
             <view class="form-item">
               <text class="label required">身份证照片</text>
               <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
-              
+
               <view class="idcard-upload-vertical-container">
                 <!-- 身份证正面 -->
                 <view class="idcard-upload-vertical-item">
                   <view class="upload-box" @click="editable && chooseImage('legal_idcard_positive')">
                     <view class="upload-camera idcard-front">
-                      <image v-if="displayData.legal_idcard_positive" :src="displayData.legal_idcard_positive" mode="aspectFill" class="preview-image"></image>
-                      <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/043b0c97-79c1-4f95-810f-c33e3d5269a3" mode="aspectFit" class="camera-icon"></image>
+                      <image v-if="displayData.legal_idcard_positive" :src="displayData.legal_idcard_positive"
+                        mode="aspectFill" class="preview-image"></image>
+                      <image v-else
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/043b0c97-79c1-4f95-810f-c33e3d5269a3"
+                        mode="aspectFit" class="camera-icon"></image>
                     </view>
                   </view>
                   <text class="upload-label required">请上传身份证正面（人像面）</text>
                 </view>
-                
+
                 <!-- 身份证反面 -->
                 <view class="idcard-upload-vertical-item">
                   <view class="upload-box" @click="editable && chooseImage('legal_idcard_negative')">
                     <view class="upload-camera idcard-back">
-                      <image v-if="displayData.legal_idcard_negative" :src="displayData.legal_idcard_negative" mode="aspectFill" class="preview-image"></image>
-                      <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/203cfdf4-2501-44e6-8565-ad251c6bf0fa" mode="aspectFit" class="camera-icon"></image>
+                      <image v-if="displayData.legal_idcard_negative" :src="displayData.legal_idcard_negative"
+                        mode="aspectFill" class="preview-image"></image>
+                      <image v-else
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/203cfdf4-2501-44e6-8565-ad251c6bf0fa"
+                        mode="aspectFit" class="camera-icon"></image>
                     </view>
                   </view>
                   <text class="upload-label required">请上传身份证反面（国徽面）</text>
@@ -104,22 +143,24 @@
         <view class="form-item-one box-cont">
           <view class="label-wrapper">
             <text class="label required">法人代表</text>
-            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('legal_name')"></image>
+            <image class="label-icon"
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+              mode="aspectFit" @click="showTipPopup('legal_name')"></image>
           </view>
-          <input type="text" v-model="displayData.legal_name" placeholder="请输入营业执照的法人代表" 
-                 :disabled="!editable" placeholder-class="placeholder" class="input" />
+          <input type="text" v-model="displayData.legal_name" placeholder="请输入营业执照的法人代表" :disabled="!editable"
+            placeholder-class="placeholder" class="input" />
         </view>
 
         <view class="form-item-one box-cont">
           <text class="label required">法人联系方式</text>
-          <input type="number" v-model="displayData.legal_phone" placeholder="请输入法人的联系方式" 
-                :disabled="!editable" placeholder-class="placeholder" class="input"  />
+          <input type="number" v-model="displayData.legal_phone" placeholder="请输入法人的联系方式" :disabled="!editable"
+            placeholder-class="placeholder" class="input" />
         </view>
 
         <view class="form-item-one box-cont">
           <text class="label required">法人身份证号</text>
-          <input type="idcard" v-model="displayData.legal_idcard_num" placeholder="请输入法人身份证号" 
-                 :disabled="!editable" placeholder-class="placeholder" class="input" />
+          <input type="idcard" v-model="displayData.legal_idcard_num" placeholder="请输入法人身份证号" :disabled="!editable"
+            placeholder-class="placeholder" class="input" />
         </view>
 
         <!-- 身份证有效期 -->
@@ -128,13 +169,15 @@
           <view class="radio-group">
             <view class="radio-item" @click="editable && setIdcardValidType('permanent')">
               <view class="radio" :class="{ checked: displayData.legal_idcard_expiry_type === 1 }">
-                <image v-if="displayData.legal_idcard_expiry_type === 1" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+                <image v-if="displayData.legal_idcard_expiry_type === 1" src="/static/images/agree_y.png"
+                  class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">长久有效</text>
             </view>
             <view class="radio-item" @click="editable && setIdcardValidType('date')">
               <view class="radio" :class="{ checked: displayData.legal_idcard_expiry_type === 2 }">
-                <image v-if="displayData.legal_idcard_expiry_type === 2" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+                <image v-if="displayData.legal_idcard_expiry_type === 2" src="/static/images/agree_y.png"
+                  class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">指定日期有效</text>
             </view>
@@ -148,30 +191,72 @@
               <text class="date-label">开始日期</text>
               <view class="date-picker-box" @click="editable && openDatePicker('idcard_start_date')">
                 <text :class="displayData.idcard_start_date ? 'date-value' : 'placeholder'">
-                  {{formatDateForDisplay(displayData.idcard_start_date) || '请选择日期'}}
+                  {{ formatDateForDisplay(displayData.idcard_start_date) || '请选择日期' }}
                 </text>
                 <view class="date-divider"></view>
-                <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649" class="date-arrow" mode="aspectFit"></image>
+                <image
+                  src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649"
+                  class="date-arrow" mode="aspectFit"></image>
               </view>
             </view>
             <view class="date-item">
               <text class="date-label">结束日期</text>
-              <view class="date-picker-box" :class="{ disabled: displayData.legal_idcard_expiry_type === 1 }" 
-                    @click="editable && displayData.legal_idcard_expiry_type !== 1 && openDatePicker('idcard_end_date')">
+              <view class="date-picker-box" :class="{ disabled: displayData.legal_idcard_expiry_type === 1 }"
+                @click="editable && displayData.legal_idcard_expiry_type !== 1 && openDatePicker('idcard_end_date')">
                 <text :class="displayData.idcard_end_date ? 'date-value' : 'placeholder'">
-                  {{formatDateForDisplay(displayData.idcard_end_date) || '请选择日期'}}
+                  {{ formatDateForDisplay(displayData.idcard_end_date) || '请选择日期' }}
                 </text>
                 <view class="date-divider"></view>
-                <image  :src="displayData.legal_idcard_expiry_type === 1 ? 
-                  'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9a757f-a36c-46bb-a59f-2caddac5365b' : 
-                  'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649'" 
+                <image :src="displayData.legal_idcard_expiry_type === 1 ?
+                  'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9a757f-a36c-46bb-a59f-2caddac5365b' :
+                  'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649'"
                   class="date-arrow" mode="aspectFit"></image>
               </view>
             </view>
           </view>
         </view>
       </view>
-      
+
+      <!-- 其他信息部分 -->
+      <view class="section">
+        <view class="section-title">
+          <view class="title-bar"></view>
+          <text class="title-text">其他信息</text>
+        </view>
+
+        <view class="form-item-image-box box-cont">
+          <text class="label">行业资质</text>
+          <view class="image-list">
+            <view class="image-item" v-for="(img, index) in displayData.qualifications_sector"
+              :key="'industry-' + index">
+              <image :src="img" mode="aspectFill" class="qualification-image"></image>
+              <view class="image-delete" v-if="editable" @click="removeImage('qualifications_sector', index)">×</view>
+            </view>
+            <view class="image-add" @click="editable && chooseMultiImage('qualifications_sector')"
+              v-if="(displayData.qualifications_sector || []).length < 9">
+              <image
+                src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png"
+                mode="aspectFit" class="upload-icon-small"></image>
+              <text class="add-text">添加照片</text>
+            </view>
+          </view>
+          <text class="label" style="margin-top: 30rpx;">其他资质</text>
+          <view class="image-list">
+            <view class="image-item" v-for="(img, index) in displayData.qualifications_other" :key="'other-' + index">
+              <image :src="img" mode="aspectFill" class="qualification-image"></image>
+              <view class="image-delete" v-if="editable" @click="removeImage('qualifications_other', index)">×</view>
+            </view>
+            <view class="image-add" @click="editable && chooseMultiImage('qualifications_other')"
+              v-if="(displayData.qualifications_other || []).length < 9">
+              <image
+                src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png"
+                mode="aspectFit" class="upload-icon-small"></image>
+              <text class="add-text">添加照片</text>
+            </view>
+          </view>
+        </view>
+      </view>
+
       <!-- 底部安全间距 -->
       <view class="safe-bottom"></view>
     </view>
@@ -180,7 +265,7 @@
     <view class="bottom-actions" ref="buttonArea">
       <!-- 驳回原因提示 -->
       <view class="reject-reason" v-if="shouldShowRejectReason">
-        <view class="reject-title">您的提交已驳回</view>
+        <view class="reject-title">您的变更申请已被驳回</view>
         <view class="reject-detail">驳回原因：{{ backText }}</view>
       </view>
       <!-- 审核中提示 -->
@@ -223,12 +308,13 @@
         </view>
         <view class="popup-body">
           <view class="radio-list">
-            <view class="radio-item" v-for="(item, index) in merchantTypeList" :key="index" 
-                  @click="selectMerchantType(item)">
+            <view class="radio-item" v-for="(item, index) in merchantTypeList" :key="index"
+              @click="selectMerchantType(item)">
               <view class="radio" :class="{ checked: displayData.uscc_type === item.value }">
-                <image v-if="displayData.uscc_type === item.value" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+                <image v-if="displayData.uscc_type === item.value" src="/static/images/agree_y.png"
+                  class="radio-icon-image" mode="aspectFit"></image>
               </view>
-              <text class="radio-label">{{item.label}}</text>
+              <text class="radio-label">{{ item.label }}</text>
             </view>
           </view>
         </view>
@@ -250,16 +336,16 @@
           <text class="confirm-text" @click="confirmDate">确定</text>
         </view>
         <view class="region-body">
-          <picker-view :value="dateValue" @change="bindDateChange" class="picker-scroll" 
-                      :indicator-style="indicatorStyle" mode="date" fields="day">
+          <picker-view :value="dateValue" @change="bindDateChange" class="picker-scroll"
+            :indicator-style="indicatorStyle" mode="date" fields="day">
             <picker-view-column>
-              <view class="picker-item" v-for="(year, index) in years" :key="index">{{year}}年</view>
+              <view class="picker-item" v-for="(year, index) in years" :key="index">{{ year }}年</view>
             </picker-view-column>
             <picker-view-column>
-              <view class="picker-item" v-for="(month, index) in months" :key="index">{{month}}月</view>
+              <view class="picker-item" v-for="(month, index) in months" :key="index">{{ month }}月</view>
             </picker-view-column>
             <picker-view-column>
-              <view class="picker-item" v-for="(day, index) in days" :key="index">{{day}}日</view>
+              <view class="picker-item" v-for="(day, index) in days" :key="index">{{ day }}日</view>
             </picker-view-column>
           </picker-view>
         </view>
@@ -271,8 +357,10 @@
       <view class="tip-popup-mask" @click="hideTipPopup"></view>
       <view class="tip-popup-content">
         <!-- 弹窗背景图片 -->
-        <image class="tip-popup-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770" mode="aspectFit"></image>
-        
+        <image class="tip-popup-bg"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
+          mode="aspectFit"></image>
+
         <!-- 弹窗内容 -->
         <view class="tip-popup-body">
           <view class="tip-title">{{ tipTitle }}</view>
@@ -290,15 +378,55 @@
         </view>
       </view>
     </view>
+
+    <!-- 注册地区选择器 -->
+    <view class="popup" :class="{ show: showRegionPopupFlag }">
+      <view class="popup-mask" @click="hideRegionPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择注册地区</text>
+          <text class="popup-close" @click="hideRegionPopup">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view @change="bindChangeRegion" class="picker-scroll" :indicator-style="indicatorStyle"
+            :value="regionValue">
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
+                {{ item.province }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in regionCitys" :key="index">
+                {{ item.city }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in regionAreas" :key="index">
+                {{ item.area }}
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideRegionPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmRegionSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
     <!-- 存储权限提示 -->
     <view class="permission" :class="{ transform: isShowStoragePer }">
-        <view class="per-tit">美融融plus 对储存空间/照片权限申请说明</view>
-        <view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中读取相册和文件内容。</view>
+      <view class="per-tit">美融融plus 对储存空间/照片权限申请说明</view>
+      <view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中读取相册和文件内容。</view>
     </view>
     <!-- 相机权限提示 -->
     <view class="permission" :class="{ transform: isShowCameraPer }">
-        <view class="per-tit">美融融plus 对相机拍摄权限申请说明</view>
-        <view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。</view>
+      <view class="per-tit">美融融plus 对相机拍摄权限申请说明</view>
+      <view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。</view>
     </view>
   </view>
 </template>
@@ -310,15 +438,16 @@ import uploadImage from '../../utils/uploadImage';
 import permissionUtils from '../../utils/per';
 import locationService from '../../utils/locationService';
 import { recognizeIdCard, recognizeBusinessLicense, formatDateFromNumber, parseValidPeriod } from '../../utils/orc';
+import ChinaCitys from '../../static/data/ChinaCitys.json';
 
 export default {
   data() {
     const currentDate = new Date();
     const currentYear = new Date().getFullYear();
-    const years = Array.from({length: 130}, (_, i) => 1970 + i);
-    const months = Array.from({length: 12}, (_, i) => i + 1);
-    const days = Array.from({length: 31}, (_, i) => i + 1);
-    
+    const years = Array.from({ length: 130 }, (_, i) => 1970 + i);
+    const months = Array.from({ length: 12 }, (_, i) => i + 1);
+    const days = Array.from({ length: 31 }, (_, i) => i + 1);
+
     return {
       // 页面状态
       editable: false,
@@ -331,7 +460,7 @@ export default {
       buttonAreaHeight: 120,
       backText: '',
       hasResubmitted: false,
-      
+
       // 数据管理
       originalData: {},
       pendingData: {},
@@ -364,6 +493,14 @@ export default {
 
       isShowStoragePer: false,
       isShowCameraPer: false,
+
+      showRegionPopupFlag: false,
+      ChinaCitys: ChinaCitys,
+      regionCitys: [],
+      regionAreas: [],
+      regionValue: [0, 0, 0],
+      addressListener: null,
+      sjAddressListener: null,
     }
   },
   computed: {
@@ -374,10 +511,15 @@ export default {
   onLoad(options) {
     console.log('资质信息变更页面开始加载...');
     this.identity = getApp().globalData.artisanType;
-    
+
     this.hasResubmitted = false;
     this.backText = '';
-    
+
+    this.regionCitys = this.ChinaCitys[0].citys;
+    this.regionAreas = this.regionCitys[0].areas;
+
+    this.setupAddressListener();
+
     this.getUserInfo().then(() => {
       this.loadApplyDetails();
     });
@@ -386,19 +528,18 @@ export default {
     this.getButtonAreaHeight();
   },
   onShow() {
-    // 只有在非编辑状态下才重新加载数据
+    this.checkAddressData();
     if (!this.editable) {
-      console.log('非编辑状态，刷新数据');
       this.loadApplyDetails();
-      
       if (this.auditStatus !== 3) {
         this.backText = '';
         this.hasResubmitted = false;
       }
-    } else {
-      console.log('编辑状态，保持当前状态不刷新');
     }
   },
+  onUnload() {
+    this.removeAddressListener();
+  },
   methods: {
     /**
      * 识别营业执照
@@ -407,7 +548,7 @@ export default {
       try {
         this.isRecognizing = true;
         this.recognizeType = 'business_license';
-        
+
         // 调用OCR接口
         const result = await recognizeBusinessLicense(imageUrl);
         console.log('营业执照识别结果:', result);
@@ -422,7 +563,7 @@ export default {
           this.isRecognizing = false;
           return;
         }
-        
+
         // 填充营业执照信息
         let recognizedFields = 0;
 
@@ -434,12 +575,12 @@ export default {
           // 如果是"无"或空值，设置为空字符串
           this.displayData.uscc_name = '';
         }
-        
+
         if (result.uscc_num && result.uscc_num.trim()) {
           this.displayData.uscc_num = result.uscc_num;
           recognizedFields++;
         }
-        
+
         // if (result.legal_name && result.legal_name.trim()) {
         //   this.displayData.legal_name = result.legal_name;
         //   recognizedFields++;
@@ -460,14 +601,14 @@ export default {
             duration: 3000
           });
         }
-        
+
       } catch (error) {
         uni.showToast({
           title: error.message || '识别失败，请手动填写',
           icon: 'none',
         });
         console.error('营业执照识别失败:', error);
-        
+
       } finally {
         this.isRecognizing = false;
       }
@@ -476,16 +617,16 @@ export default {
     // 检查营业执照识别结果是否有效
     checkBusinessLicenseRecognition(result) {
       const requiredFields = ['uscc_num', 'uscc_name', 'legal_name', 'uscc_type'];
-      
+
       for (const field of requiredFields) {
         if (result[field] && result[field].trim()) {
           return true;
         }
       }
-      
+
       return false;
     },
-    
+
     /**
      * 识别身份证正面
      */
@@ -493,18 +634,18 @@ export default {
       try {
         this.isRecognizing = true;
         this.recognizeType = 'idcard_front';
-        
+
         uni.showLoading({
           title: '正在识别身份证正面...',
           mask: true
         });
-        
+
         // 调用OCR接口
         const result = await recognizeIdCard(imageUrl, 1);
 
         // 验证是否真的识别到了数据
         const hasRecognizedData = this.checkIdCardFrontRecognition(result);
-        
+
         if (!hasRecognizedData) {
           uni.hideLoading();
           uni.showToast({
@@ -515,22 +656,22 @@ export default {
           this.isRecognizing = false;
           return;
         }
-        
+
         // 填充身份证正面信息
         if (result.name) {
           this.displayData.legal_name = result.name;
         }
-        
+
         if (result.id_number) {
           this.displayData.legal_idcard_num = result.id_number;
         }
-        
+
         uni.hideLoading();
         uni.showToast({
           title: '身份证正面识别成功',
           icon: 'none'
         });
-        
+
       } catch (error) {
         console.error('身份证正面识别失败:', error);
         uni.hideLoading();
@@ -548,7 +689,7 @@ export default {
     checkIdCardFrontRecognition(result) {
       return (result.name && result.name.trim()) || (result.id_number && result.id_number.trim());
     },
-    
+
     /**
      * 识别身份证反面
      */
@@ -556,18 +697,18 @@ export default {
       try {
         this.isRecognizing = true;
         this.recognizeType = 'idcard_back';
-        
+
         uni.showLoading({
           title: '正在识别身份证反面...',
           mask: true
         });
-        
+
         // 调用OCR接口
         const result = await recognizeIdCard(imageUrl, 2);
 
         // 验证是否真的识别到了数据
         const hasRecognizedData = this.checkIdCardBackRecognition(result);
-        
+
         if (!hasRecognizedData) {
           uni.hideLoading();
           uni.showToast({
@@ -578,15 +719,15 @@ export default {
           this.isRecognizing = false;
           return;
         }
-        
+
         // 解析有效期
         const validPeriod = parseValidPeriod(result.start_date, result.end_date);
-        
+
         // 填充有效期数据
         if (validPeriod.startDate) {
           this.displayData.idcard_start_date = validPeriod.startDate;
         }
-        
+
         if (validPeriod.isPermanent) {
           this.displayData.legal_idcard_expiry_type = 1;
           this.displayData.idcard_end_date = '长久有效';
@@ -594,20 +735,20 @@ export default {
           this.displayData.legal_idcard_expiry_type = 2;
           this.displayData.idcard_end_date = validPeriod.endDate;
         }
-        
+
         // 如果是长期有效，自动选择对应的选项
         if (validPeriod.isPermanent) {
           this.setIdcardValidType('permanent');
         } else {
           this.setIdcardValidType('date');
         }
-        
+
         uni.hideLoading();
         uni.showToast({
           title: '身份证反面识别成功',
           icon: 'none'
         });
-        
+
       } catch (error) {
         console.error('身份证反面识别失败:', error);
         uni.hideLoading();
@@ -623,8 +764,8 @@ export default {
 
     // 检查身份证反面识别结果是否有效
     checkIdCardBackRecognition(result) {
-      return (result.start_date && result.start_date.trim()) || 
-            (result.end_date && result.end_date.trim());
+      return (result.start_date && result.start_date.trim()) ||
+        (result.end_date && result.end_date.trim());
     },
 
     // 获取商户类型文本
@@ -637,11 +778,11 @@ export default {
     getUserInfo() {
       return new Promise((resolve, reject) => {
         const userType = 3;
-        request.post('/user/getuser', { type: userType }).then(result => {
+        request.post('/sj/user/getUser', { type: userType }).then(result => {
           if (result.state === 1) {
             this.userId = result.data.id;
             console.log('用户ID获取成功:', this.userId);
-            
+
             this.populateFormDataFromUserInfo(result.data);
             resolve(this.userId);
           } else {
@@ -658,13 +799,20 @@ export default {
     // 从用户信息中填充表单数据
     populateFormDataFromUserInfo(userData) {
       console.log('从用户信息填充表单数据:', userData);
-      
+
       // 初始化老数据
       this.originalData = {
-        uscc_type: userData.uscc_type ? String(userData.uscc_type) : null, // 转换为字符串
+        uscc_type: userData.uscc_type ? String(userData.uscc_type) : null,
         uscc_photo: userData.uscc_photo || '',
         uscc_num: userData.uscc_num || '',
         uscc_name: userData.uscc_name || '',
+        uscc_dependency: userData.uscc_dependency || '',
+        uscc_address: userData.uscc_address || '',
+        uscc_province: userData.uscc_province || '',
+        uscc_city: userData.uscc_city || '',
+        uscc_area: userData.uscc_area || '',
+        longitude: userData.longitude || '',
+        latitude: userData.latitude || '',
         uscc_expiry_type: userData.uscc_expiry_type || null,
         uscc_expiry: userData.uscc_expiry || '',
         license_start_date: '',
@@ -677,15 +825,30 @@ export default {
         idcard_start_date: '',
         idcard_end_date: '',
         legal_idcard_positive: userData.legal_idcard_positive || '',
-        legal_idcard_negative: userData.legal_idcard_negative || ''
+        legal_idcard_negative: userData.legal_idcard_negative || '',
+        qualifications_sector: [],
+        qualifications_other: []
       };
 
-      // 处理营业执照有效期显示
+      if (userData.qualifications_sector) {
+        try {
+          this.originalData.qualifications_sector = typeof userData.qualifications_sector === 'string' ? JSON.parse(userData.qualifications_sector) : userData.qualifications_sector;
+        } catch (e) {
+          this.originalData.qualifications_sector = [];
+        }
+      }
+      if (userData.qualifications_other) {
+        try {
+          this.originalData.qualifications_other = typeof userData.qualifications_other === 'string' ? JSON.parse(userData.qualifications_other) : userData.qualifications_other;
+        } catch (e) {
+          this.originalData.qualifications_other = [];
+        }
+      }
+
       if (this.originalData.uscc_expiry) {
         this.processLicenseExpiry(this.originalData.uscc_expiry, this.originalData);
       }
 
-      // 处理身份证有效期显示
       if (this.originalData.legal_idcard_expiry) {
         this.processIdcardExpiry(this.originalData.legal_idcard_expiry, this.originalData);
       }
@@ -704,18 +867,18 @@ export default {
     // 处理营业执照有效期
     processLicenseExpiry(expiry, targetData) {
       if (!expiry) return;
-      
+
       console.log('处理营业执照有效期:', expiry);
-      
+
       // 处理多种可能的分隔符
       if (expiry.includes('——') || expiry.includes('--') || expiry.includes('-')) {
         const separator = expiry.includes('——') ? '——' : (expiry.includes('--') ? '--' : '-');
         const [startStr, endStr] = expiry.split(separator);
         const startDate = startStr.trim();
         const endDate = endStr.trim();
-        
+
         console.log('营业执照开始日期:', startDate, '结束日期:', endDate);
-        
+
         if (endDate === '长久' || !endDate) {
           targetData.uscc_expiry_type = 1;
           targetData.license_start_date = this.formatDateFromBackend(startDate);
@@ -734,18 +897,18 @@ export default {
     // 处理身份证有效期
     processIdcardExpiry(expiry, targetData) {
       if (!expiry) return;
-      
+
       console.log('处理身份证有效期:', expiry);
-      
+
       // 处理多种可能的分隔符
       if (expiry.includes('——') || expiry.includes('--') || expiry.includes('-')) {
         const separator = expiry.includes('——') ? '——' : (expiry.includes('--') ? '--' : '-');
         const [startStr, endStr] = expiry.split(separator);
         const startDate = startStr.trim();
         const endDate = endStr.trim();
-        
+
         console.log('身份证开始日期:', startDate, '结束日期:', endDate);
-        
+
         if (endDate === '长久' || !endDate) {
           targetData.legal_idcard_expiry_type = 1;
           targetData.idcard_start_date = this.formatDateFromBackend(startDate);
@@ -780,19 +943,19 @@ export default {
         });
 
         console.log('资质信息申请详情接口返回:', res);
-        
+
         if (res.code === 200) {
           if (res.data) {
             const detail = res.data;
             console.log('找到申请记录:', detail);
-            
+
             const statusCheck = this.intelligentStatusCheck(detail);
-            
+
             if (statusCheck.isValid) {
               this.applyId = detail.id;
               this.auditStatus = statusCheck.status;
               this.backText = statusCheck.backText;
-              
+
               console.log('申请记录状态:', {
                 auditStatus: this.auditStatus,
                 backText: this.backText
@@ -803,9 +966,9 @@ export default {
                 this.backText = '';
                 this.hasResubmitted = false;
               }
-              
+
               this.updatePendingDataFromDetail(detail);
-              
+
               if (this.auditStatus === 2) {
                 this.originalData = { ...this.pendingData };
                 console.log('审核通过，同步originalData到pendingData');
@@ -832,10 +995,10 @@ export default {
           this.backText = '';
           this.applyId = null;
         }
-        
+
         await this.refreshUserData();
         this.updatePageStatus();
-        
+
       } catch (error) {
         console.error('加载申请详情失败:', error);
         this.backText = '';
@@ -847,12 +1010,19 @@ export default {
     // 从申请记录详情更新 pendingData
     updatePendingDataFromDetail(detail) {
       console.log('从申请记录更新pendingData:', detail);
-      
+
       this.pendingData = {
         uscc_type: detail.uscc_type ? String(detail.uscc_type) : this.originalData.uscc_type,
         uscc_photo: detail.uscc_photo || this.originalData.uscc_photo,
         uscc_num: detail.uscc_num || this.originalData.uscc_num,
         uscc_name: detail.uscc_name || this.originalData.uscc_name,
+        uscc_dependency: detail.uscc_dependency || this.originalData.uscc_dependency,
+        uscc_address: detail.uscc_address || this.originalData.uscc_address,
+        uscc_province: detail.uscc_province || this.originalData.uscc_province,
+        uscc_city: detail.uscc_city || this.originalData.uscc_city,
+        uscc_area: detail.uscc_area || this.originalData.uscc_area,
+        longitude: detail.longitude || this.originalData.longitude || '',
+        latitude: detail.latitude || this.originalData.latitude || '',
         uscc_expiry_type: detail.uscc_expiry_type || this.originalData.uscc_expiry_type,
         uscc_expiry: detail.uscc_expiry || this.originalData.uscc_expiry,
         license_start_date: '',
@@ -865,9 +1035,26 @@ export default {
         idcard_start_date: '',
         idcard_end_date: '',
         legal_idcard_positive: detail.legal_idcard_positive || this.originalData.legal_idcard_positive,
-        legal_idcard_negative: detail.legal_idcard_negative || this.originalData.legal_idcard_negative
+        legal_idcard_negative: detail.legal_idcard_negative || this.originalData.legal_idcard_negative,
+        qualifications_sector: this.originalData.qualifications_sector || [],
+        qualifications_other: this.originalData.qualifications_other || []
       };
 
+      if (detail.qualifications_sector) {
+        try {
+          this.pendingData.qualifications_sector = typeof detail.qualifications_sector === 'string' ? JSON.parse(detail.qualifications_sector) : detail.qualifications_sector;
+        } catch (e) {
+          this.pendingData.qualifications_sector = this.originalData.qualifications_sector || [];
+        }
+      }
+      if (detail.qualifications_other) {
+        try {
+          this.pendingData.qualifications_other = typeof detail.qualifications_other === 'string' ? JSON.parse(detail.qualifications_other) : detail.qualifications_other;
+        } catch (e) {
+          this.pendingData.qualifications_other = this.originalData.qualifications_other || [];
+        }
+      }
+
       console.log('处理前的pendingData日期字段:', {
         uscc_expiry: this.pendingData.uscc_expiry,
         legal_idcard_expiry: this.pendingData.legal_idcard_expiry
@@ -891,14 +1078,14 @@ export default {
       try {
         console.log('刷新商家最新数据...');
         const userType = 3;
-        const result = await request.post('/user/getuser', { type: userType });
+        const result = await request.post('/sj/user/getUser', { type: userType });
 
         if (result.state === 1 && result.data) {
           const userData = result.data;
           console.log('获取到商家最新数据:', userData);
-          
+
           this.updateOriginalDataFromUser(userData);
-          
+
           // 只有在审核通过时才同步 pendingData 到 originalData
           if (this.auditStatus === 2) {
             this.pendingData = { ...this.originalData };
@@ -906,7 +1093,7 @@ export default {
           } else {
             console.log('非审核通过状态，保持pendingData不变');
           }
-          
+
           console.log('刷新后的数据状态:', {
             originalData: this.originalData,
             pendingData: this.pendingData,
@@ -930,12 +1117,19 @@ export default {
     // 从用户数据更新原始数据
     updateOriginalDataFromUser(userData) {
       console.log('从用户数据更新原始数据:', userData);
-      
+
       this.originalData = {
         uscc_type: userData.uscc_type ? String(userData.uscc_type) : null,
         uscc_photo: userData.uscc_photo || '',
         uscc_num: userData.uscc_num || '',
         uscc_name: userData.uscc_name || '',
+        uscc_dependency: userData.uscc_dependency || '',
+        uscc_address: userData.uscc_address || '',
+        uscc_province: userData.uscc_province || '',
+        uscc_city: userData.uscc_city || '',
+        uscc_area: userData.uscc_area || '',
+        longitude: userData.longitude || '',
+        latitude: userData.latitude || '',
         uscc_expiry_type: userData.uscc_expiry_type || null,
         uscc_expiry: userData.uscc_expiry || '',
         license_start_date: '',
@@ -948,15 +1142,30 @@ export default {
         idcard_start_date: '',
         idcard_end_date: '',
         legal_idcard_positive: userData.legal_idcard_positive || '',
-        legal_idcard_negative: userData.legal_idcard_negative || ''
+        legal_idcard_negative: userData.legal_idcard_negative || '',
+        qualifications_sector: [],
+        qualifications_other: []
       };
 
-      // 处理营业执照有效期显示
+      if (userData.qualifications_sector) {
+        try {
+          this.originalData.qualifications_sector = typeof userData.qualifications_sector === 'string' ? JSON.parse(userData.qualifications_sector) : userData.qualifications_sector;
+        } catch (e) {
+          this.originalData.qualifications_sector = [];
+        }
+      }
+      if (userData.qualifications_other) {
+        try {
+          this.originalData.qualifications_other = typeof userData.qualifications_other === 'string' ? JSON.parse(userData.qualifications_other) : userData.qualifications_other;
+        } catch (e) {
+          this.originalData.qualifications_other = [];
+        }
+      }
+
       if (this.originalData.uscc_expiry) {
         this.processLicenseExpiry(this.originalData.uscc_expiry, this.originalData);
       }
 
-      // 处理身份证有效期显示
       if (this.originalData.legal_idcard_expiry) {
         this.processIdcardExpiry(this.originalData.legal_idcard_expiry, this.originalData);
       }
@@ -976,12 +1185,12 @@ export default {
           backText: ''
         };
       }
-      
+
       if (detail.apply_time) {
         const applyDate = new Date(detail.apply_time);
         const now = new Date();
         const daysDiff = (now - applyDate) / (1000 * 60 * 60 * 24);
-        
+
         if (daysDiff > 7 && this.originalData.uscc_name !== detail.uscc_name) {
           console.log('智能判断：申请记录已过期，忽略历史记录');
           return {
@@ -991,7 +1200,7 @@ export default {
           };
         }
       }
-      
+
       return {
         isValid: true,
         status: detail.apply_state,
@@ -1043,7 +1252,7 @@ export default {
       }
 
       this.updateNavTitle();
-      
+
       console.log('最终页面状态:', {
         auditStatus: this.auditStatus,
         backText: this.backText,
@@ -1067,7 +1276,7 @@ export default {
     startChange() {
       this.editable = true;
       this.buttonType = 'edit';
-      this.displayData = { ...this.pendingData }; 
+      this.displayData = { ...this.pendingData };
       this.updateNavTitle();
     },
 
@@ -1083,7 +1292,7 @@ export default {
     togglePendingData() {
       this.showPendingData = !this.showPendingData;
       console.log('切换显示待审核数据:', this.showPendingData);
-      
+
       if (this.showPendingData) {
         // 显示待审核数据
         this.displayData = { ...this.pendingData };
@@ -1099,11 +1308,11 @@ export default {
     // 提交变更
     async submitChange() {
       console.log('开始提交资质信息变更...');
-      
+
       if (!this.validateForm()) {
         return;
       }
-      
+
       try {
         uni.showLoading({
           title: '提交中...'
@@ -1114,7 +1323,7 @@ export default {
           name: this.displayData.legal_name,
           idcard: this.displayData.legal_idcard_num
         });
-        
+
         if (checkRes.Code == '401') {
           uni.hideLoading();
           uni.showToast({
@@ -1123,7 +1332,7 @@ export default {
           });
           return;
         }
-        
+
         if (checkRes.ResultObject?.BizCode != '1') {
           uni.hideLoading();
           uni.showToast({
@@ -1132,13 +1341,18 @@ export default {
           });
           return;
         }
-        
+
         const submitData = {
           apply_type: this.applyType,
           uscc_type: this.displayData.uscc_type,
           uscc_photo: this.displayData.uscc_photo,
           uscc_num: this.displayData.uscc_num,
           uscc_name: this.displayData.uscc_name,
+          uscc_dependency: this.displayData.uscc_dependency,
+          uscc_address: this.displayData.uscc_address,
+          uscc_province: this.displayData.uscc_province,
+          uscc_city: this.displayData.uscc_city,
+          uscc_area: this.displayData.uscc_area,
           uscc_expiry_type: this.displayData.uscc_expiry_type,
           uscc_expiry: this.displayData.uscc_expiry,
           legal_name: this.displayData.legal_name,
@@ -1147,7 +1361,9 @@ export default {
           legal_idcard_expiry_type: this.displayData.legal_idcard_expiry_type,
           legal_idcard_expiry: this.displayData.legal_idcard_expiry,
           legal_idcard_positive: this.displayData.legal_idcard_positive,
-          legal_idcard_negative: this.displayData.legal_idcard_negative
+          legal_idcard_negative: this.displayData.legal_idcard_negative,
+          qualifications_sector: JSON.stringify(this.displayData.qualifications_sector || []),
+          qualifications_other: JSON.stringify(this.displayData.qualifications_other || [])
         };
 
         // 处理营业执照有效期
@@ -1169,17 +1385,17 @@ export default {
         }
 
         console.log('提交的数据:', submitData);
-        
+
         const res = await request.post('/sj/userSjAuth/apply', submitData);
-        
+
         uni.hideLoading();
-        
+
         if (res.code === 200) {
           uni.showToast({
             title: '提交成功',
             icon: 'none'
           });
-          
+
           // 先更新 pendingData，再设置其他状态
           this.pendingData = { ...this.displayData };
           console.log('提交成功，更新pendingData:', this.pendingData);
@@ -1188,21 +1404,21 @@ export default {
           this.backText = '';
           this.hasResubmitted = true;
           this.applyId = res.data?.id || this.applyId;
-          
+
           console.log('申请ID:', this.applyId);
-          
+
           this.editable = false;
           this.buttonType = 'view';
           this.showAuditTip = true;
           this.showPendingData = false;
           this.displayData = { ...this.originalData };
-          
+
           this.updateNavTitle();
-          
+
           setTimeout(() => {
             this.loadApplyDetails();
           }, 1500);
-          
+
         } else {
           uni.showToast({
             title: res.msg || '提交失败',
@@ -1220,16 +1436,95 @@ export default {
     },
 
     showPermissionDialog(title, content) {
-        return new Promise((resolve) => {
-            uni.showModal({
-                title,
-                content,
-                confirmText: '去开启',
-                success(res) {
-                    resolve(res.confirm);
-                }
-            });
+      return new Promise((resolve) => {
+        uni.showModal({
+          title,
+          content,
+          confirmText: '去开启',
+          success(res) {
+            resolve(res.confirm);
+          }
         });
+      });
+    },
+
+    showRegionPicker() {
+      this.regionCitys = this.ChinaCitys[0].citys;
+      this.regionAreas = this.regionCitys[0].areas;
+      this.showRegionPopupFlag = true;
+    },
+
+    hideRegionPopup() {
+      this.showRegionPopupFlag = false;
+    },
+
+    bindChangeRegion(e) {
+      this.regionValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.regionCitys = this.ChinaCitys[index1].citys;
+      this.regionAreas = this.regionCitys[index2].areas;
+    },
+
+    confirmRegionSelect() {
+      let valueArr = this.regionValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+      let province = this.ChinaCitys[index1].province;
+      let city = this.regionCitys[index2].city;
+      let area = this.regionAreas[index3].area;
+      this.$set(this.displayData, 'uscc_dependency', province + '-' + city + '-' + area);
+      if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+        this.$set(this.displayData, 'uscc_province', String(this.ChinaCitys[index1].code).substring(0, 6));
+      }
+      if (this.regionCitys[index2] && this.regionCitys[index2].code) {
+        this.$set(this.displayData, 'uscc_city', String(this.regionCitys[index2].code).substring(0, 6));
+      }
+      if (this.regionAreas[index3] && this.regionAreas[index3].code) {
+        this.$set(this.displayData, 'uscc_area', String(this.regionAreas[index3].code).substring(0, 6));
+      }
+      this.$set(this.displayData, 'uscc_address', '');
+      this.$set(this.displayData, 'longitude', '');
+      this.$set(this.displayData, 'latitude', '');
+      this.hideRegionPopup();
+    },
+
+    chooseMultiImage(type) {
+      const current = this.displayData[type] || [];
+      const remaining = 9 - current.length;
+      if (remaining <= 0) {
+        uni.showToast({ title: '最多上传9张图片', icon: 'none' });
+        return;
+      }
+      uni.chooseImage({
+        count: remaining,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: async (res) => {
+          if (!res.tempFilePaths || res.tempFilePaths.length === 0) return;
+          uni.showLoading({ title: '上传中...' });
+          for (const tempFilePath of res.tempFilePaths) {
+            const file = { path: tempFilePath, size: 0 };
+            try {
+              const url = await this.directUpload(file, this.userId, 3, type);
+              if (url) {
+                current.push(url);
+              }
+            } catch (e) {
+              console.error('上传失败:', e);
+            }
+          }
+          this.$set(this.displayData, type, [...current]);
+          uni.hideLoading();
+        }
+      });
+    },
+
+    removeImage(type, index) {
+      const list = [...(this.displayData[type] || [])];
+      list.splice(index, 1);
+      this.$set(this.displayData, type, list);
     },
 
     // 表单验证
@@ -1239,18 +1534,20 @@ export default {
         { field: 'uscc_type', message: '请输入商户类型' },
         { field: 'uscc_num', message: '请输入营业执照号码' },
         { field: 'uscc_name', message: '请输入企业名称' },
+        { field: 'uscc_dependency', message: '请选择注册地区' },
+        { field: 'uscc_address', message: '请输入注册详细地址' },
         { field: 'legal_idcard_positive', message: '请上传身份证正面照片' },
         { field: 'legal_idcard_negative', message: '请上传身份证反面照片' },
         { field: 'legal_name', message: '请输入法人代表' },
         { field: 'legal_phone', message: '请输入法人联系方式' },
         { field: 'legal_idcard_num', message: '请输入法人身份证号' },
-        { 
-          condition: () => !this.displayData.legal_idcard_expiry_type, 
-          message: '请选择身份证有效期类型' 
+        {
+          condition: () => !this.displayData.legal_idcard_expiry_type,
+          message: '请选择身份证有效期类型'
         },
-        { 
-          condition: () => !this.displayData.idcard_start_date, 
-          message: '请选择身份证开始日期' 
+        {
+          condition: () => !this.displayData.idcard_start_date,
+          message: '请选择身份证开始日期'
         },
         {
           condition: () => {
@@ -1260,14 +1557,14 @@ export default {
             // 如果选择长久有效，则不需要结束日期
             return false;
           },
-          message: '请选择身份证结束日期' 
+          message: '请选择身份证结束日期'
         },
 
       ];
 
       for (let rule of validationRules) {
         let isValid = true;
-        
+
         if (rule.field) {
           if (!this.displayData[rule.field]) {
             isValid = false;
@@ -1277,7 +1574,7 @@ export default {
             isValid = false;
           }
         }
-        
+
         if (!isValid) {
           uni.showToast({
             title: rule.message,
@@ -1286,7 +1583,7 @@ export default {
           return false;
         }
       }
-      
+
       // 验证手机号格式
       if (!/^1[3-9]\d{9}$/.test(this.displayData.legal_phone)) {
         uni.showToast({
@@ -1295,7 +1592,7 @@ export default {
         });
         return false;
       }
-      
+
       // 验证身份证格式
       if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.displayData.legal_idcard_num)) {
         uni.showToast({
@@ -1304,7 +1601,7 @@ export default {
         });
         return false;
       }
-      
+
       return true;
     },
 
@@ -1332,7 +1629,7 @@ export default {
         }
       }
     },
-    
+
     // 设置身份证有效期类型
     setIdcardValidType(type) {
       if (type === 'permanent') {
@@ -1350,12 +1647,12 @@ export default {
     formatDateForDisplay(dateStr) {
       if (!dateStr) return '';
       if (dateStr === '长久有效') return '长久有效';
-      
+
       if (dateStr.includes('-')) {
         const [year, month, day] = dateStr.split('-');
         return `${year}年${parseInt(month)}月${parseInt(day)}日`;
       }
-      
+
       return dateStr;
     },
 
@@ -1363,7 +1660,7 @@ export default {
     formatDateForBackend(dateStr) {
       if (!dateStr) return '';
       if (dateStr === '长久有效') return '';
-      
+
       const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
       if (match) {
         const year = match[1];
@@ -1371,17 +1668,17 @@ export default {
         const day = match[3].padStart(2, '0');
         return `${year}-${month}-${day}`;
       }
-      
+
       return dateStr;
     },
 
     // 打开日期选择器
     openDatePicker(field) {
       this.currentDateField = field;
-      
+
       const currentDate = new Date();
       let initialDate = currentDate;
-      
+
       if (this.displayData[field] && this.displayData[field] !== '长久有效') {
         const dateStr = this.displayData[field];
         const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
@@ -1389,28 +1686,28 @@ export default {
           initialDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
         }
       }
-      
+
       const yearIndex = this.years.indexOf(initialDate.getFullYear());
       const monthIndex = initialDate.getMonth();
       const dayIndex = initialDate.getDate() - 1;
-      
+
       this.dateValue = [
         yearIndex >= 0 ? yearIndex : 0,
         monthIndex,
         dayIndex
       ];
-      
+
       this.showDatePickerFlag = true;
     },
-    
+
     hideDatePicker() {
       this.showDatePickerFlag = false;
     },
-    
+
     bindDateChange(e) {
       this.dateValue = e.detail.value;
     },
-    
+
     confirmDate() {
       const [yearIndex, monthIndex, dayIndex] = this.dateValue;
       const year = this.years[yearIndex];
@@ -1420,7 +1717,7 @@ export default {
       const selectedDate = new Date(year, month - 1, day);
       const today = new Date();
       today.setHours(0, 0, 0, 0);
-      
+
       if (this.currentDateField.endsWith('_start_date')) {
         if (selectedDate > today) {
           uni.showToast({
@@ -1429,7 +1726,7 @@ export default {
           });
           return;
         }
-        
+
         const relatedEndField = this.currentDateField.replace('_start_date', '_end_date');
         if (this.displayData[relatedEndField] && this.displayData[relatedEndField] !== '长久有效') {
           const endDateStr = this.displayData[relatedEndField];
@@ -1445,7 +1742,7 @@ export default {
             }
           }
         }
-        
+
         // 如果是身份证开始日期，自动计算20年后的结束日期
         if (this.currentDateField === 'idcard_start_date') {
           const endYear = year + 20;
@@ -1478,7 +1775,7 @@ export default {
           }
         }
       }
-      
+
       this.displayData[this.currentDateField] = dateStr;
       this.hideDatePicker();
     },
@@ -1487,15 +1784,15 @@ export default {
     showMerchantTypePicker() {
       this.showMerchantTypePickerFlag = true;
     },
-    
+
     hideMerchantTypePicker() {
       this.showMerchantTypePickerFlag = false;
     },
-    
+
     selectMerchantType(item) {
       this.displayData.uscc_type = item.value;
     },
-    
+
     confirmMerchantType() {
       this.hideMerchantTypePicker();
     },
@@ -1516,7 +1813,7 @@ export default {
           image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/24859872-da37-4beb-8e33-7743813bb5a1'
         }
       };
-      
+
       if (tipConfig[field]) {
         this.tipTitle = tipConfig[field].title;
         this.tipImage = tipConfig[field].image;
@@ -1528,6 +1825,163 @@ export default {
       this.showTipPopupFlag = false;
     },
 
+    buildRegionTextForSearch() {
+      const dependency = String(this.displayData.uscc_dependency || '').trim();
+      if (!dependency) return '';
+      const parts = dependency.split('-');
+      const province = parts[0] || '';
+      const city = parts[1] || '';
+      const district = parts[2] || '';
+      let regionText = '';
+      if (province) regionText += province;
+      if (city && city !== province) regionText += city;
+      if (district) regionText += district;
+      return regionText;
+    },
+
+    getAddressValueForSearch() {
+      const rawAddress = String(this.displayData.uscc_address || '').trim();
+      if (!rawAddress) return '';
+      const dependencyText = String(this.displayData.uscc_dependency || '').trim();
+      const regionText = this.buildRegionTextForSearch();
+      let detail = rawAddress;
+      if (regionText && detail.indexOf(regionText) === 0) {
+        detail = detail.slice(regionText.length).trim();
+      } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+        detail = detail.slice(dependencyText.length).trim();
+      }
+      detail = detail.replace(/^[\s,-]+/, '').trim();
+      return detail || rawAddress;
+    },
+
+    getAddressInfo() {
+      const dependency = String(this.displayData.uscc_dependency || '').trim();
+      const dependencyCode = String(this.displayData.uscc_area || '').trim();
+      const address = this.getAddressValueForSearch();
+      const longitude = String(this.displayData.longitude || '').trim();
+      const latitude = String(this.displayData.latitude || '').trim();
+
+      const hasDependency = !!dependency;
+      const hasAddress = !!address;
+      const hasLocation = !!(longitude && latitude);
+
+      let params = 'source=sj_change';
+
+      if (hasDependency) {
+        params += `&dependency=${encodeURIComponent(dependency)}`;
+        if (dependencyCode) {
+          params += `&dependency_code=${dependencyCode}`;
+        }
+      }
+      if (hasAddress) {
+        params += `&address=${encodeURIComponent(address)}`;
+      }
+      if (hasLocation) {
+        params += `&longitude=${longitude}&latitude=${latitude}`;
+      }
+      if (!hasDependency && !hasAddress && !hasLocation) {
+        params += '&init_current_location=1&silent_locate=1';
+      }
+
+      uni.navigateTo({
+        url: `/pages/address/search?${params}`
+      });
+    },
+
+    setupAddressListener() {
+      this.addressListener = (addressData) => {
+        this.handleAddressSelected(addressData);
+      };
+      this.sjAddressListener = (addressData) => {
+        this.handleAddressSelected(addressData);
+      };
+      uni.$on('address-selected', this.addressListener);
+      uni.$on('address-selected-for-sj', this.sjAddressListener);
+    },
+
+    removeAddressListener() {
+      if (this.addressListener) {
+        uni.$off('address-selected', this.addressListener);
+        this.addressListener = null;
+      }
+      if (this.sjAddressListener) {
+        uni.$off('address-selected-for-sj', this.sjAddressListener);
+        this.sjAddressListener = null;
+      }
+    },
+
+    checkAddressData() {
+      try {
+        const storedAddress = uni.getStorageSync('sj_selected_address');
+        if (storedAddress) {
+          this.handleAddressSelected(storedAddress);
+          uni.removeStorageSync('sj_selected_address');
+          return;
+        }
+      } catch (e) { }
+
+      if (getApp().globalData && getApp().globalData.selectedAddress) {
+        this.handleAddressSelected(getApp().globalData.selectedAddress);
+        delete getApp().globalData.selectedAddress;
+      }
+
+      try {
+        const selectedAddress = uni.getStorageSync('selectedAddress');
+        if (selectedAddress) {
+          this.handleAddressSelected(selectedAddress);
+          uni.removeStorageSync('selectedAddress');
+        }
+      } catch (e) { }
+    },
+
+    handleAddressSelected(addressData) {
+      if (!addressData) return;
+
+      let detailAddress = '';
+      if (addressData.address) {
+        detailAddress = String(addressData.address).trim();
+      } else if (addressData.name) {
+        detailAddress = String(addressData.name).trim();
+        const regionParts = [];
+        if (addressData.pname) regionParts.push(addressData.pname);
+        if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData.cityname);
+        if (addressData.adname) regionParts.push(addressData.adname);
+        const regionText = regionParts.join('');
+        if (regionText && detailAddress.indexOf(regionText) === 0) {
+          detailAddress = detailAddress.slice(regionText.length).trim();
+        }
+        detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
+      }
+
+      this.$set(this.displayData, 'uscc_address', detailAddress);
+
+      if (addressData.location) {
+        const [longitude, latitude] = String(addressData.location).split(',');
+        this.$set(this.displayData, 'longitude', longitude || '');
+        this.$set(this.displayData, 'latitude', latitude || '');
+      }
+
+      if (addressData.pname || addressData.cityname || addressData.adname) {
+        const locationParts = [];
+        if (addressData.pname) locationParts.push(addressData.pname);
+        if (addressData.cityname) locationParts.push(addressData.cityname);
+        if (addressData.adname) locationParts.push(addressData.adname);
+        this.$set(this.displayData, 'uscc_dependency', locationParts.join('-'));
+      }
+
+      if (addressData.provinceCode) {
+        this.$set(this.displayData, 'uscc_province', String(addressData.provinceCode).substring(0, 6));
+      }
+      if (addressData.cityCode) {
+        this.$set(this.displayData, 'uscc_city', String(addressData.cityCode).substring(0, 6));
+      }
+      if (addressData.districtCode) {
+        this.$set(this.displayData, 'uscc_area', String(addressData.districtCode).substring(0, 6));
+      }
+
+      this.$forceUpdate();
+    },
+
     // 图片上传方法
     async chooseImage(type) {
       if (!this.editable) return;
@@ -1626,12 +2080,12 @@ export default {
         console.log('_openCamera - 开始上传图片，字段类型:', type, '用户ID:', this.userId);
 
         const result = await this.directUpload(file, this.userId, 3, type);
-        
+
         uni.hideLoading();
 
         if (result) {
           this.displayData[type] = result;
-          
+
           // 上传成功后自动识别
           if (type === 'uscc_photo') {
             await this.recognizeBusinessLicense(result);
@@ -1644,7 +2098,7 @@ export default {
       } catch (err) {
         uni.hideLoading();
         console.log('上传图片错误:', err);
-        
+
         if (!err.errMsg || !err.errMsg.includes('cancel')) {
           uni.showToast({
             title: '上传失败，请重试',
@@ -1661,7 +2115,7 @@ export default {
 
         let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
         console.log('directUpload - artisan类型:', artisan, '原始type:', type);
-        
+
         let fileExtension = 'jpg';
         if (file.path.includes('.')) {
           let parts = file.path.split('.');
@@ -1670,15 +2124,15 @@ export default {
             fileExtension = ext;
           }
         }
-        
+
         // 添加时间戳确保文件名唯一
         const timestamp = Date.now();
         const random = Math.floor(Math.random() * 10000);
         let name = `${userId}_${artisan}_${fieldName}_${timestamp}_${random}.${fileExtension}`;
         console.log('唯一文件名（包含时间戳）:', name);
 
-        const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
-        
+        const ossConfig = await request.post('/user/getalioss', { type: type, kind: 1 });
+
         return await new Promise((resolve, reject) => {
           uni.uploadFile({
             url: ossConfig.host,
@@ -1703,7 +2157,7 @@ export default {
             fail: reject
           });
         });
-        
+
       } catch (error) {
         console.error('直接上传失败:', error);
         throw error;
@@ -1795,7 +2249,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 7rpx;
   border-radius: 5rpx;
 }
@@ -1948,7 +2402,7 @@ export default {
   width: 60rpx;
   height: 60rpx;
   border: 4rpx solid #fff;
-  border-top: 4rpx solid #E8101E;
+  border-top: 4rpx solid #FF4767;
   border-radius: 50%;
   animation: spin 1s linear infinite;
   margin-bottom: 16rpx;
@@ -1960,8 +2414,13 @@ export default {
 }
 
 @keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
 }
 
 .picker-content {
@@ -2049,8 +2508,8 @@ export default {
 }
 
 .radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .radio-icon-image {
@@ -2149,8 +2608,10 @@ export default {
   margin-top: 20rpx;
 }
 
-.change-info-btn, .view-change-btn, .resubmit-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+.change-info-btn,
+.view-change-btn,
+.resubmit-btn {
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -2171,7 +2632,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
@@ -2260,24 +2721,42 @@ export default {
 
 .popup-footer {
   margin-top: 32rpx;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 28rpx;
 }
 
 .popup-btn {
+  width: 280rpx;
   height: 88rpx;
   border-radius: 44rpx;
   display: flex;
   align-items: center;
   justify-content: center;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
 }
 
-.popup-btn .btn-text {
+.popup-btn.confirm {
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+}
+
+.popup-btn.cancel {
+  border: 2rpx solid #FF4767;
+}
+
+.popup-btn.confirm .btn-text {
   font-size: 32rpx;
   font-weight: 500;
   color: #FFFFFF;
 }
 
-.cancel-text, .confirm-text {
+.popup-btn.cancel .btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #FF4767;
+}
+
+.cancel-text,
+.confirm-text {
   font-size: 32rpx;
   padding: 16rpx;
 }
@@ -2287,7 +2766,7 @@ export default {
 }
 
 .confirm-text {
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -2392,13 +2871,13 @@ export default {
 }
 
 .tip-btn.cancel {
-  border: #E8101E 2rpx solid;
+  border: #FF4767 2rpx solid;
   background-color: transparent;
-  color: #e8101e;
+  color: #FF4767;
 }
 
 .tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   color: #FFFFFF;
 }
 
@@ -2407,8 +2886,83 @@ export default {
 }
 
 .permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-		opacity: 1;
-		visibility: visible;
+  top: calc(var(--status-bar-height) + 88rpx + 20rpx);
+  opacity: 1;
+  visibility: visible;
+}
+
+.image-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+  margin-top: 16rpx;
+}
+
+.image-item {
+  position: relative;
+  width: 200rpx;
+  height: 200rpx;
+}
+
+.qualification-image {
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 12rpx;
+}
+
+.image-delete {
+  position: absolute;
+  top: -10rpx;
+  right: -10rpx;
+  width: 36rpx;
+  height: 36rpx;
+  background: #FF4767;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #FFFFFF;
+  font-size: 28rpx;
+}
+
+.image-add {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border: 2rpx dashed #DDDDDD;
+  width: 214rpx;
+  height: 214rpx;
+  background: #F5F5F5;
+  border-radius: 20rpx;
+}
+
+.upload-icon-small {
+  width: 48rpx;
+  height: 48rpx;
+  margin-bottom: 8rpx;
+}
+
+.add-text {
+  font-size: 22rpx;
+  color: #999999;
+}
+
+.region-body {
+  margin-top: 20rpx;
+}
+
+.region-body .picker-scroll {
+  height: 400rpx;
+}
+
+.form-item-image-box {
+  display: flex;
+  flex-direction: column;
+  padding: 24rpx;
+}
+
+.form-item-image-box .label {
+  margin-bottom: 16rpx;
 }
 </style>
\ No newline at end of file
diff --git a/pages/shop/service-detail.nvue b/pages/shop/service-detail.nvue
index c92093e..17e7151 100644
--- a/pages/shop/service-detail.nvue
+++ b/pages/shop/service-detail.nvue
@@ -527,14 +527,14 @@
 
 	.price-symbol {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 		margin-right: 2rpx;
 	}
 
 	.price-value {
 		font-size: 32rpx;
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -655,7 +655,7 @@
 	.look-btn {
 		width: 130rpx;
 		height: 56rpx;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		display: flex;
 		flex-flow: row nowrap;
 		justify-content: center;
@@ -665,7 +665,7 @@
 
 	.look-text {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* 评论区域 */
@@ -734,7 +734,7 @@
 		font-size: 16rpx;
 		padding: 0 8rpx;
 		border-radius: 12rpx;
-		color: #E8101E;
+		color: #FF4767;
 		background-color: rgba(255, 148, 180, 0.50);
 		margin-right: 8rpx;
 	}
@@ -852,7 +852,7 @@
 	.submit-btn {
 		width: 410rpx;
 		height: 64rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 32rpx;
 		color: #FFFFFF;
 		font-size: 28rpx;
diff --git a/pages/shop/service-skills.vue b/pages/shop/service-skills.vue
index 8b49c83..2075f04 100644
--- a/pages/shop/service-skills.vue
+++ b/pages/shop/service-skills.vue
@@ -1,820 +1,956 @@
 <template>
-	<view class="service-skills-page">
-		<!-- 顶部导航栏 -->
-		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
+    <view class="service-skills-page">
+        <!-- 顶部导航栏 -->
+        <custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
 
-		<!-- 页面内容容器 -->
-		<view class="page-content" :style="{ paddingBottom: buttonAreaHeight + 'px' }">
-			<!-- 服务技能选择区域 -->
-			<view class="skills-container box-cont">
-				<view class="skills-header">
-					<view class="title-bar"></view>
-					<text class="skills-title">服务技能（多选）</text>
-				</view>
-				<view class="skills-subtitle" v-if="editable">请选择服务技能</view>
+        <!-- 页面内容容器 -->
+        <view class="page-content" :style="{ paddingBottom: buttonAreaHeight + 'px' }">
+            <!-- 服务技能选择区域 -->
+            <view class="skills-container box-cont">
+                <view class="skills-header">
+                    <view class="title-bar"></view>
+                    <text class="skills-title">服务技能（多选）</text>
+                </view>
+                <view class="skills-subtitle" v-if="editable">请选择服务技能</view>
 
-				<!-- 显示当前生效的服务技能 -->
-				<view class="skills-list" v-if="!showPendingSkills">
-					<view class="skill-item" v-for="(skill, index) in serviceList" :key="skill.id"
-						:class="{ disabled: true }"  v-if="isCurrentSkillSelected(skill.id)">
-						<view class="checkbox-wrapper">
-							<view class="checkbox" :class="{ checked: isCurrentSkillSelected(skill.id) }">
-								<image class="check-icon"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9"
-									mode="aspectFit">
-								</image>
-							</view>
-						</view>
-						<text class="skill-name">{{ skill.title }}</text>
-					</view>
-				</view>
+                <!-- 显示当前生效的服务技能 -->
+                <view class="skills-list" v-if="!showPendingSkills">
+                    <view class="skill-item" v-for="(skill, index) in serviceList" :key="skill.id"
+                        :class="{ disabled: true }" v-if="isCurrentSkillSelected(skill.id)">
+                        <view class="checkbox-wrapper">
+                            <view class="checkbox" :class="{ checked: isCurrentSkillSelected(skill.id) }">
+                                <image class="check-icon"
+                                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png"
+                                    mode="aspectFit">
+                                </image>
+                            </view>
+                        </view>
+                        <text class="skill-name">{{ skill.title }}</text>
+                    </view>
+                </view>
 
-				<!-- 显示待审核的服务技能 -->
-				<view class="skills-list" v-else>
-					<view class="skill-item" v-for="(skill, index) in serviceList" :key="skill.id"
-						@click="toggleSkillSelect(index)" :class="{ disabled: !editable }">
-						<view class="checkbox-wrapper">
-							<view class="checkbox" :class="{ checked: skill.checked }">
-								<image v-if="skill.checked" class="check-icon"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9"
-									mode="aspectFit">
-								</image>
-							</view>
-						</view>
-						<text class="skill-name">{{ skill.title }}</text>
-					</view>
-				</view>
-			</view>
-		</view>
+                <!-- 显示待审核的服务技能 -->
+                <view class="skills-list" v-else>
+                    <view class="skill-item" v-for="(skill, index) in serviceList" :key="skill.id"
+                        @click="toggleSkillSelect(index)" :class="{ disabled: !editable }">
+                        <view class="checkbox-wrapper">
+                            <view class="checkbox" :class="{ checked: skill.checked }">
+                                <image v-if="skill.checked" class="check-icon"
+                                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png"
+                                    mode="aspectFit">
+                                </image>
+                            </view>
+                        </view>
+                        <text class="skill-name">{{ skill.title }}</text>
+                    </view>
+                </view>
+            </view>
 
-		<!-- 底部按钮 -->
-		<view class="bottom-actions" ref="buttonArea">
-			<!-- 驳回原因提示 -->
-			<view class="reject-reason" v-if="shouldShowRejectReason">
-				<view class="reject-title">您的提交已驳回</view>
-				<view class="reject-detail">驳回原因：{{ backText }}</view>
-			</view>
-			<!-- 审核中提示 -->
-			<view class="audit-tip" v-if="showAuditTip && !showPendingSkills">
-				<text class="audit-text">您的提交变更正在审核中...</text>
-			</view>
+            <view class="box-cont" style="padding: 0;">
+                <view class="form-item-two" @click="editable ? openExperiencePicker() : null">
+                    <text class="label required">专业经验：</text>
+                    <view class="picker-content">
+                        <text :class="displayMajor ? 'picker-value' : 'placeholder'">
+                            {{ displayExperienceText || '请选择' }}
+                        </text>
+                        <image v-if="editable"
+                            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+                            class="arrow-right" mode="aspectFit"></image>
+                    </view>
+                </view>
+            </view>
+        </view>
 
-			<!-- 去变更信息按钮 -->
-			<view class="action-btn change-info-btn" v-if="buttonType === 'change'" @click="startChange">
-				<text class="btn-text">去变更信息</text>
-			</view>
+        <!-- 底部按钮 -->
+        <view class="bottom-actions" ref="buttonArea">
+            <!-- 驳回原因提示 -->
+            <view class="reject-reason" v-if="shouldShowRejectReason">
+                <view class="reject-title">您的提交已驳回</view>
+                <view class="reject-detail">驳回原因：{{ backText }}</view>
+            </view>
+            <!-- 审核中提示 -->
+            <view class="audit-tip" v-if="showAuditTip && !showPendingSkills">
+                <text class="audit-text">您的提交变更正在审核中...</text>
+            </view>
 
-			<!-- 取消和提交按钮 -->
-			<view class="action-buttons-row" v-if="buttonType === 'edit'">
-				<view class="action-btn cancel-btn" @click="cancelChange">
-					<text class="btn-text cancel-text">取消</text>
-				</view>
-				<view class="action-btn submit-btn" @click="submitChange">
-					<text class="btn-text">提交</text>
-				</view>
-			</view>
+            <!-- 去变更信息按钮 -->
+            <view class="action-btn change-info-btn" v-if="buttonType === 'change'" @click="startChange">
+                <text class="btn-text">去变更信息</text>
+            </view>
+
+            <!-- 取消和提交按钮 -->
+            <view class="action-buttons-row" v-if="buttonType === 'edit'">
+                <view class="action-btn cancel-btn" @click="cancelChange">
+                    <text class="btn-text cancel-text">取消</text>
+                </view>
+                <view class="action-btn submit-btn" @click="submitChange">
+                    <text class="btn-text">提交</text>
+                </view>
+            </view>
 
 
-			<!-- 查看我的变更按钮 -->
-			<view class="action-btn view-change-btn" v-if="buttonType === 'view'" @click="togglePendingSkills">
-				<text class="btn-text">{{ showPendingSkills ? '返回' : '查看我的变更' }}</text>
-			</view>
-		</view>
-	</view>
+            <!-- 查看我的变更按钮 -->
+            <view class="action-btn view-change-btn" v-if="buttonType === 'view'" @click="togglePendingSkills">
+                <text class="btn-text">{{ showPendingSkills ? '返回' : '查看我的变更' }}</text>
+            </view>
+        </view>
+    </view>
 </template>
 
 <script>
-	import request from '../../utils/request';
-
-	export default {
-		data() {
-			return {
-				sjInformation: {},
-				serviceList: [], // 服务技能列表
-				selectedSkills: [], // 已选中的技能ID（待审核的）
-				originalSkills: [], // 原始选中的技能ID（当前生效的）
-				editable: false, // 是否可编辑
-				buttonType: 'change', // 按钮类型: change-去变更信息, edit-取消/提交, view-查看我的变更
-				showAuditTip: false, // 是否显示审核中提示
-				auditStatus: null, // 审核状态
-				applyId: null, // 申请ID
-				isLoading: true, // 添加加载状态
-				showPendingSkills: false, // 是否显示待审核的技能
-				currentSkills: [], // 当前生效的技能ID
-				navTitle: '服务技能', // 导航栏标题
-				buttonAreaHeight: 120, // 按钮区域高度，用于计算底部padding
-				backText: '', // 驳回原因
-				identity: '', // 用户身份
-				lastApplyTime: null, //记录最后申请时间
-			}
-		},
-		computed: {
-			selectedSkillsText() {
-				const selectedTitles = this.serviceList
-					.filter(item => item.checked)
-					.map(item => item.title);
-				return selectedTitles.join('、');
-			},
-			hasChanges() {
-				// 检查是否有变更
-				const current = [...this.selectedSkills].sort().join(',');
-				const original = [...this.originalSkills].sort().join(',');
-				return current !== original;
-			},
-			// 控制驳回提示是否显示
-			shouldShowRejectReason() {
-				// 只有在审核驳回状态、不显示待审核技能、且技能未变更时才显示驳回提示
-				return this.auditStatus === 3 &&
-					!this.showPendingSkills &&
-					!this.skillsChanged &&
-					this.backText;
-				!this.hasPendingApply();
-			},
-			// 检查是否有待处理的申请（基于时间）
-			hasPendingApply() {
-				if (!this.lastApplyTime) return false;
-				// 如果最后申请时间在驳回时间之后，说明有新的申请
-				return true;
-			}
-		},
-		async onLoad() {
-			this.sjInformation = await request.post('/sj/user/getUser');
-			await this.initPage();
-		},
-		onReady() {
-			// 获取按钮区域高度，用于设置页面内容padding
-			this.getButtonAreaHeight();
-		},
-		methods: {
-			// 初始化页面
-			async initPage() {
-				this.isLoading = true;
-				try {
-					// 先加载服务技能列表
-					await this.loadServiceSkills();
-					// 然后加载申请详情
-					await this.loadApplyDetails();
-				} catch (error) {
-					console.error('初始化页面失败:', error);
-				} finally {
-					this.isLoading = false;
-				}
-			},
-
-			// 清理驳回技能存储的逻辑
-			async cleanupRejectedSkillsIfNeeded() {
-				try {
-					const rejectedSkills = uni.getStorageSync('rejectedSkills');
-					const lastApplyTime = uni.getStorageSync('lastApplyTime');
-
-					if (rejectedSkills && rejectedSkills.length > 0) {
-						// 获取当前生效技能
-						const params = {
-							type: 3
-						};
-						const res = this.sjInformation;
-
-						if (res.state === 1 && res.data && res.data.servers_kill) {
-							let currentSkillIds = [];
-							if (Array.isArray(res.data.servers_kill)) {
-								currentSkillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(
-									id));
-							} else if (typeof res.data.servers_kill === 'string') {
-								currentSkillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim()))
-									.filter(id => !isNaN(id));
-							}
-
-							const currentSorted = [...currentSkillIds].sort().join(',');
-							const rejectedSorted = [...rejectedSkills].sort().join(',');
-
-							// 如果当前生效技能与被驳回技能不一致，说明有新的申请已生效
-							if (currentSorted !== rejectedSorted) {
-								console.log('检测到技能已变更，清理驳回相关存储');
-								uni.removeStorageSync('rejectedSkills');
-								uni.removeStorageSync('lastRejectTime');
-							}
-						}
-					}
-				} catch (error) {
-					console.error('清理驳回技能存储失败:', error);
-				}
-			},
-
-			// 获取按钮区域高度
-			getButtonAreaHeight() {
-				// 使用setTimeout确保DOM已渲染
-				setTimeout(() => {
-					const query = uni.createSelectorQuery().in(this);
-					query.select('.bottom-actions').boundingClientRect(data => {
-						if (data) {
-							this.buttonAreaHeight = data.height + 20; // 增加一些边距
-						}
-					}).exec();
-				}, 100);
-			},
-
-			// 更新导航栏标题
-			updateNavTitle() {
-				if (this.editable || this.showPendingSkills) {
-					this.navTitle = '服务技能变更';
-				} else {
-					this.navTitle = '服务技能';
-				}
-			},
-
-			// 加载服务技能列表
-			async loadServiceSkills() {
-				try {
-					const res = await request.post('/sj/firstclass');
-					this.serviceList = res.data.map(item => ({
-						...item,
-						checked: false
-					}));
-					console.log('服务技能列表:', this.serviceList);
-				} catch (error) {
-					console.error('加载服务技能失败:', error);
-					uni.showToast({
-						title: '加载服务技能失败',
-						icon: 'none'
-					});
-				}
-			},
-
-			// 加载申请详情
-			async loadApplyDetails() {
-				try {
-					console.log('开始加载申请详情...');
-					const res = await request.post('/sj/userSjAuth/details', {
-						apply_type: 2 // 服务技能变更
-					});
-
-					console.log('申请详情接口返回:', res);
-
-					if (res.code === 200 && res.data) {
-						const detail = res.data;
-						this.applyId = detail.id;
-						this.auditStatus = detail.apply_state;
-						this.backText = detail.back_text || ''; // 获取驳回原因
-
-						console.log('审核状态:', this.auditStatus);
-						console.log('原始servers_kill数据:', detail.servers_kill);
-
-						// 处理服务技能数据
-						if (detail.servers_kill) {
-							let skillIds = [];
-
-							if (Array.isArray(detail.servers_kill)) {
-								skillIds = detail.servers_kill.map(id => {
-									const num = parseInt(id);
-									return isNaN(num) ? null : num;
-								}).filter(id => id !== null);
-							} else if (typeof detail.servers_kill === 'string') {
-								skillIds = detail.servers_kill.split(',').map(id => {
-									const num = parseInt(id.trim());
-									return isNaN(num) ? null : num;
-								}).filter(id => id !== null);
-							}
-
-							console.log('解析后的技能ID:', skillIds);
-
-							// 根据审核状态正确处理数据
-							if (this.auditStatus === 1) { // 审核中
-								this.selectedSkills = [...skillIds];
-								console.log('审核中，待审核技能:', this.selectedSkills);
-								// 记录申请时间
-								uni.setStorageSync('lastApplyTime', new Date().getTime());
-							} else if (this.auditStatus === 3) { // 审核驳回
-								// 检查驳回数据是否是最新的
-								await this.handleRejectedSkills(skillIds);
-							}
-
-							this.updateCheckedStatus();
-						}
-
-						// 无论审核状态如何，都加载当前生效的技能
-						await this.loadCurrentEffectiveSkills();
-
-					} else {
-						console.log('申请详情返回数据为空或code不为200:', res);
-						// 清理可能的驳回存储
-						uni.removeStorageSync('rejectedSkills');
-						uni.removeStorageSync('lastRejectTime');
-						await this.loadCurrentEffectiveSkills();
-					}
-
-				} catch (error) {
-					console.error('加载申请详情失败:', error);
-					// 出错时也尝试加载当前生效的技能
-					await this.loadCurrentEffectiveSkills();
-				}
-			},
-
-			// 处理驳回技能逻辑
-			async handleRejectedSkills(rejectedSkillIds) {
-				const storedRejectedSkills = uni.getStorageSync('rejectedSkills');
-				const lastRejectTime = uni.getStorageSync('lastRejectTime');
-
-				// 获取当前生效技能进行比较
-				const currentSkills = await this.getCurrentEffectiveSkillIds();
-
-				const rejectedSorted = [...rejectedSkillIds].sort().join(',');
-				const storedSorted = storedRejectedSkills ? [...storedRejectedSkills].sort().join(',') : '';
-				const currentSorted = [...currentSkills].sort().join(',');
-
-				// 如果驳回的技能与当前生效技能相同，说明驳回数据过时
-				if (rejectedSorted === currentSorted) {
-					console.log('驳回数据与当前生效技能相同，可能数据过时，忽略本次驳回数据');
-					this.selectedSkills = [...currentSkills];
-					// 清理驳回存储
-					uni.removeStorageSync('rejectedSkills');
-					uni.removeStorageSync('lastRejectTime');
-					this.backText = ''; // 清空驳回原因
-					return;
-				}
-
-				// 如果驳回技能与存储的驳回技能不同，更新存储
-				if (rejectedSorted !== storedSorted) {
-					console.log('发现新的驳回数据，更新存储:', rejectedSkillIds);
-					uni.setStorageSync('rejectedSkills', rejectedSkillIds);
-					uni.setStorageSync('lastRejectTime', new Date().getTime());
-				}
-
-				this.selectedSkills = [...rejectedSkillIds];
-				console.log('审核驳回，被驳回技能:', this.selectedSkills);
-			},
-
-			// 获取当前生效技能ID
-			async getCurrentEffectiveSkillIds() {
-				try {
-					const params = {
-						type: 3
-					};
-					const res = this.sjInformation;
-
-					if (res.state === 1 && res.data && res.data.servers_kill) {
-						let skillIds = [];
-						if (Array.isArray(res.data.servers_kill)) {
-							skillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(id));
-						} else if (typeof res.data.servers_kill === 'string') {
-							skillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim())).filter(id => !
-								isNaN(id));
-						}
-						return skillIds;
-					}
-					return [];
-				} catch (error) {
-					console.error('获取当前生效技能失败:', error);
-					return [];
-				}
-			},
-
-
-			// 加载当前生效的服务技能
-			async loadCurrentEffectiveSkills() {
-				try {
-					console.log('开始加载当前生效的服务技能...');
-					const currentSkills = await this.getCurrentEffectiveSkillIds();
-
-					this.currentSkills = [...currentSkills];
-					this.originalSkills = [...currentSkills];
-
-					console.log('当前生效的技能ID:', this.currentSkills);
-
-					// 只有在无申请状态或审核通过状态时，才用当前技能更新选中技能
-					if (this.auditStatus === null || this.auditStatus === 2) {
-						this.selectedSkills = [...currentSkills];
-					}
-					// 审核中状态保持原有的selectedSkills不变
-					// 审核驳回状态已经在handleRejectedSkills中处理
-
-					this.updateCheckedStatus();
-					this.updatePageStatus();
-
-				} catch (error) {
-					console.error('加载当前生效技能失败:', error);
-					this.currentSkills = [];
-					this.originalSkills = [];
-					if (this.auditStatus !== 1) {
-						this.selectedSkills = [];
-					}
-					this.updateCheckedStatus();
-					this.updatePageStatus();
-				}
-			},
-
-
-
-			// 检查技能是否在当前生效的技能中
-			isCurrentSkillSelected(skillId) {
-				return this.currentSkills.includes(skillId);
-			},
-
-			// 更新选中状态（用于待审核的技能）
-			updateCheckedStatus() {
-				console.log('更新选中状态，当前服务技能列表:', this.serviceList);
-				console.log('要选中的技能ID:', this.selectedSkills);
-				this.serviceList.forEach(item => {
-					item.checked = this.selectedSkills.includes(item.id);
-				});
-			},
-
-			// 根据审核状态更新页面状态
-			updatePageStatus() {
-				console.log('更新页面状态，审核状态:', this.auditStatus);
-
-				// 检查是否有变更
-				const currentSorted = [...this.currentSkills].sort().join(',');
-				const selectedSorted = [...this.selectedSkills].sort().join(',');
-				const hasChanges = currentSorted !== selectedSorted;
-
-				console.log('技能变更检查 - 当前生效:', this.currentSkills, '选中:', this.selectedSkills, '是否变更:', hasChanges);
-
-				if (this.auditStatus === 1) { // 审核中
-					this.showAuditTip = true;
-					this.buttonType = 'view';
-					this.editable = false;
-					this.showPendingSkills = false;
-				} else if (this.auditStatus === 3) { // 审核驳回
-					// 检查驳回数据是否有效
-					const rejectedSkills = uni.getStorageSync('rejectedSkills');
-					const rejectedSorted = rejectedSkills ? [...rejectedSkills].sort().join(',') : '';
-					const currentSorted = [...this.currentSkills].sort().join(',');
-
-					// 如果驳回技能与当前技能相同，说明驳回数据无效
-					if (rejectedSorted === currentSorted) {
-						console.log('驳回数据无效，按无申请状态处理');
-						this.showAuditTip = false;
-						this.buttonType = 'change';
-						this.editable = false;
-						this.showPendingSkills = false;
-						this.backText = ''; // 清空驳回原因
-					} else {
-						this.showAuditTip = false;
-						this.buttonType = 'change';
-						this.editable = false;
-						this.showPendingSkills = false;
-					}
-				} else { // 无申请或审核通过
-					this.showAuditTip = false;
-					this.buttonType = 'change';
-					this.editable = false;
-					this.showPendingSkills = false;
-				}
-
-				this.updateNavTitle();
-
-				console.log('最终页面状态:', {
-					showAuditTip: this.showAuditTip,
-					buttonType: this.buttonType,
-					editable: this.editable,
-					showPendingSkills: this.showPendingSkills,
-					currentSkills: this.currentSkills,
-					selectedSkills: this.selectedSkills,
-					backText: this.backText
-				});
-			},
-
-			// 切换技能选择状态（仅用于编辑模式）
-			toggleSkillSelect(index) {
-				if (!this.editable) return;
-
-				this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
-
-				// 更新选中的技能ID数组
-				this.selectedSkills = this.serviceList
-					.filter(item => item.checked)
-					.map(item => item.id);
-
-				console.log('当前选中的技能ID:', this.selectedSkills);
-			},
-
-			// 切换显示待审核的技能
-			togglePendingSkills() {
-				this.showPendingSkills = !this.showPendingSkills;
-				// 更新导航栏标题
-				this.updateNavTitle();
-			},
-
-			// 开始变更
-			startChange() {
-				this.editable = true;
-				this.buttonType = 'edit';
-				// 进入编辑模式时，显示待审核的技能
-				this.showPendingSkills = true;
-				// 更新导航栏标题
-				this.updateNavTitle();
-			},
-
-			// 取消变更
-			cancelChange() {
-				// 恢复原始选择
-				this.selectedSkills = [...this.originalSkills];
-				this.updateCheckedStatus();
-
-				this.editable = false;
-				this.buttonType = 'change';
-				this.showPendingSkills = false; // 取消后显示当前生效的技能
-				// 更新导航栏标题
-				this.updateNavTitle();
-			},
-
-			// 提交变更 - 修改为传递数组格式
-			async submitChange() {
-				if (this.selectedSkills.length === 0) {
-					uni.showToast({
-						title: '请至少选择一个服务技能',
-						icon: 'none'
-					});
-					return;
-				}
-
-				if (!this.hasChanges) {
-					uni.showToast({
-						title: '未检测到变更',
-						icon: 'none'
-					});
-					return;
-				}
-
-				try {
-					uni.showLoading({
-						title: '提交中...'
-					});
-					const params = {
-						apply_type: 2, // 服务技能变更
-						servers_kill: this.selectedSkills // 直接传递数组
-					};
-
-					console.log('提交的数据:', params);
-
-					const res = await request.post('/sj/userSjAuth/apply', params);
-
-					uni.hideLoading();
-
-					if (res.code === 200) {
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none'
-							// icon: 'success'
-						});
-
-						// 清理驳回相关存储
-						uni.removeStorageSync('rejectedSkills');
-						uni.removeStorageSync('lastRejectTime');
-
-						// 记录申请时间
-						uni.setStorageSync('lastApplyTime', new Date().getTime());
-
-						// 更新页面状态为审核中
-						this.showAuditTip = true;
-						this.editable = false;
-						this.buttonType = 'view';
-						this.auditStatus = 1; // 审核中
-						this.showPendingSkills = false; // 提交后默认显示当前生效的技能
-						// 更新导航栏标题
-						this.updateNavTitle();
-
-						// 重新加载申请详情获取最新状态
-						setTimeout(() => {
-							this.loadApplyDetails();
-						}, 1000);
-					} else {
-						uni.showToast({
-							title: res.msg || '提交失败',
-							icon: 'none'
-						});
-					}
-				} catch (error) {
-					uni.hideLoading();
-					console.error('提交变更失败:', error);
-					uni.showToast({
-						title: '提交失败',
-						icon: 'none'
-					});
-				}
-			}
-		}
-	}
+import request from '../../utils/request';
+
+export default {
+    data() {
+        return {
+            sjInformation: {},
+            serviceList: [], // 服务技能列表
+            selectedSkills: [], // 已选中的技能ID（待审核的）
+            originalSkills: [], // 原始选中的技能ID（当前生效的）
+
+            // 新增：专业经验数据流
+            originalMajor: null, // 当前生效的经验
+            pendingMajor: null,  // 待审核的经验
+            displayMajor: null,  // 页面展示的经验
+
+            editable: false, // 是否可编辑
+            buttonType: 'change', // 按钮类型: change-去变更信息, edit-取消/提交, view-查看我的变更
+            showAuditTip: false, // 是否显示审核中提示
+            auditStatus: null, // 审核状态
+            applyId: null, // 申请ID
+            isLoading: true, // 添加加载状态
+            showPendingSkills: false, // 是否显示待审核的技能
+            currentSkills: [], // 当前生效的技能ID
+            navTitle: '服务技能', // 导航栏标题
+            buttonAreaHeight: 120, // 按钮区域高度，用于计算底部padding
+            backText: '', // 驳回原因
+            identity: '', // 用户身份
+            lastApplyTime: null, //记录最后申请时间
+        }
+    },
+    computed: {
+        selectedSkillsText() {
+            const selectedTitles = this.serviceList
+                .filter(item => item.checked)
+                .map(item => item.title);
+            return selectedTitles.join('、');
+        },
+        // 新增：将 major 数值转换为文字
+        displayExperienceText() {
+            return this.getExperienceText(this.displayMajor);
+        },
+        hasChanges() {
+            // 检查是否有变更 (合并技能和经验检查)
+            const currentSorted = [...this.currentSkills].sort().join(',');
+            const selectedSorted = [...this.selectedSkills].sort().join(',');
+            const skillsChanged = currentSorted !== selectedSorted;
+            const majorChanged = String(this.displayMajor || '') !== String(this.originalMajor || '');
+            return skillsChanged || majorChanged;
+        },
+        // 控制驳回提示是否显示
+        shouldShowRejectReason() {
+            // 审核驳回时直接显示驳回原因，避免自动进入填写页面后隐藏原因
+            return Number(this.auditStatus) === 3 &&
+                !this.showPendingSkills &&
+                this.backText;
+        },
+        // 检查是否有待处理的申请（基于时间）
+        hasPendingApply() {
+            if (!this.lastApplyTime) return false;
+            // 如果最后申请时间在驳回时间之后，说明有新的申请
+            return true;
+        },
+        // 处于服务技能变更审核中或驳回时，不自动进入添加/编辑步骤
+        isChangeUnderReview() {
+            return Number(this.auditStatus) === 1 ||
+                Number(this.auditStatus) === 3 ||
+                this.showAuditTip ||
+                this.buttonType === 'view';
+        }
+    },
+    async onLoad() {
+        this.sjInformation = await request.post('/sj/user/getUser');
+        await this.initPage();
+        // 如果没有技能和经验信息，直接进入编辑模式
+        if (this.currentSkills.length === 0 && !this.originalMajor && !this.isChangeUnderReview) {
+            this.startChange();
+        }
+    },
+    onReady() {
+        // 获取按钮区域高度，用于设置页面内容padding
+        this.getButtonAreaHeight();
+    },
+    methods: {
+        // 初始化页面
+        async initPage() {
+            this.isLoading = true;
+            try {
+                this.originalMajor = this.sjInformation?.data?.major ? Number(this.sjInformation.data.major) : null;
+                this.displayMajor = this.originalMajor;
+
+                // 先加载服务技能列表
+                await this.loadServiceSkills();
+                // 然后加载申请详情
+                await this.loadApplyDetails();
+            } catch (error) {
+                console.error('初始化页面失败:', error);
+            } finally {
+                this.isLoading = false;
+            }
+        },
+
+        // 转换专业经验为文字
+        getExperienceText(major) {
+            const experiences = ['', '实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+            return experiences[major] || '';
+        },
+
+        // 打开专业经验选择器
+        openExperiencePicker() {
+            if (!this.editable) return;
+            uni.showActionSheet({
+                itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
+                success: (res) => {
+                    this.displayMajor = res.tapIndex + 1;
+                }
+            });
+        },
+
+        // 清理驳回技能存储的逻辑
+        async cleanupRejectedSkillsIfNeeded() {
+            try {
+                const rejectedSkills = uni.getStorageSync('rejectedSkills');
+                const rejectedMajor = uni.getStorageSync('rejectedMajor');
+                const lastApplyTime = uni.getStorageSync('lastApplyTime');
+
+                if (rejectedSkills && rejectedSkills.length > 0) {
+                    // 获取当前生效技能
+                    const params = {
+                        type: 3
+                    };
+                    const res = this.sjInformation;
+
+                    if (res.state === 1 && res.data && res.data.servers_kill) {
+                        let currentSkillIds = [];
+                        if (Array.isArray(res.data.servers_kill)) {
+                            currentSkillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(
+                                id));
+                        } else if (typeof res.data.servers_kill === 'string') {
+                            currentSkillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim()))
+                                .filter(id => !isNaN(id));
+                        }
+
+                        const currentSorted = [...currentSkillIds].sort().join(',');
+                        const rejectedSorted = [...rejectedSkills].sort().join(',');
+                        const currentMajor = res.data.major;
+
+                        // 如果当前生效技能与被驳回技能不一致，说明有新的申请已生效
+                        if (currentSorted !== rejectedSorted || String(currentMajor) !== String(rejectedMajor)) {
+                            console.log('检测到技能已变更，清理驳回相关存储');
+                            uni.removeStorageSync('rejectedSkills');
+                            uni.removeStorageSync('rejectedMajor');
+                            uni.removeStorageSync('lastRejectTime');
+                        }
+                    }
+                }
+            } catch (error) {
+                console.error('清理驳回技能存储失败:', error);
+            }
+        },
+
+        // 获取按钮区域高度
+        getButtonAreaHeight() {
+            // 使用setTimeout确保DOM已渲染
+            setTimeout(() => {
+                const query = uni.createSelectorQuery().in(this);
+                query.select('.bottom-actions').boundingClientRect(data => {
+                    if (data) {
+                        this.buttonAreaHeight = data.height + 20; // 增加一些边距
+                    }
+                }).exec();
+            }, 100);
+        },
+
+        // 更新导航栏标题
+        updateNavTitle() {
+            if (this.editable || this.showPendingSkills) {
+                this.navTitle = '服务技能变更';
+            } else {
+                this.navTitle = '服务技能';
+            }
+        },
+
+        // 加载服务技能列表
+        async loadServiceSkills() {
+            try {
+                const res = await request.post('/sj/firstclass');
+                this.serviceList = res.data.map(item => ({
+                    ...item,
+                    checked: false
+                }));
+                console.log('服务技能列表:', this.serviceList);
+            } catch (error) {
+                console.error('加载服务技能失败:', error);
+                uni.showToast({
+                    title: '加载服务技能失败',
+                    icon: 'none'
+                });
+            }
+        },
+
+        // 加载申请详情
+        async loadApplyDetails() {
+            try {
+                console.log('开始加载申请详情...');
+                const res = await request.post('/sj/userSjAuth/details', {
+                    apply_type: 2 // 服务技能变更
+                });
+
+                console.log('申请详情接口返回:', res);
+
+                if (res.code === 200 && res.data) {
+                    const detail = res.data;
+                    this.applyId = detail.id;
+                    const auditStatus = Number(detail.apply_state);
+                    this.auditStatus = Number.isNaN(auditStatus) ? null : auditStatus;
+                    this.backText = detail.back_text || ''; // 获取驳回原因
+
+                    console.log('审核状态:', this.auditStatus);
+                    console.log('原始servers_kill数据:', detail.servers_kill);
+
+                    // 处理服务技能数据
+                    if (detail.servers_kill) {
+                        let skillIds = [];
+
+                        if (Array.isArray(detail.servers_kill)) {
+                            skillIds = detail.servers_kill.map(id => {
+                                const num = parseInt(id);
+                                return isNaN(num) ? null : num;
+                            }).filter(id => id !== null);
+                        } else if (typeof detail.servers_kill === 'string') {
+                            skillIds = detail.servers_kill.split(',').map(id => {
+                                const num = parseInt(id.trim());
+                                return isNaN(num) ? null : num;
+                            }).filter(id => id !== null);
+                        }
+
+                        console.log('解析后的技能ID:', skillIds);
+
+                        this.pendingMajor = detail.major || this.originalMajor;
+
+                        // 根据审核状态正确处理数据
+                        if (this.auditStatus === 1) { // 审核中
+                            this.selectedSkills = [...skillIds];
+                            this.displayMajor = this.pendingMajor;
+                            console.log('审核中，待审核技能:', this.selectedSkills);
+                            // 记录申请时间
+                            uni.setStorageSync('lastApplyTime', new Date().getTime());
+                        } else if (this.auditStatus === 3) { // 审核驳回
+                            // 检查驳回数据是否是最新的
+                            await this.handleRejectedData(skillIds, detail.major);
+                        }
+
+                        this.updateCheckedStatus();
+                    }
+
+                    // 无论审核状态如何，都加载当前生效的技能
+                    await this.loadCurrentEffectiveSkills();
+
+                } else {
+                    console.log('申请详情返回数据为空或code不为200:', res);
+                    // 清理可能的驳回存储
+                    uni.removeStorageSync('rejectedSkills');
+                    uni.removeStorageSync('rejectedMajor');
+                    uni.removeStorageSync('lastRejectTime');
+                    await this.loadCurrentEffectiveSkills();
+                }
+
+            } catch (error) {
+                console.error('加载申请详情失败:', error);
+                // 出错时也尝试加载当前生效的技能
+                await this.loadCurrentEffectiveSkills();
+            }
+        },
+
+        // 处理驳回技能逻辑
+        async handleRejectedData(rejectedSkillIds, rejectedMajor) {
+            const storedRejectedSkills = uni.getStorageSync('rejectedSkills');
+            const storedRejectedMajor = uni.getStorageSync('rejectedMajor');
+            const lastRejectTime = uni.getStorageSync('lastRejectTime');
+
+            // 获取当前生效技能进行比较
+            const currentSkills = await this.getCurrentEffectiveSkillIds();
+            const currentMajor = this.sjInformation?.data?.major || null;
+
+            const rejectedSorted = [...rejectedSkillIds].sort().join(',');
+            const storedSorted = storedRejectedSkills ? [...storedRejectedSkills].sort().join(',') : '';
+            const currentSorted = [...currentSkills].sort().join(',');
+
+            // 如果驳回的技能与当前生效技能相同，说明驳回数据过时
+            if (rejectedSorted === currentSorted && String(rejectedMajor || '') === String(currentMajor || '')) {
+                console.log('驳回数据与当前生效技能相同，可能数据过时，忽略本次驳回数据');
+                this.selectedSkills = [...currentSkills];
+                this.displayMajor = currentMajor;
+                // 清理驳回存储
+                uni.removeStorageSync('rejectedSkills');
+                uni.removeStorageSync('rejectedMajor');
+                uni.removeStorageSync('lastRejectTime');
+                this.backText = ''; // 清空驳回原因
+                return;
+            }
+
+            // 如果驳回技能与存储的驳回技能不同，更新存储
+            if (rejectedSorted !== storedSorted || String(rejectedMajor) !== String(storedRejectedMajor)) {
+                console.log('发现新的驳回数据，更新存储:', rejectedSkillIds);
+                uni.setStorageSync('rejectedSkills', rejectedSkillIds);
+                uni.setStorageSync('rejectedMajor', rejectedMajor);
+                uni.setStorageSync('lastRejectTime', new Date().getTime());
+            }
+
+            this.selectedSkills = [...rejectedSkillIds];
+            this.displayMajor = rejectedMajor || currentMajor;
+            console.log('审核驳回，被驳回技能:', this.selectedSkills);
+        },
+
+        // 获取当前生效技能ID
+        async getCurrentEffectiveSkillIds() {
+            try {
+                const params = {
+                    type: 3
+                };
+                const res = this.sjInformation;
+
+                if (res.state === 1 && res.data && res.data.servers_kill) {
+                    let skillIds = [];
+                    if (Array.isArray(res.data.servers_kill)) {
+                        skillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(id));
+                    } else if (typeof res.data.servers_kill === 'string') {
+                        skillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim())).filter(id => !
+                            isNaN(id));
+                    }
+                    return skillIds;
+                }
+                return [];
+            } catch (error) {
+                console.error('获取当前生效技能失败:', error);
+                return [];
+            }
+        },
+
+
+        // 加载当前生效的服务技能
+        async loadCurrentEffectiveSkills() {
+            try {
+                console.log('开始加载当前生效的服务技能...');
+                const currentSkills = await this.getCurrentEffectiveSkillIds();
+
+                this.currentSkills = [...currentSkills];
+                this.originalSkills = [...currentSkills];
+
+                this.originalMajor = this.sjInformation?.data?.major || null;
+
+                console.log('当前生效的技能ID:', this.currentSkills);
+
+                // 只有在无申请状态或审核通过状态时，才用当前技能更新选中技能
+                if (this.auditStatus === null || this.auditStatus === 2) {
+                    this.selectedSkills = [...currentSkills];
+                    this.displayMajor = this.originalMajor;
+                }
+                // 审核中状态保持原有的selectedSkills不变
+                // 审核驳回状态已经在handleRejectedSkills中处理
+
+                this.updateCheckedStatus();
+                this.updatePageStatus();
+
+            } catch (error) {
+                console.error('加载当前生效技能失败:', error);
+                this.currentSkills = [];
+                this.originalSkills = [];
+                if (this.auditStatus !== 1) {
+                    this.selectedSkills = [];
+                }
+                this.updateCheckedStatus();
+                this.updatePageStatus();
+            }
+        },
+
+
+
+        // 检查技能是否在当前生效的技能中
+        isCurrentSkillSelected(skillId) {
+            return this.currentSkills.includes(skillId);
+        },
+
+        // 更新选中状态（用于待审核的技能）
+        updateCheckedStatus() {
+            console.log('更新选中状态，当前服务技能列表:', this.serviceList);
+            console.log('要选中的技能ID:', this.selectedSkills);
+            this.serviceList.forEach(item => {
+                item.checked = this.selectedSkills.includes(item.id);
+            });
+        },
+
+        // 根据审核状态更新页面状态
+        updatePageStatus() {
+            console.log('更新页面状态，审核状态:', this.auditStatus);
+
+            // 检查是否有变更
+            const currentSorted = [...this.currentSkills].sort().join(',');
+            const selectedSorted = [...this.selectedSkills].sort().join(',');
+            const hasChanges = currentSorted !== selectedSorted;
+
+            console.log('技能变更检查 - 当前生效:', this.currentSkills, '选中:', this.selectedSkills, '是否变更:', hasChanges);
+
+            if (this.auditStatus === 1) { // 审核中
+                this.showAuditTip = true;
+                this.buttonType = 'view';
+                this.editable = false;
+                this.showPendingSkills = false;
+            } else if (this.auditStatus === 3) { // 审核驳回
+                // 检查驳回数据是否无效
+                const rejectedSkills = uni.getStorageSync('rejectedSkills');
+                const rejectedMajor = uni.getStorageSync('rejectedMajor');
+                const rejectedSorted = rejectedSkills ? [...rejectedSkills].sort().join(',') : '';
+                const currentSorted = [...this.currentSkills].sort().join(',');
+
+                // 如果驳回技能与当前技能相同，说明驳回数据无效
+                if (rejectedSorted === currentSorted && String(rejectedMajor || '') === String(this.originalMajor || '')) {
+                    console.log('驳回数据无效，按无申请状态处理');
+                    this.showAuditTip = false;
+                    this.buttonType = 'change';
+                    this.editable = false;
+                    this.showPendingSkills = false;
+                    this.backText = ''; // 清空驳回原因
+                } else {
+                    this.showAuditTip = false;
+                    this.buttonType = 'change';
+                    this.editable = false;
+                    this.showPendingSkills = false;
+                }
+            } else { // 无申请或审核通过
+                this.showAuditTip = false;
+                this.buttonType = 'change';
+                this.editable = false;
+                this.showPendingSkills = false;
+            }
+
+            this.updateNavTitle();
+
+            console.log('最终页面状态:', {
+                showAuditTip: this.showAuditTip,
+                buttonType: this.buttonType,
+                editable: this.editable,
+                showPendingSkills: this.showPendingSkills,
+                currentSkills: this.currentSkills,
+                selectedSkills: this.selectedSkills,
+                backText: this.backText
+            });
+        },
+
+        // 切换技能选择状态（仅用于编辑模式）
+        toggleSkillSelect(index) {
+            if (!this.editable) return;
+
+            this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
+
+            // 更新选中的技能ID数组
+            this.selectedSkills = this.serviceList
+                .filter(item => item.checked)
+                .map(item => item.id);
+
+            console.log('当前选中的技能ID:', this.selectedSkills);
+        },
+
+        // 切换显示待审核的技能
+        togglePendingSkills() {
+            this.showPendingSkills = !this.showPendingSkills;
+            if (this.showPendingSkills) {
+                this.displayMajor = this.pendingMajor;
+            } else {
+                this.displayMajor = this.originalMajor;
+            }
+            // 更新导航栏标题
+            this.updateNavTitle();
+        },
+
+        // 开始变更
+        startChange() {
+            this.editable = true;
+            this.buttonType = 'edit';
+            // 进入编辑模式时，显示待审核的技能
+            this.showPendingSkills = true;
+            this.displayMajor = this.pendingMajor || this.originalMajor;
+            // 更新导航栏标题
+            this.updateNavTitle();
+        },
+
+        // 取消变更
+        cancelChange() {
+            // 恢复原始选择
+            this.selectedSkills = [...this.originalSkills];
+            this.displayMajor = this.originalMajor;
+            this.updateCheckedStatus();
+
+            this.editable = false;
+            this.buttonType = 'change';
+            this.showPendingSkills = false; // 取消后显示当前生效的技能
+            // 更新导航栏标题
+            this.updateNavTitle();
+        },
+
+        // 提交变更 - 修改为传递数组格式
+        async submitChange() {
+            if (this.selectedSkills.length === 0) {
+                uni.showToast({
+                    title: '请至少选择一个服务技能',
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!this.displayMajor) {
+                uni.showToast({ title: '请选择专业经验', icon: 'none' });
+                return;
+            }
+
+            if (!this.hasChanges) {
+                uni.showToast({
+                    title: '未检测到变更',
+                    icon: 'none'
+                });
+                return;
+            }
+
+            try {
+                uni.showLoading({
+                    title: '提交中...'
+                });
+                const params = {
+                    apply_type: 2, // 服务技能变更
+                    servers_kill: this.selectedSkills, // 直接传递数组
+                    major: this.displayMajor
+                };
+
+                console.log('提交的数据:', params);
+
+                const res = await request.post('/sj/userSjAuth/apply', params);
+
+                uni.hideLoading();
+
+                if (res.code === 200) {
+                    uni.showToast({
+                        title: '提交成功',
+                        icon: 'none'
+                        // icon: 'success'
+                    });
+
+                    // 清理驳回相关存储
+                    uni.removeStorageSync('rejectedSkills');
+                    uni.removeStorageSync('rejectedMajor');
+                    uni.removeStorageSync('lastRejectTime');
+
+                    // 记录申请时间
+                    uni.setStorageSync('lastApplyTime', new Date().getTime());
+                    this.pendingMajor = this.displayMajor;
+
+                    // 更新页面状态为审核中
+                    this.showAuditTip = true;
+                    this.editable = false;
+                    this.buttonType = 'view';
+                    this.auditStatus = 1; // 审核中
+                    this.showPendingSkills = false; // 提交后默认显示当前生效的技能
+                    // 更新导航栏标题
+                    this.updateNavTitle();
+
+                    // 重新加载申请详情获取最新状态
+                    setTimeout(() => {
+                        this.loadApplyDetails();
+                    }, 1000);
+                } else {
+                    uni.showToast({
+                        title: res.msg || '提交失败',
+                        icon: 'none'
+                    });
+                }
+            } catch (error) {
+                uni.hideLoading();
+                console.error('提交变更失败:', error);
+                uni.showToast({
+                    title: '提交失败',
+                    icon: 'none'
+                });
+            }
+        }
+    }
+}
 </script>
 
 <style scoped>
-	.service-skills-page {
-		background-color: #f5f5f5;
-		min-height: 100vh;
-		box-sizing: border-box;
-		display: flex;
-		flex-direction: column;
-	}
+.service-skills-page {
+    background-color: #f5f5f5;
+    min-height: 100vh;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+}
 
-	/* 页面内容区域 */
-	.page-content {
-		flex: 1;
-		overflow-y: auto;
-		padding: 20rpx 0;
-		box-sizing: border-box;
-	}
+/* 页面内容区域 */
+.page-content {
+    flex: 1;
+    overflow-y: auto;
+    padding: 20rpx 0;
+    box-sizing: border-box;
+}
 
-	/* 审核中提示 */
-	.audit-tip {
-		margin: 20rpx 24rpx 20rpx 24rpx;
-		border-radius: 12rpx;
-	}
+/* 审核中提示 */
+.audit-tip {
+    margin: 20rpx 24rpx 20rpx 24rpx;
+    border-radius: 12rpx;
+}
 
-	.audit-text {
-		font-weight: 400;
-		font-size: 32rpx;
-		color: #333333;
-		text-align: center;
-		display: block;
-	}
+.audit-text {
+    font-weight: 400;
+    font-size: 32rpx;
+    color: #333333;
+    text-align: center;
+    display: block;
+}
 
-	/* 驳回原因样式 */
-	.reject-reason {
-		background: transparent;
-		padding: 24rpx;
-	}
+/* 驳回原因样式 */
+.reject-reason {
+    background: transparent;
+    padding: 24rpx;
+}
 
-	.reject-title {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #333333;
-		line-height: 45rpx;
-		text-align: center;
-		font-style: normal;
-	}
+.reject-title {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #333333;
+    line-height: 45rpx;
+    text-align: center;
+    font-style: normal;
+}
 
-	.reject-detail {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #999999;
-		line-height: 40rpx;
-		text-align: center;
-		font-style: normal;
-		margin-top: 12rpx;
+.reject-detail {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #999999;
+    line-height: 40rpx;
+    text-align: center;
+    font-style: normal;
+    margin-top: 12rpx;
 
-	}
+}
 
-	.skills-header {
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
-	}
+.skills-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20rpx;
+}
 
-	.title-bar {
-		width: 6rpx;
-		height: 30rpx;
-		background-color: #E8101E;
-		margin-right: 10rpx;
-		border-radius: 5rpx;
-	}
+.title-bar {
+    width: 6rpx;
+    height: 30rpx;
+    background-color: #FF4767;
+    margin-right: 10rpx;
+    border-radius: 5rpx;
+}
 
-	.skills-title {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #1D2129;
-		line-height: 48rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.skills-title {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #1D2129;
+    line-height: 48rpx;
+    text-align: left;
+    font-style: normal;
+}
 
-	.skills-subtitle {
-		margin-left: 20rpx;
-		margin-bottom: 20rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #333333;
-		line-height: 40rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.skills-subtitle {
+    margin-left: 20rpx;
+    margin-bottom: 20rpx;
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #333333;
+    line-height: 40rpx;
+    text-align: left;
+    font-style: normal;
+}
 
-	.box-cont {
-		background: #ffffff;
-		border-radius: 20rpx;
-		margin: 0 24rpx 24rpx 24rpx;
-		box-shadow: none;
-	}
+.box-cont {
+    background: #ffffff;
+    border-radius: 20rpx;
+    margin: 0 24rpx 24rpx 24rpx;
+    box-shadow: none;
+}
 
-	.skills-container {
-		padding: 32rpx;
-	}
+.skills-container {
+    padding: 32rpx;
+}
 
-	.skills-list {
-		display: flex;
-		flex-wrap: wrap;
-		margin: 0 -16rpx;
-	}
+.skills-list {
+    display: flex;
+    flex-wrap: wrap;
+    margin: 0 -16rpx;
+}
 
-	.skill-item {
-		width: 100%;
-		display: flex;
-		align-items: center;
-		padding: 20rpx 16rpx;
-		box-sizing: border-box;
-	}
+.skill-item {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    padding: 20rpx 16rpx;
+    box-sizing: border-box;
+}
 
-	.checkbox-wrapper {
-		margin-right: 20rpx;
-	}
+.checkbox-wrapper {
+    margin-right: 20rpx;
+}
 
-	.checkbox {
-		width: 40rpx;
-		height: 40rpx;
-		border: 2rpx solid #DDDDDD;
-		border-radius: 8rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
+.checkbox {
+    width: 40rpx;
+    height: 40rpx;
+    border: 2rpx solid #DDDDDD;
+    border-radius: 8rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
 
-	.checkbox.checked {
-		background-color: #E8101E;
-		border-color: #E8101E;
-	}
+.checkbox.checked {
+    background-color: #FF4767;
+    border-color: #FF4767;
+}
 
-	.check-icon {
-		width: 42rpx;
-		height: 42rpx;
-	}
+.check-icon {
+    width: 42rpx;
+    height: 42rpx;
+}
 
-	.skill-name {
-		font-size: 28rpx;
-		color: #333333;
-	}
+.skill-name {
+    font-size: 28rpx;
+    color: #333333;
+}
 
-	.bottom-actions {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		padding: 0rpx 24rpx 40rpx 24rpx;
-		background: #ffffff;
-		z-index: 100;
-	}
+/* 迁移的专业经验表单样式 */
+.form-item-two {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24rpx 24rpx;
+}
 
-	/* 单个按钮样式 */
-	.action-btn {
-		height: 88rpx;
-		border-radius: 43rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 32rpx;
-		font-weight: 400;
-		margin-top: 20rpx;
-	}
+.form-item-two>text.label {
+    flex-shrink: 0;
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+}
 
-	.change-info-btn {
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-	}
+.required::before {
+    content: '*';
+    color: #FF0000;
+    margin-right: 4rpx;
+}
 
-	.view-change-btn {
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-	}
+.picker-content {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    gap: 16rpx;
+}
 
-	/* 双按钮行样式 */
-	.action-buttons-row {
-		display: flex;
-		justify-content: space-between;
-		margin: 0 30rpx;
-	}
+.picker-value,
+.placeholder {
+    font-size: 28rpx;
+    text-align: right;
+}
 
-	.action-buttons-row .action-btn {
-		width: 270rpx;
-	}
+.picker-value {
+    color: #333333;
+}
 
-	.cancel-btn {
-		background: #E5E5E5;
-		border-radius: 43rpx;
-		padding: 0 15rpx;
-	}
+.placeholder {
+    color: #999999;
+}
 
-	.submit-btn {
-		background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
-		border-radius: 43rpx;
-		padding: 0 15rpx;
-	}
+.arrow-right {
+    width: 9rpx;
+    height: 16rpx;
+    flex-shrink: 0;
+}
 
-	.btn-text {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 36rpx;
-		color: #FFFFFF;
-		line-height: 50rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.bottom-actions {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 0rpx 24rpx 40rpx 24rpx;
+    background: #ffffff;
+    z-index: 100;
+}
 
-	.cancel-text {
-		color: #666666;
-	}
+/* 单个按钮样式 */
+.action-btn {
+    height: 88rpx;
+    border-radius: 43rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    font-weight: 400;
+    margin-top: 20rpx;
+}
 
-	/* 响应式适配 */
-	/* @media (max-width: 375px) {
+.change-info-btn {
+    background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+}
+
+.view-change-btn {
+    background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+}
+
+/* 双按钮行样式 */
+.action-buttons-row {
+    display: flex;
+    justify-content: space-between;
+    margin: 0 30rpx;
+}
+
+.action-buttons-row .action-btn {
+    width: 270rpx;
+}
+
+.cancel-btn {
+    background: #E5E5E5;
+    border-radius: 43rpx;
+    padding: 0 15rpx;
+}
+
+.submit-btn {
+    background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+    border-radius: 43rpx;
+    padding: 0 15rpx;
+}
+
+.btn-text {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 36rpx;
+    color: #FFFFFF;
+    line-height: 50rpx;
+    text-align: left;
+    font-style: normal;
+}
+
+.cancel-text {
+    color: #666666;
+}
+
+/* 响应式适配 */
+/* @media (max-width: 375px) {
   .skill-item {
     width: 100%;
   }
@@ -829,4 +965,4 @@
     width: 33.333%;
   }
 } */
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/shop/servicesyr-home.nvue b/pages/shop/servicesyr-home.nvue
index 7dd7841..a5aa9df 100644
--- a/pages/shop/servicesyr-home.nvue
+++ b/pages/shop/servicesyr-home.nvue
@@ -427,7 +427,7 @@ export default {
 }
 
 .tab-item.active .tab-lable {
-  color: #E8101E;
+  color: #FF4767;
 }
 .tab-line {
   width: 32rpx;
@@ -437,7 +437,7 @@ export default {
 }
 
 .tab-item.active .tab-line {
-  background: #E8101E;
+  background: #FF4767;
 }
 
 .info-content {
@@ -455,7 +455,7 @@ export default {
 
 .check-text {
   font-size: 28rpx;
-  color: #E8101E;
+  color: #FF4767;
   margin-left: 12rpx;
 }
 
diff --git a/pages/shop/set.vue b/pages/shop/set.vue
index 79214c1..98539f4 100644
--- a/pages/shop/set.vue
+++ b/pages/shop/set.vue
@@ -139,7 +139,7 @@ page {
       font-weight: 500;
       &.btn_change_yes {
         box-sizing: border-box;
-        background: #e8101e;
+        background: #FF4767;
         color: #ffffff;
         text-align: left;
         padding-left: 15rpx;
diff --git a/pages/shop/sj-info-change.vue b/pages/shop/sj-info-change.vue
index b4e0bfd..0bb9192 100644
--- a/pages/shop/sj-info-change.vue
+++ b/pages/shop/sj-info-change.vue
@@ -1,1725 +1,1701 @@
 <template>
-	<view class="store-info-page">
-		<!-- 顶部导航栏 -->
-		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
-		<!-- 变更提示 -->
-		<view class="change-tip" v-if="editable">
-			<text>请变更您需要变更的信息</text>
-		</view>
+    <view class="store-info-page">
+        <!-- 顶部导航栏 -->
+        <custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
+        <!-- 变更提示 -->
+        <view class="change-tip" v-if="editable">
+            <text>请变更您需要变更的信息</text>
+        </view>
 
-		<!-- 页面内容容器 -->
-		<view class="page-content" :style="{ paddingBottom: buttonAreaHeight + 'px' }">
-			<!-- 门店信息标题 -->
-			<view class="section-title">
-				<view class="title-bar"></view>
-				<text>门店信息</text>
-			</view>
+        <!-- 页面内容容器 -->
+        <view class="page-content" :style="{ paddingBottom: buttonAreaHeight + 'px' }">
+            <!-- 门店信息标题 -->
+            <view class="section-title">
+                <view class="title-bar"></view>
+                <text>门店信息</text>
+            </view>
 
-			<!-- 店铺logo -->
-			<view class="form-item box-cont">
-				<view class="label-wrapper">
-					<text class="label required">店铺logo</text>
-					<image class="label-icon"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
-						mode="aspectFit" @click="showTipPopup('store_logo')"></image>
-				</view>
-				<view class="upload-box" @click="chooseImage('head_photo')">
-					<image v-if="displayData.head_photo" :src="displayData.head_photo" mode="aspectFill"
-						class="logo-image"></image>
-					<view class="upload-placeholder" v-else>
-						<image src="/static/images/upload-img.png" mode="aspectFit" class="upload-icon"></image>
-					</view>
-				</view>
-			</view>
+            <!-- 店铺logo -->
+            <view class="form-item box-cont">
+                <view class="label-wrapper">
+                    <text class="label required">店铺logo</text>
+                    <image class="label-icon"
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+                        mode="aspectFit" @click="showTipPopup('store_logo')"></image>
+                </view>
+                <view class="upload-box" @click="chooseImage('head_photo')">
+                    <image v-if="displayData.head_photo" :src="displayData.head_photo" mode="aspectFill"
+                        class="logo-image"></image>
+                    <view class="upload-placeholder" v-else>
+                        <image src="/static/images/upload-img.png" mode="aspectFit" class="upload-icon"></image>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 店铺名称 -->
-			<view class="form-item-one box-cont">
-				<view class="label-wrapper">
-					<text class="label required">店铺名称</text>
-					<image class="label-icon"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
-						mode="aspectFit" @click="showTipPopup('store_name')"></image>
-				</view>
-				<input type="text" v-model="displayData.name" placeholder="请输入营业执照的店铺名称" :disabled="!editable"
-					placeholder-class="placeholder" class="input" />
-			</view>
+            <!-- 店铺名称 -->
+            <view class="form-item-one box-cont">
+                <view class="label-wrapper">
+                    <text class="label required">店铺名称</text>
+                    <image class="label-icon"
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+                        mode="aspectFit" @click="showTipPopup('store_name')"></image>
+                </view>
+                <input type="text" v-model="displayData.name" placeholder="请输入营业执照的店铺名称" :disabled="!editable"
+                    placeholder-class="placeholder" class="input" />
+            </view>
 
-			<!-- 门店所在地 -->
-			<view class="form-item-two box-cont" @click="editable ? showLocationPopup() : null">
-				<text class="label required">门店所在地：</text>
-				<view class="picker-content">
-					<text :class="displayData.dependency ? 'picker-value' : 'placeholder'">
-						{{displayData.dependency || '请选择'}}
-					</text>
-					<image v-if="editable"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
-						class="arrow-right" mode="aspectFit"></image>
-				</view>
-			</view>
+            <!-- 门店所在地 -->
+            <view class="form-item-two box-cont" @click="editable ? showLocationPopup() : null">
+                <text class="label required">门店所在地：</text>
+                <view class="picker-content">
+                    <text :class="displayData.dependency ? 'picker-value' : 'placeholder'">
+                        {{displayData.dependency || '请选择'}}
+                    </text>
+                    <image v-if="editable"
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+                        class="arrow-right" mode="aspectFit"></image>
+                </view>
+            </view>
 
-			<!-- 门店详细地址 -->
-			<view class="form-item-two box-cont" @click="getAddressInfo">
-				<text class="label required">门店详细地址：</text>
-				<view class="picker-content">
-					<text :class="displayData.address ? 'picker-value' : 'placeholder'">
-						{{displayData.address || '请选择'}}
-					</text>
-					<image v-if="editable"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
-						class="arrow-right" mode="aspectFit"></image>
-				</view>
-			</view>
+            <!-- 门店详细地址 -->
+            <view class="form-item-two box-cont" @click="getAddressInfo">
+                <text class="label required">门店详细地址：</text>
+                <view class="picker-content">
+                    <text :class="displayData.address ? 'picker-value' : 'placeholder'">
+                        {{displayData.address || '请选择'}}
+                    </text>
+                    <image v-if="editable"
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+                        class="arrow-right" mode="aspectFit"></image>
+                </view>
+            </view>
+        </view>
 
-			<!-- 其他信息标题 -->
-			<view class="section-title">
-				<view class="title-bar"></view>
-				<text>其他信息</text>
-			</view>
+        <!-- 底部按钮区域 -->
+        <view class="bottom-actions" ref="buttonArea">
+            <!-- 驳回原因提示 -->
+            <view class="reject-reason" v-if="shouldShowRejectReason && auditStatus === 3 && backText">
+                <view class="reject-title">您的提交已驳回</view>
+                <view class="reject-detail">驳回原因：{{ backText }}</view>
+            </view>
+            <!-- 审核中提示 -->
+            <view class="audit-tip" v-if="showAuditTip">
+                <text class="audit-text">您的提交变更正在审核中...</text>
+            </view>
 
-			<!-- 专业经验 -->
-			<view class="form-item-two box-cont" @click="editable ? openExperiencePicker() : null">
-				<text class="label required">专业经验：</text>
-				<view class="picker-content">
-					<text :class="displayData.major ? 'picker-value' : 'placeholder'">
-						{{displayData.experienceText || '请选择'}}
-					</text>
-					<image v-if="editable"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
-						class="arrow-right" mode="aspectFit"></image>
-				</view>
-			</view>
-		</view>
+            <!-- 变更信息按钮 -->
+            <view class="action-btn change-info-btn" v-if="buttonType === 'change'" @click="startChange">
+                <text class="btn-text">变更信息</text>
+            </view>
 
-		<!-- 底部按钮区域 -->
-		<view class="bottom-actions" ref="buttonArea">
-			<!-- 驳回原因提示 -->
-			<view class="reject-reason" v-if="shouldShowRejectReason && auditStatus === 3 && backText">
-				<view class="reject-title">您的提交已驳回</view>
-				<view class="reject-detail">驳回原因：{{ backText }}</view>
-			</view>
-			<!-- 审核中提示 -->
-			<view class="audit-tip" v-if="showAuditTip">
-				<text class="audit-text">您的提交变更正在审核中...</text>
-			</view>
+            <!-- 取消和提交按钮 -->
+            <view class="action-buttons-row" v-if="buttonType === 'edit'">
+                <view class="action-btn cancel-btn" @click="cancelChange">
+                    <text class="btn-text cancel-text">取消</text>
+                </view>
+                <view class="action-btn submit-btn" @click="submitChange">
+                    <text class="btn-text">提交</text>
+                </view>
+            </view>
 
-			<!-- 变更信息按钮 -->
-			<view class="action-btn change-info-btn" v-if="buttonType === 'change'" @click="startChange">
-				<text class="btn-text">变更信息</text>
-			</view>
+            <!-- 查看我的变更/返回按钮 -->
+            <view class="action-btn view-change-btn" v-if="buttonType === 'view'" @click="togglePendingData">
+                <text class="btn-text">{{ showPendingData ? '返回' : '查看我的变更' }}</text>
+            </view>
 
-			<!-- 取消和提交按钮 -->
-			<view class="action-buttons-row" v-if="buttonType === 'edit'">
-				<view class="action-btn cancel-btn" @click="cancelChange">
-					<text class="btn-text cancel-text">取消</text>
-				</view>
-				<view class="action-btn submit-btn" @click="submitChange">
-					<text class="btn-text">提交</text>
-				</view>
-			</view>
+            <!-- 重新提交按钮 -->
+            <view class="action-btn resubmit-btn" v-if="buttonType === 'reject'" @click="startChange">
+                <text class="btn-text">重新提交</text>
+            </view>
+        </view>
 
-			<!-- 查看我的变更/返回按钮 -->
-			<view class="action-btn view-change-btn" v-if="buttonType === 'view'" @click="togglePendingData">
-				<text class="btn-text">{{ showPendingData ? '返回' : '查看我的变更' }}</text>
-			</view>
+        <!-- 所在地选择弹出框 -->
+        <view class="popup" :class="{ show: showLocationPopupFlag }">
+            <view class="popup-mask" @click="hideLocationPopup"></view>
+            <view class="popup-content">
+                <view class="popup-header">
+                    <text class="popup-title">选择所在地</text>
+                    <text class="popup-close" @click="hideLocationPopup">×</text>
+                </view>
+                <view class="region-body">
+                    <picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
+                        :value="locationValue">
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">
+                                {{item.province}}
+                            </view>
+                        </picker-view-column>
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">
+                                {{item.city}}
+                            </view>
+                        </picker-view-column>
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item,index) in locationAreas" :key="index">
+                                {{item.area}}
+                            </view>
+                        </picker-view-column>
+                    </picker-view>
+                </view>
+                <view class="popup-footer">
+                    <view class="popup-btn cancel" @click="hideLocationPopup">
+                        <text class="btn-text">取消</text>
+                    </view>
+                    <view class="popup-btn confirm" @click="confirmLocationSelect">
+                        <text class="btn-text">确定</text>
+                    </view>
+                </view>
+            </view>
+        </view>
 
-			<!-- 重新提交按钮 -->
-			<view class="action-btn resubmit-btn" v-if="buttonType === 'reject'" @click="startChange">
-				<text class="btn-text">重新提交</text>
-			</view>
-		</view>
+        <!-- 提示信息弹窗 -->
+        <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+            <view class="tip-popup-mask" @click="hideTipPopup"></view>
+            <view class="tip-popup-content">
+                <image class="tip-popup-bg"
+                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
+                    mode="aspectFit"></image>
+                <view class="tip-popup-body">
+                    <view class="tip-title">{{ tipTitle }}</view>
+                    <view class="tip-image-container">
+                        <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
+                    </view>
+                    <view class="tip-buttons">
+                        <view class="tip-btn cancel" @click="hideTipPopup">
+                            <text class="btn-text">取消</text>
+                        </view>
+                        <view class="tip-btn confirm" @click="hideTipPopup">
+                            <text class="btn-text">我已了解</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
 
-		<!-- 所在地选择弹出框 -->
-		<view class="popup" :class="{ show: showLocationPopupFlag }">
-			<view class="popup-mask" @click="hideLocationPopup"></view>
-			<view class="popup-content">
-				<view class="popup-header">
-					<text class="popup-title">选择所在地</text>
-					<text class="popup-close" @click="hideLocationPopup">×</text>
-				</view>
-				<view class="region-body">
-					<picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
-						:value="locationValue">
-						<picker-view-column>
-							<view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">
-								{{item.province}}
-							</view>
-						</picker-view-column>
-						<picker-view-column>
-							<view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">
-								{{item.city}}
-							</view>
-						</picker-view-column>
-						<picker-view-column>
-							<view class="picker-item" v-for="(item,index) in locationAreas" :key="index">
-								{{item.area}}
-							</view>
-						</picker-view-column>
-					</picker-view>
-				</view>
-				<view class="popup-footer">
-					<view class="popup-btn cancel" @click="hideLocationPopup">
-						<text class="btn-text">取消</text>
-					</view>
-					<view class="popup-btn confirm" @click="confirmLocationSelect">
-						<text class="btn-text">确定</text>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 提示信息弹窗 -->
-		<view class="tip-popup" :class="{ show: showTipPopupFlag }">
-			<view class="tip-popup-mask" @click="hideTipPopup"></view>
-			<view class="tip-popup-content">
-				<image class="tip-popup-bg"
-					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
-					mode="aspectFit"></image>
-				<view class="tip-popup-body">
-					<view class="tip-title">{{ tipTitle }}</view>
-					<view class="tip-image-container">
-						<image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
-					</view>
-					<view class="tip-buttons">
-						<view class="tip-btn cancel" @click="hideTipPopup">
-							<text class="btn-text">取消</text>
-						</view>
-						<view class="tip-btn confirm" @click="hideTipPopup">
-							<text class="btn-text">我已了解</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 存储权限提示 -->
-		<view class="permission" :class="{ transform: isShowStoragePer }">
-			<view class="per-tit">美融融plus 对储存空间/照片权限申请说明</view>
-			<view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中读取相册和文件内容。</view>
-		</view>
-		<!-- 相机权限提示 -->
-		<view class="permission" :class="{ transform: isShowCameraPer }">
-			<view class="per-tit">美融融plus 对相机拍摄权限申请说明</view>
-			<view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。</view>
-		</view>
-		<!-- 定位权限提示 -->
-		<view class="permission" :class="{ transform: isShowLocationPer }">
-			<view class="per-tit">美融融plus 对精确定位权限申请说明</view>
-			<view class="per-cont">便于您使用该功能获取您附近的手艺人以及店铺下的服务内容。</view>
-		</view>
-	</view>
+        <!-- 存储权限提示 -->
+        <view class="permission" :class="{ transform: isShowStoragePer }">
+            <view class="per-tit">美融融plus 对储存空间/照片权限申请说明</view>
+            <view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中读取相册和文件内容。</view>
+        </view>
+        <!-- 相机权限提示 -->
+        <view class="permission" :class="{ transform: isShowCameraPer }">
+            <view class="per-tit">美融融plus 对相机拍摄权限申请说明</view>
+            <view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。</view>
+        </view>
+        <!-- 定位权限提示 -->
+        <view class="permission" :class="{ transform: isShowLocationPer }">
+            <view class="per-tit">美融融plus 对精确定位权限申请说明</view>
+            <view class="per-cont">便于您使用该功能获取您附近的手艺人以及店铺下的服务内容。</view>
+        </view>
+    </view>
 </template>
 
 <script>
-	import request from '../../utils/request';
-	import ChinaCitys from '../../static/data/ChinaCitys.json';
-	import {
-		debounce
-	} from '@/utils/debounce.js';
-	import uploadImage from '../../utils/uploadImage';
-	import permissionUtils from '../../utils/per'; // 新增
-	import locationService from '../../utils/locationService'; // 新增
-
-	export default {
-		data() {
-			return {
-				// 页面状态
-				editable: false,
-				buttonType: 'change',
-				showAuditTip: false,
-				auditStatus: null,
-				applyId: null,
-				showPendingData: false,
-				navTitle: '门店信息变更',
-				buttonAreaHeight: 120,
-				backText: '',
-				hasResubmitted: false,
-
-				// 数据管理
-				originalData: {},
-				pendingData: {},
-				displayData: {},
-
-				// 门店信息字段
-				ChinaCitys: ChinaCitys,
-				locatinCitys: [],
-				locationAreas: [],
-				locationValue: [0, 0, 0],
-				showLocationPopupFlag: false,
-				showTipPopupFlag: false,
-				tipTitle: '',
-				tipImage: '',
-				currentTipType: '',
-				userId: null,
-				identity: 3,
-				applyType: 3,
-
-				// 选择器数据
-				hours: Array.from({
-					length: 24
-				}, (_, i) => i < 10 ? `0${i}` : `${i}`),
-				minutes: Array.from({
-					length: 60
-				}, (_, i) => i < 10 ? `0${i}` : `${i}`),
-				indicatorStyle: 'height: 68rpx;',
-
-				// 地址相关
-				fromAddressPage: false,
-				addressListener: null,
-				dependency_code: '',
-				dependency_province: '',
-				dependency_city: '',
-				longitude: '',
-				latitude: '',
-
-				// 权限控制变量
-				isShowStoragePer: false,
-				isShowCameraPer: false,
-				isShowLocationPer: false,
-			}
-		},
-		computed: {
-			shouldShowRejectReason() {
-				if (this.auditStatus !== 3) return false;
-				if (!this.backText) return false;
-				if (this.showPendingData) return false;
-				return true;
-			}
-		},
-		onLoad() {
-			uni.$on('address-selected-for-sj', (addressData) => {
-				this.handleAddressSelected(addressData);
-			});
-
-			console.log('页面开始加载...');
-			this.identity = getApp().globalData.artisanType;
-			console.log('当前身份类型:', this.identity);
-
-			this.getUserInfo();
-			this.loadApplyDetails();
-
-			this.locatinCitys = this.ChinaCitys[0].citys;
-			this.locationAreas = this.locatinCitys[0]?.areas || [];
-		},
-		onUnload() {
-			uni.$off('address-selected-for-sj');
-		},
-		onReady() {
-			this.getButtonAreaHeight();
-		},
-		onShow() {
-			console.log('页面显示，检查地址数据');
-			this.checkAddressData();
-
-			if (!this.editable) {
-				this.loadApplyDetails();
-			} else {
-				console.log('编辑模式下，跳过自动刷新，保持当前编辑状态');
-			}
-
-			if (this.auditStatus !== 3) {
-				this.backText = '';
-				this.hasResubmitted = false;
-			}
-		},
-		onHide() {
-			this.fromAddressPage = false;
-		},
-		methods: {
-			// 检查地址数据（原有）
-			checkAddressData() {
-				try {
-					const sjAddress = uni.getStorageSync('sj_selected_address');
-					if (sjAddress) {
-						this.handleAddressSelected(sjAddress);
-						uni.removeStorageSync('sj_selected_address');
-						return;
-					}
-				} catch (e) {}
-
-				if (getApp().globalData && getApp().globalData.selectedAddress) {
-					this.handleAddressSelected(getApp().globalData.selectedAddress);
-					delete getApp().globalData.selectedAddress;
-				}
-
-				try {
-					const storedAddress = uni.getStorageSync('selectedAddress');
-					if (storedAddress) {
-						this.handleAddressSelected(storedAddress);
-						uni.removeStorageSync('selectedAddress');
-					}
-				} catch (e) {}
-			},
-
-			// 获取用户信息（原有，未变）
-			getUserInfo() {
-				console.log('开始获取用户信息...');
-				const type = 3;
-
-				request.post('/user/getuser', {
-					type
-				}).then(result => {
-					console.log('接口返回完整数据:', result);
-
-					if (result.state === 1 && result.data) {
-						const userData = result.data;
-						console.log('用户数据详情:', userData);
-
-						this.userId = userData.id;
-
-						this.originalData = {
-							head_photo: userData.head_photo || '',
-							name: userData.name || '',
-							dependency: userData.dependency || '',
-							address: userData.address || '',
-							major: userData.major || '',
-							dependency_code: userData.dependency_code || '',
-							dependency_province: userData.dependency_province || '',
-							dependency_city: userData.dependency_city || '',
-							longitude: userData.longitude || '',
-							latitude: userData.latitude || '',
-							experienceText: this.getExperienceText(userData.major)
-						};
-
-						this.dependency_code = userData.dependency_code || '';
-						this.dependency_province = userData.dependency_province || '';
-						this.dependency_city = userData.dependency_city || '';
-						this.longitude = userData.longitude || '';
-						this.latitude = userData.latitude || '';
-
-						this.pendingData = {
-							...this.originalData
-						};
-						this.displayData = {
-							...this.originalData
-						};
-
-						console.log('数据初始化完成');
-					} else {
-						console.warn('接口返回state不是1或data为空');
-					}
-				}).catch(error => {
-					console.error('获取用户信息失败:', error);
-				});
-			},
-
-			// 智能判断申请状态（原有）
-			intelligentStatusCheck(detail) {
-				if (detail.apply_state === 2) {
-					console.log('智能判断：申请已审核通过');
-					return {
-						isValid: true,
-						status: 2,
-						backText: ''
-					};
-				}
-				if (detail.apply_time) {
-					const applyDate = new Date(detail.apply_time);
-					const now = new Date();
-					const daysDiff = (now - applyDate) / (1000 * 60 * 60 * 24);
-					if (daysDiff > 7 && this.originalData.name !== detail.name) {
-						console.log('智能判断：申请记录已过期，忽略历史记录');
-						return {
-							isValid: false,
-							status: null,
-							backText: ''
-						};
-					}
-				}
-				return {
-					isValid: true,
-					status: detail.apply_state,
-					backText: detail.back_text || ''
-				};
-			},
-
-			// 加载申请详情（原有）
-			async loadApplyDetails() {
-				try {
-					console.log('开始加载申请详情...');
-					const res = await request.post('/sj/userSjAuth/details', {
-						apply_type: this.applyType
-					});
-
-					console.log('申请详情接口返回:', res);
-
-					if (res.code === 200 && res.data) {
-						const detail = res.data;
-						const statusCheck = this.intelligentStatusCheck(detail);
-
-						if (!statusCheck.isValid) {
-							this.auditStatus = null;
-							this.backText = '';
-							this.applyId = null;
-						} else {
-							this.applyId = detail.id;
-							this.auditStatus = statusCheck.status;
-							this.backText = statusCheck.backText;
-
-							console.log('审核状态:', this.auditStatus);
-							console.log('驳回原因:', this.backText);
-
-							if (this.auditStatus === 2) {
-								console.log('审核通过，强制清除驳回相关状态');
-								this.backText = '';
-								this.hasResubmitted = false;
-							}
-
-							if (this.auditStatus === 1 || this.auditStatus === 3) {
-								this.pendingData = {
-									head_photo: detail.head_photo || this.originalData.head_photo,
-									name: detail.name || this.originalData.name,
-									dependency: detail.dependency || this.originalData.dependency,
-									address: detail.address || this.originalData.address,
-									major: detail.major || this.originalData.major,
-									dependency_code: detail.dependency_code || this.originalData.dependency_code,
-									dependency_province: detail.dependency_province || this.originalData
-										.dependency_province,
-									dependency_city: detail.dependency_city || this.originalData.dependency_city,
-									longitude: detail.longitude || this.originalData.longitude,
-									latitude: detail.latitude || this.originalData.latitude,
-									experienceText: this.getExperienceText(detail.major || this.originalData.major)
-								};
-							}
-
-							if (this.auditStatus === 2) {
-								this.originalData = {
-									...this.pendingData
-								};
-							}
-						}
-
-						this.updatePageStatus();
-
-					} else {
-						console.log('申请详情返回数据为空或code不为200:', res);
-						this.backText = '';
-						this.updatePageStatus();
-					}
-				} catch (error) {
-					console.error('加载申请详情失败:', error);
-					this.backText = '';
-					this.updatePageStatus();
-				}
-			},
-
-			// 更新页面状态（原有）
-			updatePageStatus() {
-				console.log('更新页面状态，审核状态:', this.auditStatus);
-
-				if (this.auditStatus !== 3) {
-					this.backText = '';
-				}
-
-				if (this.hasResubmitted && this.auditStatus === 3) {
-					console.log('检测到已重新提交，强制设置为审核中状态');
-					this.auditStatus = 1;
-					this.backText = '';
-				}
-
-				if (this.auditStatus === 1) {
-					this.showAuditTip = true;
-					this.buttonType = 'view';
-					this.editable = false;
-					this.showPendingData = false;
-					this.displayData = {
-						...this.originalData
-					};
-				} else if (this.auditStatus === 3) {
-					this.showAuditTip = false;
-					this.buttonType = 'reject';
-					this.editable = false;
-					this.showPendingData = false;
-					this.displayData = {
-						...this.originalData
-					};
-				} else {
-					this.showAuditTip = false;
-					this.buttonType = 'change';
-					this.editable = false;
-					this.showPendingData = false;
-					this.displayData = {
-						...this.originalData
-					};
-				}
-
-				this.updateNavTitle();
-			},
-
-			updateNavTitle() {
-				if (this.editable || this.showPendingData) {
-					this.navTitle = '门店信息变更';
-				} else {
-					this.navTitle = '门店信息';
-				}
-			},
-
-			getExperienceText(major) {
-				const experiences = ['', '实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-				return experiences[major] || '';
-			},
-
-			startChange() {
-				this.editable = true;
-				this.buttonType = 'edit';
-				this.displayData = {
-					...this.pendingData
-				};
-				this.updateNavTitle();
-			},
-
-			cancelChange() {
-				this.editable = false;
-				this.buttonType = 'change';
-				this.displayData = {
-					...this.originalData
-				};
-				this.updateNavTitle();
-			},
-
-			togglePendingData() {
-				this.showPendingData = !this.showPendingData;
-				if (this.showPendingData) {
-					this.displayData = {
-						...this.pendingData
-					};
-				} else {
-					this.displayData = {
-						...this.originalData
-					};
-				}
-				this.updateNavTitle();
-			},
-
-			async submitChange() {
-				console.log('开始提交变更...');
-				console.log('提交前的displayData:', this.displayData);
-
-				if (!this.validateForm()) {
-					return;
-				}
-
-				try {
-					uni.showLoading({
-						title: '提交中...'
-					});
-
-					this.pendingData = {
-						...this.displayData
-					};
-
-					const submitData = {
-						apply_type: this.applyType,
-						head_photo: this.displayData.head_photo,
-						name: this.displayData.name,
-						dependency: this.displayData.dependency,
-						address: this.displayData.address,
-						longitude: this.displayData.longitude,
-						latitude: this.displayData.latitude,
-						dependency_code: this.displayData.dependency_code,
-						dependency_province: this.displayData.dependency_province,
-						dependency_city: this.displayData.dependency_city,
-						major: this.displayData.major
-					};
-
-					console.log('提交的数据:', submitData);
-
-					const res = await request.post('/sj/userSjAuth/apply', submitData);
-
-					uni.hideLoading();
-
-					if (res.code === 200) {
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none'
-						});
-
-						this.backText = '';
-						this.auditStatus = 1;
-						this.hasResubmitted = true;
-
-						this.pendingData = {
-							...this.displayData
-						};
-
-						this.editable = false;
-						this.buttonType = 'view';
-						this.showAuditTip = true;
-						this.showPendingData = false;
-
-						setTimeout(() => {
-							this.loadApplyDetails();
-						}, 1500);
-
-					} else {
-						uni.showToast({
-							title: res.msg || '提交失败',
-							icon: 'none'
-						});
-					}
-				} catch (error) {
-					uni.hideLoading();
-					console.error('提交失败:', error);
-					uni.showToast({
-						title: '网络错误，请重试',
-						icon: 'none'
-					});
-				}
-			},
-
-			validateForm() {
-				if (!this.displayData.head_photo) {
-					uni.showToast({
-						title: '请上传店铺logo',
-						icon: 'none'
-					});
-					return false;
-				}
-				if (!this.displayData.name) {
-					uni.showToast({
-						title: '请输入店铺名称',
-						icon: 'none'
-					});
-					return false;
-				}
-				if (!this.displayData.dependency) {
-					uni.showToast({
-						title: '请选择门店所在地',
-						icon: 'none'
-					});
-					return false;
-				}
-				if (!this.displayData.address) {
-					uni.showToast({
-						title: '请选择门店详细地址',
-						icon: 'none'
-					});
-					return false;
-				}
-				if (!this.displayData.major) {
-					uni.showToast({
-						title: '请选择专业经验',
-						icon: 'none'
-					});
-					return false;
-				}
-				return true;
-			},
-
-			getButtonAreaHeight() {
-				setTimeout(() => {
-					const query = uni.createSelectorQuery().in(this);
-					query.select('.bottom-actions').boundingClientRect(data => {
-						if (data) this.buttonAreaHeight = data.height + 20;
-					}).exec();
-				}, 100);
-			},
-
-			showTipPopup(field) {
-				const tipConfig = {
-					'store_logo': {
-						title: '如何查看店铺logo',
-						image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9'
-					},
-					'store_name': {
-						title: '如何查看店铺名称',
-						image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
-					}
-				};
-				if (tipConfig[field]) {
-					this.currentTipType = field;
-					this.tipTitle = tipConfig[field].title;
-					this.tipImage = tipConfig[field].image;
-					this.showTipPopupFlag = true;
-				}
-			},
-
-			hideTipPopup() {
-				this.showTipPopupFlag = false;
-			},
-
-			// 修改后的 chooseImage（加入权限检查）
-			async chooseImage(type) {
-				if (!this.editable) return;
-
-				const systemInfo = uni.getSystemInfoSync();
-				const isIOS = systemInfo.platform === 'ios';
-
-				// 弹出操作菜单
-				const res = await new Promise((resolve, reject) => {
-					uni.showActionSheet({
-						itemList: ['拍照', '从相册选择'],
-						success: resolve,
-						fail: reject
-					});
-				}).catch(() => ({
-					tapIndex: -1
-				}));
-
-				if (res.tapIndex === -1) return; // 用户取消
-
-				// 处理拍照
-				if (res.tapIndex === 0) {
-					if (isIOS) {
-						this._openCamera(type, ['camera']);
-					} else {
-						this.isShowCameraPer = true;
-						const {
-							granted
-						} = await permissionUtils.checkPermission('camera', '需要相机权限以拍照');
-						if (granted) {
-							this.isShowCameraPer = false;
-							this._openCamera(type, ['camera']);
-							return;
-						}
-						this.isShowCameraPer = false;
-						const confirm = await this.showPermissionDialog('相机权限申请', '我们需要访问您的相机权限，以便您拍照上传店铺logo');
-						if (!confirm) return;
-						const result = await permissionUtils.requestPermission('camera', '需要相机权限以拍照');
-						if (result) {
-							this._openCamera(type, ['camera']);
-						} else {
-							locationService.openAppSettings();
-						}
-					}
-				}
-				// 处理从相册选择
-				else if (res.tapIndex === 1) {
-					if (isIOS) {
-						this._openCamera(type, ['album']);
-					} else {
-						this.isShowStoragePer = true;
-						const {
-							granted
-						} = await permissionUtils.checkPermission('photo_library', '需要存储权限以选择照片');
-						if (granted) {
-							this.isShowStoragePer = false;
-							this._openCamera(type, ['album']);
-							return;
-						}
-						this.isShowStoragePer = false;
-						const confirm = await this.showPermissionDialog('存储权限申请', '我们需要访问您的相册权限，以便您上传店铺logo');
-						if (!confirm) return;
-						const result = await permissionUtils.requestPermission('photo_library', '需要存储权限以选择照片');
-						if (result) {
-							this._openCamera(type, ['album']);
-						} else {
-							locationService.openAppSettings();
-						}
-					}
-				}
-			},
-
-			// 实际打开相机/相册
-			async _openCamera(type, sourceType) {
-				try {
-					const chooseResult = await new Promise((resolve, reject) => {
-						uni.chooseImage({
-							count: 1,
-							sizeType: ['compressed'],
-							sourceType: sourceType,
-							success: resolve,
-							fail: reject
-						});
-					});
-
-					if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) return;
-
-					const tempFilePath = chooseResult.tempFilePaths[0];
-					const file = {
-						path: tempFilePath,
-						size: 0
-					};
-
-					const result = await this.directUpload(file, this.userId, this.identity + 1);
-
-					if (result) {
-						this.displayData.head_photo = result;
-						console.log('图片上传成功，head_photo 更新为:', result);
-					}
-				} catch (err) {
-					console.log('上传图片错误:', err);
-					if (!err.errMsg || !err.errMsg.includes('cancel')) {
-						uni.showToast({
-							title: '上传失败',
-							icon: 'none'
-						});
-					}
-				}
-			},
-
-			// 显示权限说明弹窗
-			showPermissionDialog(title, content) {
-				return new Promise((resolve) => {
-					uni.showModal({
-						title,
-						content,
-						confirmText: '去开启',
-						success(res) {
-							resolve(res.confirm);
-						}
-					});
-				});
-			},
-
-			async openCamera(type) {
-				try {
-					const chooseResult = await new Promise((resolve, reject) => {
-						uni.chooseImage({
-							count: 1,
-							sizeType: ['compressed'],
-							sourceType: ['album', 'camera'],
-							success: resolve,
-							fail: reject
-						});
-					});
-
-					if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) return;
-
-					const tempFilePath = chooseResult.tempFilePaths[0];
-					const file = {
-						path: tempFilePath,
-						size: 0
-					};
-
-					const result = await this.directUpload(file, this.userId, this.identity + 1);
-
-					if (result) {
-						this.displayData.head_photo = result;
-						console.log('图片上传成功，head_photo 更新为:', result);
-					}
-				} catch (err) {
-					console.log('上传图片错误:', err);
-					if (!err.errMsg || !err.errMsg.includes('cancel')) {
-						uni.showToast({
-							title: '上传失败',
-							icon: 'none'
-						});
-					}
-				}
-			},
-
-			// 直接上传方法（原有）
-			async directUpload(file, userId, type) {
-				try {
-					let date = new Date().getTime();
-					let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
-
-					let fileExtension = 'jpg';
-					if (file.path.includes('.')) {
-						let parts = file.path.split('.');
-						let ext = parts[parts.length - 1].toLowerCase();
-						if (ext && ext.length <= 4) {
-							fileExtension = ext;
-						}
-					}
-
-					let name = `${userId}_${artisan}_${date}.${fileExtension}`;
-					console.log('安全文件名:', name);
-
-					const ossConfig = await request.post('/user/getalioss', {
-						type,
-						kind: 1
-					});
-
-					return await new Promise((resolve, reject) => {
-						uni.uploadFile({
-							url: ossConfig.host,
-							filePath: file.path,
-							name: 'file',
-							formData: {
-								key: ossConfig.dir + name,
-								policy: ossConfig.policy,
-								OSSAccessKeyId: ossConfig.ossAccessKeyId,
-								success_action_status: '200',
-								signature: ossConfig.signature
-							},
-							success: (res) => {
-								if (res.statusCode === 200) {
-									const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
-									resolve(fileUrl);
-								} else {
-									reject(new Error('上传失败'));
-								}
-							},
-							fail: reject
-						});
-					});
-				} catch (error) {
-					console.error('直接上传失败:', error);
-					throw error;
-				}
-			},
-
-			// 所在地选择相关方法（原有，略）
-			showLocationPopup() {
-				if (!this.editable) return;
-				this.showLocationPopupFlag = true;
-			},
-			hideLocationPopup() {
-				this.showLocationPopupFlag = false;
-			},
-			bindChangeLocation(e) {
-				this.locationValue = e.detail.value;
-				let index1 = e.detail.value[0] || 0;
-				let index2 = e.detail.value[1] || 0;
-				this.locatinCitys = this.ChinaCitys[index1].citys;
-				this.locationAreas = this.locatinCitys[index2]?.areas || [];
-			},
-			confirmLocationSelect() {
-				let valueArr = this.locationValue;
-				let index1 = valueArr[0] || 0;
-				let index2 = valueArr[1] || 0;
-				let index3 = valueArr[2] || 0;
-				let province = this.ChinaCitys[index1].province;
-				let city = this.locatinCitys[index2].city;
-				let area = this.locationAreas[index3].area;
-				this.displayData.dependency = province + '-' + city + '-' + area;
-				this.displayData.address = '';
-				this.displayData.longitude = '';
-				this.displayData.latitude = '';
-
-				if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
-					let provinceCode = this.ChinaCitys[index1].code.toString();
-					this.displayData.dependency_province = provinceCode.substring(0, 6);
-				}
-				if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
-					let cityCode = this.locatinCitys[index2].code.toString();
-					this.displayData.dependency_city = cityCode.substring(0, 6);
-				}
-				if (this.locationAreas[index3] && this.locationAreas[index3].code) {
-					let areaCode = this.locationAreas[index3].code.toString();
-					this.displayData.dependency_code = areaCode.substring(0, 6);
-				}
-
-				this.hideLocationPopup();
-			},
-
-			buildRegionTextForSearch() {
-				const dependency = String(this.displayData.dependency || '').trim();
-				if (!dependency) return '';
-
-				const parts = dependency.split('-');
-				const province = parts[0] || '';
-				const city = parts[1] || '';
-				const district = parts[2] || '';
-
-				let regionText = '';
-				if (province) regionText += province;
-				if (city && city !== province) regionText += city;
-				if (district) regionText += district;
-
-				return regionText;
-			},
-
-			getAddressValueForSearch() {
-				const rawAddress = String(this.displayData.address || '').trim();
-				if (!rawAddress) return '';
-
-				const dependencyText = String(this.displayData.dependency || '').trim();
-				const regionText = this.buildRegionTextForSearch();
-
-				let detail = rawAddress;
-
-				// 兼容“完整地址被存进address字段”的情况，进入搜索页时只传详细地址
-				if (regionText && detail.indexOf(regionText) === 0) {
-					detail = detail.slice(regionText.length).trim();
-				} else if (dependencyText && detail.indexOf(dependencyText) === 0) {
-					detail = detail.slice(dependencyText.length).trim();
-				}
-
-				detail = detail.replace(/^[\s,-]+/, '').trim();
-
-				return detail || rawAddress;
-			},
-
-			async getAddressInfo() {
-				if (!this.editable) return;
-
-				const systemInfo = uni.getSystemInfoSync();
-				const isIOS = systemInfo.platform === 'ios';
-
-				const hasDependency = !!String(this.displayData.dependency || '').trim();
-				const hasAddress = !!String(this.getAddressValueForSearch() || '').trim();
-				const hasLocation = !!(this.displayData.longitude && this.displayData.latitude);
-				const hasExistingAddressData = hasDependency || hasAddress || hasLocation;
-
-				// iOS不走你这套权限工具的二次弹窗逻辑，直接进搜索页
-				// 如果当前没有任何地址信息，则让搜索页自己只尝试一次定位
-				if (isIOS) {
-					this._navigateToAddress({
-						canInitCurrentLocation: !hasExistingAddressData
-					});
-					return;
-				}
-
-				// 已有所在地/详细地址/经纬度时，直接带现有值进入，不再额外申请定位
-				if (hasExistingAddressData) {
-					this._navigateToAddress({
-						canInitCurrentLocation: false
-					});
-					return;
-				}
-
-				// 只有完全空白进入时，才申请一次定位权限
-				this.isShowLocationPer = true;
-
-				let granted = false;
-
-				try {
-					const checkRes = await permissionUtils.checkPermission('location', '需要定位权限以获取您的位置');
-					granted = typeof checkRes === 'boolean' ? checkRes : !!(checkRes && checkRes.granted);
-
-					if (!granted) {
-						const requestRes = await permissionUtils.requestPermission('location', '需要定位权限以获取您的位置');
-						granted = typeof requestRes === 'boolean' ? requestRes : !!(requestRes && requestRes.granted);
-					}
-				} catch (error) {
-					console.log('定位权限申请流程异常:', error);
-					granted = false;
-				}
-
-				this.isShowLocationPer = false;
-
-				// 不管用户同不同意，都进入搜索地址页
-				// 同意：按当前位置初始化
-				// 不同意/没给权限：进入页面但不自动精确定位
-				this._navigateToAddress({
-					canInitCurrentLocation: granted
-				});
-			},
-
-			_navigateToAddress({
-				canInitCurrentLocation = false
-			} = {}) {
-				let params = 'source=sj_info';
-
-				const dependency = String(this.displayData.dependency || '').trim();
-				const dependencyCode = String(this.displayData.dependency_code || '').trim();
-				const address = this.getAddressValueForSearch();
-				const longitude = this.displayData.longitude;
-				const latitude = this.displayData.latitude;
-
-				const hasDependency = !!dependency;
-				const hasAddress = !!address;
-				const hasLocation = !!(longitude && latitude);
-
-				if (hasDependency) {
-					params += `&dependency=${encodeURIComponent(dependency)}`;
-					if (dependencyCode) {
-						params += `&dependency_code=${dependencyCode}`;
-					}
-				}
-
-				// 关键修复：把详细地址带过去，搜索页才能回填
-				if (hasAddress) {
-					params += `&address=${encodeURIComponent(address)}`;
-				}
-
-				if (hasLocation) {
-					params += `&longitude=${longitude}&latitude=${latitude}`;
-				}
-
-				// 当前门店信息页没有任何已知地址数据时，再决定搜索页是否初始化当前位置
-				if (!hasDependency && !hasAddress && !hasLocation) {
-					if (canInitCurrentLocation) {
-						params += '&init_current_location=1&silent_locate=1';
-					} else {
-						params += '&skip_auto_locate=1';
-					}
-				}
-
-				this.fromAddressPage = true;
-
-				uni.navigateTo({
-					url: `/pages/address/search?${params}`,
-					success: () => console.log('成功跳转到地址选择页面'),
-					fail: (err) => console.error('跳转地址选择页面失败:', err)
-				});
-			},
-
-			handleAddressSelected(addressData) {
-				if (!addressData) return;
-
-				// 详细地址只取 address，不再优先取 name
-				let detailAddress = '';
-				if (addressData.address) {
-					detailAddress = String(addressData.address).trim();
-				} else if (addressData.name) {
-					// 兜底：老数据里如果只有name，就尝试去掉前面的省市区
-					detailAddress = String(addressData.name).trim();
-
-					const regionParts = [];
-					if (addressData.pname) regionParts.push(addressData.pname);
-					if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData
-						.cityname);
-					if (addressData.adname) regionParts.push(addressData.adname);
-
-					const regionText = regionParts.join('');
-					const regionTextWithDash = regionParts.join('-');
-
-					if (regionText && detailAddress.indexOf(regionText) === 0) {
-						detailAddress = detailAddress.slice(regionText.length).trim();
-					} else if (regionTextWithDash && detailAddress.indexOf(regionTextWithDash) === 0) {
-						detailAddress = detailAddress.slice(regionTextWithDash.length).trim();
-					}
-
-					detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
-				}
-
-				this.displayData.address = detailAddress;
-				this.pendingData.address = detailAddress;
-
-				if (addressData.location) {
-					const [longitude, latitude] = addressData.location.split(',');
-					this.displayData.longitude = longitude || '';
-					this.displayData.latitude = latitude || '';
-					this.pendingData.longitude = longitude || '';
-					this.pendingData.latitude = latitude || '';
-				}
-
-				if (addressData.pname || addressData.cityname || addressData.adname) {
-					const locationParts = [];
-					if (addressData.pname) locationParts.push(addressData.pname);
-					if (addressData.cityname) locationParts.push(addressData.cityname);
-					if (addressData.adname) locationParts.push(addressData.adname);
-
-					const dependency = locationParts.join('-');
-					this.displayData.dependency = dependency;
-					this.pendingData.dependency = dependency;
-				}
-
-				if (addressData.provinceCode || addressData.cityCode || addressData.districtCode) {
-					this.displayData.dependency_province = addressData.provinceCode || '';
-					this.displayData.dependency_city = addressData.cityCode || '';
-					this.displayData.dependency_code = addressData.districtCode || '';
-
-					this.pendingData.dependency_province = addressData.provinceCode || '';
-					this.pendingData.dependency_city = addressData.cityCode || '';
-					this.pendingData.dependency_code = addressData.districtCode || '';
-				}
-
-				console.log('地址更新完成:', {
-					address: this.displayData.address,
-					dependency: this.displayData.dependency,
-					longitude: this.displayData.longitude,
-					latitude: this.displayData.latitude
-				});
-
-				this.$forceUpdate();
-			},
-
-			openExperiencePicker() {
-				if (!this.editable) return;
-				uni.showActionSheet({
-					itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
-					success: (res) => {
-						const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-						this.displayData.major = res.tapIndex + 1;
-						this.displayData.experienceText = experiences[res.tapIndex];
-						console.log('选择专业经验:', this.displayData.major, this.displayData.experienceText);
-					}
-				});
-			}
-		}
-	}
+    import request from '../../utils/request';
+    import ChinaCitys from '../../static/data/ChinaCitys.json';
+    import {
+        debounce
+    } from '@/utils/debounce.js';
+    import uploadImage from '../../utils/uploadImage';
+    import permissionUtils from '../../utils/per'; // 新增
+    import locationService from '../../utils/locationService'; // 新增
+
+    export default {
+        data() {
+            return {
+                // 页面状态
+                editable: false,
+                buttonType: 'change',
+                showAuditTip: false,
+                auditStatus: null,
+                applyId: null,
+                showPendingData: false,
+                navTitle: '门店信息变更',
+                buttonAreaHeight: 120,
+                backText: '',
+                hasResubmitted: false,
+
+                // 数据管理
+                originalData: {},
+                pendingData: {},
+                displayData: {},
+
+                // 门店信息字段
+                ChinaCitys: ChinaCitys,
+                locatinCitys: [],
+                locationAreas: [],
+                locationValue: [0, 0, 0],
+                showLocationPopupFlag: false,
+                showTipPopupFlag: false,
+                tipTitle: '',
+                tipImage: '',
+                currentTipType: '',
+                userId: null,
+                identity: 3,
+                applyType: 3,
+
+                // 选择器数据
+                hours: Array.from({
+                    length: 24
+                }, (_, i) => i < 10 ? `0${i}` : `${i}`),
+                minutes: Array.from({
+                    length: 60
+                }, (_, i) => i < 10 ? `0${i}` : `${i}`),
+                indicatorStyle: 'height: 68rpx;',
+
+                // 地址相关
+                fromAddressPage: false,
+                addressListener: null,
+                dependency_code: '',
+                dependency_province: '',
+                dependency_city: '',
+                longitude: '',
+                latitude: '',
+
+                // 权限控制变量
+                isShowStoragePer: false,
+                isShowCameraPer: false,
+                isShowLocationPer: false,
+            }
+        },
+        computed: {
+            shouldShowRejectReason() {
+                if (this.auditStatus !== 3) return false;
+                if (!this.backText) return false;
+                if (this.showPendingData) return false;
+                return true;
+            }
+        },
+        onLoad() {
+            uni.$on('address-selected-for-sj', (addressData) => {
+                this.handleAddressSelected(addressData);
+            });
+
+            console.log('页面开始加载...');
+            this.identity = getApp().globalData.artisanType;
+            console.log('当前身份类型:', this.identity);
+
+            this.getUserInfo();
+            this.loadApplyDetails();
+
+            this.locatinCitys = this.ChinaCitys[0].citys;
+            this.locationAreas = this.locatinCitys[0]?.areas || [];
+        },
+        onUnload() {
+            uni.$off('address-selected-for-sj');
+        },
+        onReady() {
+            this.getButtonAreaHeight();
+        },
+        onShow() {
+            console.log('页面显示，检查地址数据');
+            this.checkAddressData();
+
+            if (!this.editable) {
+                this.loadApplyDetails();
+            } else {
+                console.log('编辑模式下，跳过自动刷新，保持当前编辑状态');
+            }
+
+            if (this.auditStatus !== 3) {
+                this.backText = '';
+                this.hasResubmitted = false;
+            }
+        },
+        onHide() {
+            this.fromAddressPage = false;
+        },
+        methods: {
+            // 检查地址数据（原有）
+            checkAddressData() {
+                try {
+                    const sjAddress = uni.getStorageSync('sj_selected_address');
+                    if (sjAddress) {
+                        this.handleAddressSelected(sjAddress);
+                        uni.removeStorageSync('sj_selected_address');
+                        return;
+                    }
+                } catch (e) {}
+
+                if (getApp().globalData && getApp().globalData.selectedAddress) {
+                    this.handleAddressSelected(getApp().globalData.selectedAddress);
+                    delete getApp().globalData.selectedAddress;
+                }
+
+                try {
+                    const storedAddress = uni.getStorageSync('selectedAddress');
+                    if (storedAddress) {
+                        this.handleAddressSelected(storedAddress);
+                        uni.removeStorageSync('selectedAddress');
+                    }
+                } catch (e) {}
+            },
+
+            // 兼容接口里门店地址字段的不同命名
+            pickFirst(data, fields) {
+                for (const field of fields) {
+                    const value = data && data[field];
+                    if (value !== undefined && value !== null && String(value).trim() !== '') {
+                        return value;
+                    }
+                }
+                return '';
+            },
+
+            normalizeStoreInfo(data = {}) {
+                return {
+                    head_photo: this.pickFirst(data, ['head_photo', 'shop_head_photo']),
+                    name: this.pickFirst(data, ['name', 'shop_name']),
+                    dependency: this.pickFirst(data, ['dependency', 'shop_dependency', 'uscc_dependency']),
+                    address: this.pickFirst(data, ['address', 'shop_address', 'uscc_address']),
+                    dependency_code: this.pickFirst(data, ['dependency_code', 'shop_dependency_code', 'uscc_area']),
+                    dependency_province: this.pickFirst(data, ['dependency_province', 'shop_dependency_province', 'uscc_province']),
+                    dependency_city: this.pickFirst(data, ['dependency_city', 'shop_dependency_city', 'uscc_city']),
+                    longitude: this.pickFirst(data, ['longitude', 'shop_longitude']),
+                    latitude: this.pickFirst(data, ['latitude', 'shop_latitude'])
+                };
+            },
+
+            mergeStoreInfoWithOriginal(data = {}) {
+                const storeInfo = this.normalizeStoreInfo(data);
+                return {
+                    head_photo: storeInfo.head_photo || this.originalData.head_photo,
+                    name: storeInfo.name || this.originalData.name,
+                    dependency: storeInfo.dependency || this.originalData.dependency,
+                    address: storeInfo.address || this.originalData.address,
+                    dependency_code: storeInfo.dependency_code || this.originalData.dependency_code,
+                    dependency_province: storeInfo.dependency_province || this.originalData.dependency_province,
+                    dependency_city: storeInfo.dependency_city || this.originalData.dependency_city,
+                    longitude: storeInfo.longitude || this.originalData.longitude,
+                    latitude: storeInfo.latitude || this.originalData.latitude
+                };
+            },
+
+            // 获取用户信息
+            getUserInfo() {
+                console.log('开始获取用户信息...');
+                const type = 3;
+
+                request.post('/sj/user/getuser', {
+                    type
+                }).then(result => {
+                    console.log('接口返回完整数据:', result);
+
+                    if (result.state === 1 && result.data) {
+                        const userData = result.data;
+                        console.log('用户数据详情:', userData);
+
+                        this.userId = userData.id;
+
+                        this.originalData = this.normalizeStoreInfo(userData);
+
+                        this.dependency_code = this.originalData.dependency_code || '';
+                        this.dependency_province = this.originalData.dependency_province || '';
+                        this.dependency_city = this.originalData.dependency_city || '';
+                        this.longitude = this.originalData.longitude || '';
+                        this.latitude = this.originalData.latitude || '';
+
+                        this.pendingData = {
+                            ...this.originalData
+                        };
+                        this.displayData = {
+                            ...this.originalData
+                        };
+
+                        console.log('数据初始化完成');
+                    } else {
+                        console.warn('接口返回state不是1或data为空');
+                    }
+                }).catch(error => {
+                    console.error('获取用户信息失败:', error);
+                });
+            },
+
+            // 智能判断申请状态（原有）
+            intelligentStatusCheck(detail) {
+                if (detail.apply_state === 2) {
+                    console.log('智能判断：申请已审核通过');
+                    return {
+                        isValid: true,
+                        status: 2,
+                        backText: ''
+                    };
+                }
+                if (detail.apply_time) {
+                    const applyDate = new Date(detail.apply_time);
+                    const now = new Date();
+                    const daysDiff = (now - applyDate) / (1000 * 60 * 60 * 24);
+                    if (daysDiff > 7 && this.originalData.name !== detail.name) {
+                        console.log('智能判断：申请记录已过期，忽略历史记录');
+                        return {
+                            isValid: false,
+                            status: null,
+                            backText: ''
+                        };
+                    }
+                }
+                return {
+                    isValid: true,
+                    status: detail.apply_state,
+                    backText: detail.back_text || ''
+                };
+            },
+
+            // 加载申请详情（原有）
+            async loadApplyDetails() {
+                try {
+                    console.log('开始加载申请详情...');
+                    const res = await request.post('/sj/userSjAuth/details', {
+                        apply_type: this.applyType
+                    });
+
+                    console.log('申请详情接口返回:', res);
+
+                    if (res.code === 200 && res.data) {
+                        const detail = res.data;
+                        const statusCheck = this.intelligentStatusCheck(detail);
+
+                        if (!statusCheck.isValid) {
+                            this.auditStatus = null;
+                            this.backText = '';
+                            this.applyId = null;
+                        } else {
+                            this.applyId = detail.id;
+                            this.auditStatus = statusCheck.status;
+                            this.backText = statusCheck.backText;
+
+                            console.log('审核状态:', this.auditStatus);
+                            console.log('驳回原因:', this.backText);
+
+                            if (this.auditStatus === 2) {
+                                console.log('审核通过，强制清除驳回相关状态');
+                                this.backText = '';
+                                this.hasResubmitted = false;
+                            }
+
+                            if (this.auditStatus === 1 || this.auditStatus === 3) {
+                                this.pendingData = this.mergeStoreInfoWithOriginal(detail);
+                            }
+
+                            if (this.auditStatus === 2) {
+                                this.originalData = {
+                                    ...this.pendingData
+                                };
+                            }
+                        }
+
+                        this.updatePageStatus();
+
+                    } else {
+                        console.log('申请详情返回数据为空或code不为200:', res);
+                        this.backText = '';
+                        this.updatePageStatus();
+                    }
+                } catch (error) {
+                    console.error('加载申请详情失败:', error);
+                    this.backText = '';
+                    this.updatePageStatus();
+                }
+            },
+
+            // 更新页面状态（原有）
+            updatePageStatus() {
+                console.log('更新页面状态，审核状态:', this.auditStatus);
+
+                if (this.auditStatus !== 3) {
+                    this.backText = '';
+                }
+
+                if (this.hasResubmitted && this.auditStatus === 3) {
+                    console.log('检测到已重新提交，强制设置为审核中状态');
+                    this.auditStatus = 1;
+                    this.backText = '';
+                }
+
+                if (this.auditStatus === 1) {
+                    this.showAuditTip = true;
+                    this.buttonType = 'view';
+                    this.editable = false;
+                    this.showPendingData = false;
+                    this.displayData = {
+                        ...this.originalData
+                    };
+                } else if (this.auditStatus === 3) {
+                    this.showAuditTip = false;
+                    this.buttonType = 'reject';
+                    this.editable = false;
+                    this.showPendingData = false;
+                    this.displayData = {
+                        ...this.originalData
+                    };
+                } else {
+                    this.showAuditTip = false;
+                    this.buttonType = 'change';
+                    this.editable = false;
+                    this.showPendingData = false;
+                    this.displayData = {
+                        ...this.originalData
+                    };
+                }
+
+                this.updateNavTitle();
+            },
+
+            updateNavTitle() {
+                if (this.editable || this.showPendingData) {
+                    this.navTitle = '门店信息变更';
+                } else {
+                    this.navTitle = '门店信息';
+                }
+            },
+
+            startChange() {
+                this.editable = true;
+                this.buttonType = 'edit';
+                this.displayData = {
+                    ...this.pendingData
+                };
+                this.updateNavTitle();
+            },
+
+            cancelChange() {
+                this.editable = false;
+                this.buttonType = 'change';
+                this.displayData = {
+                    ...this.originalData
+                };
+                this.updateNavTitle();
+            },
+
+            togglePendingData() {
+                this.showPendingData = !this.showPendingData;
+                if (this.showPendingData) {
+                    this.displayData = {
+                        ...this.pendingData
+                    };
+                } else {
+                    this.displayData = {
+                        ...this.originalData
+                    };
+                }
+                this.updateNavTitle();
+            },
+
+            async submitChange() {
+                console.log('开始提交变更...');
+                console.log('提交前的displayData:', this.displayData);
+
+                if (!this.validateForm()) {
+                    return;
+                }
+
+                try {
+                    uni.showLoading({
+                        title: '提交中...'
+                    });
+
+                    this.pendingData = {
+                        ...this.displayData
+                    };
+
+                    const submitData = {
+                        apply_type: this.applyType,
+                        head_photo: this.displayData.head_photo,
+                        name: this.displayData.name,
+                        dependency: this.displayData.dependency,
+                        address: this.displayData.address,
+                        longitude: this.displayData.longitude,
+                        latitude: this.displayData.latitude,
+                        dependency_code: this.displayData.dependency_code,
+                        dependency_province: this.displayData.dependency_province,
+                        dependency_city: this.displayData.dependency_city
+                    };
+
+                    console.log('提交的数据:', submitData);
+
+                    const res = await request.post('/sj/userSjAuth/apply', submitData);
+
+                    uni.hideLoading();
+
+                    if (res.code === 200) {
+                        uni.showToast({
+                            title: '提交成功',
+                            icon: 'none'
+                        });
+
+                        this.backText = '';
+                        this.auditStatus = 1;
+                        this.hasResubmitted = true;
+
+                        this.pendingData = {
+                            ...this.displayData
+                        };
+
+                        this.editable = false;
+                        this.buttonType = 'view';
+                        this.showAuditTip = true;
+                        this.showPendingData = false;
+
+                        setTimeout(() => {
+                            this.loadApplyDetails();
+                        }, 1500);
+
+                    } else {
+                        uni.showToast({
+                            title: res.msg || '提交失败',
+                            icon: 'none'
+                        });
+                    }
+                } catch (error) {
+                    uni.hideLoading();
+                    console.error('提交失败:', error);
+                    uni.showToast({
+                        title: '网络错误，请重试',
+                        icon: 'none'
+                    });
+                }
+            },
+
+            validateForm() {
+                if (!this.displayData.head_photo) {
+                    uni.showToast({
+                        title: '请上传店铺logo',
+                        icon: 'none'
+                    });
+                    return false;
+                }
+                if (!this.displayData.name) {
+                    uni.showToast({
+                        title: '请输入店铺名称',
+                        icon: 'none'
+                    });
+                    return false;
+                }
+                if (!this.displayData.dependency) {
+                    uni.showToast({
+                        title: '请选择门店所在地',
+                        icon: 'none'
+                    });
+                    return false;
+                }
+                if (!this.displayData.address) {
+                    uni.showToast({
+                        title: '请选择门店详细地址',
+                        icon: 'none'
+                    });
+                    return false;
+                }
+                return true;
+            },
+
+            getButtonAreaHeight() {
+                setTimeout(() => {
+                    const query = uni.createSelectorQuery().in(this);
+                    query.select('.bottom-actions').boundingClientRect(data => {
+                        if (data) this.buttonAreaHeight = data.height + 20;
+                    }).exec();
+                }, 100);
+            },
+
+            showTipPopup(field) {
+                const tipConfig = {
+                    'store_logo': {
+                        title: '如何查看店铺logo',
+                        image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9'
+                    },
+                    'store_name': {
+                        title: '如何查看店铺名称',
+                        image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
+                    }
+                };
+                if (tipConfig[field]) {
+                    this.currentTipType = field;
+                    this.tipTitle = tipConfig[field].title;
+                    this.tipImage = tipConfig[field].image;
+                    this.showTipPopupFlag = true;
+                }
+            },
+
+            hideTipPopup() {
+                this.showTipPopupFlag = false;
+            },
+
+            // 修改后的 chooseImage（加入权限检查）
+            async chooseImage(type) {
+                if (!this.editable) return;
+
+                const systemInfo = uni.getSystemInfoSync();
+                const isIOS = systemInfo.platform === 'ios';
+
+                // 弹出操作菜单
+                const res = await new Promise((resolve, reject) => {
+                    uni.showActionSheet({
+                        itemList: ['拍照', '从相册选择'],
+                        success: resolve,
+                        fail: reject
+                    });
+                }).catch(() => ({
+                    tapIndex: -1
+                }));
+
+                if (res.tapIndex === -1) return; // 用户取消
+
+                // 处理拍照
+                if (res.tapIndex === 0) {
+                    if (isIOS) {
+                        this._openCamera(type, ['camera']);
+                    } else {
+                        this.isShowCameraPer = true;
+                        const {
+                            granted
+                        } = await permissionUtils.checkPermission('camera', '需要相机权限以拍照');
+                        if (granted) {
+                            this.isShowCameraPer = false;
+                            this._openCamera(type, ['camera']);
+                            return;
+                        }
+                        this.isShowCameraPer = false;
+                        const confirm = await this.showPermissionDialog('相机权限申请', '我们需要访问您的相机权限，以便您拍照上传店铺logo');
+                        if (!confirm) return;
+                        const result = await permissionUtils.requestPermission('camera', '需要相机权限以拍照');
+                        if (result) {
+                            this._openCamera(type, ['camera']);
+                        } else {
+                            locationService.openAppSettings();
+                        }
+                    }
+                }
+                // 处理从相册选择
+                else if (res.tapIndex === 1) {
+                    if (isIOS) {
+                        this._openCamera(type, ['album']);
+                    } else {
+                        this.isShowStoragePer = true;
+                        const {
+                            granted
+                        } = await permissionUtils.checkPermission('photo_library', '需要存储权限以选择照片');
+                        if (granted) {
+                            this.isShowStoragePer = false;
+                            this._openCamera(type, ['album']);
+                            return;
+                        }
+                        this.isShowStoragePer = false;
+                        const confirm = await this.showPermissionDialog('存储权限申请', '我们需要访问您的相册权限，以便您上传店铺logo');
+                        if (!confirm) return;
+                        const result = await permissionUtils.requestPermission('photo_library', '需要存储权限以选择照片');
+                        if (result) {
+                            this._openCamera(type, ['album']);
+                        } else {
+                            locationService.openAppSettings();
+                        }
+                    }
+                }
+            },
+
+            // 实际打开相机/相册
+            async _openCamera(type, sourceType) {
+                try {
+                    const chooseResult = await new Promise((resolve, reject) => {
+                        uni.chooseImage({
+                            count: 1,
+                            sizeType: ['compressed'],
+                            sourceType: sourceType,
+                            success: resolve,
+                            fail: reject
+                        });
+                    });
+
+                    if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) return;
+
+                    const tempFilePath = chooseResult.tempFilePaths[0];
+                    const file = {
+                        path: tempFilePath,
+                        size: 0
+                    };
+
+                    const result = await this.directUpload(file, this.userId, this.identity + 1);
+
+                    if (result) {
+                        this.displayData.head_photo = result;
+                        console.log('图片上传成功，head_photo 更新为:', result);
+                    }
+                } catch (err) {
+                    console.log('上传图片错误:', err);
+                    if (!err.errMsg || !err.errMsg.includes('cancel')) {
+                        uni.showToast({
+                            title: '上传失败',
+                            icon: 'none'
+                        });
+                    }
+                }
+            },
+
+            // 显示权限说明弹窗
+            showPermissionDialog(title, content) {
+                return new Promise((resolve) => {
+                    uni.showModal({
+                        title,
+                        content,
+                        confirmText: '去开启',
+                        success(res) {
+                            resolve(res.confirm);
+                        }
+                    });
+                });
+            },
+
+            async openCamera(type) {
+                try {
+                    const chooseResult = await new Promise((resolve, reject) => {
+                        uni.chooseImage({
+                            count: 1,
+                            sizeType: ['compressed'],
+                            sourceType: ['album', 'camera'],
+                            success: resolve,
+                            fail: reject
+                        });
+                    });
+
+                    if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) return;
+
+                    const tempFilePath = chooseResult.tempFilePaths[0];
+                    const file = {
+                        path: tempFilePath,
+                        size: 0
+                    };
+
+                    const result = await this.directUpload(file, this.userId, this.identity + 1);
+
+                    if (result) {
+                        this.displayData.head_photo = result;
+                        console.log('图片上传成功，head_photo 更新为:', result);
+                    }
+                } catch (err) {
+                    console.log('上传图片错误:', err);
+                    if (!err.errMsg || !err.errMsg.includes('cancel')) {
+                        uni.showToast({
+                            title: '上传失败',
+                            icon: 'none'
+                        });
+                    }
+                }
+            },
+
+            // 直接上传方法（原有）
+            async directUpload(file, userId, type) {
+                try {
+                    let date = new Date().getTime();
+                    let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
+
+                    let fileExtension = 'jpg';
+                    if (file.path.includes('.')) {
+                        let parts = file.path.split('.');
+                        let ext = parts[parts.length - 1].toLowerCase();
+                        if (ext && ext.length <= 4) {
+                            fileExtension = ext;
+                        }
+                    }
+
+                    let name = `${userId}_${artisan}_${date}.${fileExtension}`;
+                    console.log('安全文件名:', name);
+
+                    const ossConfig = await request.post('/user/getalioss', {
+                        type,
+                        kind: 1
+                    });
+
+                    return await new Promise((resolve, reject) => {
+                        uni.uploadFile({
+                            url: ossConfig.host,
+                            filePath: file.path,
+                            name: 'file',
+                            formData: {
+                                key: ossConfig.dir + name,
+                                policy: ossConfig.policy,
+                                OSSAccessKeyId: ossConfig.ossAccessKeyId,
+                                success_action_status: '200',
+                                signature: ossConfig.signature
+                            },
+                            success: (res) => {
+                                if (res.statusCode === 200) {
+                                    const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
+                                    resolve(fileUrl);
+                                } else {
+                                    reject(new Error('上传失败'));
+                                }
+                            },
+                            fail: reject
+                        });
+                    });
+                } catch (error) {
+                    console.error('直接上传失败:', error);
+                    throw error;
+                }
+            },
+
+            // 所在地选择相关方法（原有，略）
+            showLocationPopup() {
+                if (!this.editable) return;
+                this.showLocationPopupFlag = true;
+            },
+            hideLocationPopup() {
+                this.showLocationPopupFlag = false;
+            },
+            bindChangeLocation(e) {
+                this.locationValue = e.detail.value;
+                let index1 = e.detail.value[0] || 0;
+                let index2 = e.detail.value[1] || 0;
+                this.locatinCitys = this.ChinaCitys[index1].citys;
+                this.locationAreas = this.locatinCitys[index2]?.areas || [];
+            },
+            confirmLocationSelect() {
+                let valueArr = this.locationValue;
+                let index1 = valueArr[0] || 0;
+                let index2 = valueArr[1] || 0;
+                let index3 = valueArr[2] || 0;
+                let province = this.ChinaCitys[index1].province;
+                let city = this.locatinCitys[index2].city;
+                let area = this.locationAreas[index3].area;
+                this.displayData.dependency = province + '-' + city + '-' + area;
+                this.displayData.address = '';
+                this.displayData.longitude = '';
+                this.displayData.latitude = '';
+
+                if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+                    let provinceCode = this.ChinaCitys[index1].code.toString();
+                    this.displayData.dependency_province = provinceCode.substring(0, 6);
+                }
+                if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
+                    let cityCode = this.locatinCitys[index2].code.toString();
+                    this.displayData.dependency_city = cityCode.substring(0, 6);
+                }
+                if (this.locationAreas[index3] && this.locationAreas[index3].code) {
+                    let areaCode = this.locationAreas[index3].code.toString();
+                    this.displayData.dependency_code = areaCode.substring(0, 6);
+                }
+
+                this.hideLocationPopup();
+            },
+
+            buildRegionTextForSearch() {
+                const dependency = String(this.displayData.dependency || '').trim();
+                if (!dependency) return '';
+
+                const parts = dependency.split('-');
+                const province = parts[0] || '';
+                const city = parts[1] || '';
+                const district = parts[2] || '';
+
+                let regionText = '';
+                if (province) regionText += province;
+                if (city && city !== province) regionText += city;
+                if (district) regionText += district;
+
+                return regionText;
+            },
+
+            getAddressValueForSearch() {
+                const rawAddress = String(this.displayData.address || '').trim();
+                if (!rawAddress) return '';
+
+                const dependencyText = String(this.displayData.dependency || '').trim();
+                const regionText = this.buildRegionTextForSearch();
+
+                let detail = rawAddress;
+
+                // 兼容“完整地址被存进address字段”的情况，进入搜索页时只传详细地址
+                if (regionText && detail.indexOf(regionText) === 0) {
+                    detail = detail.slice(regionText.length).trim();
+                } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+                    detail = detail.slice(dependencyText.length).trim();
+                }
+
+                detail = detail.replace(/^[\s,-]+/, '').trim();
+
+                return detail || rawAddress;
+            },
+
+            async getAddressInfo() {
+                if (!this.editable) return;
+
+                const systemInfo = uni.getSystemInfoSync();
+                const isIOS = systemInfo.platform === 'ios';
+
+                const hasDependency = !!String(this.displayData.dependency || '').trim();
+                const hasAddress = !!String(this.getAddressValueForSearch() || '').trim();
+                const hasLocation = !!(this.displayData.longitude && this.displayData.latitude);
+                const hasExistingAddressData = hasDependency || hasAddress || hasLocation;
+
+                // iOS不走你这套权限工具的二次弹窗逻辑，直接进搜索页
+                // 如果当前没有任何地址信息，则让搜索页自己只尝试一次定位
+                if (isIOS) {
+                    this._navigateToAddress({
+                        canInitCurrentLocation: !hasExistingAddressData
+                    });
+                    return;
+                }
+
+                // 已有所在地/详细地址/经纬度时，直接带现有值进入，不再额外申请定位
+                if (hasExistingAddressData) {
+                    this._navigateToAddress({
+                        canInitCurrentLocation: false
+                    });
+                    return;
+                }
+
+                // 只有完全空白进入时，才申请一次定位权限
+                this.isShowLocationPer = true;
+
+                let granted = false;
+
+                try {
+                    const checkRes = await permissionUtils.checkPermission('location', '需要定位权限以获取您的位置');
+                    granted = typeof checkRes === 'boolean' ? checkRes : !!(checkRes && checkRes.granted);
+
+                    if (!granted) {
+                        const requestRes = await permissionUtils.requestPermission('location', '需要定位权限以获取您的位置');
+                        granted = typeof requestRes === 'boolean' ? requestRes : !!(requestRes && requestRes.granted);
+                    }
+                } catch (error) {
+                    console.log('定位权限申请流程异常:', error);
+                    granted = false;
+                }
+
+                this.isShowLocationPer = false;
+
+                // 不管用户同不同意，都进入搜索地址页
+                // 同意：按当前位置初始化
+                // 不同意/没给权限：进入页面但不自动精确定位
+                this._navigateToAddress({
+                    canInitCurrentLocation: granted
+                });
+            },
+
+            _navigateToAddress({
+                canInitCurrentLocation = false
+            } = {}) {
+                let params = 'source=sj_info';
+
+                const dependency = String(this.displayData.dependency || '').trim();
+                const dependencyCode = String(this.displayData.dependency_code || '').trim();
+                const address = this.getAddressValueForSearch();
+                const longitude = this.displayData.longitude;
+                const latitude = this.displayData.latitude;
+
+                const hasDependency = !!dependency;
+                const hasAddress = !!address;
+                const hasLocation = !!(longitude && latitude);
+
+                if (hasDependency) {
+                    params += `&dependency=${encodeURIComponent(dependency)}`;
+                    if (dependencyCode) {
+                        params += `&dependency_code=${dependencyCode}`;
+                    }
+                }
+
+                // 关键修复：把详细地址带过去，搜索页才能回填
+                if (hasAddress) {
+                    params += `&address=${encodeURIComponent(address)}`;
+                }
+
+                if (hasLocation) {
+                    params += `&longitude=${longitude}&latitude=${latitude}`;
+                }
+
+                // 当前门店信息页没有任何已知地址数据时，再决定搜索页是否初始化当前位置
+                if (!hasDependency && !hasAddress && !hasLocation) {
+                    if (canInitCurrentLocation) {
+                        params += '&init_current_location=1&silent_locate=1';
+                    } else {
+                        params += '&skip_auto_locate=1';
+                    }
+                }
+
+                this.fromAddressPage = true;
+
+                uni.navigateTo({
+                    url: `/pages/address/search?${params}`,
+                    success: () => console.log('成功跳转到地址选择页面'),
+                    fail: (err) => console.error('跳转地址选择页面失败:', err)
+                });
+            },
+
+            handleAddressSelected(addressData) {
+                if (!addressData) return;
+
+                // 详细地址只取 address，不再优先取 name
+                let detailAddress = '';
+                if (addressData.address) {
+                    detailAddress = String(addressData.address).trim();
+                } else if (addressData.name) {
+                    // 兜底：老数据里如果只有name，就尝试去掉前面的省市区
+                    detailAddress = String(addressData.name).trim();
+
+                    const regionParts = [];
+                    if (addressData.pname) regionParts.push(addressData.pname);
+                    if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData
+                        .cityname);
+                    if (addressData.adname) regionParts.push(addressData.adname);
+
+                    const regionText = regionParts.join('');
+                    const regionTextWithDash = regionParts.join('-');
+
+                    if (regionText && detailAddress.indexOf(regionText) === 0) {
+                        detailAddress = detailAddress.slice(regionText.length).trim();
+                    } else if (regionTextWithDash && detailAddress.indexOf(regionTextWithDash) === 0) {
+                        detailAddress = detailAddress.slice(regionTextWithDash.length).trim();
+                    }
+
+                    detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
+                }
+
+                this.displayData.address = detailAddress;
+                this.pendingData.address = detailAddress;
+
+                if (addressData.location) {
+                    const [longitude, latitude] = addressData.location.split(',');
+                    this.displayData.longitude = longitude || '';
+                    this.displayData.latitude = latitude || '';
+                    this.pendingData.longitude = longitude || '';
+                    this.pendingData.latitude = latitude || '';
+                }
+
+                if (addressData.pname || addressData.cityname || addressData.adname) {
+                    const locationParts = [];
+                    if (addressData.pname) locationParts.push(addressData.pname);
+                    if (addressData.cityname) locationParts.push(addressData.cityname);
+                    if (addressData.adname) locationParts.push(addressData.adname);
+
+                    const dependency = locationParts.join('-');
+                    this.displayData.dependency = dependency;
+                    this.pendingData.dependency = dependency;
+                }
+
+                if (addressData.provinceCode || addressData.cityCode || addressData.districtCode) {
+                    this.displayData.dependency_province = addressData.provinceCode || '';
+                    this.displayData.dependency_city = addressData.cityCode || '';
+                    this.displayData.dependency_code = addressData.districtCode || '';
+
+                    this.pendingData.dependency_province = addressData.provinceCode || '';
+                    this.pendingData.dependency_city = addressData.cityCode || '';
+                    this.pendingData.dependency_code = addressData.districtCode || '';
+                }
+
+                console.log('地址更新完成:', {
+                    address: this.displayData.address,
+                    dependency: this.displayData.dependency,
+                    longitude: this.displayData.longitude,
+                    latitude: this.displayData.latitude
+                });
+
+                this.$forceUpdate();
+            }
+        }
+    }
 </script>
 
-<style scoped>
-	.store-info-page {
-		padding-bottom: 20rpx;
-	}
-
-	.page-content {
-		flex: 1;
-		overflow-y: auto;
-		box-sizing: border-box;
-		padding: 20rpx 20rpx;
-	}
-
-	.change-tip {
-		background: #FAE7EC;
-		padding: 20rpx;
-		text-align: center;
-	}
-
-	.change-tip text {
-		font-size: 28rpx;
-		color: #D4131F;
-	}
-
-	.audit-tip {
-		margin: 20rpx 24rpx 20rpx 24rpx;
-		border-radius: 12rpx;
-	}
-
-	.audit-text {
-		font-weight: 400;
-		font-size: 32rpx;
-		color: #333333;
-		text-align: center;
-		display: block;
-	}
-
-	.reject-reason {
-		background: transparent;
-		padding: 24rpx;
-	}
-
-	.reject-title {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #333333;
-		line-height: 45rpx;
-		text-align: center;
-		font-style: normal;
-	}
-
-	.reject-detail {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #999999;
-		line-height: 40rpx;
-		text-align: center;
-		font-style: normal;
-		margin-top: 12rpx;
-	}
-
-	.section-title {
-		display: flex;
-		align-items: center;
-		margin-bottom: 30rpx;
-	}
-
-	.title-bar {
-		width: 6rpx;
-		height: 30rpx;
-		background-color: #E8101E;
-		margin-right: 7rpx;
-		border-radius: 5rpx;
-	}
-
-	.section-title text {
-		font-size: 36rpx;
-		color: #1D2129;
-		font-weight: 400;
-	}
-
-	.box-cont {
-		background: #ffffff;
-		border-radius: 20rpx;
-		margin-bottom: 24rpx;
-		margin-left: 8rpx;
-		margin-right: 8rpx;
-		box-shadow: none;
-	}
-
-	.form-item {
-		padding: 24rpx;
-	}
-
-	.label {
-		display: block;
-		font-size: 28rpx;
-		color: #333333;
-		font-weight: 500;
-	}
-
-	.required::before {
-		content: '*';
-		color: #FF0000;
-		margin-right: 4rpx;
-	}
-
-	.upload-box {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 160rpx;
-		border-radius: 20rpx;
-	}
-
-	.upload-placeholder {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.upload-icon {
-		width: 120rpx;
-		height: 120rpx;
-	}
-
-	.logo-image {
-		width: 120rpx;
-		height: 120rpx;
-		border-radius: 20rpx;
-	}
-
-	.form-item-one {
-		display: flex;
-		align-items: center;
-		padding: 24rpx;
-	}
-
-	.label-wrapper {
-		display: inline-flex;
-		align-items: center;
-	}
-
-	.label {
-		font-size: 28rpx;
-		color: #333333;
-		font-weight: 500;
-		line-height: 1;
-	}
-
-	.label-icon {
-		width: 26rpx;
-		height: 26rpx;
-		margin-left: 8rpx;
-		align-items: center;
-	}
-
-	.form-item-two {
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
-		padding: 24rpx;
-	}
-
-	/* 左侧标签：固定宽度，不换行 */
-	.form-item-two>text.label {
-		flex-shrink: 0;
-		font-size: 28rpx;
-		color: #333333;
-		font-weight: 500;
-	}
-
-	.input {
-		flex: 1;
-		font-size: 28rpx;
-		color: #333333;
-		text-align: right;
-	}
-
-	.placeholder {
-		color: #999999;
-	}
-
-	.picker-content {
-		flex: 1;
-		display: flex;
-		align-items: center;
-		/* justify-content: center; */
-		gap: 16rpx;
-		word-break: break-all;
-	}
-
-	.picker-value,
-	.placeholder {
-		flex: 1;
-		/* 占据剩余宽度 */
-		text-align: right;
-		/* 文字右对齐 */
-		font-size: 28rpx;
-		word-break: break-all;
-		white-space: normal;
-		line-height: 1.4;
-	}
-
-	.arrow-right {
-		width: 14rpx;
-		height: 26rpx;
-		flex-shrink: 0;
-		/* margin-left: 16rpx; */
-	}
-
-	.bottom-actions {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		padding: 0rpx 24rpx 40rpx 24rpx;
-		background: #ffffff;
-		z-index: 100;
-	}
-
-	.action-btn {
-		height: 88rpx;
-		border-radius: 43rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 32rpx;
-		font-weight: 400;
-		margin-top: 20rpx;
-	}
-
-	.change-info-btn,
-	.view-change-btn,
-	.resubmit-btn {
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-	}
-
-	.action-buttons-row {
-		display: flex;
-		justify-content: space-between;
-		margin: 0 30rpx;
-	}
-
-	.action-buttons-row .action-btn {
-		width: 270rpx;
-	}
-
-	.cancel-btn {
-		background: #E5E5E5;
-		border-radius: 43rpx;
-		padding: 0 15rpx;
-	}
-
-	.submit-btn {
-		background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
-		border-radius: 43rpx;
-		padding: 0 15rpx;
-	}
-
-	.btn-text {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 36rpx;
-		color: #FFFFFF;
-		line-height: 50rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.cancel-text {
-		color: #666666;
-	}
-
-	.popup {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 999;
-		visibility: hidden;
-		opacity: 0;
-		transition: all 0.3s ease;
-	}
-
-	.popup.show {
-		visibility: visible;
-		opacity: 1;
-	}
-
-	.popup-mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-	}
-
-	.popup-content {
-		position: relative;
-		background-color: #FFFFFF;
-		border-radius: 24rpx 24rpx 0 0;
-		padding: 32rpx;
-		transform: translateY(100%);
-		transition: transform 0.3s ease;
-	}
-
-	.popup.show .popup-content {
-		transform: translateY(0);
-	}
-
-	.popup-header {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 20rpx;
-	}
-
-	.popup-title {
-		font-size: 32rpx;
-		color: #333333;
-		font-weight: 500;
-	}
-
-	.popup-close {
-		font-size: 40rpx;
-		color: #999999;
-		padding: 16rpx;
-	}
-
-	.region-body {
-		height: 400rpx;
-	}
-
-	.picker-scroll {
-		height: 400rpx;
-	}
-
-	.picker-item {
-		height: 68rpx;
-		line-height: 68rpx;
-		text-align: center;
-	}
-
-	.popup-footer {
-		display: flex;
-		margin-top: 32rpx;
-	}
-
-	.popup-btn {
-		flex: 1;
-		height: 88rpx;
-		border-radius: 44rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin: 0 16rpx;
-	}
-
-	.popup-btn.cancel {
-		background-color: #F5F5F5;
-	}
-
-	.popup-btn.confirm {
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-	}
-
-	.popup-btn .btn-text {
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	.popup-btn.cancel .btn-text {
-		color: #666666;
-	}
-
-	.popup-btn.confirm .btn-text {
-		color: #FFFFFF;
-	}
-
-	.tip-popup {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 1000;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		visibility: hidden;
-		opacity: 0;
-		transition: all 0.3s ease;
-	}
-
-	.tip-popup.show {
-		visibility: visible;
-		opacity: 1;
-	}
-
-	.tip-popup-mask {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-	}
-
-	.tip-popup-content {
-		position: relative;
-		width: 620rpx;
-		height: 810rpx;
-	}
-
-	.tip-popup-bg {
-		width: 620rpx;
-		height: 810rpx;
-		position: absolute;
-		top: 0;
-		left: 0;
-	}
-
-	.tip-popup-body {
-		position: relative;
-		flex-direction: column;
-		padding: 80rpx 20rpx 40rpx 20rpx;
-		box-sizing: border-box;
-	}
-
-	.tip-title {
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #333;
-		text-align: center;
-		margin-top: 107rpx;
-		margin-bottom: 37rpx;
-	}
-
-	.tip-image-container {
-		align-items: center;
-		justify-content: center;
-		margin-bottom: 50rpx;
-	}
-
-	.tip-image.store_logo {
-		width: 582rpx;
-		height: 327rpx;
-		margin-right: 0;
-		margin-left: -15rpx;
-	}
-
-	.tip-image.store_name {
-		width: 627rpx;
-		height: 327rpx;
-		margin-left: 13rpx;
-	}
-
-	.tip-buttons {
-		display: flex;
-		justify-content: space-between;
-		padding: 0 28rpx;
-	}
-
-	.tip-btn {
-		width: 250rpx;
-		height: 80rpx;
-		border-radius: 40rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	.tip-btn.cancel {
-		border: #E8101E 2rpx solid;
-		background-color: transparent;
-		color: #e8101e;
-	}
-
-	.tip-btn.confirm {
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-		color: #FFFFFF;
-	}
-
-	.tip-btn .btn-text {
-		color: inherit;
-	}
-
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-		opacity: 1;
-		visibility: visible;
-	}
-</style>
\ No newline at end of file
+<style scoped lang="less">
+    .store-info-page {
+        padding-bottom: 20rpx;
+    }
+
+    .page-content {
+        flex: 1;
+        overflow-y: auto;
+        box-sizing: border-box;
+        padding: 20rpx 20rpx;
+    }
+
+    .change-tip {
+        background: #FAE7EC;
+        padding: 20rpx;
+        text-align: center;
+    }
+
+    .change-tip text {
+        font-size: 28rpx;
+        color: #D4131F;
+    }
+
+    .audit-tip {
+        margin: 20rpx 24rpx 20rpx 24rpx;
+        border-radius: 12rpx;
+    }
+
+    .audit-text {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #333333;
+        text-align: center;
+        display: block;
+    }
+
+    .reject-reason {
+        background: transparent;
+        padding: 24rpx;
+    }
+
+    .reject-title {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #333333;
+        line-height: 45rpx;
+        text-align: center;
+        font-style: normal;
+    }
+
+    .reject-detail {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #999999;
+        line-height: 40rpx;
+        text-align: center;
+        font-style: normal;
+        margin-top: 12rpx;
+    }
+
+    .section-title {
+        display: flex;
+        align-items: center;
+        margin-bottom: 30rpx;
+    }
+
+    .title-bar {
+        width: 6rpx;
+        height: 30rpx;
+        background-color: #FF4767;
+        margin-right: 7rpx;
+        border-radius: 5rpx;
+    }
+
+    .section-title text {
+        font-size: 36rpx;
+        color: #1D2129;
+        font-weight: 400;
+    }
+
+    .box-cont {
+        background: #ffffff;
+        border-radius: 20rpx;
+        margin-bottom: 24rpx;
+        margin-left: 8rpx;
+        margin-right: 8rpx;
+        box-shadow: none;
+    }
+
+    .form-item {
+        padding: 24rpx;
+    }
+
+    .label {
+        display: block;
+        font-size: 28rpx;
+        color: #333333;
+        font-weight: 500;
+    }
+
+    .required::before {
+        content: '*';
+        color: #FF0000;
+        margin-right: 4rpx;
+    }
+
+    .upload-box {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 160rpx;
+        border-radius: 20rpx;
+    }
+
+    .upload-placeholder {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .upload-icon {
+        width: 120rpx;
+        height: 120rpx;
+    }
+
+    .logo-image {
+        width: 120rpx;
+        height: 120rpx;
+        border-radius: 20rpx;
+    }
+
+    .form-item-one {
+        display: flex;
+        align-items: center;
+        padding: 24rpx;
+    }
+
+    .label-wrapper {
+        display: inline-flex;
+        align-items: center;
+        transform: translateY(4rpx);
+    }
+
+    .label {
+        font-size: 28rpx;
+        color: #333333;
+        font-weight: 500;
+        line-height: 1;
+    }
+
+    .label-icon {
+        width: 26rpx;
+        height: 26rpx;
+        margin-left: 8rpx;
+        align-items: center;
+    }
+
+    .form-item-two {
+        display: flex;
+        align-items: flex-start;
+        justify-content: space-between;
+        padding: 24rpx;
+
+        .label {
+            transform: translateY(4rpx);
+        }
+
+    }
+
+    /* 左侧标签：固定宽度，不换行 */
+    .form-item-two>text.label {
+        flex-shrink: 0;
+        font-size: 28rpx;
+        color: #333333;
+        font-weight: 500;
+    }
+
+    .input {
+        flex: 1;
+        font-size: 28rpx;
+        color: #333333;
+        text-align: right;
+    }
+
+    .placeholder {
+        color: #999999;
+    }
+
+    .picker-content {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        /* justify-content: center; */
+        gap: 16rpx;
+        word-break: break-all;
+    }
+
+    .picker-value,
+    .placeholder {
+        flex: 1;
+        /* 占据剩余宽度 */
+        text-align: right;
+        /* 文字右对齐 */
+        font-size: 28rpx;
+        word-break: break-all;
+        white-space: normal;
+        line-height: 1.4;
+    }
+
+    .arrow-right {
+        width: 14rpx;
+        height: 26rpx;
+        flex-shrink: 0;
+        /* margin-left: 16rpx; */
+    }
+
+    .bottom-actions {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        padding: 0rpx 24rpx 40rpx 24rpx;
+        background: #ffffff;
+        z-index: 100;
+    }
+
+    .action-btn {
+        height: 88rpx;
+        border-radius: 43rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 32rpx;
+        font-weight: 400;
+        margin-top: 20rpx;
+    }
+
+    .change-info-btn,
+    .view-change-btn,
+    .resubmit-btn {
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+    }
+
+    .action-buttons-row {
+        display: flex;
+        justify-content: space-between;
+        margin: 0 30rpx;
+    }
+
+    .action-buttons-row .action-btn {
+        width: 270rpx;
+    }
+
+    .cancel-btn {
+        background: #E5E5E5;
+        border-radius: 43rpx;
+        padding: 0 15rpx;
+    }
+
+    .submit-btn {
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+        border-radius: 43rpx;
+        padding: 0 15rpx;
+    }
+
+    .btn-text {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 36rpx;
+        color: #FFFFFF;
+        line-height: 50rpx;
+        text-align: left;
+        font-style: normal;
+    }
+
+    .cancel-text {
+        color: #666666;
+    }
+
+    .popup {
+        position: fixed;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 999;
+        visibility: hidden;
+        opacity: 0;
+        transition: all 0.3s ease;
+    }
+
+    .popup.show {
+        visibility: visible;
+        opacity: 1;
+    }
+
+    .popup-mask {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba(0, 0, 0, 0.5);
+    }
+
+    .popup-content {
+        position: relative;
+        background-color: #FFFFFF;
+        border-radius: 24rpx 24rpx 0 0;
+        padding: 32rpx;
+        transform: translateY(100%);
+        transition: transform 0.3s ease;
+    }
+
+    .popup.show .popup-content {
+        transform: translateY(0);
+    }
+
+    .popup-header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 20rpx;
+    }
+
+    .popup-title {
+        font-size: 32rpx;
+        color: #333333;
+        font-weight: 500;
+    }
+
+    .popup-close {
+        font-size: 40rpx;
+        color: #999999;
+        padding: 16rpx;
+    }
+
+    .region-body {
+        height: 400rpx;
+    }
+
+    .picker-scroll {
+        height: 400rpx;
+    }
+
+    .picker-item {
+        height: 68rpx;
+        line-height: 68rpx;
+        text-align: center;
+    }
+
+    .popup-footer {
+        display: flex;
+        margin-top: 32rpx;
+    }
+
+    .popup-btn {
+        flex: 1;
+        height: 88rpx;
+        border-radius: 44rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin: 0 16rpx;
+    }
+
+    .popup-btn.cancel {
+        background-color: #F5F5F5;
+    }
+
+    .popup-btn.confirm {
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+    }
+
+    .popup-btn .btn-text {
+        font-size: 32rpx;
+        font-weight: 500;
+    }
+
+    .popup-btn.cancel .btn-text {
+        color: #666666;
+    }
+
+    .popup-btn.confirm .btn-text {
+        color: #FFFFFF;
+    }
+
+    .tip-popup {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 1000;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        visibility: hidden;
+        opacity: 0;
+        transition: all 0.3s ease;
+    }
+
+    .tip-popup.show {
+        visibility: visible;
+        opacity: 1;
+    }
+
+    .tip-popup-mask {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba(0, 0, 0, 0.5);
+    }
+
+    .tip-popup-content {
+        position: relative;
+        width: 620rpx;
+        height: 810rpx;
+    }
+
+    .tip-popup-bg {
+        width: 620rpx;
+        height: 810rpx;
+        position: absolute;
+        top: 0;
+        left: 0;
+    }
+
+    .tip-popup-body {
+        position: relative;
+        flex-direction: column;
+        padding: 80rpx 20rpx 40rpx 20rpx;
+        box-sizing: border-box;
+    }
+
+    .tip-title {
+        font-size: 36rpx;
+        font-weight: bold;
+        color: #333;
+        text-align: center;
+        margin-top: 107rpx;
+        margin-bottom: 37rpx;
+    }
+
+    .tip-image-container {
+        align-items: center;
+        justify-content: center;
+        margin-bottom: 50rpx;
+    }
+
+    .tip-image.store_logo {
+        width: 582rpx;
+        height: 327rpx;
+        margin-right: 0;
+        margin-left: -15rpx;
+    }
+
+    .tip-image.store_name {
+        width: 627rpx;
+        height: 327rpx;
+        margin-left: 13rpx;
+    }
+
+    .tip-buttons {
+        display: flex;
+        justify-content: space-between;
+        padding: 0 28rpx;
+    }
+
+    .tip-btn {
+        width: 250rpx;
+        height: 80rpx;
+        border-radius: 40rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 32rpx;
+        font-weight: 500;
+    }
+
+    .tip-btn.cancel {
+        border: #FF4767 2rpx solid;
+        background-color: transparent;
+        color: #FF4767;
+    }
+
+    .tip-btn.confirm {
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+        color: #FFFFFF;
+    }
+
+    .tip-btn .btn-text {
+        color: inherit;
+    }
+
+    .permission.transform {
+        top: calc(var(--status-bar-height) + 88rpx + 20rpx);
+        opacity: 1;
+        visibility: visible;
+    }
+</style>
diff --git a/pages/shop/staff/addStaff.vue b/pages/shop/staff/addStaff.vue
index 4aa767b..140607d 100644
--- a/pages/shop/staff/addStaff.vue
+++ b/pages/shop/staff/addStaff.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
-		<custom-navbar title="添加员工" :leftImg="'/static/images/back.png'" :showUser="true"
-			backgroundColor="transparent" titleColor="#000" borderBottom="none">
+		<custom-navbar title="添加员工" :leftImg="'/static/images/back.png'" :showUser="true" backgroundColor="transparent"
+			titleColor="#000" borderBottom="none">
 			<template #right>
 				<view class="navbar-right" @click="goRecord">
 					<image class="navbar-right-img" src="/static/images/icons/record.png"></image>
@@ -9,17 +9,17 @@
 				</view>
 			</template>
 		</custom-navbar>
-		<searchBox placeholder="请输入员工手机号" class="searchBox" v-model="queryData.phone" bgClor="transparent" @confirm="search"
-			@search="search">
+		<searchBox placeholder="请输入员工手机号" class="searchBox" v-model="queryData.phone" bgClor="transparent"
+			@confirm="search" @search="search">
 		</searchBox>
-		<scroll-view  :style="{ height:`calc(100vh - ${statusBarHeight + 380}rpx)`} " scroll-y>
+		<scroll-view scroll-y :style="{ height: `calc(100vh - ${statusBarHeight + 200}rpx)` }">
 			<view class="page-container" v-if="sryDetail && sryDetail.id">
 				<!-- 个人信息栏 -->
 				<view class="user-info">
 					<image class="avatar" :src="sryDetail.head_photo" mode="aspectFill"></image>
 					<view class="user-detail">
 						<view class="flex-row-center-between">
-							<text class="user-name">{{ sryDetail.name }}</text>
+							<text class="user-name">{{ sryDisplayName }}</text>
 							<view class="enter-btn flex-row-center" @click="goDetail">进入详情</view>
 						</view>
 						<view class="tags">
@@ -27,7 +27,7 @@
 						</view>
 					</view>
 				</view>
-			
+
 				<!-- 服务项目列表 -->
 				<view class="service-list">
 					<!-- 营销中心区域 -->
@@ -36,7 +36,7 @@
 							<view class="mc-line"></view>
 							<text class="mc-title">服务项目</text>
 						</view>
-			
+
 						<view class="select-btn" @click="goServiceList">
 							<text>请选服务项目</text>
 							<image src="/static/images/icons/right_20_40.png" class="select-btn-img" />
@@ -58,7 +58,7 @@
 					<image class="tip-icon" src="/static//images/icons/tip_icon.png"></image>温馨提示：
 				</view>
 				<view class="tip-text">
-					<text style="color: #e8101e">门店商家主动邀请入驻的</text>
+					<text style="color: #FF4767">门店商家主动邀请入驻的</text>
 					<text>合作型服务从业者，需线下达成合作协议后，邀请员工入驻成为挂靠手艺人后，再进行添加操作。</text>
 				</view>
 			</view>
@@ -68,419 +68,426 @@
 				</view>
 				<view class="tip-text">
 					<text>门店商家主动邀请入驻的合作型服务从业者，需线下达成合作协议后，</text>
-					<text style="color: #e8101e">员工入驻成为门店手艺人后(搜索美融融手艺人)</text>
+					<text style="color: #FF4767">员工入驻成为门店手艺人后(搜索美融融手艺人)</text>
 					<text>，再进行添加操作。</text>
 				</view>
 			</view>
-			<view class="agreement-footer" @click="sjinvitesyr" v-if="sryDetail && sryDetail.id && sryDetail.bind_state!=1">
+
+			<view class="" style="height: 200rpx;"></view>
+			<view class="agreement-footer" @click="sjinvitesyr"
+				v-if="sryDetail && sryDetail.id && sryDetail.bind_state != 1">
 				<view class="agreement-btn">邀请员工</view>
 			</view>
-			<!-- <view class="" style="height: 98rpx;background-color: aquamarine;"></view> -->
 		</scroll-view>
+
 	</view>
 </template>
 
 <script>
-	import request from "@/utils/request";
-	import searchBox from "./components/search-box.vue";
-	export default {
-		name: "addStaff",
-		components: {
-			searchBox,
+import request from "@/utils/request";
+import searchBox from "./components/search-box.vue";
+export default {
+	name: "addStaff",
+	components: {
+		searchBox,
+	},
+	data() {
+		return {
+			queryData: {
+				phone: "",
+			},
+			statusBarHeight: 0,
+			isSubmit: false,
+			sryDetail: {},
+			serversList: {},
+		};
+	},
+	async onLoad(options) {
+		this.statusBarHeight = this.getRpxStatusBarHeight();
+		let type = 3;
+		let result = await request.post("/sj/user/getuser", {
+			type,
+		});
+		this.userInfo = result.data;
+		this.queryData.sjid = this.userInfo.id;
+		await this.sjservers();
+		if (options.phone) {
+			this.queryData.phone = options.phone
+			this.search()
+		}
+	},
+	computed: {
+		sryDisplayName() {
+			return this.sryDetail.nick_name || this.sryDetail.name || "";
 		},
-		data() {
-			return {
-				queryData: {
-					phone: "",
-				},
-				statusBarHeight:0,
-				isSubmit:false,
-				sryDetail: {},
-				serversList: {},
-			};
+		mergeServiceList() {
+			// 1. 提取原始对象的所有子数组
+			let allSubArrays = Object.values(this.$store.state.sjServiceList);
+			// 2. 遍历每个子数组，过滤掉server_time>100的元素，再合并
+			return allSubArrays
+				.map((subArr) => {
+					// 过滤
+					return subArr.filter((item) => {
+						// 只保留is_choice为true的项目
+						return item.is_choice;
+					});
+				})
+				.flat(); // 扁平化合并所有过滤后的子数组
 		},
-		async onLoad(options) {
-			this.statusBarHeight = this.getRpxStatusBarHeight();
-			let type = 3;
-			let result = await request.post("/user/getuser", {
-				type,
+	},
+	methods: {
+		goServiceList() {
+			uni.navigateTo({
+				url: "/pages/shop/staff/serviceList",
 			});
-			this.userInfo = result.data;
-			this.queryData.sjid = this.userInfo.id;
-			await this.sjservers();
-			if (options.phone) {
-				this.queryData.phone = options.phone
-				this.search()
-			}
 		},
-		computed: {
-			mergeServiceList() {
-				// 1. 提取原始对象的所有子数组
-				let allSubArrays = Object.values(this.$store.state.sjServiceList);
-				// 2. 遍历每个子数组，过滤掉server_time>100的元素，再合并
-				return allSubArrays
-					.map((subArr) => {
-						// 过滤
-						return subArr.filter((item) => {
-							// 只保留is_choice为true的项目
-							return item.is_choice;
-						});
-					})
-					.flat(); // 扁平化合并所有过滤后的子数组
-			},
+		async search() {
+			await request.post("/sj/searchsyr", this.queryData).then((res) => {
+				if (res.code == 200) {
+					this.$store.commit("setSjServiceList", this.serversList);
+					this.sryDetail = res.data;
+					if (this.sryDetail?.servers_kill_arr) {
+						this.sryDetail.servers_kill_arr_text =
+							this.sryDetail.servers_kill_arr.join("、");
+					}
+				} else {
+					uni.showToast({
+						title: res.msg,
+						duration: 2000,
+						icon: 'none'
+					});
+				}
+			});
 		},
-		methods: {
-			goServiceList() {
-				uni.navigateTo({
-					url: "/pages/shop/staff/serviceList",
-				});
-			},
-			async search() {
-				await request.post("/sj/searchsyr", this.queryData).then((res) => {
+		async sjservers() {
+			await request
+				.post("/sj/sjservers", {
+					sjid: this.queryData.sjid
+				})
+				.then((res) => {
 					if (res.code == 200) {
-						this.$store.commit("setSjServiceList", this.serversList);
-						this.sryDetail = res.data;
-						if (this.sryDetail?.servers_kill_arr) {
-							this.sryDetail.servers_kill_arr_text =
-								this.sryDetail.servers_kill_arr.join("、");
-						}
-					}else{
-						uni.showToast({
-							title: res.msg,
-							duration: 2000,
-							icon: 'none'
-						});
+						//将数据存在vuex里作为依据
+						this.serversList = res.data;
+						this.$store.commit("setSjServiceList", res.data);
 					}
 				});
-			},
-			async sjservers() {
-				await request
-					.post("/sj/sjservers", {
-						sjid: this.queryData.sjid
-					})
-					.then((res) => {
-						if (res.code == 200) {
-							//将数据存在vuex里作为依据
-							this.serversList = res.data;
-							this.$store.commit("setSjServiceList", res.data);
+		},
+		sjinvitesyr() {
+			let form = {
+				sj_id: this.queryData.sjid,
+				syr_id: this.sryDetail.id,
+				service_data: this.mergeServiceList.map(item => item.id),
+			}
+			if (this.isSubmit) {
+				return
+			}
+			this.isSubmit = true
+			request.post("/sj/sjinvitesyr", form).then((res) => {
+				if (res.code == 200) {
+					uni.showModal({
+						title: '成功',
+						content: '邀请成功，等待员工同意。',
+						showCancel: false,
+						success: () => {
+							uni.navigateTo({
+								url: `/pages/shop/staff/record`,
+							});
 						}
 					});
-			},
-			sjinvitesyr() {
-				let form = {
-					sj_id: this.queryData.sjid,
-					syr_id: this.sryDetail.id,
-					service_data: this.mergeServiceList.map(item => item.id),
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: "none",
+					});
 				}
-				if(this.isSubmit){
-					return
-				}
-				this.isSubmit = true
-				request.post("/sj/sjinvitesyr", form).then((res) => {
-					if (res.code == 200) {
-						uni.showModal({
-							title: '成功',
-							content: '邀请成功，等待员工同意。',
-							showCancel: false,
-							success: () => {
-								uni.navigateTo({
-									url: `/pages/shop/staff/record`,
-								});
-							}
-						});
-					}else{
-						uni.showToast({
-							title: res.msg,
-							icon: "none",
-						});
-					}
-				}).finally(()=>{
-					this.isSubmit = false
-				});
-			},
-			goDetail() {
-				uni.navigateTo({
-					url: `/pages/shop/staff/staffDetail?syrid=${this.sryDetail.id}`,
-				});
-			},
-			goRecord() {
-				uni.navigateTo({
-					url: "/pages/shop/staff/record",
-				});
-			},
+			}).finally(() => {
+				this.isSubmit = false
+			});
 		},
-	};
+		goDetail() {
+			uni.navigateTo({
+				url: `/pages/shop/staff/staffDetail?syrid=${this.sryDetail.id}`,
+			});
+		},
+		goRecord() {
+			uni.navigateTo({
+				url: "/pages/shop/staff/record",
+			});
+		},
+	},
+};
 </script>
 
 <style lang="less">
-	.container {
-		position: relative;
-		background-image: url("/static/images/background/bj2.png");
-		background-size: 100% auto;
-		background-position: center top;
-		background-repeat: no-repeat;
+.container {
+	position: relative;
+	background-image: url("/static/images/background/bj2.png");
+	background-size: 100% auto;
+	background-position: center top;
+	background-repeat: no-repeat;
 
-		.container-tip {
-			width: 710rpx;
-			height: 311rpx;
-			background: #ffffff;
-			border-radius: 20rpx;
-			margin: 0 auto;
+	.container-tip {
+		width: 710rpx;
+		height: 311rpx;
+		background: #ffffff;
+		border-radius: 20rpx;
+		margin: 0 auto;
 
-			.tip-title {
+		.tip-title {
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #333333;
+			line-height: 40rpx;
+			text-align: left;
+			font-style: normal;
+			padding-top: 46rpx;
+			margin-left: 6rpx;
+
+			.tip-icon {
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 8rpx;
+			}
+		}
+
+		.tip-text {
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #333333;
+			line-height: 40rpx;
+			text-align: left;
+			font-style: normal;
+			padding: 18rpx 24rpx 0 20rpx;
+		}
+	}
+}
+
+.page-container {
+	padding: 0rpx 20rpx 0 20rpx;
+
+	// 个人信息样式
+	.user-info {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+		background-color: #fff;
+		padding: 20rpx;
+		border-radius: 8px;
+
+		.avatar {
+			width: 56px;
+			height: 56px;
+			border-radius: 50%;
+			margin-right: 10px;
+		}
+
+		.user-detail {
+			flex: 1;
+
+			.user-name {
 				font-weight: 500;
-				font-size: 28rpx;
+				font-size: 36rpx;
 				color: #333333;
-				line-height: 40rpx;
+				line-height: 50rpx;
 				text-align: left;
 				font-style: normal;
-				padding-top: 46rpx;
-				margin-left: 6rpx;
-
-				.tip-icon {
-					width: 32rpx;
-					height: 32rpx;
-					margin-right: 8rpx;
-				}
 			}
 
-			.tip-text {
+			.enter-btn {
+				padding: 0 20rpx;
+				height: 50rpx;
+				border-radius: 25rpx;
+				border: 1rpx solid rgba(232, 16, 30, 0.28);
 				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-				line-height: 40rpx;
+				font-size: 24rpx;
+				color: #FF4767;
+				text-align: right;
+				font-style: normal;
+			}
+
+			.tags {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				line-height: 33rpx;
 				text-align: left;
 				font-style: normal;
-				padding: 18rpx 24rpx 0 20rpx;
+				margin-top: 18rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				max-width: 500rpx;
 			}
 		}
 	}
 
-	.page-container {
-		padding: 0rpx 20rpx 0 20rpx;
+	// 服务列表样式
+	.service-list {
+		background-color: #fff;
+		border-radius: 20rpx;
+		padding: 30rpx 20rpx;
+		margin-bottom: 20rpx;
 
-		// 个人信息样式
-		.user-info {
+		// 营销中心样式
+		.marketing-center {
 			display: flex;
+			justify-content: space-between;
 			align-items: center;
-			margin-bottom: 20rpx;
-			background-color: #fff;
-			padding: 20rpx;
-			border-radius: 8px;
+			margin-bottom: 30rpx;
 
-			.avatar {
-				width: 56px;
-				height: 56px;
-				border-radius: 50%;
-				margin-right: 10px;
+			.mc-line {
+				width: 6rpx;
+				height: 22rpx;
+				background: #FF4767;
+				border-radius: 4rpx;
+				margin-right: 10rpx;
 			}
 
-			.user-detail {
+			.mc-title {
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.select-btn {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #666666;
+				line-height: 32rpx;
+				text-align: right;
+				font-style: normal;
+
+				.select-btn-img {
+					width: 9rpx;
+					height: 18rpx;
+					margin-left: 8rpx;
+				}
+			}
+		}
+
+		// 服务项目标题
+		.service-title {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #5b5b5b;
+			line-height: 37rpx;
+			text-align: left;
+			font-style: normal;
+			padding-bottom: 10rpx;
+			border-bottom: 1rpx solid #f1f1f1;
+			margin-bottom: 30rpx;
+		}
+
+		.service-item {
+			display: flex;
+			align-items: center;
+			margin-top: 30rpx;
+
+			.item-index {
+				font-weight: 500;
+				font-size: 18rpx;
+				color: #FF4767;
+				text-align: left;
+				font-style: normal;
+				width: 30rpx;
+				height: 30rpx;
+				background: #fdf0eb;
+				border-radius: 50%;
+				margin-right: 8px;
+			}
+
+			.item-info {
 				flex: 1;
 
-				.user-name {
-					font-weight: 500;
-					font-size: 36rpx;
+				.item-name {
+					font-weight: 400;
+					font-size: 26rpx;
 					color: #333333;
-					line-height: 50rpx;
+					line-height: 37rpx;
 					text-align: left;
 					font-style: normal;
-				}
-
-				.enter-btn {
-					padding: 0 20rpx;
-					height: 50rpx;
-					border-radius: 25rpx;
-					border: 1rpx solid rgba(232, 16, 30, 0.28);
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #e8101e;
-					text-align: right;
-					font-style: normal;
-				}
-
-				.tags {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #999999;
-					line-height: 33rpx;
-					text-align: left;
-					font-style: normal;
-					margin-top: 18rpx;
 					overflow: hidden;
 					white-space: nowrap;
 					text-overflow: ellipsis;
 					max-width: 500rpx;
 				}
 			}
-		}
 
-		// 服务列表样式
-		.service-list {
-			background-color: #fff;
-			border-radius: 20rpx;
-			padding: 30rpx 20rpx;
-			margin-bottom: 20rpx;
-
-			// 营销中心样式
-			.marketing-center {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-bottom: 30rpx;
-
-				.mc-line {
-					width: 6rpx;
-					height: 22rpx;
-					background: #e8101e;
-					border-radius: 4rpx;
-					margin-right: 10rpx;
-				}
-
-				.mc-title {
-					font-weight: 500;
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 42rpx;
-					text-align: left;
-					font-style: normal;
-				}
-
-				.select-btn {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #666666;
-					line-height: 32rpx;
-					text-align: right;
-					font-style: normal;
-
-					.select-btn-img {
-						width: 9rpx;
-						height: 18rpx;
-						margin-left: 8rpx;
-					}
-				}
-			}
-
-			// 服务项目标题
-			.service-title {
+			.item-duration {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #5b5b5b;
+				color: #8a8a8a;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
-				padding-bottom: 10rpx;
-				border-bottom: 1rpx solid #f1f1f1;
-				margin-bottom: 30rpx;
-			}
-
-			.service-item {
-				display: flex;
-				align-items: center;
-				margin-top: 30rpx;
-
-				.item-index {
-					font-weight: 500;
-					font-size: 18rpx;
-					color: #e8101e;
-					text-align: left;
-					font-style: normal;
-					width: 30rpx;
-					height: 30rpx;
-					background: #fdf0eb;
-					border-radius: 50%;
-					margin-right: 8px;
-				}
-
-				.item-info {
-					flex: 1;
-
-					.item-name {
-						font-weight: 400;
-						font-size: 26rpx;
-						color: #333333;
-						line-height: 37rpx;
-						text-align: left;
-						font-style: normal;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						max-width: 500rpx;
-					}
-				}
-
-				.item-duration {
-					font-weight: 400;
-					font-size: 26rpx;
-					color: #8a8a8a;
-					line-height: 37rpx;
-					text-align: left;
-					font-style: normal;
-				}
 			}
 		}
 	}
+}
 
-	.agreement-footer {
-		padding: 20rpx 20rpx 50rpx 20rpx;
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: #ffffff;
-		.agreement-btn {
-			width: 710rpx;
-			height: 98rpx;
-			background: #e8101e;
-			border-radius: 49rpx;
-			font-weight: 400;
-			font-size: 38rpx;
-			color: #ffffff;
-			line-height: 53rpx;
-			text-align: left;
-			font-style: normal;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-	}
+.agreement-footer {
+	padding: 20rpx 20rpx 50rpx 20rpx;
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: #ffffff;
 
-	::v-deep .right-area {
-		width: 120rpx !important;
-		height: auto !important;
+	.agreement-btn {
+		width: 710rpx;
+		height: 98rpx;
+		background: #FF4767;
+		border-radius: 49rpx;
+		font-weight: 400;
+		font-size: 38rpx;
+		color: #ffffff;
+		line-height: 53rpx;
+		text-align: left;
+		font-style: normal;
 		display: flex;
-		justify-content: flex-end;
+		align-items: center;
+		justify-content: center;
+	}
+}
+
+::v-deep .right-area {
+	width: 120rpx !important;
+	height: auto !important;
+	display: flex;
+	justify-content: flex-end;
+}
+
+.navbar-right {
+	display: flex;
+	flex-wrap: wrap;
+	flex-direction: column;
+	align-content: center;
+
+	.navbar-right-img {
+		width: 32rpx;
+		height: 32rpx;
+		margin: 0 auto 4rpx auto;
 	}
 
-	.navbar-right {
-		display: flex;
-		flex-wrap: wrap;
-		flex-direction: column;
-		align-content: center;
+	.navbar-right-text {
+		font-weight: 400;
+		font-size: 16rpx;
+		color: #333333;
+		line-height: 22rpx;
+		text-align: left;
+		font-style: normal;
+		white-space: nowrap;
+	}
+}
 
-		.navbar-right-img {
-			width: 32rpx;
-			height: 32rpx;
-			margin: 0 auto 4rpx auto;
-		}
+.searchBox {
+	padding: 18rpx 30rpx 30rpx 30rpx;
+}
 
-		.navbar-right-text {
-			font-weight: 400;
-			font-size: 16rpx;
-			color: #333333;
-			line-height: 22rpx;
-			text-align: left;
-			font-style: normal;
-			white-space: nowrap;
-		}
-	}
-	
-	.searchBox{
-		padding: 18rpx 30rpx 30rpx 30rpx;
-	}
-	
-	::v-deep .navbar-content .title{
-		margin-left: 20rpx!important;
-	}
-</style>
\ No newline at end of file
+::v-deep .navbar-content .title {
+	margin-left: 20rpx !important;
+}
+</style>
diff --git a/pages/shop/staff/components/orderCard.vue b/pages/shop/staff/components/orderCard.vue
index bf5c4b8..0e03f0b 100644
--- a/pages/shop/staff/components/orderCard.vue
+++ b/pages/shop/staff/components/orderCard.vue
@@ -176,7 +176,7 @@
 
 		.stateText {
 			font-size: 28rpx;
-			color: #e8101e;
+			color: #FF4767;
 			line-height: 39rpx;
 		}
 
@@ -212,7 +212,7 @@
 	.service-price {
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #e8101e;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -240,7 +240,7 @@
 			letter-spacing: 2px;
 			text-align: left;
 			font-style: normal;
-			background: linear-gradient(166deg, #fc5e72 0%, #e8101e 100%);
+			background: linear-gradient(166deg, #fc5e72 0%, #FF4767 100%);
 			border-radius: 6rpx;
 			padding: 4rpx 4rpx 4rpx 8rpx;
 			margin-right: 13rpx;
@@ -298,7 +298,7 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #e8101e;
-		color: #e8101e;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/staff/components/search-box.vue b/pages/shop/staff/components/search-box.vue
index 0e93444..1554e91 100644
--- a/pages/shop/staff/components/search-box.vue
+++ b/pages/shop/staff/components/search-box.vue
@@ -44,7 +44,7 @@
 			},
 			bgClor: {
 				type: String,
-				default: "linear-gradient(134deg, #f52540 0%, #e8101e 100%)",
+				default: "linear-gradient(134deg, #f52540 0%, #FF4767 100%)",
 			},
 			showAdd: {
 				type: Boolean,
@@ -123,7 +123,7 @@
 		justify-content: center;
 		align-items: center;
 		position: relative;
-		background: linear-gradient(134deg, #f52540 0%, #e8101e 100%);
+		background: linear-gradient(134deg, #f52540 0%, #FF4767 100%);
 		transform: translateY(0rpx);
 	}
 
@@ -195,7 +195,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+		background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
 		background-size: cover;
 		color: #fff;
 		font-size: 26rpx;
diff --git a/pages/shop/staff/detail.vue b/pages/shop/staff/detail.vue
index c878ed9..c3f38a1 100644
--- a/pages/shop/staff/detail.vue
+++ b/pages/shop/staff/detail.vue
@@ -486,7 +486,7 @@
 				height: 52rpx;
 				line-height: 52rpx;
 				border-radius: 26rpx;
-				background-color: #e8101e;
+				background-color: #FF4767;
 				display: flex;
 				flex-flow: row nowrap;
 				justify-content: center;
@@ -552,7 +552,7 @@
 
 					// 选中态样式
 					&.active {
-						color: #e8101e; // 红色文字（匹配设计）
+						color: #FF4767; // 红色文字（匹配设计）
 
 						&::after {
 							content: "";
@@ -562,7 +562,7 @@
 							transform: translateX(-50%);
 							width: 28rpx;
 							height: 6rpx;
-							background: #e8101e;
+							background: #FF4767;
 							border-radius: 3rpx;
 						}
 					}
@@ -597,7 +597,7 @@
 
 					// 选中态样式
 					&.active {
-						color: #e8101e;
+						color: #FF4767;
 						background-color: #fee5e7; // 深粉色（更贴近设计的选中色）
 					}
 				}
@@ -618,7 +618,7 @@
 		margin: 20rpx auto;
 		width: 710rpx;
 		height: 98rpx;
-		background: #e8101e;
+		background: #FF4767;
 		border-radius: 49rpx;
 		font-weight: 400;
 		font-size: 38rpx;
diff --git a/pages/shop/staff/distribution-service.vue b/pages/shop/staff/distribution-service.vue
index 034b965..4e56cf1 100644
--- a/pages/shop/staff/distribution-service.vue
+++ b/pages/shop/staff/distribution-service.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="container">
 		<custom-navbar title="给员工分配服务" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff" borderBottom="none"></custom-navbar>
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"
+			borderBottom="none"></custom-navbar>
 		<searchBox placeholder="服务名称" v-model="queryData.title" :showAdd="false" @confirm="search" @search="search">
 		</searchBox>
 		<view class="container-tip flex-row-center">
@@ -21,9 +22,9 @@
 									{{ item.title }}
 								</view>
 								<view class="flex-row-center">
-									<text class="item-left-text2" style="color: #e8101e">¥</text>
-									<text class="item-left-text2"
-										style="color: #e8101e; font-size: 28rpx">{{ item.server_price }}</text>
+									<text class="item-left-text2" style="color: #FF4767">¥</text>
+									<text class="item-left-text2" style="color: #FF4767; font-size: 28rpx">{{
+										item.server_price }}</text>
 								</view>
 							</view>
 						</view>
@@ -43,156 +44,156 @@
 </template>
 
 <script>
-	import request from "@/utils/request";
-	import searchBox from "./components/search-box.vue";
-	import CommonList from "@/components/common/CommonList.vue";
-	export default {
-		components: {
-			searchBox,
-			CommonList,
+import request from "@/utils/request";
+import searchBox from "./components/search-box.vue";
+import CommonList from "@/components/common/CommonList.vue";
+export default {
+	components: {
+		searchBox,
+		CommonList,
+	},
+	data() {
+		return {
+			userInfo: {},
+			queryData: {
+				title: "",
+			},
+			statusBarHeight: 0,
+		};
+	},
+	async onLoad(options) {
+		let type = 3;
+		let result = await request.post("/sj/user/getuser", {
+			type,
+		});
+		this.userInfo = result.data;
+		this.queryData.sjid = this.userInfo.id;
+		this.statusBarHeight = this.getRpxStatusBarHeight();
+		this.$nextTick(() => {
+			this.search();
+		});
+	},
+	methods: {
+		search() {
+			this.$refs.groupRef.manualRefresh(this.queryData);
 		},
-		data() {
-			return {
-				userInfo: {},
-				queryData: {
-					title: "",
-				},
-				statusBarHeight: 0,
-			};
-		},
-		async onLoad(options) {
-			let type = 3;
-			let result = await request.post("/user/getuser", {
-				type,
-			});
-			this.userInfo = result.data;
-			this.queryData.sjid = this.userInfo.id;
-			this.statusBarHeight = this.getRpxStatusBarHeight();
-			this.$nextTick(() => {
-				this.search();
+		goSlectSyr(item) {
+			uni.navigateTo({
+				url: `/pages/shop/staff/selectSyr?server_id=${item.id}`,
 			});
 		},
-		methods: {
-			search() {
-				this.$refs.groupRef.manualRefresh(this.queryData);
-			},
-			goSlectSyr(item) {
-				uni.navigateTo({
-					url: `/pages/shop/staff/selectSyr?server_id=${item.id}`,
-				});
-			},
-		},
-	};
+	},
+};
 </script>
 
 <style lang="less">
-	.container {
-		.container-tip {
-			width: 750rpx;
-			padding: 27rpx 16rpx 22rpx 32rpx;
-			background: #fae7ec;
+.container {
+	.container-tip {
+		width: 750rpx;
+		padding: 27rpx 16rpx 22rpx 32rpx;
+		background: #fae7ec;
 
-			.container-tip-text {
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #e8101e;
-				line-height: 37rpx;
+		.container-tip-text {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #FF4767;
+			line-height: 37rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.tip-icon {
+			width: 46rpx;
+			height: 46rpx;
+			margin-right: 8rpx;
+		}
+	}
+
+	.service-list {
+		// background-color: #fff;
+		// margin: 20rpx 20rpx 26rpx 20rpx;
+		// border-radius: 10rpx;
+
+		.service-item {
+			//   padding-top: 20rpx;
+			//   margin: 0rpx 20rpx 30rpx 20rpx;
+			//   padding-bottom: 30rpx;
+			//   border-bottom: 1rpx solid #f1f1f1;
+			padding: 30rpx 20rpx;
+			margin: 20rpx;
+
+			background: #FFFFFF;
+			border-radius: 10rpx;
+
+			.item-left {
+				.item-left-photo {
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 20rpx;
+					background: #000;
+				}
+
+				.item-left-texts {
+					margin-left: 20rpx;
+
+					.item-left-text1 {
+						font-weight: 500;
+						font-size: 30rpx;
+						color: #333333;
+						line-height: 34rpx;
+						text-align: left;
+						font-style: normal;
+						margin-bottom: 27rpx;
+						margin-top: 6rpx;
+						max-width: 400rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.item-left-text2 {
+						font-weight: 400;
+						font-size: 26rpx;
+						color: #666666;
+						line-height: 34rpx;
+						text-align: left;
+						font-style: normal;
+					}
+
+					.item-left-line {
+						margin: 0 10rpx;
+						width: 2rpx;
+						height: 20rpx;
+						background: #666666;
+					}
+				}
+			}
+
+			.item-right {
+				width: 124rpx;
+				height: 53rpx;
+				border-radius: 27rpx;
+				border: 1rpx solid rgba(232, 16, 30, 0.5);
+				font-size: 24rpx;
+				color: #FF4767;
 				text-align: left;
 				font-style: normal;
 			}
-
-			.tip-icon {
-				width: 46rpx;
-				height: 46rpx;
-				margin-right: 8rpx;
-			}
-		}
-
-		.service-list {
-			// background-color: #fff;
-			// margin: 20rpx 20rpx 26rpx 20rpx;
-			// border-radius: 10rpx;
-
-			.service-item {
-				//   padding-top: 20rpx;
-				//   margin: 0rpx 20rpx 30rpx 20rpx;
-				//   padding-bottom: 30rpx;
-				//   border-bottom: 1rpx solid #f1f1f1;
-				padding: 30rpx 20rpx;
-				margin: 20rpx;
-
-				background: #FFFFFF;
-				border-radius: 10rpx;
-
-				.item-left {
-					.item-left-photo {
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 20rpx;
-						background: #000;
-					}
-
-					.item-left-texts {
-						margin-left: 20rpx;
-
-						.item-left-text1 {
-							font-weight: 500;
-							font-size: 30rpx;
-							color: #333333;
-							line-height: 34rpx;
-							text-align: left;
-							font-style: normal;
-							margin-bottom: 27rpx;
-							margin-top: 6rpx;
-							max-width: 400rpx;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							white-space: nowrap;
-						}
-
-						.item-left-text2 {
-							font-weight: 400;
-							font-size: 26rpx;
-							color: #666666;
-							line-height: 34rpx;
-							text-align: left;
-							font-style: normal;
-						}
-
-						.item-left-line {
-							margin: 0 10rpx;
-							width: 2rpx;
-							height: 20rpx;
-							background: #666666;
-						}
-					}
-				}
-
-				.item-right {
-					width: 124rpx;
-					height: 53rpx;
-					border-radius: 27rpx;
-					border: 1rpx solid rgba(232, 16, 30, 0.5);
-					font-size: 24rpx;
-					color: #e8101e;
-					text-align: left;
-					font-style: normal;
-				}
-			}
 		}
 	}
+}
 
-	.common-list {
-		background: #f5f5f5 !important;
-		border-radius: 30rpx !important;
-		padding-bottom: 0 !important;
-	}
+.common-list {
+	background: #f5f5f5 !important;
+	border-radius: 30rpx !important;
+	padding-bottom: 0 !important;
+}
 
-	::v-deep .list-container {
-		padding: 0 !important;
-	}
+::v-deep .list-container {
+	padding: 0 !important;
+}
 
-	::v-deep .list-scroll {
-		margin-top: 0 !important;
-	}
+::v-deep .list-scroll {
+	margin-top: 0 !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages/shop/staff/manage.vue b/pages/shop/staff/manage.vue
index 09037aa..419eab0 100644
--- a/pages/shop/staff/manage.vue
+++ b/pages/shop/staff/manage.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="container">
 		<custom-navbar title="员工管理" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
 			headleSrc="/static/images/recruit/guide.png" :showHeadle="false" titleColor="#fff" borderBottom="none"
 			@onHeadleClick="openPop"></custom-navbar>
-		<searchBox placeholder="手艺人名字/手机号" v-model="queryData.nameorphone" :showAdd="true" @confirm="search" @search="search"
-			@add="goAddStaff">
+		<searchBox placeholder="手艺人名字/手机号" v-model="queryData.nameorphone" :showAdd="true" @confirm="search"
+			@search="search" @add="goAddStaff">
 		</searchBox>
 
 		<!-- Tab 内容区域 -->
@@ -20,20 +20,22 @@
 			:listScrollHeight="`calc(100vh - ${statusBarHeight + 350}rpx)`">
 			<template #listData="{ list }">
 				<view class="scoll-lists">
-					<view class="list-item" v-for="(item, index) in list" :key="index" @click="goDetail(item)" v-if="item.syr">
+					<view class="list-item" v-for="(item, index) in list" :key="index" @click="goDetail(item)"
+						v-if="item.syr">
 						<view class="item-left">
 							<image :src="item.syr.head_photo" class="item-left-img" mode="aspectFill"></image>
-							<view class="item-left-tab flex-row-center-center" :class="{noTab:item.state==2}">{{ typName(item.state) }}</view>
+							<view class="item-left-tab flex-row-center-center" :class="{ noTab: item.state == 2 }">{{
+								typName(item.state) }}</view>
 						</view>
 						<view class="item-right">
 							<view class="item-right-text1 flex-row-center-between">
 								<text>{{ item.syr.name }}</text>
 
 								<view class="switch-box" @click.stop="handleSwitchChange(item)"
-									:class="{ disswitch: item.sj_state!=1 }" v-if="item.state==1">
-									<text class="switch-text" v-if="item.sj_state==1">接单</text>
+									:class="{ disswitch: item.sj_state != 1 }" v-if="item.state == 1">
+									<text class="switch-text" v-if="item.sj_state == 1">接单</text>
 									<view class="switch-yuan"></view>
-									<text class="switch-text" v-if="item.sj_state!=1">不接单</text>
+									<text class="switch-text" v-if="item.sj_state != 1">不接单</text>
 								</view>
 							</view>
 							<view class="item-right-text2">绑定时间: {{ item.bind_time }}</view>
@@ -75,428 +77,430 @@
 </template>
 
 <script>
-	import request from "@/utils/request";
-	import searchBox from "./components/search-box.vue";
-	import CommonList from "@/components/common/CommonList.vue";
-	export default {
-		components: {
-			searchBox,
-			CommonList,
-		},
-		data() {
-			return {
-				isSubmit:false,//调接口防止重复点击参数
-				queryData: {
-					nameorphone: "",
-					sjid: null,
-					state: "", // 1绑定 2解绑
+import request from "@/utils/request";
+import searchBox from "./components/search-box.vue";
+import CommonList from "@/components/common/CommonList.vue";
+export default {
+	components: {
+		searchBox,
+		CommonList,
+	},
+	data() {
+		return {
+			isSubmit: false,//调接口防止重复点击参数
+			queryData: {
+				nameorphone: "",
+				sjid: null,
+				state: "", // 1绑定 2解绑
+			},
+			userInfo: {},
+			artisanType: getApp().globalData.artisanType,
+			info: {
+				1: {
+					list: "/syr/serversSelf/list",
+					name: "手艺人",
+					switch: "/syr/serversSelf/switch",
 				},
-				userInfo: {},
-				artisanType: getApp().globalData.artisanType,
-				info: {
-					1: {
-						list: "/syr/serversSelf/list",
-						name: "手艺人",
-						switch: "/syr/serversSelf/switch",
-					},
-					2: {
-						list: "/sj/serversSelf/list",
-						name: "商家",
-						switch: "/sj/serversSelf/switch",
-					},
+				2: {
+					list: "/sj/serversSelf/list",
+					name: "商家",
+					switch: "/sj/serversSelf/switch",
 				},
-				statusBarHeight: 0,
-				// Tab 数据源，通过修改这个数组可以动态增删 Tab
-				tabs: [{
-						id: "",
-						name: "全部",
-					},
-					{
-						id: 1,
-						name: "服务中",
-					},
-					{
-						id: 2,
-						name: "已解约",
-					},
-				],
-			};
-		},
-		computed: {
+			},
+			statusBarHeight: 0,
+			// Tab 数据源，通过修改这个数组可以动态增删 Tab
+			tabs: [{
+				id: "",
+				name: "全部",
+			},
+			{
+				id: 1,
+				name: "服务中",
+			},
+			{
+				id: 2,
+				name: "已解约",
+			},
+			],
+		};
+	},
+	computed: {
 
-		},
-		async onLoad(options) {
-			let type = 3;
-			let result = await request.post("/user/getuser", {
-				type,
-			});
-			this.userInfo = result.data;
-			this.queryData.sjid = this.userInfo.id
-			this.statusBarHeight = this.getRpxStatusBarHeight();
+	},
+	async onLoad(options) {
+		let type = 3;
+		let result = await request.post("/sj/user/getuser", {
+			type,
+		});
+		this.userInfo = result.data;
+		this.queryData.sjid = this.userInfo.id
+		this.statusBarHeight = this.getRpxStatusBarHeight();
+		this.$nextTick(() => {
+			this.search();
+		});
+	},
+	onShow() {
+		if (this.queryData.sjid) {
 			this.$nextTick(() => {
 				this.search();
 			});
-		},
-		onShow() {
-			if(this.queryData.sjid){
-				this.$nextTick(() => {
-					this.search();
+		}
+	},
+	methods: {
+		goDetail(item) {
+			uni.$uv.throttle(() => {
+				uni.navigateTo({
+					url: `/pages/shop/staff/detail?syrid=${item.syr?.id}`,
 				});
-			}
+			}, 500)
+
 		},
-		methods: {
-			goDetail(item){
-				uni.$uv.throttle(()=>{
-					uni.navigateTo({
-						url: `/pages/shop/staff/detail?syrid=${item.syr?.id}`,
-					});
-				}, 500)
-				
-			},
-			handleSwitchChange(item) {
-				let obj = {
-					sjid:this.userInfo.id,
-					syrid: item.syr_id
-				}
-				request.post("/sj/isaccept", obj).then((res) => {
-					if(res.code==200){
-						item.sj_state ===1?item.sj_state=2:item.sj_state=1;
-					}else{
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch((error)=>{
+		handleSwitchChange(item) {
+			let obj = {
+				sjid: this.userInfo.id,
+				syrid: item.syr_id
+			}
+			request.post("/sj/isaccept", obj).then((res) => {
+				if (res.code == 200) {
+					item.sj_state === 1 ? item.sj_state = 2 : item.sj_state = 1;
+				} else {
 					uni.showToast({
-						title: '网络异常，请稍后重试',
+						title: res.msg,
 						icon: 'none',
 						duration: 2000
 					});
+				}
+			}).catch((error) => {
+				uni.showToast({
+					title: '网络异常，请稍后重试',
+					icon: 'none',
+					duration: 2000
 				});
-			},
-			typName(type) {
-				const textList = {
-					1: "服务中",
-					2: "已解约"
-				};
-				return textList[type];
-			},
-			handleService(item) {
-				uni.showModal({
-					title: "提示",
-					content: `确定要${item.us_state == 1 ? "下架" : "上架"}该服务吗？`,
-					success: (res) => {
-						if (res.confirm) {
-							request
-								.post(this.info[this.artisanType].switch, {
-									id: item.id,
-									us_state: item.us_state == 1 ? 2 : 1,
-								})
-								.then((res) => {
-									if (res.code == 200) {
-										uni.showToast({
-											title: "下架成功",
-											icon: "none",
-										});
-										this.search(); // 刷新列表
-									} else {
-										uni.showToast({
-											title: res.msg,
-											icon: "none",
-										});
-									}
-								});
-						}
-					},
-				});
-			},
-			goAddStaff() {
-				uni.navigateTo({
-					url: `/pages/shop/staff/addStaff`,
-				});
-			},
-			search() {
-				this.$refs.groupRef.manualRefresh(this.queryData);
-			},
-			// 切换 Tab 的方法
-			switchTab(tabId) {
-				this.queryData.state = tabId;
-				this.search();
-			},
-			openPop() {
-				this.$refs.popup.open("center");
-			},
-			closePop() {
-				this.$refs.popup.close();
-			},
+			});
 		},
-	};
+		typName(type) {
+			const textList = {
+				1: "服务中",
+				2: "已解约"
+			};
+			return textList[type];
+		},
+		handleService(item) {
+			uni.showModal({
+				title: "提示",
+				content: `确定要${item.us_state == 1 ? "下架" : "上架"}该服务吗？`,
+				success: (res) => {
+					if (res.confirm) {
+						request
+							.post(this.info[this.artisanType].switch, {
+								id: item.id,
+								us_state: item.us_state == 1 ? 2 : 1,
+							})
+							.then((res) => {
+								if (res.code == 200) {
+									uni.showToast({
+										title: "下架成功",
+										icon: "none",
+									});
+									this.search(); // 刷新列表
+								} else {
+									uni.showToast({
+										title: res.msg,
+										icon: "none",
+									});
+								}
+							});
+					}
+				},
+			});
+		},
+		goAddStaff() {
+			uni.navigateTo({
+				url: `/pages/shop/staff/addStaff`,
+			});
+		},
+		search() {
+			this.$refs.groupRef.manualRefresh(this.queryData);
+		},
+		// 切换 Tab 的方法
+		switchTab(tabId) {
+			this.queryData.state = tabId;
+			this.search();
+		},
+		openPop() {
+			this.$refs.popup.open("center");
+		},
+		closePop() {
+			this.$refs.popup.close();
+		},
+	},
+};
 </script>
 
 <style lang="less">
-	page {
-		background: linear-gradient(to bottom, #ffffff, #f5f5f5) !important;
-	}
+page {
+	background: linear-gradient(to bottom, #ffffff, #f5f5f5) !important;
+}
 
-	.container {
-		.tab-nav {
-			display: flex;
-			justify-content: space-between;
-			padding: 0 91rpx;
-			background: #fff;
+.container {
+	.tab-nav {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 91rpx;
+		background: #fff;
 
-			.tab-item {
-				padding: 30rpx 0rpx 30rpx 0rpx;
-				cursor: pointer;
-				font-weight: 500;
-				font-size: 32rpx;
-				color: #333333;
-				line-height: 45rpx;
-				text-align: left;
-				font-style: normal;
-				/* 预先设置透明边框，防止切换时布局跳动 */
-
-				&.active {
-					color: #e8101e;
-					font-weight: 500;
-					position: relative;
-
-					&:after {
-						content: "";
-						position: absolute;
-						bottom: 17rpx; // 定位在底部边框的下方
-						left: 50%;
-						transform: translateX(-50%); // 水平居中
-
-						/* 激活时显示红色边框 */
-						width: 34rpx;
-						height: 6rpx;
-						background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
-						border-radius: 3rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.pop-content {
-		width: 620rpx;
-		background-image: url("/static/images/background/selfOperatedTip.png");
-		background-position: top;
-		background-repeat: no-repeat;
-		background-size: cover;
-		border-radius: 20rpx;
-
-		.pop-content-title {
-			padding-top: 193rpx;
-			padding-bottom: 40rpx;
-			text-align: center;
+		.tab-item {
+			padding: 30rpx 0rpx 30rpx 0rpx;
+			cursor: pointer;
 			font-weight: 500;
-			font-size: 36rpx;
+			font-size: 32rpx;
 			color: #333333;
-			line-height: 50rpx;
-			font-style: normal;
-			display: block;
-		}
-
-		.pop-content-text {
-			padding: 0 40rpx;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #333333;
-			line-height: 40rpx;
+			line-height: 45rpx;
 			text-align: left;
 			font-style: normal;
-			display: block;
-		}
+			/* 预先设置透明边框，防止切换时布局跳动 */
 
-		.pop-content-btns {
-			display: flex;
-			padding: 0 54rpx;
-			justify-content: space-between;
-			margin-top: 80rpx;
-			padding-bottom: 51rpx;
-
-			.pop-content-close {
-				width: 246rpx;
-				height: 80rpx;
-				border-radius: 40rpx;
-				border: 2rpx solid #e8101e;
+			&.active {
+				color: #FF4767;
 				font-weight: 500;
-				font-size: 28rpx;
-				color: #e8101e;
-				text-align: left;
-				font-style: normal;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.pop-content-sure {
-				width: 246rpx;
-				height: 80rpx;
-				background: #e8101e;
-				border-radius: 40rpx;
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #ffffff;
-				text-align: left;
-				font-style: normal;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-		}
-	}
-
-	.scoll-lists {
-		padding: 0 20rpx;
-		margin-top: 20rpx;
-
-		.list-item {
-			box-sizing: border-box;
-			padding: 20rpx;
-			height: 200rpx;
-			background: #ffffff;
-			border-radius: 20rpx;
-			margin-bottom: 20rpx;
-			position: relative;
-
-			.item-left {
 				position: relative;
 
-				.item-left-img {
-					width: 131rpx;
-					height: 131rpx;
-					border-radius: 50%;
-				}
-
-				.item-left-tab {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #FFFFFF;
-					text-align: left;
-					font-style: normal;
-					width: 124rpx;
-					height: 34rpx;
-					background: #E8101E;
-					border-radius: 18rpx;
+				&:after {
+					content: "";
 					position: absolute;
-					bottom: 0;
-					left: 4rpx;
-				}
-				.noTab{
-					background: #C1C1C1;
-				}
-			}
+					bottom: 17rpx; // 定位在底部边框的下方
+					left: 50%;
+					transform: translateX(-50%); // 水平居中
 
-			.item-right {
-				margin-left: 20rpx;
-				flex: 1;
-
-				.item-right-text1 {
-					font-weight: 500;
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 42rpx;
-					text-align: left;
-					font-style: normal;
-				}
-
-				.item-right-text2 {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #999999;
-					line-height: 33rpx;
-					text-align: left;
-					font-style: normal;
-					margin-bottom: 20rpx;
-				}
-
-				.item-right-text3 {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #333333;
-					line-height: 33rpx;
-					text-align: left;
-					font-style: normal;
-					.item-right-text3-icon{
-						width: 8rpx;
-						height: 16rpx;
-						margin-left: 6rpx;
-					}
+					/* 激活时显示红色边框 */
+					width: 34rpx;
+					height: 6rpx;
+					background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
+					border-radius: 3rpx;
 				}
 			}
 		}
 	}
+}
 
-	::v-deep .right-area {
-		width: 31rpx !important;
-		height: 31rpx !important;
+.pop-content {
+	width: 620rpx;
+	background-image: url("/static/images/background/selfOperatedTip.png");
+	background-position: top;
+	background-repeat: no-repeat;
+	background-size: cover;
+	border-radius: 20rpx;
+
+	.pop-content-title {
+		padding-top: 193rpx;
+		padding-bottom: 40rpx;
+		text-align: center;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #333333;
+		line-height: 50rpx;
+		font-style: normal;
+		display: block;
 	}
 
-	::v-deep .icon-headle {
-		width: 31rpx !important;
-		height: 31rpx !important;
+	.pop-content-text {
+		padding: 0 40rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+		display: block;
 	}
 
-	.common-list {
-		background: #f5f5f5 !important;
-		border-radius: 30rpx !important;
-	}
-
-	::v-deep .list-container {
-		padding: 0 !important;
-	}
-
-	::v-deep .list-scroll {
-		margin-top: 0 !important;
-	}
-
-	.switch-box {
-		/* width: 126rpx; */
-		height: 52rpx;
-		line-height: 52rpx;
-		border-radius: 26rpx;
-		background-color: #FFD4D8;
+	.pop-content-btns {
 		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-		padding: 0 8rpx 0 15rpx;
+		padding: 0 54rpx;
+		justify-content: space-between;
+		margin-top: 80rpx;
+		padding-bottom: 51rpx;
 
-		.switch-yuan {
-			width: 38rpx;
-			height: 38rpx;
-			border-radius: 20rpx;
-			background-color: #fff;
-			margin-left: 9rpx;
-			margin-right: 0rpx;
-		}
-
-		.switch-text {
+		.pop-content-close {
+			width: 246rpx;
+			height: 80rpx;
+			border-radius: 40rpx;
+			border: 2rpx solid #FF4767;
 			font-weight: 500;
-			font-size: 24rpx;
-			color: #E8101E;
-			line-height: 33rpx;
-			text-align: right;
+			font-size: 28rpx;
+			color: #FF4767;
+			text-align: left;
 			font-style: normal;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
+		.pop-content-sure {
+			width: 246rpx;
+			height: 80rpx;
+			background: #FF4767;
+			border-radius: 40rpx;
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #ffffff;
+			text-align: left;
+			font-style: normal;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 		}
 	}
+}
 
-	.disswitch {
-		padding: 0 12rpx 0 8rpx;
-		background-color: #cecfd5;
+.scoll-lists {
+	padding: 0 20rpx;
+	margin-top: 20rpx;
 
-		.switch-yuan {
-			margin-left: 0;
-			margin-right: 9rpx;
+	.list-item {
+		box-sizing: border-box;
+		padding: 20rpx;
+		height: 200rpx;
+		background: #ffffff;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+		position: relative;
+
+		.item-left {
+			position: relative;
+
+			.item-left-img {
+				width: 131rpx;
+				height: 131rpx;
+				border-radius: 50%;
+			}
+
+			.item-left-tab {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				text-align: left;
+				font-style: normal;
+				width: 124rpx;
+				height: 34rpx;
+				background: #FF4767;
+				border-radius: 18rpx;
+				position: absolute;
+				bottom: 0;
+				left: 4rpx;
+			}
+
+			.noTab {
+				background: #C1C1C1;
+			}
 		}
 
-		.switch-text {
-			color: #A0A0A0;
+		.item-right {
+			margin-left: 20rpx;
+			flex: 1;
+
+			.item-right-text1 {
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.item-right-text2 {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				line-height: 33rpx;
+				text-align: left;
+				font-style: normal;
+				margin-bottom: 20rpx;
+			}
+
+			.item-right-text3 {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+				line-height: 33rpx;
+				text-align: left;
+				font-style: normal;
+
+				.item-right-text3-icon {
+					width: 8rpx;
+					height: 16rpx;
+					margin-left: 6rpx;
+				}
+			}
 		}
 	}
+}
+
+::v-deep .right-area {
+	width: 31rpx !important;
+	height: 31rpx !important;
+}
+
+::v-deep .icon-headle {
+	width: 31rpx !important;
+	height: 31rpx !important;
+}
+
+.common-list {
+	background: #f5f5f5 !important;
+	border-radius: 30rpx !important;
+}
+
+::v-deep .list-container {
+	padding: 0 !important;
+}
+
+::v-deep .list-scroll {
+	margin-top: 0 !important;
+}
+
+.switch-box {
+	/* width: 126rpx; */
+	height: 52rpx;
+	line-height: 52rpx;
+	border-radius: 26rpx;
+	background-color: #FFD4D8;
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: center;
+	align-items: center;
+	padding: 0 8rpx 0 15rpx;
+
+	.switch-yuan {
+		width: 38rpx;
+		height: 38rpx;
+		border-radius: 20rpx;
+		background-color: #fff;
+		margin-left: 9rpx;
+		margin-right: 0rpx;
+	}
+
+	.switch-text {
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #FF4767;
+		line-height: 33rpx;
+		text-align: right;
+		font-style: normal;
+	}
+}
+
+.disswitch {
+	padding: 0 12rpx 0 8rpx;
+	background-color: #cecfd5;
+
+	.switch-yuan {
+		margin-left: 0;
+		margin-right: 9rpx;
+	}
+
+	.switch-text {
+		color: #A0A0A0;
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages/shop/staff/record.vue b/pages/shop/staff/record.vue
index 7465cf5..71b5c1f 100644
--- a/pages/shop/staff/record.vue
+++ b/pages/shop/staff/record.vue
@@ -160,7 +160,7 @@
 	}
 
 	.tab-item.active {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -172,7 +172,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
@@ -192,7 +192,7 @@
 			.stateText {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;
+				color: #FF4767;
 				text-align: left;
 				font-style: normal;
 				position: absolute;
@@ -269,7 +269,7 @@
 				.reason-label {
 					font-weight: 400;
 					font-size: 24rpx;
-					color: #E8101E;
+					color: #FF4767;
 					line-height: 33rpx;
 					text-align: left;
 					font-style: normal;
diff --git a/pages/shop/staff/selectSyr.vue b/pages/shop/staff/selectSyr.vue
index b4b2ca3..0f5e2db 100644
--- a/pages/shop/staff/selectSyr.vue
+++ b/pages/shop/staff/selectSyr.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<custom-navbar title="选择员工" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
 			titleColor="#fff" borderBottom="none"></custom-navbar>
 		<searchBox placeholder="输入员工名/手机号" v-model="queryData.str_val" :showAdd="false" @confirm="search"
 			@search="search">
@@ -205,7 +205,7 @@
 
 				/* 预先设置透明边框，防止切换时布局跳动 */
 				&.active {
-					color: #e8101e;
+					color: #FF4767;
 					font-weight: 500;
 					position: relative;
 
@@ -219,7 +219,7 @@
 						/* 激活时显示红色边框 */
 						width: 34rpx;
 						height: 6rpx;
-						background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+						background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
 						border-radius: 3rpx;
 					}
 				}
@@ -303,7 +303,7 @@
 			margin: 0 20rpx;
 			width: 710rpx;
 			height: 98rpx;
-			background: #e8101e;
+			background: #FF4767;
 			border-radius: 49rpx;
 			font-weight: 400;
 			font-size: 38rpx;
diff --git a/pages/shop/staff/serviceList.vue b/pages/shop/staff/serviceList.vue
index 2b55c91..63cb10b 100644
--- a/pages/shop/staff/serviceList.vue
+++ b/pages/shop/staff/serviceList.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="container">
 		<custom-navbar title="服务项目" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" :showHeadle="false" titleColor="#fff"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" :showHeadle="false" titleColor="#fff"
 			borderBottom="none"></custom-navbar>
-		<serviecFirstTab :tabs="tabs" :activeId="activeId" activeColor="#E8101E" @tab-click="tabClick" bgColor="#fff">
+		<serviecFirstTab :tabs="tabs" :activeId="activeId" activeColor="#FF4767" @tab-click="tabClick" bgColor="#fff">
 		</serviecFirstTab>
 
 		<view class="service-list">
@@ -15,9 +15,9 @@
 							{{ item.title }}
 						</view>
 						<view class="flex-row-center">
-							<text class="item-left-text2" style="color: #e8101e">¥</text>
+							<text class="item-left-text2" style="color: #FF4767">¥</text>
 							<text class="item-left-text2"
-								style="color: #e8101e; font-size: 28rpx">{{ item.server_price }}</text>
+								style="color: #FF4767; font-size: 28rpx">{{ item.server_price }}</text>
 							<view class="item-left-line"></view>
 							<text class="item-left-text2">{{ item.server_time }}分钟</text>
 						</view>
@@ -142,6 +142,7 @@
 			background-color: #fff;
 			margin: 20rpx 20rpx 26rpx 20rpx;
 			border-radius: 10rpx;
+			padding-bottom: 150rpx;
 
 			.service-item {
 				padding-top: 20rpx;
@@ -218,7 +219,7 @@
 			width: 670rpx;
 			height: 86rpx;
 			border-radius: 100rpx;
-			background: #e8101e;
+			background: #FF4767;
 			font-weight: 400;
 			font-size: 34rpx;
 			color: #ffffff;
diff --git a/pages/shop/staff/staffDetail.vue b/pages/shop/staff/staffDetail.vue
index 857ede7..6e77b00 100644
--- a/pages/shop/staff/staffDetail.vue
+++ b/pages/shop/staff/staffDetail.vue
@@ -165,7 +165,7 @@
 						border: 2rpx solid rgba(232, 16, 30, 0.28);
 						font-weight: 400;
 						font-size: 24rpx;
-						color: #e8101e;
+						color: #FF4767;
 						line-height: 32rpx;
 						text-align: right;
 						font-style: normal;
diff --git a/pages/shop/staff/unbundleList.vue b/pages/shop/staff/unbundleList.vue
index 1c49b87..9a015ad 100644
--- a/pages/shop/staff/unbundleList.vue
+++ b/pages/shop/staff/unbundleList.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<custom-navbar title="解绑记录" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"
 			borderBottom="none"></custom-navbar>
 		<searchBox placeholder="手艺人名称" v-model="queryData.str_val" :showAdd="false" @confirm="search" @search="search" />
 		<CommonList ref="groupRef" apiUrl="/sj/getUnbindReadList"
@@ -85,7 +85,7 @@
 			.container-tip-text {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #e8101e;
+				color: #FF4767;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
@@ -159,7 +159,7 @@
 					border-radius: 27rpx;
 					border: 1rpx solid rgba(232, 16, 30, 0.5);
 					font-size: 24rpx;
-					color: #e8101e;
+					color: #FF4767;
 					text-align: left;
 					font-style: normal;
 				}
diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue
index accf472..1168036 100644
--- a/pages/shop/userorder-detail.vue
+++ b/pages/shop/userorder-detail.vue
@@ -1,1714 +1,1728 @@
-<template>
-	<view class="detail-page" :class="{ 'no-bottom-buttons': !haveButton }">
-		<!-- 顶部导航栏 -->
-		<custom-navbar title="订单详情" :show-back="true" title-color="#333333" :backgroundColor="backgroundColor"
-			borderBottom="none"></custom-navbar>
-
-		<view class="content-part">
-
-			<!-- 订单状态 -->
-			<view class="status-section">
-				<image class="status-section-image" mode="widthFix" :src="stateItem.icon" />
-				<text class="status-text">{{ stateItem.text }}
-					<text v-if="orderInfo.team_buy_order_state">{{
-			            ` (${getGroupType(orderInfo.team_buy_order_state)})`
-			          }}</text></text>
-			</view>
-
-
-			<!-- 到店订单客户信息 -->
-			<view class="kh-card" v-if=" serviceType == '2' && orderInfo.order_kind==2">
-				<view class="kh-card-footer flex-row-center-between">
-					<view class="kh-card-footer-left flex-row-center">
-						<image class="kh-card-footer-left-img" :src="orderInfo.order_headphoto"></image>
-						<view class="kh-card-footer-left-text">
-							{{ `${orderInfo.order_username} ${orderInfo.phone_user}` }}
-						</view>
-					</view>
-					<image class="kh-card-footer-right" @click="contactService(orderInfo.phone_user)"
-						src="/static/images/icons/phone.png"></image>
-				</view>
-			</view>
-
-			<!-- 上门订单 客户以及手艺人信息 -->
-			<view class="service-card" v-if="reservation_address_arr && reservation_address_arr.name">
-				<view class="card_title">顾客信息</view>
-				<view class="location-info">
-					<view class="name-phone">
-						<view>
-							<text class="name">{{ reservation_address_arr.name }}</text>
-							<text class="phone">{{
-			                reservation_address_arr.call_phone
-			              }}</text>
-						</view>
-						<view class="info_Btn" @click="contactService(reservation_address_arr.call_phone)">
-							<image class="btn-phone"
-								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fffa5408-df61-40c1-8dea-78325f75f3ab.png"
-								mode="aspectFit"></image>
-							<text>联系客户</text>
-						</view>
-					</view>
-					<view class="address-info">
-						<image @click="openMap()"
-							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8a503a74-a809-4dc4-b3e0-3a257530ff10.png"
-							class="location-icon"></image>
-						<text class="address">上门地址:{{ reservation_address_arr.server_address
-			              }}{{ reservation_address_arr.house_number }}</text>
-					</view>
-				</view>
-			</view>
-
-			<!-- 店铺信息 -->
-			<!-- <view class="shop_card"
-				v-if=" serviceType !== '2' && orderInfo.order_kind !== 3 && user_sj && user_sj.name">
-				<view class="shop_info_box">
-					<view class="shop_info_row">
-						<view class="shop_info_left">
-							<image class="shop_photo" :src="user_sj.head_photo" mode="aspectFill"></image>
-							<view class="shop_info_right">
-								<text class="shop_name">{{ user_sj.name }}</text>
-							</view>
-						</view>
-						<view class="shop_info_actions">
-							<view class="shop_action_item" @click="openShopMap">
-								<image class="action_icon_map"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/306b7f20-8b5a-4585-baf5-962bf4c07d8c.png"
-									mode="aspectFit"></image>
-								<view class="action_text">地址</view>
-							</view>
-							<view class="shop_action_item" @click="contactService(user_sj.phone || user_sj.account)">
-								<image class="action_icon_phone"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5e6bb10e-9f14-4349-8021-7e79078a8da7.png"
-									mode="aspectFit"></image>
-								<view class="action_text">电话</view>
-							</view>
-						</view>
-					</view>
-					<view class="shop_details">
-						<text class="shop_phone"
-							v-if="user_sj.phone || user_sj.account">商家电话：{{ user_sj.phone || user_sj.account }}</text>
-						<text class="shop_address" v-if="user_sj.address">地址：{{ user_sj.address }}</text>
-					</view>
-				</view>
-			</view> -->
-
-			<!-- 用户信息 -->
-		<!-- 	<view class="shop_card" v-if="orderInfo.order_kind==2">
-				<view class="userinfo">
-					<view class="" v-if="orderInfo.user_yh.head_photo">
-						<image :src="orderInfo.user_yh.head_photo" mode="widthFix"
-							style="width: 70rpx;border-radius: 50%;"></image>
-					</view>
-					<view class="" style="margin-left: 20rpx;margin-top: 15rpx;">{{orderInfo.user_yh.username}}</view>
-					<view class="" style="margin-left: 12rpx;margin-top: 15rpx;">{{orderInfo.user_yh.account}}</view>
-					<view class="" style="margin-left: auto;" @click="contactService(orderInfo.user_yh.account)">
-						<image
-							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/1cd9338d-f5b3-421b-8757-92578387e05d.png"
-							mode="widthFix" style="width: 40rpx;margin-top: 15rpx;"></image>
-					</view>
-				</view>
-			</view> -->
-			<!-- 服务时段 -->
-			<view class="time_card" v-if="orderInfo.order_kind == 3">
-				<view class="card_title">服务时段</view>
-				<view class="card_time mb-20">
-					预约开始时间： <text
-						style="color: #333333;">{{ formatDateAndAddMinutes(orderInfo.reservation_time).original }}</text>
-				</view>
-				<view class="card_time">
-					预约结束时间： <text
-						style="color: #333333;">{{ formatDateAndAddMinutes(orderInfo.reservation_time,orderInfo.server_time).afterAddingMinutes }}</text>
-				</view>
-			</view>
-
-			<!-- 预约信息 -->
-			<view class="booking-card">
-				<view class="card_title">预约信息</view>
-				<view class="service-item">
-					<image :src="orderInfo.server_photo[0]"
-						v-if="orderInfo.server_photo && orderInfo.server_photo.length != 0" mode="aspectFill"
-						class="service-image"></image>
-					<view class="service-info">
-						<view class="service-name">{{ orderInfo.server_title }}
-							<view class="service-name-num">×1</view>
-						</view>
-						<view v-if="orderInfo.team_buy_id" class="group-price">
-							<!-- <view class="service-price">原价¥{{ orderInfo.cost_money }}</view> -->
-							<view class="service-price2">团购价:¥<text style="font-size: 36rpx">{{
-				                  orderInfo.order_money
-				                }}</text></view>
-						</view>
-						<text class="service-price2" style="color: #333" v-else>¥
-							<text style="font-size: 36rpx">{{ orderInfo.order_money }}</text>
-						</text>
-					</view>
-				</view>
-				<view class="service-item1">
-					<view class="serverinfo">
-						<view class="serverinfo-l">服务售价</view>
-						<view class="serverinfo-r">
-							<view class="serverinfo-r-o" v-if="orderInfo.cost_money!=orderInfo.line_money">
-								￥{{orderInfo.line_money}}</view>
-							<view class="serverinfo-r-t">￥{{orderInfo.cost_money}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="service-item1">
-					<view class="payinfo">
-						<view class="payinfo-l">用户实付</view>
-						<view class="payinfo-r">￥{{orderInfo.pay_money}}</view>
-					</view>
-				</view>
-				<view class="service-item1" v-if="orderInfo.butie_zonge && orderInfo.butie_zonge!=0">
-					<view class="btinfo">
-						<view class="btinfo-l">平台补贴</view>
-						<view class="btinfo-r">￥{{orderInfo.butie_zonge}}</view>
-					</view>
-				</view>
-				<view class="service-real">
-					<text class="real-lable">商家结算基数</text>
-					<view class="real-price">
-						<text class="icon">￥</text>
-						<text>{{ orderInfo.jiesuan_jine_yiju?orderInfo.jiesuan_jine_yiju:0 }}</text>
-					</view>
-				</view>
-			</view>
-
-			<view class="syr-card" v-if="orderInfo.order_shopphone_other">
-				<view class="syr-card-header">
-					预约手艺人信息
-				</view>
-				<view class="syr-card-footer flex-row-center-between">
-					<view class="syr-card-footer-left flex-row-center">
-						<image class="syr-card-footer-left-img" :src="orderInfo.order_shopheadphoto_other"></image>
-						<view class="syr-card-footer-left-text">
-							{{ `${orderInfo.order_shop_other} ${orderInfo.order_shopphone_other}` }}
-						</view>
-					</view>
-					<image class="syr-card-footer-right" @click="contactService(orderInfo.order_shopphone_other)"
-						src="/static/images/icons/phone.png"></image>
-				</view>
-			</view>
-
-			<!-- 订单信息 -->
-			<view class="order-card">
-				<text class="card-title">订单信息</text>
-				<view class="info-item">
-					<text class="label">订单编号</text>
-					<text class="value">{{orderInfo.number}}</text>
-				</view>
-				<view class="info-item" v-if="orderInfo.order_kind == 1">
-					<text class="label">到家时间</text>
-					<text class="value">{{orderInfo.reservation_time}}</text>
-				</view>
-				<view class="info-item">
-					<text class="label">下单时间</text>
-					<text class="value">{{orderInfo.add_time}}</text>
-				</view>
-				<view class="info-item" v-if="orderInfo.server_time">
-					<text class="label">服务时长</text>
-					<text class="value">{{orderInfo.server_time}}分钟</text>
-				</view>
-
-				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_kind">
-					<text class="label">支付方式</text>
-					<text
-						class="value">{{orderInfo.pay_kind == 1 ? '账户余额' : orderInfo.pay_kind == 2 ? '微信支付' : orderInfo.pay_kind == 3 ? '支付宝支付' : ''}}</text>
-				</view>
-				<view class="info-item" v-if="orderInfo.state != 1 &&orderInfo.pay_time">
-					<text class="label">支付时间</text>
-					<text class="value">{{orderInfo.pay_time}}</text>
-				</view>
-				<view class="info-item" v-if="orderInfo.state >= 3 && orderInfo.get_time">
-					<text class="label">接单时间</text>
-					<text class="value">{{ orderInfo.get_time }}</text>
-				</view>
-
-				<view class="info-item" v-if="orderInfo.state >= 4 && orderInfo.server_start_time">
-					<text class="label">开始服务时间</text>
-					<text class="value">{{ orderInfo.server_start_time }}</text>
-				</view>
-
-				<view class="info-item" v-if="orderInfo.state >= 5 && orderInfo.server_end_time">
-					<text class="label">完成服务时间</text>
-					<text class="value">{{ orderInfo.server_end_time }}</text>
-				</view>
-			</view>
-
-			<!-- 订单信息 -->
-			<view class="order-card" v-if="orderInfo.team_buy_id">
-				<text class="card-title">团购活动</text>
-				<view class="info-item">
-					<text class="label" v-if="orderInfo.team_buy_number">活动编号</text>
-					<text class="value">{{orderInfo.team_buy_number}}</text>
-				</view>
-				<view class="info-item">
-					<text class="label">活动名称</text>
-					<text class="value">{{orderInfo.team_buy_title}}</text>
-				</view>
-				<view class="info-item" v-if="orderInfo.team_buy_order_number">
-					<text class="label">团单编号</text>
-					<text class="value">{{orderInfo.team_buy_order_number}}</text>
-				</view>
-			</view>
-			<view class="order-card" v-if="Object.keys(orderInfo.coupon_info).length>0">
-				<text class="card-title">优惠券信息</text>
-				<view class="coupon-item">
-					<view class="info-item">
-						<text class="label">优惠券</text>
-						<text class="value">{{orderInfo.coupon_info.title}}</text>
-					</view>
-					<view class="info-item">
-						<text class="label">券码</text>
-						<text class="value">{{orderInfo.coupon_info.code_num}}</text>
-					</view>
-					<view class="info-item">
-						<text class="label">优惠金额</text>
-						<text class="value">{{orderInfo.coupon_info.reduce_money}}元</text>
-					</view>
-				</view>
-
-			</view>
-		</view>
-		<!-- 底部按钮 -->
-
-		<view class="bottom-buttons"
-			v-if="haveButton && (orderInfo.state == 2) || orderInfo.state == 3 || orderInfo.state == 4">
-			<!-- <view class="contact-button" @click="contactService(orderInfo.phone_user)">
-		  <image src="/static/images/tell_icon.png" class="tell-icon"></image>
-		  <text class="contact-text">联系TA</text>
-		</view> -->
-			<view class="handel-button btn-border" v-if="orderInfo.state == 2 || orderInfo.state == 3"
-				@click.stop="cancelOrder($event, orderInfo)">
-				<text class="button-text">取消订单</text>
-			</view>
-			<view class="handel-button btn-bg" v-if="orderInfo.state == 3" @click.stop="startOrder($event, orderInfo)">
-				<text class="button-text">开始服务</text>
-			</view>
-			<view class="handel-button btn-bg" v-if="orderInfo.state != 4" @click.stop="endOrder($event, orderInfo)">
-				<text class="button-text">服务完成</text>
-			</view>
-		</view>
-
-		<serviceCodeInput :show="showInput" @close="showInput = false" @confirm="onConfirm" />
-
-		<!-- 获取权限提示匡内容 -->
-		<view class="permission" :class="{ transform: isShowPer }">
-			<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
-			<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
-		</view>
-
-		<!-- 定位权限提示匡内容 -->
-		<view class="permission" :class="{ transform: isShowLocationPer }">
-			<view class="per-tit">美融融plus 对位置权限申请说明</view>
-			<view class="per-cont">当您需要查看商家位置或打开地图时，需要获取您的位置权限。</view>
-		</view>
-
-
-
-
-	</view>
-</template>
-
-<script>
-	import request from '../../utils/request'
-	import _public from '../../utils/public'
-	import serviceCodeInput from '../../components/service-code-input/service-code-input.vue';
-	import locationService from '../../utils/locationService';
-	import permissionUtils from '../../utils/per'
-	export default {
-		components: {
-			serviceCodeInput
-		},
-		data() {
-			return {
-				serviceType: 1, //订单类型，1普通，2自营
-				urls: {
-					1: {
-						weChatRefund: "/sj/yhwechatrefund",
-						aliRefund: "/sj/yhalirefund",
-						startOrder: "/sj/startserver",
-						endOrder: "/sj/endserver",
-						detail: "/sj/yhorderdetail",
-					},
-					2: {
-						weChatRefund: "/sj/orderSelf/weChatRefund",
-						aliRefund: "/sj/orderSelf/aliRefund",
-						startOrder: "/sj/orderSelf/start",
-						endOrder: "/sj/orderSelf/end",
-						detail: "/sj/orderSelf/details",
-					}
-				},
-				clickType: false, //点击状态，防止连续点击
-				isShowPer: false,
-				isShowLocationPer: false, // 控制定位权限说明视图显示
-				id: '',
-				staffInfo: {
-					avatar: '/static/images/staff.jpg',
-					name: '中医理疗谢飞',
-					rating: 5
-				},
-				showInput: false,
-				userInfo: {},
-				orderInfo: {},
-				reservation_address_arr: {},
-				user_sj: {}, // 店铺信息
-				distance: "", // 距离
-				scrollTop: 0,
-				haveButton: true,
-			}
-		},
-		async onLoad(options) {
-			this.id = options.order_id
-			if (options.serviceType) {
-				this.serviceType = options.serviceType
-			}
-			//推送消息订单传入后判断是否是自营
-			if (options.order_type) {
-				this.serviceType = options.order_type == 6 ? 2 : 1
-			}
-			//信息读取
-			if (options.push_id) {
-				this.messageRead(options.push_id)
-			}
-
-
-			// 添加调试日志
-			console.log('serviceType 值:', this.serviceType, '类型:', typeof this.serviceType)
-			console.log('options.serviceType:', options.serviceType)
-
-			if (options.order_id) {
-				// 请求订单详情
-				const userInfo = await request.post('/user/getuser', {
-					type: 3
-				});
-				this.userInfo = userInfo.data;
-				this.getOrderDetail();
-			}
-			if (options.order_kind == 3) {
-				this.haveButton = false
-			}
-
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		computed: {
-			backgroundColor() {
-				if (this.scrollTop > 10) {
-					return `rgba(255, 255, 255, ${Math.min(0.02 * this.scrollTop, 1)})`;
-				}
-				return "transparent";
-			},
-			stateItem() {
-				const list = [{
-						text: "待支付",
-						icon: "/static/images/icons/pay.png",
-						state: "1"
-					},
-					{
-						text: "待接单",
-						icon: "/static/images/icons/pending.png",
-						state: "2",
-					},
-					{
-						text: "待开始",
-						icon: "/static/images/icons/daikaishi.png",
-						state: "3",
-					},
-					{
-						text: "待完成",
-						icon: "/static/images/icons/pendingService.png",
-						state: "4",
-					},
-					{
-						text: "已完成",
-						icon: "/static/images/icons/payOk.png",
-						state: "5"
-					},
-					{
-						text: "待评价",
-						icon: "/static/images/icons/pending.png",
-						state: "6",
-					},
-					{
-						text: "已取消",
-						icon: "/static/images/evaluate/cancel.png",
-						state: "7"
-					},
-				];
-				const item = list.find((it) => it.state == this.orderInfo.state) || {};
-				return item;
-			},
-		},
-		methods: {
-			//消息列表跳转阅读
-			messageRead(id) {
-				request.post("/sj/push/messageRead", {
-					id: id
-				}).then(res => {
-					console.log("messageRead:", res)
-					this.messageUpudateNum()
-				})
-			},
-			//获取拼团状态文字
-			getGroupType(id) {
-				let list = [{
-						id: 1,
-						text: "拼团中",
-					},
-					{
-						id: 2,
-						text: "已成团",
-					},
-					{
-						id: 3,
-						text: "拼团失败",
-					},
-				];
-				let name = list.find((it) => it.id == id)?.text;
-				return name;
-			},
-			// 用于标准格式的方法
-			formatDateTime(dateStr, includeSeconds = true) {
-				if (!dateStr) {
-					return '';
-				}
-
-				// 处理日期字符串，兼容不同格式
-				const originalDate = new Date(dateStr.replace(/-/g, '/'));
-
-				// 格式化为 YYYY-MM-DD HH:mm:ss
-				const year = originalDate.getFullYear();
-				const month = String(originalDate.getMonth() + 1).padStart(2, "0");
-				const day = String(originalDate.getDate()).padStart(2, "0");
-				const hours = String(originalDate.getHours()).padStart(2, "0");
-				const minutes = String(originalDate.getMinutes()).padStart(2, "0");
-				const seconds = String(originalDate.getSeconds()).padStart(2, "0");
-
-				if (includeSeconds) {
-					return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-				} else {
-					return `${year}-${month}-${day} ${hours}:${minutes}`;
-				}
-			},
-			formatDateAndAddMinutes(dateStr, addMinutes = 0) {
-				// 解析原始日期
-				if (!dateStr) {
-					return {
-						original: '',
-						afterAddingMinutes: '',
-					};
-				}
-				const originalDate = new Date(dateStr.replace(/-/g, '/'));
-
-				// 格式化日期的辅助函数
-				function format(date) {
-					const year = date.getFullYear();
-					// 月份和日期需要补零
-					const month = String(date.getMonth() + 1).padStart(2, "0");
-					const day = String(date.getDate()).padStart(2, "0");
-					const hours = String(date.getHours()).padStart(2, "0");
-					const minutes = String(date.getMinutes()).padStart(2, "0");
-
-					return `${year}年${month}月${day}日 ${hours}:${minutes}`;
-				}
-
-				// 格式化原始日期
-				const formattedOriginal = format(originalDate);
-
-				// 计算加上指定分钟后的日期
-				const newDate = new Date(originalDate);
-				newDate.setMinutes(newDate.getMinutes() + addMinutes);
-
-				// 格式化新日期
-				const formattedNew = format(newDate);
-
-				return {
-					original: formattedOriginal,
-					afterAddingMinutes: formattedNew,
-				};
-			},
-			getOrderDetail() {
-				request.post(this.urls[this.serviceType].detail, {
-					id: this.id,
-					sjid: this.userInfo.id
-				}).then(res => {
-					this.orderInfo = res.data;
-					this.reservation_address_arr = res.data.reservation_address_arr;
-
-					// 添加店铺信息（如果有的话）
-					if (res.data.user_sj) {
-						this.user_sj = res.data.user_sj;
-						this.calculateDistance(); // 计算距离
-					}
-
-					console.log(this.orderInfo)
-				})
-			},
-
-			// 打开店铺地图
-			openShopMap() {
-				if (!this.user_sj.latitude || !this.user_sj.longitude) {
-					uni.showToast({
-						title: '暂无店铺位置信息',
-						icon: 'none'
-					});
-					return;
-				}
-
-				// #ifdef MP-WEIXIN
-				uni.openLocation({
-					latitude: parseFloat(this.user_sj.latitude),
-					longitude: parseFloat(this.user_sj.longitude),
-					name: this.user_sj.name || '店铺位置',
-					address: this.user_sj.address || '',
-					success: () => console.log('打开系统位置地图成功'),
-					fail: (error) => console.log(error),
-				});
-				// #endif
-
-				// #ifdef APP-PLUS
-				_public.goMap({
-					latitude: parseFloat(this.user_sj.latitude),
-					longitude: parseFloat(this.user_sj.longitude),
-					name: this.user_sj.name || '店铺位置',
-					address: this.user_sj.address || '',
-				});
-				// #endif
-			},
-
-			// 计算距离
-			calculateDistance() {
-				if (this.user_sj.latitude && this.user_sj.longitude) {
-					// 使用公共方法计算距离
-					this.distance = _public.calcDistance(
-						parseFloat(this.user_sj.latitude),
-						parseFloat(this.user_sj.longitude),
-						getApp().globalData.latitude || 0,
-						getApp().globalData.longitude || 0
-					);
-				}
-			},
-
-			// 取消订单
-			cancelOrder(e, order) {
-				// app阻止事件冒泡
-				// #ifdef APP-PLUS
-				e.preventDefault();
-				e.stopPropagation();
-				// #endif
-				uni.showModal({
-					title: '取消订单',
-					content: '确定要取消该订单吗？（订单取消后，支付金额将原路退回）',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 取消订单
-							let data = {
-								orderNo: order.number,
-								amount: order.pay_money,
-								sjid: this.userInfo.id
-							}
-							let url = '';
-							if (order.pay_kind == 1) {
-								url = ''
-							} else if (order.pay_kind == 2) {
-								url = this.urls[this.serviceType].weChatRefund
-							} else if (order.pay_kind == 3) {
-								url = this.urls[this.serviceType].aliRefund
-							}
-							console.log(data, url)
-							if (this.clickType) {
-								return
-							}
-							this.clickType = true
-							request.post(url, data).then(res => {
-								if (res.state == 1) {
-									uni.showToast({
-										title: '取消成功！',
-										icon: 'none'
-									})
-									this.getOrderDetail();
-									// 修改上一页页面信息
-									const pages = getCurrentPages();
-									const prevPage = pages[pages.length - 2];
-									if (prevPage) {
-										prevPage.$vm.getOrderNumber();
-										prevPage.$vm.getOrderList();
-									}
-								} else {
-									uni.showToast({
-										title: res.msg,
-										icon: 'none'
-									})
-								}
-
-							}).catch(err => {
-								console.log(err)
-							}).finally(() => {
-								this.clickType = false
-							})
-						}
-					}
-				})
-			},
-			// 开始服务
-			startOrder(e, order) {
-				// app阻止事件冒泡
-				if (order.team_buy_order_state == 1) {
-					uni.showToast({
-						title: "订单当前处于拼团中，服务将在拼团完成后才开启~",
-						icon: "none",
-					});
-					return
-				}
-				this.showInput = true
-			},
-			// 输入完成
-			onConfirm(code) {
-				this.showInput = false
-				if (this.clickType) {
-					return
-				}
-				this.clickType = true
-				request.post(this.urls[this.serviceType].startOrder, {
-					id: this.orderInfo.id,
-					server_code: code,
-					sjid: this.userInfo.id
-				}).then(res => {
-					console.log(res)
-					if (res.state == 1) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-						this.getOrderDetail();
-						// 修改上一页页面信息
-						const pages = getCurrentPages();
-						const prevPage = pages[pages.length - 2];
-						if (prevPage) {
-							prevPage.$vm.getOrderNumber();
-							prevPage.$vm.getOrderList();
-						}
-					} else if (res.state == 2) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					}
-					this.handelOrder = {};
-				}).finally(() => {
-					this.clickType = false
-				})
-			},
-			// 完成服务
-			endOrder(e, order) {
-				// app阻止事件冒泡
-				// #ifdef APP-PLUS
-				e.preventDefault();
-				e.stopPropagation();
-				// #endif
-				if (this.clickType) {
-					return
-				}
-				this.clickType = true
-				request.post(this.urls[this.serviceType].endOrder, {
-					id: order.id,
-					sjid: this.userInfo.id
-				}).then(res => {
-					if (res.state == 1) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-						this.getOrderDetail();
-						// 修改上一页页面信息
-						const pages = getCurrentPages();
-						const prevPage = pages[pages.length - 2];
-						if (prevPage) {
-							prevPage.$vm.getOrderNumber();
-							prevPage.$vm.getOrderList();
-						}
-					}
-				}).finally(() => {
-					this.clickType = false
-				})
-			},
-			// 显示权限说明弹窗
-			showPermissionDialog(title, content) {
-				return new Promise((resolve) => {
-					uni.showModal({
-						title,
-						content,
-						confirmText: '去开启',
-						success(res) {
-							resolve(res.confirm);
-						}
-					});
-				});
-			},
-			// 联系用户
-			async contactService(phone) {
-				// TODO: 实现联系客服功能
-				// uni.navigateTo({
-				// 	url: '/pages/contact/contact?phone='+phone
-				// })
-				const systemInfo = uni.getSystemInfoSync()
-				if (systemInfo.platform === 'ios') {
-					uni.makePhoneCall({
-						phoneNumber: phone //仅为示例
-					})
-				} else {
-					let permission = '';
-					if (systemInfo.platform === 'ios') {
-						permission = 'phone'
-					} else {
-						permission = 'android.permission.CALL_PHONE'
-					}
-					this.isShowPer = true;
-					const firstRequest = !plus.storage.getItem(`perm_${permission}`)
-					if (firstRequest) {
-						this.isShowPer = true;
-					}
-					// 1. 检查权限
-					const {
-						granted
-					} = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-					if (granted) {
-						this.isShowPer = false;
-						uni.makePhoneCall({
-							phoneNumber: phone //仅为示例
-						})
-						return;
-					}
-					this.isShowPer = false;
-					// 2. 显示权限说明弹窗
-					const confirm = await this.showPermissionDialog(
-						'拨打电话权限申请',
-						'我们需要拨打电话权限，方便您联系商家或平台'
-					);
-
-					if (!confirm) return;
-
-					// 3. 请求权限
-					const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-					console.log('result', result)
-					if (result) {
-						uni.makePhoneCall({
-							phoneNumber: phone //仅为示例
-						})
-						return;
-					} else {
-						locationService.openAppSettings();
-						return;
-						// uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-					}
-				}
-
-
-			},
-
-			// 打开上门地址地图
-			async openMap() {
-				const systemInfo = uni.getSystemInfoSync();
-				if (systemInfo.platform === "ios") {
-					this._openLocation(this.reservation_address_arr);
-				} else {
-					this.isShowLocationPer = true;
-					const {
-						granted
-					} = await permissionUtils.checkPermission(
-						"location",
-						"需要位置权限以打开地图"
-					);
-					if (granted) {
-						this.isShowLocationPer = false;
-						this._openLocation(this.reservation_address_arr);
-						return;
-					}
-					this.isShowLocationPer = false;
-					const confirm = await this.showPermissionDialog(
-						"位置权限申请",
-						"我们需要您的位置权限，以便在地图上显示位置"
-					);
-					if (!confirm) return;
-					const result = await permissionUtils.requestPermission(
-						"location",
-						"需要位置权限以打开地图"
-					);
-					if (result) {
-						this._openLocation(this.reservation_address_arr);
-					} else {
-						locationService.openAppSettings();
-					}
-				}
-			},
-
-			// 打开店铺地图
-			async openShopMap() {
-				if (!this.user_sj.latitude || !this.user_sj.longitude) {
-					uni.showToast({
-						title: '暂无店铺位置信息',
-						icon: 'none'
-					});
-					return;
-				}
-				const systemInfo = uni.getSystemInfoSync();
-				if (systemInfo.platform === "ios") {
-					this._openLocation(this.user_sj);
-				} else {
-					this.isShowLocationPer = true;
-					const {
-						granted
-					} = await permissionUtils.checkPermission(
-						"location",
-						"需要位置权限以打开地图"
-					);
-					if (granted) {
-						this.isShowLocationPer = false;
-						this._openLocation(this.user_sj);
-						return;
-					}
-					this.isShowLocationPer = false;
-					const confirm = await this.showPermissionDialog(
-						"位置权限申请",
-						"我们需要您的位置权限，以便在地图上显示店铺位置"
-					);
-					if (!confirm) return;
-					const result = await permissionUtils.requestPermission(
-						"location",
-						"需要位置权限以打开地图"
-					);
-					if (result) {
-						this._openLocation(this.user_sj);
-					} else {
-						locationService.openAppSettings();
-					}
-				}
-			},
-
-			// 实际打开地图的方法（抽离）
-			_openLocation(obj) {
-				// #ifdef MP-WEIXIN
-				uni.openLocation({
-					latitude: parseFloat(obj.latitude),
-					longitude: parseFloat(obj.longitude),
-					name: obj.name || obj.house_number || '位置',
-					address: obj.address || obj.server_address || '',
-					success: () => console.log('打开地图成功'),
-					fail: (err) => console.error('打开地图失败', err)
-				});
-				// #endif
-				// #ifdef APP-PLUS
-				_public.goMap({
-					latitude: parseFloat(obj.latitude),
-					longitude: parseFloat(obj.longitude),
-					name: obj.name || obj.house_number || '位置',
-					address: obj.address || obj.server_address || ''
-				});
-				// #endif
-			},
-		}
-	}
-</script>
-
-<style lang="less">
-	page {
-		position: relative;
-		background-color: #fff;
-	}
-
-	.detail-page::before {
-		content: "";
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		height: 1200rpx !important;
-		background-image: url("/static/images/bg.png");
-		background-size: cover;
-		background-position: center top;
-		background-repeat: no-repeat;
-		z-index: 1;
-	}
-
-	.detail-page.no-bottom-buttons {
-		padding-bottom: 20rpx !important;
-	}
-
-	.content-part {
-		position: relative;
-		left: 0;
-		right: 0;
-		z-index: 9;
-	}
-
-	/* 导航栏样式 */
-	.custom-nav {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		height: 88rpx;
-		background-color: transparent;
-		display: flex;
-		align-items: center;
-		padding: 0 32rpx;
-		z-index: 100;
-		/* #ifdef H5 */
-		padding-top: 0;
-		/* #endif */
-		/* #ifdef APP-PLUS || MP-WEIXIN */
-		padding-top: var(--status-bar-height);
-		/* #endif */
-	}
-
-	.nav-back {
-		width: 48rpx;
-		height: 48rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.back-icon {
-		width: 32rpx;
-		height: 32rpx;
-	}
-
-	.nav-title {
-		flex: 1;
-		text-align: center;
-		font-size: 36rpx;
-		font-weight: 500;
-		color: #ffffff;
-	}
-
-	/* 状态区域 */
-	.status-section {
-		/* background: linear-gradient(135deg, #FF6B9D 0%, #FF4D6B 100%); */
-		/* height: 160rpx; */
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		gap: 20rpx;
-		padding-top: 55rpx;
-		padding-bottom: 50rpx;
-
-		/* padding-top: 88rpx; */
-		/* #ifdef APP-PLUS || MP-WEIXIN */
-		/* padding-top: calc(88rpx + var(--status-bar-height)); */
-		/* #endif */
-		.status-section-image {
-			width: 52rpx;
-			height: 48rpx;
-		}
-	}
-
-	.status-text {
-		font-size: 44rpx;
-		color: #333333;
-		font-weight: 600;
-	}
-
-	/* 服务人员卡片 */
-	.service-card {
-		margin: 0 30rpx 20rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		padding: 30rpx 20rpx;
-		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
-
-		.card_title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			padding-bottom: 16rpx;
-		}
-	}
-
-	.location-info {
-		display: flex;
-		flex-direction: column;
-		gap: 24rpx;
-		//   flex-direction: column;
-		//   flex-flow: row nowrap;
-		//   justify-content: flex-start;
-		//   align-items: center;
-	}
-
-	.location-icon {
-		width: 44rpx;
-		height: 44rpx;
-		margin-right: 10rpx;
-		flex-shrink: 0;
-	}
-
-	.address-info {
-		display: flex;
-		align-items: center;
-		flex: 1;
-	}
-
-	.name-phone {
-		display: flex;
-		align-items: center;
-		flex-wrap: nowrap;
-		justify-content: space-between;
-	}
-
-	.name {
-		font-size: 30rpx;
-		color: #333333;
-		font-weight: 500;
-		margin-right: 20rpx;
-	}
-
-	.phone {
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 42rpx;
-	}
-
-	.address {
-		font-size: 26rpx;
-		color: #333333;
-		margin-top: 8rpx;
-	}
-
-	.info_Btn {
-		width: 155rpx;
-		height: 42rpx;
-		border-radius: 13rpx;
-		border: 1rpx solid #bbbbbb;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		gap: 11rpx;
-		color: #999999;
-		font-size: 24rpx;
-
-		.btn-phone {
-			width: 20rpx;
-			height: 22rpx;
-		}
-	}
-
-	/* 店铺信息卡片 */
-	.shop_card {
-		margin: 30rpx 30rpx 20rpx;
-		background-color: #ffffff;
-		border-radius: 16rpx;
-		padding: 24rpx 20rpx 24rpx;
-		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
-
-		.card_title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-		}
-
-		.shop_info_box {
-			// margin-top: 30rpx;
-		}
-
-		.shop_info_row {
-			display: flex;
-			align-items: center;
-			padding-bottom: 24rpx;
-			border-bottom: 3rpx solid #f6f5f5;
-		}
-
-		.shop_info_left {
-			display: flex;
-			align-items: center;
-			flex: 1;
-		}
-
-		.shop_photo {
-			width: 96rpx;
-			height: 96rpx;
-			border-radius: 12rpx;
-			margin-right: 20rpx;
-		}
-
-		.shop_name {
-			font-size: 32rpx;
-			color: #333333;
-			font-weight: 600;
-		}
-
-		.shop_distance {
-			display: flex;
-			align-items: center;
-			margin-top: 10rpx;
-		}
-
-		.distance_icon {
-			width: 24rpx;
-			height: 24rpx;
-			margin-right: 4rpx;
-		}
-
-		.distance_text {
-			font-size: 26rpx;
-			color: #666666;
-		}
-
-		.shop_info_actions {
-			display: flex;
-			align-items: center;
-			gap: 30rpx;
-		}
-
-		.shop_action_item {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-		}
-
-		.action_icon_map,
-		.action_icon_phone {
-			width: 40rpx;
-			height: 40rpx;
-		}
-
-		.action_text {
-			font-size: 20rpx;
-			color: #8b8b8b;
-			margin-top: 2rpx;
-		}
-
-		.shop_details {
-			margin-top: 24rpx;
-		}
-
-		.shop_time {
-			display: block;
-			font-size: 28rpx;
-			color: #333333;
-			font-weight: 500;
-			padding-bottom: 10rpx;
-			margin-bottom: 20rpx;
-			border-bottom: 1rpx solid #f6f5f5;
-		}
-
-		.shop_phone {
-			display: block;
-			font-size: 28rpx;
-			color: #666666;
-			margin-bottom: 10rpx;
-		}
-
-		.shop_address {
-			display: block;
-			font-size: 28rpx;
-			color: #666666;
-		}
-	}
-
-	/* 预约信息卡片 */
-	.booking-card {
-		margin: 0rpx 30rpx 20rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		padding: 24rpx 30rpx 20rpx 20rpx;
-		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
-
-		.card_title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			margin-bottom: 40rpx;
-			line-height: 34rpx;
-		}
-	}
-
-	.card-header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-bottom: 24rpx;
-	}
-
-	.card-title {
-		font-size: 32rpx;
-		color: #3d3d3d;
-		font-weight: 500;
-	}
-
-	.update-time {
-		font-size: 28rpx;
-		color: #333333;
-		padding-right: 4rpx;
-	}
-
-	.update-change {
-		font-size: 28rpx;
-		color: #666666;
-	}
-
-	.service-item {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: flex-start;
-		align-items: center;
-		margin-bottom: 32rpx;
-	}
-
-	.service-image {
-		width: 160rpx;
-		height: 160rpx;
-		border-radius: 16rpx;
-		margin-right: 24rpx;
-		background-color: #e2e2e2;
-	}
-
-	.service-info {
-		flex: 1;
-		height: 160rpx;
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: space-between;
-		align-items: flex-start;
-		margin-right: 24rpx;
-	}
-
-	.service-name {
-		width: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-
-		.service-name-num {
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #999999;
-			line-height: 34rpx;
-		}
-	}
-
-	.service-price {
-		font-family: DINPro, DINPro;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #bbbbbb;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-		margin-bottom: 7rpx;
-	}
-
-	.service-price2 {
-		font-family: DINPro, DINPro;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #E8101E;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.service-count {
-		font-weight: 500;
-		font-size: 26rpx;
-		color: #999999;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.service-real {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: flex-end;
-		align-items: baseline;
-		padding-top: 24rpx;
-		border-top: 1rpx solid rgba(0, 0, 0, 0.05);
-	}
-
-	.real-lable {
-		font-size: 30rpx;
-		color: #333333;
-	}
-
-	.real-price {
-		font-family: DINPro, DINPro;
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #E8101E;
-
-		.icon {
-			font-size: 20rpx;
-		}
-	}
-
-	/* 订单信息卡片 */
-	.order-card {
-		margin: 20rpx 30rpx 30rpx 30rpx;
-		background-color: #ffffff;
-		border-radius: 16rpx;
-		padding: 36rpx 20rpx 40rpx;
-		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
-
-		.card_title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			padding-bottom: 10rpx;
-		}
-	}
-
-	.time_card {
-		margin: 30rpx;
-		background-color: #ffffff;
-		border-radius: 16rpx;
-		padding: 30rpx 20rpx;
-		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
-
-		.card_title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			padding-bottom: 16rpx;
-		}
-
-		.card_time {
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #999999;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-		}
-	}
-
-	.info-item {
-		display: flex;
-		justify-content: space-between;
-		margin-top: 30rpx;
-	}
-
-	.label {
-		font-size: 28rpx;
-		color: #999999;
-	}
-
-	.value {
-		font-size: 28rpx;
-		color: #333333;
-	}
-
-	/* 底部按钮 */
-	.bottom-buttons {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		height: 128rpx;
-		background-color: #ffffff;
-		display: flex;
-		flex-flow: row nowrap;
-		align-items: center;
-		justify-content: flex-end;
-		box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
-		padding: 0 24rpx 0 78rpx;
-		/* #ifdef H5 */
-		padding-bottom: env(safe-area-inset-bottom);
-		/* #endif */
-		z-index: 999;
-	}
-
-	.contact-button {
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.contact-text {
-		font-size: 24rpx;
-		color: #666666;
-	}
-
-	.tell-icon {
-		width: 36rpx;
-		height: 36rpx;
-		margin-right: 8rpx;
-	}
-
-	.handel-button {
-		width: 186rpx;
-		height: 72rpx;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-		border-radius: 36rpx;
-		margin-left: 30rpx;
-	}
-
-	.btn-border {
-		border: 2rpx solid #979797;
-		background-color: #fff;
-		box-sizing: border-box;
-		margin-left: 60rpx;
-	}
-
-	.btn-bg {
-		background-color: #E8101E;
-	}
-
-	.button-text {
-		font-size: 28rpx;
-		font-weight: 400;
-		color: #ffffff;
-	}
-
-	.btn-border .button-text {
-		font-size: 28rpx;
-		font-weight: 400;
-		color: #333333;
-	}
-
-	/* APP适配 */
-	/* #ifdef APP-PLUS */
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-		opacity: 1;
-		visibility: visible;
-	}
-
-	.detail-page {
-		padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
-	}
-
-	/* #endif */
-	/* 平台适配 */
-	/* #ifdef H5 */
-	.detail-page {
-		padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
-	}
-
-	/* #endif */
-
-	/* #ifdef MP-WEIXIN */
-	.custom-nav {
-		padding-top: calc(var(--status-bar-height) + constant(safe-area-inset-top));
-		padding-top: calc(var(--status-bar-height) + env(safe-area-inset-top));
-	}
-
-	/* #endif */
-
-
-	.syr-card {
-		margin: 30rpx;
-		background-color: #ffffff;
-		padding: 30rpx 20rpx;
-
-		border-radius: 16rpx;
-
-		.syr-card-header {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			line-height: 45rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 40rpx;
-		}
-
-		.syr-card-footer {
-			.syr-card-footer-left {
-				.syr-card-footer-left-img {
-					width: 70rpx;
-					height: 70rpx;
-					border-radius: 50%;
-					margin-right: 20rpx;
-				}
-
-				.syr-card-footer-left-text {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #333333;
-					line-height: 40rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-
-			.syr-card-footer-right {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
-	}
-
-	// 客户卡片样式
-	.kh-card {
-		margin: 30rpx;
-		background-color: #ffffff;
-		padding: 30rpx 20rpx;
-
-		border-radius: 16rpx;
-
-		.kh-card-header {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			line-height: 45rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 40rpx;
-		}
-
-		.kh-card-footer {
-			.kh-card-footer-left {
-				.kh-card-footer-left-img {
-					width: 70rpx;
-					height: 70rpx;
-					border-radius: 50%;
-					margin-right: 20rpx;
-				}
-
-				.kh-card-footer-left-text {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #333333;
-					line-height: 40rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-
-			.kh-card-footer-right {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
-	}
-
-	.userinfo {
-		display: flex;
-	}
-
-	.serverinfo {
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.serverinfo-l {
-		width: 120rpx;
-		height: 42rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 42rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.serverinfo-r {
-		display: flex;
-	}
-
-	.serverinfo-r-o {
-		height: 40rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #999999;
-		line-height: 40rpx;
-		text-align: left;
-		font-style: normal;
-		// margin-left: 350rpx;
-		text-decoration: line-through;
-	}
-
-	.serverinfo-r-t {
-		height: 40rpx;
-		font-family: DINPro, DINPro;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #333333;
-		line-height: 40rpx;
-		text-align: left;
-		font-style: normal;
-		margin-left: 17rpx;
-	}
-
-	.service-item1 {
-		margin-bottom: 32rpx;
-	}
-
-	.payinfo {
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.payinfo-l {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #666666;
-		line-height: 37rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.payinfo-r {
-		font-family: DINPro, DINPro;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #333333;
-		line-height: 41rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.btinfo {
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.btinfo-l {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #666666;
-		line-height: 37rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.btinfo-r {
-		font-family: DINPro, DINPro;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 38rpx;
-		text-align: left;
-		font-style: normal;
-	}
-	.coupon-title{
-		width: 160rpx;
-		height: 40rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #3D3D3D;
-		line-height: 39rpx;
-		text-align: left;
-		font-style: normal;
-	}
-	.coupon-item {}
+<template>
+	<view class="detail-page" :class="{ 'no-bottom-buttons': !haveButton }">
+		<!-- 顶部导航栏 -->
+		<custom-navbar title="订单详情" :show-back="true" title-color="#333333" :backgroundColor="backgroundColor"
+			borderBottom="none"></custom-navbar>
+
+		<view class="content-part">
+
+			<!-- 订单状态 -->
+			<view class="status-section">
+				<image class="status-section-image" mode="widthFix" :src="stateItem.icon" />
+				<text class="status-text">{{ stateItem.text }}
+					<text v-if="orderInfo.team_buy_order_state">{{
+			            ` (${getGroupType(orderInfo.team_buy_order_state)})`
+			          }}</text></text>
+			</view>
+
+			<!-- 到店订单客户信息 -->
+			<view class="kh-card" v-if=" (serviceType == '2' ||serviceType == '1') && orderInfo.order_kind==2">
+				<view class="kh-card-footer flex-row-center-between">
+					<view class="kh-card-footer-left flex-row-center">
+						<image class="kh-card-footer-left-img" :src="orderInfo.order_headphoto || orderInfo.user_yh.head_photo"></image>
+						<view class="kh-card-footer-left-text">
+							{{ `${orderInfo.order_username} ${orderInfo.phone_user}` }}
+						</view>
+					</view>
+					<image class="kh-card-footer-right" @click="contactService(orderInfo.phone_user)"
+						src="/static/images/icons/phone.png"></image>
+				</view>
+			</view>
+
+			<!-- 上门订单 客户以及手艺人信息 -->
+			<view class="service-card" v-if="reservation_address_arr && reservation_address_arr.name">
+				<view class="card_title">顾客信息</view>
+				<view class="location-info">
+					<view class="name-phone">
+						<view>
+							<text class="name">{{ reservation_address_arr.name }}</text>
+							<text class="phone">{{
+			                reservation_address_arr.call_phone
+			              }}</text>
+						</view>
+						<view class="info_Btn" @click="contactService(reservation_address_arr.call_phone)">
+							<image class="btn-phone"
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fffa5408-df61-40c1-8dea-78325f75f3ab.png"
+								mode="aspectFit"></image>
+							<text>联系客户</text>
+						</view>
+					</view>
+					<view class="address-info">
+						<image @click="openMap()"
+							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8a503a74-a809-4dc4-b3e0-3a257530ff10.png"
+							class="location-icon"></image>
+						<text class="address">上门地址:{{ reservation_address_arr.server_address
+			              }}{{ reservation_address_arr.house_number }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 店铺信息 -->
+			<!-- <view class="shop_card"
+				v-if=" serviceType !== '2' && orderInfo.order_kind !== 3 && user_sj && user_sj.name">
+				<view class="shop_info_box">
+					<view class="shop_info_row">
+						<view class="shop_info_left">
+							<image class="shop_photo" :src="user_sj.head_photo" mode="aspectFill"></image>
+							<view class="shop_info_right">
+								<text class="shop_name">{{ user_sj.name }}</text>
+							</view>
+						</view>
+						<view class="shop_info_actions">
+							<view class="shop_action_item" @click="openShopMap">
+								<image class="action_icon_map"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/306b7f20-8b5a-4585-baf5-962bf4c07d8c.png"
+									mode="aspectFit"></image>
+								<view class="action_text">地址</view>
+							</view>
+							<view class="shop_action_item" @click="contactService(user_sj.phone || user_sj.account)">
+								<image class="action_icon_phone"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5e6bb10e-9f14-4349-8021-7e79078a8da7.png"
+									mode="aspectFit"></image>
+								<view class="action_text">电话</view>
+							</view>
+						</view>
+					</view>
+					<view class="shop_details">
+						<text class="shop_phone"
+							v-if="user_sj.phone || user_sj.account">商家电话：{{ user_sj.phone || user_sj.account }}</text>
+						<text class="shop_address" v-if="user_sj.address">地址：{{ user_sj.address }}</text>
+					</view>
+				</view>
+			</view> -->
+
+			<!-- 用户信息 -->
+			<!-- 	<view class="shop_card" v-if="orderInfo.order_kind==2">
+				<view class="userinfo">
+					<view class="" v-if="orderInfo.user_yh.head_photo">
+						<image :src="orderInfo.user_yh.head_photo" mode="widthFix"
+							style="width: 70rpx;border-radius: 50%;"></image>
+					</view>
+					<view class="" style="margin-left: 20rpx;margin-top: 15rpx;">{{orderInfo.user_yh.username}}</view>
+					<view class="" style="margin-left: 12rpx;margin-top: 15rpx;">{{orderInfo.user_yh.account}}</view>
+					<view class="" style="margin-left: auto;" @click="contactService(orderInfo.user_yh.account)">
+						<image
+							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/1cd9338d-f5b3-421b-8757-92578387e05d.png"
+							mode="widthFix" style="width: 40rpx;margin-top: 15rpx;"></image>
+					</view>
+				</view>
+			</view> -->
+			<!-- 服务时段 -->
+			<view class="time_card" v-if="orderInfo.order_kind == 3">
+				<view class="card_title">服务时段</view>
+				<view class="card_time mb-20">
+					预约开始时间： <text
+						style="color: #333333;">{{ formatDateAndAddMinutes(orderInfo.reservation_time).original }}</text>
+				</view>
+				<view class="card_time">
+					预约结束时间： <text
+						style="color: #333333;">{{ formatDateAndAddMinutes(orderInfo.reservation_time,orderInfo.server_time).afterAddingMinutes }}</text>
+				</view>
+			</view>
+
+			<!-- 预约信息 -->
+			<view class="booking-card">
+				<view class="card_title">预约信息</view>
+				<view class="service-item">
+					<image :src="orderInfo.server_photo[0]"
+						v-if="orderInfo.server_photo && orderInfo.server_photo.length != 0" mode="aspectFill"
+						class="service-image"></image>
+					<view class="service-info">
+						<view class="service-name">{{ orderInfo.server_title }}
+							<view class="service-name-num">×1</view>
+						</view>
+						<view v-if="orderInfo.team_buy_id" class="group-price">
+							<!-- <view class="service-price">原价¥{{ orderInfo.cost_money }}</view> -->
+							<view class="service-price2">团购价:¥<text style="font-size: 36rpx">{{
+				                  orderInfo.order_money
+				                }}</text></view>
+						</view>
+						<text class="service-price2" style="color: #333" v-else>¥
+							<text style="font-size: 36rpx">{{ orderInfo.order_money }}</text>
+						</text>
+					</view>
+				</view>
+				<view class="service-item1">
+					<view class="serverinfo">
+						<view class="serverinfo-l">服务售价</view>
+						<view class="serverinfo-r">
+							<view class="serverinfo-r-o" v-if="orderInfo.cost_money!=orderInfo.line_money">
+								￥{{orderInfo.line_money}}</view>
+							<view class="serverinfo-r-t">￥{{orderInfo.cost_money}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="service-item1">
+					<view class="payinfo">
+						<view class="payinfo-l">用户实付</view>
+						<view class="payinfo-r">￥{{orderInfo.pay_money}}</view>
+					</view>
+				</view>
+				<view class="service-item1" v-if="orderInfo.butie_zonge && orderInfo.butie_zonge!=0">
+					<view class="btinfo">
+						<view class="btinfo-l">平台补贴</view>
+						<view class="btinfo-r">￥{{orderInfo.butie_zonge}}</view>
+					</view>
+				</view>
+				<view class="service-real">
+					<text class="real-lable">商家结算基数</text>
+					<view class="real-price">
+						<text class="icon">￥</text>
+						<text>{{ orderInfo.jiesuan_jine_yiju?orderInfo.jiesuan_jine_yiju:0 }}</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="syr-card" v-if="orderInfo.order_shopphone_other">
+				<view class="syr-card-header">
+					预约手艺人信息
+				</view>
+				<view class="syr-card-footer flex-row-center-between">
+					<view class="syr-card-footer-left flex-row-center">
+						<image class="syr-card-footer-left-img" :src="orderInfo.order_shopheadphoto_other"></image>
+						<view class="syr-card-footer-left-text">
+							{{ `${orderInfo.order_shop_other} ${orderInfo.order_shopphone_other}` }}
+						</view>
+					</view>
+					<image class="syr-card-footer-right" @click="contactService(orderInfo.order_shopphone_other)"
+						src="/static/images/icons/phone.png"></image>
+				</view>
+			</view>
+
+			<!-- 订单信息 -->
+			<view class="order-card">
+				<text class="card-title">订单信息</text>
+				<view class="info-item">
+					<text class="label">订单编号</text>
+					<text class="value">{{orderInfo.number}}</text>
+				</view>
+				<view class="info-item" v-if="orderInfo.order_kind == 1">
+					<text class="label">到家时间</text>
+					<text class="value">{{orderInfo.reservation_time}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">下单时间</text>
+					<text class="value">{{orderInfo.add_time}}</text>
+				</view>
+				<view class="info-item" v-if="orderInfo.server_time">
+					<text class="label">服务时长</text>
+					<text class="value">{{orderInfo.server_time}}分钟</text>
+				</view>
+
+				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_kind">
+					<text class="label">支付方式</text>
+					<text
+						class="value">{{orderInfo.pay_kind == 1 ? '账户余额' : orderInfo.pay_kind == 2 ? '微信支付' : orderInfo.pay_kind == 3 ? '支付宝支付' : ''}}</text>
+				</view>
+				<view class="info-item" v-if="orderInfo.state != 1 &&orderInfo.pay_time">
+					<text class="label">支付时间</text>
+					<text class="value">{{orderInfo.pay_time}}</text>
+				</view>
+				<view class="info-item" v-if="orderInfo.state >= 3 && orderInfo.get_time">
+					<text class="label">接单时间</text>
+					<text class="value">{{ orderInfo.get_time }}</text>
+				</view>
+
+				<view class="info-item" v-if="orderInfo.state >= 4 && orderInfo.server_start_time">
+					<text class="label">开始服务时间</text>
+					<text class="value">{{ orderInfo.server_start_time }}</text>
+				</view>
+
+				<view class="info-item" v-if="orderInfo.state >= 5 && orderInfo.server_end_time">
+					<text class="label">完成服务时间</text>
+					<text class="value">{{ orderInfo.server_end_time }}</text>
+				</view>
+			</view>
+
+			<!-- 订单信息 -->
+			<view class="order-card" v-if="orderInfo.team_buy_id">
+				<text class="card-title">团购活动</text>
+				<view class="info-item">
+					<text class="label" v-if="orderInfo.team_buy_number">活动编号</text>
+					<text class="value">{{orderInfo.team_buy_number}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">活动名称</text>
+					<text class="value">{{orderInfo.team_buy_title}}</text>
+				</view>
+				<view class="info-item" v-if="orderInfo.team_buy_order_number">
+					<text class="label">团单编号</text>
+					<text class="value">{{orderInfo.team_buy_order_number}}</text>
+				</view>
+			</view>
+			<view class="order-card" v-if="orderInfo.coupon_info && Object.keys(orderInfo.coupon_info).length > 0">
+				<text class="card-title">优惠券信息</text>
+				<view class="coupon-item">
+					<view class="info-item">
+						<text class="label">优惠券</text>
+						<text class="value">{{orderInfo.coupon_info.title}}</text>
+					</view>
+					<view class="info-item">
+						<text class="label">券码</text>
+						<text class="value">{{orderInfo.coupon_info.code_num}}</text>
+					</view>
+					<view class="info-item">
+						<text class="label">优惠金额</text>
+						<text class="value">{{orderInfo.coupon_info.reduce_money}}元</text>
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<!-- 底部按钮 -->
+
+		<view class="bottom-buttons"
+			v-if="haveButton && (orderInfo.state == 2 || orderInfo.state == 3 || orderInfo.state == 4)">
+			<!-- <view class="contact-button" @click="contactService(orderInfo.phone_user)">
+		  <image src="/static/images/tell_icon.png" class="tell-icon"></image>
+		  <text class="contact-text">联系TA</text>
+		</view> -->
+			<view class="handel-button btn-border" v-if="orderInfo.state == 2 || orderInfo.state == 3"
+				@click.stop="cancelOrder($event, orderInfo)">
+				<text class="button-text">取消订单</text>
+			</view>
+			<view class="handel-button btn-bg" v-if="orderInfo.state == 3" @click.stop="startOrder($event, orderInfo)">
+				<text class="button-text">开始服务</text>
+			</view>
+			<view class="handel-button btn-bg" v-if="orderInfo.state == 4" @click.stop="endOrder($event, orderInfo)">
+				<text class="button-text">服务完成</text>
+			</view>
+		</view>
+
+		<serviceCodeInput :show="showInput" @close="showInput = false" @confirm="onConfirm" />
+
+		<!-- 获取权限提示匡内容 -->
+		<view class="permission" :class="{ transform: isShowPer }">
+			<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
+			<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
+		</view>
+
+		<!-- 定位权限提示匡内容 -->
+		<view class="permission" :class="{ transform: isShowLocationPer }">
+			<view class="per-tit">美融融plus 对位置权限申请说明</view>
+			<view class="per-cont">当您需要查看商家位置或打开地图时，需要获取您的位置权限。</view>
+		</view>
+
+
+
+
+	</view>
+</template>
+
+<script>
+	import request from '../../utils/request'
+	import _public from '../../utils/public'
+	import serviceCodeInput from '../../components/service-code-input/service-code-input.vue';
+	import locationService from '../../utils/locationService';
+	import permissionUtils from '../../utils/per'
+	export default {
+		components: {
+			serviceCodeInput
+		},
+		data() {
+			return {
+				serviceType: 1, //订单类型，1普通，2自营
+				urls: {
+					1: {
+						weChatRefund: "/sj/yhwechatrefund",
+						aliRefund: "/sj/yhalirefund",
+						startOrder: "/sj/startserver",
+						endOrder: "/sj/endserver",
+						detail: "/sj/yhorderdetail",
+					},
+					2: {
+						weChatRefund: "/sj/orderSelf/weChatRefund",
+						aliRefund: "/sj/orderSelf/aliRefund",
+						startOrder: "/sj/orderSelf/start",
+						endOrder: "/sj/orderSelf/end",
+						detail: "/sj/orderSelf/details",
+					}
+				},
+				clickType: false, //点击状态，防止连续点击
+				isShowPer: false,
+				isShowLocationPer: false, // 控制定位权限说明视图显示
+				id: '',
+				staffInfo: {
+					avatar: '/static/images/staff.jpg',
+					name: '中医理疗谢飞',
+					rating: 5
+				},
+				showInput: false,
+				userInfo: {},
+				orderInfo: {},
+				reservation_address_arr: {},
+				user_sj: {}, // 店铺信息
+				distance: "", // 距离
+				scrollTop: 0,
+				haveButton: true,
+			}
+		},
+		async onLoad(options) {
+			this.id = options.order_id
+			if (options.serviceType) {
+				this.serviceType = options.serviceType
+			}
+			//推送消息订单传入后判断是否是自营
+			if (options.order_type) {
+				this.serviceType = options.order_type == 6 ? 2 : 1
+			}
+			//信息读取
+			if (options.push_id) {
+				this.messageRead(options.push_id)
+			}
+			if(options.haveButton){
+				this.haveButton = options.haveButton
+			}
+
+
+			// 添加调试日志
+			console.log('serviceType 值:', this.serviceType, '类型:', typeof this.serviceType)
+			console.log('options.serviceType:', options.serviceType)
+
+			if (options.order_id) {
+				// 请求订单详情
+				const userInfo = await request.post('/user/getuser', {
+					type: 3
+				});
+				this.userInfo = userInfo.data;
+				this.getOrderDetail();
+			}
+			if (options.order_kind == 3) {
+				this.haveButton = false
+			}
+
+		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+		computed: {
+			backgroundColor() {
+				if (this.scrollTop > 10) {
+					return `rgba(255, 255, 255, ${Math.min(0.02 * this.scrollTop, 1)})`;
+				}
+				return "transparent";
+			},
+			stateItem() {
+				const list = [{
+						text: "待支付",
+						icon: "/static/images/icons/pay.png",
+						state: "1"
+					},
+					{
+						text: "待接单",
+						icon: "/static/images/icons/pending.png",
+						state: "2",
+					},
+					{
+						text: "待开始",
+						icon: "/static/images/icons/daikaishi.png",
+						state: "3",
+					},
+					{
+						text: "待完成",
+						icon: "/static/images/icons/pendingService.png",
+						state: "4",
+					},
+					{
+						text: "已完成",
+						icon: "/static/images/icons/payOk.png",
+						state: "5"
+					},
+					{
+						text: "待评价",
+						icon: "/static/images/icons/pending.png",
+						state: "6",
+					},
+					{
+						text: "已取消",
+						icon: "/static/images/evaluate/cancel.png",
+						state: "7"
+					},
+				];
+				const item = list.find((it) => it.state == this.orderInfo.state) || {};
+				return item;
+			},
+		},
+		methods: {
+			//消息列表跳转阅读
+			messageRead(id) {
+				request.post("/sj/push/messageRead", {
+					id: id
+				}).then(res => {
+					console.log("messageRead:", res)
+					this.messageUpudateNum()
+				})
+			},
+			//获取拼团状态文字
+			getGroupType(id) {
+				let list = [{
+						id: 1,
+						text: "拼团中",
+					},
+					{
+						id: 2,
+						text: "已成团",
+					},
+					{
+						id: 3,
+						text: "拼团失败",
+					},
+				];
+				let name = list.find((it) => it.id == id)?.text;
+				return name;
+			},
+			// 用于标准格式的方法
+			formatDateTime(dateStr, includeSeconds = true) {
+				if (!dateStr) {
+					return '';
+				}
+
+				// 处理日期字符串，兼容不同格式
+				const originalDate = new Date(dateStr.replace(/-/g, '/'));
+
+				// 格式化为 YYYY-MM-DD HH:mm:ss
+				const year = originalDate.getFullYear();
+				const month = String(originalDate.getMonth() + 1).padStart(2, "0");
+				const day = String(originalDate.getDate()).padStart(2, "0");
+				const hours = String(originalDate.getHours()).padStart(2, "0");
+				const minutes = String(originalDate.getMinutes()).padStart(2, "0");
+				const seconds = String(originalDate.getSeconds()).padStart(2, "0");
+
+				if (includeSeconds) {
+					return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+				} else {
+					return `${year}-${month}-${day} ${hours}:${minutes}`;
+				}
+			},
+			formatDateAndAddMinutes(dateStr, addMinutes = 0) {
+				// 解析原始日期
+				if (!dateStr) {
+					return {
+						original: '',
+						afterAddingMinutes: '',
+					};
+				}
+				const originalDate = new Date(dateStr.replace(/-/g, '/'));
+
+				// 格式化日期的辅助函数
+				function format(date) {
+					const year = date.getFullYear();
+					// 月份和日期需要补零
+					const month = String(date.getMonth() + 1).padStart(2, "0");
+					const day = String(date.getDate()).padStart(2, "0");
+					const hours = String(date.getHours()).padStart(2, "0");
+					const minutes = String(date.getMinutes()).padStart(2, "0");
+
+					return `${year}年${month}月${day}日 ${hours}:${minutes}`;
+				}
+
+				// 格式化原始日期
+				const formattedOriginal = format(originalDate);
+
+				// 计算加上指定分钟后的日期
+				const newDate = new Date(originalDate);
+				newDate.setMinutes(newDate.getMinutes() + addMinutes);
+
+				// 格式化新日期
+				const formattedNew = format(newDate);
+
+				return {
+					original: formattedOriginal,
+					afterAddingMinutes: formattedNew,
+				};
+			},
+			getOrderDetail() {
+				return request.post(this.urls[this.serviceType].detail, {
+					id: this.id,
+					sjid: this.userInfo.id
+				}).then(res => {
+					const newOrderInfo = res.data;
+					// 保留当前前端已经更新的状态
+					if (this.orderInfo && this.orderInfo.state > newOrderInfo.state) {
+						newOrderInfo.state = this.orderInfo.state;
+					}
+					this.orderInfo = newOrderInfo;
+					this.orderInfo.coupon_info = this.orderInfo.coupon_info || {};
+					this.reservation_address_arr = this.orderInfo.reservation_address_arr || {};
+				});
+			},
+
+			// 打开店铺地图
+			openShopMap() {
+				if (!this.user_sj.latitude || !this.user_sj.longitude) {
+					uni.showToast({
+						title: '暂无店铺位置信息',
+						icon: 'none'
+					});
+					return;
+				}
+
+				// #ifdef MP-WEIXIN
+				uni.openLocation({
+					latitude: parseFloat(this.user_sj.latitude),
+					longitude: parseFloat(this.user_sj.longitude),
+					name: this.user_sj.name || '店铺位置',
+					address: this.user_sj.address || '',
+					success: () => console.log('打开系统位置地图成功'),
+					fail: (error) => console.log(error),
+				});
+				// #endif
+
+				// #ifdef APP-PLUS
+				_public.goMap({
+					latitude: parseFloat(this.user_sj.latitude),
+					longitude: parseFloat(this.user_sj.longitude),
+					name: this.user_sj.name || '店铺位置',
+					address: this.user_sj.address || '',
+				});
+				// #endif
+			},
+
+			// 计算距离
+			calculateDistance() {
+				if (this.user_sj.latitude && this.user_sj.longitude) {
+					// 使用公共方法计算距离
+					this.distance = _public.calcDistance(
+						parseFloat(this.user_sj.latitude),
+						parseFloat(this.user_sj.longitude),
+						getApp().globalData.latitude || 0,
+						getApp().globalData.longitude || 0
+					);
+				}
+			},
+
+			// 取消订单
+			cancelOrder(e, order) {
+				// app阻止事件冒泡
+				// #ifdef APP-PLUS
+				e.preventDefault();
+				e.stopPropagation();
+				// #endif
+				uni.showModal({
+					title: '取消订单',
+					content: '确定要取消该订单吗？（订单取消后，支付金额将原路退回）',
+					success: (res) => {
+						if (res.confirm) {
+							// TODO: 取消订单
+							let data = {
+								orderNo: order.number,
+								amount: order.pay_money,
+								sjid: this.userInfo.id
+							}
+							let url = '';
+							if (order.pay_kind == 1) {
+								url = ''
+							} else if (order.pay_kind == 2) {
+								url = this.urls[this.serviceType].weChatRefund
+							} else if (order.pay_kind == 3) {
+								url = this.urls[this.serviceType].aliRefund
+							}
+							console.log(data, url)
+							if (this.clickType) {
+								return
+							}
+							this.clickType = true
+							request.post(url, data).then(res => {
+								if (res.state == 1 || res.code == 200) {
+									uni.showToast({
+										title: res.msg,
+										icon: 'none'
+									})
+									this.getOrderDetail();
+									// 修改上一页页面信息
+									const pages = getCurrentPages();
+									const prevPage = pages[pages.length - 2];
+									if (prevPage) {
+										prevPage.$vm.getOrderNumber();
+										prevPage.$vm.getOrderList();
+									}
+								} else {
+									uni.showToast({
+										title: res.msg,
+										icon: 'none'
+									})
+								}
+
+							}).catch(err => {
+								console.log(err)
+							}).finally(() => {
+								this.clickType = false
+							})
+						}
+					}
+				})
+			},
+			// 开始服务
+			startOrder(e, order) {
+				// app阻止事件冒泡
+				if (order.team_buy_order_state == 1) {
+					uni.showToast({
+						title: "订单当前处于拼团中，服务将在拼团完成后才开启~",
+						icon: "none",
+					});
+					return
+				}
+				this.showInput = true
+			},
+			// 输入完成
+			onConfirm(code) {
+				this.showInput = false;
+				if (this.clickType) return;
+				this.clickType = true;
+				uni.showLoading({
+					title: '服务开始中...'
+				});
+
+				request.post(this.urls[this.serviceType].startOrder, {
+					id: this.orderInfo.id,
+					server_code: code,
+					sjid: this.userInfo.id
+				}).then(res => {
+					if (res.state == 1 || res.code == 200) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'success'
+						});
+						// 直接修改状态为 4（待完成）
+						this.orderInfo.state = 4;
+						// 强制刷新视图，按钮立即变化
+						this.$forceUpdate();
+						// 后台静默获取真实数据，确保后续操作数据准确
+						this.getOrderDetail().catch(e => console.warn('静默同步失败', e));
+						// 刷新上一页订单列表
+						const pages = getCurrentPages();
+						const prevPage = pages[pages.length - 2];
+						if (prevPage && prevPage.$vm) {
+							prevPage.$vm.getOrderNumber?.();
+							prevPage.$vm.getOrderList?.();
+						}
+					} else if (res.state == 2) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				}).catch(err => {
+					console.error('开始服务失败', err);
+					uni.showToast({
+						title: '操作失败',
+						icon: 'none'
+					});
+				}).finally(() => {
+					this.clickType = false;
+					uni.hideLoading();
+				});
+			},
+			// 完成服务
+			endOrder(e, order) {
+				// app阻止事件冒泡
+				// #ifdef APP-PLUS
+				e.preventDefault();
+				e.stopPropagation();
+				// #endif
+				if (this.clickType) {
+					return
+				}
+				this.clickType = true
+				request.post(this.urls[this.serviceType].endOrder, {
+					id: order.id,
+					sjid: this.userInfo.id
+				}).then(res => {
+					if (res.state == 1 || res.code == 200) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.getOrderDetail();
+						// 修改上一页页面信息
+						const pages = getCurrentPages();
+						const prevPage = pages[pages.length - 2];
+						if (prevPage) {
+							prevPage.$vm.getOrderNumber();
+							prevPage.$vm.getOrderList();
+						}
+					}
+				}).finally(() => {
+					this.clickType = false
+				})
+			},
+			// 显示权限说明弹窗
+			showPermissionDialog(title, content) {
+				return new Promise((resolve) => {
+					uni.showModal({
+						title,
+						content,
+						confirmText: '去开启',
+						success(res) {
+							resolve(res.confirm);
+						}
+					});
+				});
+			},
+			// 联系用户
+			async contactService(phone) {
+				// TODO: 实现联系客服功能
+				// uni.navigateTo({
+				// 	url: '/pages/contact/contact?phone='+phone
+				// })
+				const systemInfo = uni.getSystemInfoSync()
+				if (systemInfo.platform === 'ios') {
+					uni.makePhoneCall({
+						phoneNumber: phone //仅为示例
+					})
+				} else {
+					let permission = '';
+					if (systemInfo.platform === 'ios') {
+						permission = 'phone'
+					} else {
+						permission = 'android.permission.CALL_PHONE'
+					}
+					this.isShowPer = true;
+					const firstRequest = !plus.storage.getItem(`perm_${permission}`)
+					if (firstRequest) {
+						this.isShowPer = true;
+					}
+					// 1. 检查权限
+					const {
+						granted
+					} = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
+					if (granted) {
+						this.isShowPer = false;
+						uni.makePhoneCall({
+							phoneNumber: phone //仅为示例
+						})
+						return;
+					}
+					this.isShowPer = false;
+					// 2. 显示权限说明弹窗
+					const confirm = await this.showPermissionDialog(
+						'拨打电话权限申请',
+						'我们需要拨打电话权限，方便您联系商家或平台'
+					);
+
+					if (!confirm) return;
+
+					// 3. 请求权限
+					const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
+					console.log('result', result)
+					if (result) {
+						uni.makePhoneCall({
+							phoneNumber: phone //仅为示例
+						})
+						return;
+					} else {
+						locationService.openAppSettings();
+						return;
+						// uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
+					}
+				}
+
+
+			},
+
+			// 打开上门地址地图
+			async openMap() {
+				const systemInfo = uni.getSystemInfoSync();
+				if (systemInfo.platform === "ios") {
+					this._openLocation(this.reservation_address_arr);
+				} else {
+					this.isShowLocationPer = true;
+					const {
+						granted
+					} = await permissionUtils.checkPermission(
+						"location",
+						"需要位置权限以打开地图"
+					);
+					if (granted) {
+						this.isShowLocationPer = false;
+						this._openLocation(this.reservation_address_arr);
+						return;
+					}
+					this.isShowLocationPer = false;
+					const confirm = await this.showPermissionDialog(
+						"位置权限申请",
+						"我们需要您的位置权限，以便在地图上显示位置"
+					);
+					if (!confirm) return;
+					const result = await permissionUtils.requestPermission(
+						"location",
+						"需要位置权限以打开地图"
+					);
+					if (result) {
+						this._openLocation(this.reservation_address_arr);
+					} else {
+						locationService.openAppSettings();
+					}
+				}
+			},
+
+			// 打开店铺地图
+			async openShopMap() {
+				if (!this.user_sj.latitude || !this.user_sj.longitude) {
+					uni.showToast({
+						title: '暂无店铺位置信息',
+						icon: 'none'
+					});
+					return;
+				}
+				const systemInfo = uni.getSystemInfoSync();
+				if (systemInfo.platform === "ios") {
+					this._openLocation(this.user_sj);
+				} else {
+					this.isShowLocationPer = true;
+					const {
+						granted
+					} = await permissionUtils.checkPermission(
+						"location",
+						"需要位置权限以打开地图"
+					);
+					if (granted) {
+						this.isShowLocationPer = false;
+						this._openLocation(this.user_sj);
+						return;
+					}
+					this.isShowLocationPer = false;
+					const confirm = await this.showPermissionDialog(
+						"位置权限申请",
+						"我们需要您的位置权限，以便在地图上显示店铺位置"
+					);
+					if (!confirm) return;
+					const result = await permissionUtils.requestPermission(
+						"location",
+						"需要位置权限以打开地图"
+					);
+					if (result) {
+						this._openLocation(this.user_sj);
+					} else {
+						locationService.openAppSettings();
+					}
+				}
+			},
+
+			// 实际打开地图的方法（抽离）
+			_openLocation(obj) {
+				// #ifdef MP-WEIXIN
+				uni.openLocation({
+					latitude: parseFloat(obj.latitude),
+					longitude: parseFloat(obj.longitude),
+					name: obj.name || obj.house_number || '位置',
+					address: obj.address || obj.server_address || '',
+					success: () => console.log('打开地图成功'),
+					fail: (err) => console.error('打开地图失败', err)
+				});
+				// #endif
+				// #ifdef APP-PLUS
+				_public.goMap({
+					latitude: parseFloat(obj.latitude),
+					longitude: parseFloat(obj.longitude),
+					name: obj.name || obj.house_number || '位置',
+					address: obj.address || obj.server_address || ''
+				});
+				// #endif
+			},
+		}
+	}
+</script>
+
+<style lang="less">
+	page {
+		position: relative;
+		background-color: #fff;
+	}
+
+	.detail-page::before {
+		content: "";
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 1200rpx !important;
+		background-image: url("/static/images/bg.png");
+		background-size: cover;
+		background-position: center top;
+		background-repeat: no-repeat;
+		z-index: 1;
+	}
+
+	.detail-page.no-bottom-buttons {
+		padding-bottom: 20rpx !important;
+	}
+
+	.content-part {
+		position: relative;
+		left: 0;
+		right: 0;
+		z-index: 9;
+	}
+
+	/* 导航栏样式 */
+	.custom-nav {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 88rpx;
+		background-color: transparent;
+		display: flex;
+		align-items: center;
+		padding: 0 32rpx;
+		z-index: 100;
+		/* #ifdef H5 */
+		padding-top: 0;
+		/* #endif */
+		/* #ifdef APP-PLUS || MP-WEIXIN */
+		padding-top: var(--status-bar-height);
+		/* #endif */
+	}
+
+	.nav-back {
+		width: 48rpx;
+		height: 48rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.back-icon {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.nav-title {
+		flex: 1;
+		text-align: center;
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #ffffff;
+	}
+
+	/* 状态区域 */
+	.status-section {
+		/* background: linear-gradient(135deg, #FF6B9D 0%, #FF4D6B 100%); */
+		/* height: 160rpx; */
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 20rpx;
+		padding-top: 55rpx;
+		padding-bottom: 50rpx;
+
+		/* padding-top: 88rpx; */
+		/* #ifdef APP-PLUS || MP-WEIXIN */
+		/* padding-top: calc(88rpx + var(--status-bar-height)); */
+		/* #endif */
+		.status-section-image {
+			width: 52rpx;
+			height: 48rpx;
+		}
+	}
+
+	.status-text {
+		font-size: 44rpx;
+		color: #333333;
+		font-weight: 600;
+	}
+
+	/* 服务人员卡片 */
+	.service-card {
+		margin: 0 30rpx 20rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		padding: 30rpx 20rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
+
+		.card_title {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			padding-bottom: 16rpx;
+		}
+	}
+
+	.location-info {
+		display: flex;
+		flex-direction: column;
+		gap: 24rpx;
+		//   flex-direction: column;
+		//   flex-flow: row nowrap;
+		//   justify-content: flex-start;
+		//   align-items: center;
+	}
+
+	.location-icon {
+		width: 44rpx;
+		height: 44rpx;
+		margin-right: 10rpx;
+		flex-shrink: 0;
+	}
+
+	.address-info {
+		display: flex;
+		align-items: center;
+		flex: 1;
+	}
+
+	.name-phone {
+		display: flex;
+		align-items: center;
+		flex-wrap: nowrap;
+		justify-content: space-between;
+	}
+
+	.name {
+		font-size: 30rpx;
+		color: #333333;
+		font-weight: 500;
+		margin-right: 20rpx;
+	}
+
+	.phone {
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #333333;
+		line-height: 42rpx;
+	}
+
+	.address {
+		font-size: 26rpx;
+		color: #333333;
+		margin-top: 8rpx;
+	}
+
+	.info_Btn {
+		width: 155rpx;
+		height: 42rpx;
+		border-radius: 13rpx;
+		border: 1rpx solid #bbbbbb;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 11rpx;
+		color: #999999;
+		font-size: 24rpx;
+
+		.btn-phone {
+			width: 20rpx;
+			height: 22rpx;
+		}
+	}
+
+	/* 店铺信息卡片 */
+	.shop_card {
+		margin: 30rpx 30rpx 20rpx;
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		padding: 24rpx 20rpx 24rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
+
+		.card_title {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+		}
+
+		.shop_info_box {
+			// margin-top: 30rpx;
+		}
+
+		.shop_info_row {
+			display: flex;
+			align-items: center;
+			padding-bottom: 24rpx;
+			border-bottom: 3rpx solid #f6f5f5;
+		}
+
+		.shop_info_left {
+			display: flex;
+			align-items: center;
+			flex: 1;
+		}
+
+		.shop_photo {
+			width: 96rpx;
+			height: 96rpx;
+			border-radius: 12rpx;
+			margin-right: 20rpx;
+		}
+
+		.shop_name {
+			font-size: 32rpx;
+			color: #333333;
+			font-weight: 600;
+		}
+
+		.shop_distance {
+			display: flex;
+			align-items: center;
+			margin-top: 10rpx;
+		}
+
+		.distance_icon {
+			width: 24rpx;
+			height: 24rpx;
+			margin-right: 4rpx;
+		}
+
+		.distance_text {
+			font-size: 26rpx;
+			color: #666666;
+		}
+
+		.shop_info_actions {
+			display: flex;
+			align-items: center;
+			gap: 30rpx;
+		}
+
+		.shop_action_item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+		}
+
+		.action_icon_map,
+		.action_icon_phone {
+			width: 40rpx;
+			height: 40rpx;
+		}
+
+		.action_text {
+			font-size: 20rpx;
+			color: #8b8b8b;
+			margin-top: 2rpx;
+		}
+
+		.shop_details {
+			margin-top: 24rpx;
+		}
+
+		.shop_time {
+			display: block;
+			font-size: 28rpx;
+			color: #333333;
+			font-weight: 500;
+			padding-bottom: 10rpx;
+			margin-bottom: 20rpx;
+			border-bottom: 1rpx solid #f6f5f5;
+		}
+
+		.shop_phone {
+			display: block;
+			font-size: 28rpx;
+			color: #666666;
+			margin-bottom: 10rpx;
+		}
+
+		.shop_address {
+			display: block;
+			font-size: 28rpx;
+			color: #666666;
+		}
+	}
+
+	/* 预约信息卡片 */
+	.booking-card {
+		margin: 0rpx 30rpx 20rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		padding: 24rpx 30rpx 20rpx 20rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
+
+		.card_title {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			margin-bottom: 40rpx;
+			line-height: 34rpx;
+		}
+	}
+
+	.card-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 24rpx;
+	}
+
+	.card-title {
+		font-size: 32rpx;
+		color: #3d3d3d;
+		font-weight: 500;
+	}
+
+	.update-time {
+		font-size: 28rpx;
+		color: #333333;
+		padding-right: 4rpx;
+	}
+
+	.update-change {
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+	.service-item {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-start;
+		align-items: center;
+		margin-bottom: 32rpx;
+	}
+
+	.service-image {
+		width: 160rpx;
+		height: 160rpx;
+		border-radius: 16rpx;
+		margin-right: 24rpx;
+		background-color: #e2e2e2;
+	}
+
+	.service-info {
+		flex: 1;
+		height: 160rpx;
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: space-between;
+		align-items: flex-start;
+		margin-right: 24rpx;
+	}
+
+	.service-name {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #333333;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+
+		.service-name-num {
+			font-weight: 500;
+			font-size: 26rpx;
+			color: #999999;
+			line-height: 34rpx;
+		}
+	}
+
+	.service-price {
+		font-family: DINPro, DINPro;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #bbbbbb;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 7rpx;
+	}
+
+	.service-price2 {
+		font-family: DINPro, DINPro;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #FF4767;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.service-count {
+		font-weight: 500;
+		font-size: 26rpx;
+		color: #999999;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.service-real {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding-top: 24rpx;
+		border-top: 1rpx solid rgba(0, 0, 0, 0.05);
+	}
+
+	.real-lable {
+		font-size: 30rpx;
+		color: #333333;
+	}
+
+	.real-price {
+		font-family: DINPro, DINPro;
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #FF4767;
+
+		.icon {
+			font-size: 20rpx;
+		}
+	}
+
+	/* 订单信息卡片 */
+	.order-card {
+		margin: 20rpx 30rpx 30rpx 30rpx;
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		padding: 36rpx 20rpx 40rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
+
+		.card_title {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			padding-bottom: 10rpx;
+		}
+	}
+
+	.time_card {
+		margin: 30rpx;
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		padding: 30rpx 20rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
+
+		.card_title {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			padding-bottom: 16rpx;
+		}
+
+		.card_time {
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #999999;
+			line-height: 34rpx;
+			text-align: left;
+			font-style: normal;
+		}
+	}
+
+	.info-item {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 30rpx;
+	}
+
+	.label {
+		font-size: 28rpx;
+		color: #999999;
+	}
+
+	.value {
+		font-size: 28rpx;
+		color: #333333;
+	}
+
+	/* 底部按钮 */
+	.bottom-buttons {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 128rpx;
+		background-color: #ffffff;
+		display: flex;
+		flex-flow: row nowrap;
+		align-items: center;
+		justify-content: flex-end;
+		box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
+		padding: 0 24rpx 0 78rpx;
+		/* #ifdef H5 */
+		padding-bottom: env(safe-area-inset-bottom);
+		/* #endif */
+		z-index: 999;
+	}
+
+	.contact-button {
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.contact-text {
+		font-size: 24rpx;
+		color: #666666;
+	}
+
+	.tell-icon {
+		width: 36rpx;
+		height: 36rpx;
+		margin-right: 8rpx;
+	}
+
+	.handel-button {
+		width: 186rpx;
+		height: 72rpx;
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: center;
+		align-items: center;
+		border-radius: 36rpx;
+		margin-left: 30rpx;
+	}
+
+	.btn-border {
+		border: 2rpx solid #979797;
+		background-color: #fff;
+		box-sizing: border-box;
+		margin-left: 60rpx;
+	}
+
+	.btn-bg {
+		background-color: #FF4767;
+	}
+
+	.button-text {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #ffffff;
+	}
+
+	.btn-border .button-text {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #333333;
+	}
+
+	/* APP适配 */
+	/* #ifdef APP-PLUS */
+	.permission.transform {
+		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
+		opacity: 1;
+		visibility: visible;
+	}
+
+	.detail-page {
+		padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
+	}
+
+	/* #endif */
+	/* 平台适配 */
+	/* #ifdef H5 */
+	.detail-page {
+		padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
+	}
+
+	/* #endif */
+
+	/* #ifdef MP-WEIXIN */
+	.custom-nav {
+		padding-top: calc(var(--status-bar-height) + constant(safe-area-inset-top));
+		padding-top: calc(var(--status-bar-height) + env(safe-area-inset-top));
+	}
+
+	/* #endif */
+
+
+	.syr-card {
+		margin: 30rpx;
+		background-color: #ffffff;
+		padding: 30rpx 20rpx;
+
+		border-radius: 16rpx;
+
+		.syr-card-header {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			line-height: 45rpx;
+			text-align: left;
+			font-style: normal;
+			margin-bottom: 40rpx;
+		}
+
+		.syr-card-footer {
+			.syr-card-footer-left {
+				.syr-card-footer-left-img {
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.syr-card-footer-left-text {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+					line-height: 40rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+
+			.syr-card-footer-right {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	}
+
+	// 客户卡片样式
+	.kh-card {
+		margin: 30rpx;
+		background-color: #ffffff;
+		padding: 30rpx 20rpx;
+
+		border-radius: 16rpx;
+
+		.kh-card-header {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			line-height: 45rpx;
+			text-align: left;
+			font-style: normal;
+			margin-bottom: 40rpx;
+		}
+
+		.kh-card-footer {
+			.kh-card-footer-left {
+				.kh-card-footer-left-img {
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.kh-card-footer-left-text {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+					line-height: 40rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+
+			.kh-card-footer-right {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	}
+
+	.userinfo {
+		display: flex;
+	}
+
+	.serverinfo {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.serverinfo-l {
+		width: 120rpx;
+		height: 42rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 30rpx;
+		color: #333333;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.serverinfo-r {
+		display: flex;
+	}
+
+	.serverinfo-r-o {
+		height: 40rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #999999;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+		// margin-left: 350rpx;
+		text-decoration: line-through;
+	}
+
+	.serverinfo-r-t {
+		height: 40rpx;
+		font-family: DINPro, DINPro;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #333333;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+		margin-left: 17rpx;
+	}
+
+	.service-item1 {
+		margin-bottom: 32rpx;
+	}
+
+	.payinfo {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.payinfo-l {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 37rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.payinfo-r {
+		font-family: DINPro, DINPro;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #333333;
+		line-height: 41rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.btinfo {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.btinfo-l {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 37rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.btinfo-r {
+		font-family: DINPro, DINPro;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #333333;
+		line-height: 38rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.coupon-title {
+		width: 160rpx;
+		height: 40rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #3D3D3D;
+		line-height: 39rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.coupon-item {}
 </style>
\ No newline at end of file
diff --git a/pages/shop/userorders.vue b/pages/shop/userorders.vue
index aff94d4..f30cdd0 100644
--- a/pages/shop/userorders.vue
+++ b/pages/shop/userorders.vue
@@ -256,7 +256,7 @@
 						console.log(res);
 						if (res.state == 1 || res.code == 200) {
 							uni.showToast({
-								title: res.msg,
+								title: "开始服务",
 								icon: "none",
 							});
 							this.$refs.groupRef.manualRefresh(this.listQuery);
@@ -272,10 +272,10 @@
 			// 去订单详情
 			goOrderDetail(item) {
 				let path = "";
-				path = `/pages/shop/userorder-detail?order_id=${item.id}&order_kind=${item.order_kind}`;
+				path = `/pages/shop/userorder-detail?order_id=${item.id}&order_kind=${item.order_kind}&haveButton=${this.haveButton}`;
 				if (item.table_source == "order_self") {
 					//如果是自营订单
-					path = `/pages/shop/userorder-detail?order_id=${item.id}&serviceType=2&order_kind=${item.order_kind}`;
+					path = `/pages/shop/userorder-detail?order_id=${item.id}&serviceType=2&order_kind=${item.order_kind}&haveButton=${this.haveButton}`;
 				}
 				uni.navigateTo({
 					url: path,
@@ -342,7 +342,7 @@
 	}
 	
 	.tab-item.active {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 	
@@ -354,7 +354,7 @@
 		left: 50%;
 		bottom: 0;
 		transform: translateX(-50%);
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 	
@@ -383,7 +383,7 @@
 	}
 	
 	.tab-item2.active {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 		background: #FEE5E7;
 	}
@@ -450,7 +450,7 @@
 
 	.rating-score {
 		font-size: 16rpx;
-		color: #E8101E;
+		color: #FF4767;
 		margin-left: 68rpx;
 	}
 
@@ -504,7 +504,7 @@
 
 	.load-date {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.load-text {
diff --git a/pages/shop/verify/manual-verify.vue b/pages/shop/verify/manual-verify.vue
new file mode 100644
index 0000000..9a5be51
--- /dev/null
+++ b/pages/shop/verify/manual-verify.vue
@@ -0,0 +1,167 @@
+<template>
+  <view class="manual-verify">
+    <CustomNavbar title="" backgroundColor="#FFFFFF"></CustomNavbar>
+
+    <view class="content">
+      <view class="tip">请输入6位核销码</view>
+
+      <view class="code-inputs" @tap="focusInput">
+        <view class="input-box" :class="{ filled: code[i - 1] }" v-for="i in 6" :key="i">
+          {{ code[i - 1] || '' }}
+        </view>
+      </view>
+
+      <input class="hidden-input" type="text" maxlength="6" :value="code" :focus="inputFocus"
+        :selection-start="cursorPos" :selection-end="cursorPos" @input="onInput" @blur="onBlur" confirm-type="done" />
+
+      <button class="confirm-btn" :class="{ active: code.length === 6 }" :disabled="code.length < 6" @tap="submitCode">
+        确认
+      </button>
+    </view>
+  </view>
+</template>
+
+<script>
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+import request from "@/utils/request";
+
+export default {
+  components: { CustomNavbar },
+  data() {
+    return {
+      code: '',
+      inputFocus: true,
+      isBlurred: false
+    };
+  },
+  computed: {
+    // 光标永远定位在最后一位
+    cursorPos() {
+      return this.code.length;
+    }
+  },
+  onReady() {
+    this.$nextTick(() => {
+      this.inputFocus = true;
+    });
+  },
+  methods: {
+    focusInput() {
+      // 核心修复：无论如何，重新聚焦时强制光标在最后
+      this.inputFocus = false;
+      this.$nextTick(() => {
+        this.inputFocus = true;
+        this.isBlurred = false;
+      });
+    },
+    onBlur() {
+      this.isBlurred = true;
+    },
+    onInput(e) {
+      let value = e.detail.value;
+      value = value.replace(/\D/g, '');
+      if (value.length > 6) value = value.slice(0, 6);
+      this.code = value;
+    },
+    submitCode() {
+      if (this.code.length !== 6) {
+        uni.showToast({ title: '请输入6位核销码', icon: 'none' });
+        this.focusInput();
+        return;
+      }
+
+      uni.showLoading({ title: '查询订单中...', mask: true });
+
+      request.post('/sj/poster/getOrderByCode', {
+        server_code: this.code
+      }).then(res => {
+        uni.hideLoading();
+        if (res.code === 200 && res.data) {
+          res.data.server_code = this.code;
+          const orderDataStr = encodeURIComponent(JSON.stringify(res.data));
+          uni.navigateTo({
+            url: `/pages/shop/verify/verify-order-detail?data=${orderDataStr}`
+          });
+        } else {
+          uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });
+        }
+      }).catch(() => {
+        uni.hideLoading();
+        uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.manual-verify {
+  padding-top: 150rpx;
+  background-color: #fff;
+  min-height: 100vh;
+
+  .tip {
+    font-weight: 500;
+    font-size: 46rpx;
+    color: #333333;
+    line-height: 65rpx;
+    text-align: left;
+    margin-bottom: 80rpx;
+    margin-left: 48rpx;
+  }
+
+  .code-inputs {
+    display: flex;
+    justify-content: center;
+    gap: 24rpx;
+    margin-bottom: 80rpx;
+    padding: 0 30rpx;
+
+    .input-box {
+      width: 88rpx;
+      height: 88rpx;
+      border-radius: 12rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 48rpx;
+      font-weight: 500;
+      color: #333;
+      background-color: #F3F3F3;
+    }
+  }
+
+  .confirm-btn {
+    margin: 0 49rpx;
+    background: #ff476685;
+    color: #fff;
+    border-radius: 88rpx;
+    height: 96rpx;
+    line-height: 96rpx;
+    font-size: 36rpx;
+    font-weight: 500;
+    box-shadow: 0 8rpx 20rpx rgba(255, 71, 103, 0.2);
+    transition: all 0.2s;
+
+    &.active {
+      background: #FF4767;
+    }
+
+    &[disabled] {
+      opacity: 1;
+      background: #ff476685;
+      color: #fff;
+    }
+  }
+
+  .hidden-input {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 2px;
+    height: 2px;
+    opacity: 0;
+    background: transparent;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/shop/verify/verify-fail.vue b/pages/shop/verify/verify-fail.vue
new file mode 100644
index 0000000..7a9f822
--- /dev/null
+++ b/pages/shop/verify/verify-fail.vue
@@ -0,0 +1,105 @@
+<template>
+  <view class="verify-fail-page">
+    <!-- 自定义导航栏 -->
+    <custom-navbar title="" :showBack="true" backgroundColor="#FFFFFF" borderBottom="none"></custom-navbar>
+
+    <view class="fail-content">
+      <!-- 失败图标 -->
+      <image class="fail-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/3d7aec4c-beae-4d82-83ca-1244e9af4af7.png" mode="aspectFit"></image>
+      
+      <!-- 失败文案 -->
+      <view class="fail-title">核销未成功</view>
+      <view class="fail-message">未找到订单信息，请核对二维码是否正确！</view>
+
+      <!-- 重新扫码按钮 -->
+      <view class="rescan-btn" @tap="rescan">
+        重新扫码验券
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+
+export default {
+  components: { CustomNavbar },
+  data() {
+    return {};
+  },
+  methods: {
+    rescan() {
+      // 返回到扫码页面（verify-order）
+      uni.navigateBack({
+        delta: 1, // 退回上一页，即扫码页
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+page {
+  background-color: #fff;
+}
+.verify-fail-page {
+  min-height: 100vh;
+  background-color: #fff;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.fail-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+//   padding: 0 60rpx;
+  margin-top: -250rpx;
+}
+
+.fail-icon {
+  width: 300rpx;
+  height: 257rpx;
+  margin-bottom: -10rpx;
+}
+
+.fail-title {
+  font-weight: 500;
+font-size: 36rpx;
+color: #333333;
+line-height: 50rpx;
+  margin-bottom: 9rpx;
+}
+
+.fail-message {
+  font-weight: 400;
+    font-size: 26rpx;
+    color: #999999;
+    line-height: 37rpx;
+  text-align: center;
+  margin-bottom: 60rpx;
+}
+
+.rescan-btn {
+  width: 329rpx;
+height: 98rpx;
+  border-radius: 49rpx;
+    border: 1rpx solid #FF4767;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #FF4767;
+  transition: all 0.2s;
+  
+  &:active {
+    transform: scale(0.98);
+    background: #e63e5b;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/shop/verify/verify-order-detail.vue b/pages/shop/verify/verify-order-detail.vue
new file mode 100644
index 0000000..a25db76
--- /dev/null
+++ b/pages/shop/verify/verify-order-detail.vue
@@ -0,0 +1,573 @@
+<template>
+  <view class="page">
+    <custom-navbar title="订单核销详情" :showBack="true" backgroundColor="#F5F5F5" :show-headle="true" borderBottom="none">
+    </custom-navbar>
+
+    <scroll-view class="scroll-content" scroll-y="true">
+      <view class="page-header">
+        <image class="header-icon"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/be13b4f4-c0db-4f39-b9fc-0e69c13b72ee.png"
+          mode="aspectFit"></image>
+        <view class="header-text-box">
+          <view class="header-title">{{ orderTypeText }}</view>
+          <view class="header-sub">请确认核销订单信息～</view>
+        </view>
+      </view>
+
+      <view class="card">
+        <view class="card-title">顾客信息</view>
+        <view class="customer-info">
+          <text>{{ orderData.customerName || '--' }}</text>
+          <text class="ml-10">{{ orderData.customerPhone || '--' }}</text>
+        </view>
+      </view>
+
+      <view class="card">
+        <view class="card-title">预约信息</view>
+        <view class="goods-block">
+          <image class="goods-img" :src="orderData.goodsImg" mode="aspectFill"></image>
+          <view class="goods-detail">
+            <view class="goods-top">
+              <text class="goods-name">{{ orderData.goodsName || '--' }}</text>
+              <text class="goods-quantity">x{{ orderData.goodsNum || 1 }}</text>
+            </view>
+            <view class="goods-price"><text class="money-symbol1">¥</text>{{ formatPrice(orderData.goodsPrice) }}</view>
+          </view>
+        </view>
+
+        <view class="price-row mt-10">
+          <text class="label">服务售价</text>
+          <view class="val-box">
+            <text class="old-price">¥{{ formatPrice(orderData.originalPrice) }}</text>
+            <text class="new-price">¥{{ formatPrice(orderData.actualPrice) }}</text>
+          </view>
+        </view>
+        <view class="price-row mt-15">
+          <text class="label">用户实付</text>
+          <text class="new-price">¥{{ formatPrice(orderData.payPrice) }}</text>
+        </view>
+
+        <view class="dashed-divider"></view>
+
+        <view class="settle-row">
+          <text class="settle-label">商家结算基数</text>
+          <text class="settle-val"><text class="money-symbol2">¥</text>{{ formatPrice(orderData.settlePrice) }}</text>
+        </view>
+      </view>
+
+      <view class="bottom-placeholder"></view>
+    </scroll-view>
+
+    <view class="bottom-btn-wrapper">
+      <view class="confirm-btn" @tap="isVerified ? goHomePage() : confirmVerify()"
+        :class="{ 'btn-disabled': isVerifying }">
+        <text class="btn-text">{{ isVerified ? '核销成功，返回首页' : (isVerifying ? '核销中...' : '确认核销') }}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request";
+
+export default {
+  computed: {
+    orderTypeText() {
+      const map = {
+        1: '用户订单',
+        2: '商家订单',
+        3: '工时订单',
+        4: '工位订单',
+        5: '铁军线上缴费订单',
+        6: '自营订单'
+      };
+      return map[this.orderData.orderType] || '工时订单';
+    }
+  },
+  data() {
+    return {
+      statusBarHeight: 44,
+      orderData: {
+        orderId: '',
+        orderType: '',   // 订单类型
+        serverCode: '',  // 核销码
+        customerName: '',
+        customerPhone: '',
+        goodsImg: '',
+        goodsName: '',
+        goodsNum: 1,
+        goodsPrice: 0,
+        originalPrice: 0,
+        actualPrice: 0,
+        payPrice: 0,
+        settlePrice: 0
+      },
+      isVerifying: false,
+      isVerified: false,  // 订单是否已被核销
+      userInfo: {}  // 用户信息，用于获取sjid
+    };
+  },
+  onLoad(options) {
+    const sysInfo = uni.getSystemInfoSync();
+    if (sysInfo.statusBarHeight) {
+      this.statusBarHeight = sysInfo.statusBarHeight;
+    }
+
+    if (options.data) {
+      try {
+        const parsedData = JSON.parse(decodeURIComponent(options.data));
+        this.mapOrderData(parsedData);
+        console.log(parsedData, '-==-=-=-=-=-=parsedData=-=-=-=-=parsedData')
+      } catch (e) {
+        console.error('解析订单数据失败', e);
+        uni.showToast({ title: '订单数据异常', icon: 'none' });
+      }
+    } else {
+      // uni.showToast({ title: '未获取到订单信息', icon: 'none' });
+      console.log('未获取到订单信息');
+    }
+  },
+  async onShow() {
+    // 每次页面显示时刷新订单核销状态
+    if (this.orderData.orderId) {
+      // 获取用户信息（sjid）
+      if (!this.userInfo.id) {
+        try {
+          const res = await request.post('/user/getuser', { type: 3 });
+          if (res.data) {
+            this.userInfo = res.data;
+          }
+        } catch (e) {
+          console.error('获取用户信息失败', e);
+        }
+      }
+      this.checkVerifyStatus();
+    }
+  },
+  methods: {
+    // 精准映射 /sj/poster/getOrderByCode 接口返回的 data 字段
+    mapOrderData(data) {
+      this.orderData = {
+        orderId: data.order_id || '',
+        orderType: data.order_type || '', // 映射订单类型
+        serverCode: data.server_code || '', // 映射核销码
+        customerName: data.user_name || '--',
+        customerPhone: data.user_phone || '--',
+        goodsImg: data.order_photo || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/default_goods.png',
+        goodsName: data.order_title || '--',
+        goodsNum: data.order_num || 1,
+        goodsPrice: data.cost_money || 0,
+        originalPrice: data.line_money || 0,
+        actualPrice: data.cost_money || 0,
+        payPrice: data.pay_money || 0,
+        settlePrice: data.jiesuan_jine_yiju || 0
+      };
+    },
+    formatPrice(price) {
+      if (price === null || price === undefined) return '0.00';
+      const num = parseFloat(price);
+      if (isNaN(num)) return '0.00';
+      return num.toFixed(2);
+    },
+    goBack() {
+      uni.navigateBack();
+    },
+    // 检查订单核销状态
+    checkVerifyStatus() {
+      if (!this.orderData.orderId) return;
+      // 根据订单类型选择对应的详情接口
+      const orderType = this.orderData.orderType;
+      let detailUrl = '';
+      let params = { id: this.orderData.orderId };
+
+      if (orderType == 3) {
+        // 工时订单
+        detailUrl = '/syr/workHourOrder/details';
+      } else if (orderType == 4) {
+        // 工位订单
+        detailUrl = '/sj/workSeatOrder/details';
+      } else if (orderType == 6) {
+        // 自营订单
+        detailUrl = '/sj/orderSelf/details';
+        params.sjid = this.userInfo.id || '';  // 自营订单需要sjid
+      } else {
+        // 普通订单 (orderType 1, 2, 5)
+        detailUrl = '/sj/yhorderdetail';
+        params.sjid = this.userInfo.id || '';
+      }
+
+      request.post(detailUrl, params).then(res => {
+        if (res.code === 200 && res.data) {
+          const orderState = res.data.state;
+          // 状态 1/2/3 为待核销，状态 4/5/6/7 为已核销
+          if (orderState >= 4) {
+            this.isVerified = true;
+          }
+        }
+      }).catch(err => {
+        console.error('检查核销状态失败', err);
+      });
+    },
+    // 返回首页
+    goHomePage() {
+      uni.switchTab({
+        url: '/pages/home/home'
+      });
+    },
+    getOrderDetailUrl() {
+      const orderId = this.orderData.orderId;
+      const orderType = this.orderData.orderType;
+
+      if (orderType == 3) {
+        return `/pages/shop/SellerDetail?order_id=${orderId}&identity=1`;
+      }
+      if (orderType == 4) {
+        return `/pages/shop/SellerDetail?order_id=${orderId}`;
+      }
+      if (orderType == 6) {
+        return `/pages/shop/userorder-detail?order_id=${orderId}&serviceType=2`;
+      }
+      return `/pages/shop/userorder-detail?order_id=${orderId}`;
+    },
+    confirmVerify() {
+      if (this.isVerifying) return;
+      if (!this.orderData.orderId) {
+        uni.showToast({ title: '订单ID缺失，无法核销', icon: 'none' });
+        return;
+      }
+      uni.showModal({
+        title: '确认核销',
+        content: '确定要将此订单标记为已核销吗？',
+        success: (res) => {
+          if (res.confirm) {
+            this.doVerify();
+          }
+        }
+      });
+    },
+    doVerify() {
+      this.isVerifying = true;
+      uni.showLoading({ title: '核销中...', mask: true });
+      console.log(this.orderData, '------------------parsedData')
+
+      // 调用核销接口
+      request.post('/sj/poster/useOrderServerCode', {
+        id: this.orderData.orderId,
+        order_type: this.orderData.orderType,
+        server_code: this.orderData.serverCode
+      }).then(res => {
+        uni.hideLoading();
+        if (res.code === 200) {
+          uni.showToast({ title: '核销成功', icon: 'success' });
+          this.isVerified = true;
+          this.isVerifying = false;
+          // 核销成功后跳转到订单详情
+          const url = this.getOrderDetailUrl();
+          setTimeout(() => {
+            uni.navigateTo({ url });
+          }, 1500);
+        } else {
+          uni.showToast({ title: res.msg || '核销失败，请重试', icon: 'none' });
+          this.isVerifying = false;
+        }
+      }).catch(err => {
+        uni.hideLoading();
+        console.error('核销请求异常', err);
+        uni.showToast({ title: '网络异常，核销失败', icon: 'none' });
+        this.isVerifying = false;
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background-color: #F5F5F5;
+  position: relative;
+}
+
+/* 自定义导航栏 */
+.nav-bar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  background-color: #ffffff;
+  z-index: 10;
+  box-sizing: border-box;
+}
+
+.back-btn {
+  width: 60rpx;
+  height: 100%;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.back-icon {
+  width: 18rpx;
+  height: 36rpx;
+}
+
+.nav-title {
+  font-size: 34rpx;
+  font-weight: 500;
+  color: #333333;
+}
+
+.right-placeholder {
+  width: 60rpx;
+}
+
+/* 可滚动内容区域 */
+.scroll-content {
+  padding-top: 40rpx;
+  flex: 1;
+  padding-bottom: 20rpx;
+  box-sizing: border-box;
+}
+
+/* 页面头部：订单类型标识 */
+.page-header {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 40rpx 30rpx 10rpx;
+
+  .header-icon {
+    width: 99rpx;
+    height: 95rpx;
+    margin-right: 20rpx;
+  }
+
+  .header-text-box {
+    display: flex;
+    flex-direction: column;
+
+    .header-title {
+      font-weight: 500;
+      font-size: 36rpx;
+      color: #333333;
+      line-height: 50rpx;
+      margin-bottom: 12rpx;
+    }
+
+    .header-sub {
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #999999;
+      line-height: 33rpx;
+    }
+  }
+}
+
+/* 卡片通用样式 */
+.card {
+  background-color: #ffffff;
+  border-radius: 20rpx;
+  margin: 24rpx 30rpx;
+  padding: 20rpx;
+  box-shadow: none;
+
+  .card-title {
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+    line-height: 42rpx;
+    margin-bottom: 24rpx;
+  }
+}
+
+/* 顾客信息 */
+.customer-info {
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #666666;
+  line-height: 40rpx;
+
+  .ml-10 {
+    margin-left: 6rpx;
+  }
+}
+
+/* 商品基础信息块 */
+.goods-block {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 30rpx;
+
+  .goods-img {
+    width: 120rpx;
+    height: 127rpx;
+    border-radius: 12rpx;
+    background-color: #f0f0f0;
+    margin-right: 20rpx;
+    flex-shrink: 0;
+  }
+
+  .goods-detail {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    .goods-top {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: flex-start;
+
+      .goods-name {
+        font-weight: 500;
+        font-size: 30rpx;
+        color: #333333;
+        line-height: 42rpx;
+        max-width: 380rpx;
+      }
+
+      .goods-quantity {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666666;
+        line-height: 40rpx;
+      }
+    }
+
+    .goods-price {
+      font-weight: 500;
+      font-size: 36rpx;
+      color: #333333;
+      line-height: 50rpx;
+    }
+
+    .money-symbol1 {
+      font-size: 24rpx;
+    }
+  }
+}
+
+/* 价格明细行 */
+.price-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: baseline;
+
+  &.mt-10 {
+    margin-top: 20rpx;
+  }
+
+  &.mt-15 {
+    margin-top: 30rpx;
+  }
+
+  .label {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #666666;
+    line-height: 37rpx;
+  }
+
+  .val-box {
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+
+    .old-price {
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #999999;
+      line-height: 37rpx;
+      text-decoration: line-through;
+      margin-right: 16rpx;
+    }
+  }
+
+  .new-price {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #333333;
+    line-height: 37rpx;
+  }
+}
+
+/* 虚线分割线 */
+.dashed-divider {
+  width: 100%;
+  height: 1px;
+  border-bottom: 2rpx solid #f5f5f5;
+  margin: 30rpx 0;
+}
+
+/* 商家结算基数栏 */
+.settle-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: baseline;
+
+  .settle-label {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #333333;
+    line-height: 37rpx;
+    margin-right: 12rpx;
+  }
+
+  .settle-val {
+    font-weight: 500;
+    font-size: 40rpx;
+    color: #FF4767;
+    line-height: 56rpx;
+  }
+
+  .money-symbol2 {
+    font-size: 26rpx;
+    margin-right: 5rpx;
+  }
+}
+
+.bottom-placeholder {
+  height: 160rpx;
+}
+
+/* 底部按钮容器 */
+.bottom-btn-wrapper {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: #f5f5f5;
+  padding: 20rpx 40rpx 60rpx; // 底部安全区
+}
+
+.confirm-btn {
+  background-color: #FF4767;
+  height: 98rpx;
+  border-radius: 49rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  transition: opacity 0.2s;
+}
+
+.btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #ffffff;
+}
+
+.btn-disabled {
+  opacity: 0.6;
+}
+</style>
diff --git a/pages/shop/verify/verify-order.nvue b/pages/shop/verify/verify-order.nvue
new file mode 100644
index 0000000..38c8286
--- /dev/null
+++ b/pages/shop/verify/verify-order.nvue
@@ -0,0 +1,246 @@
+<template>
+  <view class="verify-page">
+    
+    <barcode 
+      ref="barcode"
+      class="barcode-view" 
+      autostart="true" 
+      flash="false" 
+      zoom="false"
+      frameColor="#FF4767"      scanbarColor="#FF4767"
+      @marked="onScanCode">
+    </barcode>
+
+    <view class="full-mask"></view>
+
+    <view class="nav-bar" :style="{ paddingTop: statusBarHeight + 'px', height: (statusBarHeight + 44) + 'px' }">
+      <view class="back-btn" @tap="goBack">
+        <image class="back-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ea671fc8-435e-46fe-ba69-6d728328149a.png"></image>
+      </view>
+      <text class="nav-title">扫码验券</text>
+      <view class="right-placeholder"></view>
+    </view>
+
+    <view class="bottom-bar">
+      <view class="action-btn" @tap="goToManualVerify">
+        <image class="btn-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/acb1ead0-d0d7-4db1-b779-7bb1cffa6594.png"></image>
+        <text class="btn-text">输入核销码</text>
+      </view>
+      
+      <view class="action-btn" @tap="chooseFromAlbum">
+        <image class="btn-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/7d6de32b-091d-4103-8138-14ae217e5f47.png"></image>
+        <text class="btn-text">相册</text>
+      </view>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request";
+
+export default {
+  data() {
+    return {
+      statusBarHeight: 44, // 默认状态栏高度
+      isProcessing: false  // 防抖开关
+    }
+  },
+  onLoad() {
+    const sysInfo = uni.getSystemInfoSync();
+    if(sysInfo.statusBarHeight) {
+      this.statusBarHeight = sysInfo.statusBarHeight;
+    }
+  },
+  onShow() {
+    // 从失败页退回来时，确保开关打开，并重新唤醒底层的扫码引擎
+    this.isProcessing = false;
+    if (this.$refs.barcode) {
+      this.$refs.barcode.start(); // 重新开始扫描
+    }
+  },
+  methods: {
+    goBack() {
+      uni.navigateBack();
+    },
+
+    // nvue 下 barcode 的回调事件叫 @marked
+    onScanCode(e) {
+      if (this.isProcessing) return;
+      this.isProcessing = true;
+      
+      // 并且扫码获取的内容在 e.detail.message 里
+      const code = e.detail.message;
+      this.handleCodeResult(code);
+    },
+
+    // 统一处理扫码结果
+    handleCodeResult(code) {
+      if (!code) {
+        this.isProcessing = false;
+        return;
+      }
+      console.log('扫码结果：-----------', code)
+      uni.showLoading({ title: '查询订单中...' });
+      
+      request.post('/sj/poster/getOrderByCode', { encrypted: code }).then(result => {
+        console.log(result,'resultresultresultresult0.0.0.0.0.0')
+        uni.hideLoading();
+        if (result.code == 200) {
+          uni.showToast({ title: '扫码成功！', icon: 'none' });
+          const orderDataStr = encodeURIComponent(JSON.stringify(result.data));
+          uni.navigateTo({
+            url: `/pages/shop/verify/verify-order-detail?data=${orderDataStr}`
+          });
+          // 延迟重置防抖，避免重复扫码跳转
+          setTimeout(() => { this.isProcessing = false; }, 1000);
+        } else {
+          console.log('失败1')
+          // 失败直接跳 fail 页
+          this.isProcessing = false; // 必须马上重置，保证退回该页时能继续扫
+          uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });
+        }
+      }).catch((err) => {
+          console.log('失败2')
+
+        uni.hideLoading();
+        this.isProcessing = false;
+        uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });
+      });
+    },
+
+    // 从相册选择图片并识别二维码
+    chooseFromAlbum() {
+      uni.chooseImage({
+        count: 1,
+        sourceType: ['album'], // 仅限相册
+        success: (res) => {
+          const filePath = res.tempFilePaths[0];
+          uni.showLoading({ title: '识别中...' });
+
+          // #ifdef APP-PLUS
+          // 调用 App 底层引擎，静默解析本地图片，绝不弹出原生扫码界面
+          plus.barcode.scan(
+            filePath,
+            (type, result) => {
+              uni.hideLoading();
+              // 成功识别到二维码，直接将内容丢给你的处理逻辑
+              this.handleCodeResult(result);
+            },
+            (error) => {
+              uni.hideLoading();
+              uni.showToast({ title: '未识别到有效二维码', icon: 'none' });
+            }
+          );
+          // #endif
+
+          // #ifndef APP-PLUS
+          // 非 App 环境（比如小程序兜底），才走普通的 scanCode
+          uni.hideLoading();
+          uni.scanCode({
+            success: (scanRes) => {
+              this.handleCodeResult(scanRes.result);
+            }
+          });
+          // #endif
+        }
+      });
+    },
+
+    goToManualVerify() {
+      uni.navigateTo({ url: '/pages/shop/verify/manual-verify' }); 
+    }
+  }
+};
+</script>
+
+<style>
+.verify-page {
+  flex: 1;
+  background-color: #000000;
+}
+
+.barcode-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.full-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.nav-bar {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+}
+
+.back-btn {
+  width: 60rpx;
+  height: 88rpx;
+  justify-content: center;
+  align-items: flex-start;
+}
+
+.back-icon {
+  width: 18rpx;
+  height: 36rpx;
+}
+
+.nav-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #FFFFFF;
+}
+
+.right-placeholder {
+  width: 60rpx;
+}
+
+.bottom-bar {
+  position: absolute;
+  bottom: 80rpx;
+  left: 0;
+  right: 0;
+  height: 120rpx;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-around;
+}
+
+.action-btn {
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  width: 325rpx;
+  height: 105rpx;
+  background-color: rgba(0, 0, 0, 0.4);
+  border-radius: 20rpx;
+}
+
+.btn-icon {
+  width: 40rpx;
+  height: 38rpx;
+  margin-right: 16rpx;
+}
+
+.btn-text {
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #FFFFFF;
+}
+</style>
\ No newline at end of file
diff --git a/pages/shop/workSpace/addWorkSpace.vue b/pages/shop/workSpace/addWorkSpace.vue
index 41b3b07..ce7194f 100644
--- a/pages/shop/workSpace/addWorkSpace.vue
+++ b/pages/shop/workSpace/addWorkSpace.vue
@@ -707,8 +707,8 @@ font-style: normal;
 
 .btn-draft {
   background-color: #ffffff;
-  color: #E8101E;
-  border: 2rpx solid #E8101E;
+  color: #FF4767;
+  border: 2rpx solid #FF4767;
   box-sizing: border-box;
 }
 
@@ -717,7 +717,7 @@ font-style: normal;
 }
 
 .btn-submit {
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
 }
 .form-step {
@@ -867,7 +867,7 @@ font-style: normal;
 /* #endif */
 
 .redTip {
-  color: #E8101E;
+  color: #FF4767;
   font-size: 24rpx;
   margin-left: 10rpx;
 }
diff --git a/pages/shop/workSpace/components/class_select.vue b/pages/shop/workSpace/components/class_select.vue
index 0c3065b..89ebbf5 100644
--- a/pages/shop/workSpace/components/class_select.vue
+++ b/pages/shop/workSpace/components/class_select.vue
@@ -186,7 +186,7 @@ export default {
         color: #333333;
       }
       .activeText {
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -214,9 +214,9 @@ export default {
         border: 2rpx solid transparent;
       }
       .secondClassItemActive {
-        border: 1rpx solid #E8101E;
+        border: 1rpx solid #FF4767;
         background: rgba(252, 67, 124, 0.1);
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -226,7 +226,7 @@ export default {
     margin-top: 30rpx;
     font-size: 26rpx;
     .red {
-      color: #E8101E;
+      color: #FF4767;
     }
   }
   .fixBottomBtn {
@@ -243,10 +243,10 @@ export default {
     .btn {
       width: 100%;
       height: 39rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
       border-radius: 39rpx;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
     }
   }
 }
diff --git a/pages/shop/workSpace/components/orderCard.vue b/pages/shop/workSpace/components/orderCard.vue
index 659c20f..9f440b4 100644
--- a/pages/shop/workSpace/components/orderCard.vue
+++ b/pages/shop/workSpace/components/orderCard.vue
@@ -2,7 +2,9 @@
 	<view class="order-card" @click="goDetail">
 		<!-- 订单编号 -->
 		<view class="orderNumBox">
-			<view class="order-id white-space-nowrap">订单编号：{{ dataItem.number }}</view>
+			<!-- <view class="order-id white-space-nowrap">订单编号：{{ dataItem.number }}</view> -->
+			<view class="order-id white-space-nowrap"><text style="color:#999999 ;">服务时段：</text>{{ useTime }}</view>
+
 			<view class="stateText" :class="{
 				stateText2: dataItem.state > 4 && dataItem.state !== 7,  // 排除已取消
 				stateText3: dataItem.state === 7  // 已取消状态单独处理
@@ -38,14 +40,15 @@
 		</view>
 
 		<!-- 时间信息 -->
-		<view class="time-info"><text style="color:#999999 ;">服务时段：</text>{{ useTime }}</view>
+		<!-- <view class="time-info"><text style="color:#999999 ;">服务时段：</text>{{ useTime }}</view> -->
+		<view class="address"><text style="color:#999999 ;">工位地址：</text>{{ dataItem.user_sj.address }}</view>
 
 		<!-- 操作按钮 -->
 		<view class="button-group" v-if="dataItem.state > 1 && dataItem.state < 5">
 			<view class="btn cancel-btn" v-if="dataItem.state == 2 || dataItem.state == 3" @click.stop="emitCancel">取消订单
 			</view>
 			<view class="btn accept-btn" @click.stop="emitAccept" v-if="dataItem.state == 2">接单</view>
-			<view class="btn accept-btn" @click.stop="emitStart" v-if="dataItem.state == 3">开始订单</view>
+			<view class="btn accept-btn" @click.stop="emitStart" v-if="dataItem.state == 3">开始服务</view>
 			<view class="btn accept-btn" @click.stop="emitDone" v-if="dataItem.state == 4">完成订单</view>
 		</view>
 	</view>
@@ -126,7 +129,7 @@
 					"待支付",
 					"待接单",
 					"待开始",
-					"进行中",
+					"待完成",
 					"已完成",
 					"已评价",
 					"已取消",
@@ -181,7 +184,7 @@
 		.stateText {
 			font-weight: 400;
 			font-size: 26rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: left;
 			font-style: normal;
 			position: absolute;
@@ -269,7 +272,7 @@
 			font-family: DINPro, DINPro;
 			font-weight: 500;
 			font-size: 36rpx;
-			color: #E8101E;
+			color: #FF4767;
 			line-height: 34rpx;
 			text-align: left;
 			font-style: normal;
@@ -305,6 +308,16 @@
 		padding-bottom: 20rpx;
 		margin-top: 28rpx;
 	}
+	.address {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #999;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+		padding-bottom: 20rpx;
+		margin-top: 28rpx;
+	}
 
 	/* 按钮组 */
 	.button-group {
@@ -344,7 +357,7 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/workSpace/components/workSpaceCard.vue b/pages/shop/workSpace/components/workSpaceCard.vue
index 388aacb..d48c182 100644
--- a/pages/shop/workSpace/components/workSpaceCard.vue
+++ b/pages/shop/workSpace/components/workSpaceCard.vue
@@ -282,7 +282,7 @@ export default {
   top: 0;
   width: 160rpx;
   height: 100%;
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
   display: flex;
   justify-content: center;
@@ -336,17 +336,17 @@ export default {
 
 .price-symbol {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-value {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-unit {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .status-tag {
@@ -367,7 +367,7 @@ export default {
 .status-tag.state2 .status-text {
 font-weight: 400;
 font-size: 26rpx;
-color: #E8101E;
+color: #FF4767;
 line-height: 37rpx;
 text-align: left;
 font-style: normal;
diff --git a/pages/shop/workSpace/list.vue b/pages/shop/workSpace/list.vue
index c9a83ac..fc4b36f 100644
--- a/pages/shop/workSpace/list.vue
+++ b/pages/shop/workSpace/list.vue
@@ -348,7 +348,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
diff --git a/pages/shop/workSpace/saleList.vue b/pages/shop/workSpace/saleList.vue
index 64bd9f9..b17345b 100644
--- a/pages/shop/workSpace/saleList.vue
+++ b/pages/shop/workSpace/saleList.vue
@@ -229,7 +229,18 @@
 						server_code: code,
 					})
 					.then((res) => {
+						console.log('API Response:', res);
 						if (res.code == 200) {
+							uni.showToast({
+								title: res.msg,
+								icon: "none"
+							});
+							this.getServicesList();
+						} else if (res.state == 1) {
+							uni.showToast({
+								title: res.msg,
+								icon: "none"
+							});
 							this.getServicesList();
 						}
 					}).finally(() => {
@@ -309,7 +320,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
diff --git a/pages/syr/components/orderCard.vue b/pages/syr/components/orderCard.vue
index 4da2ca8..996c782 100644
--- a/pages/syr/components/orderCard.vue
+++ b/pages/syr/components/orderCard.vue
@@ -189,7 +189,7 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/syr/home.vue b/pages/syr/home.vue
index 52d3d38..dc092de 100644
--- a/pages/syr/home.vue
+++ b/pages/syr/home.vue
@@ -179,7 +179,7 @@
 					},
 				],
 				chartOpts: {
-					color: ["#E8101E"],
+					color: ["#FF4767"],
 					padding: [15, 15, 0, 15],
 					enableScroll: false,
 					legend: false,
@@ -671,7 +671,7 @@
 		height: 52rpx;
 		line-height: 52rpx;
 		border-radius: 26rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		display: flex;
 		flex-flow: row nowrap;
 		justify-content: center;
@@ -761,7 +761,7 @@
 		width: 70rpx;
 		height: 6rpx;
 		border-radius: 4rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		position: absolute;
 		bottom: -10rpx;
 		z-index: 99;
@@ -833,7 +833,7 @@
 	}
 
 	.order-state-item.active {
-		background: linear-gradient(43deg, #f52540 0%, #E8101E 100%);
+		background: linear-gradient(43deg, #f52540 0%, #FF4767 100%);
 	}
 
 	.order-state-item.active .state-name,
@@ -935,7 +935,7 @@
 
 	.action-btn.verify .action-text {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.nothings-box {
diff --git a/pages/syr/manHour/addManHour.vue b/pages/syr/manHour/addManHour.vue
index facc2b1..470bd44 100644
--- a/pages/syr/manHour/addManHour.vue
+++ b/pages/syr/manHour/addManHour.vue
@@ -711,13 +711,13 @@ font-style: normal;
 
 .btn-draft {
   background-color: #ffffff;
-  color: #E8101E;
-  border: 2rpx solid #E8101E;
+  color: #FF4767;
+  border: 2rpx solid #FF4767;
   box-sizing: border-box;
 }
 
 .btn-submit {
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
 }
 .form-step {
@@ -867,7 +867,7 @@ font-style: normal;
 /* #endif */
 
 .redTip {
-  color: #E8101E;
+  color: #FF4767;
   font-size: 24rpx;
   margin-left: 10rpx;
 }
diff --git a/pages/syr/manHour/components/class_select.vue b/pages/syr/manHour/components/class_select.vue
index bcb2bf3..3c90b56 100644
--- a/pages/syr/manHour/components/class_select.vue
+++ b/pages/syr/manHour/components/class_select.vue
@@ -184,7 +184,7 @@ export default {
         color: #333333;
       }
       .activeText {
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -212,9 +212,9 @@ export default {
         border: 2rpx solid transparent;
       }
       .secondClassItemActive {
-        border: 1rpx solid #E8101E;
+        border: 1rpx solid #FF4767;
         background: rgba(252, 67, 124, 0.1);
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -224,7 +224,7 @@ export default {
     margin-top: 30rpx;
     font-size: 26rpx;
     .red {
-      color: #E8101E;
+      color: #FF4767;
     }
   }
   .fixBottomBtn {
@@ -241,10 +241,10 @@ export default {
     .btn {
       width: 100%;
       height: 39rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
       border-radius: 39rpx;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
     }
   }
 }
diff --git a/pages/syr/manHour/components/manHourCard.vue b/pages/syr/manHour/components/manHourCard.vue
index 54ba73c..48b73d0 100644
--- a/pages/syr/manHour/components/manHourCard.vue
+++ b/pages/syr/manHour/components/manHourCard.vue
@@ -282,7 +282,7 @@ export default {
   top: 0;
   width: 160rpx;
   height: 100%;
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
   display: flex;
   justify-content: center;
@@ -336,17 +336,17 @@ export default {
 
 .price-symbol {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-value {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-unit {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .status-tag {
@@ -367,7 +367,7 @@ export default {
 .status-tag.state2 .status-text {
 font-weight: 400;
 font-size: 26rpx;
-color: #E8101E;
+color: #FF4767;
 line-height: 37rpx;
 text-align: left;
 font-style: normal;
diff --git a/pages/syr/manHour/components/orderCard.vue b/pages/syr/manHour/components/orderCard.vue
index 1eb482d..7e76749 100644
--- a/pages/syr/manHour/components/orderCard.vue
+++ b/pages/syr/manHour/components/orderCard.vue
@@ -166,7 +166,7 @@ export default {
   margin-bottom: 40rpx;
   .stateText {
     font-size: 28rpx;
-    color: #E8101E;
+    color: #FF4767;
     line-height: 39rpx;
   }
 }
@@ -213,7 +213,7 @@ export default {
       .service-price {
         font-weight: 500;
         font-size: 30rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 34rpx;
       }
     }
@@ -275,7 +275,7 @@ font-style: normal;
 
 /* 接单按钮 */
 .accept-btn {
-  border: 2rpx solid #E8101E;
-  color: #E8101E;
+  border: 2rpx solid #FF4767;
+  color: #FF4767;
 }
 </style>
diff --git a/pages/syr/manHour/list.vue b/pages/syr/manHour/list.vue
index 5bd9828..1e373a3 100644
--- a/pages/syr/manHour/list.vue
+++ b/pages/syr/manHour/list.vue
@@ -351,7 +351,7 @@ font-style: normal;
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 3rpx;
 }
 
diff --git a/pages/syr/manHour/saleList.vue b/pages/syr/manHour/saleList.vue
index 47fd849..5ecdc07 100644
--- a/pages/syr/manHour/saleList.vue
+++ b/pages/syr/manHour/saleList.vue
@@ -309,7 +309,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
diff --git a/pages/syr/manHourDetail.vue b/pages/syr/manHourDetail.vue
index 905323e..3542ca0 100644
--- a/pages/syr/manHourDetail.vue
+++ b/pages/syr/manHourDetail.vue
@@ -80,7 +80,7 @@
         </view>
         <view class="info-item" v-if="orderInfo.state != 1">
           <text class="label">支付小计</text>
-          <text class="value" style="color: #E8101E"
+          <text class="value" style="color: #FF4767"
             >{{ orderInfo.order_money }}元</text
           >
         </view>
@@ -723,13 +723,13 @@ page {
   margin-left: 60rpx;
 }
 .btn-border {
-  border: 1rpx solid #E8101E;
+  border: 1rpx solid #FF4767;
   background-color: #fff;
   box-sizing: border-box;
   margin-left: 60rpx;
 }
 .btn-bg {
-  background-color: #E8101E;
+  background-color: #FF4767;
 }
 .button-text {
   font-size: 28rpx;
@@ -739,7 +739,7 @@ page {
 .btn-border .button-text {
   font-size: 28rpx;
   font-weight: 400;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 /* 权限提示 */
diff --git a/pages/syr/migration.vue b/pages/syr/migration.vue
index 7ac9c6f..ddfc88e 100644
--- a/pages/syr/migration.vue
+++ b/pages/syr/migration.vue
@@ -236,7 +236,7 @@
 	.jump-button {
 		width: 100%;
 		height: 100rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 60rpx;
 		display: flex;
 		align-items: center;
diff --git a/pages/syr/my.vue b/pages/syr/my.vue
index e0293fb..3447801 100644
--- a/pages/syr/my.vue
+++ b/pages/syr/my.vue
@@ -314,7 +314,7 @@
 		flex-flow: row nowrap;
 		justify-content: center;
 		align-items: center;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		background-color: #FFF1F1;
 		border-radius: 22rpx;
 		box-sizing: border-box;
@@ -334,7 +334,7 @@
 
 	.verified-text {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.verified-text.no {
@@ -401,7 +401,7 @@
 		line-height: 30rpx;
 		text-align: left;
 		font-style: normal;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.function-list {
diff --git a/pages/syr/shoporder-detail.vue b/pages/syr/shoporder-detail.vue
index c8ba45a..54ab2e5 100644
--- a/pages/syr/shoporder-detail.vue
+++ b/pages/syr/shoporder-detail.vue
@@ -890,7 +890,7 @@
 	.real-price {
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 
 		.icon {
 			font-size: 20rpx;
@@ -1001,14 +1001,14 @@
 	}
 
 	.btn-border {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 60rpx;
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
@@ -1020,7 +1020,7 @@
 	.btn-border .button-text {
 		font-size: 28rpx;
 		font-weight: 400;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* APP适配 */
diff --git a/pages/syr/shoporders.vue b/pages/syr/shoporders.vue
index a3ae68c..8165090 100644
--- a/pages/syr/shoporders.vue
+++ b/pages/syr/shoporders.vue
@@ -261,18 +261,18 @@ export default {
 
 .rating-score {
   font-size: 16rpx;
-  color: #E8101E;
+  color: #FF4767;
   margin-left: 68rpx;
 }
 
 .currency {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .amount {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -314,7 +314,7 @@ export default {
 }
 .load-date {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .load-text {
diff --git a/pages/syr/userorder-detail.vue b/pages/syr/userorder-detail.vue
index 81c10fb..f670994 100644
--- a/pages/syr/userorder-detail.vue
+++ b/pages/syr/userorder-detail.vue
@@ -899,7 +899,7 @@
 	.real-price {
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 
 		.icon {
 			font-size: 20rpx;
@@ -1010,14 +1010,14 @@
 	}
 
 	.btn-border {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 60rpx;
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
@@ -1029,7 +1029,7 @@
 	.btn-border .button-text {
 		font-size: 28rpx;
 		font-weight: 400;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* APP适配 */
diff --git a/pages/syr/userorders.vue b/pages/syr/userorders.vue
index ae934c2..6dd6e49 100644
--- a/pages/syr/userorders.vue
+++ b/pages/syr/userorders.vue
@@ -326,7 +326,7 @@
 
 	.rating-score {
 		font-size: 16rpx;
-		color: #E8101E;
+		color: #FF4767;
 		margin-left: 68rpx;
 	}
 
@@ -380,7 +380,7 @@
 
 	.load-date {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.load-text {
diff --git a/pages/syr/workstation/buyList.vue b/pages/syr/workstation/buyList.vue
index af5b825..aba63ac 100644
--- a/pages/syr/workstation/buyList.vue
+++ b/pages/syr/workstation/buyList.vue
@@ -281,7 +281,7 @@ export default {
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 3rpx;
 }
 
diff --git a/pages/syr/workstation/buyWorkstation.vue b/pages/syr/workstation/buyWorkstation.vue
index bf2cc2c..9dd7620 100644
--- a/pages/syr/workstation/buyWorkstation.vue
+++ b/pages/syr/workstation/buyWorkstation.vue
@@ -633,7 +633,7 @@
 
 			.filter__left__select__item.active {
 				.filter__left__select__item__title {
-					color: #E8101E;
+					color: #FF4767;
 				}
 			}
 		}
@@ -736,7 +736,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 3rpx;
 	}
 
@@ -771,11 +771,11 @@
 	}
 
 	.icon-tab.active .icon-text {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.icon-tab.active .icon-img {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 	}
 
 	.service-list {
diff --git a/pages/syr/workstation/components/buyOrderCard.vue b/pages/syr/workstation/components/buyOrderCard.vue
index 48a8e06..635c68e 100644
--- a/pages/syr/workstation/components/buyOrderCard.vue
+++ b/pages/syr/workstation/components/buyOrderCard.vue
@@ -141,14 +141,14 @@ export default {
           justify-content: center;
           font-weight: 400;
           font-size: 26rpx;
-          color: #E8101E;
+          color: #FF4767;
           line-height: 37rpx;
           text-align: left;
           font-style: normal;
           width: 160rpx;
           height: 58rpx;
           border-radius: 32rpx;
-          border: 2rpx solid #E8101E;
+          border: 2rpx solid #FF4767;
         }
       }
     }
diff --git a/pages/syr/workstation/components/orderCard.vue b/pages/syr/workstation/components/orderCard.vue
index 6ae4f3f..d3d7a04 100644
--- a/pages/syr/workstation/components/orderCard.vue
+++ b/pages/syr/workstation/components/orderCard.vue
@@ -181,7 +181,7 @@ export default {
   margin-bottom: 40rpx;
   .stateText {
     font-size: 28rpx;
-    color: #E8101E;
+    color: #FF4767;
     line-height: 39rpx;
   }
 }
@@ -228,7 +228,7 @@ export default {
       .service-price {
         font-weight: 500;
         font-size: 30rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 34rpx;
       }
     }
@@ -289,7 +289,7 @@ font-style: normal;
 
 /* 接单按钮 */
 .accept-btn {
-  border: 2rpx solid #E8101E;
-  color: #E8101E;
+  border: 2rpx solid #FF4767;
+  color: #FF4767;
 }
 </style>
diff --git a/pages/syr/workstation/workstationDetail.vue b/pages/syr/workstation/workstationDetail.vue
index ed0b5ef..6cfaf02 100644
--- a/pages/syr/workstation/workstationDetail.vue
+++ b/pages/syr/workstation/workstationDetail.vue
@@ -234,7 +234,7 @@ export default {
         &__price {
           font-weight: 500;
           font-size: 36rpx;
-          color: #E8101E;
+          color: #FF4767;
           line-height: 50rpx;
           text-align: left;
           font-style: normal;
@@ -332,10 +332,10 @@ font-style: normal;
       width: 696rpx;
       height: 78rpx;
       border-radius: 798rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
       font-weight: 400;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
       line-height: 39rpx;
       text-align: right;
       font-style: normal;
diff --git a/pages/syr/workstation/workstationOrder.vue b/pages/syr/workstation/workstationOrder.vue
index a808314..3f05714 100644
--- a/pages/syr/workstation/workstationOrder.vue
+++ b/pages/syr/workstation/workstationOrder.vue
@@ -238,7 +238,7 @@ export default {
           margin-top: 38rpx;
           font-weight: 500;
           font-size: 28rpx;
-          color: #E8101E;
+          color: #FF4767;
           line-height: 34rpx;
           text-align: left;
           font-style: normal;
@@ -291,7 +291,7 @@ export default {
       &__price {
         font-weight: 500;
         font-size: 42rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 59rpx;
         font-style: normal;
       }
@@ -299,7 +299,7 @@ export default {
     &__right {
       width: 188rpx;
       height: 68rpx;
-      background: linear-gradient(73deg, #fe78b3 0%, #E8101E 100%);
+      background: linear-gradient(73deg, #fe78b3 0%, #FF4767 100%);
       border-radius: 798rpx;
       font-weight: 400;
       font-size: 30rpx;
diff --git a/pages/user/components/project-tabs.vue b/pages/user/components/project-tabs.vue
index cb50375..6e3f47e 100644
--- a/pages/user/components/project-tabs.vue
+++ b/pages/user/components/project-tabs.vue
@@ -157,7 +157,7 @@ export default {
             height: 18rpx;
           }
           .active {
-            color: #e8101e;
+            color: #FF4767;
           }
           .tab-active-indicator {
             position: absolute;
@@ -166,7 +166,7 @@ export default {
             transform: translateX(-50%);
             width: 32rpx;
             height: 6rpx;
-            background: linear-gradient(107deg, #f84c63 0%, #e8101e 100%);
+            background: linear-gradient(107deg, #f84c63 0%, #FF4767 100%);
             border-radius: 10rpx;
           }
         }
@@ -212,7 +212,7 @@ export default {
         }
         .active {
           background: #ffecf0;
-          color: #e8101e;
+          color: #FF4767;
           font-weight: 500;
           transform: scale(1.05);
         }
diff --git a/pages/user/components/serviceCardList.vue b/pages/user/components/serviceCardList.vue
index b0f6063..f8d43c4 100644
--- a/pages/user/components/serviceCardList.vue
+++ b/pages/user/components/serviceCardList.vue
@@ -157,7 +157,7 @@ export default {
     padding: 0 8rpx;
     height: 38rpx;
     line-height: 38rpx;
-    background: linear-gradient(124deg, #f52540 0%, #e8101e 100%);
+    background: linear-gradient(124deg, #f52540 0%, #FF4767 100%);
     border-radius: 12rpx 2rpx 12rpx 2rpx;
     font-size: 22rpx;
     color: #ffffff;
@@ -225,7 +225,7 @@ export default {
   .price {
     font-weight: 500;
     font-size: 26rpx;
-    color: #e8101e;
+    color: #FF4767;
   }
   .service_time {
     font-size: 26rpx;
@@ -264,7 +264,7 @@ export default {
   width: 144rpx;
   height: 60rpx;
   line-height: 60rpx;
-  background: linear-gradient(107deg, #f84c63 0%, #e8101e 100%);
+  background: linear-gradient(107deg, #f84c63 0%, #FF4767 100%);
   border-radius: 30rpx;
   text-align: center;
   color: #fff;
diff --git a/pages/user/employee-detail.vue b/pages/user/employee-detail.vue
index 410e326..a0bfc02 100644
--- a/pages/user/employee-detail.vue
+++ b/pages/user/employee-detail.vue
@@ -1024,7 +1024,7 @@
 				width: 448rpx;
 				height: 86rpx;
 				margin-left: 240rpx;
-				background: #E8101E;
+				background: #FF4767;
 				border-radius: 43rpx;
 				display: flex;
 				align-items: center;
diff --git a/pages/user/store-detail.vue b/pages/user/store-detail.vue
index 334df00..e7de41f 100644
--- a/pages/user/store-detail.vue
+++ b/pages/user/store-detail.vue
@@ -1313,7 +1313,7 @@
 					transition: all 0.3s ease;
 
 					&.active {
-						color: #E8101E;
+						color: #FF4767;
 					}
 				}
 			}
@@ -1442,7 +1442,7 @@
 
 						.showcase-tag {
 							font-size: 20rpx;
-							color: #E8101E;
+							color: #FF4767;
 							background: rgba(232, 16, 30, 0.1);
 							border-radius: 15rpx;
 							padding: 4rpx 12rpx;
diff --git a/pages/user/syr-detail.vue b/pages/user/syr-detail.vue
index b707045..55eaf51 100644
--- a/pages/user/syr-detail.vue
+++ b/pages/user/syr-detail.vue
@@ -648,14 +648,14 @@
 						align-items: center;
 						background: #ffffff;
 						border-radius: 8rpx;
-						border: 2rpx solid #e8101e;
+						border: 2rpx solid #FF4767;
 						padding-right: 10rpx;
 
 						&__text {
 							font-family: DINPro, DINPro;
 							font-weight: bold;
 							font-size: 20rpx;
-							color: #e8101e;
+							color: #FF4767;
 							line-height: 24rpx;
 							text-align: left;
 							font-style: normal;
@@ -672,7 +672,7 @@
 							justify-content: center;
 							font-weight: 500;
 							font-size: 20rpx;
-							color: #e8101e;
+							color: #FF4767;
 							text-align: left;
 							font-style: normal;
 						}
diff --git a/pages/wallet/alipay.vue b/pages/wallet/alipay.vue
index 900eeaf..45e3e87 100644
--- a/pages/wallet/alipay.vue
+++ b/pages/wallet/alipay.vue
@@ -417,7 +417,7 @@ button {
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 22rpx;
-  color: #e8101e;
+  color: #FF4767;
   line-height: 30rpx;
   text-align: left;
   font-style: normal;
diff --git a/pages/wallet/alipayAccount.vue b/pages/wallet/alipayAccount.vue
index 248ae34..e396139 100644
--- a/pages/wallet/alipayAccount.vue
+++ b/pages/wallet/alipayAccount.vue
@@ -377,10 +377,10 @@ export default {
     width: 666rpx;
     height: 84rpx;
     border-radius: 69rpx;
-    border: 2rpx solid #e8101e;
+    border: 2rpx solid #FF4767;
     font-weight: 500;
     font-size: 32rpx;
-    color: #e8101e;
+    color: #FF4767;
     line-height: 45rpx;
     text-align: left;
     font-style: normal;
diff --git a/pages/wallet/components/addPop.vue b/pages/wallet/components/addPop.vue
index 3488642..1070379 100644
--- a/pages/wallet/components/addPop.vue
+++ b/pages/wallet/components/addPop.vue
@@ -80,10 +80,10 @@ export default {
     width: 666rpx;
     height: 84rpx;
     border-radius: 69rpx;
-    border: 2rpx solid #e8101e;
+    border: 2rpx solid #FF4767;
     font-weight: 500;
     font-size: 32rpx;
-    color: #e8101e;
+    color: #FF4767;
     line-height: 45rpx;
     text-align: left;
     font-style: normal;
diff --git a/pages/wallet/components/cashPop.vue b/pages/wallet/components/cashPop.vue
index c471439..d560fe3 100644
--- a/pages/wallet/components/cashPop.vue
+++ b/pages/wallet/components/cashPop.vue
@@ -171,7 +171,7 @@ export default {
       font-style: normal;
     }
     .popRed {
-      color: #e8101e;
+      color: #FF4767;
     }
   }
   .pop-btn {
@@ -181,7 +181,7 @@ export default {
     justify-content: center;
     width: 672rpx;
     height: 96rpx;
-    background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+    background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
     border-radius: 48rpx;
     font-weight: 500;
     font-size: 34rpx;
diff --git a/pages/wallet/wallet.vue b/pages/wallet/wallet.vue
index 7d87de1..80d5710 100644
--- a/pages/wallet/wallet.vue
+++ b/pages/wallet/wallet.vue
@@ -315,7 +315,7 @@
 						font-family: DINPro, DINPro;
 						font-weight: 500;
 						font-size: 36rpx;
-						color: #e8101e;
+						color: #FF4767;
 						line-height: 46rpx;
 						text-align: left;
 						font-style: normal;
@@ -357,7 +357,7 @@
 				margin-top: 69rpx;
 				width: 614rpx;
 				height: 88rpx;
-				background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+				background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 				border-radius: 44rpx;
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
@@ -414,14 +414,14 @@
 
 				.tabActive {
 					font-weight: 500;
-					color: #e8101e;
+					color: #FF4767;
 				}
 
 				.walletDetailTab.tabActive::after {
 					content: "";
 					width: 56rpx;
 					height: 8rpx;
-					background: #e8101e;
+					background: #FF4767;
 					border-radius: 5rpx;
 					position: absolute;
 					left: 50%;
@@ -469,7 +469,7 @@
 				justify-content: center;
 				width: 430rpx;
 				height: 86rpx;
-				background: linear-gradient(181deg, #f52540 0%, #e8101e 100%);
+				background: linear-gradient(181deg, #f52540 0%, #FF4767 100%);
 				border-radius: 43rpx;
 				font-weight: 400;
 				font-size: 36rpx;
diff --git a/pages/wallet/withdrawCash.vue b/pages/wallet/withdrawCash.vue
index 4b699a8..67e3ea0 100644
--- a/pages/wallet/withdrawCash.vue
+++ b/pages/wallet/withdrawCash.vue
@@ -431,7 +431,7 @@ export default {
     .cash-card-text1 {
       font-weight: 400;
       font-size: 30rpx;
-      color: #e8101e;
+      color: #FF4767;
       line-height: 42rpx;
       text-align: left;
       font-style: normal;
@@ -512,7 +512,7 @@ export default {
     justify-content: center;
     width: 710rpx;
     height: 108rpx;
-    background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+    background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
     border-radius: 55rpx;
     font-weight: 400;
     font-size: 42rpx;
diff --git a/static/css/common.css b/static/css/common.css
index 997106c..15c3944 100644
--- a/static/css/common.css
+++ b/static/css/common.css
@@ -575,7 +575,7 @@ page {
   height: 64rpx;
   text-align: center;
   line-height: 64rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 32rpx;
   position: fixed;
   left: 24rpx;
@@ -607,7 +607,7 @@ page {
 }
 .fixed-btn {
   height: 80rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 40rpx;
   display: flex;
   align-items: center;
diff --git a/static/images/agree_y.png b/static/images/agree_y.png
index 811e97f..e53c94b 100644
Binary files a/static/images/agree_y.png and b/static/images/agree_y.png differ
diff --git a/static/images/home/banner.png b/static/images/home/banner.png
new file mode 100644
index 0000000..3883597
Binary files /dev/null and b/static/images/home/banner.png differ
diff --git a/static/images/home/growth-package/action-success.png b/static/images/home/growth-package/action-success.png
new file mode 100644
index 0000000..a37a75e
Binary files /dev/null and b/static/images/home/growth-package/action-success.png differ
diff --git a/static/images/home/growth-package/action.png b/static/images/home/growth-package/action.png
new file mode 100644
index 0000000..83700b1
Binary files /dev/null and b/static/images/home/growth-package/action.png differ
diff --git a/static/images/home/growth-package/deal-1.png b/static/images/home/growth-package/deal-1.png
new file mode 100644
index 0000000..b01a5a5
Binary files /dev/null and b/static/images/home/growth-package/deal-1.png differ
diff --git a/static/images/home/growth-package/deal-2.png b/static/images/home/growth-package/deal-2.png
new file mode 100644
index 0000000..23e5d6c
Binary files /dev/null and b/static/images/home/growth-package/deal-2.png differ
diff --git a/static/images/home/growth-package/deal-3.png b/static/images/home/growth-package/deal-3.png
new file mode 100644
index 0000000..695215a
Binary files /dev/null and b/static/images/home/growth-package/deal-3.png differ
diff --git a/static/images/home/growth-package/deal.png b/static/images/home/growth-package/deal.png
new file mode 100644
index 0000000..939f305
Binary files /dev/null and b/static/images/home/growth-package/deal.png differ
diff --git a/static/images/home/growth-package/intro.png b/static/images/home/growth-package/intro.png
new file mode 100644
index 0000000..31c4429
Binary files /dev/null and b/static/images/home/growth-package/intro.png differ
diff --git a/static/images/home/growth-package/plan.png b/static/images/home/growth-package/plan.png
new file mode 100644
index 0000000..47e72d8
Binary files /dev/null and b/static/images/home/growth-package/plan.png differ
diff --git a/static/images/tabbar/new_home.png b/static/images/tabbar/new_home.png
index b53545b..d7b21fa 100644
Binary files a/static/images/tabbar/new_home.png and b/static/images/tabbar/new_home.png differ
diff --git a/static/images/tabbar/new_home_gray.png b/static/images/tabbar/new_home_gray.png
index 96f2b0f..3e86ab4 100644
Binary files a/static/images/tabbar/new_home_gray.png and b/static/images/tabbar/new_home_gray.png differ
diff --git a/static/images/tabbar/new_message.png b/static/images/tabbar/new_message.png
index d78e893..4467983 100644
Binary files a/static/images/tabbar/new_message.png and b/static/images/tabbar/new_message.png differ
diff --git a/static/images/tabbar/new_message_gray.png b/static/images/tabbar/new_message_gray.png
index ad69144..2f7eaf3 100644
Binary files a/static/images/tabbar/new_message_gray.png and b/static/images/tabbar/new_message_gray.png differ
diff --git a/static/images/tabbar/new_my.png b/static/images/tabbar/new_my.png
index 797ed38..c6a2563 100644
Binary files a/static/images/tabbar/new_my.png and b/static/images/tabbar/new_my.png differ
diff --git a/static/images/tabbar/new_my_gray.png b/static/images/tabbar/new_my_gray.png
index 6db8a24..85bce0e 100644
Binary files a/static/images/tabbar/new_my_gray.png and b/static/images/tabbar/new_my_gray.png differ
diff --git a/static/images/tabbar/new_order.png b/static/images/tabbar/new_order.png
index 54d44a3..356dacf 100644
Binary files a/static/images/tabbar/new_order.png and b/static/images/tabbar/new_order.png differ
diff --git a/static/images/tabbar/new_order_gray.png b/static/images/tabbar/new_order_gray.png
index baebf74..697f86c 100644
Binary files a/static/images/tabbar/new_order_gray.png and b/static/images/tabbar/new_order_gray.png differ
diff --git a/store/index.js b/store/index.js
index 35999ac..2daceb7 100644
--- a/store/index.js
+++ b/store/index.js
@@ -6,40 +6,43 @@ Vue.use(Vuex);
 
 const store = new Vuex.Store({
 	state: {
-			messageNum: 0,//底部消息数量
-		sjServiceList:{},//商家分配手艺人时服务数据shop/staff
-		tabbarList: [], //底部设置
-		reservationTime: {}, // 预约时刻信息
-		reservationSyr: {}, // 预约手艺人人信息
-		reservationAddress: {}, // 预约地址信息
-		selectStore: {}, //选择的门店信息
-		wxShareType: 0, // 正式版:0，测试版:1，体验版:2
-		//公共的变量，这里的变量不能随便修改，只能通过触发mutations的方法才能改变
+		messageNum: 0,                 // 底部消息数量
+		// ========== 新增：全局当前选中的 tab 索引 ==========
+		currentTabIndex: 0,            // 用于自定义 tabbar 高亮
+		// ============================================
+		sjServiceList: {},             // 商家分配手艺人时服务数据shop/staff
+		tabbarList: [],                // 底部设置
+		reservationTime: {},           // 预约时刻信息
+		reservationSyr: {},            // 预约手艺人人信息
+		reservationAddress: {},        // 预约地址信息
+		selectStore: {},               // 选择的门店信息
+		wxShareType: 0,                // 正式版:0，测试版:1，体验版:2
 		searchCity: {
 			center: "117.330043,38.372266",
 			name: "黄骅",
 		},
-		systemInfo: uni.getSystemInfoSync(), //设备信息
-		//是否有定位权限
+		systemInfo: uni.getSystemInfoSync(),
 		isLocation: false,
-		//路由
 		baseUrl: "",
-		//手机和app信息
 		version: {
 			VersionCode: "",
 			DeviceBrand: "",
 			DeviceType: "",
 		},
-		//商家信息
 		sjInfo: {},
-		workSpaceSJClassList: [], //商家工位分类列表
-		workHourSJClassList: [], //商家工时分类列表
+		workSpaceSJClassList: [],
+		workHourSJClassList: [],
 	},
 	mutations: {
-		//写入底部消息数量
+		// 写入底部消息数量
 		setMessageNum(state, newval) {
 			state.messageNum = newval;
 		},
+		// ========== 新增：设置全局当前选中 tab 索引 ==========
+		SET_CURRENT_TAB_INDEX(state, index) {
+			state.currentTabIndex = index;
+		},
+		// ==============================================
 		clearServiceState(state) {
 			state.reservationTime = {};
 			state.reservationSyr = {};
diff --git a/utils/albumUploadImage.js b/utils/albumUploadImage.js
index 2f17212..fda5fca 100644
--- a/utils/albumUploadImage.js
+++ b/utils/albumUploadImage.js
@@ -67,6 +67,7 @@ const handleUpload = async (userId, type, sourceType = ['album', 'camera'], uplo
 			// ========== 【核心新增：图片比例校验 结束】 ==========
 		} else if (uploadType == 'video') {
 			const res = await uni.chooseVideo({
+				maxDuration:60,
 				count: 1,
 				sourceType: ['album', 'camera'],
 				compressed: false
@@ -77,6 +78,22 @@ const handleUpload = async (userId, type, sourceType = ['album', 'camera'], uplo
 			// #ifdef APP-PLUS || MP-WEIXIN
 			file = res;
 			// #endif
+			console.log(res,'resresres');
+			 const duration = res.duration;
+			      if (duration < 3) {
+			        uni.showToast({
+			          title: "视频时长不能少于3秒",
+			          icon: "none",
+			        });
+			        return null;
+			      }
+			      if (duration > 61) {
+			        uni.showToast({
+			          title: "视频时长不能超过1分钟",
+			          icon: "none",
+			        });
+			        return null;
+			      }
 		}
 
 
@@ -87,10 +104,10 @@ const handleUpload = async (userId, type, sourceType = ['album', 'camera'], uplo
 		console.error('上传出错:', error)
 
 		// 如果是用户取消操作，不抛出错误，返回 null
-		if (error.errMsg && error.errMsg.includes('cancel')) {
-			console.log('用户取消了操作')
-			return null
-		}
+		// if (error.errMsg && error.errMsg.includes('cancel')) {
+		// 	console.log('用户取消了操作')
+		// 	return null
+		// }
 
 		throw error
 	} finally {
@@ -149,23 +166,15 @@ const uploadFile = async (file, userId, type, uploadType) => {
 	console.log('file=======', file)
 	console.log('userId=======', userId)
 	// 检查文件大小
-	if (uploadType == 'image') {
-		if (file.size > 5 * 1024 * 1024) {
-			uni.showToast({
-				title: `文件大小不能超过5MB`,
-				icon: 'none'
-			})
-			return Promise.reject(new Error('文件大小超出限制'))
-		}
-	} else if (uploadType == 'video') {
-		if (file.size > 100 * 1024 * 1024) {
-			uni.showToast({
-				title: `文件大小不能超过100MB`,
-				icon: 'none'
-			})
-			return Promise.reject(new Error('文件大小超出限制'))
-		}
-	}
+	  if (uploadType == "image") {
+	    if (file.size > 5 * 1024 * 1024) {
+	      return Promise.reject({errMsg: "文件大小不能超过5MB"});
+	    }
+	  } else if (uploadType == "video") {
+	    if (file.size > 500 * 1024 * 1024) {
+	      return Promise.reject({errMsg: "文件大小不能超过500MB"});
+	    }
+	  }
 
 	let date = new Date().getTime()
 	console.log('file', file)
@@ -217,7 +226,7 @@ const getOssConfig = async (type) => {
 
 // 上传到OSS
 const uploadToOss = (file, ossConfig, name, uploadType) => {
-	console.log(ossConfig)
+	
 	return new Promise((resolve, reject) => {
 		// #ifdef H5
 		const formData = new FormData()
@@ -274,6 +283,10 @@ const uploadToOss = (file, ossConfig, name, uploadType) => {
 			path = file.tempFilePath
 			// #endif
 		}
+		
+		uni.showLoading({
+			title: '上传中'
+		})
 
 		uni.uploadFile({
 			url: ossConfig.host,
@@ -288,9 +301,12 @@ const uploadToOss = (file, ossConfig, name, uploadType) => {
 			},
 			success(res) {
 				resolve(`${ossConfig.host}/${ossConfig.dir}${name}`)
+				uni.hideLoading(); 
 			},
 			complete(err) {
 				console.log('err', err)
+				uni.hideLoading();
+				 
 			}
 		});
 		// #endif
diff --git a/utils/appBackBase.js b/utils/appBackBase.js
new file mode 100644
index 0000000..8146010
--- /dev/null
+++ b/utils/appBackBase.js
@@ -0,0 +1 @@
+export const APP_BACK_BASE_URL = "http://test.mrrwlkj.top";
diff --git a/utils/request.js b/utils/request.js
index 7fd430b..74a52a1 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -175,7 +175,16 @@ const request = async (options, isUpdate) => {
           uni.hideLoading();
         }
         // #endif
-        resolve(responseInterceptor(options, res, resolve, reject));
+        try {
+          const result = responseInterceptor(options, res, resolve, reject);
+          if (result && typeof result.then === "function") {
+            result.then((data) => resolve(data)).catch((err) => reject(err));
+          } else {
+            resolve(result);
+          }
+        } catch (err) {
+          reject(err);
+        }
       },
       fail: (err) => {
         // #ifdef H5
@@ -204,6 +213,7 @@ const request = async (options, isUpdate) => {
 // 处理 401 未授权
 async function handleUnauthorized(originalRequest, resolve, reject) {
   if (!getToken()) {
+    reject(new Error("未登录"));
     return redirectToLogin();
   }
   // 如果正在刷新 Token，将请求加入队列
@@ -229,7 +239,7 @@ async function handleUnauthorized(originalRequest, resolve, reject) {
   } catch (error) {
     removeToken();
     redirectToLogin();
-    // reject(error)
+    reject(error);
     return error;
   } finally {
     isRefreshing = false;
@@ -252,9 +262,21 @@ async function refreshToken() {
   });
 
   if (res.state == 1 || res.code == 200) {
-    uni.setStorageSync("accessToken", res.access_token);
-    uni.setStorageSync("refreshToken", res.refresh_token);
-    return res.access_token;
+    const tokenData = res.data || res;
+    if (!tokenData.access_token) {
+      throw new Error("Refresh token response missing access_token");
+    }
+    uni.setStorageSync("accessToken", tokenData.access_token);
+    if (tokenData.refresh_token) {
+      uni.setStorageSync("refreshToken", tokenData.refresh_token);
+    }
+    if (tokenData.refresh_token_expries) {
+      uni.setStorageSync(
+        "refresh_token_expries",
+        tokenData.refresh_token_expries,
+      );
+    }
+    return tokenData.access_token;
   }
 
   throw new Error("Refresh token failed");
diff --git a/utils/ui-config.js b/utils/ui-config.js
index 28c229e..a8f2f8a 100644
--- a/utils/ui-config.js
+++ b/utils/ui-config.js
@@ -694,9 +694,9 @@ function buildSheet() {
 				conectTexts: "[' ',' ',' ']",
 				baseColor: "#898989 ", //协议文案非协议部分颜色
 				//operatorColor: "#FFB5C5", //单独设置运营商协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
-				oneColor: "#E8101E", //单独设置第一个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
-				twoColor: "#E8101E", //单独设置第二个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
-				threeColor: "#E8101E", //单独设置第三个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
+				oneColor: "#FF4767", //单独设置第一个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
+				twoColor: "#FF4767", //单独设置第二个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
+				threeColor: "#FF4767", //单独设置第三个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
 			},
 			setAppPrivacyOne: {
 				title: '《用户注册协议》',
diff --git a/utils/version.js b/utils/version.js
index 2c6fff1..63bb7d7 100644
--- a/utils/version.js
+++ b/utils/version.js
@@ -1,4 +1,6 @@
 
+import { APP_BACK_BASE_URL } from './appBackBase.js'
+
 let VersionCode = '';
 let DeviceType = '';
 let platform = '';
@@ -60,30 +62,6 @@ export function setVersion() {
 }
 
 export async function getBaseUrl() {
-	let version = uni.getStorageSync('setVersion')
-	await uni.request({
-		url: 'https://api.mrrwlkj.top/api/openPuc/getSjApiUrl', // 接口地址
-		method: 'GET', // 请求方法（默认 GET）
-		header: {
-			'Content-Type': 'application/json', // 请求头
-			'VersionCode': version.VersionCode,
-			'DeviceBrand': version.DeviceBrand,
-			'DeviceType': version.DeviceType
-		},
-		success: (res) => {
-			if (res.data.code == 200) {
-				uni.setStorageSync('baseUrl', res.data.data.url)
-				 // store.commit('setBaseUrl', res.data.data.url)
-			}
-			 return res.data.data.url;
-			console.log('请求成功', res.data);
-		},
-		fail: (err) => {
-			console.log('请求失败', err);
-			return 'http://60.247.146.5:93';
-		},
-		complete: () => {
-			console.log('请求完成（无论成功失败都会执行）');
-		}
-	});
-}
\ No newline at end of file
+	uni.setStorageSync('baseUrl', APP_BACK_BASE_URL)
+	return APP_BACK_BASE_URL
+}