From e79c8eda8a0bb32c8366327e7401ce240d833fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Mon, 1 Jun 2026 13:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E6=B5=81=E7=A8=8B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artisan/profile.vue              | 1162 ++++++++++-----------
 pages/ruzhu/ruzhu.vue                  | 1279 ++++++++++++------------
 pages/ruzhu/sj-info.vue                |  191 +++-
 pages/shop/qualification_sj_change.vue |  621 ++++++++----
 4 files changed, 1836 insertions(+), 1417 deletions(-)

diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index 629d01d..7c9d35d 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -191,645 +191,645 @@
 </template>
 
 <script>
-import {
-	handleImgSizeUni
-} from '@/utils/service.js'
-import request from "../../utils/request";
+	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;
+	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()
+			},
 
-			// 设置分享状态
-			this.sharing = true;
+			// 分享到微信
+			handleShareWechat() {
+				console.log('分享到微信')
 
-			try {
-				// 显示加载提示
-				uni.showLoading({
-					title: '正在准备分享...',
-					mask: true
+				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.showToast({
-						title: '无法获取用户信息',
-						icon: 'none'
+					uni.showModal({
+						title: '提示',
+						content: '无法获取用户信息，请联系客服或稍后重试',
+						showCancel: false,
+						confirmText: '确定'
 					})
 					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'
+				// 根据身份跳转到不同的页面
+				if (this.identity == '2') {
+					// 商家跳转到店铺主页
+					uni.navigateTo({
+						url: '/pages/user/store-detail?id=' + this.currentUserId
 					})
-				},
-				fail: (err) => {
-					console.log("分享失败:", JSON.stringify(err))
-					// 尝试使用备用图片
-					if (imageUrl !== backupImageUrl) {
-						console.log("尝试使用备用图片分享...")
-						this.executeAppShare(backupImageUrl)
+				} 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
+
+						// 存储到本地，避免重复调用
+						uni.setStorageSync('userInfo', result.data)
+						console.log('从接口获取用户信息成功:', this.userInfo)
 					} else {
-						uni.showToast({
-							title: '分享失败',
-							icon: 'none'
-						})
+						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)
+				}
+			},
+
+			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'
 					}
 				}
-			}
 
-			// 检查是否支持分享API
-			if (uni.share) {
-				uni.share(shareConfig)
-			} else {
-				uni.showToast({
-					title: '当前环境不支持分享',
-					icon: 'none'
-				})
-			}
-		},
+				console.log('当前身份:', this.identity)
+			},
 
-		// 获取分享路径
-		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
-
-					// 存储到本地，避免重复调用
-					uni.setStorageSync('userInfo', result.data)
-					console.log('从接口获取用户信息成功:', this.userInfo)
+			navigateToTimeSetting() {
+				if (this.identity == '2') {
+					// 商家跳转到营业时间页面
+					uni.navigateTo({
+						url: '/pages/shop/business-time'
+					})
 				} else {
-					console.log('接口返回数据异常:', result)
+					// 手艺人跳转到服务时间页面
+					uni.navigateTo({
+						url: '/pages/artisan/service-time'
+					})
 				}
-			} 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)
-			}
-		},
-
-		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)
+			navigateToServiceSkill() {
+				if (this.identity == '2') {
+					// 商家跳转到商家服务技能页面
+					uni.navigateTo({
+						url: '/pages/shop/service-skills'
+					})
 				} else {
-					console.log('未获取到身份信息')
-					// 默认设为手艺人
-					this.identity = '1'
+					// 手艺人跳转到手艺人服务技能页面
+					uni.navigateTo({
+						url: '/pages/artisan/service-skills'
+					})
 				}
-			}
+			},
 
-			console.log('当前身份:', this.identity)
-		},
-
-		navigateToTimeSetting() {
-			if (this.identity == '2') {
-				// 商家跳转到营业时间页面
+			navigateToShopInfo() { // 商家：门店信息 
 				uni.navigateTo({
-					url: '/pages/shop/business-time'
+					url: '/pages/shop/sj-info-change'
 				})
-			} else {
-				// 手艺人跳转到服务时间页面
+			},
+
+			navigateToServiceArea() { // 手艺人：服务区域
 				uni.navigateTo({
-					url: '/pages/artisan/service-time'
+					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'
+				})
+			},
+
+			navigateToQualification() { // 商家手艺人：资质信息
+				if (this.userInfo.credentials_state == '1') {
+					// 商家跳转到资质信息页面
+					uni.navigateTo({
+						url: '/pages/ruzhu/ruzhu?type=1'
+					})
+				} else {
+					// 手艺人跳转到资质信息页面
+					uni.navigateTo({
+						url: '/pages/shop/qualification_sj_change'
+					})
+				}
+			},
+
+			navigateToBelongShop() { // 手艺人：所属门店
+				uni.navigateTo({
+					url: '/pages/artisan/belong_shop'
 				})
 			}
-		},
-
-		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'
-			})
-		},
-
-		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>
 
 <style>
-.profile-page {
-	min-height: 100vh;
-	background-color: #f5f5f5;
-}
+	.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));
-}
+	/* 自定义导航栏样式 */
+	.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;
-}
+	/* 导航栏左侧 */
+	.navbar-left {
+		display: flex;
+		align-items: center;
+	}
 
-.back-icon {
-	width: 16rpx;
-	height: 32rpx;
-	margin-right: 23rpx;
-}
+	.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-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;
-}
+	/* 导航栏右侧状态栏 */
+	.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-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-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;
-}
+	.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);
-}
+	.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-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-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;
-}
+	.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;
-}
+	.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;
-}
+	.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 {
+		/* margin-top: 10rpx; */
+		/* margin-left: 17rpx; */
+	}
 
-.subsection-content {
-	border-radius: 12rpx;
-	overflow: hidden;
-	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 {
+		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-item:last-child {
+		border-bottom: none;
+	}
 
-.info-left {
-	display: flex;
-	align-items: center;
-}
+	.info-left {
+		display: flex;
+		align-items: center;
+	}
 
-.item-icon {
-	width: 48rpx;
-	height: 48rpx;
-	margin-right: 24rpx;
-}
+	.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;
-}
+	.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;
-}
+	.arrow-right {
+		margin-right: 19rpx;
+		width: 11rpx;
+		height: 22rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 46efb3b..aa64e95 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -95,712 +95,719 @@
 </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';
+	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,
-			navTitle: '商家入驻', // 默认标题
-			qualificationData: null, // 新增：保存资质信息
-			storeInfoData: null, // 新增：保存门店信息
-			successData: {}, //入驻提示
-			// 新增：缓存手艺人数据
-			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;
-		}
-	},
-	async onLoad(options) {
-		this.identity = 2;
-		await this.getUserInfoSync()
-		// 确保子组件也能访问到 identity
-		this.getXieyi(1);
-	},
-
-	onShow() {
-		console.log('入驻页面 onShow - 检查地址数据');
-		// 检查商家地址数据
-		this.checkAndPassAddressToSj();
-	},
-
-	methods: {
-		topt() {
-			uni.switchTab({
-				url: '/pages/home/home'
-			})
+	export default {
+		components: {
+			StepTab,
+			QualificationInfo,
+			StoreInfo,
+			successruzhu
 		},
-		// 获取用户信息（复用不可服务时间页面的方法）
-		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);
-					}
-
+		data() {
+			return {
+				currentStep: 0, // 当前步骤索引
+				isAgree: false,
+				identity: null,
+				textData: {},
+				loading: false,
+				error: null,
+				navTitle: '商家入驻', // 默认标题
+				qualificationData: null, // 新增：保存资质信息
+				storeInfoData: null, // 新增：保存门店信息
+				successData: {}, //入驻提示
+				// 新增：缓存手艺人数据
+				artisanDataCache: {
+					personalInfo: null,
+					qualificationInfo: null
 				}
-			}).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);
+		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;
 			}
 		},
+		async onLoad(options) {
+			console.log(options, 'options---');
+			if (options.type == 1) {
+				this.currentStep = 4
+			}
+			this.identity = 2;
+			await this.getUserInfoSync()
+			// 确保子组件也能访问到 identity
+			this.getXieyi(1);
+		},
 
-		// 检查用户信息
-		checkUserInfo() {
-			console.log('检查用户信息...');
+		onShow() {
+			console.log('入驻页面 onShow - 检查地址数据');
+			// 检查商家地址数据
+			this.checkAndPassAddressToSj();
+		},
 
-			// 从多种可能的存储位置检查用户信息
-			const sources = [{
-				name: '本地存储-userInfo',
-				data: uni.getStorageSync('userInfo')
+		methods: {
+			topt() {
+				uni.switchTab({
+					url: '/pages/home/home'
+				})
 			},
-			{
-				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', {
+			// 获取用户信息（复用不可服务时间页面的方法）
+			async getUserInfoSync() {
+				await request.post('/sj/userSjAuth/details', {
 					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);
+					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);
-					reject(error);
 				});
-			});
-		},
+			},
+			// 检查并传递地址给商家组件
+			checkAndPassAddressToSj() {
+				try {
+					const sjAddress = uni.getStorageSync('sj_selected_address');
+					if (sjAddress) {
+						console.log('找到商家地址数据，准备传递:', sjAddress);
 
-		// 检查并获取用户信息
-		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'
-						});
+						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);
 				});
-				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=======');
+				// 检查是否有token（确认登录状态）
+				const token = uni.getStorageSync('token');
+				if (!token) {
+					console.warn('未检测到登录token');
 					uni.showToast({
-						title: '提交成功',
-						icon: 'none',
-						duration: 1500
-					});
-					setTimeout(() => {
-						this.currentStep = 2;
-					}, 1500);
-				} else {
-					uni.showToast({
-						title: res.msg || '提交失败',
+						title: '请先登录',
 						icon: 'none'
 					});
 				}
-			} catch (error) {
-				uni.hideLoading();
-				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);
+					});
 				});
-			}
-		},
+			},
 
-		// 构建商家数据
-		buildBusinessData(qualificationData, storeData) {
-			qualificationData = qualificationData || {};
-			storeData = storeData || {};
-			console.log(qualificationData, 'storeDatastoreDatastoreData');
-			const formData = {};
-			Object.assign(formData, storeData);
+			// 检查并获取用户信息
+			async checkAndGetUserInfo() {
+				// 先检查是否已有用户信息
+				const existingUserInfo = uni.getStorageSync('userInfo');
+				if (existingUserInfo && existingUserInfo.account) {
+					console.log('已有用户信息:', existingUserInfo);
+					return existingUserInfo;
+				}
 
-			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) {
-				formData.invite_code_other = qualificationData.invite_code;
-			}
-			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'
+				// 如果没有，则调用接口获取
+				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;
 				}
-			}
+			},
 
-			return formData;
+			// 审核提交方法
+			async submitForReview() {
+				const userInfo = await this.checkAndGetUserInfo();
+				if (!userInfo) {
+					return;
+				}
 
-		},
-
-		async goNext() {
-			if (this.currentStep === 0 && !this.isAgree) {
-				uni.showToast({
-					title: '请阅读并同意以上协议',
-					icon: 'none'
+				uni.showLoading({
+					title: '提交中...'
 				});
-				return;
-			}
 
-			if (this.currentStep === 1) {
-				if (this.$refs.qualificationInfo) {
-					const isValid = await this.$refs.qualificationInfo.saveFormData();
-					if (!isValid) {
+				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) {
+					formData.invite_code_other = qualificationData.invite_code;
+				}
+				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) {
+					if (!this.$refs.storeInfo.saveFormData()) {
 						return;
 					}
-					this.qualificationData = this.$refs.qualificationInfo.getFormData();
+					this.storeInfoData = this.$refs.storeInfo.getFormData();
 				}
-				await this.submitForReview();
-				return;
-			}
 
-			if (this.currentStep < 3) {
-				this.currentStep++;
-				setTimeout(() => {
-					this.scrollToTop();
-				}, 100);
-			}
-		},
-
-		async submitApplication() {
-			if (this.$refs.storeInfo) {
-				if (!this.$refs.storeInfo.saveFormData()) {
-					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 === '长久有效' ?
+				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
-				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 || {}) : {};
+					}
+					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'
-					});
-					setTimeout(() => {
-						this.currentStep = 4;
-					}, 1500);
-				} else {
-					uni.showToast({
-						title: res.msg || '提交失败了',
+						title: '提交失败，请重试',
 						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
+			goPrev() {
+				if (this.currentStep > 0) {
+					this.currentStep--;
+				}
+			},
+			scrollToTop() {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 0
 				});
-				this.textData = res.data;
-			} catch (err) {
-				console.error('获取协议失败:', err);
-				this.error = '获取协议内容失败，请重试';
-				uni.showToast({
-					title: '获取协议内容失败',
-					icon: 'none'
-				});
-			} finally {
-				this.loading = false;
-			}
-		},
+			},
+			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;
-}
+	.ruzhu-page {
+		background: #f5f5f5;
+	}
 
-.content {
-	padding: 20rpx 20rpx 50rpx 20rpx;
-	box-sizing: border-box;
-}
+	.content {
+		padding: 20rpx 20rpx 50rpx 20rpx;
+		box-sizing: border-box;
+	}
 
-.xieyi_content {
-	padding: 20rpx;
-	background: #ffffff;
-	border-radius: 20rpx;
-}
+	.xieyi_content {
+		padding: 20rpx;
+		background: #ffffff;
+		border-radius: 20rpx;
+	}
 
-.ruzhu-cont {
-	padding: 24rpx;
-	background-color: #fff;
-}
+	.ruzhu-cont {
+		padding: 24rpx;
+		background-color: #fff;
+	}
 
-.ruzhu-text {
-	font-size: 28rpx;
-	color: #3D3D3D;
-	font-weight: 400;
-}
+	.ruzhu-text {
+		font-size: 28rpx;
+		color: #3D3D3D;
+		font-weight: 400;
+	}
 
-.kong {
-	width: 100vw;
-	height: 180rpx;
-}
+	.kong {
+		width: 100vw;
+		height: 180rpx;
+	}
 
-/* 底部按钮区域样式 */
-.bottom-fixed {
-	position: fixed;
-	left: 0;
-	bottom: 0;
-	right: 0;
-	background-color: #ffffff;
-	padding: 24rpx 0;
-}
+	/* 底部按钮区域样式 */
+	.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 {
+		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;
-}
+	/* 步骤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;
-}
+	.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和步骤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;
-}
+	/* 步骤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;
-}
+	.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;
-}
+	/* 步骤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;
-}
+	.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-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;
-}
+	.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;
-}
+	.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 {
+		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-btn {
+		width: 32rpx;
+		height: 32rpx;
+		margin-right: 13rpx;
+	}
 
-.agree-tip {
-	font-size: 26rpx;
-	font-weight: 400;
-	color: #666666;
-}
+	.agree-tip {
+		font-size: 26rpx;
+		font-weight: 400;
+		color: #666666;
+	}
 
-.next-text {
-	color: #ffffff;
-	font-size: 32rpx;
-	font-weight: 500;
-}
+	.next-text {
+		color: #ffffff;
+		font-size: 32rpx;
+		font-weight: 500;
+	}
 
-.prev-text {
-	color: #333;
-	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;
-}
-.showziliaotext{
-	height: 40rpx;
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 500;
-	font-size: 32rpx;
-	color: #FFFFFF;
-	line-height: 80rpx;
-	font-style: normal;
-	margin: 0 0 0 281rpx;
-	align-items: center;
-}
-</style>
+	.submit-text {
+		color: #ffffff;
+		font-size: 32rpx;
+		font-weight: 500;
+	}
+
+	.showziliao {
+		width: 690rpx;
+		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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index b0cdc2d..b5496e2 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -55,11 +55,14 @@
         </view>
       </view>
 
-      <view class="form-item-two box-cont">
+      <view class="form-item-two box-cont" @click="getAddressInfo">
         <text class="label required">注册详细地址</text>
         <view class="picker-content">
-          <input type="text" v-model="formData.uscc_address" placeholder="请输入注册地址" placeholder-class="placeholder"
-            class="input" />
+          <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>
@@ -295,6 +298,11 @@ export default {
         uscc_name: '',
         uscc_dependency: '',
         uscc_address: '',
+        uscc_province: '',
+        uscc_city: '',
+        uscc_area: '',
+        longitude: '',
+        latitude: '',
         legal_idcard_positive: '',
         legal_idcard_negative: '',
         legal_name: '',
@@ -318,7 +326,9 @@ export default {
       isRecognizing: false,
       recognizeType: '',
       userId: null,
-      identity: 3
+      identity: 3,
+      addressListener: null,
+      sjAddressListener: null
     }
   },
 
@@ -344,6 +354,10 @@ export default {
     await this.getUserInfo();
     this.regionCitys = this.ChinaCitys[0].citys;
     this.regionAreas = this.regionCitys[0].areas;
+    this.setupAddressListener();
+  },
+  beforeDestroy() {
+    this.removeAddressListener();
   },
 
   methods: {
@@ -495,6 +509,18 @@ export default {
       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();
     },
 
@@ -543,6 +569,163 @@ export default {
       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;
diff --git a/pages/shop/qualification_sj_change.vue b/pages/shop/qualification_sj_change.vue
index 9bc58e9..de7f180 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,31 @@
           <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" />
+          <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()">
@@ -72,12 +79,17 @@
           </view>
         </view>
 
-        <view class="form-item-one box-cont">
+        <view class="form-item-one box-cont" @click="editable && getAddressInfo()">
           <view class="label-wrapper">
             <text class="label required">注册详细地址</text>
           </view>
-          <input type="text" v-model="displayData.uscc_address" placeholder="请输入注册地址" 
-                 :disabled="!editable" placeholder-class="placeholder" class="input" />
+          <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>
         </view>
       </view>
 
@@ -94,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>
@@ -125,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>
 
         <!-- 身份证有效期 -->
@@ -149,13 +169,17 @@
           <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="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="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="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>
@@ -169,23 +193,25 @@
               <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>
@@ -200,10 +226,11 @@
           <text class="title-text">其他信息</text>
         </view>
 
-        <view class="form-item-image-box box-cont" >
+        <view class="form-item-image-box box-cont">
           <text class="label required">行业资质</text>
           <view class="image-list">
-            <view class="image-item" v-for="(img, index) in displayData.qualifications_sector" :key="'industry-' + index">
+            <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>
@@ -231,7 +258,7 @@
           </view>
         </view>
       </view>
-      
+
       <!-- 底部安全间距 -->
       <view class="safe-bottom"></view>
     </view>
@@ -283,12 +310,14 @@
         </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="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">{{item.label}}</text>
+              <text class="radio-label">{{ item.label }}</text>
             </view>
           </view>
         </view>
@@ -310,16 +339,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>
@@ -331,8 +360,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>
@@ -392,13 +423,13 @@
 
     <!-- 存储权限提示 -->
     <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>
@@ -416,10 +447,10 @@ 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,
@@ -432,7 +463,7 @@ export default {
       buttonAreaHeight: 120,
       backText: '',
       hasResubmitted: false,
-      
+
       // 数据管理
       originalData: {},
       pendingData: {},
@@ -471,6 +502,8 @@ export default {
       regionCitys: [],
       regionAreas: [],
       regionValue: [0, 0, 0],
+      addressListener: null,
+      sjAddressListener: null,
     }
   },
   computed: {
@@ -481,13 +514,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();
     });
@@ -496,19 +531,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: {
     /**
      * 识别营业执照
@@ -517,7 +551,7 @@ export default {
       try {
         this.isRecognizing = true;
         this.recognizeType = 'business_license';
-        
+
         // 调用OCR接口
         const result = await recognizeBusinessLicense(imageUrl);
         console.log('营业执照识别结果:', result);
@@ -532,7 +566,7 @@ export default {
           this.isRecognizing = false;
           return;
         }
-        
+
         // 填充营业执照信息
         let recognizedFields = 0;
 
@@ -544,12 +578,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++;
@@ -570,14 +604,14 @@ export default {
             duration: 3000
           });
         }
-        
+
       } catch (error) {
         uni.showToast({
           title: error.message || '识别失败，请手动填写',
           icon: 'none',
         });
         console.error('营业执照识别失败:', error);
-        
+
       } finally {
         this.isRecognizing = false;
       }
@@ -586,16 +620,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;
     },
-    
+
     /**
      * 识别身份证正面
      */
@@ -603,18 +637,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({
@@ -625,22 +659,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();
@@ -658,7 +692,7 @@ export default {
     checkIdCardFrontRecognition(result) {
       return (result.name && result.name.trim()) || (result.id_number && result.id_number.trim());
     },
-    
+
     /**
      * 识别身份证反面
      */
@@ -666,18 +700,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({
@@ -688,15 +722,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 = '长久有效';
@@ -704,20 +738,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();
@@ -733,8 +767,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());
     },
 
     // 获取商户类型文本
@@ -751,7 +785,7 @@ export default {
           if (result.state === 1) {
             this.userId = result.data.id;
             console.log('用户ID获取成功:', this.userId);
-            
+
             this.populateFormDataFromUserInfo(result.data);
             resolve(this.userId);
           } else {
@@ -768,7 +802,7 @@ export default {
     // 从用户信息中填充表单数据
     populateFormDataFromUserInfo(userData) {
       console.log('从用户信息填充表单数据:', userData);
-      
+
       // 初始化老数据
       this.originalData = {
         uscc_type: userData.uscc_type ? String(userData.uscc_type) : null,
@@ -777,6 +811,11 @@ export default {
         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: '',
@@ -831,18 +870,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);
@@ -861,18 +900,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);
@@ -907,19 +946,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
@@ -930,9 +969,9 @@ export default {
                 this.backText = '';
                 this.hasResubmitted = false;
               }
-              
+
               this.updatePendingDataFromDetail(detail);
-              
+
               if (this.auditStatus === 2) {
                 this.originalData = { ...this.pendingData };
                 console.log('审核通过，同步originalData到pendingData');
@@ -959,10 +998,10 @@ export default {
           this.backText = '';
           this.applyId = null;
         }
-        
+
         await this.refreshUserData();
         this.updatePageStatus();
-        
+
       } catch (error) {
         console.error('加载申请详情失败:', error);
         this.backText = '';
@@ -974,7 +1013,7 @@ 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,
@@ -982,6 +1021,11 @@ export default {
         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: '',
@@ -1042,9 +1086,9 @@ export default {
         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 };
@@ -1052,7 +1096,7 @@ export default {
           } else {
             console.log('非审核通过状态，保持pendingData不变');
           }
-          
+
           console.log('刷新后的数据状态:', {
             originalData: this.originalData,
             pendingData: this.pendingData,
@@ -1076,7 +1120,7 @@ export default {
     // 从用户数据更新原始数据
     updateOriginalDataFromUser(userData) {
       console.log('从用户数据更新原始数据:', userData);
-      
+
       this.originalData = {
         uscc_type: userData.uscc_type ? String(userData.uscc_type) : null,
         uscc_photo: userData.uscc_photo || '',
@@ -1084,6 +1128,11 @@ export default {
         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: '',
@@ -1139,12 +1188,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 {
@@ -1154,7 +1203,7 @@ export default {
           };
         }
       }
-      
+
       return {
         isValid: true,
         status: detail.apply_state,
@@ -1206,7 +1255,7 @@ export default {
       }
 
       this.updateNavTitle();
-      
+
       console.log('最终页面状态:', {
         auditStatus: this.auditStatus,
         backText: this.backText,
@@ -1230,7 +1279,7 @@ export default {
     startChange() {
       this.editable = true;
       this.buttonType = 'edit';
-      this.displayData = { ...this.pendingData }; 
+      this.displayData = { ...this.pendingData };
       this.updateNavTitle();
     },
 
@@ -1246,7 +1295,7 @@ export default {
     togglePendingData() {
       this.showPendingData = !this.showPendingData;
       console.log('切换显示待审核数据:', this.showPendingData);
-      
+
       if (this.showPendingData) {
         // 显示待审核数据
         this.displayData = { ...this.pendingData };
@@ -1262,11 +1311,11 @@ export default {
     // 提交变更
     async submitChange() {
       console.log('开始提交资质信息变更...');
-      
+
       if (!this.validateForm()) {
         return;
       }
-      
+
       try {
         uni.showLoading({
           title: '提交中...'
@@ -1277,7 +1326,7 @@ export default {
           name: this.displayData.legal_name,
           idcard: this.displayData.legal_idcard_num
         });
-        
+
         if (checkRes.Code == '401') {
           uni.hideLoading();
           uni.showToast({
@@ -1286,7 +1335,7 @@ export default {
           });
           return;
         }
-        
+
         if (checkRes.ResultObject?.BizCode != '1') {
           uni.hideLoading();
           uni.showToast({
@@ -1295,7 +1344,7 @@ export default {
           });
           return;
         }
-        
+
         const submitData = {
           apply_type: this.applyType,
           uscc_type: this.displayData.uscc_type,
@@ -1304,6 +1353,9 @@ export default {
           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,
@@ -1336,17 +1388,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);
@@ -1355,21 +1407,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 || '提交失败',
@@ -1387,16 +1439,16 @@ 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() {
@@ -1426,6 +1478,18 @@ export default {
       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();
     },
 
@@ -1480,13 +1544,13 @@ export default {
         { 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: () => {
@@ -1496,14 +1560,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;
@@ -1513,7 +1577,7 @@ export default {
             isValid = false;
           }
         }
-        
+
         if (!isValid) {
           uni.showToast({
             title: rule.message,
@@ -1522,7 +1586,7 @@ export default {
           return false;
         }
       }
-      
+
       // 验证手机号格式
       if (!/^1[3-9]\d{9}$/.test(this.displayData.legal_phone)) {
         uni.showToast({
@@ -1531,7 +1595,7 @@ export default {
         });
         return false;
       }
-      
+
       // 验证身份证格式
       if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.displayData.legal_idcard_num)) {
         uni.showToast({
@@ -1540,7 +1604,7 @@ export default {
         });
         return false;
       }
-      
+
       return true;
     },
 
@@ -1568,7 +1632,7 @@ export default {
         }
       }
     },
-    
+
     // 设置身份证有效期类型
     setIdcardValidType(type) {
       if (type === 'permanent') {
@@ -1586,12 +1650,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;
     },
 
@@ -1599,7 +1663,7 @@ export default {
     formatDateForBackend(dateStr) {
       if (!dateStr) return '';
       if (dateStr === '长久有效') return '';
-      
+
       const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
       if (match) {
         const year = match[1];
@@ -1607,17 +1671,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+)日/);
@@ -1625,28 +1689,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];
@@ -1656,7 +1720,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({
@@ -1665,7 +1729,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];
@@ -1681,7 +1745,7 @@ export default {
             }
           }
         }
-        
+
         // 如果是身份证开始日期，自动计算20年后的结束日期
         if (this.currentDateField === 'idcard_start_date') {
           const endYear = year + 20;
@@ -1714,7 +1778,7 @@ export default {
           }
         }
       }
-      
+
       this.displayData[this.currentDateField] = dateStr;
       this.hideDatePicker();
     },
@@ -1723,15 +1787,15 @@ export default {
     showMerchantTypePicker() {
       this.showMerchantTypePickerFlag = true;
     },
-    
+
     hideMerchantTypePicker() {
       this.showMerchantTypePickerFlag = false;
     },
-    
+
     selectMerchantType(item) {
       this.displayData.uscc_type = item.value;
     },
-    
+
     confirmMerchantType() {
       this.hideMerchantTypePicker();
     },
@@ -1752,7 +1816,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;
@@ -1764,6 +1828,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;
@@ -1862,12 +2083,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);
@@ -1880,7 +2101,7 @@ export default {
       } catch (err) {
         uni.hideLoading();
         console.log('上传图片错误:', err);
-        
+
         if (!err.errMsg || !err.errMsg.includes('cancel')) {
           uni.showToast({
             title: '上传失败，请重试',
@@ -1897,7 +2118,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('.');
@@ -1906,15 +2127,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,
@@ -1939,7 +2160,7 @@ export default {
             fail: reject
           });
         });
-        
+
       } catch (error) {
         console.error('直接上传失败:', error);
         throw error;
@@ -2196,8 +2417,13 @@ export default {
 }
 
 @keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
 }
 
 .picker-content {
@@ -2385,7 +2611,9 @@ export default {
   margin-top: 20rpx;
 }
 
-.change-info-btn, .view-change-btn, .resubmit-btn {
+.change-info-btn,
+.view-change-btn,
+.resubmit-btn {
   background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
 }
 
@@ -2513,7 +2741,8 @@ export default {
   color: #FFFFFF;
 }
 
-.cancel-text, .confirm-text {
+.cancel-text,
+.confirm-text {
   font-size: 32rpx;
   padding: 16rpx;
 }
@@ -2643,9 +2872,9 @@ 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 {