From 0c411882d9458884545295bcc5d7d70befaa5c1f Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Fri, 17 Apr 2026 18:45:30 +0800
Subject: [PATCH 001/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/filters.vue |   2 +-
 pages/shop/buy-order.vue          | 418 ++++++++++++++++--------------
 pages/shop/buyorder-detail.vue    |  24 ++
 pages/shop/userorder-detail.vue   | 111 ++++----
 4 files changed, 309 insertions(+), 246 deletions(-)

diff --git a/pages/home/components/filters.vue b/pages/home/components/filters.vue
index 0c62060..15f5381 100644
--- a/pages/home/components/filters.vue
+++ b/pages/home/components/filters.vue
@@ -209,7 +209,7 @@
 			secondTabs() {
 				if (this.activeFirstId == 1 || this.activeFirstId == 2) {
 					return [{
-							title: `待服务(${this.numInfo.noservernum})`,
+							title: `待开始(${this.numInfo.noservernum})`,
 							id: 3
 						},
 						{
diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue
index d42af13..951610c 100644
--- a/pages/shop/buy-order.vue
+++ b/pages/shop/buy-order.vue
@@ -13,32 +13,40 @@
 			<scroll-view scroll-y class="order-scroll" @scrolltolower="loadMore" refresher-enabled
 				:refresher-triggered="isRefreshing" @refresherrefresh="onRefresh">
 				<view class="order-item" v-for="(order, index) in orderList" :key="index">
-					<!-- 订单编号和状态 -->
-					<view class="order-header">
-						<view class="order-tag">
-							<text
-								class="order-tag-text">{{order.order_kind == 1 ? '到家' : order.order_kind == 2 ? '到店' : ''}}</text>
-						</view>
+					<!-- 顶部：订单编号 + 状态 -->
+					<view class="order-top">
 						<text class="order-number">订单编号：{{order.number}}</text>
-						<text class="order-status"
-							:class="order.statusClass">{{order.state == 1 ? '待支付' : order.state == 2 ? '待接单' : order.state == 3 ? '待服务' : order.state == 4 ? '待完成' : order.state == 5 ? '已完成' : order.state == 6 ? '待评价' : order.state == 7 ? '已取消' : ''}}</text>
+						<view class="order-status-badge" :class="{
+							'order-status-badge2': order.state > 4 && order.state !== 7,
+							'order-status-badge3': order.state === 7
+						}">
+							{{ getStatusText(order.state) }}
+						</view>
 					</view>
 
 					<!-- 订单内容 -->
 					<view class="order-content" @click="goDetail(order)">
-						<image v-if="order.order_photo" :src="order.order_photo[0]" mode="aspectFill"
-							class="service-image"></image>
+						<image v-if="order.order_photo && order.order_photo.length" :src="order.order_photo[0]"
+							mode="aspectFill" class="service-image"></image>
 						<view class="service-image" v-else></view>
+
 						<view class="service-info">
-							<text class="service-name">{{order.server_title}}</text>
-							<view class="service-time" v-if="order.order_kind == 1">
-								<image src="/static/images/time_icon.png" class="time-icon"></image>
-								<text>{{order.reservation_time}}</text>
+							<view class="service-name">{{order.server_title}}</view>
+
+							<view class="service-time" v-if="getDisplayTime(order)">
+								<text class="label-text">下单时间:</text>
+								<text class="value-text">{{ getDisplayTime(order) }}</text>
 							</view>
-							<view class="service-address" v-if="order.order_kind == 1">
+
+							<view class="service-address" v-if="order.order_kind == 1 && getFullAddress(order)">
 								<image src="/static/images/position_icon.png" class="location-icon"></image>
-								<text>{{Object.assign({},order.reservation_address_arr).dependency}}{{Object.assign({},order.reservation_address_arr).address}}
-								</text>
+								<text class="address-text">{{ getFullAddress(order) }}</text>
+							</view>
+
+							<view class="price-row">
+								<text class="price-symbol">¥</text>
+								<text class="price-now">{{ getDisplayPrice(order) }}</text>
+								<text class="price-old" v-if="getOriginalPrice(order)">{{ getOriginalPrice(order) }}</text>
 							</view>
 						</view>
 					</view>
@@ -50,26 +58,31 @@
 								v-if="order.state == 5 || order.state == 6 || order.state == 7"></image>
 						</view>
 						<view class="action-right">
-							<text class="action-btn contact" @click="cancelService(order)"
-								v-if="order.state == 1">取消订单</text>
-							<text class="action-btn contact" @click="refoundService(order)"
-								v-if="order.state == 2 || order.state == 3">申请退款</text>
-							<text class="action-btn contact" @click="contactService(order.order_shopphone)"
-								v-if="order.state != 7 || order.state!=2">联系客服</text>
-							<text class="action-btn primary" v-if="order.state == 1"
-								@click="payOrder(order)">立即支付</text>
-							<text class="action-btn review" v-if="order.state == 6"
-								@click="reviewOrder(order)">评价</text>
-							<text class="action-btn again"
-								v-if="order.state == 5 || order.state == 6 || order.state == 7"
-								@click="orderAgain(order)">再来一单</text>
-							<!-- <text 
-              class="action-btn again" 
-              v-if="order.state == 5 && order.appeal == 1"
-              @click="addComplaint(order)"
-            >投诉</text> -->
-							<text class="action-btn again" v-if="order.state == 5 && order.appeal == 2"
-								@click="lookComplaint(order)">查看投诉</text>
+							<text class="action-btn gray-btn" @click="cancelService(order)" v-if="order.state == 1">
+								取消订单
+							</text>
+							<text class="action-btn gray-btn" @click="refoundService(order)"
+								v-if="order.state == 2 || order.state == 3">
+								申请退款
+							</text>
+							<!-- <text class="action-btn gray-btn" @click="contactService(order.order_shopphone)"
+								v-if="order.state != 7 && order.state != 2">
+								联系客服
+							</text> -->
+							<text class="action-btn red-btn" v-if="order.state == 1" @click="payOrder(order)">
+								立即支付
+							</text>
+							<text class="action-btn red-btn" v-if="order.state == 6" @click="reviewOrder(order)">
+								评价
+							</text>
+							<text class="action-btn gray-btn" v-if="order.state == 5 || order.state == 6 || order.state == 7"
+								@click="orderAgain(order)">
+								再来一单
+							</text>
+							<text class="action-btn gray-btn" v-if="order.state == 5 && order.appeal == 2"
+								@click="lookComplaint(order)">
+								查看投诉
+							</text>
 						</view>
 					</view>
 				</view>
@@ -86,14 +99,13 @@
 				</view>
 			</scroll-view>
 		</view>
+
 		<view class="nologin_part" v-else>
 			<image src="/static/images/no_login.png" class="nologin_icon" mode="aspectFit"></image>
 			<view class="btn-login">
 				<text class="login-text" @click="goLogin">前去登录</text>
 			</view>
 		</view>
-
-
 	</view>
 </template>
 
@@ -104,6 +116,7 @@
 	import {
 		debounce
 	} from '@/utils/debounce.js'
+
 	export default {
 		data() {
 			return {
@@ -131,7 +144,6 @@
 					id: 7,
 					title: '已取消'
 				}],
-				// ,{id: 6,title: '待评价'}
 				currentTab: 0,
 				isRefreshing: false,
 				hasMore: true,
@@ -145,7 +157,6 @@
 		},
 		onLoad() {
 			// this.loadOrders();
-
 		},
 		async onShow() {
 			this.isLogin = uni.getStorageSync('accessToken') ? true : false;
@@ -165,7 +176,6 @@
 				this.currentTab = index;
 				this.orderList = [];
 				this.formData.page = 1;
-				// TODO: 根据当前标签加载对应订单数据
 				if (this.currentTab != 0) {
 					this.formData.state = this.currentTab;
 				} else {
@@ -193,13 +203,13 @@
 				this.isRefreshing = true
 				this.formData.page = 1;
 				this.orderList = [];
+				this.hasMore = true;
 				this.loadOrders()
 			},
 
 			// 加载更多
 			loadMore() {
 				if (!this.hasMore) return
-				// TODO: 加载更多订单数据
 				this.loadOrders();
 			},
 
@@ -211,6 +221,44 @@
 				})
 			},
 
+			getStatusText(state) {
+				const map = {
+					1: '待支付',
+					2: '待接单',
+					3: '待服务',
+					4: '服务中',
+					5: '已完成',
+					6: '待评价',
+					7: '已取消'
+				}
+				return map[state] || ''
+			},
+
+			getDisplayTime(order) {
+				return order.create_time || order.createtime || order.add_time || order.reservation_time || ''
+			},
+
+			getDisplayPrice(order) {
+				const price = order.pay_money || order.order_money || 0
+				return Number(price).toFixed(2)
+			},
+
+			getOriginalPrice(order) {
+				const orderMoney = Number(order.order_money || 0)
+				const payMoney = Number(order.pay_money || 0)
+				if (orderMoney > 0 && payMoney > 0 && orderMoney !== payMoney) {
+					return orderMoney.toFixed(2)
+				}
+				return ''
+			},
+
+			getFullAddress(order) {
+				const arr = order.reservation_address_arr || {}
+				const dependency = arr.dependency || ''
+				const address = arr.address || ''
+				return `${dependency}${address}`
+			},
+
 			// 删除订单
 			deleteOrder: debounce(async function(order) {
 				uni.showModal({
@@ -218,7 +266,6 @@
 					content: '确定要删除该订单吗？',
 					success: (res) => {
 						if (res.confirm) {
-							// TODO: 删除订单
 							request.post('/sj/deleteorder', {
 								id: order.id,
 								sjid: this.sjid
@@ -229,6 +276,7 @@
 								})
 								this.formData.page = 1;
 								this.orderList = [];
+								this.hasMore = true;
 								this.loadOrders();
 							})
 						}
@@ -249,63 +297,14 @@
 					});
 				});
 			},
+
 			// 联系客服
 			async contactService(phone) {
-				// TODO: 实现联系客服功能
 				uni.navigateTo({
 					url: '/pages/contact/contact'
 				})
-				//  const systemInfo = uni.getSystemInfoSync()
-				//  if(systemInfo.platform === 'ios') {
-				//  	uni.makePhoneCall({
-				//  		phoneNumber: phone //仅为示例
-				//  	})
-				//  }else {
-				//  	let permission = '';
-				//  	if(systemInfo.platform === 'ios') {
-				//  		permission = 'phone'
-				//  	}else {
-				//  		permission = 'android.permission.CALL_PHONE'
-				//  	}
-				// this.isShowPer = true;
-				//  	const firstRequest = !plus.storage.getItem(`perm_${permission}`)
-				//  	if(firstRequest) {
-				//  		this.isShowPer = true;
-				//  	}
-				//  	// 1. 检查权限
-				//  	const { granted } = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-				//  	if (granted) {
-				//   this.isShowPer = false;
-				//  	  uni.makePhoneCall({
-				//  	  	phoneNumber: phone //仅为示例
-				//  	  })
-				//  	  return;
-				//  	}
-				//  	this.isShowPer = false;
-				//  	// 2. 显示权限说明弹窗
-				//  	const confirm = await this.showPermissionDialog(
-				//  	  '拨打电话权限申请',
-				//  	  '我们需要拨打电话权限，方便您联系商家或平台'
-				//  	);
-
-				//  	if (!confirm) return;
-
-				//  	// 3. 请求权限
-				//  	const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-				//  	console.log('result',result)
-				//  	if (result) {
-				//  	  uni.makePhoneCall({
-				//  	  	phoneNumber: phone //仅为示例
-				//  	  })
-				//  	  return;
-				//  	} else {
-				//  	  locationService.openAppSettings();
-				//  	  return;
-				//  	  // uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-				//  	}
-				//  }
-
 			},
+
 			// 取消订单
 			async cancelService(order) {
 				console.log(order)
@@ -314,7 +313,6 @@
 					content: '确定要取消该订单吗？',
 					success: (res) => {
 						if (res.confirm) {
-							// TODO: 取消订单
 							let data = {
 								orderNo: order.number,
 								amount: order.pay_money,
@@ -327,6 +325,7 @@
 								})
 								this.formData.page = 1;
 								this.orderList = [];
+								this.hasMore = true;
 								this.loadOrders();
 							}).catch(err => {
 								console.log(err)
@@ -335,6 +334,7 @@
 					}
 				})
 			},
+
 			// 申请退款
 			async refoundService(order) {
 				uni.showModal({
@@ -342,7 +342,6 @@
 					content: '确定申请退款？退款后则订单取消！',
 					success: (res) => {
 						if (res.confirm) {
-							// TODO: 申请退款
 							let data = {
 								orderNo: order.number,
 								amount: order.pay_money,
@@ -365,6 +364,7 @@
 								})
 								this.formData.page = 1;
 								this.orderList = [];
+								this.hasMore = true;
 								this.loadOrders();
 							}).catch(err => {
 								console.log(err)
@@ -376,7 +376,6 @@
 
 			// 支付订单
 			payOrder(order) {
-				// TODO: 实现支付功能
 				uni.navigateTo({
 					url: `/pages/shop/pay-order?id=${order.id}&money=${order.order_money}&title=${order.server_title}&number=${order.number}`
 				})
@@ -391,25 +390,26 @@
 
 			// 再次下单
 			orderAgain(order) {
-				// TODO: 实现再次下单功能
 				uni.navigateTo({
 					url: '/pages/shop/service-detail?id=' + order.server_id
 				})
 			},
+
 			// 投诉
 			addComplaint(order) {
 				uni.navigateTo({
 					url: '/pages/complaint/add-complaint?number=' + order.number
 				})
 			},
+
 			// 查看投诉
 			lookComplaint(order) {
 				uni.navigateTo({
 					url: '/pages/complaint/detail?number=' + order.number
 				})
 			},
+
 			goLogin() {
-				// uni.oprPresentLogin()
 				uni.navigateTo({
 					url: '/pages/blogPopup/blogPopup'
 				});
@@ -471,113 +471,155 @@
 
 	.order-item {
 		background-color: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		margin-bottom: 24rpx;
 		padding: 24rpx;
 		box-sizing: border-box;
+		position: relative;
 	}
 
-	.order-header {
-		display: flex;
-		align-items: center;
-		margin-bottom: 34rpx;
-	}
-
-	.order-tag {
-		width: 74rpx;
-		height: 38rpx;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-		border-radius: 19rpx;
-		margin-right: 8rpx;
-		background-color: rgba(232, 16, 30, 0.2);
-	}
-
-	.order-tag-text {
-		color: #E8101E;
-		font-size: 24rpx;
+	.order-top {
+		position: relative;
+		padding-right: 120rpx;
+		min-height: 40rpx;
 	}
 
 	.order-number {
-		flex: 1;
-		font-size: 24rpx;
-		color: #666666;
-	}
-
-	.order-status {
+		display: block;
 		font-size: 28rpx;
-		font-weight: 500;
-		background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5349af61-d67a-4ecf-91ce-6e4f05ad5edb.png');
+		color: #333333;
+		line-height: 40rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.order-status-badge {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #E8101E;
+		text-align: left;
+		font-style: normal;
+		position: absolute;
+		right: -24rpx;
+		top: -24rpx;
+		background-image: url("/static/images/icons/tabBj.png");
+		background-size: 100% auto;
+		background-position: center top;
 		background-repeat: no-repeat;
-		background-size: 100%;
-		height: 49rpx;
 		width: 128rpx;
-		padding-left: 30rpx;
+		height: 49rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
 	}
 
-	.status-pending {
-		color: #E8101E;
+	.order-status-badge2 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #333333;
 	}
 
-	.status-cancelled {
-		color: #E8101E;
-	}
-
-	.status-completed {
-		color: #E8101E;
+	.order-status-badge3 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #999999 !important;
 	}
 
 	.order-content {
 		display: flex;
-		margin-bottom: 24rpx;
+		align-items: flex-start;
+		margin-top: 20rpx;
 	}
 
 	.service-image {
-		width: 182rpx;
-		height: 182rpx;
-		border-radius: 16rpx;
-		margin-right: 24rpx;
-		background-color: #000000;
+		width: 162rpx;
+		height: 162rpx;
+		border-radius: 24rpx;
+		margin-right: 20rpx;
+		background-color: #F5F5F5;
+		flex-shrink: 0;
 	}
 
 	.service-info {
 		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-start;
 	}
 
 	.service-name {
-		font-size: 24rpx;
+		font-size: 30rpx;
 		color: #333333;
-		font-weight: 500;
+		line-height: 42rpx;
+		margin-bottom: 12rpx;
+		word-break: break-all;
 	}
 
-	.service-time,
-	.service-address {
+	.service-time {
 		display: flex;
 		align-items: center;
 		font-size: 24rpx;
+		line-height: 34rpx;
+		margin-bottom: 8rpx;
+	}
+
+	.label-text {
+		color: #666666;
+	}
+
+	.value-text {
 		color: #999999;
-		font-weight: 500;
-		margin-top: 8rpx;
+		margin-left: 8rpx;
+	}
+
+	.service-address {
+		display: flex;
 		align-items: flex-start;
+		margin-bottom: 10rpx;
 	}
 
-	.text-overflow-1 {
-		white-space: normal !important;
-		word-break: break-word !important;
-		overflow: visible !important;
-		text-overflow: clip !important;
-		flex: 1;
-	}
-
-	.time-icon,
 	.location-icon {
 		width: 24rpx;
 		height: 24rpx;
-		margin-right: 4rpx;
-		flex-shrink: 0;
+		margin-right: 6rpx;
 		margin-top: 4rpx;
+		flex-shrink: 0;
+	}
+
+	.address-text {
+		font-size: 24rpx;
+		color: #999999;
+		line-height: 34rpx;
+		word-break: break-all;
+	}
+
+	.price-row {
+		display: flex;
+		align-items: baseline;
+		margin-top: 6rpx;
+	}
+
+	.price-symbol {
+		font-size: 24rpx;
+		color: #FF0037;
+		line-height: 1;
+	}
+
+	.price-now {
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #FF0037;
+		line-height: 1;
+		margin-left: 2rpx;
+	}
+
+	.price-old {
+		font-size: 22rpx;
+		color: #999999;
+		text-decoration: line-through;
+		margin-left: 10rpx;
+		line-height: 1;
 	}
 
 	.order-actions {
@@ -586,6 +628,12 @@
 		align-items: center;
 		border-top: 1rpx solid #EEEEEE;
 		padding-top: 24rpx;
+		margin-top: 24rpx;
+	}
+
+	.action-left {
+		display: flex;
+		align-items: center;
 	}
 
 	.delete-icon {
@@ -596,41 +644,33 @@
 	.action-right {
 		display: flex;
 		align-items: center;
+		flex-wrap: wrap;
+		justify-content: flex-end;
 	}
 
 	.action-btn {
-		display: inline-block;
-		width: 128rpx;
-		height: 48rpx;
-		line-height: 48rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		min-width: 128rpx;
+		height: 60rpx;
+		padding: 0 28rpx;
 		margin-left: 16rpx;
-		text-align: center;
-		font-size: 28rpx;
-		border-radius: 24rpx;
+		border-radius: 30rpx;
 		font-size: 24rpx;
+		box-sizing: border-box;
 	}
 
-	.action-btn.contact {
+	.gray-btn {
 		background-color: #FFFFFF;
 		border: 1rpx solid #999999;
 		color: #333333;
 	}
 
-	.action-btn.primary {
-		background-color: #E8101E;
-		color: #FFFFFF;
-	}
-
-	.action-btn.review {
-		background-color: rgba(252, 67, 124, 0.40);
-		border: 1rpx solid #E8101E;
-		color: #FFFFFF;
-	}
-
-	.action-btn.again {
+	.red-btn {
 		background-color: #FFFFFF;
-		border: 1rpx solid #999999;
-		color: #666666;
+		border: 1rpx solid #E8101E;
+		color: #E8101E;
 	}
 
 	.nologin_part {
@@ -686,12 +726,12 @@
 		opacity: 1;
 		visibility: visible;
 	}
-
 	/* #endif */
+
 	/* 平台适配 */
 	/* #ifdef H5 */
 	/* .order-list {
-  padding-bottom: env(safe-area-inset-bottom);
-} */
+		padding-bottom: env(safe-area-inset-bottom);
+	} */
 	/* #endif */
 </style>
\ No newline at end of file
diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue
index 3e9439d..01786d2 100644
--- a/pages/shop/buyorder-detail.vue
+++ b/pages/shop/buyorder-detail.vue
@@ -88,6 +88,30 @@
         <text class="label">下单时间</text>
         <text class="value">{{orderInfo.add_time}}</text>
       </view>
+      <view class="info-item">
+        <text class="label">服务时长</text>
+        <text class="value">{{ orderInfo.server_time }}分钟</text>
+			</view>
+      <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_kind">
+					<text class="label">支付方式</text>
+					<text class="value">{{
+						orderInfo.pay_kind == 1
+						? "账户余额"
+						: orderInfo.pay_kind == 2
+						? "微信支付"
+						: orderInfo.pay_kind == 3
+						? "支付宝支付"
+						: ""
+					}}</text>
+				</view>
+        <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_time">
+					<text class="label">支付时间</text>
+					<text class="value">{{ orderInfo.pay_time }}</text>
+				</view>
+        <view class="info-item" v-if="orderInfo.state >= 3 && orderInfo.get_time">
+					<text class="label">接单时间</text>
+					<text class="value">{{ orderInfo.get_time }}</text>
+				</view>
       <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 7">
         <text class="label">开始服务时间</text>
         <text class="value">{{orderInfo.server_start_time}}</text>
diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue
index db1c3df..9af1db2 100644
--- a/pages/shop/userorder-detail.vue
+++ b/pages/shop/userorder-detail.vue
@@ -251,20 +251,20 @@
 					<text class="value">{{orderInfo.team_buy_order_number}}</text>
 				</view>
 			</view>
-			<view class="order-card" v-if="Object.keys(orderInfo.coupon_info).length>0">
+			<view class="order-card" v-if="orderInfo.coupon_info && Object.keys(orderInfo.coupon_info).length > 0">
 				<text class="card-title">优惠券信息</text>
 				<view class="coupon-item">
-					<view class="info-item">
-						<text class="label">优惠券</text>
-						<text class="value">{{orderInfo.coupon_info.title}}</text>
-					</view>
-					<view class="info-item">
-						<text class="label">券码</text>
-						<text class="value">{{orderInfo.coupon_info.code_num}}</text>
-					</view>
-					<view class="info-item">
-						<text class="label">优惠金额</text>
-						<text class="value">{{orderInfo.coupon_info.reduce_money}}元</text>
+					<view class="info-item">
+						<text class="label">优惠券</text>
+						<text class="value">{{orderInfo.coupon_info.title}}</text>
+					</view>
+					<view class="info-item">
+						<text class="label">券码</text>
+						<text class="value">{{orderInfo.coupon_info.code_num}}</text>
+					</view>
+					<view class="info-item">
+						<text class="label">优惠金额</text>
+						<text class="value">{{orderInfo.coupon_info.reduce_money}}元</text>
 					</view>
 				</view>
 
@@ -285,7 +285,7 @@
 			<view class="handel-button btn-bg" v-if="orderInfo.state == 3" @click.stop="startOrder($event, orderInfo)">
 				<text class="button-text">开始服务</text>
 			</view>
-			<view class="handel-button btn-bg" v-if="orderInfo.state != 4" @click.stop="endOrder($event, orderInfo)">
+			<view class="handel-button btn-bg" v-if="orderInfo.state == 4" @click.stop="endOrder($event, orderInfo)">
 				<text class="button-text">服务完成</text>
 			</view>
 		</view>
@@ -530,21 +530,19 @@
 				};
 			},
 			getOrderDetail() {
-				request.post(this.urls[this.serviceType].detail, {
+				return request.post(this.urls[this.serviceType].detail, {
 					id: this.id,
 					sjid: this.userInfo.id
 				}).then(res => {
-					this.orderInfo = res.data;
-					this.reservation_address_arr = res.data.reservation_address_arr;
-
-					// 添加店铺信息（如果有的话）
-					if (res.data.user_sj) {
-						this.user_sj = res.data.user_sj;
-						this.calculateDistance(); // 计算距离
+					const newOrderInfo = res.data;
+					// 保留当前前端已经更新的状态
+					if (this.orderInfo && this.orderInfo.state > newOrderInfo.state) {
+						newOrderInfo.state = this.orderInfo.state;
 					}
-
-					console.log(this.orderInfo)
-				})
+					this.orderInfo = newOrderInfo;
+					this.orderInfo.coupon_info = this.orderInfo.coupon_info || {};
+					this.reservation_address_arr = this.orderInfo.reservation_address_arr || {};
+				});
 			},
 
 			// 打开店铺地图
@@ -663,40 +661,41 @@
 			},
 			// 输入完成
 			onConfirm(code) {
-				this.showInput = false
-				if (this.clickType) {
-					return
-				}
-				this.clickType = true
+				this.showInput = false;
+				if (this.clickType) return;
+				this.clickType = true;
+				uni.showLoading({ title: '服务开始中...' });
+				
 				request.post(this.urls[this.serviceType].startOrder, {
 					id: this.orderInfo.id,
 					server_code: code,
 					sjid: this.userInfo.id
 				}).then(res => {
-					console.log(res)
 					if (res.state == 1) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-						this.getOrderDetail();
-						// 修改上一页页面信息
+						uni.showToast({ title: res.msg, icon: 'success' });
+						// 直接修改状态为 4（待完成）
+						this.orderInfo.state = 4;
+						// 强制刷新视图，按钮立即变化
+						this.$forceUpdate();
+						// 后台静默获取真实数据，确保后续操作数据准确
+						this.getOrderDetail().catch(e => console.warn('静默同步失败', e));
+						// 刷新上一页订单列表
 						const pages = getCurrentPages();
 						const prevPage = pages[pages.length - 2];
-						if (prevPage) {
-							prevPage.$vm.getOrderNumber();
-							prevPage.$vm.getOrderList();
+						if (prevPage && prevPage.$vm) {
+							prevPage.$vm.getOrderNumber?.();
+							prevPage.$vm.getOrderList?.();
 						}
 					} else if (res.state == 2) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
+						uni.showToast({ title: res.msg, icon: 'none' });
 					}
-					this.handelOrder = {};
+				}).catch(err => {
+					console.error('开始服务失败', err);
+					uni.showToast({ title: '操作失败', icon: 'none' });
 				}).finally(() => {
-					this.clickType = false
-				})
+					this.clickType = false;
+					uni.hideLoading();
+				});
 			},
 			// 完成服务
 			endOrder(e, order) {
@@ -1696,16 +1695,16 @@
 		text-align: left;
 		font-style: normal;
 	}
-	.coupon-title{
-		width: 160rpx;
-		height: 40rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #3D3D3D;
-		line-height: 39rpx;
-		text-align: left;
-		font-style: normal;
+	.coupon-title{
+		width: 160rpx;
+		height: 40rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #3D3D3D;
+		line-height: 39rpx;
+		text-align: left;
+		font-style: normal;
 	}
 	.coupon-item {}
 </style>
\ No newline at end of file

From 7bca1214aec5793d0748112b61f7f0ad53ac1ad0 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Sun, 19 Apr 2026 15:14:59 +0800
Subject: [PATCH 002/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/filters.vue             |    6 +-
 pages/shop/SellerDetail.vue                   |    4 +-
 pages/shop/buy-order.vue                      |    2 +-
 pages/shop/buyorder-detail.vue                | 1687 +++++++++--------
 pages/shop/photoAlbum/photoManage.vue         |    5 +-
 pages/shop/sj-info-change.vue                 |    8 +-
 pages/shop/userorder-detail.vue               |   38 +-
 pages/shop/userorders.vue                     |    2 +-
 pages/shop/workSpace/components/orderCard.vue |    2 +-
 9 files changed, 929 insertions(+), 825 deletions(-)

diff --git a/pages/home/components/filters.vue b/pages/home/components/filters.vue
index 15f5381..2e70229 100644
--- a/pages/home/components/filters.vue
+++ b/pages/home/components/filters.vue
@@ -156,6 +156,7 @@
 						weChatRefund: "/sj/workSeatOrder/weChatRefund",
 						aliRefund: "/sj/workSeatOrder/aliRefund",
 						startOrder: "/sj/workSeatOrder/start",
+						sureOrder:"/sj/workSeatOrder/sure",
 						endOrder: "/sj/workSeatOrder/end",
 						ordernum: "/sj/workSeatOrder/orderNum",
 						list: "/sj/workSeatOrder/list",
@@ -405,6 +406,7 @@
 					return;
 				}
 				this.clickType = true;
+				console.log(111,this.activeFirstId,this.urls)
 				request
 					.post(this.urls[this.activeFirstId].sureOrder, {
 						id: order.id,
@@ -414,7 +416,7 @@
 					.then((res) => {
 						if (res.state != 1 || res.code != 200) {
 							uni.showToast({
-								title: res.msg,
+								title: "开始服务",
 								icon: "none",
 							});
 						} else {
@@ -459,7 +461,7 @@
 						console.log(res);
 						if (res.state == 1 || res.code == 200) {
 							uni.showToast({
-								title: res.msg,
+								title: "开始服务",
 								icon: "none",
 							});
 							this.searchList();
diff --git a/pages/shop/SellerDetail.vue b/pages/shop/SellerDetail.vue
index 740c86b..d3aa5e3 100644
--- a/pages/shop/SellerDetail.vue
+++ b/pages/shop/SellerDetail.vue
@@ -25,11 +25,11 @@
 						}}</text>
 								<text class="service-name-num">×1</text>
 							</view>
-							<text class="service-subtitle white-space-nowrap">{{identity==0?'使用场景':'服务范围'}}：{{
+						<!-- 	<text class="service-subtitle white-space-nowrap">{{identity==0?'使用场景':'服务范围'}}：{{
                   orderInfo.first_class_title +
                   "   " +
                   orderInfo.second_class_title
-                }}</text>
+                }}</text> -->
 						</view>
 						<view class="service-price">
 							<text>单价：{{ orderInfo.price }}元/10分钟</text>
diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue
index 951610c..1cdab7f 100644
--- a/pages/shop/buy-order.vue
+++ b/pages/shop/buy-order.vue
@@ -77,7 +77,7 @@
 							</text>
 							<text class="action-btn gray-btn" v-if="order.state == 5 || order.state == 6 || order.state == 7"
 								@click="orderAgain(order)">
-								再来一单
+								再次购买
 							</text>
 							<text class="action-btn gray-btn" v-if="order.state == 5 && order.appeal == 2"
 								@click="lookComplaint(order)">
diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue
index 01786d2..f20a06e 100644
--- a/pages/shop/buyorder-detail.vue
+++ b/pages/shop/buyorder-detail.vue
@@ -1,98 +1,94 @@
 <template>
-  <view class="detail-page">
-    <!-- 顶部导航栏 -->
-    <custom-navbar 
-      title="订单详情" 
-      :show-back="true"
-	  title-color="#333333"
-	  backgroundColor="transparent"
-    ></custom-navbar>
-    <view class="content-part">
-    <!-- 订单状态 -->
-    <view class="status-section">
-      <text class="status-text">{{orderInfo.state == 1 ? '待支付' : orderInfo.state == 2 ? '待接单' : orderInfo.state == 3 ? '待服务' : orderInfo.state == 4 ? '待完成' : orderInfo.state == 5 ? '已完成' : orderInfo.state == 6 ? '待评价' : orderInfo.state == 7 ? '已取消' : ''}}</text>
-    </view>
-    
-    <!-- 到家订单 客户以及手艺人信息 -->
-    <view class="service-card">
-      <view class="location-info">
-        <image src="/static/images/gohome_location.png" class="location-icon"></image>
-        <view class="address-info">
-          <view class="name-phone">
-            <text class="name">{{userInfo.name}}</text>
-            <text class="phone">{{userInfo.account}}</text>
-          </view>
-          <text class="address">{{userInfo.dependency}}{{userInfo.address}}</text>
-        </view>
-      </view>
-	  <image src="/static/images/boder_icon.png"
-			 mode="aspectFill"
-			 class="divider"></image>
-      <view class="staff-info">
-        <image :src="user_syr.head_photo" mode="aspectFill" class="staff-avatar"></image>
-        <view class="staff-detail">
-          <text class="staff-name">{{user_syr.name}}</text>
-          <view class="rating">
-            <!-- <image 
+	<view class="detail-page">
+		<!-- 顶部导航栏 -->
+		<custom-navbar title="订单详情" :show-back="true" title-color="#333333"
+			backgroundColor="transparent"></custom-navbar>
+		<view class="content-part">
+			<!-- 订单状态 -->
+			<!-- <view class="status-section">
+      <text class="status-text">{{orderInfo.state == 1 ? '待支付' : orderInfo.state == 2 ? '待接单' : orderInfo.state == 3 ? '待服务' : orderInfo.state == 4 ? '服务中' : orderInfo.state == 5 ? '已完成' : orderInfo.state == 6 ? '待评价' : orderInfo.state == 7 ? '已取消' : ''}}</text>
+    </view> -->
+			<view class="status-section">
+				<image class="status-section-image" mode="widthFix" :src="stateItem.icon" />
+				<text class="status-text">{{ stateItem.text }}</text>
+			</view>
+
+			<!-- 到家订单 客户以及手艺人信息 -->
+			<view class="service-card">
+				<view class="location-info">
+					<image src="/static/images/gohome_location.png" class="location-icon"></image>
+					<view class="address-info">
+						<view class="name-phone">
+							<text class="name">{{userInfo.name}}</text>
+							<text class="phone">{{userInfo.account}}</text>
+						</view>
+						<text class="address">{{userInfo.dependency}}{{userInfo.address}}</text>
+					</view>
+				</view>
+				<image src="/static/images/boder_icon.png" mode="aspectFill" class="divider"></image>
+				<view class="staff-info">
+					<image :src="user_syr.head_photo" mode="aspectFill" class="staff-avatar"></image>
+					<view class="staff-detail">
+						<text class="staff-name">{{user_syr.name}}</text>
+						<view class="rating">
+							<!-- <image 
               v-for="(star, index) in 5" 
               :key="index"
               src="/static/images/star.png" 
               class="star-icon"
             ></image> -->
-          </view>
-        </view>
-        <!-- <image src="/static/images/order_phone.png" class="phone-btn" @click="contactService(user_syr.account)"></image> -->
-      </view>
-    </view>
-	
-	
-    <!-- 预约信息 -->
-    <view class="booking-card">
-      <view class="card-header" v-if="orderInfo.order_kind == 1">
-        <text class="card-title">预约信息</text>
-		<view>
-			<text class="update-time">{{orderInfo.reservation_time}}</text>
-			<!-- <text class="update-change">更改时间</text> -->
-		</view>
-      </view>
-      <view class="service-item">
-        <image
-			:src="orderInfo.server_photo[0]"
-			v-if="orderInfo.server_photo && orderInfo.server_photo.length != 0"
-			mode="aspectFill"
-			class="service-image"></image>
-        <view class="service-info">
-          <text class="service-name text-overflow">{{orderInfo.server_title}}</text>
-          <text class="service-price">¥{{orderInfo.order_money}}</text>
-        </view>
-        <text class="service-count">×1</text>
-      </view>
-	  <view class="service-real">
-		<text class="real-lable">实际支付金额：</text>
-		<text class="real-price">￥{{orderInfo.pay_money}}</text>
-	  </view>
-    </view>
-    
-    <!-- 订单信息 -->
-    <view class="order-card">
-      <text class="card-title">订单信息</text>
-      <view class="info-item">
-        <text class="label">服务码</text>
-        <text class="value">{{orderInfo.server_code}}</text>
-      </view>
-      <view class="info-item">
-        <text class="label">订单编号</text>
-        <text class="value">{{orderInfo.number}}</text>
-      </view>
-      <view class="info-item">
-        <text class="label">下单时间</text>
-        <text class="value">{{orderInfo.add_time}}</text>
-      </view>
-      <view class="info-item">
-        <text class="label">服务时长</text>
-        <text class="value">{{ orderInfo.server_time }}分钟</text>
+						</view>
+					</view>
+					<!-- <image src="/static/images/order_phone.png" class="phone-btn" @click="contactService(user_syr.account)"></image> -->
+				</view>
 			</view>
-      <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_kind">
+
+
+			<!-- 预约信息 -->
+			<view class="booking-card">
+				<view class="card-header" v-if="orderInfo.order_kind == 1">
+					<text class="card-title">预约信息</text>
+					<view>
+						<text class="update-time">{{orderInfo.reservation_time}}</text>
+						<!-- <text class="update-change">更改时间</text> -->
+					</view>
+				</view>
+				<view class="service-item">
+					<image :src="orderInfo.server_photo[0]"
+						v-if="orderInfo.server_photo && orderInfo.server_photo.length != 0" mode="aspectFill"
+						class="service-image"></image>
+					<view class="service-info">
+						<text class="service-name text-overflow">{{orderInfo.server_title}}</text>
+						<text class="service-price">¥{{orderInfo.order_money}}</text>
+					</view>
+					<text class="service-count">×1</text>
+				</view>
+				<view class="service-real">
+					<text class="real-lable">实际支付金额：</text>
+					<text class="real-price">￥{{orderInfo.pay_money}}</text>
+				</view>
+			</view>
+
+			<!-- 订单信息 -->
+			<view class="order-card">
+				<text class="card-title">订单信息</text>
+				<view class="info-item" v-if="orderInfo.state!=7">
+					<text class="label">服务码</text>
+					<text class="value">{{orderInfo.server_code}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">订单编号</text>
+					<text class="value">{{orderInfo.number}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">下单时间</text>
+					<text class="value">{{orderInfo.add_time}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">服务时长</text>
+					<text class="value">{{ orderInfo.server_time }}分钟</text>
+				</view>
+				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_kind">
 					<text class="label">支付方式</text>
 					<text class="value">{{
 						orderInfo.pay_kind == 1
@@ -104,772 +100,853 @@
 						: ""
 					}}</text>
 				</view>
-        <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_time">
+				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_time">
 					<text class="label">支付时间</text>
 					<text class="value">{{ orderInfo.pay_time }}</text>
 				</view>
-        <view class="info-item" v-if="orderInfo.state >= 3 && orderInfo.get_time">
+				<view class="info-item" v-if="orderInfo.state >= 3 && orderInfo.get_time">
 					<text class="label">接单时间</text>
 					<text class="value">{{ orderInfo.get_time }}</text>
 				</view>
-      <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 7">
-        <text class="label">开始服务时间</text>
-        <text class="value">{{orderInfo.server_start_time}}</text>
-      </view>
-      <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 4 && orderInfo.state != 7">
-        <text class="label">服务完成时间</text>
-        <text class="value">{{orderInfo.server_end_time}}</text>
-      </view>
-    </view>
-    </view>
-    <!-- 底部按钮 -->
-	<view class="bottom-buttons">
-		<view class="contact-button">
-		  <!-- <image src="/static/images/tell_icon.png" class="tell-icon"></image>
+				<view class="info-item"
+					v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 7">
+					<text class="label">开始服务时间</text>
+					<text class="value">{{orderInfo.server_start_time}}</text>
+				</view>
+				<view class="info-item"
+					v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 4 && orderInfo.state != 7">
+					<text class="label">服务完成时间</text>
+					<text class="value">{{orderInfo.server_end_time}}</text>
+				</view>
+			</view>
+		</view>
+		<!-- 底部按钮 -->
+		<view class="bottom-buttons">
+			<view class="contact-button">
+				<!-- <image src="/static/images/tell_icon.png" class="tell-icon"></image>
 		  <text class="contact-text">联系TA</text> -->
+			</view>
+			<view class="handel-button btn-border" @click="cancelService" v-if="orderInfo.state == 1">
+				<text class="button-text">取消订单</text>
+			</view>
+			<view class="handel-button btn-border" @click="refoundService"
+				v-if="orderInfo.state == 2 || orderInfo.state == 3">
+				<text class="button-text">申请退款</text>
+			</view>
+			<view class="handel-button btn-bg" @click="payOrder" v-if="orderInfo.state == 1">
+				<text class="button-text">立即支付</text>
+			</view>
+			<view class="handel-button btn-bg" @click="reviewOrder" v-if="orderInfo.state == 6">
+				<text class="button-text">评价</text>
+			</view>
+			<view class="handel-button btn-bg" @click="orderAgain" v-if="orderInfo.state == 5 || orderInfo.state == 6">
+				<text class="button-text">再次购买</text>
+			</view>
 		</view>
-		<view class="handel-button btn-border"
-			  @click="cancelService"
-			   v-if="orderInfo.state == 1">
-		  <text class="button-text">取消订单</text>
-		</view>
-		<view class="handel-button btn-border"
-			  @click="refoundService"
-			   v-if="orderInfo.state == 2 || orderInfo.state == 3">
-		  <text class="button-text">申请退款</text>
-		</view>
-		<view class="handel-button btn-bg"
-			  @click="payOrder"
-			   v-if="orderInfo.state == 1">
-		  <text class="button-text">立即支付</text>
-		</view>
-		<view class="handel-button btn-bg"
-			  @click="reviewOrder"
-			   v-if="orderInfo.state == 6">
-		  <text class="button-text">评价</text>
-		</view>
-		<view class="handel-button btn-bg"
-			  @click="orderAgain"
-			   v-if="orderInfo.state == 5 || orderInfo.state == 6">
-		  <text class="button-text">再来一单</text>
-		</view>
-	</view>
-	
-	<!-- 获取权限提示匡内容 -->
-	<view class="permission"
-		  :class="{ transform: isShowPer }">
-		<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
-		<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
-	</view>
 
-  </view>
+		<!-- 获取权限提示匡内容 -->
+		<view class="permission" :class="{ transform: isShowPer }">
+			<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
+			<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
+		</view>
+
+	</view>
 </template>
 
 <script>
-import request from '../../utils/request'
-import _public from '../../utils/public'
-import locationService from '../../utils/locationService';
-import permissionUtils from '../../utils/per'
-export default {
-  data() {
-    return {
-	  isShowPer: false,
-	  id: '',
-      staffInfo: {
-        avatar: '/static/images/staff.jpg',
-        name: '中医理疗谢飞',
-        rating: 5
-      },
-	  userInfo: {},
-      orderInfo: {},
-	  user_syr: {}
-    }
-  },
-  async onLoad(options) {
-	this.id = options.id
-	if(this.id) {
-		const userInfo = await request.post('/user/getuser',{type: 3});
-		this.userInfo = userInfo.data;
-		// 请求订单详情
-		this.getOrderDetail()
-	}
-  	
-  },
-  methods: {
-	getOrderDetail() {
-	  request.post('/sj/sjorderdetail',{id: this.id,sjid: this.userInfo.id}).then(res=>{
-	  	this.orderInfo = res.data;
-	  	this.user_syr = res.data.user_syr;
-	  	console.log(this.orderInfo)
-	  })
-	},
-	// 显示权限说明弹窗
-	showPermissionDialog(title, content) {
-	  return new Promise((resolve) => {
-		uni.showModal({
-		  title,
-		  content,
-		  confirmText: '去开启',
-		  success(res) {
-			resolve(res.confirm);
-		  }
-		});
-	  });
-	},
-    // 拨打电话
-    async makeCall() {
-	  const systemInfo = uni.getSystemInfoSync()
-	  if(systemInfo.platform === 'ios') {
-	  	uni.makePhoneCall({
-	  		phoneNumber: this.orderInfo.customer.phone //仅为示例
-	  	})
-	  }else {
-	  	let permission = '';
-	  	if(systemInfo.platform === 'ios') {
-	  		permission = 'phone'
-	  	}else {
-	  		permission = 'android.permission.CALL_PHONE'
-	  	}
-	  	// const firstRequest = !plus.storage.getItem(`perm_${permission}`)
-	  	// if(firstRequest) {
-	  	// 	this.isShowPer = true;
-	  	// }
-		this.isShowPer = true;
-	  	// 1. 检查权限
-	  	const { granted } = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-	  	if (granted) {
-	  	  uni.makePhoneCall({
-	  	  	phoneNumber: this.orderInfo.customer.phone //仅为示例
-	  	  })
-	  	  return;
-	  	}
-	  	this.isShowPer = false;
-	  	// 2. 显示权限说明弹窗
-	  	const confirm = await this.showPermissionDialog(
-	  	  '拨打电话权限申请',
-	  	  '我们需要拨打电话权限，方便您联系商家或平台'
-	  	);
-	  	
-	  	if (!confirm) return;
-	  	
-	  	// 3. 请求权限
-	  	const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-	  	console.log('result',result)
-	  	if (result) {
-	  	  uni.makePhoneCall({
-	  	  	phoneNumber: this.orderInfo.customer.phone //仅为示例
-	  	  })
-	  	  return;
-	  	} else {
-	  	  locationService.openAppSettings();
-	  	  return;
-	  	  // uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-	  	}
-	  }
-	  
-      // uni.makePhoneCall({
-      //   phoneNumber: this.orderInfo.customer.phone
-      // })
-    },
-	// 联系客服
-	async contactService(phone) {
-	  // TODO: 实现联系客服功能
-	  // uni.navigateTo({
-	  // 	url: '/pages/contact/contact?phone='+phone
-	  // })
-	  const systemInfo = uni.getSystemInfoSync()
-	  if(systemInfo.platform === 'ios') {
-	  	uni.makePhoneCall({
-	  		phoneNumber: phone //仅为示例
-	  	})
-	  }else {
-	  	let permission = '';
-	  	if(systemInfo.platform === 'ios') {
-	  		permission = 'phone'
-	  	}else {
-	  		permission = 'android.permission.CALL_PHONE'
-	  	}
-		
-		this.isShowPer = true;
-	  	// const firstRequest = !plus.storage.getItem(`perm_${permission}`)
-	  	// if(firstRequest) {
-	  	// 	this.isShowPer = true;
-	  	// }
-	  	// 1. 检查权限
-	  	const { granted } = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-	  	if (granted) {
-	  	  uni.makePhoneCall({
-	  	  	phoneNumber: phone //仅为示例
-	  	  })
-	  	  this.isShowPer = false;
-	  	  return;
-	  	}
-	  	this.isShowPer = false;
-	  	// 2. 显示权限说明弹窗
-	  	const confirm = await this.showPermissionDialog(
-	  	  '拨打电话权限申请',
-	  	  '我们需要拨打电话权限，方便您联系商家或平台'
-	  	);
-	  	
-	  	if (!confirm) return;
-	  	
-	  	// 3. 请求权限
-	  	const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-	  	console.log('result',result)
-	  	if (result) {
-	  	  uni.makePhoneCall({
-	  	  	phoneNumber: phone //仅为示例
-	  	  })
-	  	  return;
-	  	} else {
-	  	  locationService.openAppSettings();
-	  	  return;
-	  	  // uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-	  	}
-	  }
-	  
-	  
-	},
-	// 取消订单
-	cancelService() {
-		uni.showModal({
-		  title: '取消订单',
-		  content: '确定要取消该订单吗？',
-		  success: (res) => {
-		    if (res.confirm) {
-		      // TODO: 取消订单
-			  let data = {
-				orderNo: this.orderInfo.number,
-				amount: this.orderInfo.pay_money,
-			  	sjid: this.userInfo.id
-			  }
-			  request.post('/sj/cancelorder',data).then(res=>{
-				if(res.state == 1) {
-				  uni.showToast({
-				  	title: '取消成功！',
-				  	icon: 'none'
-				  })
-				  this.getOrderDetail();
-				}else {
-				  uni.showToast({
-				  	title: res.msg,
-				  	icon: 'none'
-				  })
-				}
-			  	
-			  }).catch(err=>{
-				console.log(err)
-			  })
-		    }
-		  }
-		})
-		
-	},
-	
-	// 申请退款
-	refoundService() {
-		
-		uni.showModal({
-		  title: '申请退款',
-		  content: '确定申请退款？退款后则订单取消！',
-		  success: (res) => {
-		    if (res.confirm) {
-		      // TODO: 申请退款
-			  let data = {
-				orderNo: this.orderInfo.number,
-				amount: this.orderInfo.pay_money,
-			  	sjid: this.userInfo.id
-			  }
-			  let url = '';
-			  if(this.orderInfo.pay_kind == 1) {
-				url = ''
-			  }else if(this.orderInfo.pay_kind == 2) {
-				url = '/sj/selfwechatrefund'
-			  }else if(this.orderInfo.pay_kind == 3) {
-				url = '/sj/selfalirefund'
-			  }
-			  request.post(url,data).then(res=>{
-				console.log('申请退款接口',res)
-				uni.showToast({
-					title: '申请退款成功！',
-					icon: 'none'
+	import request from '../../utils/request'
+	import _public from '../../utils/public'
+	import locationService from '../../utils/locationService';
+	import permissionUtils from '../../utils/per'
+	export default {
+		data() {
+			return {
+				isShowPer: false,
+				id: '',
+				staffInfo: {
+					avatar: '/static/images/staff.jpg',
+					name: '中医理疗谢飞',
+					rating: 5
+				},
+				userInfo: {},
+				orderInfo: {},
+				user_syr: {}
+			}
+		},
+		async onLoad(options) {
+			this.id = options.id
+			if (this.id) {
+				const userInfo = await request.post('/user/getuser', {
+					type: 3
+				});
+				this.userInfo = userInfo.data;
+				// 请求订单详情
+				this.getOrderDetail()
+			}
+
+		},
+		computed: {
+			stateItem() {
+				const list = [{
+						text: "待支付",
+						icon: "/static/images/icons/pay.png",
+						state: "1"
+					},
+					{
+						text: "待接单",
+						icon: "/static/images/icons/pending.png",
+						state: "2",
+					},
+					{
+						text: "待服务",
+						icon: "/static/images/icons/pendingService.png",
+						state: "3",
+					},
+					{
+						text: "服务中",
+						icon: "/static/images/icons/pendingService.png",
+						state: "4",
+					},
+					{
+						text: "已完成",
+						icon: "/static/images/icons/payOk.png",
+						state: "5"
+					},
+					{
+						text: "待评价",
+						icon: "/static/images/icons/pending.png",
+						state: "6",
+					},
+					{
+						text: "已取消",
+						icon: "/static/images/evaluate/cancel.png",
+						state: "7"
+					},
+				];
+				const item = list.find((it) => it.state == this.orderInfo.state) || {};
+				return item;
+			},
+		},
+		methods: {
+			getOrderDetail() {
+				request.post('/sj/sjorderdetail', {
+					id: this.id,
+					sjid: this.userInfo.id
+				}).then(res => {
+					this.orderInfo = res.data;
+					this.user_syr = res.data.user_syr;
+					console.log(this.orderInfo)
 				})
-				this.orderInfo = {};
-				this.getOrderDetail();
-			  }).catch(err=>{
-				console.log(err)
-			  })
-		    }
-		  }
-		})
-		
-	},
-	
-	// 支付订单
-	payOrder() {
-	  // TODO: 实现支付功能
-	  uni.navigateTo({
-	    url: `/pages/shop/pay-order?id=${this.orderInfo.id}&money=${this.orderInfo.order_money}&title=${this.orderInfo.server_title}&number=${this.orderInfo.number}`
-	  })
-	},
-	
-	// 评价订单
-	reviewOrder() {
-	  // uni.navigateTo({
-	  //   url: `/pages/order/pay?id=${this.orderInfo.id}`
-	  // })
-	},
-	
-	// 再次下单
-	orderAgain() {
-	  // TODO: 实现再次下单功能
-	  uni.navigateTo({
-	  	url: '/pages/shop/service-detail?id='+this.orderInfo.server_id
-	  })
+			},
+			// 显示权限说明弹窗
+			showPermissionDialog(title, content) {
+				return new Promise((resolve) => {
+					uni.showModal({
+						title,
+						content,
+						confirmText: '去开启',
+						success(res) {
+							resolve(res.confirm);
+						}
+					});
+				});
+			},
+			// 拨打电话
+			async makeCall() {
+				const systemInfo = uni.getSystemInfoSync()
+				if (systemInfo.platform === 'ios') {
+					uni.makePhoneCall({
+						phoneNumber: this.orderInfo.customer.phone //仅为示例
+					})
+				} else {
+					let permission = '';
+					if (systemInfo.platform === 'ios') {
+						permission = 'phone'
+					} else {
+						permission = 'android.permission.CALL_PHONE'
+					}
+					// const firstRequest = !plus.storage.getItem(`perm_${permission}`)
+					// if(firstRequest) {
+					// 	this.isShowPer = true;
+					// }
+					this.isShowPer = true;
+					// 1. 检查权限
+					const {
+						granted
+					} = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
+					if (granted) {
+						uni.makePhoneCall({
+							phoneNumber: this.orderInfo.customer.phone //仅为示例
+						})
+						return;
+					}
+					this.isShowPer = false;
+					// 2. 显示权限说明弹窗
+					const confirm = await this.showPermissionDialog(
+						'拨打电话权限申请',
+						'我们需要拨打电话权限，方便您联系商家或平台'
+					);
+
+					if (!confirm) return;
+
+					// 3. 请求权限
+					const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
+					console.log('result', result)
+					if (result) {
+						uni.makePhoneCall({
+							phoneNumber: this.orderInfo.customer.phone //仅为示例
+						})
+						return;
+					} else {
+						locationService.openAppSettings();
+						return;
+						// uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
+					}
+				}
+
+				// uni.makePhoneCall({
+				//   phoneNumber: this.orderInfo.customer.phone
+				// })
+			},
+			// 联系客服
+			async contactService(phone) {
+				// TODO: 实现联系客服功能
+				// uni.navigateTo({
+				// 	url: '/pages/contact/contact?phone='+phone
+				// })
+				const systemInfo = uni.getSystemInfoSync()
+				if (systemInfo.platform === 'ios') {
+					uni.makePhoneCall({
+						phoneNumber: phone //仅为示例
+					})
+				} else {
+					let permission = '';
+					if (systemInfo.platform === 'ios') {
+						permission = 'phone'
+					} else {
+						permission = 'android.permission.CALL_PHONE'
+					}
+
+					this.isShowPer = true;
+					// const firstRequest = !plus.storage.getItem(`perm_${permission}`)
+					// if(firstRequest) {
+					// 	this.isShowPer = true;
+					// }
+					// 1. 检查权限
+					const {
+						granted
+					} = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
+					if (granted) {
+						uni.makePhoneCall({
+							phoneNumber: phone //仅为示例
+						})
+						this.isShowPer = false;
+						return;
+					}
+					this.isShowPer = false;
+					// 2. 显示权限说明弹窗
+					const confirm = await this.showPermissionDialog(
+						'拨打电话权限申请',
+						'我们需要拨打电话权限，方便您联系商家或平台'
+					);
+
+					if (!confirm) return;
+
+					// 3. 请求权限
+					const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
+					console.log('result', result)
+					if (result) {
+						uni.makePhoneCall({
+							phoneNumber: phone //仅为示例
+						})
+						return;
+					} else {
+						locationService.openAppSettings();
+						return;
+						// uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
+					}
+				}
+
+
+			},
+			// 取消订单
+			cancelService() {
+				uni.showModal({
+					title: '取消订单',
+					content: '确定要取消该订单吗？',
+					success: (res) => {
+						if (res.confirm) {
+							// TODO: 取消订单
+							let data = {
+								orderNo: this.orderInfo.number,
+								amount: this.orderInfo.pay_money,
+								sjid: this.userInfo.id
+							}
+							request.post('/sj/cancelorder', data).then(res => {
+								if (res.state == 1) {
+									uni.showToast({
+										title: '取消成功！',
+										icon: 'none'
+									})
+									this.getOrderDetail();
+								} else {
+									uni.showToast({
+										title: res.msg,
+										icon: 'none'
+									})
+								}
+
+							}).catch(err => {
+								console.log(err)
+							})
+						}
+					}
+				})
+
+			},
+
+			// 申请退款
+			refoundService() {
+
+				uni.showModal({
+					title: '申请退款',
+					content: '确定申请退款？退款后则订单取消！',
+					success: (res) => {
+						if (res.confirm) {
+							// TODO: 申请退款
+							let data = {
+								orderNo: this.orderInfo.number,
+								amount: this.orderInfo.pay_money,
+								sjid: this.userInfo.id
+							}
+							let url = '';
+							if (this.orderInfo.pay_kind == 1) {
+								url = ''
+							} else if (this.orderInfo.pay_kind == 2) {
+								url = '/sj/selfwechatrefund'
+							} else if (this.orderInfo.pay_kind == 3) {
+								url = '/sj/selfalirefund'
+							}
+							request.post(url, data).then(res => {
+								console.log('申请退款接口', res)
+								uni.showToast({
+									title: '申请退款成功！',
+									icon: 'none'
+								})
+								this.orderInfo = {};
+								this.getOrderDetail();
+							}).catch(err => {
+								console.log(err)
+							})
+						}
+					}
+				})
+
+			},
+
+			// 支付订单
+			payOrder() {
+				// TODO: 实现支付功能
+				uni.navigateTo({
+					url: `/pages/shop/pay-order?id=${this.orderInfo.id}&money=${this.orderInfo.order_money}&title=${this.orderInfo.server_title}&number=${this.orderInfo.number}`
+				})
+			},
+
+			// 评价订单
+			reviewOrder() {
+				// uni.navigateTo({
+				//   url: `/pages/order/pay?id=${this.orderInfo.id}`
+				// })
+			},
+
+			// 再次下单
+			orderAgain() {
+				// TODO: 实现再次下单功能
+				uni.navigateTo({
+					url: '/pages/shop/service-detail?id=' + this.orderInfo.server_id
+				})
+			}
+		}
 	}
-  }
-}
 </script>
 
-<style>
-page {
-	position: relative;
-	background-color: #fff;
-}
-.detail-page::before {
-  content: '';
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 1200rpx !important;
-  background-image: url('/static/images/bg.png');
-  background-size: cover;
-  background-position: center top;
-  background-repeat: no-repeat;
-  z-index: 1;
-}
-.content-part {
-	position: relative;
-	left: 0;
-	right: 0;
-	z-index: 9;
-}
-/* 导航栏样式 */
-.custom-nav {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 88rpx;
-  background-color: transparent;
-  display: flex;
-  align-items: center;
-  padding: 0 32rpx;
-  z-index: 100;
-  /* #ifdef H5 */
-  padding-top: 0;
-  /* #endif */
-  /* #ifdef APP-PLUS || MP-WEIXIN */
-  padding-top: var(--status-bar-height);
-  /* #endif */
-}
+<style lang="less">
+	page {
+		position: relative;
+		background-color: #fff;
+	}
 
-.nav-back {
-  width: 48rpx;
-  height: 48rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+	.detail-page::before {
+		content: '';
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 1200rpx !important;
+		background-image: url('/static/images/bg.png');
+		background-size: cover;
+		background-position: center top;
+		background-repeat: no-repeat;
+		z-index: 1;
+	}
 
-.back-icon {
-  width: 32rpx;
-  height: 32rpx;
-}
+	.content-part {
+		position: relative;
+		left: 0;
+		right: 0;
+		z-index: 9;
+	}
 
-.nav-title {
-  flex: 1;
-  text-align: center;
-  font-size: 36rpx;
-  font-weight: 500;
-  color: #FFFFFF;
-}
+	/* 导航栏样式 */
+	.custom-nav {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 88rpx;
+		background-color: transparent;
+		display: flex;
+		align-items: center;
+		padding: 0 32rpx;
+		z-index: 100;
+		/* #ifdef H5 */
+		padding-top: 0;
+		/* #endif */
+		/* #ifdef APP-PLUS || MP-WEIXIN */
+		padding-top: var(--status-bar-height);
+		/* #endif */
+	}
 
-/* 状态区域 */
-.status-section {
-  /* background: linear-gradient(135deg, #FF6B9D 0%, #FF4D6B 100%); */
-  height: 160rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  /* padding-top: 88rpx; */
-  /* #ifdef APP-PLUS || MP-WEIXIN */
-  /* padding-top: calc(88rpx + var(--status-bar-height)); */
-  /* #endif */
-}
- 
- 
+	.nav-back {
+		width: 48rpx;
+		height: 48rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
+	.back-icon {
+		width: 32rpx;
+		height: 32rpx;
+	}
 
-.status-text {
-  font-size: 40rpx;
-  color: #FFFFFF;
-  font-weight: 500;
-}
+	.nav-title {
+		flex: 1;
+		text-align: center;
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
 
- /* 服务人员卡片 */
-.service-card {
-  margin: 24rpx;
-  background-color: #FFFFFF;
-  border-radius: 16rpx;
-  padding: 24rpx 0;
-  box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
-}
+	/* 状态区域 */
+	/* 状态区域 */
+	.status-section {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 20rpx;
+		padding-top: 55rpx;
+		padding-bottom: 50rpx;
 
-.location-info {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-start;
-  align-items: center;
-  padding: 0 24rpx;
-}
+		.status-section-image {
+			width: 52rpx;
+		}
+	}
+	
+	.status-text {
+		font-size: 44rpx;
+		color: #333333;
+		font-weight: 600;
+	}
+	
 
-.location-icon {
-  width: 60rpx;
-  height: 60rpx;
-  margin-right: 32rpx;
-}
+	/* 服务人员卡片 */
+	.service-card {
+		margin: 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 24rpx 0;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
+	}
 
-.address-info {
-  flex: 1;
-}
+	.location-info {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-start;
+		align-items: center;
+		padding: 0 24rpx;
+	}
 
-.name-phone {
-  display: flex;
-  align-items: center;
-  margin-bottom: 8rpx;
-}
+	.location-icon {
+		width: 60rpx;
+		height: 60rpx;
+		margin-right: 32rpx;
+	}
 
-.name {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-  margin-right: 16rpx;
-}
+	.address-info {
+		flex: 1;
+	}
 
-.phone {
-  font-size: 28rpx;
-  color: #666666;
-}
+	.name-phone {
+		display: flex;
+		align-items: center;
+		margin-bottom: 8rpx;
+	}
 
-.address {
-  font-size: 28rpx;
-  color: #666666;
-}
+	.name {
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: 500;
+		margin-right: 16rpx;
+	}
 
-.divider {
-  width: 702rpx;
-  height: 4rpx;
-}
+	.phone {
+		font-size: 28rpx;
+		color: #666666;
+	}
 
-.staff-info {
-  display: flex;
-  align-items: center;
-  padding: 32rpx 24rpx 0;
-}
+	.address {
+		font-size: 28rpx;
+		color: #666666;
+	}
 
-.staff-avatar {
-  width: 80rpx;
-  height: 80rpx;
-  border-radius: 44rpx;
-  margin-right: 16rpx;
-  background-color: #333333;
-}
+	.divider {
+		width: 702rpx;
+		height: 4rpx;
+	}
 
-.staff-detail {
-  flex: 1;
-}
+	.staff-info {
+		display: flex;
+		align-items: center;
+		padding: 32rpx 24rpx 0;
+	}
 
-.staff-name {
-  font-size: 32rpx;
-  color: #3D3D3D;
-  font-weight: 500;
-}
+	.staff-avatar {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 44rpx;
+		margin-right: 16rpx;
+		background-color: #333333;
+	}
 
-.rating {
-  display: flex;
-  align-items: center;
-}
+	.staff-detail {
+		flex: 1;
+	}
 
-.star-icon {
-  width: 24rpx;
-  height: 24rpx;
-  margin-right: 4rpx;
-}
+	.staff-name {
+		font-size: 32rpx;
+		color: #3D3D3D;
+		font-weight: 500;
+	}
 
-.phone-btn {
-  width: 64rpx;
-  height: 64rpx;
-  background-color: #E8101E;
-  border-radius: 32rpx;
-}
-/* 门店信息 */
-.service-shop {
-  margin: 24rpx;
-  background-color: #FFFFFF;
-  border-radius: 16rpx;
-  padding: 24rpx;
-  box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-start;
-  align-items: center;
-}
-.shop-info {
-  flex: 1;
-}
-.shop-info1 {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-start;
-  align-items: center;
-}
-.shop-logo {
-  width: 96rpx;
-  height: 96rpx;
-  border-radius: 48rpx;
-  margin-right: 18rpx;
-}
-.shop-name {
-  font-size: 24rpx;
-  font-weight: 500;
-  color: #3D3D3D;
-}
-.shop-info2 {
-  display: flex;
-  flex-flow: column wrap;
-  justify-content: flex-start;
-  align-items: flex-start;
-  margin-top: 16rpx;
-}
-.shop-time {
-  margin-bottom: 8rpx;
-}
-.shop-time,.shop-address {
-  font-size: 24rpx;
-  color: #999999;
-}
-.shop-btns {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-end;
-  align-items: center;
-}
-.btn-map,.btn-phone {
-  width: 64rpx;
-  height: 64rpx;
-}
-.btn-map {
-  margin-right: 48rpx;
-}
-/* 预约信息卡片 */
-.booking-card {
-  margin: 24rpx;
-  background-color: #FFFFFF;
-  border-radius: 16rpx;
-  padding: 24rpx;
-  box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
-}
+	.rating {
+		display: flex;
+		align-items: center;
+	}
 
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 24rpx;
-}
+	.star-icon {
+		width: 24rpx;
+		height: 24rpx;
+		margin-right: 4rpx;
+	}
 
-.card-title {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-}
+	.phone-btn {
+		width: 64rpx;
+		height: 64rpx;
+		background-color: #E8101E;
+		border-radius: 32rpx;
+	}
 
-.update-time {
-  font-size: 28rpx;
-  color: #333333;
-  padding-right: 4rpx;
-}
-.update-change {
-  font-size: 28rpx;
-  color: #666666;
-}
-.service-item {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-start;
-  align-items: center;
-  margin-bottom: 24rpx;
-}
+	/* 门店信息 */
+	.service-shop {
+		margin: 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 24rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-start;
+		align-items: center;
+	}
 
-.service-image {
-  width: 160rpx;
-  height: 160rpx;
-  border-radius: 16rpx;
-  margin-right: 24rpx;
-  background-color: #e2e2e2;
-}
+	.shop-info {
+		flex: 1;
+	}
 
-.service-info {
-  flex: 1;
-  height: 160rpx;
-  display: flex;
-  flex-flow: column nowrap;
-  justify-content: space-between;
-  align-items: flex-start;
-  margin-right: 24rpx;
-}
+	.shop-info1 {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-start;
+		align-items: center;
+	}
 
-.service-name {
-  font-size: 28rpx;
-  color: #333333;
-  margin-bottom: 8rpx;
-}
+	.shop-logo {
+		width: 96rpx;
+		height: 96rpx;
+		border-radius: 48rpx;
+		margin-right: 18rpx;
+	}
 
-.service-price {
-  font-size: 32rpx;
-  color: #FF4D6B;
-  font-weight: 500;
-}
+	.shop-name {
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #3D3D3D;
+	}
 
-.service-count {
-  font-size: 28rpx;
-  color: #666666;
-}
+	.shop-info2 {
+		display: flex;
+		flex-flow: column wrap;
+		justify-content: flex-start;
+		align-items: flex-start;
+		margin-top: 16rpx;
+	}
 
-.service-real {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: flex-end;
-  align-items: baseline;
-  padding-top: 24rpx;
-  border-top: 1rpx solid rgba(0, 0, 0, 0.05);
-}
-.real-lable {
-  font-size: 24rpx;
-  color: #333333;
-}
-.real-price {
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #E8101E;
-}
-/* 订单信息卡片 */
-.order-card {
-  margin: 24rpx;
-  background-color: #FFFFFF;
-  border-radius: 16rpx;
-  padding: 24rpx;
-  box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
-}
+	.shop-time {
+		margin-bottom: 8rpx;
+	}
 
-.info-item {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 16rpx;
-}
+	.shop-time,
+	.shop-address {
+		font-size: 24rpx;
+		color: #999999;
+	}
 
-.label {
-  font-size: 28rpx;
-  color: #999999;
-}
+	.shop-btns {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-end;
+		align-items: center;
+	}
 
-.value {
-  font-size: 28rpx;
-  color: #333333;
-}
+	.btn-map,
+	.btn-phone {
+		width: 64rpx;
+		height: 64rpx;
+	}
 
-/* 底部按钮 */
-.bottom-buttons {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  height: 128rpx;
-  background-color: #FFFFFF;
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
-  justify-content: space-between;
-  box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
-  padding: 0 24rpx 0 78rpx;
-  /* #ifdef H5 */
-  padding-bottom: env(safe-area-inset-bottom);
-  /* #endif */
-  z-index: 999;
-}
-.contact-button {
-  display: flex;
-  flex-flow: column nowrap;
-  justify-content: center;
-  align-items: center;
-}
-.contact-text {
-  font-size: 24rpx;
-  color: #666666;
-}
-.tell-icon {
-  width: 36rpx;
-  height: 36rpx;
-  margin-right: 8rpx;
-}
-.handel-button {
-  width: 240rpx;
-  height: 64rpx;
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: center;
-  align-items: center;
-  border-radius: 32rpx;
-}
-.btn-border {
-  border: 1rpx solid #E8101E;
-  background-color: #fff;
-  box-sizing: border-box;
-  margin-left: 20rpx;
-}
-.btn-bg {
-  background-color: #E8101E;
-}
-.button-text {
-  font-size: 28rpx;
-  font-weight: 400;
-  color: #FFFFFF;
-}
-.btn-border .button-text {
-  font-size: 28rpx;
-  font-weight: 400;
-  color: #E8101E;
-}
-/* APP适配 */
-/* #ifdef APP-PLUS */
-.permission.transform {
-	top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-	opacity: 1;
-	visibility: visible;
-}
-/* #endif */
-/* 平台适配 */
-/* #ifdef H5 */
-.detail-page {
-  padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
-}
-/* #endif */
+	.btn-map {
+		margin-right: 48rpx;
+	}
 
-/* #ifdef MP-WEIXIN */
-.custom-nav {
-  padding-top: calc(var(--status-bar-height) + constant(safe-area-inset-top));
-  padding-top: calc(var(--status-bar-height) + env(safe-area-inset-top));
-}
-/* #endif */
-</style> 
\ No newline at end of file
+	/* 预约信息卡片 */
+	.booking-card {
+		margin: 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 24rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
+	}
+
+	.card-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 24rpx;
+	}
+
+	.card-title {
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: 500;
+	}
+
+	.update-time {
+		font-size: 28rpx;
+		color: #333333;
+		padding-right: 4rpx;
+	}
+
+	.update-change {
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+	.service-item {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-start;
+		align-items: center;
+		margin-bottom: 24rpx;
+	}
+
+	.service-image {
+		width: 160rpx;
+		height: 160rpx;
+		border-radius: 16rpx;
+		margin-right: 24rpx;
+		background-color: #e2e2e2;
+	}
+
+	.service-info {
+		flex: 1;
+		height: 160rpx;
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: space-between;
+		align-items: flex-start;
+		margin-right: 24rpx;
+	}
+
+	.service-name {
+		font-size: 28rpx;
+		color: #333333;
+		margin-bottom: 8rpx;
+	}
+
+	.service-price {
+		font-size: 32rpx;
+		color: #FF4D6B;
+		font-weight: 500;
+	}
+
+	.service-count {
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+	.service-real {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding-top: 24rpx;
+		border-top: 1rpx solid rgba(0, 0, 0, 0.05);
+	}
+
+	.real-lable {
+		font-size: 24rpx;
+		color: #333333;
+	}
+
+	.real-price {
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #E8101E;
+	}
+
+	/* 订单信息卡片 */
+	.order-card {
+		margin: 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 24rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50);
+	}
+
+	.info-item {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 16rpx;
+	}
+
+	.label {
+		font-size: 28rpx;
+		color: #999999;
+	}
+
+	.value {
+		font-size: 28rpx;
+		color: #333333;
+	}
+
+	/* 底部按钮 */
+	.bottom-buttons {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 128rpx;
+		background-color: #FFFFFF;
+		display: flex;
+		flex-flow: row nowrap;
+		align-items: center;
+		justify-content: space-between;
+		box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
+		padding: 0 24rpx 0 78rpx;
+		/* #ifdef H5 */
+		padding-bottom: env(safe-area-inset-bottom);
+		/* #endif */
+		z-index: 999;
+	}
+
+	.contact-button {
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.contact-text {
+		font-size: 24rpx;
+		color: #666666;
+	}
+
+	.tell-icon {
+		width: 36rpx;
+		height: 36rpx;
+		margin-right: 8rpx;
+	}
+
+	.handel-button {
+		width: 240rpx;
+		height: 64rpx;
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: center;
+		align-items: center;
+		border-radius: 32rpx;
+	}
+
+	.btn-border {
+		border: 1rpx solid #E8101E;
+		background-color: #fff;
+		box-sizing: border-box;
+		margin-left: 20rpx;
+	}
+
+	.btn-bg {
+		background-color: #E8101E;
+	}
+
+	.button-text {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+	}
+
+	.btn-border .button-text {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #E8101E;
+	}
+
+	/* APP适配 */
+	/* #ifdef APP-PLUS */
+	.permission.transform {
+		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
+		opacity: 1;
+		visibility: visible;
+	}
+
+	.detail-page {
+		padding-bottom: 140rpx;
+	}
+
+	/* #endif */
+	/* 平台适配 */
+	/* #ifdef H5 */
+	.detail-page {
+		padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
+	}
+
+	/* #endif */
+
+	/* #ifdef MP-WEIXIN */
+	.custom-nav {
+		padding-top: calc(var(--status-bar-height) + constant(safe-area-inset-top));
+		padding-top: calc(var(--status-bar-height) + env(safe-area-inset-top));
+	}
+
+	/* #endif */
+</style>
\ No newline at end of file
diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue
index 834234a..13c7d3c 100644
--- a/pages/shop/photoAlbum/photoManage.vue
+++ b/pages/shop/photoAlbum/photoManage.vue
@@ -136,8 +136,11 @@
 		methods: {
 			todetail() {
 				console.log('详情');
+				// uni.navigateTo({
+				// 	url: '/pages/shop/skill-detail'
+				// })
 				uni.navigateTo({
-					url: '/pages/shop/skill-detail'
+					url: `/pages/agreement/agreement?type=${this.type==1?22:23}&title=${this.type==1?`相册配置说明`:`视频配置说明`}`
 				})
 			},
 			getItem(item) {
diff --git a/pages/shop/sj-info-change.vue b/pages/shop/sj-info-change.vue
index b4e0bfd..4a88b7c 100644
--- a/pages/shop/sj-info-change.vue
+++ b/pages/shop/sj-info-change.vue
@@ -1224,7 +1224,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="less">
 	.store-info-page {
 		padding-bottom: 20rpx;
 	}
@@ -1367,6 +1367,7 @@
 	.label-wrapper {
 		display: inline-flex;
 		align-items: center;
+		transform: translateY(4rpx);
 	}
 
 	.label {
@@ -1388,6 +1389,11 @@
 		align-items: flex-start;
 		justify-content: space-between;
 		padding: 24rpx;
+
+		.label {
+			transform: translateY(4rpx);
+		}
+
 	}
 
 	/* 左侧标签：固定宽度，不换行 */
diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue
index 9af1db2..b87fbf5 100644
--- a/pages/shop/userorder-detail.vue
+++ b/pages/shop/userorder-detail.vue
@@ -93,7 +93,7 @@
 			</view> -->
 
 			<!-- 用户信息 -->
-		<!-- 	<view class="shop_card" v-if="orderInfo.order_kind==2">
+			<!-- 	<view class="shop_card" v-if="orderInfo.order_kind==2">
 				<view class="userinfo">
 					<view class="" v-if="orderInfo.user_yh.head_photo">
 						<image :src="orderInfo.user_yh.head_photo" mode="widthFix"
@@ -653,10 +653,13 @@
 			// 开始服务
 			startOrder(e, order) {
 				// app阻止事件冒泡
-				// #ifdef APP-PLUS
-				e.preventDefault();
-				e.stopPropagation();
-				// #endif
+				if (order.team_buy_order_state == 1) {
+					uni.showToast({
+						title: "订单当前处于拼团中，服务将在拼团完成后才开启~",
+						icon: "none",
+					});
+					return
+				}
 				this.showInput = true
 			},
 			// 输入完成
@@ -664,15 +667,20 @@
 				this.showInput = false;
 				if (this.clickType) return;
 				this.clickType = true;
-				uni.showLoading({ title: '服务开始中...' });
-				
+				uni.showLoading({
+					title: '服务开始中...'
+				});
+
 				request.post(this.urls[this.serviceType].startOrder, {
 					id: this.orderInfo.id,
 					server_code: code,
 					sjid: this.userInfo.id
 				}).then(res => {
 					if (res.state == 1) {
-						uni.showToast({ title: res.msg, icon: 'success' });
+						uni.showToast({
+							title: res.msg,
+							icon: 'success'
+						});
 						// 直接修改状态为 4（待完成）
 						this.orderInfo.state = 4;
 						// 强制刷新视图，按钮立即变化
@@ -687,11 +695,17 @@
 							prevPage.$vm.getOrderList?.();
 						}
 					} else if (res.state == 2) {
-						uni.showToast({ title: res.msg, icon: 'none' });
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
 					}
 				}).catch(err => {
 					console.error('开始服务失败', err);
-					uni.showToast({ title: '操作失败', icon: 'none' });
+					uni.showToast({
+						title: '操作失败',
+						icon: 'none'
+					});
 				}).finally(() => {
 					this.clickType = false;
 					uni.hideLoading();
@@ -1695,7 +1709,8 @@
 		text-align: left;
 		font-style: normal;
 	}
-	.coupon-title{
+
+	.coupon-title {
 		width: 160rpx;
 		height: 40rpx;
 		font-family: PingFangSC, PingFang SC;
@@ -1706,5 +1721,6 @@
 		text-align: left;
 		font-style: normal;
 	}
+
 	.coupon-item {}
 </style>
\ No newline at end of file
diff --git a/pages/shop/userorders.vue b/pages/shop/userorders.vue
index 0236388..26ae105 100644
--- a/pages/shop/userorders.vue
+++ b/pages/shop/userorders.vue
@@ -249,7 +249,7 @@
 						console.log(res);
 						if (res.state == 1 || res.code == 200) {
 							uni.showToast({
-								title: res.msg,
+								title: "开始服务",
 								icon: "none",
 							});
 							this.$refs.groupRef.manualRefresh(this.listQuery);
diff --git a/pages/shop/workSpace/components/orderCard.vue b/pages/shop/workSpace/components/orderCard.vue
index 659c20f..134d454 100644
--- a/pages/shop/workSpace/components/orderCard.vue
+++ b/pages/shop/workSpace/components/orderCard.vue
@@ -126,7 +126,7 @@
 					"待支付",
 					"待接单",
 					"待开始",
-					"进行中",
+					"待完成",
 					"已完成",
 					"已评价",
 					"已取消",

From 4dc74695de2826d200eff3913bc8798eb6694205 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Sun, 19 Apr 2026 15:57:27 +0800
Subject: [PATCH 003/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/manHourDetail.vue | 80 +++++++++++++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/pages/shop/manHourDetail.vue b/pages/shop/manHourDetail.vue
index 100bdd9..c15b404 100644
--- a/pages/shop/manHourDetail.vue
+++ b/pages/shop/manHourDetail.vue
@@ -5,7 +5,22 @@
 			:backgroundColor="backgroundColor"></custom-navbar>
 		<view class="content-part">
 			<!-- 订单状态 -->
-			<view class="status-section">
+			<view class="status-section2" v-if="orderInfo.state == '2' || orderInfo.state == '3'">
+				<view class="service-code">
+					<text class="service-code-value">{{ orderInfo.server_code }}</text>
+					<image class="service-code-label" mode="widthFix"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e306ce60-c10c-4eec-a8bf-1b064fc21a32.png" />
+				</view>
+				<view class="status-row">
+					<image class="status-section-image" mode="widthFix"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/27783709-3bda-472a-ab6a-824ed4b11d2a.png" />
+					<text class="status-text-red">
+						{{ stateItem.text }}
+						<text class="status-text-normal">，请上门/到店后出示服务码</text>
+					</text>
+				</view>
+			</view>
+			<view v-else class="status-section">
 				<image class="status-section-image" mode="widthFix" :src="stateItem.icon" />
 				<text class="status-text">{{ stateItem.text }}</text>
 			</view>
@@ -686,6 +701,69 @@
 		font-weight: 600;
 	}
 
+	/* 服务码状态区域 */
+	.status-section2 {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding-top: 55rpx;
+		padding-bottom: 20rpx;
+		gap: 20rpx;
+
+		.status-row {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: auto;
+		}
+
+		.status-section-image {
+			width: 27rpx;
+			margin-right: 6rpx;
+			margin-top: -4rpx;
+		}
+
+		.service-code {
+			display: flex;
+			align-items: baseline;
+			justify-content: center;
+			width: auto;
+			padding-bottom: 20rpx;
+
+			.service-code-label {
+				width: 96rpx;
+				height: 41rpx;
+				margin-left: 6rpx;
+				position: relative;
+				top: -45rpx;
+			}
+
+			.service-code-value {
+				font-family: DINPro, DINPro;
+				font-weight: bold;
+				font-size: 80rpx;
+				color: #333333;
+				line-height: 103rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		.status-text-red {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #DC232F;
+			line-height: 37rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.status-text-normal {
+			color: #333333;
+		}
+	}
+
 	/* 预约手艺人信息卡片 */
 	.syr-card {
 		margin: 30rpx;

From f560bcb69d034b11dbcb4e260d6d7afb95406565 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Mon, 20 Apr 2026 10:41:15 +0800
Subject: [PATCH 004/118] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=94=99=E8=AF=AF=E7=9A=84=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artisan/add-service.vue | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/pages/artisan/add-service.vue b/pages/artisan/add-service.vue
index bbba759..4fe750c 100644
--- a/pages/artisan/add-service.vue
+++ b/pages/artisan/add-service.vue
@@ -364,19 +364,6 @@
       >
     </view>
 
-    <!-- 新增上门提醒弹窗-->
-    <transition name="fade">
-      <view class="popup-mask2" v-if="showReminderPopup" @click="closeReminderPopup(false)">
-        <view class="popup-content2" @click.stop>
-          <view class="popup-title">提示</view>
-          <view class="popup-message">此服务是需要上门服务的哦～</view>
-          <view class="popup-buttons">
-            <view class="popup-btn popup-btn-notshow" @click="closeReminderPopup(true)">不再提示</view>
-            <view class="popup-btn popup-btn-know" @click="closeReminderPopup(false)">我已知晓</view>
-          </view>
-        </view>
-      </view>
-    </transition>
 
   </view>
 </template>
@@ -402,7 +389,6 @@ export default {
   },
   data() {
     return {
-      showReminderPopup: false,
       artisanType: getApp().globalData.artisanType,
       nowQer: "xc",
       progress: 0,
@@ -474,11 +460,6 @@ export default {
         this.serviceTypes = this.serviceTypes.concat(res.data);
       });
     }
-    // 判断是否显示上门提醒弹窗
-    const notShow = uni.getStorageSync('addServiceReminderNotShow');
-    if (!notShow) {
-      this.showReminderPopup = true;
-    }
     this.getUserInfo();
   },
   computed: {
@@ -575,14 +556,6 @@ export default {
       return true;
     },
 
-
-    closeReminderPopup(notShowAgain) {
-      console.log('关闭弹窗，不再提示：', notShowAgain);
-      if (notShowAgain) {
-        uni.setStorageSync('addServiceReminderNotShow', true);
-      }
-      this.showReminderPopup = false;
-    },
     goImgAndText() {
       uni.navigateTo({
         url: `/pages/shop/add-img-text?list=${this.formData.graphic_details}`,

From b4ebbd533c6ea6dda6e1e504b36251931152fbd5 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Mon, 20 Apr 2026 11:06:14 +0800
Subject: [PATCH 005/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/SellerDetail.vue |  2 +-
 pages/shop/add-service.vue  | 26 +-------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/pages/shop/SellerDetail.vue b/pages/shop/SellerDetail.vue
index d3aa5e3..da5a21d 100644
--- a/pages/shop/SellerDetail.vue
+++ b/pages/shop/SellerDetail.vue
@@ -1016,7 +1016,7 @@
 	}
 
 	.btn-border {
-		border: 1rpx solid #979797;
+		border: 2rpx solid #979797;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 30rpx;
diff --git a/pages/shop/add-service.vue b/pages/shop/add-service.vue
index 3e7c7d9..f85bb6a 100644
--- a/pages/shop/add-service.vue
+++ b/pages/shop/add-service.vue
@@ -276,19 +276,7 @@
 			<view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。</view>
 		</view>
 
-		<!-- 新增上门提醒弹窗-->
-		<transition name="fade">
-			<view class="popup-mask2" v-if="showReminderPopup" @click="closeReminderPopup(false)">
-				<view class="popup-content2" @click.stop>
-					<view class="popup-title">提示</view>
-					<view class="popup-message">此服务是需要上门服务的哦～</view>
-					<view class="popup-buttons">
-						<view class="popup-btn popup-btn-notshow" @click="closeReminderPopup(true)">不再提示</view>
-						<view class="popup-btn popup-btn-know" @click="closeReminderPopup(false)">我已知晓</view>
-					</view>
-				</view>
-			</view>
-		</transition>
+		
 
 	</view>
 </template>
@@ -316,7 +304,6 @@
 		},
 		data() {
 			return {
-				showReminderPopup: false,
 				artisanType: getApp().globalData.artisanType,
 				nowQer: "xc",
 				progress: 0,
@@ -391,9 +378,6 @@
 			}
 			// 判断是否显示上门提醒弹窗
 			const notShow = uni.getStorageSync('addServiceReminderNotShow');
-			// if (!notShow) {
-			// 	this.showReminderPopup = true;
-			// }
 			this.getUserInfo();
 		},
 		computed: {
@@ -513,14 +497,6 @@
 				return true;
 			},
 
-
-			closeReminderPopup(notShowAgain) {
-				console.log('关闭弹窗，不再提示：', notShowAgain);
-				if (notShowAgain) {
-					uni.setStorageSync('addServiceReminderNotShow', true);
-				}
-				this.showReminderPopup = false;
-			},
 			goImgAndText() {
 				uni.navigateTo({
 					url: `/pages/shop/add-img-text?list=${this.formData.graphic_details}`,

From b584f8f97b6a583ddede37d76310021f5d77a173 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Mon, 20 Apr 2026 13:27:15 +0800
Subject: [PATCH 006/118] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=97=A8=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/manHour/components/orderCard.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pages/shop/manHour/components/orderCard.vue b/pages/shop/manHour/components/orderCard.vue
index f130e57..9bbae47 100644
--- a/pages/shop/manHour/components/orderCard.vue
+++ b/pages/shop/manHour/components/orderCard.vue
@@ -40,6 +40,8 @@
 
 		<!-- 时间信息 -->
 		<!-- <view class="time-info"><text style="color:#999999 ;">服务时段：</text>{{ useTime }}</view> -->
+		 <!-- 上门地址 -->
+		 <view class="order-address" v-if="dataItem.user_sj.address">上门地址：{{ dataItem.user_sj.address }}</view>
 
 		<!-- 操作按钮 -->
 		<view class="button-group">
@@ -304,6 +306,16 @@
 		font-style: normal;
 	}
 
+	.order-address {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 24rpx;
+	}
+
 	/* 时间信息 */
 	.time-info {
 		font-weight: 400;
@@ -321,7 +333,7 @@
 		display: flex;
 		justify-content: flex-end;
 		gap: 30rpx;
-		padding-top: 20rpx;
+		// padding-top: 20rpx;
 		padding-bottom: 30rpx;
 	}
 

From 7fabbd8549c6ff475fb66a942131a71749b29242 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Mon, 20 Apr 2026 15:37:07 +0800
Subject: [PATCH 007/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/staff/serviceList.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/shop/staff/serviceList.vue b/pages/shop/staff/serviceList.vue
index fcc19c9..eb114d6 100644
--- a/pages/shop/staff/serviceList.vue
+++ b/pages/shop/staff/serviceList.vue
@@ -26,8 +26,11 @@
 				<!-- <view class="item-right" @click="item.is_choice = !item.is_choice">
 					{{ item.is_choice ? "取消" : "添加" }}
 				</view> -->
-				<image class="item-right" src="/static/images/icons/staffCancel.png" @click="changeType(item)" v-if="item.is_choice"></image>
-				<image class="item-right" src="/static/images/icons/staffAdd.png" @click="changeType(item)" v-else></image>
+				<view v-if="isBack==0">
+					<image class="item-right" src="/static/images/icons/staffCancel.png" @click="changeType(item)" v-if="item.is_choice"></image>
+					<image class="item-right" src="/static/images/icons/staffAdd.png" @click="changeType(item)" v-else></image>
+				</view>
+				
 			</view>
 		</view>
 		<view class="container-footer">

From 49b50dc1f0427372ddc24e83a153a41272c1af0a Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Mon, 20 Apr 2026 15:42:20 +0800
Subject: [PATCH 008/118] =?UTF-8?q?=E5=95=86=E5=AE=B6bug=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/workSpace/components/orderCard.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pages/shop/workSpace/components/orderCard.vue b/pages/shop/workSpace/components/orderCard.vue
index 134d454..dd6b27a 100644
--- a/pages/shop/workSpace/components/orderCard.vue
+++ b/pages/shop/workSpace/components/orderCard.vue
@@ -2,7 +2,9 @@
 	<view class="order-card" @click="goDetail">
 		<!-- 订单编号 -->
 		<view class="orderNumBox">
-			<view class="order-id white-space-nowrap">订单编号：{{ dataItem.number }}</view>
+			<!-- <view class="order-id white-space-nowrap">订单编号：{{ dataItem.number }}</view> -->
+			<view class="order-id white-space-nowrap"><text style="color:#999999 ;">服务时段：</text>{{ useTime }}</view>
+
 			<view class="stateText" :class="{
 				stateText2: dataItem.state > 4 && dataItem.state !== 7,  // 排除已取消
 				stateText3: dataItem.state === 7  // 已取消状态单独处理
@@ -38,7 +40,8 @@
 		</view>
 
 		<!-- 时间信息 -->
-		<view class="time-info"><text style="color:#999999 ;">服务时段：</text>{{ useTime }}</view>
+		<!-- <view class="time-info"><text style="color:#999999 ;">服务时段：</text>{{ useTime }}</view> -->
+		<view class="address"><text style="color:#999999 ;">工位地址：</text>{{ dataItem.user_sj.address }}</view>
 
 		<!-- 操作按钮 -->
 		<view class="button-group" v-if="dataItem.state > 1 && dataItem.state < 5">
@@ -305,6 +308,16 @@
 		padding-bottom: 20rpx;
 		margin-top: 28rpx;
 	}
+	.address {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #999;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+		padding-bottom: 20rpx;
+		margin-top: 28rpx;
+	}
 
 	/* 按钮组 */
 	.button-group {

From 95f880a251f14f07a7a78416a78ae50e14aae4c4 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Mon, 20 Apr 2026 17:56:29 +0800
Subject: [PATCH 009/118] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/workSpace/components/orderCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/shop/workSpace/components/orderCard.vue b/pages/shop/workSpace/components/orderCard.vue
index dd6b27a..41613b0 100644
--- a/pages/shop/workSpace/components/orderCard.vue
+++ b/pages/shop/workSpace/components/orderCard.vue
@@ -48,7 +48,7 @@
 			<view class="btn cancel-btn" v-if="dataItem.state == 2 || dataItem.state == 3" @click.stop="emitCancel">取消订单
 			</view>
 			<view class="btn accept-btn" @click.stop="emitAccept" v-if="dataItem.state == 2">接单</view>
-			<view class="btn accept-btn" @click.stop="emitStart" v-if="dataItem.state == 3">开始订单</view>
+			<view class="btn accept-btn" @click.stop="emitStart" v-if="dataItem.state == 3">开始服务</view>
 			<view class="btn accept-btn" @click.stop="emitDone" v-if="dataItem.state == 4">完成订单</view>
 		</view>
 	</view>

From 0e3e1fb5fa1d22a96eda9808d2c1ef16b3fbc28c Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Tue, 21 Apr 2026 17:07:28 +0800
Subject: [PATCH 010/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/photoAlbum/photoManage.vue | 49 +++++++++++++++++----------
 pages/shop/photoAlbum/videoList.vue   | 37 ++++++++++----------
 pages/shop/staff/addStaff.vue         |  6 ++--
 pages/shop/staff/serviceList.vue      |  1 +
 utils/request.js                      |  4 +--
 5 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue
index 13c7d3c..09ca84e 100644
--- a/pages/shop/photoAlbum/photoManage.vue
+++ b/pages/shop/photoAlbum/photoManage.vue
@@ -5,7 +5,7 @@
 		<view class="container-titles flex-row-center-between">
 			<view class="titles-left">
 				<view class="titles-bar"></view>
-				<text class="titles-title">我的资料</text>
+				<text class="titles-title">{{ titleList[type].title2 }}</text>
 			</view>
 			<view class="titles-right" @click="todetail">
 				<text class="titles-text">展示位置及拍摄技巧</text>
@@ -112,6 +112,16 @@
 						}
 					],
 				},
+				titleList: {
+					1: {
+						title: "商家图片",
+						title2: "商家相册"
+					},
+					2: {
+						title: "视频作品",
+						title2: "商家视频"
+					},
+				},
 				imgVideoList: {
 
 				},
@@ -179,25 +189,28 @@
 				// });
 			},
 			goAdd(id, item) {
-				if (this.type == 1) {
-					if (this.imgVideoList[id] && this.imgVideoList[id].length >= 21) {
-						uni.showToast({
-							title: '最多上传20张图片',
-							icon: 'none',
-							duration: 2000
-						});
-						return
-					}
-				} else if (this.type == 2) {
-					if (this.imgVideoList[id] && this.imgVideoList[id].length >= 10) {
-						uni.showToast({
-							title: '最多上个10张视频',
-							icon: 'none',
-							duration: 2000
-						});
-						return
+				if (!item) {
+					if (this.type == 1) {
+						if (this.imgVideoList[id] && this.imgVideoList[id].length >= 20) {
+							uni.showToast({
+								title: '最多上传20张图片',
+								icon: 'none',
+								duration: 2000
+							});
+							return
+						}
+					} else if (this.type == 2) {
+						if (this.imgVideoList[id] && this.imgVideoList[id].length >= 10) {
+							uni.showToast({
+								title: '最多上个10张视频',
+								icon: 'none',
+								duration: 2000
+							});
+							return
+						}
 					}
 				}
+
 				// 1. 原有逻辑：分类id为空，拦截提示
 				if (!id) {
 					uni.showToast({
diff --git a/pages/shop/photoAlbum/videoList.vue b/pages/shop/photoAlbum/videoList.vue
index 9d2699c..abd5501 100644
--- a/pages/shop/photoAlbum/videoList.vue
+++ b/pages/shop/photoAlbum/videoList.vue
@@ -171,25 +171,28 @@
 			},
 			goAdd(id, item) {
 				if (this.isManage) return; // 管理模式下禁止跳转
-				if (this.type == 1) {
-					if (this.imgVideoList.length >= 20) {
-						uni.showToast({
-							title: '最多上传20张图片',
-							icon: 'none',
-							duration: 2000
-						});
-						return
-					}
-				} else if (this.type == 2) {
-					if (this.imgVideoList.length >= 10) {
-						uni.showToast({
-							title: '最多上10个视频',
-							icon: 'none',
-							duration: 2000
-						});
-						return
+				if(!item){
+					if (this.type == 1) {
+						if (this.imgVideoList.length >= 20) {
+							uni.showToast({
+								title: '最多上传20张图片',
+								icon: 'none',
+								duration: 2000
+							});
+							return
+						}
+					} else if (this.type == 2) {
+						if (this.imgVideoList.length >= 10) {
+							uni.showToast({
+								title: '最多上10个视频',
+								icon: 'none',
+								duration: 2000
+							});
+							return
+						}
 					}
 				}
+				
 				if (!id) {
 					uni.showToast({
 						title: '参数异常，无法上传',
diff --git a/pages/shop/staff/addStaff.vue b/pages/shop/staff/addStaff.vue
index a313eb1..9eb0dd6 100644
--- a/pages/shop/staff/addStaff.vue
+++ b/pages/shop/staff/addStaff.vue
@@ -12,7 +12,7 @@
 		<searchBox placeholder="请输入员工手机号" class="searchBox" v-model="queryData.phone" bgClor="transparent" @confirm="search"
 			@search="search">
 		</searchBox>
-		<scroll-view  :style="{ height:`calc(100vh - ${statusBarHeight + 200}rpx)`} ">
+		<scroll-view scroll-y  :style="{ height:`calc(100vh - ${statusBarHeight + 200}rpx)`} ">
 			<view class="page-container" v-if="sryDetail && sryDetail.id">
 				<!-- 个人信息栏 -->
 				<view class="user-info">
@@ -72,11 +72,13 @@
 					<text>，再进行添加操作。</text>
 				</view>
 			</view>
+			
+			<view class="" style="height: 200rpx;"></view>
 			<view class="agreement-footer" @click="sjinvitesyr" v-if="sryDetail && sryDetail.id && sryDetail.bind_state!=1">
 				<view class="agreement-btn">邀请员工</view>
 			</view>
-			<!-- <view class="" style="height: 98rpx;background-color: aquamarine;"></view> -->
 		</scroll-view>
+		
 	</view>
 </template>
 
diff --git a/pages/shop/staff/serviceList.vue b/pages/shop/staff/serviceList.vue
index eb114d6..8636f8f 100644
--- a/pages/shop/staff/serviceList.vue
+++ b/pages/shop/staff/serviceList.vue
@@ -142,6 +142,7 @@
 			background-color: #fff;
 			margin: 20rpx 20rpx 26rpx 20rpx;
 			border-radius: 10rpx;
+			padding-bottom: 150rpx;
 
 			.service-item {
 				padding-top: 20rpx;
diff --git a/utils/request.js b/utils/request.js
index ff89727..151428f 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -134,12 +134,12 @@ const request = async (options, isUpdate) => {
 
 
 	if (process.env.NODE_ENV === 'development') {
-		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。	
+		//baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。	
 		baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'https://app.mrrweb.com.cn';
 	} else {
-		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
+		//baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
 		baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。	
 			//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'https://app.mrrweb.com.cn';

From 211b33f63fdcde68bf42cacbb56cf89560fb1831 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 21 Apr 2026 19:06:52 +0800
Subject: [PATCH 011/118] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/SellerDetail.vue       | 18 ++++++++++++++----
 pages/shop/manHourDetail.vue      |  2 +-
 pages/shop/workSpace/saleList.vue | 11 +++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pages/shop/SellerDetail.vue b/pages/shop/SellerDetail.vue
index da5a21d..8d7005c 100644
--- a/pages/shop/SellerDetail.vue
+++ b/pages/shop/SellerDetail.vue
@@ -240,7 +240,7 @@
 			}
 
 			if (options.identity) {
-				this.identity = options.identity;
+				this.identity = parseInt(options.identity);
 			}
 			if (options.order_id) {
 				// 请求订单详情
@@ -547,6 +547,7 @@
 						server_code: code,
 					})
 					.then((res) => {
+						console.log('API Response:', res);
 						if (res.code == 200) {
 							uni.showToast({
 								title: res.msg,
@@ -559,10 +560,19 @@
 								prevPage.$vm.getOrderNumber();
 								prevPage.$vm.getOrderList();
 							}
+						} else if (res.state == 1) {
+							uni.showToast({
+								title: res.msg,
+								icon: "none"
+							});
+							this.getOrderDetail();
+							const pages = getCurrentPages();
+							const prevPage = pages[pages.length - 2];
+							if (prevPage) {
+								prevPage.$vm.getOrderNumber();
+								prevPage.$vm.getOrderList();
+							}
 						}
-						// else if (res.state == 2) {
-						//   uni.showToast({ title: res.msg, icon: "none" });
-						// }
 						this.handelOrder = {};
 					}).finally(() => {
 						this.clickType = false
diff --git a/pages/shop/manHourDetail.vue b/pages/shop/manHourDetail.vue
index c15b404..29fd098 100644
--- a/pages/shop/manHourDetail.vue
+++ b/pages/shop/manHourDetail.vue
@@ -1066,7 +1066,7 @@
 	}
 
 	.btn-border {
-		border: 1rpx solid #E8101E;
+		border: 2rpx solid #E8101E;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 60rpx;
diff --git a/pages/shop/workSpace/saleList.vue b/pages/shop/workSpace/saleList.vue
index 64bd9f9..6068598 100644
--- a/pages/shop/workSpace/saleList.vue
+++ b/pages/shop/workSpace/saleList.vue
@@ -229,7 +229,18 @@
 						server_code: code,
 					})
 					.then((res) => {
+						console.log('API Response:', res);
 						if (res.code == 200) {
+							uni.showToast({
+								title: res.msg,
+								icon: "none"
+							});
+							this.getServicesList();
+						} else if (res.state == 1) {
+							uni.showToast({
+								title: res.msg,
+								icon: "none"
+							});
 							this.getServicesList();
 						}
 					}).finally(() => {

From aa43bcf4fd7c97978d5a5fe192e8902078ff0ec5 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Wed, 22 Apr 2026 16:50:09 +0800
Subject: [PATCH 012/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/address/search.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pages/address/search.vue b/pages/address/search.vue
index 808b6b7..d7467a0 100644
--- a/pages/address/search.vue
+++ b/pages/address/search.vue
@@ -2293,6 +2293,15 @@
                 const currentPage = pages[pages.length - 1]
                 const source = this.source || currentPage.options.source
 
+                //特殊处理重庆
+				if(addressItem.cityCode == 500100){
+					addressItem.cityname = "重庆城区"
+				}
+				if(addressItem.cityCode == 500200){
+					addressItem.cityname = "重庆郊县"
+				}
+				
+
                 if (source === 'syr_info') {
                     uni.$emit('address-selected-for-syr', addressItem)
                     uni.setStorageSync('syr_selected_address', addressItem)

From f1e4ee07b0cbb8ac349eb16c43125612c11bd72b Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Wed, 22 Apr 2026 17:55:06 +0800
Subject: [PATCH 013/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/buyorder-detail.vue  | 205 ++++++++++++++++++++++++++------
 pages/shop/userorder-detail.vue |   8 +-
 2 files changed, 172 insertions(+), 41 deletions(-)

diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue
index f20a06e..24da70a 100644
--- a/pages/shop/buyorder-detail.vue
+++ b/pages/shop/buyorder-detail.vue
@@ -5,43 +5,48 @@
 			backgroundColor="transparent"></custom-navbar>
 		<view class="content-part">
 			<!-- 订单状态 -->
-			<!-- <view class="status-section">
-      <text class="status-text">{{orderInfo.state == 1 ? '待支付' : orderInfo.state == 2 ? '待接单' : orderInfo.state == 3 ? '待服务' : orderInfo.state == 4 ? '服务中' : orderInfo.state == 5 ? '已完成' : orderInfo.state == 6 ? '待评价' : orderInfo.state == 7 ? '已取消' : ''}}</text>
-    </view> -->
-			<view class="status-section">
+			<view class="status-section2" v-if="orderInfo.state == '2' || orderInfo.state == '3'">
+				<view class="service-code">
+					<text class="service-code-value">{{ orderInfo.server_code }}</text>
+					<image class="service-code-label" mode="widthFix"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e306ce60-c10c-4eec-a8bf-1b064fc21a32.png" />
+				</view>
+				<view class="status-row">
+					<image class="status-section-image" mode="widthFix"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/27783709-3bda-472a-ab6a-824ed4b11d2a.png" />
+					<text class="status-text-red">
+						{{ stateItem.text }}
+						<text v-if="orderInfo.team_buy_order_state">{{
+			            ` (${getGroupType(orderInfo.team_buy_order_state)})`
+			          }}</text>
+						<text class="status-text-normal">，请上门/到店后出示服务码</text>
+					</text>
+				</view>
+			</view>
+			<view v-else class="status-section">
 				<image class="status-section-image" mode="widthFix" :src="stateItem.icon" />
-				<text class="status-text">{{ stateItem.text }}</text>
+				<text class="status-text">{{ stateItem.text }}
+					<text v-if="orderInfo.team_buy_order_state">{{
+			            ` (${getGroupType(orderInfo.team_buy_order_state)})`
+			          }}</text>
+				</text>
 			</view>
 
-			<!-- 到家订单 客户以及手艺人信息 -->
-			<view class="service-card">
-				<view class="location-info">
-					<image src="/static/images/gohome_location.png" class="location-icon"></image>
-					<view class="address-info">
-						<view class="name-phone">
-							<text class="name">{{userInfo.name}}</text>
-							<text class="phone">{{userInfo.account}}</text>
-						</view>
-						<text class="address">{{userInfo.dependency}}{{userInfo.address}}</text>
-					</view>
+			<!-- 预约手艺人信息 -->
+			<view class="syr-card">
+				<view class="syr-card-header">
+					预约手艺人信息
 				</view>
-				<image src="/static/images/boder_icon.png" mode="aspectFill" class="divider"></image>
-				<view class="staff-info">
-					<image :src="user_syr.head_photo" mode="aspectFill" class="staff-avatar"></image>
-					<view class="staff-detail">
-						<text class="staff-name">{{user_syr.name}}</text>
-						<view class="rating">
-							<!-- <image 
-              v-for="(star, index) in 5" 
-              :key="index"
-              src="/static/images/star.png" 
-              class="star-icon"
-            ></image> -->
-						</view>
+				<view class="syr-card-footer flex-row-center-between">
+					<view class="syr-card-footer-left flex-row-center">
+						<image class="syr-card-footer-left-img" :src="user_syr.head_photo"></image>
+						<view class="syr-card-footer-left-text">{{ `${user_syr.name} ${user_syr.account}` }}</view>
 					</view>
-					<!-- <image src="/static/images/order_phone.png" class="phone-btn" @click="contactService(user_syr.account)"></image> -->
+					<image class="syr-card-footer-right" @click="contactService(user_syr.account)"
+						src="/static/images/icons/phone.png"></image>
 				</view>
 			</view>
+			
 
 
 			<!-- 预约信息 -->
@@ -49,7 +54,7 @@
 				<view class="card-header" v-if="orderInfo.order_kind == 1">
 					<text class="card-title">预约信息</text>
 					<view>
-						<text class="update-time">{{orderInfo.reservation_time}}</text>
+						<text class="update-time">{{`服务时间 ${orderInfo.reservation_time}`}}</text>
 						<!-- <text class="update-change">更改时间</text> -->
 					</view>
 				</view>
@@ -64,7 +69,7 @@
 					<text class="service-count">×1</text>
 				</view>
 				<view class="service-real">
-					<text class="real-lable">实际支付金额：</text>
+					<text class="real-lable">实付金额：</text>
 					<text class="real-price">￥{{orderInfo.pay_money}}</text>
 				</view>
 			</view>
@@ -72,10 +77,6 @@
 			<!-- 订单信息 -->
 			<view class="order-card">
 				<text class="card-title">订单信息</text>
-				<view class="info-item" v-if="orderInfo.state!=7">
-					<text class="label">服务码</text>
-					<text class="value">{{orderInfo.server_code}}</text>
-				</view>
 				<view class="info-item">
 					<text class="label">订单编号</text>
 					<text class="value">{{orderInfo.number}}</text>
@@ -228,6 +229,15 @@
 			},
 		},
 		methods: {
+			getGroupType(teamBuyOrderState) {
+				let list = [
+					{ id: 1, text: "拼团中" },
+					{ id: 2, text: "已成团" },
+					{ id: 3, text: "拼团失败" }
+				];
+				let name = list.find((it) => it.id == teamBuyOrderState)?.text;
+				return name;
+			},
 			getOrderDetail() {
 				request.post('/sj/sjorderdetail', {
 					id: this.id,
@@ -476,6 +486,20 @@
 		background-color: #fff;
 	}
 
+	/* 辅助类 */
+	.flex-row-center-between {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.flex-row-center {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+
 	.detail-page::before {
 		content: '';
 		position: fixed;
@@ -558,7 +582,114 @@
 		color: #333333;
 		font-weight: 600;
 	}
-	
+
+	/* 服务码状态区域 */
+	.status-section2 {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding-top: 55rpx;
+		padding-bottom: 20rpx;
+		gap: 20rpx;
+
+		.status-row {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: auto;
+		}
+
+		.status-section-image {
+			width: 27rpx;
+			height: auto;
+			margin-right: 6rpx;
+			margin-top: -4rpx;
+		}
+
+		.service-code {
+			display: flex;
+			align-items: baseline;
+			justify-content: center;
+			width: auto;
+			padding-bottom: 20rpx;
+
+			.service-code-label {
+				width: 96rpx;
+				height: 41rpx;
+				margin-left: 6rpx;
+				position: relative;
+				top: -45rpx;
+			}
+
+			.service-code-value {
+				font-family: DINPro, DINPro;
+				font-weight: bold;
+				font-size: 80rpx;
+				color: #333333;
+				line-height: 103rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		.status-text-red {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #DC232F;
+			line-height: 37rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.status-text-normal {
+			color: #333333;
+		}
+	}
+
+	/* 预约手艺人信息卡片 */
+	.syr-card {
+		margin: 30rpx;
+		background-color: #ffffff;
+		padding: 30rpx 20rpx;
+		border-radius: 16rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
+
+		.syr-card-header {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			line-height: 45rpx;
+			text-align: left;
+			font-style: normal;
+			margin-bottom: 40rpx;
+		}
+
+		.syr-card-footer {
+			.syr-card-footer-left {
+				.syr-card-footer-left-img {
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.syr-card-footer-left-text {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+					line-height: 40rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+
+			.syr-card-footer-right {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	}
 
 	/* 服务人员卡片 */
 	.service-card {
diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue
index b87fbf5..9d9aaa4 100644
--- a/pages/shop/userorder-detail.vue
+++ b/pages/shop/userorder-detail.vue
@@ -621,9 +621,9 @@
 							}
 							this.clickType = true
 							request.post(url, data).then(res => {
-								if (res.state == 1) {
+								if (res.state == 1 || res.code == 200) {
 									uni.showToast({
-										title: '取消成功！',
+										title: res.msg,
 										icon: 'none'
 									})
 									this.getOrderDetail();
@@ -676,7 +676,7 @@
 					server_code: code,
 					sjid: this.userInfo.id
 				}).then(res => {
-					if (res.state == 1) {
+					if (res.state == 1 || res.code == 200) {
 						uni.showToast({
 							title: res.msg,
 							icon: 'success'
@@ -726,7 +726,7 @@
 					id: order.id,
 					sjid: this.userInfo.id
 				}).then(res => {
-					if (res.state == 1) {
+					if (res.state == 1 || res.code == 200) {
 						uni.showToast({
 							title: res.msg,
 							icon: 'none'

From a159fbdb222382eb48c6f0deb62ede95db75dbf9 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 23 Apr 2026 10:13:27 +0800
Subject: [PATCH 014/118] =?UTF-8?q?=E5=95=86=E5=AE=B6=E5=B7=A5=E4=BD=8D?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=9B=A0=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AF=BC=E8=87=B4=E7=9A=84=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BAbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/SellerDetail.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pages/shop/SellerDetail.vue b/pages/shop/SellerDetail.vue
index 8d7005c..2f9ae10 100644
--- a/pages/shop/SellerDetail.vue
+++ b/pages/shop/SellerDetail.vue
@@ -377,15 +377,18 @@
 					})
 					.then((res) => {
 						if (this.identity == 0) {
+							// 商家视角：优先使用手艺人信息，若没有则使用商家自己的信息
+							const provider = res.data.user_syr || res.data.user_sj || {};
 							this.orderInfo = res.data ? {
-								...res.data.order,
-								...res.data.work_seat,
-								...res.data.user_syr,
-								work_hour_id: res.data.work_seat.id,
-								order_id: res.data.order.id,
-								user_sj_id: res.data.user_syr.id,
+							...res.data.order,
+							...res.data.work_seat,
+							...provider,
+							work_hour_id: res.data.work_seat.id,
+							order_id: res.data.order.id,
+							user_sj_id: provider.id,
 							} : {};
 						} else if (this.identity == 1) {
+							 // 手艺人视角
 							this.orderInfo = res.data ? {
 								...res.data.order,
 								...res.data.work_hour,

From 7a5181a63835985394f0d196a27b0a1eef07c614 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 23 Apr 2026 10:23:34 +0800
Subject: [PATCH 015/118] =?UTF-8?q?=E5=95=86=E5=AE=B6=E5=B7=A5=E4=BD=8D?=
 =?UTF-8?q?=E3=80=81=E5=B7=A5=E6=97=B6=E8=AE=A2=E5=8D=95=E5=9B=A0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/SellerDetail.vue  | 15 +++++++--------
 pages/shop/manHourDetail.vue |  5 +++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pages/shop/SellerDetail.vue b/pages/shop/SellerDetail.vue
index 2f9ae10..47a86ab 100644
--- a/pages/shop/SellerDetail.vue
+++ b/pages/shop/SellerDetail.vue
@@ -377,15 +377,14 @@
 					})
 					.then((res) => {
 						if (this.identity == 0) {
-							// 商家视角：优先使用手艺人信息，若没有则使用商家自己的信息
-							const provider = res.data.user_syr || res.data.user_sj || {};
+							const userSyr = res.data.user_syr || {};  // 避免 null 展开报错
 							this.orderInfo = res.data ? {
-							...res.data.order,
-							...res.data.work_seat,
-							...provider,
-							work_hour_id: res.data.work_seat.id,
-							order_id: res.data.order.id,
-							user_sj_id: provider.id,
+								...res.data.order,
+								...res.data.work_seat,
+								...userSyr,
+								work_hour_id: res.data.work_seat.id,
+								order_id: res.data.order.id,
+								syr_id: userSyr.id,           // 用于判断是否有手艺人/顾客信息
 							} : {};
 						} else if (this.identity == 1) {
 							 // 手艺人视角
diff --git a/pages/shop/manHourDetail.vue b/pages/shop/manHourDetail.vue
index 29fd098..5229af5 100644
--- a/pages/shop/manHourDetail.vue
+++ b/pages/shop/manHourDetail.vue
@@ -411,13 +411,14 @@
 					})
 					.then((res) => {
 						if (this.identity == 0) {
+							const userSyr = res.data.user_syr || {};  // 避免 null 展开报错
 							this.orderInfo = res.data ? {
 								...res.data.order,
 								...res.data.work_hour,
-								...res.data.user_syr,
+								...userSyr,                     // 有手艺人就展开，没有就是空对象
 								work_hour_id: res.data.work_hour.id,
 								order_id: res.data.order.id,
-								user_sj_id: res.data.user_syr.id,
+								syr_id: userSyr.id,             // 手艺人ID（无手艺人时为 undefined）
 							} : {};
 							console.log(this.orderInfo, '----------------------------------')
 						} else if (this.identity == 1) {

From 9de417bdfc2d4bacafc38c65c65768c7cc69ec30 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Fri, 24 Apr 2026 17:54:24 +0800
Subject: [PATCH 016/118] =?UTF-8?q?=E6=92=AD=E6=94=BE=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                         |   7 ++
 pages.json                            |   6 ++
 pages/shop/photoAlbum/addPhoto.vue    |  18 +++--
 pages/shop/photoAlbum/videoplayer.vue | 106 ++++++++++++++++++++++++++
 4 files changed, 129 insertions(+), 8 deletions(-)
 create mode 100644 pages/shop/photoAlbum/videoplayer.vue

diff --git a/manifest.json b/manifest.json
index 584ecdc..81a9949 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,6 +10,13 @@
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
+		"screenOrientation" : [
+		    //可选，字符串数组类型，应用支持的横竖屏
+		    "portrait-primary", //可选，字符串类型，支持竖屏
+		    "portrait-secondary", //可选，字符串类型，支持反向竖屏
+		    "landscape-primary", //可选，字符串类型，支持横屏
+		    "landscape-secondary" //可选，字符串类型，支持反向横屏
+		],
         "compatible" : {
             "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
         },
diff --git a/pages.json b/pages.json
index b63a79f..e50a10a 100644
--- a/pages.json
+++ b/pages.json
@@ -596,6 +596,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/shop/photoAlbum/videoplayer",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/shop/photoAlbum/videoList",
 			"style": {
diff --git a/pages/shop/photoAlbum/addPhoto.vue b/pages/shop/photoAlbum/addPhoto.vue
index 6c36e5c..f813e08 100644
--- a/pages/shop/photoAlbum/addPhoto.vue
+++ b/pages/shop/photoAlbum/addPhoto.vue
@@ -220,14 +220,16 @@
 				// uni.navigateTo({
 				// 	url: `/pages/album/list?urls=${encodeURIComponent(JSON.stringify(urls))}`
 				// });
-				this.videoPlay = true; // 显示播放盒子
-				this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 必传
-				this.videoUrl = this.formData.url;
-				this.videoContext.requestFullScreen({
-					direction: 90
-				});
-				this.videoContext.play();
-
+				// this.videoPlay = true; // 显示播放盒子
+				// this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 必传
+				// this.videoUrl = this.formData.url;
+				// this.videoContext.requestFullScreen({
+				// 	direction: 90
+				// });
+				// this.videoContext.play();
+				uni.navigateTo({
+					url: '/pages/shop/photoAlbum/videoplayer?url=' + this.formData.url
+				})
 
 			},
 			async submitPhoto() {
diff --git a/pages/shop/photoAlbum/videoplayer.vue b/pages/shop/photoAlbum/videoplayer.vue
new file mode 100644
index 0000000..9ae18ef
--- /dev/null
+++ b/pages/shop/photoAlbum/videoplayer.vue
@@ -0,0 +1,106 @@
+<template>
+	<view class="video-page">
+		<!-- 原生视频组件：全端兼容 -->
+		<video id="fullVideo" class="video-box" :src="videoUrl" controls show-fullscreen-btn enable-progress-gesture
+			:autoplay="true" :loop="false" :muted="false" @play="onPlay" @pause="onPause" object-fit="cover" :direction="90"
+			@fullscreenchange="handleFullScreenChange" @ended="onVideoEnd" @fullscreenclick="tapback"></video>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				videoUrl: "",
+				videoContext: null
+			};
+		},
+		onLoad(options) {
+			console.log(options, '页面参数');
+			// 接收视频地址
+			if (options.url) {
+				this.videoUrl = options.url;
+			}
+		},
+		onReady() {
+			// #ifdef APP-PLUS
+			//plus.screen.unlockOrientation(); //解除屏幕方向的锁定，但是不一定是竖屏；
+			
+			// #endif
+			// 初始化视频实例（唯一正确位置）
+			this.videoContext = uni.createVideoContext("fullVideo", this);
+			// 页面渲染完成后 安全触发自动全屏
+			//this.autoFullScreen();
+		},
+		methods: {
+			tapback(e) {
+				console.log('点击全屏按钮');
+				// if (e.target.fullScreen) {
+				// 	plus.screen.lockOrientation('landscape'); //锁死屏幕方向为竖屏
+				// }else{
+				// 	plus.screen.lockOrientation('portrait'); //锁死屏幕方向为竖屏
+				// }
+			},
+			// 自动全屏（核心：修复iOS方向错乱）
+			autoFullScreen() {
+				if (!this.videoContext) return;
+
+				// 区分平台设置方向：iOS用0自适应，安卓用90横屏
+				const direction = uni.getSystemInfoSync().platform === 'ios' ? 0 : 90;
+
+				// 延迟执行，避免视频未加载完成导致全屏失败
+				setTimeout(() => {
+					this.videoContext.requestFullScreen({
+						direction: direction
+					});
+				}, 300)
+			},
+			// 手动横屏全屏
+			openFullScreen() {
+				if (!this.videoContext) return;
+				const direction = uni.getSystemInfoSync().platform === 'ios' ? 0 : 90;
+				this.videoContext.requestFullScreen({
+					direction
+				});
+			},
+			// 退出全屏
+			closeFullScreen() {
+				if (!this.videoContext) return;
+				this.videoContext.exitFullScreen();
+			},
+			// 播放监听
+			onPlay() {
+				console.log("视频开始播放");
+			},
+			// 暂停监听
+			onPause() {
+				console.log("视频暂停");
+			},
+			// 全屏状态切换
+			handleFullScreenChange(e) {
+				// 全屏隐藏导航栏，退出显示
+				// uni.setNavigationBarHidden(!!e.detail.fullScreen);
+				console.log("全屏状态：", e.detail.fullScreen);
+			},
+			// 视频播放完毕
+			onVideoEnd() {
+				this.closeFullScreen();
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.video-page {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+	}
+
+	.video-box {
+		width: 100%;
+		/* 自适应高度，避免拉伸 */
+		height: 100%;
+		object-fit: cover;
+	}
+</style>
\ No newline at end of file

From f4e9bcc0f67bb88100f6fed2d1f646f85f85e7bb Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 28 Apr 2026 14:56:14 +0800
Subject: [PATCH 017/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=A3=E9=87=91?=
 =?UTF-8?q?=E6=B8=A9=E9=A6=A8=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/promotion/setUpServe.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/promotion/setUpServe.vue b/pages/promotion/setUpServe.vue
index 0a06605..b188ff5 100644
--- a/pages/promotion/setUpServe.vue
+++ b/pages/promotion/setUpServe.vue
@@ -2,7 +2,7 @@
 	<view class="select-serve">
 		<custom-navbar title="设置佣金" backgroundColor="#FFFFFF"></custom-navbar>
 		<view class="select-tip">
-			<text style="color: #E8101E;">温馨提示：</text>支持 快速设置“百分比”（如每单返 2%）佣金，成功成交的订单，系统会按照实付金额*佣金比例进行扣减。
+			<text style="color: #E8101E;">温馨提示：</text>支持 按1%~30%区间设置佣金比例，订单成功成交后，系统将按实付金额 × 佣金比例自动扣减。
 		</view>
 		<view v-for="(item,index) in selectedItems" :key="index" class="serve-card">
 			<image :src="item.photo[0]" mode="aspectFill" class="serve-card__img"></image>

From f5e3e96be8c967a0723260b08a2fef4eb11646e4 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Tue, 28 Apr 2026 17:48:49 +0800
Subject: [PATCH 018/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                         |   15 +-
 pages.json                            |   11 +-
 pages/address/search.vue              | 5064 +++++++++++++------------
 pages/shop/add-service.vue            |    8 +-
 pages/shop/photoAlbum/photoManage.vue |    4 +-
 5 files changed, 2587 insertions(+), 2515 deletions(-)

diff --git a/manifest.json b/manifest.json
index 81a9949..8356026 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,13 +10,13 @@
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
-		"screenOrientation" : [
-		    //可选，字符串数组类型，应用支持的横竖屏
-		    "portrait-primary", //可选，字符串类型，支持竖屏
-		    "portrait-secondary", //可选，字符串类型，支持反向竖屏
-		    "landscape-primary", //可选，字符串类型，支持横屏
-		    "landscape-secondary" //可选，字符串类型，支持反向横屏
-		],
+        "screenOrientation" : [
+            //可选，字符串数组类型，应用支持的横竖屏
+            "portrait-primary", //可选，字符串类型，支持竖屏
+            "portrait-secondary", //可选，字符串类型，支持反向竖屏
+            "landscape-primary", //可选，字符串类型，支持横屏
+            "landscape-secondary" //可选，字符串类型，支持反向横屏
+        ],
         "compatible" : {
             "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
         },
@@ -76,6 +76,7 @@
             },
             /* ios打包配置 */
             "ios" : {
+                "UIRequiresFullScreen" : false, // 允许非全屏模式
                 "urlschemewhitelist" : [ "iosmap" ],
                 "dSYMs" : false,
                 "plistcmds" : [
diff --git a/pages.json b/pages.json
index e50a10a..f10ced4 100644
--- a/pages.json
+++ b/pages.json
@@ -599,6 +599,8 @@
 		{
 			"path": "pages/shop/photoAlbum/videoplayer",
 			"style": {
+				"navigationBarTitleText": "全屏视频播放",
+				"pageOrientation": "auto",
 				"navigationStyle": "custom"
 			}
 		},
@@ -969,10 +971,11 @@
 				"selectedIconPath": "/static/images/tabbar/home_icon_active.png",
 				"pagePath": "pages/home/home"
 			},
-			{ 	"iconPath": "/static/images/tabbar/new_message_gray.png",
-				"text": "消息", 
-				"selectedIconPath": "/static/images/tabbar/new_message.png", 
-				"pagePath": "pages/message/message" 
+			{
+				"iconPath": "/static/images/tabbar/new_message_gray.png",
+				"text": "消息",
+				"selectedIconPath": "/static/images/tabbar/new_message.png",
+				"pagePath": "pages/message/message"
 			},
 			{
 				"iconPath": "/static/images/tabbar/my_icon_dis.png",
diff --git a/pages/address/search.vue b/pages/address/search.vue
index d7467a0..71d9bbd 100644
--- a/pages/address/search.vue
+++ b/pages/address/search.vue
@@ -1,86 +1,78 @@
 <template>
-    <view class="search-address-page">
-        <!-- 自定义导航栏 -->
-        <custom-navbar title="搜索地址" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
+	<view class="search-address-page">
+		<!-- 自定义导航栏 -->
+		<custom-navbar title="搜索地址" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
 
-        <!-- 城市选择-->
-        <view class="search-container" v-if="isSelectCity">
-            <text class="search-container-text" @click="goSelectCity">{{ city.name }}</text>
-            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/Fill.jpg" mode="aspectFit" class="text-img"></image>
-        </view>
+		<!-- 城市选择-->
+		<view class="search-container" v-if="isSelectCity">
+			<text class="search-container-text" @click="goSelectCity">{{ city.name }}</text>
+			<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/Fill.jpg" mode="aspectFit"
+				class="text-img"></image>
+		</view>
 
-        <!-- 地图容器 -->
-        <view class="map-container" :style="{ height: mapHeight + 'rpx' }">
-            <map
-                v-if="mapVisible"
-                :key="mapRenderKey"
-                id="map"
-                class="map"
-                :latitude="latitude"
-                :longitude="longitude"
-                scale="19"
-                @tap="onMapTap"
-                @regionchange="changeMap"
-            ></map>
+		<!-- 地图容器 -->
+		<view class="map-container" :style="{ height: mapHeight + 'rpx' }">
+			<map v-if="mapVisible" :key="mapRenderKey" id="map" class="map" :latitude="latitude" :longitude="longitude"
+				scale="19" @tap="onMapTap" @regionchange="changeMap"></map>
 
-            <image
-                v-if="showMapSnapshot"
-                class="map-snapshot"
-                :src="mapSnapshotUrl"
-                mode="aspectFill"
-                @load="onSnapshotLoad"
-                @error="onSnapshotError"
-            ></image>
+			<image v-if="showMapSnapshot" class="map-snapshot" :src="mapSnapshotUrl" mode="aspectFill"
+				@load="onSnapshotLoad" @error="onSnapshotError"></image>
 
-            <cover-view v-if="mapVisible" class="center-marker">
-                <cover-image
-                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/04007cab-3047-42b0-baab-44df344a92d2"
-                    class="center-marker-img"
-                ></cover-image>
-            </cover-view>
-        </view>
+			<cover-view v-if="mapVisible" class="center-marker">
+				<cover-image
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/04007cab-3047-42b0-baab-44df344a92d2"
+					class="center-marker-img"></cover-image>
+			</cover-view>
+		</view>
 
-        <!-- 底部编辑区域 -->
-        <view class="bottom-edit-section">
-            <!-- 地址识别输入行 -->
-            <view class="address-input-row">
-                <textarea class="raw-address-input" v-model="rawAddress" placeholder="粘贴文本到此处，将自动识别地址信息。" placeholder-style="color: #C6C9CC; font-size: 14px;" :maxlength="200" :adjust-position="true" />
-                <view class="action-buttons">
-                    <view class="action-btn paste-btn" @click="hasRawContent ? clearRawAddress() : onPaste()">
-                        <text class="btn-text" :style="{ color: '#333333' }">{{ hasRawContent ? '一键清空' : '粘贴' }}</text>
-                    </view>
-                    <view class="action-btn smart-btn" :class="{ 'smart-btn-active': hasRawContent }" @click="onSmartRecognize">
-                        <text class="btn-text" :style="{ color: hasRawContent ? '#E8101E' : '#999999' }">{{ smartBtnText }}</text>
-                    </view>
-                </view>
-            </view>
+		<!-- 底部编辑区域 -->
+		<view class="bottom-edit-section">
+			<!-- 地址识别输入行 -->
+			<view class="address-input-row">
+				<textarea class="raw-address-input" v-model="rawAddress" placeholder="粘贴文本到此处，将自动识别地址信息。"
+					placeholder-style="color: #C6C9CC; font-size: 14px;" :maxlength="200" :adjust-position="true" />
+				<view class="action-buttons">
+					<view class="action-btn paste-btn" @click="hasRawContent ? clearRawAddress() : onPaste()">
+						<text class="btn-text" :style="{ color: '#333333' }">{{ hasRawContent ? '一键清空' : '粘贴' }}</text>
+					</view>
+					<view class="action-btn smart-btn" :class="{ 'smart-btn-active': hasRawContent }"
+						@click="onSmartRecognize">
+						<text class="btn-text"
+							:style="{ color: hasRawContent ? '#E8101E' : '#999999' }">{{ smartBtnText }}</text>
+					</view>
+				</view>
+			</view>
 
-            <!-- 地址信息栏 -->
-            <view class="address-info-panel">
-                <view class="info-row" @click="selectRegion">
-                    <text class="row-label">所在地区</text>
-                    <view class="row-content">
-                        <text :class="currentRegion ? 'content-text' : 'placeholder'">{{ currentRegion || "请选择"}}</text>
-                        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/71c63001-a104-49ad-a90d-30d2ade73f4d.png" mode="aspectFit" class="arrow-icon"></image>
-                    </view>
-                </view>
-                <view class="line"></view>
-                <view class="info-row">
-                    <text class="row-label">详细地址</text>
-                    <input type="text" class="detail-input" v-model="detailAddress" @input="onDetailInput" placeholder="请填写详细地址" placeholder-style="color: #999999; font-size: 14px;" :adjust-position="true" />
-                </view>
-                <view class="line"></view>
-            </view>
+			<!-- 地址信息栏 -->
+			<view class="address-info-panel">
+				<view class="info-row" @click="selectRegion">
+					<text class="row-label">所在地区</text>
+					<view class="row-content">
+						<text :class="currentRegion ? 'content-text' : 'placeholder'">{{ currentRegion || "请选择"}}</text>
+						<image
+							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/71c63001-a104-49ad-a90d-30d2ade73f4d.png"
+							mode="aspectFit" class="arrow-icon"></image>
+					</view>
+				</view>
+				<view class="line"></view>
+				<view class="info-row">
+					<text class="row-label">详细地址</text>
+					<input type="text" class="detail-input" v-model="detailAddress" @input="onDetailInput"
+						placeholder="请填写详细地址" placeholder-style="color: #999999; font-size: 14px;"
+						:adjust-position="true" />
+				</view>
+				<view class="line"></view>
+			</view>
 
-            <!-- 确认按钮 -->
-            <view class="fixed-confirm-bar">
-                <view class="confirm-btn" @click="onConfirm">
-                    <text class="con-btn-text">确认</text>
-                </view>
-            </view>
-        </view>
+			<!-- 确认按钮 -->
+			<view class="fixed-confirm-bar">
+				<view class="confirm-btn" @click="onConfirm">
+					<text class="con-btn-text">确认</text>
+				</view>
+			</view>
+		</view>
 
-        <!-- 地区选择弹窗（用户端） -->
+		<!-- 地区选择弹窗（用户端） -->
 		<view class="popup" :class="{ show: showRegionPicker }">
 			<view class="popup-mask" @click="closeRegionPicker"></view>
 			<view class="popup-content">
@@ -89,32 +81,19 @@
 					<text class="popup-close" @click="closeRegionPicker">×</text>
 				</view>
 				<view class="region-body">
-					<picker-view
-						@change="onRegionChange"
-						class="picker-scroll"
-						:indicator-style="indicatorStyle"
-						:value="regionPickerValue"
-					>
+					<picker-view @change="onRegionChange" class="picker-scroll" :indicator-style="indicatorStyle"
+						:value="regionPickerValue">
 						<picker-view-column>
-							<view
-								class="picker-item"
-								v-for="(item, index) in regionProvinceList"
-								:key="index"
-							>{{ item.province }}</view>
+							<view class="picker-item" v-for="(item, index) in regionProvinceList" :key="index">
+								{{ item.province }}</view>
 						</picker-view-column>
 						<picker-view-column>
-							<view
-								class="picker-item"
-								v-for="(item, index) in regionCityList"
-								:key="index"
-							>{{ item.city }}</view>
+							<view class="picker-item" v-for="(item, index) in regionCityList" :key="index">
+								{{ item.city }}</view>
 						</picker-view-column>
 						<picker-view-column>
-							<view
-								class="picker-item"
-								v-for="(item, index) in regionDistrictList"
-								:key="index"
-							>{{ item.area }}</view>
+							<view class="picker-item" v-for="(item, index) in regionDistrictList" :key="index">
+								{{ item.area }}</view>
 						</picker-view-column>
 					</picker-view>
 				</view>
@@ -128,2451 +107,2522 @@
 				</view>
 			</view>
 		</view>
-    </view>
+	</view>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import ChinaCitys from './data/ChinaCitys.json'
-    import store from '@/store'
-    import { setVersion } from '@/utils/version.js'
-
-    export default {
-        data() {
-            return {
-                useApiRawRecognize: false,
-                mapVisible: true,
-                showMapSnapshot: false,
-                mapSnapshotUrl: '',
-                mapRenderKey: 0,
-                mapMoveTimer: null,
-                mapProgrammaticUntil: 0,
-                mapGuardTimer: null,
-                mapReverseTimer: null,
-                popupRestoreTimer: null,
-                reverseGeocodeRequestId: 0,
-                dependencyInitLock: false,
-                dependencyInitTimer: null,
-                blankPageInitLock: false,
-
-                // 地图与定位相关
-                systemInfo: {},
-                latitude: 0,
-                longitude: 0,
-                newLatitude: 0,
-                newLongitude: 0,
-                mapHeight: 670,
-                city: {
-                    center: '',
-                    name: ''
-                },
-                isSelectCity: false,
-                searchCity: uni.getStorageSync('searchCity'),
-                source: '',
-                recognizeMapMoving: false,
-                recognizeMapMoveTimer: null,
-
-                // 编辑区数据
-                manualDetail: '',
-                isManualDetail: false,
-                currentProvince: '',
-                currentCity: '',
-                currentDistrict: '',
-                currentDetail: '',
-                selectedProvinceCode: '',
-                selectedCityCode: '',
-                selectedDistrictCode: '',
-                rawAddress: '',
-                hasRawContent: false,
-                smartBtnText: '智能识别',
-                hasDetailContent: false,
-                currentRegion: '',
-                detailAddress: '',
-
-                // 首次进入且上页没有详细地址时，禁止自动回填详细地址
-                suppressInitDetailFill: false,
-                ignoreRegionChangeOnce: false,
-
-                // 地区选择弹窗数据
-                showRegionPicker: false,
-                regionProvinceList: [],
-                regionCityList: [],
-                regionDistrictList: [],
-                regionPickerValue: [0, 0, 0],
-
-                indicatorStyle: 'height: 68rpx;',
-                userSelectedRegion: false,
-
-                // 高德地图 key
-                amapKey: '30b7eb1a1b2f88edc085b9b3ee9a2188'
-            }
-        },
-
-        watch: {
-            rawAddress(newVal) {
-                this.hasRawContent = (newVal || '').trim().length > 0
-                this.smartBtnText = '智能识别'
-            },
-            detailAddress(newVal) {
-                this.hasDetailContent = (newVal || '').trim().length > 0
-            }
-        },
-
-        onLoad(options) {
-    console.log('ChinaCitys 数据:', ChinaCitys)
-    console.log('ChinaCitys 长度:', ChinaCitys?.length)
-
-    this.systemInfo = uni.getSystemInfoSync()
-    this.source = options.source || ''
-    this.mapHeight = 670
-
-    const incomingAddress = options.address ? decodeURIComponent(options.address) : ''
-    const hasDependency = !!options.dependency
-    const hasLocation = !!(options.longitude && options.latitude)
-    const skipAutoLocate = String(options.skip_auto_locate || '') === '1'
-    const initCurrentLocation = String(options.init_current_location || '') === '1'
-    const silentLocate = String(options.silent_locate || '') === '1'
-
-    // 1. 有传入地区：优先按传入地区初始化，禁止首屏地图自动反写
-    if (hasDependency) {
-        const regions = decodeURIComponent(options.dependency).split('-')
-        console.log('传入地区信息:', regions)
-
-        this.currentProvince = regions[0] || ''
-        this.currentCity = regions[1] || ''
-        this.currentDistrict = regions[2] || ''
-
-        let regionText = ''
-        if (this.currentProvince) regionText += this.currentProvince
-        if (this.currentCity && this.currentCity !== this.currentProvince) regionText += this.currentCity
-        if (this.currentDistrict) regionText += this.currentDistrict
-        this.currentRegion = regionText
-
-        if (incomingAddress) {
-            this.detailAddress = incomingAddress
-            this.manualDetail = incomingAddress
-            this.currentDetail = incomingAddress
-            this.isManualDetail = true
-            this.suppressInitDetailFill = false
-        } else {
-            this.detailAddress = ''
-            this.manualDetail = ''
-            this.currentDetail = ''
-            this.isManualDetail = false
-            this.suppressInitDetailFill = true
-        }
-
-        this.startDependencyInitLock()
-
-        if (hasLocation) {
-            this.applyMapLocation(options.longitude, options.latitude, true)
-            return
-        }
-
-        const dependencyCode = options.dependency_code
-
-        ;(async () => {
-            let center = null
-
-            if (dependencyCode && regions[2]) {
-                center = await this.getDistrictCenter(regions[2], dependencyCode)
-            }
-
-            if (!center && regions[2]) {
-                center = await this.getDistrictCenter(regions[2])
-            }
-            if (!center && regions[1] && regions[1] !== regions[0]) {
-                center = await this.getDistrictCenter(regions[1])
-            }
-            if (!center && regions[0]) {
-                center = await this.getDistrictCenter(regions[0])
-            }
-
-            if (center) {
-                const locationRes = center.split(',')
-                if (locationRes.length >= 2) {
-                    this.updateMapCenter(
-                        parseFloat(locationRes[0]),
-                        parseFloat(locationRes[1]),
-                        true
-                    )
-                }
-            } else if (!skipAutoLocate) {
-                this.clearDependencyInitLock()
-                this.getCurrentLocation()
-            } else {
-                this.clearDependencyInitLock()
-            }
-        })()
-
-        return
-    }
-
-    // 2. 只有经纬度，没有地区
-    if (hasLocation) {
-        this.applyMapLocation(options.longitude, options.latitude, true)
-
-        if (incomingAddress) {
-            this.detailAddress = incomingAddress
-            this.manualDetail = incomingAddress
-            this.currentDetail = incomingAddress
-            this.isManualDetail = true
-            this.suppressInitDetailFill = false
-        } else {
-            this.detailAddress = ''
-            this.manualDetail = ''
-            this.currentDetail = ''
-            this.isManualDetail = false
-            this.suppressInitDetailFill = true
-        }
-
-        this.reverseGeocode(parseFloat(options.longitude), parseFloat(options.latitude))
-        return
-    }
-
-    // 3. 从城市选择页进入
-    if (options.city) {
-        const city = JSON.parse(decodeURIComponent(options.city))
-        this.city = city
-        this.ignoreRegionChangeOnce = true
-        this.getNowLocation(city.center)
-        this.isSelectCity = true
-        return
-    }
-
-    // 4. 仅标记城市选择模式
-    if (options.isSelectCity) {
-        this.isSelectCity = true
-        this.getCurrentLocation()
-        return
-    }
-
-    // 5. 手艺人信息页首次进入且详细地址为空：按当前定位初始化
-    if (initCurrentLocation) {
-        this.blankPageInitLock = false
-        this.getCurrentLocation(silentLocate, true)
-        return
-    }
-
-    // 6. 空白进入且明确要求不自动定位
-    if (skipAutoLocate && !hasDependency && !hasLocation) {
-        this.blankPageInitLock = true
-        this.currentProvince = ''
-        this.currentCity = ''
-        this.currentDistrict = ''
-        this.currentRegion = ''
-        this.detailAddress = ''
-        this.manualDetail = ''
-        this.currentDetail = ''
-        this.isManualDetail = false
-        this.suppressInitDetailFill = true
-        return
-    }
-
-    // 7. 默认当前位置
-    if (!skipAutoLocate) {
-        this.blankPageInitLock = false
-        this.getCurrentLocation(silentLocate, false)
-    }
-},
-
-        onShow() {
-            if (!this.isSelectCity) return
-
-            const searchCity = uni.getStorageSync('searchCity')
-            if (searchCity && this.city.name !== searchCity.name) {
-                this.city = searchCity
-                this.searchCity = searchCity
-                this.ignoreRegionChangeOnce = true
-                this.getNowLocation(searchCity.center)
-            }
-        },
-
-        methods: {
-            normalizeMunicipalityName(name) {
-                const value = String(name || '').trim()
-
-                const map = {
-                    '北京': '北京市',
-                    '北京市': '北京市',
-                    '上海': '上海市',
-                    '上海市': '上海市',
-                    '天津': '天津市',
-                    '天津市': '天津市',
-                    '重庆': '重庆市',
-                    '重庆市': '重庆市',
-                    '香港': '香港特别行政区',
-                    '香港特别行政区': '香港特别行政区',
-                    '澳门': '澳门特别行政区',
-                    '澳门特别行政区': '澳门特别行政区'
-                }
-
-                return map[value] || value
-            },
-
-            normalizeRecognizedRegionParts(province, city, district) {
-                let p = this.normalizeMunicipalityName(province)
-                let c = this.normalizeMunicipalityName(city)
-                const d = String(district || '').trim()
-
-                const municipalities = [
-                    '北京市',
-                    '上海市',
-                    '天津市',
-                    '重庆市',
-                    '香港特别行政区',
-                    '澳门特别行政区'
-                ]
-
-                if (!p && municipalities.includes(c)) {
-                    p = c
-                }
-
-                if (!c && municipalities.includes(p)) {
-                    c = p
-                }
-
-                return {
-                    province: p,
-                    city: c,
-                    district: d
-                }
-            },
-
-            buildRegionText(province, city, district) {
-                let text = ''
-                if (province) text += province
-                if (city && city !== province) text += city
-                if (district) text += district
-                return text
-            },
-
-            startDependencyInitLock(duration = 800) {
-                this.dependencyInitLock = true
-
-                if (this.dependencyInitTimer) {
-                    clearTimeout(this.dependencyInitTimer)
-                }
-
-                this.dependencyInitTimer = setTimeout(() => {
-                    this.dependencyInitLock = false
-                    this.dependencyInitTimer = null
-                }, duration)
-            },
-
-            clearDependencyInitLock() {
-                this.dependencyInitLock = false
-
-                if (this.dependencyInitTimer) {
-                    clearTimeout(this.dependencyInitTimer)
-                    this.dependencyInitTimer = null
-                }
-            },
-
-            clearBlankPageInitLock() {
-                this.blankPageInitLock = false
-            },
-
-            isUserGestureMapEvent(causedBy) {
-                return ['gesture', 'drag', 'scale'].includes(String(causedBy || '').toLowerCase())
-            },
-
-            applyMapLocation(longitude, latitude, noReverse = true) {
-                const lng = Number(longitude)
-                const lat = Number(latitude)
-
-                if (!Number.isFinite(lng) || !Number.isFinite(lat)) return
-
-                this.ignoreRegionChangeOnce = true
-                this.mapProgrammaticUntil = Date.now() + 280
-
-                this.longitude = lng
-                this.latitude = lat
-                this.newLongitude = lng
-                this.newLatitude = lat
-
-                if (this.mapGuardTimer) {
-                    clearTimeout(this.mapGuardTimer)
-                }
-                this.mapGuardTimer = setTimeout(() => {
-                    this.ignoreRegionChangeOnce = false
-                    this.mapGuardTimer = null
-                }, 320)
-
-                if (this.mapReverseTimer) {
-                    clearTimeout(this.mapReverseTimer)
-                    this.mapReverseTimer = null
-                }
-
-                if (!noReverse) {
-                    this.mapReverseTimer = setTimeout(() => {
-                        this.reverseGeocode(lng, lat)
-                        this.mapReverseTimer = null
-                    }, 220)
-                }
-            },
-
-            normalizeCityName(province, city) {
-                let cityName = ''
-
-                if (Array.isArray(city)) {
-                    cityName = city[0] || ''
-                } else {
-                    cityName = city || ''
-                }
-
-                const fallbackCities = [
-                    '北京市',
-                    '上海市',
-                    '天津市',
-                    '重庆市',
-                    '香港特别行政区',
-                    '澳门特别行政区'
-                ]
-
-                if (!cityName && fallbackCities.includes(province)) {
-                    cityName = province
-                }
-
-                return cityName
-            },
-
-            buildMapSnapshotUrl() {
-                const lng = Number(this.longitude || this.newLongitude || 0).toFixed(6)
-                const lat = Number(this.latitude || this.newLatitude || 0).toFixed(6)
-                return `https://restapi.amap.com/v3/staticmap?location=${lng},${lat}&zoom=17&size=750*500&scale=2&markers=mid,0xE8101E,A:${lng},${lat}&key=${this.amapKey}`
-            },
-
-            onSnapshotLoad() {
-                console.log('地图加载成功:', this.mapSnapshotUrl)
-            },
-
-            onSnapshotError(e) {
-                console.log('地图加载失败:', e, this.mapSnapshotUrl)
-                uni.showToast({
-                    title: '地图加载失败',
-                    icon: 'none'
-                })
-            },
-
-            findRegionIndexByCode(baseData, provinceCode, cityCode, areaCode) {
-                const result = { provinceIndex: -1, cityIndex: -1, areaIndex: -1 }
-                const targetProvinceCode = (provinceCode || '').slice(0, 6)
-                const targetCityCode = (cityCode || '').slice(0, 6)
-                const targetAreaCode = (areaCode || '').slice(0, 6)
-                if (!targetProvinceCode || !targetCityCode || !targetAreaCode) return result
-
-                for (let pIdx = 0; pIdx < baseData.length; pIdx++) {
-                    const provinceItem = baseData[pIdx]
-                    const currentProvinceCode = (provinceItem.code || '').slice(0, 6)
-                    if (currentProvinceCode === targetProvinceCode) {
-                        result.provinceIndex = pIdx
-                        const citys = provinceItem.citys || []
-                        for (let cIdx = 0; cIdx < citys.length; cIdx++) {
-                            const cityItem = citys[cIdx]
-                            const currentCityCode = (cityItem.code || '').slice(0, 6)
-                            if (currentCityCode === targetCityCode) {
-                                result.cityIndex = cIdx
-                                const areas = cityItem?.areas || []
-                                for (let aIdx = 0; aIdx < areas.length; aIdx++) {
-                                    const areaItem = areas[aIdx]
-                                    const currentAreaCode = (areaItem.code || '').slice(0, 6)
-                                    if (currentAreaCode === targetAreaCode) {
-                                        result.areaIndex = aIdx
-                                        return result
-                                    }
-                                }
-                                return result
-                            }
-                        }
-                        return result
-                    }
-                }
-                return result
-            },
-
-            convert(item) {
-                const data = {
-                    key: this.amapKey,
-                    locations: `${item.longitude},${item.latitude}`,
-                    coordsys: 'gps'
-                }
-                return new Promise((resolve) => {
-                    uni.request({
-                        url: 'https://restapi.amap.com/v3/assistant/coordinate/convert',
-                        method: 'GET',
-                        data,
-                        success(res) {
-                            resolve(res.data)
-                        }
-                    })
-                })
-            },
-
-            getLocation(silent = false) {
-                return new Promise((resolve, reject) => {
-                    const handleFail = (err) => {
-                        if (!silent) {
-                            uni.showToast({ title: '获取位置失败', icon: 'none' })
-                        }
-                        reject(err)
-                    }
-
-                    if (this.$store?.state?.version?.DeviceBrand === 'ios') {
-                        uni.getLocation({
-                            type: 'wgs84',
-                            isHighAccuracy: true,
-                            success: async (res) => {
-                                try {
-                                    const convert = await this.convert(res)
-                                    const locations = String(convert?.locations || '').split(',')
-
-                                    if (locations.length >= 2) {
-                                        res.longitude = Number(locations[0])
-                                        res.latitude = Number(locations[1])
-                                    }
-
-                                    resolve(res)
-                                } catch (error) {
-                                    handleFail(error)
-                                }
-                            },
-                            fail: handleFail
-                        })
-                    } else {
-                        uni.getLocation({
-                            type: 'gcj02',
-                            geocode: true,
-                            success: (res) => resolve(res),
-                            fail: handleFail
-                        })
-                    }
-                })
-            },
-
-            async getCurrentLocation(silent = false, lockInit = false) {
-                this.blankPageInitLock = false
-
-                try {
-                    const locationRes = await this.getLocation(silent)
-
-                    if (lockInit) {
-                        this.startDependencyInitLock(1200)
-                        this.userSelectedRegion = false
-                        this.isManualDetail = false
-                        this.suppressInitDetailFill = false
-                    }
-
-                    this.updateMapCenter(locationRes.longitude, locationRes.latitude, false)
-                } catch (error) {
-                    if (silent) {
-                        this.latitude = 0
-                        this.longitude = 0
-                        this.newLatitude = 0
-                        this.newLongitude = 0
-
-                        this.currentProvince = ''
-                        this.currentCity = ''
-                        this.currentDistrict = ''
-                        this.currentRegion = ''
-                        this.detailAddress = ''
-                        this.manualDetail = ''
-                        this.currentDetail = ''
-                        this.isManualDetail = false
-
-                        this.blankPageInitLock = true
-                        this.suppressInitDetailFill = true
-                    }
-
-                    console.log('定位失败', error)
-                }
-            },
-
-            getNowLocation(center) {
-                if (!center) return
-                const locationRes = center.split(',')
-                if (locationRes.length < 2) return
-
-                this.updateMapCenter(
-                    parseFloat(locationRes[0]),
-                    parseFloat(locationRes[1]),
-                    false
-                )
-            },
-
-            normalizeAdcode6(code) {
-                    return String(code || '').slice(0, 6)
-                },
-
-                validateLocationWithDependency(longitude, latitude, dependencyCode) {
-                    return new Promise((resolve) => {
-                        const targetCode = this.normalizeAdcode6(dependencyCode)
-
-                        if (!targetCode || !longitude || !latitude) {
-                            resolve(true)
-                            return
-                        }
-
-                        uni.request({
-                            url: 'https://restapi.amap.com/v3/geocode/regeo',
-                            method: 'GET',
-                            data: {
-                                key: this.amapKey,
-                                location: `${longitude},${latitude}`,
-                                extensions: 'base'
-                            },
-                            success: (res) => {
-                                const adcode = this.normalizeAdcode6(
-                                    res?.data?.regeocode?.addressComponent?.adcode || ''
-                                )
-
-                                if (!adcode) {
-                                    resolve(true)
-                                    return
-                                }
-
-                                resolve(adcode === targetCode)
-                            },
-                            fail: () => {
-                                resolve(true)
-                            }
-                        })
-                    })
-                },
-
-                async locateByDependencyCenter(regions, dependencyCode, skipAutoLocate) {
-                    let center = null
-
-                    if (dependencyCode && regions[2]) {
-                        center = await this.getDistrictCenter(regions[2], dependencyCode)
-                    }
-
-                    if (!center && regions[2]) {
-                        center = await this.getDistrictCenter(regions[2])
-                    }
-                    if (!center && regions[1] && regions[1] !== regions[0]) {
-                        center = await this.getDistrictCenter(regions[1])
-                    }
-                    if (!center && regions[0]) {
-                        center = await this.getDistrictCenter(regions[0])
-                    }
-
-                    if (center) {
-                        const locationRes = center.split(',')
-                        if (locationRes.length >= 2) {
-                            this.updateMapCenter(
-                                parseFloat(locationRes[0]),
-                                parseFloat(locationRes[1]),
-                                true
-                            )
-                        }
-                    } else if (!skipAutoLocate) {
-                        this.getCurrentLocation()
-                    }
-                },
-
-            reverseGeocode(lng, lat) {
-                const requestId = ++this.reverseGeocodeRequestId
-                const targetLng = parseFloat(lng)
-                const targetLat = parseFloat(lat)
-
-                if (!Number.isFinite(targetLng) || !Number.isFinite(targetLat)) return
-
-                uni.request({
-                    url: 'https://restapi.amap.com/v3/geocode/regeo',
-                    data: {
-                        key: this.amapKey,
-                        location: `${targetLng},${targetLat}`,
-                        extensions: 'base'
-                    },
-                    success: (res) => {
-                        if (requestId !== this.reverseGeocodeRequestId) return
-
-                        if (res.data.status === '1' && res.data.regeocode) {
-                            if (this.recognizeMapMoving) return
-
-                            const regeo = res.data.regeocode
-                            const formatted = regeo.formatted_address || ''
-                            const addrComp = regeo.addressComponent || {}
-
-                            const provinceName = addrComp.province || ''
-                            const cityName = this.normalizeCityName(provinceName, addrComp.city)
-                            const districtName = addrComp.district || ''
-
-                            let region = ''
-                            if (provinceName) region += provinceName
-                            if (cityName && cityName !== provinceName) region += cityName
-                            if (districtName) region += districtName
-
-                            if (!this.userSelectedRegion) {
-                                this.currentRegion = region || formatted
-                                this.currentProvince = provinceName
-                                this.currentCity = cityName
-                                this.currentDistrict = districtName
-
-                                const adcode = addrComp.adcode || ''
-                                if (adcode.length >= 6) {
-                                    this.selectedDistrictCode = adcode
-                                    this.selectedCityCode = adcode.substring(0, 4) + '00'
-                                    this.selectedProvinceCode = adcode.substring(0, 2) + '0000'
-                                }
-                            }
-
-                            let detail = ''
-                            if (region && formatted.startsWith(region)) {
-                                detail = formatted.substring(region.length).trim()
-                            } else {
-                                detail = formatted.trim()
-                            }
-
-                            if (this.suppressInitDetailFill) {
-                                this.suppressInitDetailFill = false
-                                return
-                            }
-
-                            if (!this.isManualDetail) {
-                                this.detailAddress = detail || formatted
-                                this.manualDetail = this.detailAddress
-                                this.currentDetail = this.detailAddress
-                            }
-                        }
-                    },
-                    fail: (err) => {
-                        if (requestId !== this.reverseGeocodeRequestId) return
-                        console.error('逆地理编码失败:', err)
-                    }
-                })
-            },
-
-            onMapTap(e) {
-                this.clearDependencyInitLock()
-                this.clearBlankPageInitLock()
-
-                this.userSelectedRegion = false
-                this.isManualDetail = false
-                this.suppressInitDetailFill = false
-
-                const tapLat = Number(e?.detail?.latitude)
-                const tapLng = Number(e?.detail?.longitude)
-
-                if (Number.isFinite(tapLat) && Number.isFinite(tapLng)) {
-                    this.latitude = tapLat
-                    this.longitude = tapLng
-                    this.newLatitude = tapLat
-                    this.newLongitude = tapLng
-                    this.reverseGeocode(tapLng, tapLat)
-                    return
-                }
-
-                const mapCtx = uni.createMapContext('map', this)
-                mapCtx.getCenterLocation({
-                    success: (res) => {
-                        this.latitude = res.latitude
-                        this.longitude = res.longitude
-                        this.newLatitude = res.latitude
-                        this.newLongitude = res.longitude
-                        this.reverseGeocode(res.longitude, res.latitude)
-                    },
-                    fail: (err) => {
-                        console.error('点击地图获取中心点失败', err)
-                    }
-                })
-            },
-
-            syncCenterFromMap() {
-                if (this.dependencyInitLock) return
-                if (this.blankPageInitLock) return
-
-                const mapCtx = uni.createMapContext('map', this)
-
-                mapCtx.getCenterLocation({
-                    success: (res) => {
-                        if (
-                            !res ||
-                            !Number.isFinite(Number(res.longitude)) ||
-                            !Number.isFinite(Number(res.latitude))
-                        ) {
-                            return
-                        }
-
-                        this.userSelectedRegion = false
-                        this.isManualDetail = false
-                        this.suppressInitDetailFill = false
-
-                        this.latitude = Number(res.latitude)
-                        this.longitude = Number(res.longitude)
-                        this.newLatitude = Number(res.latitude)
-                        this.newLongitude = Number(res.longitude)
-
-                        this.reverseGeocode(this.longitude, this.latitude)
-                    },
-                    fail: (err) => {
-                        console.error('syncCenterFromMap失败', err)
-                    }
-                })
-            },
-
-            changeMap(e) {
-                if (this.showRegionPicker || !this.mapVisible) return
-                if (this.recognizeMapMoving) return
-                if (this.dependencyInitLock) return
-
-                const eventType = e?.detail?.type || e?.type || ''
-                const causedBy = e?.detail?.causedBy || e?.causedBy || ''
-
-                if (this.blankPageInitLock) {
-                    if (this.isUserGestureMapEvent(causedBy)) {
-                        this.clearBlankPageInitLock()
-                    } else {
-                        return
-                    }
-                }
-
-                if (eventType === 'begin') return
-
-                if (Date.now() < this.mapProgrammaticUntil) {
-                    return
-                }
-
-                const isProgrammaticEvent = causedBy && causedBy !== 'gesture'
-
-                if (isProgrammaticEvent && this.ignoreRegionChangeOnce) {
-                    this.ignoreRegionChangeOnce = false
-                    return
-                }
-
-                if (this.mapMoveTimer) {
-                    clearTimeout(this.mapMoveTimer)
-                }
-
-                const delay = eventType === 'end' ? 80 : 260
-
-                this.mapMoveTimer = setTimeout(() => {
-                    this.syncCenterFromMap()
-
-                    setTimeout(() => {
-                        this.syncCenterFromMap()
-                    }, 180)
-
-                    this.mapMoveTimer = null
-                }, delay)
-            },
-
-            goSelectCity() {
-                uni.navigateTo({
-                    url: '/subPackages/address/selectCity'
-                })
-            },
-
-            clearRawAddress() {
-                this.rawAddress = ''
-                uni.showToast({ title: '已清空', icon: 'none' })
-            },
-
-            onDetailInput(e) {
-                const val = e.detail.value || ''
-                this.detailAddress = val
-                this.manualDetail = val
-                this.currentDetail = val
-                this.isManualDetail = val.trim().length > 0
-            },
-
-            onPaste() {
-                uni.getClipboardData({
-                    success: (res) => {
-                        if (res.data) {
-                            this.rawAddress = res.data
-                            uni.showToast({ title: '已粘贴', icon: 'none' })
-                        }
-                    }
-                })
-            },
-
-            sanitizeRawAddress(raw) {
-                let text = (raw || '')
-                    .replace(/[\r\n\t]+/g, ' ')
-                    .replace(/　/g, ' ')
-                    .replace(/\s+/g, ' ')
-                    .trim()
-
-                const addressMatch = text.match(/地址[:：]\s*(.*)/)
-                if (addressMatch && addressMatch[1]) {
-                    text = addressMatch[1].trim()
-                }
-
-                text = text
-                    .replace(/(收货人|联系人|姓名)[:：]\s*[\u4e00-\u9fa5A-Za-z·]{1,20}/g, '')
-                    .replace(/(电话|手机)[:：]?\s*1[3-9]\d{9}/g, '')
-                    .replace(/1[3-9]\d{9}/g, '')
-                    .replace(/[，,；;]+/g, ' ')
-                    .replace(/\s+/g, ' ')
-                    .trim()
-
-                return text
-            },
-
-            escapeRegExp(str) {
-                return (str || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-            },
-
-            getNetworkTypeSafe() {
-                return new Promise((resolve) => {
-                    uni.getNetworkType({
-                        success: (res) => resolve(res.networkType || 'unknown'),
-                        fail: () => resolve('unknown')
-                    })
-                })
-            },
-
-            async ensureRecognizeNetworkAvailable() {
-                const networkType = await this.getNetworkTypeSafe()
-
-                if (networkType === 'none') {
-                    this.showRecognizeNetworkError()
-                    return false
-                }
-
-                return true
-            },
-
-            showRecognizeNetworkError() {
-                uni.showToast({
-                    title: '网络异常，无法进行地址识别与地图定位，请检查网络后重试',
-                    icon: 'none',
-                    duration: 3500
-                })
-            },
-
-            isLikelyNetworkError(error) {
-                const msg = String(
-                    error?.errMsg ||
-                    error?.message ||
-                    error ||
-                    ''
-                ).toLowerCase()
-
-                return (
-                    msg.includes('network') ||
-                    msg.includes('timeout') ||
-                    msg.includes('request:fail') ||
-                    msg.includes('fail')
-                )
-            },
-
-            hasStrongAddressFeature(text) {
-                return /(\d|号|栋|幢|单元|室|楼|层|座|路|街|巷|道|村|镇|乡|里|弄|园|苑|小区|大厦|广场|市场|学校|医院|公寓|酒店|中心|胡同)/.test(text || '')
-            },
-
-            containsObviousInvalidNoise(text) {
-                return /(价格|价钱|多少钱|举报|投诉|建议|咨询|测试|示例|比如|比方|假设|无效|乱填)/i.test(text || '')
-            },
-
-            isLikelyInvalidRecognizedDetail(text) {
-                const value = String(text || '').trim()
-                if (!value) return true
-
-                if (/(价格|价钱|多少钱|举报|投诉|建议|咨询|测试|示例|比如|比方|假设|无效|乱填)/i.test(value)) {
-                    return true
-                }
-
-                if (/^\d{6,}$/.test(value) || /^[A-Za-z]{6,}$/.test(value)) {
-                    return true
-                }
-
-                const specialChars = (value.match(/[^\u4e00-\u9fa5a-zA-Z0-9]/g) || []).length
-                if (specialChars / value.length > 0.3) {
-                    return true
-                }
-
-                if (value.length < 2) {
-                    return true
-                }
-
-                const hasLongLetterChunk = /[A-Za-z]{6,}/.test(value)
-                const letterCount = (value.match(/[A-Za-z]/g) || []).length
-                const letterRatio = value.length ? (letterCount / value.length) : 0
-                const hasAddressFeature = this.hasStrongAddressFeature(value)
-
-                if (hasLongLetterChunk && !hasAddressFeature) {
-                    return true
-                }
-
-                if (letterRatio > 0.35 && !hasAddressFeature) {
-                    return true
-                }
-
-                return false
-            },
-
-            isPreciseGeocodeLevel(level) {
-                return [
-                    '门牌号',
-                    '兴趣点',
-                    '道路',
-                    '道路交叉口',
-                    '乡镇',
-                    '村庄',
-                    '村级地名',
-                    'roadno',
-                    'poi'
-                ].includes(String(level || '').trim())
-            },
-
-            normalizeDistrictName(name) {
-                return String(name || '').trim()
-            },
-
-            validateRecognizedDetail(detailText, geo, hit = {}) {
-                const cleaned = String(detailText || '').trim()
-                if (!cleaned) {
-                    return { valid: false, cleaned: '', reason: 'empty' }
-                }
-
-                if (this.isLikelyInvalidRecognizedDetail(cleaned)) {
-                    return { valid: false, cleaned: '', reason: 'invalid_detail' }
-                }
-
-                if (!geo) {
-                    return { valid: false, cleaned: '', reason: 'geocode_failed' }
-                }
-
-                const geoLevel = String(geo?.level || '').trim()
-                const preciseLevel = this.isPreciseGeocodeLevel(geoLevel)
-                const hasAddressFeature = this.hasStrongAddressFeature(cleaned)
-
-                const hitCountyCode = String(hit?.county_code || '').slice(0, 6)
-                const geoAdcode = String(geo?.adcode || '').slice(0, 6)
-
-                const hitDistrictName = this.normalizeDistrictName(hit?.county_name)
-                const geoDistrictName = this.normalizeDistrictName(geo?.district)
-
-                const sameDistrictByCode = !!hitCountyCode && !!geoAdcode && hitCountyCode === geoAdcode
-                const sameDistrictByName = !!hitDistrictName && !!geoDistrictName && hitDistrictName === geoDistrictName
-                const sameDistrict = sameDistrictByCode || sameDistrictByName
-
-                const purePoiLike =
-                    cleaned.length >= 2 &&
-                    /^[\u4e00-\u9fa5A-Za-z0-9]+$/.test(cleaned) &&
-                    !/[A-Za-z]{6,}/.test(cleaned)
-
-                if (hasAddressFeature || preciseLevel) {
-                    return { valid: true, cleaned, reason: '' }
-                }
-
-                if (sameDistrict && purePoiLike) {
-                    return { valid: true, cleaned, reason: 'district_geo_verified' }
-                }
-
-                return { valid: false, cleaned: '', reason: 'detail_not_precise' }
-            },
-
-            cleanRecognizedDetail(detail, province, city, district) {
-                let text = this.stripLeadingRegionParts(detail, [
-                    province,
-                    city,
-                    district
-                ])
-
-                text = text
-                    .replace(/(收货人|联系人|姓名)[:：].*$/g, '')
-                    .replace(/(电话|手机)[:：]?\s*1[3-9]\d{9}.*$/g, '')
-                    .replace(/备注[:：].*$/g, '')
-                    .replace(/1[3-9]\d{9}/g, '')
-                    .replace(/[（(][^）)]*[）)]/g, '')
-                    .replace(/^[，,；;、\s]+/, '')
-                    .replace(/\s+/g, ' ')
-                    .trim()
-
-                return text
-            },
-
-            appendIfMissing(base, part) {
-                const src = String(base || '').trim()
-                const seg = String(part || '').trim()
-
-                if (!seg) return src
-                if (!src) return seg
-                if (src.includes(seg)) return src
-
-                return `${src}${seg}`
-            },
-
-            deriveCodesFromDivision(divcode = '') {
-                const code = String(divcode || '').trim()
-                if (!/^\d{12}$/.test(code)) {
-                    return {
-                        province_code: '',
-                        city_code: '',
-                        county_code: ''
-                    }
-                }
-
-                return {
-                    province_code: `${code.slice(0, 2)}0000`,
-                    city_code: `${code.slice(0, 4)}00`,
-                    county_code: code.slice(0, 6)
-                }
-            },
-
-            parseDivisionInfo(area = {}) {
-                const divisionInfo = area?.division_info || {}
-                const divisionName = String(divisionInfo.division_name || '').trim()
-                const divcode = String(divisionInfo.divcode || '').trim()
-
-                let parts = []
-                if (divisionName.includes(';')) {
-                    parts = divisionName.split(';')
-                } else if (divisionName) {
-                    parts = divisionName.split(/\s+/)
-                }
-
-                const derivedCodes = this.deriveCodesFromDivision(divcode)
-
-                return {
-                    province_name: String(parts[0] || '').trim(),
-                    city_name: String(parts[1] || '').trim(),
-                    county_name: String(parts[2] || '').trim(),
-                    town_name: String(parts[3] || '').trim(),
-                    province_code: derivedCodes.province_code,
-                    city_code: derivedCodes.city_code,
-                    county_code: derivedCodes.county_code
-                }
-            },
-
-            parseLonlatInfo(lonlat = {}) {
-                const offline = lonlat?.offline_geocode || {}
-
-                return {
-                    gcj02: String(offline.gcj02 || '').trim(),
-                    wgs84: String(offline.wgs84 || '').trim(),
-                    level: String(offline.level || '').trim()
-                }
-            },
-
-            parseStreetStd(streetStd = '') {
-                const parsed = {}
-
-                String(streetStd)
-                    .split(/\t+/)
-                    .forEach(item => {
-                        const index = item.indexOf('=')
-                        if (index === -1) return
-
-                        const key = item.slice(0, index).trim().toLowerCase()
-                        const value = item.slice(index + 1).trim()
-
-                        if (key) {
-                            parsed[key] = value
-                        }
-                    })
-
-                return {
-                    province_name: (parsed.prov || parsed.province || '').trim(),
-                    city_name: (parsed.city || '').trim(),
-                    county_name: (parsed.district || parsed.county || parsed.area || '').trim(),
-                    town_name: (parsed.town || parsed.street || '').trim(),
-                    road_name: (parsed.road || '').trim(),
-                    road_no: (parsed.roadno || parsed.road_no || '').trim(),
-                    poi_name: (parsed.poi || parsed.poi_name || '').trim(),
-                    house_no: (parsed.houseno || parsed.house_no || '').trim(),
-                    room_no: (parsed.roomno || parsed.room_no || '').trim(),
-                    floor_no: (parsed.floor || parsed.floor_no || '').trim(),
-                    unit_no: (parsed.unit || parsed.unit_no || '').trim(),
-                    building_no: (parsed.building || parsed.building_no || '').trim(),
-                    block_no: (parsed.block || parsed.block_no || '').trim(),
-                    detail: (parsed.detail || parsed.address || parsed.addr || '').trim(),
-                    address: (parsed.address || parsed.detail || parsed.addr || '').trim(),
-                    province_code: (parsed.province_code || parsed.prov_code || '').trim(),
-                    city_code: (parsed.city_code || '').trim(),
-                    county_code: (parsed.county_code || parsed.district_code || parsed.area_code || '').trim(),
-                    _street_std_map: parsed
-                }
-            },
-
-            normalizeRecognizeHit(res) {
-                if (!res || (res.code !== 200 && res.code !== 0)) return null
-
-                // 旧格式1：data是数组
-                if (Array.isArray(res.data) && res.data.length) {
-                    const item = res.data[0]
-                    return {
-                        province_name: (item.province_name || '').trim(),
-                        city_name: (item.city_name || '').trim(),
-                        county_name: (item.county_name || '').trim(),
-                        town_name: (item.town_name || '').trim(),
-                        road_name: '',
-                        road_no: '',
-                        poi_name: '',
-                        house_no: '',
-                        room_no: '',
-                        floor_no: '',
-                        unit_no: '',
-                        building_no: '',
-                        block_no: '',
-                        detail: (item.detail || '').trim(),
-                        address: (item.address || item.detail || '').trim(),
-                        province_code: (item.province_code || '').trim(),
-                        city_code: (item.city_code || '').trim(),
-                        county_code: (item.county_code || '').trim(),
-                        backend_gcj02: '',
-                        backend_wgs84: '',
-                        backend_level: '',
-                        _street_std_map: {}
-                    }
-                }
-
-                // 旧格式2：data.data是数组
-                if (Array.isArray(res?.data?.data) && res.data.data.length) {
-                    const item = res.data.data[0]
-                    return {
-                        province_name: (item.province_name || '').trim(),
-                        city_name: (item.city_name || '').trim(),
-                        county_name: (item.county_name || '').trim(),
-                        town_name: (item.town_name || '').trim(),
-                        road_name: '',
-                        road_no: '',
-                        poi_name: '',
-                        house_no: '',
-                        room_no: '',
-                        floor_no: '',
-                        unit_no: '',
-                        building_no: '',
-                        block_no: '',
-                        detail: (item.detail || '').trim(),
-                        address: (item.address || item.detail || '').trim(),
-                        province_code: (item.province_code || '').trim(),
-                        city_code: (item.city_code || '').trim(),
-                        county_code: (item.county_code || '').trim(),
-                        backend_gcj02: '',
-                        backend_wgs84: '',
-                        backend_level: '',
-                        _street_std_map: {}
-                    }
-                }
-
-                // 旧格式3：result是数组
-                if (Array.isArray(res.result) && res.result.length) {
-                    const item = res.result[0]
-                    return {
-                        province_name: (item.province_name || '').trim(),
-                        city_name: (item.city_name || '').trim(),
-                        county_name: (item.county_name || '').trim(),
-                        town_name: (item.town_name || '').trim(),
-                        road_name: '',
-                        road_no: '',
-                        poi_name: '',
-                        house_no: '',
-                        room_no: '',
-                        floor_no: '',
-                        unit_no: '',
-                        building_no: '',
-                        block_no: '',
-                        detail: (item.detail || '').trim(),
-                        address: (item.address || item.detail || '').trim(),
-                        province_code: (item.province_code || '').trim(),
-                        city_code: (item.city_code || '').trim(),
-                        county_code: (item.county_code || '').trim(),
-                        backend_gcj02: '',
-                        backend_wgs84: '',
-                        backend_level: '',
-                        _street_std_map: {}
-                    }
-                }
-
-                // 新格式：data本身就是对象
-                if (
-                    res.data &&
-                    typeof res.data === 'object' &&
-                    (
-                        res.data.province_name ||
-                        res.data.city_name ||
-                        res.data.county_name ||
-                        res.data.detail ||
-                        res.data.address
-                    )
-                ) {
-                    return {
-                        province_name: (res.data.province_name || '').trim(),
-                        city_name: (res.data.city_name || '').trim(),
-                        county_name: (res.data.county_name || '').trim(),
-                        town_name: (res.data.town_name || '').trim(),
-                        road_name: (res.data.road_name || res.data.road || '').trim(),
-                        road_no: (res.data.road_no || res.data.roadno || '').trim(),
-                        poi_name: (res.data.poi_name || res.data.poi || '').trim(),
-                        house_no: (res.data.house_no || res.data.houseno || '').trim(),
-                        room_no: (res.data.room_no || res.data.roomno || '').trim(),
-                        floor_no: (res.data.floor_no || res.data.floor || '').trim(),
-                        unit_no: (res.data.unit_no || res.data.unit || '').trim(),
-                        building_no: (res.data.building_no || res.data.building || '').trim(),
-                        block_no: (res.data.block_no || res.data.block || '').trim(),
-                        detail: (res.data.detail || '').trim(),
-                        address: (res.data.address || res.data.detail || '').trim(),
-                        province_code: (res.data.province_code || '').trim(),
-                        city_code: (res.data.city_code || '').trim(),
-                        county_code: (res.data.county_code || '').trim(),
-                        backend_gcj02: '',
-                        backend_wgs84: '',
-                        backend_level: '',
-                        _street_std_map: {}
-                    }
-                }
-
-                // 新格式：data.street + data.area + data.lonlat
-                if (res?.data?.street && typeof res.data.street === 'object') {
-                    const street = res.data.street
-                    const stdParsed = this.parseStreetStd(street.street_std || '')
-                    const divisionParsed = this.parseDivisionInfo(res?.data?.area || {})
-                    const lonlatParsed = this.parseLonlatInfo(res?.data?.lonlat || {})
-
-                    return {
-                        province_name: (street.province_name || street.province || stdParsed.province_name || divisionParsed.province_name || '').trim(),
-                        city_name: (street.city_name || street.city || stdParsed.city_name || divisionParsed.city_name || '').trim(),
-                        county_name: (street.county_name || street.district || street.county || stdParsed.county_name || divisionParsed.county_name || '').trim(),
-                        town_name: (street.town_name || street.town || street.street_name || stdParsed.town_name || divisionParsed.town_name || '').trim(),
-                        road_name: (street.road_name || street.road || stdParsed.road_name || '').trim(),
-                        road_no: (street.road_no || street.roadno || stdParsed.road_no || '').trim(),
-                        poi_name: (street.poi_name || street.poi || stdParsed.poi_name || '').trim(),
-                        house_no: (street.house_no || street.houseno || stdParsed.house_no || '').trim(),
-                        room_no: (street.room_no || street.roomno || stdParsed.room_no || '').trim(),
-                        floor_no: (street.floor_no || street.floor || stdParsed.floor_no || '').trim(),
-                        unit_no: (street.unit_no || street.unit || stdParsed.unit_no || '').trim(),
-                        building_no: (street.building_no || street.building || stdParsed.building_no || '').trim(),
-                        block_no: (street.block_no || street.block || stdParsed.block_no || '').trim(),
-                        detail: (street.detail || street.address || stdParsed.detail || stdParsed.address || '').trim(),
-                        address: (street.address || street.detail || stdParsed.address || stdParsed.detail || '').trim(),
-                        province_code: (street.province_code || stdParsed.province_code || divisionParsed.province_code || '').trim(),
-                        city_code: (street.city_code || stdParsed.city_code || divisionParsed.city_code || '').trim(),
-                        county_code: (street.county_code || street.district_code || stdParsed.county_code || divisionParsed.county_code || '').trim(),
-                        backend_gcj02: lonlatParsed.gcj02,
-                        backend_wgs84: lonlatParsed.wgs84,
-                        backend_level: lonlatParsed.level,
-                        _street_std_map: stdParsed._street_std_map || {}
-                    }
-                }
-
-                return null
-            },
-
-            getRecognizeApiUrl() {
-                const app = typeof getApp === 'function' ? getApp() : null
-
-                const baseUrl =
-                    app?.globalData?.url ||
-                    app?.globalData?.baseUrl ||
-                    app?.globalData?.apiBaseUrl ||
-                    'https://api.mrrwlkj.top'
-
-                return `${String(baseUrl).replace(/\/+$/, '')}/api/recognize/address`
-            },
-
-            buildMultipartFormData(fields = {}) {
-                const boundary = '----UniFormBoundary' + Date.now()
-                let body = ''
-
-                Object.keys(fields).forEach((key) => {
-                    const value = fields[key] == null ? '' : String(fields[key])
-                    body += `--${boundary}\r\n`
-                    body += `Content-Disposition: form-data; name="${key}"\r\n\r\n`
-                    body += `${value}\r\n`
-                })
-
-                body += `--${boundary}--\r\n`
-
-                return {
-                    boundary,
-                    body
-                }
-            },
-
-            requestRecognizeAddress(rawText) {
-                return request.post('/api/recognize/address', {
-                    text: rawText
-                })
-            },
-
-            buildGeoFromBackend(hit) {
-                const location = String(hit?.backend_gcj02 || '').trim()
-                if (!location) return null
-
-                return {
-                    location,
-                    adcode: String(hit?.county_code || '').trim(),
-                    level: String(hit?.backend_level || '').trim(),
-                    district: String(hit?.county_name || '').trim()
-                }
-            },
-
-            geocodeRecognizedAddress(address) {
-                return new Promise((resolve) => {
-                    if (!address) {
-                        resolve({
-                            ok: true,
-                            data: null,
-                            error: null
-                        })
-                        return
-                    }
-
-                    uni.request({
-                        url: 'https://restapi.amap.com/v3/geocode/geo',
-                        method: 'GET',
-                        data: {
-                            key: this.amapKey,
-                            address,
-                            output: 'JSON'
-                        },
-                        success: (res) => {
-                            if (res.data.status === '1' && res.data.geocodes?.length > 0) {
-                                resolve({
-                                    ok: true,
-                                    data: res.data.geocodes[0],
-                                    error: null
-                                })
-                            } else {
-                                resolve({
-                                    ok: true,
-                                    data: null,
-                                    error: null
-                                })
-                            }
-                        },
-                        fail: (error) => resolve({
-                            ok: false,
-                            data: null,
-                            error
-                        })
-                    })
-                })
-            },
-
-            stripLeadingRegionParts(text, parts = []) {
-                let result = String(text || '').trim()
-
-                const validParts = [...new Set(
-                    parts
-                        .map(item => String(item || '').trim())
-                        .filter(Boolean)
-                )].sort((a, b) => b.length - a.length)
-
-                if (!result || !validParts.length) return result
-
-                let changed = true
-
-                while (changed && result) {
-                    changed = false
-                    result = result.replace(/^\s+/, '')
-
-                    for (const part of validParts) {
-                        const reg = new RegExp(`^${this.escapeRegExp(part)}(?:\\s+|\\b)?`)
-                        if (reg.test(result)) {
-                            result = result.replace(reg, '').trim()
-                            changed = true
-                            break
-                        }
-                    }
-                }
-
-                return result
-            },
-
-            assembleDetailByInterfaceFields(hit, sanitizedText, province, city, district) {
-                const directDetail = String(
-                    hit?.detail ||
-                    hit?.address ||
-                    hit?.addr ||
-                    hit?.full_address_detail ||
-                    hit?.address_detail ||
-                    ''
-                ).trim()
-
-                const structuredValues = [
-                    String(hit?.town_name || '').trim(),
-                    String(hit?.road_name || '').trim(),
-                    String(hit?.road_no || '').trim(),
-                    String(hit?.poi_name || '').trim(),
-                    String(hit?.house_no || '').trim(),
-                    String(hit?.unit_no || '').trim(),
-                    String(hit?.floor_no || '').trim(),
-                    String(hit?.room_no || '').trim(),
-                    String(hit?.building_no || '').trim(),
-                    String(hit?.block_no || '').trim()
-                ]
-
-                let result = ''
-
-                // 先放街道/镇
-                result = this.appendIfMissing(result, structuredValues[0])
-
-                // 再放接口直接给出的detail/address
-                if (directDetail) {
-                    const cleanedDirect = this.stripLeadingRegionParts(
-                        directDetail,
-                        [province, city, district].filter(Boolean)
-                    ).trim()
-                    result = this.appendIfMissing(result, cleanedDirect)
-                }
-
-                // 再按结构化字段补齐
-                for (let i = 1; i < structuredValues.length; i++) {
-                    result = this.appendIfMissing(result, structuredValues[i])
-                }
-
-                // 再把street_std中其他未知字段补齐，做到“有什么就拼什么”
-                const rawMap = hit?._street_std_map || {}
-                const ignoredKeys = new Set([
-                    'prov', 'province',
-                    'city',
-                    'district', 'county', 'area',
-                    'town', 'street',
-                    'road',
-                    'roadno', 'road_no',
-                    'poi', 'poi_name',
-                    'houseno', 'house_no',
-                    'roomno', 'room_no',
-                    'floor', 'floor_no',
-                    'unit', 'unit_no',
-                    'building', 'building_no',
-                    'block', 'block_no',
-                    'detail', 'address', 'addr',
-                    'province_code', 'prov_code',
-                    'city_code',
-                    'county_code', 'district_code', 'area_code'
-                ])
-
-                Object.keys(rawMap).forEach((key) => {
-                    if (ignoredKeys.has(key)) return
-                    const value = String(rawMap[key] || '').trim()
-                    if (!value) return
-                    result = this.appendIfMissing(result, value)
-                })
-
-                // 最后兜底原始文本扣省市区
-                if (!result) {
-                    result = this.stripLeadingRegionParts(
-                        sanitizedText,
-                        [province, city, district].filter(Boolean)
-                    ).trim()
-                }
-
-                // 最终再次确保详细地址不带省市区
-                result = this.stripLeadingRegionParts(
-                    result,
-                    [province, city, district].filter(Boolean)
-                ).trim()
-
-                return result
-            },
-
-            buildExactRecognizedDetail(hit, sanitizedText, province, city, district) {
-                return this.assembleDetailByInterfaceFields(
-                    hit,
-                    sanitizedText,
-                    province,
-                    city,
-                    district
-                )
-            },
-
-            async onSmartRecognize() {
-                this.clearBlankPageInitLock()
-                this.userSelectedRegion = false
-                this.isManualDetail = false
-                this.suppressInitDetailFill = false
-
-                if (!this.hasRawContent) {
-                    uni.showToast({ title: '请先粘贴或输入地址', icon: 'none' })
-                    return
-                }
-
-                const originalRawText = (this.rawAddress || '').trim()
-                if (!originalRawText) {
-                    uni.showToast({ title: '请先粘贴或输入地址', icon: 'none' })
-                    return
-                }
-
-                const hasNetwork = await this.ensureRecognizeNetworkAvailable()
-                if (!hasNetwork) return
-
-                const sanitizedText = this.sanitizeRawAddress(originalRawText)
-                const removedNoise = sanitizedText !== originalRawText
-
-                if (!sanitizedText) {
-                    uni.showToast({ title: '未提取到有效地址', icon: 'none' })
-                    return
-                }
-
-                uni.showLoading({ title: '识别中...' })
-
-                try {
-                    const res = await this.requestRecognizeAddress(sanitizedText)
-                    console.log('智能识别接口返回:', res)
-
-                    const hit = this.normalizeRecognizeHit(res)
-
-                    if (!res || (res.code !== 0 && res.code !== 200) || !hit) {
-                        uni.hideLoading()
-                        uni.showToast({
-                            title: res?.msg || '地址解析失败',
-                            icon: 'none'
-                        })
-                        return
-                    }
-
-                    console.log('智能识别标准化结果:', hit)
-
-                    const normalizedRegion = this.normalizeRecognizedRegionParts(
-                        hit.province_name,
-                        hit.city_name,
-                        hit.county_name
-                    )
-
-                    const province = normalizedRegion.province
-                    const city = normalizedRegion.city
-                    const district = normalizedRegion.district
-
-                    const regionText = this.buildRegionText(province, city, district)
-
-                    if (!regionText) {
-                        uni.hideLoading()
-                        const tip = this.getRecognizeToast('low', removedNoise, false, hit, '', false)
-                        if (tip.type === 'modal') {
-                            uni.showModal({
-                                title: tip.title,
-                                content: tip.content,
-                                showCancel: false
-                            })
-                        } else {
-                            uni.showToast({
-                                title: tip.title,
-                                icon: 'none'
-                            })
-                        }
-                        return
-                    }
-
-                    const detailCandidate = this.cleanRecognizedDetail(
-                        this.buildExactRecognizedDetail(
-                            hit,
-                            sanitizedText,
-                            province,
-                            city,
-                            district
-                        ),
-                        province,
-                        city,
-                        district
-                    )
-
-                    const fullAddress = `${regionText}${detailCandidate}`.trim()
-                    console.log('用于定位的完整地址:', fullAddress)
-
-                    let geocodeOk = false
-                    let geo = null
-                    let detailRejected = false
-                    let detailText = ''
-
-                    const fullGeoResult = await this.geocodeRecognizedAddress(fullAddress)
-
-                    if (!fullGeoResult.ok) {
-                        uni.hideLoading()
-                        this.showRecognizeNetworkError()
-                        return
-                    }
-
-                    geo = fullGeoResult.data || this.buildGeoFromBackend(hit)
-
-                    const detailDecision = this.validateRecognizedDetail(detailCandidate, geo, hit)
-                    detailRejected = !detailDecision.valid && !!detailCandidate
-                    detailText = detailDecision.valid ? detailDecision.cleaned : ''
-
-                    if (!detailText) {
-                        const regionGeoResult = await this.geocodeRecognizedAddress(regionText)
-                        if (!regionGeoResult.ok) {
-                            uni.hideLoading()
-                            this.showRecognizeNetworkError()
-                            return
-                        }
-                        geo = regionGeoResult.data || this.buildGeoFromBackend(hit)
-                        detailText = ''
-                    }
-
-                    if (geo) {
-                        const location = geo.location
-                        const adcode = geo.adcode || ''
-
-                        if (adcode.length >= 6) {
-                            this.selectedDistrictCode = adcode.slice(0, 6)
-                            this.selectedCityCode = adcode.slice(0, 4) + '00'
-                            this.selectedProvinceCode = adcode.slice(0, 2) + '0000'
-                        } else {
-                            this.selectedProvinceCode = hit.province_code || this.selectedProvinceCode || ''
-                            this.selectedCityCode = hit.city_code || this.selectedCityCode || ''
-                            this.selectedDistrictCode = hit.county_code || this.selectedDistrictCode || ''
-                        }
-
-                        if (location) {
-                            const [lng, lat] = location.split(',')
-                            this.longitude = parseFloat(lng)
-                            this.latitude = parseFloat(lat)
-                            this.newLongitude = this.longitude
-                            this.newLatitude = this.latitude
-
-                            this.recognizeMapMoving = true
-                            if (this.recognizeMapMoveTimer) {
-                                clearTimeout(this.recognizeMapMoveTimer)
-                            }
-
-                            this.updateMapCenter(this.longitude, this.latitude, true)
-                            geocodeOk = true
-
-                            this.recognizeMapMoveTimer = setTimeout(() => {
-                                this.recognizeMapMoving = false
-                                this.recognizeMapMoveTimer = null
-                            }, 1500)
-                        }
-                    }
-
-                    const level = this.getRecognizeLevel(hit, detailText, sanitizedText)
-                    const shouldOnlyToast = this.shouldOnlyToastForGarbageRecognize(
-                        sanitizedText,
-                        hit,
-                        detailText,
-                        detailRejected,
-                        geocodeOk
-                    )
-
-                    if (level === 'low' || shouldOnlyToast) {
-                        uni.hideLoading()
-
-                        if (shouldOnlyToast) {
-                            uni.showModal({
-                                title: '未识别到有效地址',
-                                content: '当前输入内容无效，系统未自动填入所在地区和详细地址，请检查后重新输入，或手动选择地址。',
-                                showCancel: false
-                            })
-                        } else {
-                            const tip = this.getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText, detailRejected)
-                            if (tip.type === 'modal') {
-                                uni.showModal({
-                                    title: tip.title,
-                                    content: tip.content,
-                                    showCancel: false
-                                })
-                            } else {
-                                uni.showToast({
-                                    title: tip.title,
-                                    icon: 'none'
-                                })
-                            }
-                        }
-                        return
-                    }
-
-                    this.commitRecognizedResult(province, city, district, regionText, detailText, geo, level, removedNoise, geocodeOk, hit, detailRejected)
-                } catch (error) {
-                    console.error('智能识别失败:', error)
-                    uni.hideLoading()
-
-                    if (this.isLikelyNetworkError(error)) {
-                        this.showRecognizeNetworkError()
-                        return
-                    }
-
-                    uni.showToast({
-                        title: '识别失败，请稍后重试',
-                        icon: 'none'
-                    })
-                }
-            },
-
-            getRecognizeLevel(hit, detailText, rawText) {
-                const province = (hit?.province_name || '').trim()
-                const city = (hit?.city_name || '').trim()
-                const district = (hit?.county_name || '').trim()
-
-                if (/火星市|月球|银河|测试地址/.test(rawText || '')) {
-                    return 'low'
-                }
-
-                if (!province || (!city && !district)) {
-                    return 'low'
-                }
-
-                if (!detailText || detailText.length < 2) {
-                    return 'medium'
-                }
-
-                return 'high'
-            },
-
-            shouldOnlyToastForGarbageRecognize(rawText, hit, detailText, detailRejected = false, geocodeOk = false) {
-                if (geocodeOk) return false
-
-                const input = String(rawText || '').trim()
-                if (!input) return true
-
-                const province = (hit?.province_name || '').trim()
-                const city = (hit?.city_name || '').trim()
-                const district = (hit?.county_name || '').trim()
-
-                const hasFullRegion = !!(province && (city || district))
-                if (!hasFullRegion) return false
-
-                const hasAddressFeature = this.hasStrongAddressFeature(input)
-                const hasRegionKeyword = /(省|市|区|县|旗|镇|乡|村|街道)/.test(input)
-                const hasLongLetterChunk = /[A-Za-z]{2,}/.test(input)
-                const hasInvalidNoise = this.containsObviousInvalidNoise(input)
-
-                if (!hasAddressFeature && !hasRegionKeyword && !detailText) {
-                    if (hasLongLetterChunk || hasInvalidNoise || detailRejected) {
-                        return true
-                    }
-                }
-
-                return false
-            },
-
-            getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText, detailRejected = false) {
-                const province = (hit?.province_name || '').trim()
-                const city = (hit?.city_name || '').trim()
-                const district = (hit?.county_name || '').trim()
-
-                const hasRegion = !!(province || city || district)
-                const hasFullRegion = !!(province && (city || district))
-                const hasDetail = !!(detailText && detailText.trim())
-
-                if (detailRejected && hasFullRegion && !hasDetail) {
-                    return {
-                        type: 'modal',
-                        title: '已识别到地区，详细地址未自动填入',
-                        content: '已识别到省市区，但检测到详细地址中包含无效或不完整内容，系统未自动填入详细地址，请手动补充。'
-                    }
-                }
-
-                if (level === 'low') {
-                    if (!hasRegion) {
-                        return {
-                            type: 'modal',
-                            title: '已识别，但未匹配到有效地区',
-                            content: '未查找到明确的省市区信息，请手动选择所在地区，并检查输入内容是否包含错别字、备注或无效地址。'
-                        }
-                    }
-
-                    if (hasRegion && !hasFullRegion) {
-                        return {
-                            type: 'modal',
-                            title: '已识别到部分地区信息',
-                            content: '当前仅识别到部分地区，未能完整匹配到市区县，请手动补全所在地区并核对详细地址。'
-                        }
-                    }
-
-                    if (hasFullRegion && !hasDetail) {
-                        return {
-                            type: 'modal',
-                            title: '已识别到地区，但详细地址不完整',
-                            content: '已识别到省市区，但未能准确提取详细地址，请补充门牌号、楼栋号等信息。'
-                        }
-                    }
-
-                    return {
-                        type: 'modal',
-                        title: '已识别，但未匹配到有效地区',
-                        content: '当前地址未匹配到有效地区，请核对所在地区和详细地址，必要时请手动修正。'
-                    }
-                }
-
-                if (level === 'medium') {
-                    if (!hasDetail) {
-                        return {
-                            type: 'toast',
-                            title: removedNoise ? '已识别到地区，请补充详细地址' : '已识别到地区，请补充详细地址'
-                        }
-                    }
-
-                    if (!geocodeOk) {
-                        return {
-                            type: 'toast',
-                            title: removedNoise ? '已识别，但未查到地图位置' : '已识别，但未查到对应地图位置'
-                        }
-                    }
-
-                    return {
-                        type: 'toast',
-                        title: removedNoise ? '已识别到部分地址，请核对' : '已识别到部分地址，请核对'
-                    }
-                }
-
-                if (!geocodeOk) {
-                    return {
-                        type: 'toast',
-                        title: removedNoise ? '已识别，但未查到地图位置' : '已识别，请核对地址和地图位置'
-                    }
-                }
-
-                return {
-                    type: 'toast',
-                    title: removedNoise ? '识别成功，请核对' : '识别成功，请核对'
-                }
-            },
-
-            commitRecognizedResult(province, city, district, regionText, detailText, geo, level, removedNoise, geocodeOk, hit, detailRejected) {
-                this.currentProvince = province
-                this.currentCity = city
-                this.currentDistrict = district
-                this.currentRegion = regionText
-
-                this.selectedProvinceCode = hit.province_code || this.selectedProvinceCode || ''
-                this.selectedCityCode = hit.city_code || this.selectedCityCode || ''
-                this.selectedDistrictCode = hit.county_code || this.selectedDistrictCode || ''
-
-                this.detailAddress = detailText
-                this.manualDetail = detailText
-                this.currentDetail = detailText
-                this.isManualDetail = !!detailText
-
-                this.smartBtnText = '已识别'
-                uni.hideLoading()
-
-                const tip = this.getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText, detailRejected)
-                if (tip.type === 'modal') {
-                    uni.showModal({
-                        title: tip.title,
-                        content: tip.content,
-                        showCancel: false
-                    })
-                } else {
-                    uni.showToast({
-                        title: tip.title,
-                        icon: 'none'
-                    })
-                }
-            },
-
-            updateMapCenter(longitude, latitude, noReverse = false) {
-                const lng = parseFloat(longitude)
-                const lat = parseFloat(latitude)
-
-                if (!Number.isFinite(lng) || !Number.isFinite(lat)) return
-
-                this.applyMapLocation(lng, lat, noReverse)
-            },
-
-            selectRegion() {
-                this.openRegionPicker()
-            },
-
-            openRegionPicker() {
-                this.regionProvinceList = ChinaCitys || []
-
-                let provinceIndex = 0
-                let cityIndex = 0
-                let areaIndex = 0
-
-                if (this.selectedProvinceCode && this.selectedCityCode && this.selectedDistrictCode) {
-                    const idx = this.findRegionIndexByCode(
-                        ChinaCitys,
-                        this.selectedProvinceCode,
-                        this.selectedCityCode,
-                        this.selectedDistrictCode
-                    )
-                    provinceIndex = idx.provinceIndex >= 0 ? idx.provinceIndex : 0
-                    cityIndex = idx.cityIndex >= 0 ? idx.cityIndex : 0
-                    areaIndex = idx.areaIndex >= 0 ? idx.areaIndex : 0
-                }
-
-                this.regionCityList = this.regionProvinceList[provinceIndex]?.citys || []
-                this.regionDistrictList = this.regionCityList[cityIndex]?.areas || []
-                this.regionPickerValue = [provinceIndex, cityIndex, areaIndex]
-
-                if (this.mapMoveTimer) {
-                    clearTimeout(this.mapMoveTimer)
-                    this.mapMoveTimer = null
-                }
-
-                this.mapSnapshotUrl = this.buildMapSnapshotUrl()
-                this.showMapSnapshot = true
-                this.mapVisible = false
-                this.showRegionPicker = true
-            },
-
-            closeRegionPicker() {
-                this.showRegionPicker = false
-
-                if (this.popupRestoreTimer) {
-                    clearTimeout(this.popupRestoreTimer)
-                }
-
-                this.popupRestoreTimer = setTimeout(() => {
-                    this.showMapSnapshot = false
-                    this.mapSnapshotUrl = ''
-
-                    this.ignoreRegionChangeOnce = true
-                    this.mapProgrammaticUntil = Date.now() + 500
-
-                    if (this.mapGuardTimer) {
-                        clearTimeout(this.mapGuardTimer)
-                    }
-                    this.mapGuardTimer = setTimeout(() => {
-                        this.ignoreRegionChangeOnce = false
-                        this.mapGuardTimer = null
-                    }, 550)
-
-                    this.mapVisible = true
-                    this.mapRenderKey += 1
-                    this.popupRestoreTimer = null
-                }, 300)
-            },
-
-            onRegionChange(e) {
-                const val = e.detail.value
-                this.regionPickerValue = val
-
-                const provinceIdx = val[0]
-                const cityIdx = val[1] || 0
-
-                if (this.regionProvinceList.length > provinceIdx) {
-                    this.regionCityList = this.regionProvinceList[provinceIdx].citys || []
-                    const maxCityIdx = this.regionCityList.length - 1
-                    const adjustedCityIdx = Math.min(cityIdx, maxCityIdx)
-
-                    if (adjustedCityIdx !== cityIdx) {
-                        this.regionPickerValue = [provinceIdx, adjustedCityIdx, 0]
-                    }
-
-                    if (this.regionCityList.length > adjustedCityIdx) {
-                        this.regionDistrictList = this.regionCityList[adjustedCityIdx].areas || []
-                        const areaIdx = val[2] || 0
-                        const maxAreaIdx = this.regionDistrictList.length - 1
-                        if (areaIdx > maxAreaIdx) {
-                            this.regionPickerValue = [provinceIdx, adjustedCityIdx, 0]
-                        }
-                    } else {
-                        this.regionDistrictList = []
-                        this.regionPickerValue = [provinceIdx, 0, 0]
-                    }
-                } else {
-                    this.regionCityList = []
-                    this.regionDistrictList = []
-                    this.regionPickerValue = [0, 0, 0]
-                }
-            },
-
-            async confirmRegion() {
-                this.clearBlankPageInitLock()
-                const [provinceIdx, cityIdx, districtIdx] = this.regionPickerValue
-                const provinceItem = this.regionProvinceList[provinceIdx]
-                const cityItem = this.regionCityList[cityIdx]
-                const districtItem = this.regionDistrictList[districtIdx]
-
-                if (!provinceItem || !cityItem || !districtItem) {
-                    uni.showToast({ title: '选择无效', icon: 'none' })
-                    return
-                }
-
-                this.userSelectedRegion = true
-
-                const regionStr = provinceItem.province + cityItem.city + districtItem.area
-                this.currentProvince = provinceItem.province
-                this.currentCity = cityItem.city
-                this.currentDistrict = districtItem.area
-                this.currentRegion = regionStr
-
-                this.selectedProvinceCode = provinceItem.code
-                this.selectedCityCode = cityItem.code
-                this.selectedDistrictCode = districtItem.code
-
-                this.isManualDetail = false
-                this.suppressInitDetailFill = true
-                this.detailAddress = ''
-                this.manualDetail = ''
-                this.currentDetail = ''
-
-                const shortCode = districtItem.code ? districtItem.code.toString().slice(0, 6) : ''
-                this.startDependencyInitLock()
-                const center = await this.getDistrictCenter(districtItem.area, shortCode)
-
-                if (center) {
-                    const [lng, lat] = center.split(',')
-                    this.updateMapCenter(parseFloat(lng), parseFloat(lat), true)
-                } else {
-                    uni.showToast({ title: '无法定位该地区，请手动拖动地图', icon: 'none' })
-                }
-
-                this.closeRegionPicker()
-            },
-
-            getDistrictCenter(keyword, adcode = '', subdistrict = 0) {
-                return new Promise((resolve) => {
-                    const params = {
-                        key: this.amapKey,
-                        subdistrict,
-                        extensions: 'all'
-                    }
-
-                    const queryAdcode = () => {
-                        if (!adcode) return Promise.resolve(null)
-
-                        return new Promise((resolveInner) => {
-                            uni.request({
-                                url: 'https://restapi.amap.com/v3/config/district',
-                                method: 'GET',
-                                data: {
-                                    ...params,
-                                    keywords: adcode.slice(0, 6)
-                                },
-                                success: (res) => {
-                                    if (res.data.status === '1' && res.data.districts && res.data.districts.length > 0) {
-                                        const district = res.data.districts[0]
-                                        if (district.center) {
-                                            resolveInner(district.center)
-                                            return
-                                        }
-                                    }
-                                    resolveInner(null)
-                                },
-                                fail: () => resolveInner(null)
-                            })
-                        })
-                    }
-
-                    const queryKeyword = () => {
-                        return new Promise((resolveInner) => {
-                            uni.request({
-                                url: 'https://restapi.amap.com/v3/config/district',
-                                method: 'GET',
-                                data: {
-                                    ...params,
-                                    keywords: keyword
-                                },
-                                success: (res) => {
-                                    if (res.data.status === '1' && res.data.districts && res.data.districts.length > 0) {
-                                        const district = res.data.districts[0]
-                                        if (district.center) {
-                                            resolveInner(district.center)
-                                            return
-                                        }
-                                    }
-                                    resolveInner(null)
-                                },
-                                fail: () => resolveInner(null)
-                            })
-                        })
-                    }
-
-                    queryAdcode().then(center => {
-                        if (center) {
-                            resolve(center)
-                        } else {
-                            queryKeyword().then(resolve)
-                        }
-                    })
-                })
-            },
-
-            onConfirm() {
-                const fullAddress = (this.currentRegion + (this.detailAddress ? ' ' + this.detailAddress : '')).trim()
-
-                const addressItem = {
-                    name: fullAddress,
-                    address: this.detailAddress,
-                    location: `${this.longitude},${this.latitude}`,
-                    pname: this.currentProvince,
-                    cityname: this.currentCity,
-                    adname: this.currentDistrict,
-                    province: this.currentProvince,
-                    city: this.currentCity,
-                    district: this.currentDistrict,
-                    provinceCode: this.selectedProvinceCode,
-                    cityCode: this.selectedCityCode,
-                    districtCode: this.selectedDistrictCode,
-                    source: this.source
-                }
-
-                const pages = getCurrentPages()
-                const prevPage = pages[pages.length - 2]
-                const currentPage = pages[pages.length - 1]
-                const source = this.source || currentPage.options.source
-
-                //特殊处理重庆
-				if(addressItem.cityCode == 500100){
-					addressItem.cityname = "重庆城区"
+	import request from '@/utils/request'
+	import ChinaCitys from './data/ChinaCitys.json'
+	import store from '@/store'
+	import {
+		setVersion
+	} from '@/utils/version.js'
+
+	export default {
+		data() {
+			return {
+				useApiRawRecognize: false,
+				mapVisible: true,
+				showMapSnapshot: false,
+				mapSnapshotUrl: '',
+				mapRenderKey: 0,
+				mapMoveTimer: null,
+				mapProgrammaticUntil: 0,
+				mapGuardTimer: null,
+				mapReverseTimer: null,
+				popupRestoreTimer: null,
+				reverseGeocodeRequestId: 0,
+				dependencyInitLock: false,
+				dependencyInitTimer: null,
+				blankPageInitLock: false,
+
+				// 地图与定位相关
+				systemInfo: {},
+				latitude: 0,
+				longitude: 0,
+				newLatitude: 0,
+				newLongitude: 0,
+				mapHeight: 670,
+				city: {
+					center: '',
+					name: ''
+				},
+				isSelectCity: false,
+				searchCity: uni.getStorageSync('searchCity'),
+				source: '',
+				recognizeMapMoving: false,
+				recognizeMapMoveTimer: null,
+
+				// 编辑区数据
+				manualDetail: '',
+				isManualDetail: false,
+				currentProvince: '',
+				currentCity: '',
+				currentDistrict: '',
+				currentDetail: '',
+				selectedProvinceCode: '',
+				selectedCityCode: '',
+				selectedDistrictCode: '',
+				rawAddress: '',
+				hasRawContent: false,
+				smartBtnText: '智能识别',
+				hasDetailContent: false,
+				currentRegion: '',
+				detailAddress: '',
+
+				// 首次进入且上页没有详细地址时，禁止自动回填详细地址
+				suppressInitDetailFill: false,
+				ignoreRegionChangeOnce: false,
+
+				// 地区选择弹窗数据
+				showRegionPicker: false,
+				regionProvinceList: [],
+				regionCityList: [],
+				regionDistrictList: [],
+				regionPickerValue: [0, 0, 0],
+
+				indicatorStyle: 'height: 68rpx;',
+				userSelectedRegion: false,
+
+				// 高德地图 key
+				amapKey: '30b7eb1a1b2f88edc085b9b3ee9a2188'
+			}
+		},
+
+		watch: {
+			rawAddress(newVal) {
+				this.hasRawContent = (newVal || '').trim().length > 0
+				this.smartBtnText = '智能识别'
+			},
+			detailAddress(newVal) {
+				this.hasDetailContent = (newVal || '').trim().length > 0
+			}
+		},
+
+		onLoad(options) {
+			console.log('ChinaCitys 数据:', ChinaCitys)
+			console.log('ChinaCitys 长度:', ChinaCitys?.length)
+
+			this.systemInfo = uni.getSystemInfoSync()
+			this.source = options.source || ''
+			this.mapHeight = 670
+
+			const incomingAddress = options.address ? decodeURIComponent(options.address) : ''
+			const hasDependency = !!options.dependency
+			const hasLocation = !!(options.longitude && options.latitude)
+			const skipAutoLocate = String(options.skip_auto_locate || '') === '1'
+			const initCurrentLocation = String(options.init_current_location || '') === '1'
+			const silentLocate = String(options.silent_locate || '') === '1'
+
+			// 1. 有传入地区：优先按传入地区初始化，禁止首屏地图自动反写
+			if (hasDependency) {
+				const regions = decodeURIComponent(options.dependency).split('-')
+				console.log('传入地区信息:', regions)
+
+				this.currentProvince = regions[0] || ''
+				this.currentCity = regions[1] || ''
+				this.currentDistrict = regions[2] || ''
+
+				let regionText = ''
+				if (this.currentProvince) regionText += this.currentProvince
+				if (this.currentCity && this.currentCity !== this.currentProvince) regionText += this.currentCity
+				if (this.currentDistrict) regionText += this.currentDistrict
+				this.currentRegion = regionText
+
+				if (incomingAddress) {
+					this.detailAddress = incomingAddress
+					this.manualDetail = incomingAddress
+					this.currentDetail = incomingAddress
+					this.isManualDetail = true
+					this.suppressInitDetailFill = false
+				} else {
+					this.detailAddress = ''
+					this.manualDetail = ''
+					this.currentDetail = ''
+					this.isManualDetail = false
+					this.suppressInitDetailFill = true
 				}
-				if(addressItem.cityCode == 500200){
-					addressItem.cityname = "重庆郊县"
+
+				this.startDependencyInitLock()
+				if (hasLocation) {
+					
+					this.applyMapLocation(options.longitude, options.latitude, false)
+					return
+				}
+
+				const dependencyCode = options.dependency_code
+
+				;
+				(async () => {
+					let center = null
+					
+					if (dependencyCode && regions[2]) {
+						center = await this.getDistrictCenter(regions[2], dependencyCode)
+					}
+
+					if (!center && regions[2]) {
+						center = await this.getDistrictCenter(regions[2])
+					}
+					if (!center && regions[1] && regions[1] !== regions[0]) {
+						center = await this.getDistrictCenter(regions[1])
+					}
+					if (!center && regions[0]) {
+						center = await this.getDistrictCenter(regions[0])
+					}
+
+					if (center) {
+						const locationRes = center.split(',')
+						if (locationRes.length >= 2) {
+							this.updateMapCenter(
+								parseFloat(locationRes[0]),
+								parseFloat(locationRes[1]),
+								false
+							)
+						}
+					} else if (!skipAutoLocate) {
+						this.clearDependencyInitLock()
+						this.getCurrentLocation()
+					} else {
+						this.clearDependencyInitLock()
+					}
+				})()
+
+				return
+			}
+
+			// 2. 只有经纬度，没有地区
+			if (hasLocation) {
+				this.applyMapLocation(options.longitude, options.latitude, true)
+
+				if (incomingAddress) {
+					this.detailAddress = incomingAddress
+					this.manualDetail = incomingAddress
+					this.currentDetail = incomingAddress
+					this.isManualDetail = true
+					this.suppressInitDetailFill = false
+				} else {
+					this.detailAddress = ''
+					this.manualDetail = ''
+					this.currentDetail = ''
+					this.isManualDetail = false
+					this.suppressInitDetailFill = true
 				}
 				
 
-                if (source === 'syr_info') {
-                    uni.$emit('address-selected-for-syr', addressItem)
-                    uni.setStorageSync('syr_selected_address', addressItem)
-                } else if (source === 'sj_info') {
-                    uni.$emit('address-selected-for-sj', addressItem)
-                    uni.setStorageSync('sj_selected_address', addressItem)
-                    if (getApp().globalData) getApp().globalData.selectedAddress = addressItem
-                } else if (prevPage) {
-                    if (prevPage.$vm && typeof prevPage.$vm.editAddress === 'function') {
-                        prevPage.$vm.editAddress(addressItem)
-                    } else {
-                        uni.$emit('address-selected', addressItem)
-                    }
-                } else {
-                    uni.$emit('address-selected', addressItem)
-                }
+				this.reverseGeocode(parseFloat(options.longitude), parseFloat(options.latitude))
+				return
+			}
 
-                uni.navigateBack()
-            }
-        }
-    }
+			// 3. 从城市选择页进入
+			if (options.city) {
+				const city = JSON.parse(decodeURIComponent(options.city))
+				this.city = city
+				this.ignoreRegionChangeOnce = true
+				this.getNowLocation(city.center)
+				this.isSelectCity = true
+				return
+			}
+
+			// 4. 仅标记城市选择模式
+			if (options.isSelectCity) {
+				this.isSelectCity = true
+				this.getCurrentLocation()
+				return
+			}
+
+			// 5. 手艺人信息页首次进入且详细地址为空：按当前定位初始化
+			if (initCurrentLocation) {
+				this.blankPageInitLock = false
+				this.getCurrentLocation(silentLocate, true)
+				return
+			}
+
+			// 6. 空白进入且明确要求不自动定位
+			if (skipAutoLocate && !hasDependency && !hasLocation) {
+				this.blankPageInitLock = true
+				this.currentProvince = ''
+				this.currentCity = ''
+				this.currentDistrict = ''
+				this.currentRegion = ''
+				this.detailAddress = ''
+				this.manualDetail = ''
+				this.currentDetail = ''
+				this.isManualDetail = false
+				this.suppressInitDetailFill = true
+				return
+			}
+
+			// 7. 默认当前位置
+			if (!skipAutoLocate) {
+				this.blankPageInitLock = false
+				this.getCurrentLocation(silentLocate, false)
+			}
+		},
+
+		onShow() {
+			if (!this.isSelectCity) return
+
+			const searchCity = uni.getStorageSync('searchCity')
+			if (searchCity && this.city.name !== searchCity.name) {
+				this.city = searchCity
+				this.searchCity = searchCity
+				this.ignoreRegionChangeOnce = true
+				this.getNowLocation(searchCity.center)
+			}
+		},
+
+		methods: {
+			normalizeMunicipalityName(name) {
+				const value = String(name || '').trim()
+
+				const map = {
+					'北京': '北京市',
+					'北京市': '北京市',
+					'上海': '上海市',
+					'上海市': '上海市',
+					'天津': '天津市',
+					'天津市': '天津市',
+					'重庆': '重庆市',
+					'重庆市': '重庆市',
+					'香港': '香港特别行政区',
+					'香港特别行政区': '香港特别行政区',
+					'澳门': '澳门特别行政区',
+					'澳门特别行政区': '澳门特别行政区'
+				}
+
+				return map[value] || value
+			},
+
+			normalizeRecognizedRegionParts(province, city, district) {
+				let p = this.normalizeMunicipalityName(province)
+				let c = this.normalizeMunicipalityName(city)
+				const d = String(district || '').trim()
+
+				const municipalities = [
+					'北京市',
+					'上海市',
+					'天津市',
+					'重庆市',
+					'香港特别行政区',
+					'澳门特别行政区'
+				]
+
+				if (!p && municipalities.includes(c)) {
+					p = c
+				}
+
+				if (!c && municipalities.includes(p)) {
+					c = p
+				}
+
+				return {
+					province: p,
+					city: c,
+					district: d
+				}
+			},
+
+			buildRegionText(province, city, district) {
+				let text = ''
+				if (province) text += province
+				if (city && city !== province) text += city
+				if (district) text += district
+				return text
+			},
+
+			startDependencyInitLock(duration = 800) {
+				this.dependencyInitLock = true
+
+				if (this.dependencyInitTimer) {
+					clearTimeout(this.dependencyInitTimer)
+				}
+
+				this.dependencyInitTimer = setTimeout(() => {
+					this.dependencyInitLock = false
+					this.dependencyInitTimer = null
+				}, duration)
+			},
+
+			clearDependencyInitLock() {
+				this.dependencyInitLock = false
+
+				if (this.dependencyInitTimer) {
+					clearTimeout(this.dependencyInitTimer)
+					this.dependencyInitTimer = null
+				}
+			},
+
+			clearBlankPageInitLock() {
+				this.blankPageInitLock = false
+			},
+
+			isUserGestureMapEvent(causedBy) {
+				return ['gesture', 'drag', 'scale'].includes(String(causedBy || '').toLowerCase())
+			},
+
+			applyMapLocation(longitude, latitude, noReverse = true) {
+				const lng = Number(longitude)
+				const lat = Number(latitude)
+
+				if (!Number.isFinite(lng) || !Number.isFinite(lat)) return
+
+				this.ignoreRegionChangeOnce = true
+				this.mapProgrammaticUntil = Date.now() + 280
+
+				this.longitude = lng
+				this.latitude = lat
+				this.newLongitude = lng
+				this.newLatitude = lat
+
+				if (this.mapGuardTimer) {
+					clearTimeout(this.mapGuardTimer)
+				}
+				this.mapGuardTimer = setTimeout(() => {
+					this.ignoreRegionChangeOnce = false
+					this.mapGuardTimer = null
+				}, 320)
+
+				if (this.mapReverseTimer) {
+					clearTimeout(this.mapReverseTimer)
+					this.mapReverseTimer = null
+				}
+				
+
+				if (!noReverse) {
+					this.mapReverseTimer = setTimeout(() => {
+						this.reverseGeocode(lng, lat)
+						this.mapReverseTimer = null
+					}, 220)
+				}
+			},
+
+			normalizeCityName(province, city) {
+				let cityName = ''
+
+				if (Array.isArray(city)) {
+					cityName = city[0] || ''
+				} else {
+					cityName = city || ''
+				}
+
+				const fallbackCities = [
+					'北京市',
+					'上海市',
+					'天津市',
+					'重庆市',
+					'香港特别行政区',
+					'澳门特别行政区'
+				]
+
+				if (!cityName && fallbackCities.includes(province)) {
+					cityName = province
+				}
+
+				return cityName
+			},
+
+			buildMapSnapshotUrl() {
+				const lng = Number(this.longitude || this.newLongitude || 0).toFixed(6)
+				const lat = Number(this.latitude || this.newLatitude || 0).toFixed(6)
+				return `https://restapi.amap.com/v3/staticmap?location=${lng},${lat}&zoom=17&size=750*500&scale=2&markers=mid,0xE8101E,A:${lng},${lat}&key=${this.amapKey}`
+			},
+
+			onSnapshotLoad() {
+				console.log('地图加载成功:', this.mapSnapshotUrl)
+			},
+
+			onSnapshotError(e) {
+				console.log('地图加载失败:', e, this.mapSnapshotUrl)
+				uni.showToast({
+					title: '地图加载失败',
+					icon: 'none'
+				})
+			},
+
+			findRegionIndexByCode(baseData, provinceCode, cityCode, areaCode) {
+				const result = {
+					provinceIndex: -1,
+					cityIndex: -1,
+					areaIndex: -1
+				}
+				const targetProvinceCode = (provinceCode || '').slice(0, 6)
+				const targetCityCode = (cityCode || '').slice(0, 6)
+				const targetAreaCode = (areaCode || '').slice(0, 6)
+				if (!targetProvinceCode || !targetCityCode || !targetAreaCode) return result
+
+				for (let pIdx = 0; pIdx < baseData.length; pIdx++) {
+					const provinceItem = baseData[pIdx]
+					const currentProvinceCode = (provinceItem.code || '').slice(0, 6)
+					if (currentProvinceCode === targetProvinceCode) {
+						result.provinceIndex = pIdx
+						const citys = provinceItem.citys || []
+						for (let cIdx = 0; cIdx < citys.length; cIdx++) {
+							const cityItem = citys[cIdx]
+							const currentCityCode = (cityItem.code || '').slice(0, 6)
+							if (currentCityCode === targetCityCode) {
+								result.cityIndex = cIdx
+								const areas = cityItem?.areas || []
+								for (let aIdx = 0; aIdx < areas.length; aIdx++) {
+									const areaItem = areas[aIdx]
+									const currentAreaCode = (areaItem.code || '').slice(0, 6)
+									if (currentAreaCode === targetAreaCode) {
+										result.areaIndex = aIdx
+										return result
+									}
+								}
+								return result
+							}
+						}
+						return result
+					}
+				}
+				return result
+			},
+
+			convert(item) {
+				const data = {
+					key: this.amapKey,
+					locations: `${item.longitude},${item.latitude}`,
+					coordsys: 'gps'
+				}
+				return new Promise((resolve) => {
+					uni.request({
+						url: 'https://restapi.amap.com/v3/assistant/coordinate/convert',
+						method: 'GET',
+						data,
+						success(res) {
+							resolve(res.data)
+						}
+					})
+				})
+			},
+
+			getLocation(silent = false) {
+				return new Promise((resolve, reject) => {
+					const handleFail = (err) => {
+						if (!silent) {
+							uni.showToast({
+								title: '获取位置失败',
+								icon: 'none'
+							})
+						}
+						reject(err)
+					}
+
+					if (this.$store?.state?.version?.DeviceBrand === 'ios') {
+						uni.getLocation({
+							type: 'wgs84',
+							isHighAccuracy: true,
+							success: async (res) => {
+								try {
+									const convert = await this.convert(res)
+									const locations = String(convert?.locations || '').split(',')
+
+									if (locations.length >= 2) {
+										res.longitude = Number(locations[0])
+										res.latitude = Number(locations[1])
+									}
+
+									resolve(res)
+								} catch (error) {
+									handleFail(error)
+								}
+							},
+							fail: handleFail
+						})
+					} else {
+						uni.getLocation({
+							type: 'gcj02',
+							geocode: true,
+							success: (res) => resolve(res),
+							fail: handleFail
+						})
+					}
+				})
+			},
+
+			async getCurrentLocation(silent = false, lockInit = false) {
+				this.blankPageInitLock = false
+
+				try {
+					const locationRes = await this.getLocation(silent)
+
+					if (lockInit) {
+						this.startDependencyInitLock(1200)
+						this.userSelectedRegion = false
+						this.isManualDetail = false
+						this.suppressInitDetailFill = false
+					}
+
+					this.updateMapCenter(locationRes.longitude, locationRes.latitude, false)
+				} catch (error) {
+					if (silent) {
+						this.latitude = 0
+						this.longitude = 0
+						this.newLatitude = 0
+						this.newLongitude = 0
+
+						this.currentProvince = ''
+						this.currentCity = ''
+						this.currentDistrict = ''
+						this.currentRegion = ''
+						this.detailAddress = ''
+						this.manualDetail = ''
+						this.currentDetail = ''
+						this.isManualDetail = false
+
+						this.blankPageInitLock = true
+						this.suppressInitDetailFill = true
+					}
+
+					console.log('定位失败', error)
+				}
+			},
+
+			getNowLocation(center) {
+				if (!center) return
+				const locationRes = center.split(',')
+				if (locationRes.length < 2) return
+
+				this.updateMapCenter(
+					parseFloat(locationRes[0]),
+					parseFloat(locationRes[1]),
+					false
+				)
+			},
+
+			normalizeAdcode6(code) {
+				return String(code || '').slice(0, 6)
+			},
+
+			validateLocationWithDependency(longitude, latitude, dependencyCode) {
+				return new Promise((resolve) => {
+					const targetCode = this.normalizeAdcode6(dependencyCode)
+
+					if (!targetCode || !longitude || !latitude) {
+						resolve(true)
+						return
+					}
+
+					uni.request({
+						url: 'https://restapi.amap.com/v3/geocode/regeo',
+						method: 'GET',
+						data: {
+							key: this.amapKey,
+							location: `${longitude},${latitude}`,
+							extensions: 'base'
+						},
+						success: (res) => {
+							const adcode = this.normalizeAdcode6(
+								res?.data?.regeocode?.addressComponent?.adcode || ''
+							)
+
+							if (!adcode) {
+								resolve(true)
+								return
+							}
+
+							resolve(adcode === targetCode)
+						},
+						fail: () => {
+							resolve(true)
+						}
+					})
+				})
+			},
+
+			async locateByDependencyCenter(regions, dependencyCode, skipAutoLocate) {
+				let center = null
+
+				if (dependencyCode && regions[2]) {
+					center = await this.getDistrictCenter(regions[2], dependencyCode)
+				}
+
+				if (!center && regions[2]) {
+					center = await this.getDistrictCenter(regions[2])
+				}
+				if (!center && regions[1] && regions[1] !== regions[0]) {
+					center = await this.getDistrictCenter(regions[1])
+				}
+				if (!center && regions[0]) {
+					center = await this.getDistrictCenter(regions[0])
+				}
+
+				if (center) {
+					const locationRes = center.split(',')
+					if (locationRes.length >= 2) {
+						this.updateMapCenter(
+							parseFloat(locationRes[0]),
+							parseFloat(locationRes[1]),
+							true
+						)
+					}
+				} else if (!skipAutoLocate) {
+					this.getCurrentLocation()
+				}
+			},
+
+			reverseGeocode(lng, lat) {
+				const requestId = ++this.reverseGeocodeRequestId
+				const targetLng = parseFloat(lng)
+				const targetLat = parseFloat(lat)
+
+				if (!Number.isFinite(targetLng) || !Number.isFinite(targetLat)) return
+
+				uni.request({
+					url: 'https://restapi.amap.com/v3/geocode/regeo',
+					data: {
+						key: this.amapKey,
+						location: `${targetLng},${targetLat}`,
+						extensions: 'base'
+					},
+					success: (res) => {
+						if (requestId !== this.reverseGeocodeRequestId) return
+
+						if (res.data.status === '1' && res.data.regeocode) {
+							if (this.recognizeMapMoving) return
+
+							const regeo = res.data.regeocode
+							const formatted = regeo.formatted_address || ''
+							const addrComp = regeo.addressComponent || {}
+
+							const provinceName = addrComp.province || ''
+							const cityName = this.normalizeCityName(provinceName, addrComp.city)
+							const districtName = addrComp.district || ''
+
+							let region = ''
+							if (provinceName) region += provinceName
+							if (cityName && cityName !== provinceName) region += cityName
+							if (districtName) region += districtName
+
+							if (!this.userSelectedRegion) {
+								this.currentRegion = region || formatted
+								this.currentProvince = provinceName
+								this.currentCity = cityName
+								this.currentDistrict = districtName
+
+								const adcode = addrComp.adcode || ''
+								if (adcode.length >= 6) {
+									this.selectedDistrictCode = adcode
+									this.selectedCityCode = adcode.substring(0, 4) + '00'
+									this.selectedProvinceCode = adcode.substring(0, 2) + '0000'
+								}
+							}
+
+							let detail = ''
+							if (region && formatted.startsWith(region)) {
+								detail = formatted.substring(region.length).trim()
+							} else {
+								detail = formatted.trim()
+							}
+
+							if (this.suppressInitDetailFill) {
+								this.suppressInitDetailFill = false
+								return
+							}
+
+							if (!this.isManualDetail) {
+								this.detailAddress = detail || formatted
+								this.manualDetail = this.detailAddress
+								this.currentDetail = this.detailAddress
+							}
+						}
+					},
+					fail: (err) => {
+						if (requestId !== this.reverseGeocodeRequestId) return
+						console.error('逆地理编码失败:', err)
+					}
+				})
+			},
+
+			onMapTap(e) {
+				this.clearDependencyInitLock()
+				this.clearBlankPageInitLock()
+
+				this.userSelectedRegion = false
+				this.isManualDetail = false
+				this.suppressInitDetailFill = false
+
+				const tapLat = Number(e?.detail?.latitude)
+				const tapLng = Number(e?.detail?.longitude)
+
+				if (Number.isFinite(tapLat) && Number.isFinite(tapLng)) {
+					this.latitude = tapLat
+					this.longitude = tapLng
+					this.newLatitude = tapLat
+					this.newLongitude = tapLng
+					this.reverseGeocode(tapLng, tapLat)
+					return
+				}
+
+				const mapCtx = uni.createMapContext('map', this)
+				mapCtx.getCenterLocation({
+					success: (res) => {
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						this.newLatitude = res.latitude
+						this.newLongitude = res.longitude
+						this.reverseGeocode(res.longitude, res.latitude)
+					},
+					fail: (err) => {
+						console.error('点击地图获取中心点失败', err)
+					}
+				})
+			},
+
+			syncCenterFromMap() {
+				if (this.dependencyInitLock) return
+				if (this.blankPageInitLock) return
+
+				const mapCtx = uni.createMapContext('map', this)
+
+				mapCtx.getCenterLocation({
+					success: (res) => {
+						if (
+							!res ||
+							!Number.isFinite(Number(res.longitude)) ||
+							!Number.isFinite(Number(res.latitude))
+						) {
+							return
+						}
+
+						this.userSelectedRegion = false
+						this.isManualDetail = false
+						this.suppressInitDetailFill = false
+
+						this.latitude = Number(res.latitude)
+						this.longitude = Number(res.longitude)
+						this.newLatitude = Number(res.latitude)
+						this.newLongitude = Number(res.longitude)
+
+						this.reverseGeocode(this.longitude, this.latitude)
+					},
+					fail: (err) => {
+						console.error('syncCenterFromMap失败', err)
+					}
+				})
+			},
+
+			changeMap(e) {
+				if (this.showRegionPicker || !this.mapVisible) return
+				if (this.recognizeMapMoving) return
+				if (this.dependencyInitLock) return
+
+				const eventType = e?.detail?.type || e?.type || ''
+				const causedBy = e?.detail?.causedBy || e?.causedBy || ''
+
+				if (this.blankPageInitLock) {
+					if (this.isUserGestureMapEvent(causedBy)) {
+						this.clearBlankPageInitLock()
+					} else {
+						return
+					}
+				}
+
+				if (eventType === 'begin') return
+
+				if (Date.now() < this.mapProgrammaticUntil) {
+					return
+				}
+
+				const isProgrammaticEvent = causedBy && causedBy !== 'gesture'
+
+				if (isProgrammaticEvent && this.ignoreRegionChangeOnce) {
+					this.ignoreRegionChangeOnce = false
+					return
+				}
+
+				if (this.mapMoveTimer) {
+					clearTimeout(this.mapMoveTimer)
+				}
+
+				const delay = eventType === 'end' ? 80 : 260
+
+				this.mapMoveTimer = setTimeout(() => {
+					this.syncCenterFromMap()
+
+					setTimeout(() => {
+						this.syncCenterFromMap()
+					}, 180)
+
+					this.mapMoveTimer = null
+				}, delay)
+			},
+
+			goSelectCity() {
+				uni.navigateTo({
+					url: '/subPackages/address/selectCity'
+				})
+			},
+
+			clearRawAddress() {
+				this.rawAddress = ''
+				uni.showToast({
+					title: '已清空',
+					icon: 'none'
+				})
+			},
+
+			onDetailInput(e) {
+				const val = e.detail.value || ''
+				this.detailAddress = val
+				this.manualDetail = val
+				this.currentDetail = val
+				this.isManualDetail = val.trim().length > 0
+			},
+
+			onPaste() {
+				uni.getClipboardData({
+					success: (res) => {
+						if (res.data) {
+							this.rawAddress = res.data
+							uni.showToast({
+								title: '已粘贴',
+								icon: 'none'
+							})
+						}
+					}
+				})
+			},
+
+			sanitizeRawAddress(raw) {
+				let text = (raw || '')
+					.replace(/[\r\n\t]+/g, ' ')
+					.replace(/　/g, ' ')
+					.replace(/\s+/g, ' ')
+					.trim()
+
+				const addressMatch = text.match(/地址[:：]\s*(.*)/)
+				if (addressMatch && addressMatch[1]) {
+					text = addressMatch[1].trim()
+				}
+
+				text = text
+					.replace(/(收货人|联系人|姓名)[:：]\s*[\u4e00-\u9fa5A-Za-z·]{1,20}/g, '')
+					.replace(/(电话|手机)[:：]?\s*1[3-9]\d{9}/g, '')
+					.replace(/1[3-9]\d{9}/g, '')
+					.replace(/[，,；;]+/g, ' ')
+					.replace(/\s+/g, ' ')
+					.trim()
+
+				return text
+			},
+
+			escapeRegExp(str) {
+				return (str || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+			},
+
+			getNetworkTypeSafe() {
+				return new Promise((resolve) => {
+					uni.getNetworkType({
+						success: (res) => resolve(res.networkType || 'unknown'),
+						fail: () => resolve('unknown')
+					})
+				})
+			},
+
+			async ensureRecognizeNetworkAvailable() {
+				const networkType = await this.getNetworkTypeSafe()
+
+				if (networkType === 'none') {
+					this.showRecognizeNetworkError()
+					return false
+				}
+
+				return true
+			},
+
+			showRecognizeNetworkError() {
+				uni.showToast({
+					title: '网络异常，无法进行地址识别与地图定位，请检查网络后重试',
+					icon: 'none',
+					duration: 3500
+				})
+			},
+
+			isLikelyNetworkError(error) {
+				const msg = String(
+					error?.errMsg ||
+					error?.message ||
+					error ||
+					''
+				).toLowerCase()
+
+				return (
+					msg.includes('network') ||
+					msg.includes('timeout') ||
+					msg.includes('request:fail') ||
+					msg.includes('fail')
+				)
+			},
+
+			hasStrongAddressFeature(text) {
+				return /(\d|号|栋|幢|单元|室|楼|层|座|路|街|巷|道|村|镇|乡|里|弄|园|苑|小区|大厦|广场|市场|学校|医院|公寓|酒店|中心|胡同)/.test(text || '')
+			},
+
+			containsObviousInvalidNoise(text) {
+				return /(价格|价钱|多少钱|举报|投诉|建议|咨询|测试|示例|比如|比方|假设|无效|乱填)/i.test(text || '')
+			},
+
+			isLikelyInvalidRecognizedDetail(text) {
+				const value = String(text || '').trim()
+				if (!value) return true
+
+				if (/(价格|价钱|多少钱|举报|投诉|建议|咨询|测试|示例|比如|比方|假设|无效|乱填)/i.test(value)) {
+					return true
+				}
+
+				if (/^\d{6,}$/.test(value) || /^[A-Za-z]{6,}$/.test(value)) {
+					return true
+				}
+
+				const specialChars = (value.match(/[^\u4e00-\u9fa5a-zA-Z0-9]/g) || []).length
+				if (specialChars / value.length > 0.3) {
+					return true
+				}
+
+				if (value.length < 2) {
+					return true
+				}
+
+				const hasLongLetterChunk = /[A-Za-z]{6,}/.test(value)
+				const letterCount = (value.match(/[A-Za-z]/g) || []).length
+				const letterRatio = value.length ? (letterCount / value.length) : 0
+				const hasAddressFeature = this.hasStrongAddressFeature(value)
+
+				if (hasLongLetterChunk && !hasAddressFeature) {
+					return true
+				}
+
+				if (letterRatio > 0.35 && !hasAddressFeature) {
+					return true
+				}
+
+				return false
+			},
+
+			isPreciseGeocodeLevel(level) {
+				return [
+					'门牌号',
+					'兴趣点',
+					'道路',
+					'道路交叉口',
+					'乡镇',
+					'村庄',
+					'村级地名',
+					'roadno',
+					'poi'
+				].includes(String(level || '').trim())
+			},
+
+			normalizeDistrictName(name) {
+				return String(name || '').trim()
+			},
+
+			validateRecognizedDetail(detailText, geo, hit = {}) {
+				const cleaned = String(detailText || '').trim()
+				if (!cleaned) {
+					return {
+						valid: false,
+						cleaned: '',
+						reason: 'empty'
+					}
+				}
+
+				if (this.isLikelyInvalidRecognizedDetail(cleaned)) {
+					return {
+						valid: false,
+						cleaned: '',
+						reason: 'invalid_detail'
+					}
+				}
+
+				if (!geo) {
+					return {
+						valid: false,
+						cleaned: '',
+						reason: 'geocode_failed'
+					}
+				}
+
+				const geoLevel = String(geo?.level || '').trim()
+				const preciseLevel = this.isPreciseGeocodeLevel(geoLevel)
+				const hasAddressFeature = this.hasStrongAddressFeature(cleaned)
+
+				const hitCountyCode = String(hit?.county_code || '').slice(0, 6)
+				const geoAdcode = String(geo?.adcode || '').slice(0, 6)
+
+				const hitDistrictName = this.normalizeDistrictName(hit?.county_name)
+				const geoDistrictName = this.normalizeDistrictName(geo?.district)
+
+				const sameDistrictByCode = !!hitCountyCode && !!geoAdcode && hitCountyCode === geoAdcode
+				const sameDistrictByName = !!hitDistrictName && !!geoDistrictName && hitDistrictName === geoDistrictName
+				const sameDistrict = sameDistrictByCode || sameDistrictByName
+
+				const purePoiLike =
+					cleaned.length >= 2 &&
+					/^[\u4e00-\u9fa5A-Za-z0-9]+$/.test(cleaned) &&
+					!/[A-Za-z]{6,}/.test(cleaned)
+
+				if (hasAddressFeature || preciseLevel) {
+					return {
+						valid: true,
+						cleaned,
+						reason: ''
+					}
+				}
+
+				if (sameDistrict && purePoiLike) {
+					return {
+						valid: true,
+						cleaned,
+						reason: 'district_geo_verified'
+					}
+				}
+
+				return {
+					valid: false,
+					cleaned: '',
+					reason: 'detail_not_precise'
+				}
+			},
+
+			cleanRecognizedDetail(detail, province, city, district) {
+				let text = this.stripLeadingRegionParts(detail, [
+					province,
+					city,
+					district
+				])
+
+				text = text
+					.replace(/(收货人|联系人|姓名)[:：].*$/g, '')
+					.replace(/(电话|手机)[:：]?\s*1[3-9]\d{9}.*$/g, '')
+					.replace(/备注[:：].*$/g, '')
+					.replace(/1[3-9]\d{9}/g, '')
+					.replace(/[（(][^）)]*[）)]/g, '')
+					.replace(/^[，,；;、\s]+/, '')
+					.replace(/\s+/g, ' ')
+					.trim()
+
+				return text
+			},
+
+			appendIfMissing(base, part) {
+				const src = String(base || '').trim()
+				const seg = String(part || '').trim()
+
+				if (!seg) return src
+				if (!src) return seg
+				if (src.includes(seg)) return src
+
+				return `${src}${seg}`
+			},
+
+			deriveCodesFromDivision(divcode = '') {
+				const code = String(divcode || '').trim()
+				if (!/^\d{12}$/.test(code)) {
+					return {
+						province_code: '',
+						city_code: '',
+						county_code: ''
+					}
+				}
+
+				return {
+					province_code: `${code.slice(0, 2)}0000`,
+					city_code: `${code.slice(0, 4)}00`,
+					county_code: code.slice(0, 6)
+				}
+			},
+
+			parseDivisionInfo(area = {}) {
+				const divisionInfo = area?.division_info || {}
+				const divisionName = String(divisionInfo.division_name || '').trim()
+				const divcode = String(divisionInfo.divcode || '').trim()
+
+				let parts = []
+				if (divisionName.includes(';')) {
+					parts = divisionName.split(';')
+				} else if (divisionName) {
+					parts = divisionName.split(/\s+/)
+				}
+
+				const derivedCodes = this.deriveCodesFromDivision(divcode)
+
+				return {
+					province_name: String(parts[0] || '').trim(),
+					city_name: String(parts[1] || '').trim(),
+					county_name: String(parts[2] || '').trim(),
+					town_name: String(parts[3] || '').trim(),
+					province_code: derivedCodes.province_code,
+					city_code: derivedCodes.city_code,
+					county_code: derivedCodes.county_code
+				}
+			},
+
+			parseLonlatInfo(lonlat = {}) {
+				const offline = lonlat?.offline_geocode || {}
+
+				return {
+					gcj02: String(offline.gcj02 || '').trim(),
+					wgs84: String(offline.wgs84 || '').trim(),
+					level: String(offline.level || '').trim()
+				}
+			},
+
+			parseStreetStd(streetStd = '') {
+				const parsed = {}
+
+				String(streetStd)
+					.split(/\t+/)
+					.forEach(item => {
+						const index = item.indexOf('=')
+						if (index === -1) return
+
+						const key = item.slice(0, index).trim().toLowerCase()
+						const value = item.slice(index + 1).trim()
+
+						if (key) {
+							parsed[key] = value
+						}
+					})
+
+				return {
+					province_name: (parsed.prov || parsed.province || '').trim(),
+					city_name: (parsed.city || '').trim(),
+					county_name: (parsed.district || parsed.county || parsed.area || '').trim(),
+					town_name: (parsed.town || parsed.street || '').trim(),
+					road_name: (parsed.road || '').trim(),
+					road_no: (parsed.roadno || parsed.road_no || '').trim(),
+					poi_name: (parsed.poi || parsed.poi_name || '').trim(),
+					house_no: (parsed.houseno || parsed.house_no || '').trim(),
+					room_no: (parsed.roomno || parsed.room_no || '').trim(),
+					floor_no: (parsed.floor || parsed.floor_no || '').trim(),
+					unit_no: (parsed.unit || parsed.unit_no || '').trim(),
+					building_no: (parsed.building || parsed.building_no || '').trim(),
+					block_no: (parsed.block || parsed.block_no || '').trim(),
+					detail: (parsed.detail || parsed.address || parsed.addr || '').trim(),
+					address: (parsed.address || parsed.detail || parsed.addr || '').trim(),
+					province_code: (parsed.province_code || parsed.prov_code || '').trim(),
+					city_code: (parsed.city_code || '').trim(),
+					county_code: (parsed.county_code || parsed.district_code || parsed.area_code || '').trim(),
+					_street_std_map: parsed
+				}
+			},
+
+			normalizeRecognizeHit(res) {
+				if (!res || (res.code !== 200 && res.code !== 0)) return null
+
+				// 旧格式1：data是数组
+				if (Array.isArray(res.data) && res.data.length) {
+					const item = res.data[0]
+					return {
+						province_name: (item.province_name || '').trim(),
+						city_name: (item.city_name || '').trim(),
+						county_name: (item.county_name || '').trim(),
+						town_name: (item.town_name || '').trim(),
+						road_name: '',
+						road_no: '',
+						poi_name: '',
+						house_no: '',
+						room_no: '',
+						floor_no: '',
+						unit_no: '',
+						building_no: '',
+						block_no: '',
+						detail: (item.detail || '').trim(),
+						address: (item.address || item.detail || '').trim(),
+						province_code: (item.province_code || '').trim(),
+						city_code: (item.city_code || '').trim(),
+						county_code: (item.county_code || '').trim(),
+						backend_gcj02: '',
+						backend_wgs84: '',
+						backend_level: '',
+						_street_std_map: {}
+					}
+				}
+
+				// 旧格式2：data.data是数组
+				if (Array.isArray(res?.data?.data) && res.data.data.length) {
+					const item = res.data.data[0]
+					return {
+						province_name: (item.province_name || '').trim(),
+						city_name: (item.city_name || '').trim(),
+						county_name: (item.county_name || '').trim(),
+						town_name: (item.town_name || '').trim(),
+						road_name: '',
+						road_no: '',
+						poi_name: '',
+						house_no: '',
+						room_no: '',
+						floor_no: '',
+						unit_no: '',
+						building_no: '',
+						block_no: '',
+						detail: (item.detail || '').trim(),
+						address: (item.address || item.detail || '').trim(),
+						province_code: (item.province_code || '').trim(),
+						city_code: (item.city_code || '').trim(),
+						county_code: (item.county_code || '').trim(),
+						backend_gcj02: '',
+						backend_wgs84: '',
+						backend_level: '',
+						_street_std_map: {}
+					}
+				}
+
+				// 旧格式3：result是数组
+				if (Array.isArray(res.result) && res.result.length) {
+					const item = res.result[0]
+					return {
+						province_name: (item.province_name || '').trim(),
+						city_name: (item.city_name || '').trim(),
+						county_name: (item.county_name || '').trim(),
+						town_name: (item.town_name || '').trim(),
+						road_name: '',
+						road_no: '',
+						poi_name: '',
+						house_no: '',
+						room_no: '',
+						floor_no: '',
+						unit_no: '',
+						building_no: '',
+						block_no: '',
+						detail: (item.detail || '').trim(),
+						address: (item.address || item.detail || '').trim(),
+						province_code: (item.province_code || '').trim(),
+						city_code: (item.city_code || '').trim(),
+						county_code: (item.county_code || '').trim(),
+						backend_gcj02: '',
+						backend_wgs84: '',
+						backend_level: '',
+						_street_std_map: {}
+					}
+				}
+
+				// 新格式：data本身就是对象
+				if (
+					res.data &&
+					typeof res.data === 'object' &&
+					(
+						res.data.province_name ||
+						res.data.city_name ||
+						res.data.county_name ||
+						res.data.detail ||
+						res.data.address
+					)
+				) {
+					return {
+						province_name: (res.data.province_name || '').trim(),
+						city_name: (res.data.city_name || '').trim(),
+						county_name: (res.data.county_name || '').trim(),
+						town_name: (res.data.town_name || '').trim(),
+						road_name: (res.data.road_name || res.data.road || '').trim(),
+						road_no: (res.data.road_no || res.data.roadno || '').trim(),
+						poi_name: (res.data.poi_name || res.data.poi || '').trim(),
+						house_no: (res.data.house_no || res.data.houseno || '').trim(),
+						room_no: (res.data.room_no || res.data.roomno || '').trim(),
+						floor_no: (res.data.floor_no || res.data.floor || '').trim(),
+						unit_no: (res.data.unit_no || res.data.unit || '').trim(),
+						building_no: (res.data.building_no || res.data.building || '').trim(),
+						block_no: (res.data.block_no || res.data.block || '').trim(),
+						detail: (res.data.detail || '').trim(),
+						address: (res.data.address || res.data.detail || '').trim(),
+						province_code: (res.data.province_code || '').trim(),
+						city_code: (res.data.city_code || '').trim(),
+						county_code: (res.data.county_code || '').trim(),
+						backend_gcj02: '',
+						backend_wgs84: '',
+						backend_level: '',
+						_street_std_map: {}
+					}
+				}
+
+				// 新格式：data.street + data.area + data.lonlat
+				if (res?.data?.street && typeof res.data.street === 'object') {
+					const street = res.data.street
+					const stdParsed = this.parseStreetStd(street.street_std || '')
+					const divisionParsed = this.parseDivisionInfo(res?.data?.area || {})
+					const lonlatParsed = this.parseLonlatInfo(res?.data?.lonlat || {})
+
+					return {
+						province_name: (street.province_name || street.province || stdParsed.province_name ||
+							divisionParsed.province_name || '').trim(),
+						city_name: (street.city_name || street.city || stdParsed.city_name || divisionParsed.city_name ||
+							'').trim(),
+						county_name: (street.county_name || street.district || street.county || stdParsed.county_name ||
+							divisionParsed.county_name || '').trim(),
+						town_name: (street.town_name || street.town || street.street_name || stdParsed.town_name ||
+							divisionParsed.town_name || '').trim(),
+						road_name: (street.road_name || street.road || stdParsed.road_name || '').trim(),
+						road_no: (street.road_no || street.roadno || stdParsed.road_no || '').trim(),
+						poi_name: (street.poi_name || street.poi || stdParsed.poi_name || '').trim(),
+						house_no: (street.house_no || street.houseno || stdParsed.house_no || '').trim(),
+						room_no: (street.room_no || street.roomno || stdParsed.room_no || '').trim(),
+						floor_no: (street.floor_no || street.floor || stdParsed.floor_no || '').trim(),
+						unit_no: (street.unit_no || street.unit || stdParsed.unit_no || '').trim(),
+						building_no: (street.building_no || street.building || stdParsed.building_no || '').trim(),
+						block_no: (street.block_no || street.block || stdParsed.block_no || '').trim(),
+						detail: (street.detail || street.address || stdParsed.detail || stdParsed.address || '').trim(),
+						address: (street.address || street.detail || stdParsed.address || stdParsed.detail || '').trim(),
+						province_code: (street.province_code || stdParsed.province_code || divisionParsed.province_code ||
+							'').trim(),
+						city_code: (street.city_code || stdParsed.city_code || divisionParsed.city_code || '').trim(),
+						county_code: (street.county_code || street.district_code || stdParsed.county_code || divisionParsed
+							.county_code || '').trim(),
+						backend_gcj02: lonlatParsed.gcj02,
+						backend_wgs84: lonlatParsed.wgs84,
+						backend_level: lonlatParsed.level,
+						_street_std_map: stdParsed._street_std_map || {}
+					}
+				}
+
+				return null
+			},
+
+			getRecognizeApiUrl() {
+				const app = typeof getApp === 'function' ? getApp() : null
+
+				const baseUrl =
+					app?.globalData?.url ||
+					app?.globalData?.baseUrl ||
+					app?.globalData?.apiBaseUrl ||
+					'https://api.mrrwlkj.top'
+
+				return `${String(baseUrl).replace(/\/+$/, '')}/api/recognize/address`
+			},
+
+			buildMultipartFormData(fields = {}) {
+				const boundary = '----UniFormBoundary' + Date.now()
+				let body = ''
+
+				Object.keys(fields).forEach((key) => {
+					const value = fields[key] == null ? '' : String(fields[key])
+					body += `--${boundary}\r\n`
+					body += `Content-Disposition: form-data; name="${key}"\r\n\r\n`
+					body += `${value}\r\n`
+				})
+
+				body += `--${boundary}--\r\n`
+
+				return {
+					boundary,
+					body
+				}
+			},
+
+			requestRecognizeAddress(rawText) {
+				return request.post('/api/recognize/address', {
+					text: rawText
+				})
+			},
+
+			buildGeoFromBackend(hit) {
+				const location = String(hit?.backend_gcj02 || '').trim()
+				if (!location) return null
+
+				return {
+					location,
+					adcode: String(hit?.county_code || '').trim(),
+					level: String(hit?.backend_level || '').trim(),
+					district: String(hit?.county_name || '').trim()
+				}
+			},
+
+			geocodeRecognizedAddress(address) {
+				return new Promise((resolve) => {
+					if (!address) {
+						resolve({
+							ok: true,
+							data: null,
+							error: null
+						})
+						return
+					}
+
+					uni.request({
+						url: 'https://restapi.amap.com/v3/geocode/geo',
+						method: 'GET',
+						data: {
+							key: this.amapKey,
+							address,
+							output: 'JSON'
+						},
+						success: (res) => {
+							if (res.data.status === '1' && res.data.geocodes?.length > 0) {
+								resolve({
+									ok: true,
+									data: res.data.geocodes[0],
+									error: null
+								})
+							} else {
+								resolve({
+									ok: true,
+									data: null,
+									error: null
+								})
+							}
+						},
+						fail: (error) => resolve({
+							ok: false,
+							data: null,
+							error
+						})
+					})
+				})
+			},
+
+			stripLeadingRegionParts(text, parts = []) {
+				let result = String(text || '').trim()
+
+				const validParts = [...new Set(
+					parts
+					.map(item => String(item || '').trim())
+					.filter(Boolean)
+				)].sort((a, b) => b.length - a.length)
+
+				if (!result || !validParts.length) return result
+
+				let changed = true
+
+				while (changed && result) {
+					changed = false
+					result = result.replace(/^\s+/, '')
+
+					for (const part of validParts) {
+						const reg = new RegExp(`^${this.escapeRegExp(part)}(?:\\s+|\\b)?`)
+						if (reg.test(result)) {
+							result = result.replace(reg, '').trim()
+							changed = true
+							break
+						}
+					}
+				}
+
+				return result
+			},
+
+			assembleDetailByInterfaceFields(hit, sanitizedText, province, city, district) {
+				const directDetail = String(
+					hit?.detail ||
+					hit?.address ||
+					hit?.addr ||
+					hit?.full_address_detail ||
+					hit?.address_detail ||
+					''
+				).trim()
+
+				const structuredValues = [
+					String(hit?.town_name || '').trim(),
+					String(hit?.road_name || '').trim(),
+					String(hit?.road_no || '').trim(),
+					String(hit?.poi_name || '').trim(),
+					String(hit?.house_no || '').trim(),
+					String(hit?.unit_no || '').trim(),
+					String(hit?.floor_no || '').trim(),
+					String(hit?.room_no || '').trim(),
+					String(hit?.building_no || '').trim(),
+					String(hit?.block_no || '').trim()
+				]
+
+				let result = ''
+
+				// 先放街道/镇
+				result = this.appendIfMissing(result, structuredValues[0])
+
+				// 再放接口直接给出的detail/address
+				if (directDetail) {
+					const cleanedDirect = this.stripLeadingRegionParts(
+						directDetail,
+						[province, city, district].filter(Boolean)
+					).trim()
+					result = this.appendIfMissing(result, cleanedDirect)
+				}
+
+				// 再按结构化字段补齐
+				for (let i = 1; i < structuredValues.length; i++) {
+					result = this.appendIfMissing(result, structuredValues[i])
+				}
+
+				// 再把street_std中其他未知字段补齐，做到“有什么就拼什么”
+				const rawMap = hit?._street_std_map || {}
+				const ignoredKeys = new Set([
+					'prov', 'province',
+					'city',
+					'district', 'county', 'area',
+					'town', 'street',
+					'road',
+					'roadno', 'road_no',
+					'poi', 'poi_name',
+					'houseno', 'house_no',
+					'roomno', 'room_no',
+					'floor', 'floor_no',
+					'unit', 'unit_no',
+					'building', 'building_no',
+					'block', 'block_no',
+					'detail', 'address', 'addr',
+					'province_code', 'prov_code',
+					'city_code',
+					'county_code', 'district_code', 'area_code'
+				])
+
+				Object.keys(rawMap).forEach((key) => {
+					if (ignoredKeys.has(key)) return
+					const value = String(rawMap[key] || '').trim()
+					if (!value) return
+					result = this.appendIfMissing(result, value)
+				})
+
+				// 最后兜底原始文本扣省市区
+				if (!result) {
+					result = this.stripLeadingRegionParts(
+						sanitizedText,
+						[province, city, district].filter(Boolean)
+					).trim()
+				}
+
+				// 最终再次确保详细地址不带省市区
+				result = this.stripLeadingRegionParts(
+					result,
+					[province, city, district].filter(Boolean)
+				).trim()
+
+				return result
+			},
+
+			buildExactRecognizedDetail(hit, sanitizedText, province, city, district) {
+				return this.assembleDetailByInterfaceFields(
+					hit,
+					sanitizedText,
+					province,
+					city,
+					district
+				)
+			},
+
+			async onSmartRecognize() {
+				this.clearBlankPageInitLock()
+				this.userSelectedRegion = false
+				this.isManualDetail = false
+				this.suppressInitDetailFill = false
+
+				if (!this.hasRawContent) {
+					uni.showToast({
+						title: '请先粘贴或输入地址',
+						icon: 'none'
+					})
+					return
+				}
+
+				const originalRawText = (this.rawAddress || '').trim()
+				if (!originalRawText) {
+					uni.showToast({
+						title: '请先粘贴或输入地址',
+						icon: 'none'
+					})
+					return
+				}
+
+				const hasNetwork = await this.ensureRecognizeNetworkAvailable()
+				if (!hasNetwork) return
+
+				const sanitizedText = this.sanitizeRawAddress(originalRawText)
+				const removedNoise = sanitizedText !== originalRawText
+
+				if (!sanitizedText) {
+					uni.showToast({
+						title: '未提取到有效地址',
+						icon: 'none'
+					})
+					return
+				}
+
+				uni.showLoading({
+					title: '识别中...'
+				})
+
+				try {
+					const res = await this.requestRecognizeAddress(sanitizedText)
+					console.log('智能识别接口返回:', res)
+
+					const hit = this.normalizeRecognizeHit(res)
+
+					if (!res || (res.code !== 0 && res.code !== 200) || !hit) {
+						uni.hideLoading()
+						uni.showToast({
+							title: res?.msg || '地址解析失败',
+							icon: 'none'
+						})
+						return
+					}
+
+					console.log('智能识别标准化结果:', hit)
+
+					const normalizedRegion = this.normalizeRecognizedRegionParts(
+						hit.province_name,
+						hit.city_name,
+						hit.county_name
+					)
+
+					const province = normalizedRegion.province
+					const city = normalizedRegion.city
+					const district = normalizedRegion.district
+
+					const regionText = this.buildRegionText(province, city, district)
+
+					if (!regionText) {
+						uni.hideLoading()
+						const tip = this.getRecognizeToast('low', removedNoise, false, hit, '', false)
+						if (tip.type === 'modal') {
+							uni.showModal({
+								title: tip.title,
+								content: tip.content,
+								showCancel: false
+							})
+						} else {
+							uni.showToast({
+								title: tip.title,
+								icon: 'none'
+							})
+						}
+						return
+					}
+
+					const detailCandidate = this.cleanRecognizedDetail(
+						this.buildExactRecognizedDetail(
+							hit,
+							sanitizedText,
+							province,
+							city,
+							district
+						),
+						province,
+						city,
+						district
+					)
+
+					const fullAddress = `${regionText}${detailCandidate}`.trim()
+					console.log('用于定位的完整地址:', fullAddress)
+
+					let geocodeOk = false
+					let geo = null
+					let detailRejected = false
+					let detailText = ''
+
+					const fullGeoResult = await this.geocodeRecognizedAddress(fullAddress)
+
+					if (!fullGeoResult.ok) {
+						uni.hideLoading()
+						this.showRecognizeNetworkError()
+						return
+					}
+
+					geo = fullGeoResult.data || this.buildGeoFromBackend(hit)
+
+					const detailDecision = this.validateRecognizedDetail(detailCandidate, geo, hit)
+					detailRejected = !detailDecision.valid && !!detailCandidate
+					detailText = detailDecision.valid ? detailDecision.cleaned : ''
+
+					if (!detailText) {
+						const regionGeoResult = await this.geocodeRecognizedAddress(regionText)
+						if (!regionGeoResult.ok) {
+							uni.hideLoading()
+							this.showRecognizeNetworkError()
+							return
+						}
+						geo = regionGeoResult.data || this.buildGeoFromBackend(hit)
+						detailText = ''
+					}
+
+					if (geo) {
+						const location = geo.location
+						const adcode = geo.adcode || ''
+
+						if (adcode.length >= 6) {
+							this.selectedDistrictCode = adcode.slice(0, 6)
+							this.selectedCityCode = adcode.slice(0, 4) + '00'
+							this.selectedProvinceCode = adcode.slice(0, 2) + '0000'
+						} else {
+							this.selectedProvinceCode = hit.province_code || this.selectedProvinceCode || ''
+							this.selectedCityCode = hit.city_code || this.selectedCityCode || ''
+							this.selectedDistrictCode = hit.county_code || this.selectedDistrictCode || ''
+						}
+
+						if (location) {
+							const [lng, lat] = location.split(',')
+							this.longitude = parseFloat(lng)
+							this.latitude = parseFloat(lat)
+							this.newLongitude = this.longitude
+							this.newLatitude = this.latitude
+
+							this.recognizeMapMoving = true
+							if (this.recognizeMapMoveTimer) {
+								clearTimeout(this.recognizeMapMoveTimer)
+							}
+
+							this.updateMapCenter(this.longitude, this.latitude, true)
+							geocodeOk = true
+
+							this.recognizeMapMoveTimer = setTimeout(() => {
+								this.recognizeMapMoving = false
+								this.recognizeMapMoveTimer = null
+							}, 1500)
+						}
+					}
+
+					const level = this.getRecognizeLevel(hit, detailText, sanitizedText)
+					const shouldOnlyToast = this.shouldOnlyToastForGarbageRecognize(
+						sanitizedText,
+						hit,
+						detailText,
+						detailRejected,
+						geocodeOk
+					)
+
+					if (level === 'low' || shouldOnlyToast) {
+						uni.hideLoading()
+
+						if (shouldOnlyToast) {
+							uni.showModal({
+								title: '未识别到有效地址',
+								content: '当前输入内容无效，系统未自动填入所在地区和详细地址，请检查后重新输入，或手动选择地址。',
+								showCancel: false
+							})
+						} else {
+							const tip = this.getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText,
+								detailRejected)
+							if (tip.type === 'modal') {
+								uni.showModal({
+									title: tip.title,
+									content: tip.content,
+									showCancel: false
+								})
+							} else {
+								uni.showToast({
+									title: tip.title,
+									icon: 'none'
+								})
+							}
+						}
+						return
+					}
+
+					this.commitRecognizedResult(province, city, district, regionText, detailText, geo, level,
+						removedNoise, geocodeOk, hit, detailRejected)
+				} catch (error) {
+					console.error('智能识别失败:', error)
+					uni.hideLoading()
+
+					if (this.isLikelyNetworkError(error)) {
+						this.showRecognizeNetworkError()
+						return
+					}
+
+					uni.showToast({
+						title: '识别失败，请稍后重试',
+						icon: 'none'
+					})
+				}
+			},
+
+			getRecognizeLevel(hit, detailText, rawText) {
+				const province = (hit?.province_name || '').trim()
+				const city = (hit?.city_name || '').trim()
+				const district = (hit?.county_name || '').trim()
+
+				if (/火星市|月球|银河|测试地址/.test(rawText || '')) {
+					return 'low'
+				}
+
+				if (!province || (!city && !district)) {
+					return 'low'
+				}
+
+				if (!detailText || detailText.length < 2) {
+					return 'medium'
+				}
+
+				return 'high'
+			},
+
+			shouldOnlyToastForGarbageRecognize(rawText, hit, detailText, detailRejected = false, geocodeOk = false) {
+				if (geocodeOk) return false
+
+				const input = String(rawText || '').trim()
+				if (!input) return true
+
+				const province = (hit?.province_name || '').trim()
+				const city = (hit?.city_name || '').trim()
+				const district = (hit?.county_name || '').trim()
+
+				const hasFullRegion = !!(province && (city || district))
+				if (!hasFullRegion) return false
+
+				const hasAddressFeature = this.hasStrongAddressFeature(input)
+				const hasRegionKeyword = /(省|市|区|县|旗|镇|乡|村|街道)/.test(input)
+				const hasLongLetterChunk = /[A-Za-z]{2,}/.test(input)
+				const hasInvalidNoise = this.containsObviousInvalidNoise(input)
+
+				if (!hasAddressFeature && !hasRegionKeyword && !detailText) {
+					if (hasLongLetterChunk || hasInvalidNoise || detailRejected) {
+						return true
+					}
+				}
+
+				return false
+			},
+
+			getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText, detailRejected = false) {
+				const province = (hit?.province_name || '').trim()
+				const city = (hit?.city_name || '').trim()
+				const district = (hit?.county_name || '').trim()
+
+				const hasRegion = !!(province || city || district)
+				const hasFullRegion = !!(province && (city || district))
+				const hasDetail = !!(detailText && detailText.trim())
+
+				if (detailRejected && hasFullRegion && !hasDetail) {
+					return {
+						type: 'modal',
+						title: '已识别到地区，详细地址未自动填入',
+						content: '已识别到省市区，但检测到详细地址中包含无效或不完整内容，系统未自动填入详细地址，请手动补充。'
+					}
+				}
+
+				if (level === 'low') {
+					if (!hasRegion) {
+						return {
+							type: 'modal',
+							title: '已识别，但未匹配到有效地区',
+							content: '未查找到明确的省市区信息，请手动选择所在地区，并检查输入内容是否包含错别字、备注或无效地址。'
+						}
+					}
+
+					if (hasRegion && !hasFullRegion) {
+						return {
+							type: 'modal',
+							title: '已识别到部分地区信息',
+							content: '当前仅识别到部分地区，未能完整匹配到市区县，请手动补全所在地区并核对详细地址。'
+						}
+					}
+
+					if (hasFullRegion && !hasDetail) {
+						return {
+							type: 'modal',
+							title: '已识别到地区，但详细地址不完整',
+							content: '已识别到省市区，但未能准确提取详细地址，请补充门牌号、楼栋号等信息。'
+						}
+					}
+
+					return {
+						type: 'modal',
+						title: '已识别，但未匹配到有效地区',
+						content: '当前地址未匹配到有效地区，请核对所在地区和详细地址，必要时请手动修正。'
+					}
+				}
+
+				if (level === 'medium') {
+					if (!hasDetail) {
+						return {
+							type: 'toast',
+							title: removedNoise ? '已识别到地区，请补充详细地址' : '已识别到地区，请补充详细地址'
+						}
+					}
+
+					if (!geocodeOk) {
+						return {
+							type: 'toast',
+							title: removedNoise ? '已识别，但未查到地图位置' : '已识别，但未查到对应地图位置'
+						}
+					}
+
+					return {
+						type: 'toast',
+						title: removedNoise ? '已识别到部分地址，请核对' : '已识别到部分地址，请核对'
+					}
+				}
+
+				if (!geocodeOk) {
+					return {
+						type: 'toast',
+						title: removedNoise ? '已识别，但未查到地图位置' : '已识别，请核对地址和地图位置'
+					}
+				}
+
+				return {
+					type: 'toast',
+					title: removedNoise ? '识别成功，请核对' : '识别成功，请核对'
+				}
+			},
+
+			commitRecognizedResult(province, city, district, regionText, detailText, geo, level, removedNoise, geocodeOk,
+				hit, detailRejected) {
+				this.currentProvince = province
+				this.currentCity = city
+				this.currentDistrict = district
+				this.currentRegion = regionText
+
+				this.selectedProvinceCode = hit.province_code || this.selectedProvinceCode || ''
+				this.selectedCityCode = hit.city_code || this.selectedCityCode || ''
+				this.selectedDistrictCode = hit.county_code || this.selectedDistrictCode || ''
+
+				this.detailAddress = detailText
+				this.manualDetail = detailText
+				this.currentDetail = detailText
+				this.isManualDetail = !!detailText
+
+				this.smartBtnText = '已识别'
+				uni.hideLoading()
+
+				const tip = this.getRecognizeToast(level, removedNoise, geocodeOk, hit, detailText, detailRejected)
+				if (tip.type === 'modal') {
+					uni.showModal({
+						title: tip.title,
+						content: tip.content,
+						showCancel: false
+					})
+				} else {
+					uni.showToast({
+						title: tip.title,
+						icon: 'none'
+					})
+				}
+			},
+
+			updateMapCenter(longitude, latitude, noReverse = false) {
+				const lng = parseFloat(longitude)
+				const lat = parseFloat(latitude)
+
+				if (!Number.isFinite(lng) || !Number.isFinite(lat)) return
+
+				this.applyMapLocation(lng, lat, noReverse)
+			},
+
+			selectRegion() {
+				this.openRegionPicker()
+			},
+
+			openRegionPicker() {
+				this.regionProvinceList = ChinaCitys || []
+
+				let provinceIndex = 0
+				let cityIndex = 0
+				let areaIndex = 0
+
+				if (this.selectedProvinceCode && this.selectedCityCode && this.selectedDistrictCode) {
+					const idx = this.findRegionIndexByCode(
+						ChinaCitys,
+						this.selectedProvinceCode,
+						this.selectedCityCode,
+						this.selectedDistrictCode
+					)
+					provinceIndex = idx.provinceIndex >= 0 ? idx.provinceIndex : 0
+					cityIndex = idx.cityIndex >= 0 ? idx.cityIndex : 0
+					areaIndex = idx.areaIndex >= 0 ? idx.areaIndex : 0
+				}
+
+				this.regionCityList = this.regionProvinceList[provinceIndex]?.citys || []
+				this.regionDistrictList = this.regionCityList[cityIndex]?.areas || []
+				this.regionPickerValue = [provinceIndex, cityIndex, areaIndex]
+
+				if (this.mapMoveTimer) {
+					clearTimeout(this.mapMoveTimer)
+					this.mapMoveTimer = null
+				}
+
+				this.mapSnapshotUrl = this.buildMapSnapshotUrl()
+				this.showMapSnapshot = true
+				this.mapVisible = false
+				this.showRegionPicker = true
+			},
+
+			closeRegionPicker() {
+				this.showRegionPicker = false
+
+				if (this.popupRestoreTimer) {
+					clearTimeout(this.popupRestoreTimer)
+				}
+
+				this.popupRestoreTimer = setTimeout(() => {
+					this.showMapSnapshot = false
+					this.mapSnapshotUrl = ''
+
+					this.ignoreRegionChangeOnce = true
+					this.mapProgrammaticUntil = Date.now() + 500
+
+					if (this.mapGuardTimer) {
+						clearTimeout(this.mapGuardTimer)
+					}
+					this.mapGuardTimer = setTimeout(() => {
+						this.ignoreRegionChangeOnce = false
+						this.mapGuardTimer = null
+					}, 550)
+
+					this.mapVisible = true
+					this.mapRenderKey += 1
+					this.popupRestoreTimer = null
+				}, 300)
+			},
+
+			onRegionChange(e) {
+				const val = e.detail.value
+				this.regionPickerValue = val
+
+				const provinceIdx = val[0]
+				const cityIdx = val[1] || 0
+
+				if (this.regionProvinceList.length > provinceIdx) {
+					this.regionCityList = this.regionProvinceList[provinceIdx].citys || []
+					const maxCityIdx = this.regionCityList.length - 1
+					const adjustedCityIdx = Math.min(cityIdx, maxCityIdx)
+
+					if (adjustedCityIdx !== cityIdx) {
+						this.regionPickerValue = [provinceIdx, adjustedCityIdx, 0]
+					}
+
+					if (this.regionCityList.length > adjustedCityIdx) {
+						this.regionDistrictList = this.regionCityList[adjustedCityIdx].areas || []
+						const areaIdx = val[2] || 0
+						const maxAreaIdx = this.regionDistrictList.length - 1
+						if (areaIdx > maxAreaIdx) {
+							this.regionPickerValue = [provinceIdx, adjustedCityIdx, 0]
+						}
+					} else {
+						this.regionDistrictList = []
+						this.regionPickerValue = [provinceIdx, 0, 0]
+					}
+				} else {
+					this.regionCityList = []
+					this.regionDistrictList = []
+					this.regionPickerValue = [0, 0, 0]
+				}
+			},
+
+			async confirmRegion() {
+				this.clearBlankPageInitLock()
+				const [provinceIdx, cityIdx, districtIdx] = this.regionPickerValue
+				const provinceItem = this.regionProvinceList[provinceIdx]
+				const cityItem = this.regionCityList[cityIdx]
+				const districtItem = this.regionDistrictList[districtIdx]
+
+				if (!provinceItem || !cityItem || !districtItem) {
+					uni.showToast({
+						title: '选择无效',
+						icon: 'none'
+					})
+					return
+				}
+
+				this.userSelectedRegion = true
+
+				const regionStr = provinceItem.province + cityItem.city + districtItem.area
+				this.currentProvince = provinceItem.province
+				this.currentCity = cityItem.city
+				this.currentDistrict = districtItem.area
+				this.currentRegion = regionStr
+
+				this.selectedProvinceCode = provinceItem.code
+				this.selectedCityCode = cityItem.code
+				this.selectedDistrictCode = districtItem.code
+
+				this.isManualDetail = false
+				this.suppressInitDetailFill = true
+				this.detailAddress = ''
+				this.manualDetail = ''
+				this.currentDetail = ''
+
+				const shortCode = districtItem.code ? districtItem.code.toString().slice(0, 6) : ''
+				this.startDependencyInitLock()
+				const center = await this.getDistrictCenter(districtItem.area, shortCode)
+
+				if (center) {
+					const [lng, lat] = center.split(',')
+					this.updateMapCenter(parseFloat(lng), parseFloat(lat), true)
+				} else {
+					uni.showToast({
+						title: '无法定位该地区，请手动拖动地图',
+						icon: 'none'
+					})
+				}
+
+				this.closeRegionPicker()
+			},
+
+			getDistrictCenter(keyword, adcode = '', subdistrict = 0) {
+				return new Promise((resolve) => {
+					const params = {
+						key: this.amapKey,
+						subdistrict,
+						extensions: 'all'
+					}
+
+					const queryAdcode = () => {
+						if (!adcode) return Promise.resolve(null)
+
+						return new Promise((resolveInner) => {
+							uni.request({
+								url: 'https://restapi.amap.com/v3/config/district',
+								method: 'GET',
+								data: {
+									...params,
+									keywords: adcode.slice(0, 6)
+								},
+								success: (res) => {
+									if (res.data.status === '1' && res.data.districts &&
+										res.data.districts.length > 0) {
+										const district = res.data.districts[0]
+										if (district.center) {
+											resolveInner(district.center)
+											return
+										}
+									}
+									resolveInner(null)
+								},
+								fail: () => resolveInner(null)
+							})
+						})
+					}
+
+					const queryKeyword = () => {
+						return new Promise((resolveInner) => {
+							uni.request({
+								url: 'https://restapi.amap.com/v3/config/district',
+								method: 'GET',
+								data: {
+									...params,
+									keywords: keyword
+								},
+								success: (res) => {
+									if (res.data.status === '1' && res.data.districts &&
+										res.data.districts.length > 0) {
+										const district = res.data.districts[0]
+										if (district.center) {
+											resolveInner(district.center)
+											return
+										}
+									}
+									resolveInner(null)
+								},
+								fail: () => resolveInner(null)
+							})
+						})
+					}
+
+					queryAdcode().then(center => {
+						if (center) {
+							resolve(center)
+						} else {
+							queryKeyword().then(resolve)
+						}
+					})
+				})
+			},
+
+			onConfirm() {
+				const fullAddress = (this.currentRegion + (this.detailAddress ? ' ' + this.detailAddress : '')).trim()
+
+				const addressItem = {
+					name: fullAddress,
+					address: this.detailAddress,
+					location: `${this.longitude},${this.latitude}`,
+					pname: this.currentProvince,
+					cityname: this.currentCity,
+					adname: this.currentDistrict,
+					province: this.currentProvince,
+					city: this.currentCity,
+					district: this.currentDistrict,
+					provinceCode: this.selectedProvinceCode,
+					cityCode: this.selectedCityCode,
+					districtCode: this.selectedDistrictCode,
+					source: this.source
+				}
+
+				const pages = getCurrentPages()
+				const prevPage = pages[pages.length - 2]
+				const currentPage = pages[pages.length - 1]
+				const source = this.source || currentPage.options.source
+
+				//特殊处理重庆
+				if (addressItem.cityCode == 500100) {
+					addressItem.cityname = "重庆城区"
+				}
+				if (addressItem.cityCode == 500200) {
+					addressItem.cityname = "重庆郊县"
+				}
+
+
+				if (source === 'syr_info') {
+					uni.$emit('address-selected-for-syr', addressItem)
+					uni.setStorageSync('syr_selected_address', addressItem)
+				} else if (source === 'sj_info') {
+					uni.$emit('address-selected-for-sj', addressItem)
+					uni.setStorageSync('sj_selected_address', addressItem)
+					if (getApp().globalData) getApp().globalData.selectedAddress = addressItem
+				} else if (prevPage) {
+					if (prevPage.$vm && typeof prevPage.$vm.editAddress === 'function') {
+						prevPage.$vm.editAddress(addressItem)
+					} else {
+						uni.$emit('address-selected', addressItem)
+					}
+				} else {
+					uni.$emit('address-selected', addressItem)
+				}
+
+				uni.navigateBack()
+			}
+		}
+	}
 </script>
 
 <style scoped lang="less">
-    .search-address-page {
-        flex: 1;
-        height: 100vh;
-        overflow: hidden;
-        display: flex;
-        flex-direction: column;
-        background-color: #FFFFFF;
-    }
+	.search-address-page {
+		flex: 1;
+		height: 100vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		background-color: #FFFFFF;
+	}
 
-    /* 城市选择 */
-    .search-container {
-        background-color: #FFFFFF;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        padding: 32rpx 30rpx 20rpx 30rpx;
+	/* 城市选择 */
+	.search-container {
+		background-color: #FFFFFF;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		padding: 32rpx 30rpx 20rpx 30rpx;
 
-        .search-container-text {
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 500;
-            font-size: 32rpx;
-            color: #333333;
-            line-height: 45rpx;
-        }
+		.search-container-text {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			line-height: 45rpx;
+		}
 
-        .text-img {
-            width: 20rpx;
-            height: 12rpx;
-            margin-left: 8rpx;
-            margin-right: 26rpx;
-        }
-    }
+		.text-img {
+			width: 20rpx;
+			height: 12rpx;
+			margin-left: 8rpx;
+			margin-right: 26rpx;
+		}
+	}
 
-    /* 地图区域 */
-    .map-container {
-        width: 750rpx;
-        position: relative;
-        overflow: hidden;
-    }
+	/* 地图区域 */
+	.map-container {
+		width: 750rpx;
+		position: relative;
+		overflow: hidden;
+	}
 
-    .map {
-        width: 750rpx;
-        height: 100%;
-    }
+	.map {
+		width: 750rpx;
+		height: 100%;
+	}
 
-    .map-snapshot {
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 750rpx;
-        height: 100%;
-        display: block;
-        z-index: 2;
-        background: #f5f5f5;
-    }
+	.map-snapshot {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 750rpx;
+		height: 100%;
+		display: block;
+		z-index: 2;
+		background: #f5f5f5;
+	}
 
-    .center-marker {
-        position: absolute;
-        left: 375rpx;
-        transform: translateX(-50%);
-        top: 250rpx;
-        width: 42rpx;
-        height: 69rpx;
-        z-index: 3;
+	.center-marker {
+		position: absolute;
+		left: 375rpx;
+		transform: translateX(-50%);
+		top: 250rpx;
+		width: 42rpx;
+		height: 69rpx;
+		z-index: 3;
 
-        .center-marker-img {
-            width: 42rpx;
-        }
-    }
+		.center-marker-img {
+			width: 42rpx;
+		}
+	}
 
-    .map-snapshot {
-        width: 750rpx;
-        height: 100%;
-        display: block;
-    }
+	.map-snapshot {
+		width: 750rpx;
+		height: 100%;
+		display: block;
+	}
 
-    /* 底部编辑区域（用户端样式） */
-    .bottom-edit-section {
-        background-color: #FFFFFF;
-        padding: 20rpx 20rpx 120rpx 20rpx;
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-    }
+	/* 底部编辑区域（用户端样式） */
+	.bottom-edit-section {
+		background-color: #FFFFFF;
+		padding: 20rpx 20rpx 120rpx 20rpx;
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
 
-    /* 固定按钮栏 */
-    .fixed-confirm-bar {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background-color: #FFFFFF;
-        padding: 20rpx 20rpx env(safe-area-inset-bottom) 20rpx; /* 适配刘海屏 */
-        box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
-        z-index: 10;
-    }
+	/* 固定按钮栏 */
+	.fixed-confirm-bar {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: #FFFFFF;
+		padding: 20rpx 20rpx env(safe-area-inset-bottom) 20rpx;
+		/* 适配刘海屏 */
+		box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
+		z-index: 10;
+	}
 
-    .address-input-row {
-        // width: 702rpx;
-        display: flex;
-        flex-direction: column;
-        background-color: #F5F5F5;
-        border-radius: 20rpx;
-        padding: 16rpx 24rpx;
-        margin-bottom: 30rpx;
-    }
+	.address-input-row {
+		// width: 702rpx;
+		display: flex;
+		flex-direction: column;
+		background-color: #F5F5F5;
+		border-radius: 20rpx;
+		padding: 16rpx 24rpx;
+		margin-bottom: 30rpx;
+	}
 
-    .raw-address-input {
-        width: 100%;
-        height: 120rpx;
-        font-size: 14px;
-        color: #333333;
-        background-color: transparent;
-        border-width: 0;
-        padding: 0;
-        margin: 0;
-    }
+	.raw-address-input {
+		width: 100%;
+		height: 120rpx;
+		font-size: 14px;
+		color: #333333;
+		background-color: transparent;
+		border-width: 0;
+		padding: 0;
+		margin: 0;
+	}
 
-    .action-buttons {
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-end;
-        margin-top: 0rpx;
-    }
+	.action-buttons {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		margin-top: 0rpx;
+	}
 
-    .action-btn {
-        margin-left: 16rpx;
-        padding: 7rpx 20rpx;
-        font-size: 24rpx;
-        border-radius: 11rpx;
-        border-width: 1rpx;
-        border-style: solid;
-        background-color: transparent;
-        align-items: center;
-        justify-content: center;
-    }
+	.action-btn {
+		margin-left: 16rpx;
+		padding: 7rpx 20rpx;
+		font-size: 24rpx;
+		border-radius: 11rpx;
+		border-width: 1rpx;
+		border-style: solid;
+		background-color: transparent;
+		align-items: center;
+		justify-content: center;
+	}
 
-    .action-btn:first-child {
-        margin-left: 0;
-    }
+	.action-btn:first-child {
+		margin-left: 0;
+	}
 
-    .btn-text {
-        font-size: 24rpx;
-        font-weight: 400;
-        line-height: 33rpx;
-    }
+	.btn-text {
+		font-size: 24rpx;
+		font-weight: 400;
+		line-height: 33rpx;
+	}
 
-    .paste-btn {
-        border-color: #C6C9CC;
-        color: #333333;
-    }
+	.paste-btn {
+		border-color: #C6C9CC;
+		color: #333333;
+	}
 
-    .smart-btn {
-        border-color: #C6C9CC;
-        color: #999999;
-    }
+	.smart-btn {
+		border-color: #C6C9CC;
+		color: #999999;
+	}
 
-    .smart-btn.smart-btn-active {
-        border-color: #E8101E;
-        color: #E8101E;
-    }
+	.smart-btn.smart-btn-active {
+		border-color: #E8101E;
+		color: #E8101E;
+	}
 
-    .address-info-panel {
-        background-color: #FFFFFF;
-        border-radius: 16rpx;
-        margin-bottom: 40rpx;
-    }
+	.address-info-panel {
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		margin-bottom: 40rpx;
+	}
 
-    .info-row {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-between;
-        padding: 30rpx 0;
-    }
+	.info-row {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx 0;
+	}
 
-    .line {
-        border-bottom: 1rpx solid #F0F0F0;
-        width: 540rpx;
-        margin-left: 150rpx;
-    }
+	.line {
+		border-bottom: 1rpx solid #F0F0F0;
+		width: 540rpx;
+		margin-left: 150rpx;
+	}
 
-    .row-label {
-        font-size: 28rpx;
-        color: #333333;
-        font-weight: 500;
-        width: 160rpx;
-    }
+	.row-label {
+		font-size: 28rpx;
+		color: #333333;
+		font-weight: 500;
+		width: 160rpx;
+	}
 
-    .row-content {
-        flex: 1;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: flex-start;
-    }
+	.row-content {
+		flex: 1;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: flex-start;
+	}
 
-    .content-text {
-        font-size: 28rpx;
-        color: #333333;
-        margin-right: 12rpx;
-        flex: 1;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
+	.content-text {
+		font-size: 28rpx;
+		color: #333333;
+		margin-right: 12rpx;
+		flex: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 
-    .placeholder {
-        color: #999999;
-        font-size: 28rpx;
-    }
+	.placeholder {
+		color: #999999;
+		font-size: 28rpx;
+	}
 
-    .arrow-icon {
-        width: 14rpx;
-        height: 26rpx;
-        position: absolute;
-        right: 60rpx;
-    }
+	.arrow-icon {
+		width: 14rpx;
+		height: 26rpx;
+		position: absolute;
+		right: 60rpx;
+	}
 
-    .detail-input {
-        flex: 1;
-        font-size: 28rpx;
-        color: #333333;
-        padding: 0;
-        border-width: 0;
-        background-color: transparent;
-        height: 60rpx;
-    }
+	.detail-input {
+		flex: 1;
+		font-size: 28rpx;
+		color: #333333;
+		padding: 0;
+		border-width: 0;
+		background-color: transparent;
+		height: 60rpx;
+	}
 
-    .confirm-btn {
-        background-color: #E8101E;
-        border-radius: 49rpx;
-        height: 98rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 32rpx;
-        color: #FFFFFF;
-        // margin-top: 40rpx;
-    }
+	.confirm-btn {
+		background-color: #E8101E;
+		border-radius: 49rpx;
+		height: 98rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 32rpx;
+		color: #FFFFFF;
+		// margin-top: 40rpx;
+	}
 
-    .con-btn-text {
-        font-size: 32rpx;
-        color: #FFFFFF;
-    }
+	.con-btn-text {
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
 
-    /* 弹窗基础 */
+	/* 弹窗基础 */
 	.popup {
 		position: fixed;
 		left: 0;
@@ -2583,10 +2633,12 @@
 		opacity: 0;
 		transition: all 0.3s ease;
 	}
+
 	.popup.show {
 		visibility: visible !important;
 		opacity: 1 !important;
 	}
+
 	.popup-mask {
 		position: fixed;
 		top: 0;
@@ -2595,6 +2647,7 @@
 		bottom: 0;
 		background-color: rgba(0, 0, 0, 0.5);
 	}
+
 	.popup-content {
 		position: relative;
 		background-color: #ffffff;
@@ -2604,9 +2657,11 @@
 		transition: transform 0.3s ease;
 		max-height: 70vh;
 	}
+
 	.popup.show .popup-content {
 		transform: translateY(0);
 	}
+
 	.popup-header {
 		display: flex;
 		align-items: center;
@@ -2615,23 +2670,28 @@
 		padding: 0 0 20rpx 0;
 		border-bottom: 1rpx solid #F0F0F0;
 	}
+
 	.popup-title {
 		font-size: 32rpx;
 		font-weight: 500;
 		color: #333;
 	}
+
 	.popup-close {
 		font-size: 40rpx;
 		color: #999;
 		padding: 10rpx;
 	}
+
 	.region-body {
 		height: 400rpx;
 		overflow: hidden;
 	}
+
 	.picker-scroll {
 		height: 400rpx;
 	}
+
 	.picker-item {
 		height: 68rpx;
 		line-height: 68rpx;
@@ -2639,12 +2699,14 @@
 		font-size: 28rpx;
 		color: #333;
 	}
+
 	.popup-footer {
 		display: flex;
 		margin-top: 30rpx;
 		padding-top: 20rpx;
 		border-top: 1rpx solid #F0F0F0;
 	}
+
 	.popup-btn {
 		flex: 1;
 		height: 88rpx;
@@ -2654,24 +2716,30 @@
 		justify-content: center;
 		margin: 0 16rpx;
 	}
+
 	.popup-btn.cancel {
 		background-color: #f5f5f5;
 	}
+
 	.popup-btn.confirm {
 		background: #e8101e;
 	}
+
 	.popup-btn .btn-text {
 		font-size: 32rpx;
 		font-weight: 500;
 	}
+
 	.popup-btn.cancel .btn-text {
 		color: #666666;
 	}
+
 	.popup-btn.confirm .btn-text {
 		color: #ffffff;
 	}
+
 	/* 指示器样式（沿用原有） */
 	.indicatorStyle {
 		height: 68rpx;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/shop/add-service.vue b/pages/shop/add-service.vue
index f85bb6a..68d4c6e 100644
--- a/pages/shop/add-service.vue
+++ b/pages/shop/add-service.vue
@@ -134,9 +134,9 @@
 				</view>
 
 				<view class="detail-row">
-					<text class="form-label required">服务功效</text>
+					<text class="form-label required">服务内容</text>
 					<view class="detail-textarea-wrap">
-						<textarea class="detail-textarea" v-model="detailForm.effect" placeholder="请输入服务功效"
+						<textarea class="detail-textarea" v-model="detailForm.effect" placeholder="请输入服务内容"
 							placeholder-class="placeholder" maxlength="200"></textarea>
 						<text class="detail-count">{{(detailForm.effect || '').length}}/200</text>
 					</view>
@@ -442,7 +442,7 @@
 				// 如果新字段都为空，则尝试从旧的 detail 数组中提取（兼容旧数据）
 				if (!this.formData.efficacy && !this.formData.crowd && !this.formData.product) {
 					(detail || []).forEach((item) => {
-						if (item.title === "服务功效") {
+						if (item.title === "服务内容" || item.title === "服务功效") {
 							this.detailForm.effect = item.text || "";
 						} else if (item.title === "适用人群") {
 							this.detailForm.crowd = item.text || "";
@@ -475,7 +475,7 @@
 			checkDetailForm() {
 				if (!this.detailForm.effect || !this.detailForm.effect.trim()) {
 					uni.showToast({
-						title: "请输入服务功效",
+						title: "请输入服务内容",
 						icon: "none",
 					});
 					return false;
diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue
index 09ca84e..c0c8ad0 100644
--- a/pages/shop/photoAlbum/photoManage.vue
+++ b/pages/shop/photoAlbum/photoManage.vue
@@ -166,8 +166,8 @@
 					obj.name = item.name || item.auth_name
 				}
 				if (item.id == 0) {
-					obj.url = item.url
-					obj.name = item.name
+					obj.url = item.url || item.auth_url
+					obj.name = item.name || item.name
 				}
 				if (item.type == 2) {
 					obj.url = obj.url + `?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`

From 46e0975e890bcbdf563d6615e0522692b5f9c02f Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 29 Apr 2026 16:06:33 +0800
Subject: [PATCH 019/118] =?UTF-8?q?=E5=95=86=E5=AE=B6=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81bug=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/sj-info.vue | 402 ++++++++++++++++++++++++++++++++++------
 1 file changed, 346 insertions(+), 56 deletions(-)

diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 39037df..449e093 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -6,6 +6,29 @@
       <text>门店信息</text>
     </view>
 
+    <!-- 邀请码确认弹窗 -->
+    <uni-popup ref="existingInvitePopup" type="center" :mask-click="false">
+      <view class="invite-popup-content">
+        <view class="invite-popup-header">
+          <text class="invite-popup-title">请确认邀请信息</text>
+        </view>
+        <view class="invite-popup-body">
+          <view class="invite-item">
+            <text class="invite-label">邀请码</text>
+            <text class="invite-value">{{ existingInviterInfo && existingInviterInfo.invite_code }}</text>
+          </view>
+          <view class="invite-item">
+            <text class="invite-label">邀请人</text>
+            <text class="invite-value">{{ (existingInviterInfo && (existingInviterInfo.name || existingInviterInfo.nick_name)) || '' }}</text>
+          </view>
+        </view>
+        <view class="invite-popup-footer">
+          <view class="invite-btn cancel" @click="hideExistingInviteTipPopup">关闭</view>
+          <view class="invite-btn confirm" @click="useExistingInviteCode">确认</view>
+        </view>
+      </view>
+    </uni-popup>
+
     <!-- 店铺logo -->
     <view class="form-item box-cont">
         <view class="label-wrapper">
@@ -100,6 +123,7 @@
             </view>
             <input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码" 
                   placeholder-class="placeholder" class="input" 
+                  :disabled="hasExistingInviter"
                   @input="handleInviteCodeInput" />
         </view>
         
@@ -351,6 +375,7 @@ export default {
       tipImage: '',
       currentTipType: '',
       userId: null,
+      userMobile: null,           // 新增：当前用户手机号
       identity: 2,
       tipImagesPreloaded: false,
       tipPopupBg: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770',
@@ -361,6 +386,11 @@ export default {
       inviterInfo: null,
       currentValidatingCode: '',
       
+      // 已有邀请人信息（用户之前作为手艺人被邀请）
+      existingInviterInfo: null,
+      hasExistingInviter: false,      // 控制输入框禁用
+      hasAutoReplacedInvite: false,   // 是否已自动替换（防止被覆盖）
+      
       fromAddressPage: false,
       addressListener: null,
 
@@ -411,8 +441,9 @@ export default {
     uni.$off('address-selected-for-sj');
   },
   
-  mounted() {
-    this.getUserInfo();
+  async mounted() {
+    // 先获取用户信息（含手机号）
+    await this.getUserInfo();
     this.preloadTipImages();
 
     this.locatinCitys = this.ChinaCitys[0].citys;
@@ -433,7 +464,11 @@ export default {
     
     this.setupAddressListener();
     
-    if (this.formData.invite_code_other) {
+    // 【关键】检查并强制使用已绑定的邀请人（手艺人原邀请码）
+    await this.forceUseExistingInviter();
+    
+    // 如果没有自动替换，再处理普通邀请码输入
+    if (!this.hasAutoReplacedInvite && this.formData.invite_code_other) {
       this.validateInviteCode(this.formData.invite_code_other);
     }
   },
@@ -447,40 +482,55 @@ export default {
   onShow() {
     this.checkAddressData();
     
-    const localData = this.loadFormDataFromLocal();
-    if (localData) {
-      Object.assign(this.formData, localData);
-
-      // 立即更新显示文本（即使在 serviceList 加载完成前）
-      this.updateSelectedServicesTextImmediately();
-
-      // 恢复服务技能的选中状态
-      if (this.serviceList.length > 0) {
+    // 如果已自动替换，避免被本地存储覆盖（只恢复非邀请码字段）
+    if (this.hasAutoReplacedInvite) {
+      const localData = this.loadFormDataFromLocal();
+      if (localData) {
+        const { invite_code_other, ...otherData } = localData;
+        Object.keys(otherData).forEach(key => {
+          if (this.formData[key] !== undefined && key !== 'invite_code_other') {
+            this.formData[key] = otherData[key];
+          }
+        });
         this.restoreServiceSkillsSelection();
+        this.updateSelectedServicesTextImmediately();
       }
+    } else {
+      // 原有恢复逻辑
+      const localData = this.loadFormDataFromLocal();
+      if (localData) {
+        Object.assign(this.formData, localData);
+
+        // 立即更新显示文本（即使在 serviceList 加载完成前）
+        this.updateSelectedServicesTextImmediately();
+
+        // 恢复服务技能的选中状态
+        if (this.serviceList.length > 0) {
+          this.restoreServiceSkillsSelection();
+        }
+        
+        // 恢复获取消息方式的显示文本
+        if (this.formData.apply_state) {
+          const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
+          this.messageMethodText = methods[this.formData.apply_state - 1] || '';
+        }
+        
+        // 恢复专业经验的显示文本
+        if (this.formData.major) {
+          const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+          this.experienceText = experiences[this.formData.major - 1] || '';
+        }
+      }
+
+      // 重新从本地存储加载邀请码验证状态
+      this.loadInviteStateFromLocal();
       
-      // 恢复获取消息方式的显示文本
-      if (this.formData.apply_state) {
-        const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-        this.messageMethodText = methods[this.formData.apply_state - 1] || '';
+      this.checkGlobalData();
+
+      // 邀请码验证
+      if (this.formData.invite_code_other) {
+        this.validateInviteCode(this.formData.invite_code_other);
       }
-      
-      // 恢复专业经验的显示文本
-      if (this.formData.major) {
-        const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-        this.experienceText = experiences[this.formData.major - 1] || '';
-      }
-
-    }
-
-    // 重新从本地存储加载邀请码验证状态
-    this.loadInviteStateFromLocal();
-    
-    this.checkGlobalData();
-
-    // 邀请码验证
-    if (this.formData.invite_code_other) {
-      this.validateInviteCode(this.formData.invite_code_other);
     }
   },
 
@@ -493,7 +543,137 @@ export default {
   },
   
   methods: {
-    // 邀请码相关方法
+    // ========== 新增：强制使用已绑定的邀请人（商家端） ==========
+    async forceUseExistingInviter() {
+      if (this.hasAutoReplacedInvite) return false;
+      
+      // 需要用户手机号
+      if (!this.userMobile) {
+        console.log('用户手机号未获取，跳过强制替换');
+        return false;
+      }
+      
+      try {
+        // 1. 调用商家端接口查询已绑定的邀请码
+        const res = await request.post('/sj/User/getBInviteCode', {
+          account: this.userMobile,
+          type: 2   // 2=商家入驻
+        });
+        
+        console.log('查询已有邀请码结果:', res);
+        
+        if (res && res.code === 200 && res.data) {
+          // 兼容字段：可能是 invite_code 或 invite_code_other
+          const oldInviteCode = res.data.invite_code || res.data.invite_code_other;
+          
+          if (oldInviteCode) {
+            console.log('检测到已绑定邀请码:', oldInviteCode);
+            
+            // 2. 用邀请码获取完整的邀请人信息
+            const inviteRes = await request.post('/user/user/getInvite', {
+              invite_code: oldInviteCode
+            });
+            
+            console.log('获取邀请人信息结果:', inviteRes);
+            
+            if (inviteRes && inviteRes.code === 200 && inviteRes.data && inviteRes.data.account) {
+              const fullInviterInfo = inviteRes.data;
+              
+              // 强制填充
+              this.formData.invite_code_other = oldInviteCode;
+              this.hasExistingInviter = true;       // 控制输入框禁用
+              this.hasAutoReplacedInvite = true;
+              this.inviteCodeError = false;
+              this.inviterInfo = fullInviterInfo;
+              this.currentValidatingCode = oldInviteCode;
+              this.existingInviterInfo = fullInviterInfo;
+              
+              // 保存状态
+              this.saveInviteStateToLocal();
+              this.saveFormDataToLocal();
+              
+              // 弹窗提示
+              this.showExistingInviteTipPopup();
+              return true;
+            } else {
+              console.error('获取邀请人信息失败，邀请码可能无效');
+            }
+          } else {
+            console.log('接口返回成功但无邀请码数据');
+          }
+        } else {
+          console.log('查询已有邀请码接口异常:', res?.msg);
+        }
+      } catch (error) {
+        console.error('强制替换邀请人失败:', error);
+      }
+      return false;
+    },
+    
+    // 显示已有邀请人确认弹窗（复用原有方法，但内容更准确）
+    showExistingInviteTipPopup() {
+      if (this.$refs.existingInvitePopup) {
+        this.$refs.existingInvitePopup.open();
+      } else {
+        uni.showModal({
+          title: '请确认邀请信息',
+          content: `邀请码：${this.existingInviterInfo?.invite_code}\n邀请人：${this.existingInviterInfo?.name || this.existingInviterInfo?.nick_name}`,
+          confirmText: '确认',
+          cancelText: '关闭',
+          success: (res) => {
+            if (res.confirm) {
+              this.useExistingInviteCode();
+            } else {
+              // 用户关闭弹窗：清空邀请码，允许手动输入（与铁军端行为一致）
+              this.formData.invite_code_other = '';
+              this.hasExistingInviter = false;
+              this.hasAutoReplacedInvite = false;
+              this.inviterInfo = null;
+              this.existingInviterInfo = null;
+              this.saveFormDataToLocal();
+            }
+          }
+        });
+      }
+    },
+    
+    // 确认使用已有邀请码（用户点击确认）
+    useExistingInviteCode() {
+      if (this.existingInviterInfo) {
+        // 保存邀请码状态
+        const inviteState = {
+          inviterInfo: this.existingInviterInfo,
+          inviteCodeError: false,
+          currentValidatingCode: this.existingInviterInfo.invite_code
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+        this.saveFormDataToLocal();
+      }
+      this.hideExistingInviteTipPopup();
+    },
+    
+    // 隐藏已有邀请人确认弹窗
+    hideExistingInviteTipPopup() {
+      if (this.$refs.existingInvitePopup) {
+        this.$refs.existingInvitePopup.close();
+      }
+    },
+    
+    // 获取用户信息（含手机号）
+    getUserInfo() {
+      return request.post('/sj/User/getUser').then(result => {
+        this.userId = result.data.id;
+        // 获取手机号（根据实际接口字段调整）
+        this.userMobile = result.data.mobile || result.data.account;
+        if (this.userMobile) {
+          getApp().globalData.userMobile = this.userMobile;
+        }
+        console.log('用户ID获取成功:', this.userId, '手机号:', this.userMobile);
+      }).catch(err => {
+        console.error('获取用户信息失败:', err);
+      });
+    },
+    
     // 从本地存储加载邀请码验证状态
     loadInviteStateFromLocal() {
       try {
@@ -562,6 +742,7 @@ export default {
         console.log('保存邀请码验证状态失败:', e);
       }
     },
+    
     // 触发邀请码错误抖动效果
     triggerInviteErrorShake() {
       // 触发抖动效果
@@ -606,6 +787,13 @@ export default {
     
     // 处理邀请码输入
     handleInviteCodeInput(e) {
+      // 如果已经被强制替换为已有邀请人，禁止任何手动修改
+      if (this.hasAutoReplacedInvite) {
+        console.log('已强制使用原邀请人，禁止修改邀请码');
+        this.formData.invite_code_other = this.inviterInfo ? this.inviterInfo.invite_code : '';
+        return;
+      }
+      
       const code = e.detail ? e.detail.value : this.formData.invite_code_other;
       
       console.log('邀请码输入:', code);
@@ -702,7 +890,7 @@ export default {
     },
     
     // 验证邀请码
-     async validateInviteCode(code) {
+    async validateInviteCode(code) {
       console.log('开始验证邀请码:', code);
 
       // 特殊邀请码13131313直接通过
@@ -794,7 +982,6 @@ export default {
       }
     },
     
-    
     // 从本地存储加载数据
     loadFormDataFromLocal() {
       try {
@@ -878,6 +1065,23 @@ export default {
       }
     },
     
+    // 立即更新所有显示文本（用于 onShow 恢复）
+    updateSelectedServicesTextImmediately() {
+      // 恢复服务技能显示文本
+      this.updateSelectedServicesText();
+      
+      // 恢复获取消息方式的显示文本
+      if (this.formData.apply_state) {
+        const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
+        this.messageMethodText = methods[this.formData.apply_state - 1] || '';
+      }
+      
+      // 恢复专业经验的显示文本
+      if (this.formData.major) {
+        const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+        this.experienceText = experiences[this.formData.major - 1] || '';
+      }
+    },
 
     // 地址相关方法 
 
@@ -965,7 +1169,6 @@ export default {
       this.$forceUpdate()
     },
     
-    
     // 检查全局数据
     checkGlobalData() {
       if (getApp().globalData.storeInfoData) {
@@ -976,7 +1179,7 @@ export default {
       }
     },
     
-    // 更新已选择服务技能的显示文本
+    // 更新已选择服务技能的显示文本（兼容 serviceList 加载后）
     updateSelectedServicesText() {
       if (this.formData.servers_kill && this.formData.servers_kill.length > 0 && this.serviceList.length > 0) {
         const selectedServices = this.serviceList
@@ -989,12 +1192,8 @@ export default {
       }
     },
     
-    // 获取用户信息
-    getUserInfo() {
-      request.post('/sj/User/getUser').then(result => {
-        this.userId = result.data.id;
-      })
-    },
+    // 获取用户信息（原始版本，已在上方扩展）
+    // getUserInfo() 已在上方重写
     
     getFormData() {
       return this.formData;
@@ -1059,20 +1258,20 @@ export default {
         this.tipTitle = tipConfig[field].title;
         this.tipImage = tipConfig[field].image;
         // 等待图片预加载完成后再显示弹窗
-      if (this.tipImagesPreloaded) {
-        this.showTipPopupFlag = true;
-      } else {
-        // 如果图片还没预加载完成，立即加载当前图片
-        console.log('图片还未预加载完成，立即加载当前图片');
-        this.loadImage(this.tipImage).then(() => {
+        if (this.tipImagesPreloaded) {
           this.showTipPopupFlag = true;
-        }).catch(() => {
-          // 即使加载失败也显示弹窗，避免用户无法操作
-          this.showTipPopupFlag = true;
-        });
+        } else {
+          // 如果图片还没预加载完成，立即加载当前图片
+          console.log('图片还未预加载完成，立即加载当前图片');
+          this.loadImage(this.tipImage).then(() => {
+            this.showTipPopupFlag = true;
+          }).catch(() => {
+            // 即使加载失败也显示弹窗，避免用户无法操作
+            this.showTipPopupFlag = true;
+          });
+        }
       }
-    }
-  }, 
+    }, 
     
     // 隐藏提示弹窗
     hideTipPopup() {
@@ -1510,6 +1709,7 @@ export default {
 }
 </script>
 
+
 <style scoped>
 .store-info-page {
   /* padding: 28rpx 0; */
@@ -2073,4 +2273,94 @@ export default {
 .tip-btn .btn-text {
   color: inherit;
 }
+
+/* 邀请码确认弹窗样式 */
+.invite-popup-content {
+  width: 571rpx;
+  height: 535rpx;
+  background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6f130301-f3df-467c-8a1c-dc49f85e5295.png');
+  background-size: cover;
+  background-position: center;
+  border-radius: 30rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 40rpx;
+  box-sizing: border-box;
+}
+
+.invite-popup-header {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 40rpx;
+}
+
+.invite-popup-title {
+  font-size: 36rpx;
+  font-weight: 500;
+  color: #333333;
+}
+
+.invite-popup-body {
+  flex: 1;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 24rpx;
+}
+
+.invite-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx;
+  background-color: rgba(255, 255, 255, 0.9);
+  border-radius: 16rpx;
+}
+
+.invite-label {
+  font-size: 28rpx;
+  color: #666666;
+}
+
+.invite-value {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.invite-popup-footer {
+  width: 100%;
+  display: flex;
+  gap: 20rpx;
+  margin-top: 40rpx;
+}
+
+.invite-btn {
+  flex: 1;
+  height: 88rpx;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.invite-btn.cancel {
+  background-color: #FFFFFF;
+  color: #FC437C;
+  border: 2rpx solid #FC437C;
+}
+
+.invite-btn.confirm {
+  background: linear-gradient(90deg, #FC437C 0%, #FF618F 100%);
+  color: #FFFFFF;
+}
+
+/* 输入框禁用样式 */
+.input:disabled {
+  color: #999999;
+  background-color: #F5F5F5;
+}
 </style>
\ No newline at end of file

From 7618492df515fb640482261ff03b5d945c5b2ddb Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Wed, 29 Apr 2026 16:41:21 +0800
Subject: [PATCH 020/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/buy-order.vue            |  2 +-
 pages/shop/components/orderCard.vue | 82 ++++++++++++++++++-----------
 pages/shop/manHour/saleList.vue     |  8 +--
 pages/shop/userorder-detail.vue     |  5 +-
 4 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue
index 1cdab7f..8d6fa7d 100644
--- a/pages/shop/buy-order.vue
+++ b/pages/shop/buy-order.vue
@@ -15,7 +15,7 @@
 				<view class="order-item" v-for="(order, index) in orderList" :key="index">
 					<!-- 顶部：订单编号 + 状态 -->
 					<view class="order-top">
-						<text class="order-number">订单编号：{{order.number}}</text>
+						<text class="order-number">服务时段：{{order.number}}</text>
 						<view class="order-status-badge" :class="{
 							'order-status-badge2': order.state > 4 && order.state !== 7,
 							'order-status-badge3': order.state === 7
diff --git a/pages/shop/components/orderCard.vue b/pages/shop/components/orderCard.vue
index 9194278..c15cd4d 100644
--- a/pages/shop/components/orderCard.vue
+++ b/pages/shop/components/orderCard.vue
@@ -6,18 +6,17 @@
 			<view class="stateText" :class="{
 			stateText2: dataItem.state > 4 && dataItem.state !== 7,  // 排除已取消
 			stateText3: dataItem.state === 7  // 已取消状态单独处理
-			}"  v-if="showState">
-		{{ stateText }}
-		</view>
+			}" v-if="showState">
+				{{ stateText }}
+			</view>
 			<image class="rightArrow" src="/static/images/shop/pintuan/rightArrow.png" v-else
 				@click="$emit('goOrderDetail', dataItem)"></image>
 		</view>
 
 		<!-- 服务信息区域 -->
-		<view class="service-container" @click="$emit('goOrderDetail', dataItem)" :class="{noFotter:(!dataItem.reservation_time && !dataItem.reserve_end_time) || haveButton }">
-			<image class="service-img" 
-			
-			:src=" dataItem.order_photo ? dataItem.order_photo[0] : JSON.parse(dataItem.photo)[0]
+		<view class="service-container" @click="$emit('goOrderDetail', dataItem)"
+			:class="{noFotter:(!dataItem.reservation_time && !dataItem.reserve_end_time) || haveButton }">
+			<image class="service-img" :src=" dataItem.order_photo ? dataItem.order_photo[0] : JSON.parse(dataItem.photo)[0]
         " mode="aspectFill"></image>
 			<view class="service-info">
 				<view>
@@ -30,12 +29,13 @@
 						</text>
 
 					</view>
-					<view class="service-time" v-if="dataItem.add_time && dataItem.state!=7">下单时间: {{ dataItem.add_time }}</view>
+					<view class="service-time" v-if="dataItem.add_time && dataItem.state!=7">下单时间:
+						{{ dataItem.add_time }}</view>
 				</view>
-				<view class="service-price" >
+				<view class="service-price">
 					<text v-if="dataItem.team_buy_id">{{`团购价: `}}</text>¥<text
 						style="font-size: 34rpx;">{{ dataItem.order_money }}</text>
-						<text  class="service-price-line">{{ dataItem.line_money }}</text>
+					<text class="service-price-line">{{ dataItem.line_money }}</text>
 				</view>
 
 			</view>
@@ -83,49 +83,49 @@
 			useTime() {
 				const start = this.dataItem.reservation_time;
 				const server_time = this.dataItem.server_time || 0;
-			
+
 				// 格式化时间范围：输出 2025年05月29 12:30-13:30 格式
 				function formatTimeRange(startTimeStr, serviceMinutes) {
 					// 1. 空值兜底：避免无开始时间时报错
 					if (!startTimeStr) return "";
-			
+
 					// 2. 兼容低版本iOS：iOS不识别 "-" 分隔的日期，必须替换为 "/"
 					const iosSafeTimeStr = startTimeStr.replace(/-/g, "/");
 					const startTime = new Date(iosSafeTimeStr);
-			
+
 					// 校验时间有效性
 					if (isNaN(startTime.getTime())) {
 						console.error("无效的开始时间格式:", startTimeStr);
 						return "";
 					}
-			
+
 					// 3. 计算结束时间（开始时间 + 服务分钟数）
 					const endTime = new Date(startTime.getTime() + serviceMinutes * 60 * 1000);
-			
+
 					// 格式化年份：YYYY年
 					const formatYear = (date) => {
 						return date.getFullYear() + '年';
 					};
-			
+
 					// 格式化月份和日期：MM月DD（补零）
 					const formatMonthDay = (date) => {
 						const month = String(date.getMonth() + 1).padStart(2, "0");
 						const day = String(date.getDate()).padStart(2, "0");
 						return `${month}月${day}`;
 					};
-			
+
 					// 格式化时间部分：HH:MM（补零）
 					const formatTimePart = (date) => {
 						const hours = String(date.getHours()).padStart(2, "0");
 						const minutes = String(date.getMinutes()).padStart(2, "0");
 						return `${hours}:${minutes}`;
 					};
-			
+
 					// 4. 判断是否同一天
 					const isSameDay = startTime.getFullYear() === endTime.getFullYear() &&
-									  startTime.getMonth() === endTime.getMonth() &&
-									  startTime.getDate() === endTime.getDate();
-			
+						startTime.getMonth() === endTime.getMonth() &&
+						startTime.getDate() === endTime.getDate();
+
 					// 5. 拼接最终格式
 					if (isSameDay) {
 						// 同一天：2025年05月29 12:30-13:30
@@ -135,7 +135,7 @@
 						return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatYear(endTime)}${formatMonthDay(endTime)} ${formatTimePart(endTime)}`;
 					}
 				}
-			
+
 				// 兜底：如果start为空，返回空字符串避免报错
 				return start ? formatTimeRange(start, server_time) : "";
 			},
@@ -233,12 +233,13 @@
 			align-items: center;
 			justify-content: center;
 		}
-		
-		.stateText2{
+
+		.stateText2 {
 			background-image: url("/static/images/icons/tabBj2.png");
 			color: #333;
 		}
-		.stateText3{
+
+		.stateText3 {
 			background-image: url("/static/images/icons/tabBj2.png");
 			color: #999999 !important;
 		}
@@ -256,8 +257,8 @@
 		padding-bottom: 24rpx;
 		border-bottom: 1px solid #f6f5f5;
 	}
-	
-	.noFotter{
+
+	.noFotter {
 		border-bottom: none;
 		padding-bottom: 0rpx;
 	}
@@ -286,6 +287,7 @@
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
+
 		.service-price-line {
 			font-weight: 400;
 			font-size: 24rpx;
@@ -351,13 +353,15 @@
 		margin-top: 28rpx;
 		display: flex;
 		align-items: center;
-		.time-info-img{
+
+		.time-info-img {
 			width: 40rpx;
 			height: 40rpx;
 			margin-right: 10rpx;
 			border-radius: 50%;
 		}
-		.time-info-name{
+
+		.time-info-name {
 			font-weight: 400;
 			font-size: 26rpx;
 			color: #333333;
@@ -365,8 +369,22 @@
 			text-align: left;
 			font-style: normal;
 			margin-right: 20rpx;
+			max-width: 110rpx;
+			overflow: hidden;
+			word-break: break-all;
+			/* break-all(允许在单词内换行。) */
+			text-overflow: ellipsis;
+			/* 超出部分省略号 */
+			display: -webkit-box;
+			/** 对象作为伸缩盒子模型显示 **/
+			-webkit-box-orient: vertical;
+			/** 设置或检索伸缩盒对象的子元素的排列方式 **/
+			-webkit-line-clamp: 1;
+			/** 显示的行数 **/
+
 		}
-		.time-info-text1{
+
+		.time-info-text1 {
 			font-weight: 400;
 			font-size: 26rpx;
 			color: #999999;
@@ -374,8 +392,10 @@
 			text-align: left;
 			font-style: normal;
 			// margin-right: 20rpx;
+			white-space: nowrap;
 		}
-		.time-info-text2{
+
+		.time-info-text2 {
 			font-weight: 400;
 			font-size: 26rpx;
 			color: #333333;
diff --git a/pages/shop/manHour/saleList.vue b/pages/shop/manHour/saleList.vue
index 1a6741a..09ba921 100644
--- a/pages/shop/manHour/saleList.vue
+++ b/pages/shop/manHour/saleList.vue
@@ -57,10 +57,10 @@ export default {
           text: "全部",
         },
 
-        // {
-        //   id: 1,
-        //   text: "待支付",
-        // },
+        {
+          id: 1,
+          text: "待支付",
+        },
         {
           id: 2,
           text: "待接单",
diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue
index 9d9aaa4..4331ac0 100644
--- a/pages/shop/userorder-detail.vue
+++ b/pages/shop/userorder-detail.vue
@@ -15,12 +15,11 @@
 			          }}</text></text>
 			</view>
 
-
 			<!-- 到店订单客户信息 -->
-			<view class="kh-card" v-if=" serviceType == '2' && orderInfo.order_kind==2">
+			<view class="kh-card" v-if=" (serviceType == '2' ||serviceType == '1') && orderInfo.order_kind==2">
 				<view class="kh-card-footer flex-row-center-between">
 					<view class="kh-card-footer-left flex-row-center">
-						<image class="kh-card-footer-left-img" :src="orderInfo.order_headphoto"></image>
+						<image class="kh-card-footer-left-img" :src="orderInfo.order_headphoto || orderInfo.user_yh.head_photo"></image>
 						<view class="kh-card-footer-left-text">
 							{{ `${orderInfo.order_username} ${orderInfo.phone_user}` }}
 						</view>

From 8347f81269037722321af929572bc58e61a0c13c Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Wed, 29 Apr 2026 18:17:50 +0800
Subject: [PATCH 021/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/buy-order.vue           |  40 +++++++++++-
 pages/shop/buyorder-detail.vue     | 101 +++++++++--------------------
 pages/shop/photoAlbum/addPhoto.vue |  23 ++++---
 utils/albumUploadImage.js          |  17 +++--
 4 files changed, 93 insertions(+), 88 deletions(-)

diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue
index 8d6fa7d..ceeb3a2 100644
--- a/pages/shop/buy-order.vue
+++ b/pages/shop/buy-order.vue
@@ -15,7 +15,7 @@
 				<view class="order-item" v-for="(order, index) in orderList" :key="index">
 					<!-- 顶部：订单编号 + 状态 -->
 					<view class="order-top">
-						<text class="order-number">服务时段：{{order.number}}</text>
+						<text class="order-number">服务时段：{{getPeriodTime(order)}}</text>
 						<view class="order-status-badge" :class="{
 							'order-status-badge2': order.state > 4 && order.state !== 7,
 							'order-status-badge3': order.state === 7
@@ -46,7 +46,8 @@
 							<view class="price-row">
 								<text class="price-symbol">¥</text>
 								<text class="price-now">{{ getDisplayPrice(order) }}</text>
-								<text class="price-old" v-if="getOriginalPrice(order)">{{ getOriginalPrice(order) }}</text>
+								<text class="price-old"
+									v-if="getOriginalPrice(order)">{{ getOriginalPrice(order) }}</text>
 							</view>
 						</view>
 					</view>
@@ -75,7 +76,8 @@
 							<text class="action-btn red-btn" v-if="order.state == 6" @click="reviewOrder(order)">
 								评价
 							</text>
-							<text class="action-btn gray-btn" v-if="order.state == 5 || order.state == 6 || order.state == 7"
+							<text class="action-btn gray-btn"
+								v-if="order.state == 5 || order.state == 6 || order.state == 7"
 								@click="orderAgain(order)">
 								再次购买
 							</text>
@@ -171,6 +173,37 @@
 			this.loadOrders();
 		},
 		methods: {
+			getPeriodTime(order) {
+				const reservationTime = order.reservation_time;
+				const serverTime = order.server_time;
+
+				if (!reservationTime || !serverTime) {
+					return order.create_time || order.createtime || order.add_time || '';
+				}
+
+				// 兼容 iOS：将 "2026-04-29 15:50:00" 转换为 "2026/04/29 15:50:00"
+				const formattedTime = reservationTime.replace(/-/g, '/');
+				const startDate = new Date(formattedTime);
+
+				if (isNaN(startDate.getTime())) {
+					return order.create_time || order.createtime || order.add_time || '';
+				}
+
+				// 格式化开始时间
+				const year = startDate.getFullYear();
+				const month = String(startDate.getMonth() + 1).padStart(2, '0');
+				const day = String(startDate.getDate()).padStart(2, '0');
+				const startHour = String(startDate.getHours()).padStart(2, '0');
+				const startMinute = String(startDate.getMinutes()).padStart(2, '0');
+
+				// 计算结束时间
+				const endDate = new Date(startDate.getTime() + serverTime * 60 * 1000);
+				const endHour = String(endDate.getHours()).padStart(2, '0');
+				const endMinute = String(endDate.getMinutes()).padStart(2, '0');
+
+				// 返回格式：YYYY-MM-DD HH:mm - HH:mm
+				return `${year}-${month}-${day} ${startHour}:${startMinute} - ${endHour}:${endMinute}`;
+			},
 			// 切换标签
 			switchTab(index) {
 				this.currentTab = index;
@@ -726,6 +759,7 @@
 		opacity: 1;
 		visibility: visible;
 	}
+
 	/* #endif */
 
 	/* 平台适配 */
diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue
index 24da70a..adf82db 100644
--- a/pages/shop/buyorder-detail.vue
+++ b/pages/shop/buyorder-detail.vue
@@ -32,21 +32,35 @@
 				</text>
 			</view>
 
-			<!-- 预约手艺人信息 -->
-			<view class="syr-card">
-				<view class="syr-card-header">
-					预约手艺人信息
-				</view>
-				<view class="syr-card-footer flex-row-center-between">
-					<view class="syr-card-footer-left flex-row-center">
-						<image class="syr-card-footer-left-img" :src="user_syr.head_photo"></image>
-						<view class="syr-card-footer-left-text">{{ `${user_syr.name} ${user_syr.account}` }}</view>
+			<!-- 到家订单 客户以及手艺人信息 -->
+			<view class="service-card">
+				<view class="location-info">
+					<image src="/static/images/gohome_location.png" class="location-icon"></image>
+					<view class="address-info">
+						<view class="name-phone">
+							<text class="name">{{userInfo.name}}</text>
+							<text class="phone">{{userInfo.account}}</text>
+						</view>
+						<text class="address">{{userInfo.dependency}}{{userInfo.address}}</text>
 					</view>
-					<image class="syr-card-footer-right" @click="contactService(user_syr.account)"
-						src="/static/images/icons/phone.png"></image>
+				</view>
+				<image src="/static/images/boder_icon.png" mode="aspectFill" class="divider"></image>
+				<view class="staff-info">
+					<image :src="user_syr.head_photo" mode="aspectFill" class="staff-avatar"></image>
+					<view class="staff-detail">
+						<text class="staff-name">{{user_syr.name}}</text>
+						<view class="rating">
+							<!-- <image 
+              v-for="(star, index) in 5" 
+              :key="index"
+              src="/static/images/star.png" 
+              class="star-icon"
+            ></image> -->
+						</view>
+					</view>
+					<!-- <image src="/static/images/order_phone.png" class="phone-btn" @click="contactService(user_syr.account)"></image> -->
 				</view>
 			</view>
-			
 
 
 			<!-- 预约信息 -->
@@ -54,7 +68,7 @@
 				<view class="card-header" v-if="orderInfo.order_kind == 1">
 					<text class="card-title">预约信息</text>
 					<view>
-						<text class="update-time">{{`服务时间 ${orderInfo.reservation_time}`}}</text>
+						<text class="update-time">{{orderInfo.reservation_time}}</text>
 						<!-- <text class="update-change">更改时间</text> -->
 					</view>
 				</view>
@@ -69,7 +83,7 @@
 					<text class="service-count">×1</text>
 				</view>
 				<view class="service-real">
-					<text class="real-lable">实付金额：</text>
+					<text class="real-lable">实际支付金额：</text>
 					<text class="real-price">￥{{orderInfo.pay_money}}</text>
 				</view>
 			</view>
@@ -486,20 +500,6 @@
 		background-color: #fff;
 	}
 
-	/* 辅助类 */
-	.flex-row-center-between {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.flex-row-center {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-
 	.detail-page::before {
 		content: '';
 		position: fixed;
@@ -646,50 +646,7 @@
 			color: #333333;
 		}
 	}
-
-	/* 预约手艺人信息卡片 */
-	.syr-card {
-		margin: 30rpx;
-		background-color: #ffffff;
-		padding: 30rpx 20rpx;
-		border-radius: 16rpx;
-		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
-
-		.syr-card-header {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			line-height: 45rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 40rpx;
-		}
-
-		.syr-card-footer {
-			.syr-card-footer-left {
-				.syr-card-footer-left-img {
-					width: 70rpx;
-					height: 70rpx;
-					border-radius: 50%;
-					margin-right: 20rpx;
-				}
-
-				.syr-card-footer-left-text {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #333333;
-					line-height: 40rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-
-			.syr-card-footer-right {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
-	}
+	
 
 	/* 服务人员卡片 */
 	.service-card {
diff --git a/pages/shop/photoAlbum/addPhoto.vue b/pages/shop/photoAlbum/addPhoto.vue
index f813e08..32a005a 100644
--- a/pages/shop/photoAlbum/addPhoto.vue
+++ b/pages/shop/photoAlbum/addPhoto.vue
@@ -410,9 +410,9 @@
 				let res = null
 
 				try {
-					uni.showLoading({
-						title: '上传中'
-					})
+					// uni.showLoading({
+					// 	title: '上传中'
+					// })
 					console.log(this.formData, '=============================');
 					if (this.formData.type == 1) {
 						res = await uploadImage.handleUpload(this.userInfo.id, 3);
@@ -423,11 +423,18 @@
 					console.log('上传单张图片', res)
 					this.formData.url = res;
 				} catch (err) {
-					console.log(err)
-					uni.showToast({
-						title: '上传失败',
-						icon: 'none'
-					}); // 新增：上传失败提示
+					if (err.errMsg && (err.errMsg.includes('cancel')||err.errMsg.includes('取消'))) {
+						uni.showToast({
+							title: '取消上传',
+							icon: 'none'
+						});
+					} else {
+						uni.showToast({
+							title: '上传失败',
+							icon: 'none'
+						}); // 新增：上传失败提示
+					}
+
 				} finally {
 					uni.hideLoading(); // 移到这里，必执行
 				}
diff --git a/utils/albumUploadImage.js b/utils/albumUploadImage.js
index 2f17212..4d6d211 100644
--- a/utils/albumUploadImage.js
+++ b/utils/albumUploadImage.js
@@ -87,10 +87,10 @@ const handleUpload = async (userId, type, sourceType = ['album', 'camera'], uplo
 		console.error('上传出错:', error)
 
 		// 如果是用户取消操作，不抛出错误，返回 null
-		if (error.errMsg && error.errMsg.includes('cancel')) {
-			console.log('用户取消了操作')
-			return null
-		}
+		// if (error.errMsg && error.errMsg.includes('cancel')) {
+		// 	console.log('用户取消了操作')
+		// 	return null
+		// }
 
 		throw error
 	} finally {
@@ -217,7 +217,7 @@ const getOssConfig = async (type) => {
 
 // 上传到OSS
 const uploadToOss = (file, ossConfig, name, uploadType) => {
-	console.log(ossConfig)
+	
 	return new Promise((resolve, reject) => {
 		// #ifdef H5
 		const formData = new FormData()
@@ -274,6 +274,10 @@ const uploadToOss = (file, ossConfig, name, uploadType) => {
 			path = file.tempFilePath
 			// #endif
 		}
+		
+		uni.showLoading({
+			title: '上传中'
+		})
 
 		uni.uploadFile({
 			url: ossConfig.host,
@@ -288,9 +292,12 @@ const uploadToOss = (file, ossConfig, name, uploadType) => {
 			},
 			success(res) {
 				resolve(`${ossConfig.host}/${ossConfig.dir}${name}`)
+				uni.hideLoading(); 
 			},
 			complete(err) {
 				console.log('err', err)
+				uni.hideLoading();
+				 
 			}
 		});
 		// #endif

From ad97d5683c7dae0b66e8dbab943f11d70a987ff9 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Thu, 30 Apr 2026 11:17:25 +0800
Subject: [PATCH 022/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/filters.vue | 10 +++++-----
 pages/shop/buy-order.vue          |  3 ++-
 pages/shop/buyorder-detail.vue    |  6 +++++-
 pages/shop/userorder-detail.vue   |  5 ++++-
 pages/shop/userorders.vue         |  4 ++--
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pages/home/components/filters.vue b/pages/home/components/filters.vue
index 2e70229..903fbaf 100644
--- a/pages/home/components/filters.vue
+++ b/pages/home/components/filters.vue
@@ -515,27 +515,27 @@
 				if (this.idType == 1) {
 					if (this.activeFirstId == 1) {
 						uni.navigateTo({
-							url:  `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}`,
+							url:  `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 2) {
 						uni.navigateTo({
-							url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2`,
+							url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 3) {
 						uni.navigateTo({
-							url: `/pages/shop/SellerDetail?order_id=${order.id}`,
+							url: `/pages/shop/SellerDetail?order_id=${order.id}&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 4) {
 						uni.navigateTo({
-							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}`,
+							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 5) {
 						uni.navigateTo({
-							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2`,
+							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2&haveButton=${this.haveButton}`,
 						});
 					}
 				}
diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue
index ceeb3a2..5ae0473 100644
--- a/pages/shop/buy-order.vue
+++ b/pages/shop/buy-order.vue
@@ -272,7 +272,8 @@
 			},
 
 			getDisplayPrice(order) {
-				const price = order.pay_money || order.order_money || 0
+				const price = Number(order.pay_money) || Number(order.order_money) || 0
+				
 				return Number(price).toFixed(2)
 			},
 
diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue
index adf82db..5768e0a 100644
--- a/pages/shop/buyorder-detail.vue
+++ b/pages/shop/buyorder-detail.vue
@@ -82,7 +82,11 @@
 					</view>
 					<text class="service-count">×1</text>
 				</view>
-				<view class="service-real">
+				<view class="service-real" v-if="orderInfo.state==7 || orderInfo.state==1">
+					<text class="real-lable">应付金额：</text>
+					<text class="real-price">￥{{orderInfo.order_money}}</text>
+				</view>
+				<view class="service-real" v-else>
 					<text class="real-lable">实际支付金额：</text>
 					<text class="real-price">￥{{orderInfo.pay_money}}</text>
 				</view>
diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue
index 4331ac0..80f8863 100644
--- a/pages/shop/userorder-detail.vue
+++ b/pages/shop/userorder-detail.vue
@@ -272,7 +272,7 @@
 		<!-- 底部按钮 -->
 
 		<view class="bottom-buttons"
-			v-if="haveButton && (orderInfo.state == 2) || orderInfo.state == 3 || orderInfo.state == 4">
+			v-if="haveButton && (orderInfo.state == 2 || orderInfo.state == 3 || orderInfo.state == 4)">
 			<!-- <view class="contact-button" @click="contactService(orderInfo.phone_user)">
 		  <image src="/static/images/tell_icon.png" class="tell-icon"></image>
 		  <text class="contact-text">联系TA</text>
@@ -370,6 +370,9 @@
 			if (options.push_id) {
 				this.messageRead(options.push_id)
 			}
+			if(options.haveButton){
+				this.haveButton = options.haveButton
+			}
 
 
 			// 添加调试日志
diff --git a/pages/shop/userorders.vue b/pages/shop/userorders.vue
index 26ae105..8acdbc3 100644
--- a/pages/shop/userorders.vue
+++ b/pages/shop/userorders.vue
@@ -265,10 +265,10 @@
 			// 去订单详情
 			goOrderDetail(item) {
 				let path = "";
-				path = `/pages/shop/userorder-detail?order_id=${item.id}&order_kind=${item.order_kind}`;
+				path = `/pages/shop/userorder-detail?order_id=${item.id}&order_kind=${item.order_kind}&haveButton=${this.haveButton}`;
 				if (item.table_source == "order_self") {
 					//如果是自营订单
-					path = `/pages/shop/userorder-detail?order_id=${item.id}&serviceType=2&order_kind=${item.order_kind}`;
+					path = `/pages/shop/userorder-detail?order_id=${item.id}&serviceType=2&order_kind=${item.order_kind}&haveButton=${this.haveButton}`;
 				}
 				uni.navigateTo({
 					url: path,

From 7b54ba6749bac8cd3cbe0f1f770afe2741e61384 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 30 Apr 2026 14:46:11 +0800
Subject: [PATCH 023/118] =?UTF-8?q?=E5=95=86=E5=AE=B6=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81=E5=BC=B9=E7=AA=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/ruzhu.vue   |  12 ++-
 pages/ruzhu/sj-info.vue | 167 +++++++++++++++++++++++++++++-----------
 2 files changed, 130 insertions(+), 49 deletions(-)

diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 39f2433..86104a5 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -742,8 +742,16 @@
 					console.log('商家门店信息数据:', this.storeInfoData);
 				}
 
-				// 执行提交逻辑
-				this.completeRegistration();
+				// 提交前确认邀请码
+				if (this.$refs.storeInfo && this.$refs.storeInfo.confirmInviteCodeBeforeSubmit) {
+					this.$refs.storeInfo.confirmInviteCodeBeforeSubmit(() => {
+						// 确认后执行提交逻辑
+						this.completeRegistration();
+					});
+				} else {
+					// 不支持邀请码确认，直接提交
+					this.completeRegistration();
+				}
 			},
 
 			goPrev() {
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 449e093..6c4bc55 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -6,29 +6,6 @@
       <text>门店信息</text>
     </view>
 
-    <!-- 邀请码确认弹窗 -->
-    <uni-popup ref="existingInvitePopup" type="center" :mask-click="false">
-      <view class="invite-popup-content">
-        <view class="invite-popup-header">
-          <text class="invite-popup-title">请确认邀请信息</text>
-        </view>
-        <view class="invite-popup-body">
-          <view class="invite-item">
-            <text class="invite-label">邀请码</text>
-            <text class="invite-value">{{ existingInviterInfo && existingInviterInfo.invite_code }}</text>
-          </view>
-          <view class="invite-item">
-            <text class="invite-label">邀请人</text>
-            <text class="invite-value">{{ (existingInviterInfo && (existingInviterInfo.name || existingInviterInfo.nick_name)) || '' }}</text>
-          </view>
-        </view>
-        <view class="invite-popup-footer">
-          <view class="invite-btn cancel" @click="hideExistingInviteTipPopup">关闭</view>
-          <view class="invite-btn confirm" @click="useExistingInviteCode">确认</view>
-        </view>
-      </view>
-    </uni-popup>
-
     <!-- 店铺logo -->
     <view class="form-item box-cont">
         <view class="label-wrapper">
@@ -325,6 +302,29 @@
       </view>
     </view>
 
+    <!-- 邀请码确认弹窗 -->
+    <uni-popup ref="existingInvitePopup" type="center" :mask-click="false">
+      <view class="invite-popup-content">
+        <view class="invite-popup-header">
+          <text class="invite-popup-title">请确认邀请信息</text>
+        </view>
+        <view class="invite-popup-body">
+          <view class="invite-item">
+            <text class="invite-label">邀请码</text>
+            <text class="invite-value">{{ existingInviterInfo && existingInviterInfo.invite_code }}</text>
+          </view>
+          <view class="invite-item">
+            <text class="invite-label">邀请人</text>
+            <text class="invite-value">{{ (existingInviterInfo && (existingInviterInfo.name || existingInviterInfo.nick_name)) || '' }}</text>
+          </view>
+        </view>
+        <view class="invite-popup-footer">
+          <view class="invite-btn cancel" @click="cancelInviteConfirm">取消</view>
+          <view class="invite-btn confirm" @click="useExistingInviteCode">确认</view>
+        </view>
+      </view>
+    </uni-popup>
+
   </view>
 </template>
 
@@ -592,8 +592,7 @@ export default {
               this.saveInviteStateToLocal();
               this.saveFormDataToLocal();
               
-              // 弹窗提示
-              this.showExistingInviteTipPopup();
+              // 不在页面加载时弹窗，改为在提交申请时弹窗
               return true;
             } else {
               console.error('获取邀请人信息失败，邀请码可能无效');
@@ -612,29 +611,31 @@ export default {
     
     // 显示已有邀请人确认弹窗（复用原有方法，但内容更准确）
     showExistingInviteTipPopup() {
-      if (this.$refs.existingInvitePopup) {
-        this.$refs.existingInvitePopup.open();
-      } else {
-        uni.showModal({
-          title: '请确认邀请信息',
-          content: `邀请码：${this.existingInviterInfo?.invite_code}\n邀请人：${this.existingInviterInfo?.name || this.existingInviterInfo?.nick_name}`,
-          confirmText: '确认',
-          cancelText: '关闭',
-          success: (res) => {
-            if (res.confirm) {
-              this.useExistingInviteCode();
-            } else {
-              // 用户关闭弹窗：清空邀请码，允许手动输入（与铁军端行为一致）
-              this.formData.invite_code_other = '';
-              this.hasExistingInviter = false;
-              this.hasAutoReplacedInvite = false;
-              this.inviterInfo = null;
-              this.existingInviterInfo = null;
-              this.saveFormDataToLocal();
+      this.$nextTick(() => {
+        if (this.$refs.existingInvitePopup) {
+          this.$refs.existingInvitePopup.open();
+        } else {
+          uni.showModal({
+            title: '请确认邀请信息',
+            content: `邀请码：${this.existingInviterInfo?.invite_code}\n邀请人：${this.existingInviterInfo?.name || this.existingInviterInfo?.nick_name}`,
+            confirmText: '确认',
+            cancelText: '关闭',
+            success: (res) => {
+              if (res.confirm) {
+                this.useExistingInviteCode();
+              } else {
+                // 用户关闭弹窗：清空邀请码，允许手动输入（与铁军端行为一致）
+                this.formData.invite_code_other = '';
+                this.hasExistingInviter = false;
+                this.hasAutoReplacedInvite = false;
+                this.inviterInfo = null;
+                this.existingInviterInfo = null;
+                this.saveFormDataToLocal();
+              }
             }
-          }
-        });
-      }
+          });
+        }
+      });
     },
     
     // 确认使用已有邀请码（用户点击确认）
@@ -650,6 +651,12 @@ export default {
         this.saveFormDataToLocal();
       }
       this.hideExistingInviteTipPopup();
+      
+      // 执行提交回调
+      if (this.submitCallback) {
+        this.submitCallback();
+        this.submitCallback = null;
+      }
     },
     
     // 隐藏已有邀请人确认弹窗
@@ -659,6 +666,68 @@ export default {
       }
     },
     
+    // 取消邀请码确认
+    cancelInviteConfirm() {
+      // 如果是系统自动替换的邀请码，取消后允许用户手动输入
+      if (this.hasAutoReplacedInvite) {
+        this.hasAutoReplacedInvite = false;
+        this.hasExistingInviter = false;
+        // 保存状态
+        this.saveInviteStateToLocal();
+        this.saveFormDataToLocal();
+      }
+      
+      // 关闭弹窗
+      this.hideExistingInviteTipPopup();
+    },
+    
+    // 显示邀请码确认弹窗
+    showInviteConfirmPopup(inviterData) {
+      this.$nextTick(() => {
+        // 使用 existingInvitePopup 组件显示确认弹窗
+        if (this.$refs.existingInvitePopup) {
+          // 将邀请人信息存入 existingInviterInfo 以便弹窗显示
+          this.existingInviterInfo = inviterData;
+          this.$refs.existingInvitePopup.open();
+        } else {
+          // 降级方案
+          uni.showModal({
+            title: '请确认邀请信息',
+            content: `邀请码：${inviterData?.invite_code}\n邀请人：${inviterData?.name || inviterData?.nick_name}`,
+            confirmText: '确认',
+            cancelText: '取消',
+            success: (res) => {
+              if (res.confirm) {
+                // 确认使用该邀请码
+                this.saveInviteStateToLocal();
+              } else {
+                // 取消，清空邀请码
+                this.formData.invite_code_other = '';
+                this.inviterInfo = null;
+                this.inviteCodeError = false;
+                this.saveInviteStateToLocal();
+              }
+            }
+          });
+        }
+      });
+    },
+    
+    // 提交申请前确认邀请码（供父组件调用）
+    confirmInviteCodeBeforeSubmit(callback) {
+      this.submitCallback = callback;
+      
+      // 如果有已验证的邀请人信息，显示确认弹窗
+      if (this.inviterInfo && this.formData.invite_code_other) {
+        this.showInviteConfirmPopup(this.inviterInfo);
+      } else {
+        // 没有邀请码或未验证，直接提交
+        if (this.submitCallback) {
+          this.submitCallback();
+        }
+      }
+    },
+    
     // 获取用户信息（含手机号）
     getUserInfo() {
       return request.post('/sj/User/getUser').then(result => {
@@ -954,6 +1023,8 @@ export default {
               this.inviterInfo = userData;
               this.inviteCodeError = false;
               console.log('邀请码验证通过，邀请人:', userData);
+              
+              // 不在输入时弹窗，改为在提交申请时弹窗
           } else {
               // 接口返回数据但没有account字段，说明不是有效邀请人
               console.log('接口返回数据无效，没有account字段:', userData);
@@ -2307,6 +2378,7 @@ export default {
   display: flex;
   flex-direction: column;
   gap: 24rpx;
+  margin-top: 20rpx;
 }
 
 .invite-item {
@@ -2345,6 +2417,7 @@ export default {
   justify-content: center;
   font-size: 32rpx;
   font-weight: 500;
+  margin: 0 10rpx;
 }
 
 .invite-btn.cancel {

From 5bb78163b47d5c2c4e9277235b1d7957c69346d8 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 30 Apr 2026 14:47:48 +0800
Subject: [PATCH 024/118] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/sj-info.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 6c4bc55..1e888fd 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -319,7 +319,7 @@
           </view>
         </view>
         <view class="invite-popup-footer">
-          <view class="invite-btn cancel" @click="cancelInviteConfirm">取消</view>
+          <view class="invite-btn cancel" @click="cancelInviteConfirm">关闭</view>
           <view class="invite-btn confirm" @click="useExistingInviteCode">确认</view>
         </view>
       </view>
@@ -2417,7 +2417,7 @@ export default {
   justify-content: center;
   font-size: 32rpx;
   font-weight: 500;
-  margin: 0 10rpx;
+  margin: 0 5rpx;
 }
 
 .invite-btn.cancel {

From 0130ad939d0cf95d9b794e3fb4c2bc2e5e60e01b Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 30 Apr 2026 14:56:42 +0800
Subject: [PATCH 025/118] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/submitres.vue | 43 +++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/pages/ruzhu/submitres.vue b/pages/ruzhu/submitres.vue
index 3e1ec69..6ea3b4e 100644
--- a/pages/ruzhu/submitres.vue
+++ b/pages/ruzhu/submitres.vue
@@ -135,31 +135,30 @@ export default {
         return;
       }
       
-      // 重新确定 type 值
-      let type;
-      if (this.identity == 1) {
-        type = 2; // 手艺人
-      } else if (this.identity == 2) {
-        type = 3; // 商家
-      } else {
-        console.error('未知的用户类型identity:', this.identity);
-        this.backMag = '用户类型错误，请联系客服';
-        return;
-      }
-      
-      console.log('请求参数 type:', type);
-      
-      request.post('/user/getuser', {type}).then(result => {
-        console.log('接口返回数据:', result);
-        if (result.data && result.data.back_text) {
-          this.backMag = result.data.back_text;
-          console.log('设置backMag为:', this.backMag);
+      request.post('/sj/userSjAuth/details', {
+        type: this.identity // 1=手艺人，2=商家
+      }).then(result => {
+        console.log('申请详情接口返回数据:', result);
+        if (result.code === 200) {
+          if (result.data) {
+            if (result.data.back_text) {
+              this.backMag = result.data.back_text;
+              console.log('设置backMag为:', this.backMag);
+            } else {
+              this.backMag = '未知原因，请联系客服';
+              console.log('接口返回无back_text字段');
+            }
+          } else {
+            // 接口返回成功但数据为空，可能没有申请记录
+            console.log('接口返回成功但data为空');
+            this.backMag = '暂无驳回原因信息';
+          }
         } else {
-          this.backMag = '未知原因，请联系客服';
-          console.log('接口返回无back_text字段');
+          this.backMag = '获取驳回原因失败，请联系客服';
+          console.log('接口返回错误:', result?.msg || '未知错误');
         }
       }).catch(err => {
-        console.error('获取用户信息失败:', err);
+        console.error('获取申请详情失败:', err);
         this.backMag = '获取驳回原因失败，请联系客服';
       }).finally(() => {
         console.log('getUserInfo执行完成');

From 665ca23d3b36a512797d6cd459f409034353cb4d Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 30 Apr 2026 16:58:04 +0800
Subject: [PATCH 026/118] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E7=A0=81=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/sj-info.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 1e888fd..13eae2d 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -668,15 +668,6 @@ export default {
     
     // 取消邀请码确认
     cancelInviteConfirm() {
-      // 如果是系统自动替换的邀请码，取消后允许用户手动输入
-      if (this.hasAutoReplacedInvite) {
-        this.hasAutoReplacedInvite = false;
-        this.hasExistingInviter = false;
-        // 保存状态
-        this.saveInviteStateToLocal();
-        this.saveFormDataToLocal();
-      }
-      
       // 关闭弹窗
       this.hideExistingInviteTipPopup();
     },

From 659ec0f4731b2fffaf79505a69e99bdd3662909e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 6 May 2026 13:25:33 +0800
Subject: [PATCH 027/118] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/workOrderCard.vue | 517 +++++++++++-------------
 1 file changed, 239 insertions(+), 278 deletions(-)

diff --git a/pages/home/components/workOrderCard.vue b/pages/home/components/workOrderCard.vue
index 14bdcdf..cb77c81 100644
--- a/pages/home/components/workOrderCard.vue
+++ b/pages/home/components/workOrderCard.vue
@@ -6,7 +6,7 @@
 			<view class="stateText" :class="{
 				stateText2: dataItem.state > 4 && dataItem.state !== 7,  // 排除已取消
 				stateText3: dataItem.state === 7  // 已取消状态单独处理
-				}" v-if="showState">
+			}" v-if="showState">
 				{{ stateText }}
 			</view>
 		</view>
@@ -18,8 +18,8 @@
 				<view class="topInfo">
 					<view class="price_title">
 						<view class="service-type white-space-nowrap">{{
-              dataItem.title
-            }}</view>
+							dataItem.title
+						}}</view>
 
 					</view>
 					<view class="service-address">下单时间：{{ dataItem.add_time }}</view>
@@ -45,299 +45,260 @@
 </template>
 
 <script>
-	export default {
-		name: "OrderCard",
-		props: {
-			dataItem: {
-				type: Object,
-			},
-			typeId: {
-				type: Number,
-			},
-			showState: {
-				type: Boolean,
-				default: true,
-			}
+export default {
+	name: "OrderCard",
+	props: {
+		dataItem: {
+			type: Object,
 		},
-		computed: {
-			photo() {
-				return this.dataItem.photo? JSON.parse(this.dataItem.photo):"";
-			},
-			useTime() {
-				const start = this.dataItem.reserve_start_time;
-				const endTime = this.dataItem.reserve_end_time;
-
-				function formatTimeRange(startTimeStr, endTimeStr) {
-					if (!startTimeStr || !endTimeStr) return "未设置";
-					
-					// 解析开始时间为Date对象
-					const startTime = new Date(startTimeStr.replace(/-/g, '/'));
-					const endTime = new Date(endTimeStr.replace(/-/g, '/'));
-					
-					if (isNaN(startTime.getTime()) || isNaN(endTime.getTime())) {
-						console.error("无效的时间格式");
-						return "时间格式错误";
-					}
-					
-					// 格式化年份：YYYY年
-					const formatYear = (date) => {
-						return date.getFullYear() + '年';
-					};
-					
-					// 格式化月份和日期：MM月DD
-					const formatMonthDay = (date) => {
-						const month = String(date.getMonth() + 1).padStart(2, "0");
-						const day = String(date.getDate()).padStart(2, "0");
-						return `${month}月${day}`;
-					};
-					
-					// 格式化时间部分：HH:MM
-					const formatTimePart = (date) => {
-						const hours = String(date.getHours()).padStart(2, "0");
-						const minutes = String(date.getMinutes()).padStart(2, "0");
-						return `${hours}:${minutes}`;
-					};
-					
-					// 判断是否同一天
-					const isSameDay = startTime.getFullYear() === endTime.getFullYear() &&
-									  startTime.getMonth() === endTime.getMonth() &&
-									  startTime.getDate() === endTime.getDate();
-					
-					if (isSameDay) {
-						// 同一天：2025年05月29 12:30-13:30
-						return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatTimePart(endTime)}`;
-					} else {
-						// 跨天：2025年05月29 12:30-2025年05月30 13:30
-						return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatYear(endTime)}${formatMonthDay(endTime)} ${formatTimePart(endTime)}`;
-					}
-				}
-				return formatTimeRange(start, endTime);
-			},
-			stateText() {
-				const textList = [
-					"",
-					"待支付",
-					"待接单",
-					"待开始",
-					"进行中",
-					"已完成",
-					"已评价",
-					"已取消",
-				];
-				return textList[this.dataItem.state];
-			},
+		typeId: {
+			type: Number,
 		},
-		methods: {
-			// 触发取消事件
-			emitCancel() {
-				this.$emit("cancel", this.dataItem);
-			},
-			// 触发接单事件
-			emitAccept() {
-				this.$emit("accept", this.dataItem);
-			},
-			emitStart() {
-				this.$emit("start", this.dataItem);
-			},
-			emitDone() {
-				this.$emit("done", this.dataItem);
-			},
-			goDetail() {
-				this.$emit("goDetail", this.dataItem);
-			},
-			emitGoPay() {
-				this.$emit("goPay", this.dataItem);
-			},
-			emitRefund() {
-				this.$emit("goRefund", this.dataItem);
-			}
+		showState: {
+			type: Boolean,
+			default: true,
+		}
+	},
+	computed: {
+		photo() {
+			return this.dataItem.photo ? JSON.parse(this.dataItem.photo) : "";
 		},
-	};
+		useTime() {
+			const start = this.dataItem.reserve_start_time;
+			const end = this.dataItem.reserve_end_time;
+			if (!start || !end) return "未设置";
+			const startDate = new Date(start.replace(/-/g, '/'));
+			const endDate = new Date(end.replace(/-/g, '/'));
+			if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) return "时间格式错误";
+			const pad = (n) => String(n).padStart(2, "0");
+			const fmt = (d) => `${pad(d.getMonth() + 1)}.${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+			return `${fmt(startDate)}-${fmt(endDate)}`;
+		},
+		stateText() {
+			const textList = [
+				"",
+				"待支付",
+				"待接单",
+				"待开始",
+				"进行中",
+				"已完成",
+				"已评价",
+				"已取消",
+			];
+			return textList[this.dataItem.state];
+		},
+	},
+	methods: {
+		// 触发取消事件
+		emitCancel() {
+			this.$emit("cancel", this.dataItem);
+		},
+		// 触发接单事件
+		emitAccept() {
+			this.$emit("accept", this.dataItem);
+		},
+		emitStart() {
+			this.$emit("start", this.dataItem);
+		},
+		emitDone() {
+			this.$emit("done", this.dataItem);
+		},
+		goDetail() {
+			this.$emit("goDetail", this.dataItem);
+		},
+		emitGoPay() {
+			this.$emit("goPay", this.dataItem);
+		},
+		emitRefund() {
+			this.$emit("goRefund", this.dataItem);
+		}
+	},
+};
 </script>
 
 <style lang="less" scoped>
-	.order-card {
-		position: relative;  // 必须加，确保父容器有定位
-		padding: 24rpx 20rpx 0rpx;
-		margin: 0rpx 30rpx 20rpx 30rpx;
-		background-color: #fff;
-		border-radius: 12px;
-		/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
-	}
+.order-card {
+	position: relative; // 必须加，确保父容器有定位
+	padding: 24rpx 20rpx 0rpx;
+	margin: 0rpx 30rpx 20rpx 30rpx;
+	background-color: #fff;
+	border-radius: 12px;
+	/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
+}
 
-	.orderNumBox {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 40rpx;
+.orderNumBox {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 40rpx;
 
-		.stateText {
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #E8101E;
-			text-align: left;
-			font-style: normal;
-			position: absolute;
-			right: 0;
-			top: 0;
-			background-image: url("/static/images/icons/tabBj.png");
-			background-size: 100% auto;
-			background-position: center top;
-			background-repeat: no-repeat;
-			width: 128rpx;
-			height: 49rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-
-		.stateText2 {
-			background-image: url("/static/images/icons/tabBj2.png");
-			color: #333;
-		}
-
-		.stateText3 {
-			background-image: url("/static/images/icons/tabBj2.png");
-			color: #999999 !important;
-		}
-	}
-
-	/* 订单编号 */
-	.order-id {
-		width: 530rpx;
-		font-size: 28rpx;
-		color: #333333;
-	}
-
-	/* 服务信息容器 */
-	.service-container {
-		display: flex;
-		align-items: center;
-		padding-bottom: 24rpx;
-		border-bottom: 1px solid #f6f5f5;
-		width: 100%;
-	}
-
-	/* 服务图片 */
-	.service-img {
-		width: 172rpx;
-		height: 168rpx;
-		border-radius: 24rpx;
-		margin-right: 30rpx;
-		flex-shrink: 0;
-	}
-
-	/* 服务信息 */
-	.service-info {
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		width: 100%;
-		height: 168rpx;
-
-		.topInfo {
-			display: flex;
-			flex-direction: column;
-
-			.price_title {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				margin-bottom: 20rpx;
-
-				.service-type {
-					font-weight: 500;
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 34rpx;
-					max-width: 300rpx;
-				}
-
-
-			}
-
-		}
-
-		.service-price {
-			font-family: DINPro, DINPro;
-			font-weight: 500;
-			font-size: 36rpx;
-			color: #E8101E;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-		}
-	}
-
-	.service_subTitle {
-		font-size: 26rpx;
-		line-height: 26rpx;
-		color: #666666;
-		margin-top: 18rpx;
-	}
-
-
-
-	.service-address {
+	.stateText {
 		font-weight: 400;
 		font-size: 26rpx;
-		color: #999999;
-		line-height: 33rpx;
+		color: #E8101E;
 		text-align: left;
 		font-style: normal;
-	}
-
-	/* 时间信息 */
-	.time-info {
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #333333;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-		padding-bottom: 20rpx;
-		margin-top: 28rpx;
-	}
-
-	/* 按钮组 */
-	.button-group {
-		display: flex;
-		justify-content: flex-end;
-		gap: 30rpx;
-		padding-bottom: 30rpx;
-	}
-
-	/* 通用按钮样式 */
-	.btn {
-		white-space: nowrap;
-		width: 100rpx;
-		height: 32rpx;
+		position: absolute;
+		right: 0;
+		top: 0;
+		background-image: url("/static/images/icons/tabBj.png");
+		background-size: 100% auto;
+		background-position: center top;
+		background-repeat: no-repeat;
+		width: 128rpx;
+		height: 49rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		padding: 10px 20px;
-		border-radius: 64rpx;
-		// box-sizing: border-box;
-		//height: 64rpx;
-		//border-radius: 32rpx;
-		border: 2rpx solid #979797;
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #333333;
-		line-height: 64rpx;
-		// padding: 0 28rpx;
+	}
+
+	.stateText2 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #333;
+	}
+
+	.stateText3 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #999999 !important;
+	}
+}
+
+/* 订单编号 */
+.order-id {
+	width: 530rpx;
+	font-size: 28rpx;
+	color: #333333;
+}
+
+/* 服务信息容器 */
+.service-container {
+	display: flex;
+	align-items: center;
+	padding-bottom: 24rpx;
+	border-bottom: 1px solid #f6f5f5;
+	width: 100%;
+}
+
+/* 服务图片 */
+.service-img {
+	width: 172rpx;
+	height: 168rpx;
+	border-radius: 24rpx;
+	margin-right: 30rpx;
+	flex-shrink: 0;
+}
+
+/* 服务信息 */
+.service-info {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	width: 100%;
+	height: 168rpx;
+
+	.topInfo {
+		display: flex;
+		flex-direction: column;
+
+		.price_title {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-bottom: 20rpx;
+
+			.service-type {
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 34rpx;
+				max-width: 300rpx;
+			}
+
+
+		}
 
 	}
 
-	/* 取消按钮 */
-	.cancel-btn {
-		border: 2rpx solid #979797;
-		color: #333333;
-	}
-
-	/* 接单按钮 */
-	.accept-btn {
-		border: 2rpx solid #E8101E;
+	.service-price {
+		font-family: DINPro, DINPro;
+		font-weight: 500;
+		font-size: 36rpx;
 		color: #E8101E;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
 	}
+}
+
+.service_subTitle {
+	font-size: 26rpx;
+	line-height: 26rpx;
+	color: #666666;
+	margin-top: 18rpx;
+}
+
+
+
+.service-address {
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #999999;
+	line-height: 33rpx;
+	text-align: left;
+	font-style: normal;
+}
+
+/* 时间信息 */
+.time-info {
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #333333;
+	line-height: 34rpx;
+	text-align: left;
+	font-style: normal;
+	padding-bottom: 20rpx;
+	margin-top: 28rpx;
+}
+
+/* 按钮组 */
+.button-group {
+	display: flex;
+	justify-content: flex-end;
+	gap: 30rpx;
+	padding-bottom: 30rpx;
+}
+
+/* 通用按钮样式 */
+.btn {
+	white-space: nowrap;
+	width: 100rpx;
+	height: 32rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 10px 20px;
+	border-radius: 64rpx;
+	// box-sizing: border-box;
+	//height: 64rpx;
+	//border-radius: 32rpx;
+	border: 2rpx solid #979797;
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #333333;
+	line-height: 64rpx;
+	// padding: 0 28rpx;
+
+}
+
+/* 取消按钮 */
+.cancel-btn {
+	border: 2rpx solid #979797;
+	color: #333333;
+}
+
+/* 接单按钮 */
+.accept-btn {
+	border: 2rpx solid #E8101E;
+	color: #E8101E;
+}
 </style>
\ No newline at end of file

From 3e9235844a8fde68da72c91abe28c2e299fe3647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 6 May 2026 15:01:38 +0800
Subject: [PATCH 028/118] =?UTF-8?q?=E9=99=90=E5=88=B6=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=97=B6=E9=95=BF=E5=92=8C=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/photoAlbum/addPhoto.vue | 11 ++++----
 utils/albumUploadImage.js          | 41 +++++++++++++++++-------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/pages/shop/photoAlbum/addPhoto.vue b/pages/shop/photoAlbum/addPhoto.vue
index 32a005a..51c7d5e 100644
--- a/pages/shop/photoAlbum/addPhoto.vue
+++ b/pages/shop/photoAlbum/addPhoto.vue
@@ -428,11 +428,12 @@
 							title: '取消上传',
 							icon: 'none'
 						});
-					} else {
-						uni.showToast({
-							title: '上传失败',
-							icon: 'none'
-						}); // 新增：上传失败提示
+					} else {
+						console.error('上传失败：', err.errMsg);
+						uni.showToast({
+							title: err.errMsg || '上传失败',
+							icon: 'none'
+						}); // 新增：上传失败提示
 					}
 
 				} finally {
diff --git a/utils/albumUploadImage.js b/utils/albumUploadImage.js
index 4d6d211..ae649cc 100644
--- a/utils/albumUploadImage.js
+++ b/utils/albumUploadImage.js
@@ -77,6 +77,21 @@ const handleUpload = async (userId, type, sourceType = ['album', 'camera'], uplo
 			// #ifdef APP-PLUS || MP-WEIXIN
 			file = res;
 			// #endif
+			 const duration = res.duration;
+			      if (duration < 3) {
+			        uni.showToast({
+			          title: "视频时长不能少于3秒",
+			          icon: "none",
+			        });
+			        return null;
+			      }
+			      if (duration > 59.9) {
+			        uni.showToast({
+			          title: "视频时长不能超过1分钟",
+			          icon: "none",
+			        });
+			        return null;
+			      }
 		}
 
 
@@ -149,23 +164,15 @@ const uploadFile = async (file, userId, type, uploadType) => {
 	console.log('file=======', file)
 	console.log('userId=======', userId)
 	// 检查文件大小
-	if (uploadType == 'image') {
-		if (file.size > 5 * 1024 * 1024) {
-			uni.showToast({
-				title: `文件大小不能超过5MB`,
-				icon: 'none'
-			})
-			return Promise.reject(new Error('文件大小超出限制'))
-		}
-	} else if (uploadType == 'video') {
-		if (file.size > 100 * 1024 * 1024) {
-			uni.showToast({
-				title: `文件大小不能超过100MB`,
-				icon: 'none'
-			})
-			return Promise.reject(new Error('文件大小超出限制'))
-		}
-	}
+	  if (uploadType == "image") {
+	    if (file.size > 5 * 1024 * 1024) {
+	      return Promise.reject({errMsg: "文件大小不能超过5MB"});
+	    }
+	  } else if (uploadType == "video") {
+	    if (file.size > 500 * 1024 * 1024) {
+	      return Promise.reject({errMsg: "文件大小不能超过500MB"});
+	    }
+	  }
 
 	let date = new Date().getTime()
 	console.log('file', file)

From 2836b0712f7813c1119b3e55620a7b17abf917b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 6 May 2026 15:18:55 +0800
Subject: [PATCH 029/118] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=97=B6=E9=95=BF?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/albumUploadImage.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/utils/albumUploadImage.js b/utils/albumUploadImage.js
index ae649cc..fda5fca 100644
--- a/utils/albumUploadImage.js
+++ b/utils/albumUploadImage.js
@@ -67,6 +67,7 @@ const handleUpload = async (userId, type, sourceType = ['album', 'camera'], uplo
 			// ========== 【核心新增：图片比例校验 结束】 ==========
 		} else if (uploadType == 'video') {
 			const res = await uni.chooseVideo({
+				maxDuration:60,
 				count: 1,
 				sourceType: ['album', 'camera'],
 				compressed: false
@@ -77,6 +78,7 @@ const handleUpload = async (userId, type, sourceType = ['album', 'camera'], uplo
 			// #ifdef APP-PLUS || MP-WEIXIN
 			file = res;
 			// #endif
+			console.log(res,'resresres');
 			 const duration = res.duration;
 			      if (duration < 3) {
 			        uni.showToast({
@@ -85,7 +87,7 @@ const handleUpload = async (userId, type, sourceType = ['album', 'camera'], uplo
 			        });
 			        return null;
 			      }
-			      if (duration > 59.9) {
+			      if (duration > 61) {
 			        uni.showToast({
 			          title: "视频时长不能超过1分钟",
 			          icon: "none",

From a5180be20fc8d7af1d39fc62b3bc766fe0714080 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 6 May 2026 18:17:27 +0800
Subject: [PATCH 030/118] =?UTF-8?q?13131313=E9=82=80=E8=AF=B7=E7=A0=81?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/sj-info.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 13eae2d..6e4a47a 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -708,8 +708,11 @@ export default {
     confirmInviteCodeBeforeSubmit(callback) {
       this.submitCallback = callback;
       
-      // 如果有已验证的邀请人信息，显示确认弹窗
-      if (this.inviterInfo && this.formData.invite_code_other) {
+      // 如果邀请码是13131313，显示确认弹窗，邀请人显示为"暂无邀请人"
+      if (this.formData.invite_code_other === '13131313') {
+        this.showInviteConfirmPopup({ invite_code: '13131313', name: '暂无邀请人' });
+      } else if (this.inviterInfo && this.formData.invite_code_other) {
+        // 如果有已验证的邀请人信息，显示确认弹窗
         this.showInviteConfirmPopup(this.inviterInfo);
       } else {
         // 没有邀请码或未验证，直接提交

From 4e21e22bdf02a743ee28ec47afb1f8c2a0d99152 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Wed, 13 May 2026 17:41:13 +0800
Subject: [PATCH 031/118] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json               |  4 ++--
 pages/shop/add-img-text.vue | 13 +++++++------
 pages/shop/add-service.vue  |  6 +++++-
 utils/request.js            |  8 ++++----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/manifest.json b/manifest.json
index 8356026..f438265 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "美融融商家",
     "appid" : "__UNI__BBE6285",
     "description" : "同城便捷到家美业“技术外卖”服务、同城预约到店服务平台美融融为同城爱美人群提供更优质的更全面的服务。",
-    "versionName" : "1.0.09",
-    "versionCode" : 1009,
+    "versionName" : "1.0.16",
+    "versionCode" : 1016,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/shop/add-img-text.vue b/pages/shop/add-img-text.vue
index b61c22f..2c6f79a 100644
--- a/pages/shop/add-img-text.vue
+++ b/pages/shop/add-img-text.vue
@@ -119,12 +119,13 @@
 			};
 		},
 		onLoad(options) {
-			console.log(options)
-			if(options.list){
-				this.list = JSON.parse(options.list)
-				console.log(this.list)
-			}
-		},
+		console.log(options)
+		if(options.list){
+			const parsed = JSON.parse(options.list)
+			this.list = Array.isArray(parsed) ? parsed : []
+			console.log(this.list)
+		}
+	},
 		methods: {
 			submitForm(){
 				uni.$emit('updateGraphicDetails', this.list);
diff --git a/pages/shop/add-service.vue b/pages/shop/add-service.vue
index 68d4c6e..db7b857 100644
--- a/pages/shop/add-service.vue
+++ b/pages/shop/add-service.vue
@@ -576,7 +576,7 @@
 							this.categoryAll = result.data;
 							this.categoryAll.filter((e, i) => {
 								if (e.id == this.formData.second_class_id) {
-									this.selectedCategoryIndex = i;
+									this.selectedCategoryIndex = [i];
 									this.category = e.title;
 								}
 							});
@@ -913,6 +913,8 @@
 				this.formData.first_class_id = selectedType.id;
 				this.serviceType = selectedType.title;
 				this.ratio = selectedType.ratio;
+				this.formData.second_class_id = "";
+				this.category = "";
 				let id = selectedType.id;
 				request
 					.post("/user/secondclass", {
@@ -926,6 +928,8 @@
 							this.categoryAll = res.data;
 							this.showCategory = true;
 							this.selectedCategoryIndex = [0];
+							// this.formData.second_class_id = res.data[0].id;
+							// this.category = res.data[0].title;
 						}
 					});
 			},
diff --git a/utils/request.js b/utils/request.js
index 151428f..1a06288 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -134,13 +134,13 @@ const request = async (options, isUpdate) => {
 
 
 	if (process.env.NODE_ENV === 'development') {
-		//baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。	
-		baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
+		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。	
+		//baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'https://app.mrrweb.com.cn';
 	} else {
-		//baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
-		baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。	
+		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
+		//baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。	
 			//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'https://app.mrrweb.com.cn';
 

From d5690bc51b8b07e299a91debef3e15e2a1cc3afa Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 20 May 2026 16:44:16 +0800
Subject: [PATCH 032/118] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 8356026..d1586a4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "美融融商家",
     "appid" : "__UNI__BBE6285",
     "description" : "同城便捷到家美业“技术外卖”服务、同城预约到店服务平台美融融为同城爱美人群提供更优质的更全面的服务。",
-    "versionName" : "1.0.09",
-    "versionCode" : 1009,
+    "versionName" : "1.0.15",
+    "versionCode" : 1015,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

From 4b51811351436e5da84c3e59100b3a02665618ae Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 21 May 2026 11:52:07 +0800
Subject: [PATCH 033/118] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/request.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/request.js b/utils/request.js
index 1a06288..ff89727 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -135,12 +135,12 @@ const request = async (options, isUpdate) => {
 
 	if (process.env.NODE_ENV === 'development') {
 		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。	
-		//baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
+		baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'https://app.mrrweb.com.cn';
 	} else {
 		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
-		//baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。	
+		baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。	
 			//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'https://app.mrrweb.com.cn';
 

From d6f09178ac2fd8dad6e83216d0afcfbe9d91cc62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Thu, 21 May 2026 16:52:23 +0800
Subject: [PATCH 034/118] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json              |    6 +
 pages/my/my.vue         | 2977 ++++++++++++++++++++-------------------
 pages/my/myFavorite.vue |   22 +
 3 files changed, 1555 insertions(+), 1450 deletions(-)
 create mode 100644 pages/my/myFavorite.vue

diff --git a/pages.json b/pages.json
index f10ced4..7d21046 100644
--- a/pages.json
+++ b/pages.json
@@ -951,6 +951,12 @@
 			"style": {
 				"navigationBarTitleText": "拍摄技巧"
 			}
+		},
+		{
+			"path": "pages/my/myFavorite",
+			"style": {
+				"navigationBarTitleText": "我的收藏"
+			}
 		}
 
 
diff --git a/pages/my/my.vue b/pages/my/my.vue
index ba8c00a..9e3c59a 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,1451 +1,1528 @@
-<template>
-	<view class="my-page">
-		<!-- 顶部导航栏 -->
-		<!-- <custom-navbar
-      title="我的"
-      :show-back="false"
-      title-color="#333333"
-      :backgroundColor="backgroundColor"
-    ></custom-navbar> -->
-
-		<!-- 用户信息区域 -->
-		<view class="user-section" v-if="isLogin">
-			<view class="user-info">
-				<view class="user-info-left">
-					<view class="avatar">
-						<image :src="!userInfo.head_photo ? baseAvartar : userInfo.head_photo" mode="aspectFill"
-							class="avatar-img"></image>
-						<button class="avatar-button"></button>
-						<!-- open-type="chooseAvatar" -->
-						<!-- @chooseavatar="getAvatar" -->
-					</view>
-
-					<view class="user-detail" @click="goToProfile">
-						<view class="nickname">
-							<text class="nickname-text">{{
-                userInfo.name || userInfo.nick_name || ""
-              }}</text>
-						</view>
-						<view class="user_detail_tip">
-							<view class="user_detail_tip_phone" v-if="id_type !== 0">
-								资料编辑
-								<image mode="aspectFill"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6a4b7bc9-174a-471a-9bf5-6ba167005960" />
-							</view>
-							<view v-else class="user_detail_tip_phone" style="color: #999999">美融融小程序欢迎您</view>
-						</view>
-					</view>
-				</view>
-				<view class="user-info-right" @click="goToWallet">
-					<view class="wallet_content">
-						<image
-							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/931c0992-5243-4c70-ab2b-b99b430661c8.png"
-							mode="aspectFill" class="wallet_content_img"></image>
-						<view class="wallet_content_text">钱包余额：<text style="color: #e8101e">{{ userInfo.money }}元</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="authentication" v-if="id_type == 2 && !isBind">
-				<view @click="goTypeSelect" class="authentication_content">
-					<image mode="aspectFill" class="authentication_img"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ed8bc685-33bd-48cf-8058-85b07b9be0dc.png" />
-					<view class="authentication_text">申请成为平台商家</view>
-				</view>
-			</view>
-			<view class="inviteMessage" v-if="inviteList.length > 0">
-				<view class="inviteMessage_content">
-					<image mode="widthFix" class="inviteMessage_img"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/7f577210-2d63-4146-af09-bcaf3db85a49.png" />
-					<view class="inviteMessage_text">您有{{ inviteList.length }}条商家邀请</view>
-				</view>
-				<image @click="goToInviteList" mode="aspectFill" class="btn_img"
-					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/f2483bec-bbe7-4f2c-a6fd-e40a0accae82.png" />
-			</view>
-		</view>
-		<!-- 用户相关信息 -->
-		<view class="user-section" v-else>
-			<view class="user-info">
-				<view class="user-info-left" @click="goLogin">
-					<image
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b48d973-d219-4cac-b206-675c192d0cff"
-						mode="aspectFill" class="avatar"></image>
-					<view class="user-detail">
-						<text class="nickname"> 请点击登录 </text>
-						<text class="user-detail-tip">美融融商家欢迎您</text>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="order-card">
-			<template v-for="card in currentCardList">
-				<view class="function-list" v-if="card.type == 'line'">
-					<view class="function-title">{{ card.title }}</view>
-					<view class="function-grid">
-						<view class="grid-item" v-for="(item, index) in card.list" :key="index"
-							@click="handleFunction(item)">
-							<view class="icon-wrapper">
-								<image :src="item.icon" class="grid-icon" mode="widthFix"></image>
-							</view>
-							<text class="grid-text">{{ item.text }}</text>
-						</view>
-					</view>
-				</view>
-				<view class="function-list" style="padding: 24rpx; padding-bottom: 28rpx"
-					v-if="card.type == 'lineCard'">
-					<view class="lineCard-title">{{ card.title }}</view>
-					<view class="lineCard-grid">
-						<image v-for="(item, index) in card.list" :src="item.url" mode="widthFix"
-							@click="handleFunction(item)"></image>
-					</view>
-				</view>
-				<view class="imagePure" v-if="card.type == 'imagePure'">
-					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
-				</view>
-				<view class="image-list" v-if="card.type == 'image'">
-					<view class="image-title">{{ card.title }}</view>
-					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
-				</view>
-				<view class="imageText-list" v-if="card.type == 'imageText'">
-					<view class="imageText-title">{{ card.title }}</view>
-					<view class="imageText-content">
-						<image :src="card.url" mode="widthFix"></image>
-						<view class="text-status">入驻成功啦！</view>
-						<view class="text-next">下一步:等待<text style="color: #e8101e">专属门店商家邀约绑定</text>，解锁订单资源与服</view>
-						<view class="text-next">务通道，开启高效变现、共创共赢的新旅程～</view>
-					</view>
-				</view>
-			</template>
-		</view>
-
-		<tipsPopup2 :show="tipShow" @closePopup="closePopup" sureText="确认" @okBtn="okBtn">
-			{{ tipsText }}
-		</tipsPopup2>
-		<TabBar :selected="2"></TabBar>
-	</view>
-</template>
-
-<script>
-	import TabBar from "@/components/tabbar/tabbar.vue"
-	import tipsPopup2 from "@/components/tips-popup/tips-popup2";
-	import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
-	import request from "@/utils/request";
-	export default {
-		components: {
-			CustomNavbar,
-			tipsPopup2,
-			TabBar
-		},
-		data() {
-			return {
-				tipType: "", //提示弹窗类型
-				userInfo: {},
-				baseAvartar: "https://app.mrrweb.com.cn" + "/public/images/headanimal.png",
-				cardList: [{
-						type: "image",
-						title: "基础功能",
-						id_type: 0,
-						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/aa9fa8d6-8d85-4dce-875a-e71e02595198.png",
-						path: "/pages/ruzhu/ruzhu",
-					},
-					{
-						type: "lineCard",
-						title: "管理中心",
-
-						list: [{
-								title: "员工管理",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a9c13cce-f3e1-4ac1-9881-d39dc2b813ff.png",
-								path: "/pages/shop/staff/manage",
-								go_id_type: 1,
-							},
-							{
-								title: "服务分配",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/673f9885-3be1-4769-b417-b675b8ac5099.png",
-								path: "/pages/shop/staff/distribution-service",
-								go_id_type: 1,
-							},
-						],
-					},
-					{
-						type: "lineCard",
-						title: "交易项目",
-
-						list: [{
-								title: "服务管理",
-								path: "/pages/artisan/service-list",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c4a8df11-b4c0-46e3-a72e-7bbb20bbbd6a.png",
-							},
-							{
-								title: "工位管理",
-								path: "/pages/shop/workSpace/list",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d4c59f74-34a5-4e0f-b3be-766342e4d6e9.png",
-							},
-							{
-								title: "购买服务",
-								path: "/pages/shop/buy-service",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/285172ae-9757-472f-b466-73d5cc78d82a.png",
-							},
-							{
-								title: "购买工时",
-								path: "/pages/shop/manHour/buyManHour",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9a13b1d0-3099-4e52-8d43-549f2520c1ca.png",
-							},
-						],
-					},
-					{
-						type: "lineCard",
-						title: "交易订单",
-
-						list: [{
-								title: "用户订单",
-								path: "/pages/shop/userorders",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/1ca76fe3-21fc-408d-a453-4b253e377e46.png",
-							},
-							{
-								title: "工位订单",
-								path: "/pages/shop/workSpace/saleList",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6ebd42c1-09a4-4ed1-8b82-de6db52f6cda.png",
-							},
-							{
-								title: "服务订单",
-								path: "/pages/shop/buy-order",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/65c5d29b-9aa6-4dd0-b766-baa484d1e5fe.png",
-							},
-							{
-								title: "工时订单",
-								path: "/pages/shop/manHour/saleList",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/f4b1628d-9d2e-4de0-90a8-bd2c83dad2af.png",
-							},
-						],
-					},
-					{
-						type: "lineCard",
-						title: "营销中心",
-
-						list: [{
-								title: "拼团管理",
-								path: "/pages/shop/groupBuying/list",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9a93bf6a-4387-460e-afb5-80441e4e7310.png",
-							},
-							{
-								title: "日常推广",
-								path: "/pages/promotion/promotion",
-								go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b7419b23-2241-4b32-98f2-603bb479bcc1.png",
-							},
-						],
-					},
-					{
-						type: "lineCard",
-						title: "平台自营项目",
-						id_type: 1,
-						self_state: true,
-						list: [{
-								text: "自营服务",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b0faf058-e824-4d8b-a4fa-17d3e90b04ec.png",
-								path: "/pages/selfOperated/list",
-							},
-							{
-								text: "自营订单",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b1dc0fc5-13be-4e21-8942-929edd42195b.png",
-								path: "/pages/shop/userorders?serviceType=2",
-							},
-						],
-					},
-					{
-						type: "imagePure",
-						title: "",
-						id_type: 1,
-						self_state: false,
-						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/30b42fe6-21f9-443f-a091-5439d57e3593.png",
-						path: "/pages/selfOperated/agreement?title=平台自营项目介绍&type=18",
-					},
-					{
-						type: "line",
-						title: "我的服务",
-						list: [{
-								text: "联系平台",
-								icon: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/930a458a-9d2a-4543-a39c-399bb5bb5290.png",
-								path: "/pages/contact/contact",
-							},
-							{
-								text: "设置",
-								icon: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0e0676c1-aa2b-4b3f-b9d5-c020c566cc85.png",
-								path: "",
-								type: "setting",
-								isNeedLogin: true,
-							},
-						],
-					},
-				],
-
-				isLogin: false,
-				tipsText: "",
-				tipShow: false,
-				scrollTop: 0,
-				inviteList: [],
-				// 账号停用弹窗控制
-				stopUseModal: false,
-			};
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		computed: {
-			id_type() {
-				return this.userInfo?.id_type || 0;
-			},
-			isBind() {
-				return this.userInfo.bind_count > 0;
-			},
-
-			// 判断是否账号已停止使用
-			isAccountDisabled() {
-				return this.userInfo?.is_ok === 2;
-			},
-
-			currentCardList() {
-				return this.cardList
-					.filter((card) => this.checkShow(card))
-					.map((item) => ({
-						...item,
-						list: item.list?.filter((card) => this.checkShow(card)),
-					}));
-			},
-			backgroundColor() {
-				if (this.scrollTop > 10) {
-					return `rgba(255, 255, 255, ${0.02 * this.scrollTop});`;
-				}
-				return "transparent";
-			},
-		},
-		onLoad() {
-			uni.hideTabBar();
-			const systemInfo = uni.getSystemInfoSync();
-			const statusBarHeight = systemInfo.statusBarHeight;
-			// 导航栏主体高度：iOS一般44px，Android一般48px（可自定义）
-			const navMainHeight = systemInfo.platform === "ios" ? 44 : 48;
-			// 绑定2个CSS变量：状态栏高度、导航栏主体高度
-			this.cssVars = {
-				"--status-bar-height": `${statusBarHeight}px`,
-				"--nav-main-height": `${navMainHeight}px`,
-			};
-		},
-		onShow() {
-			this.isLogin = uni.getStorageSync("accessToken") ? true : false;
-			if (!this.isLogin) {} else {
-				// 获取用户信息
-				this.getUserInfo();
-			}
-		},
-		methods: {
-			// 检查是否允许访问的方法
-			checkAccess(item) {
-				// 如果账号未停止使用，允许访问所有
-				if (!this.isAccountDisabled) {
-					return true;
-				}
-
-				// 账号已停止使用时，只允许特定的路径访问
-				// 允许访问的路径列表
-				const allowedPaths = [
-					"/subPackages/other/contact/contact", // 联系平台
-				];
-
-				const allowedTypes = ["logout"]; // 退出登录
-
-				// 检查是否在允许列表中
-				if (item.type && allowedTypes.includes(item.type)) {
-					return true;
-				}
-
-				if (item.path && allowedPaths.includes(item.path)) {
-					return true;
-				}
-
-				// 其他情况不允许访问
-				this.showStopUseModal();
-				return false;
-			},
-
-			// 显示账号停用提示
-			showStopUseModal() {
-				uni.showModal({
-					title: "提示",
-					content: "您的账号已停止使用。若有疑问或恢复需求，请尽快联系平台工作人员核实处理。",
-					showCancel: false,
-					confirmText: "我知道了",
-				});
-			},
-
-			checkShow(card) {
-				if (card.id_type != undefined && card.id_type != this.id_type) {
-					return false;
-				}
-				if (card.isNeedLogin != undefined) {
-					return this.isLogin;
-				}
-				if (
-					card.self_state != undefined &&
-					(card.self_state ?
-						this.userInfo.self_state != 1 :
-						this.userInfo.self_state == 1)
-				) {
-					return false;
-				}
-				return true;
-			},
-			// 去权益界面
-			goToRights() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				uni.navigateTo({
-					url: "/subPackages/other/agreement/agreement?type=16&title=权益说明",
-				});
-			},
-			goToWallet() {
-				uni.navigateTo({
-					url: "/pages/wallet/wallet",
-				});
-			},
-			saveToast() {
-				setTimeout(() => {
-					uni.showToast({
-						title: "保存成功！",
-						icon: "none",
-					});
-				}, 500);
-			},
-			async getAvatar(e) {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				console.log("getAvatar:", e);
-				const tempFilePath = e.detail.avatarUrl; // 获取临时文件路径
-				try {
-					// 4. 生成唯一文件名（防止OSS文件覆盖，推荐格式：目录/时间戳-随机数.后缀）
-					const filename = `${Date.now()}-${Math.floor(
-          Math.random() * 1000,
-        )}.jpg`;
-
-					// 5. 显示上传中loading（提升用户体验）
-					uni.showLoading({
-						title: "上传中...",
-						mask: true,
-					});
-
-					// 6. 调用后端接口，获取OSS临时上传参数（关键：OSS不允许前端直接传密钥，需后端签名）
-					const ossConfig = await this.getOssUploadConfig(filename);
-					if (!ossConfig) {
-						uni.hideLoading();
-						uni.showToast({
-							title: "获取上传配置失败",
-							icon: "none",
-						});
-						return;
-					}
-
-					// 7. 上传图片到阿里云OSS（使用UniApp uploadFile，适配小程序）
-					await this.uploadToOss(tempFilePath, ossConfig);
-
-					// 8. 上传成功后续操作（如更新页面头像、通知后端更新用户信息）
-					const ossFileUrl = `${ossConfig.host}/${ossConfig.dir}${filename}`; // OSS文件最终URL
-					uni.hideLoading();
-					uni.showToast({
-						title: "头像上传成功",
-					});
-					console.log("OSS图片URL:", ossFileUrl);
-					this.saveProfile(ossFileUrl);
-				} catch (error) {
-					uni.hideLoading();
-					console.error("头像上传异常:", error);
-				}
-			},
-			// 保存资料
-			saveProfile(url) {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				uni.showLoading({
-					title: "保存中...",
-				});
-				let head_photo = url;
-				let {
-					nick_name,
-					sex,
-					dependency
-				} = this.userInfo;
-				request
-					.post("/syr/User/editUser", {
-						nick_name,
-						head_photo,
-						sex,
-						dependency,
-					})
-					.then((res) => {
-						uni.hideLoading();
-						this.userInfo.head_photo = url;
-						uni.showToast({
-							title: "保存成功！",
-							icon: "none",
-						});
-					});
-			},
-			//调用后端接口，获取OSS临时上传参数（关键：OSS不允许前端直接传密钥，需后端签名）
-			async getOssUploadConfig(filename) {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				try {
-					// 调用后端接口，传递文件名（后端需根据filename生成对应的dir和key）
-					const res = await request.post("/user/getalioss", {
-						type: 1, // 后端定义的业务类型（如1=头像）
-						kind: 1, // 后端定义的参数（按实际接口调整）
-						filename: filename, // 告知后端当前要上传的文件名，用于生成OSS的key
-					});
-					return {
-						...res,
-						filename,
-					}; // 格式示例：{ host: "https://xxx.oss-cn-beijing.aliyuncs.com", policy: "...", OSSAccessKeyId: "...", signature: "...", dir: "user/avatar/" }
-				} catch (error) {
-					console.error("获取OSS配置失败:", error);
-					throw error;
-				}
-			},
-			//上传oss
-			async uploadToOss(tempFilePath, ossConfig) {
-				return new Promise((resolve, reject) => {
-					// 构造OSS上传的FormData参数（严格按OSS要求的字段名）
-					const formData = {
-						name: ossConfig.filename, // 文件名（与后端协商的key一致）
-						policy: ossConfig.policy, // OSS临时授权policy
-						OSSAccessKeyId: ossConfig
-						.ossAccessKeyId, // 临时AccessKeyId（注意字段名：后端返回可能是ossAccessKeyId或OSSAccessKeyId，需对齐）
-						signature: ossConfig.signature, // 签名
-						success_action_status: "200", // OSS上传成功后返回200状态码（必须设置）
-						key: ossConfig.dir + ossConfig.filename ||
-							ossConfig.dir + tempFilePath.split("/")
-						.pop(), // OSS存储的完整key（dir + filename，核心字段）
-					};
-
-					// 调用UniApp上传API（小程序推荐用这个，比fetch稳定）
-					uni.uploadFile({
-						url: ossConfig.host, // OSS的Endpoint（如https://xxx.oss-cn-beijing.aliyuncs.com）
-						filePath: tempFilePath, // 小程序临时文件路径
-						name: "file", // OSS要求的文件字段名（固定为"file"，后端需与OSS配置一致）
-						formData: formData, // OSS上传所需的表单参数
-						timeout: 30000, // 超时时间（30秒，防止大文件上传超时）
-						success: (uploadRes) => {
-							// OSS上传成功的判断：statusCode为200且响应体为空（OSS特性）
-							if (uploadRes.statusCode === 200) {
-								resolve();
-							} else {
-								reject(new Error(`OSS上传失败，状态码: ${uploadRes.statusCode}`));
-							}
-						},
-						fail: (err) => {
-							reject(new Error(`上传请求失败: ${err.errMsg}`));
-						},
-					});
-				});
-			},
-			closePopup() {
-				this.tipShow = false;
-				//uni.showTabBar();
-			},
-
-			okBtn() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				if (this.tipType == "tjRuzhu") {
-					getApp().globalData.artisanType = 2;
-					if (this.userInfo.is_ok == 2) {
-						uni.navigateTo({
-							url: "/subPackages/ruzhu/stopuse",
-						});
-						return;
-					}
-					//如果现在身份是推荐官认证中身份是推荐官
-					if (
-						this.userInfo.id_type == 1 &&
-						this.userInfo.auth_info?.id_type == 1
-					) {
-						uni.navigateTo({
-							url: "/subPackages/ruzhu/complete?id_type=1",
-						});
-						return;
-					}
-					if (!this.userInfo.auth_info?.apply_state) {
-						//如果没有认证中信息
-						uni.navigateTo({
-							url: "/subPackages/ruzhu/complete",
-						});
-					} else {
-						//如果认证中信息apply_state状态不同
-						if (this.userInfo.auth_info.apply_state == 1) {
-							uni.navigateTo({
-								url: "/subPackages/ruzhu/submitres?applyState=1",
-							});
-						} else if (this.userInfo.auth_info.apply_state == 2) {
-							uni.navigateTo({
-								url: "/subPackages/ruzhu/submitres?applyState=2",
-							});
-						} else if (this.userInfo.auth_info.apply_state == 3) {
-							uni.navigateTo({
-								url: "/subPackages/ruzhu/submitres?applyState=3",
-							});
-						}
-					}
-				} else if (this.tipType == "login") {
-					uni.navigateTo({
-						url: "/pages/blogPopup/blogPopup",
-					});
-				}
-				// uni.showTabBar();
-			},
-			getUserInfo() {
-				request.post("/sj/user/getUser").then((result) => {
-					this.userInfo = result.data;
-					uni.setStorageSync("syrId", result.data.id);
-				});
-				this.getInviteList();
-			},
-			async goLogin() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				this.tipsText = "您现在还未登录，是否确定登录？";
-				this.tipShow = true;
-				this.tipType = "login";
-				uni.hideTabBar();
-			},
-
-			goToOrderList(type) {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				if (!this.isLogin) {
-					uni.showToast({
-						title: "您暂未登录，无法使用此功能！",
-						icon: "none",
-					});
-					return;
-				}
-			},
-			logout() {
-				uni.showModal({
-					title: "提示",
-					content: "确定要退出登录吗？",
-					success: (res) => {
-						if (res.confirm) {
-							// uni.removeStorageSync('access_token');
-							// uni.removeStorageSync('refresh_token');
-							uni.clearStorageSync();
-							// TODO: 实现退出登录逻辑
-							uni.reLaunch({
-								url: "/pages/home/home",
-							});
-						}
-					},
-				});
-			},
-			async handleFunction(item) {
-				// 如果是退出登录，直接处理，不检查账号状态
-				if (this.isLogin && item.type === "setting") {
-					uni.navigateTo({
-						url: `/pages/settings/index`,
-					});
-					return;
-				}
-
-				// 检查账号状态，如果不允许访问，直接返回
-				if (!this.checkAccess(item)) {
-					return;
-				}
-
-				// if (!this.isLogin) {
-				//   uni.showToast({
-				//     title: "您暂未登录，无法使用此功能！",
-				//     icon: "none",
-				//   });
-				//   return;
-				// }
-
-				if (item.path == "/pages/ruzhu/ruzhu") {
-					request.post("/sj/userSjAuth/details", {
-						type: 1
-					}).then((res) => {
-						if (res.code == 200 && res.data && res.data.apply_state != 2) {
-							uni.navigateTo({
-								url: `/pages/ruzhu/submitres?identity=${res.data.id_type}&applyState=${res.data.apply_state}`,
-							});
-						} else {
-							uni.navigateTo({
-								url: item.path,
-							});
-						}
-					});
-
-					return;
-				}
-				if (item.type) {
-					uni.navigateTo({
-						url: `${item.path}?type=${item.type}`,
-					});
-				} else {
-					if (item.go_id_type == 1 && this.userInfo?.id_type == 0) {
-						uni.showToast({
-							title: `您暂未入驻，无法使用${ item.title }！`,
-							icon: "none",
-						});
-						return;
-					}
-					if(!this.isLogin && item.go_id_type){
-						uni.showToast({
-							title: `您暂未登录，无法使用${ item.title }！`,
-							icon: "none",
-						});
-						return;
-					}
-					uni.navigateTo({
-						url: `${item.path}`,
-					});
-				}
-			},
-			goToProfile() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				if (this.userInfo.id_type == 0) {
-					return;
-				}
-				uni.navigateTo({
-					url: "/pages/artisan/profile",
-				});
-			},
-			goToInviteList() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				if (this.userInfo.id_type == 0) {
-					return;
-				}
-				uni.navigateTo({
-					url: "/subPackages/affiliated/inviteList?type=" + this.id_type,
-				});
-			},
-			getInviteList() {
-				request
-					.post("/syr/sjSyrBind/inviteList", {
-						page: 1,
-						limit: 999
-					})
-					.then((res) => {
-						this.inviteList = res.data.list;
-					});
-			},
-			goTypeSelect() {
-				// 添加访问检查
-				if (this.isAccountDisabled) {
-					this.showStopUseModal();
-					return;
-				}
-				request
-					.post("/syr/userSyrAuth/details", {
-						type: 1,
-						id_type: 1
-					})
-					.then((res) => {
-						if (res.code == 200 && res.data && res.data.apply_state != 2) {
-							uni.navigateTo({
-								url: `/subPackages/ruzhu/submitres?identity=${res.data.id_type}&applyState=${res.data.apply_state}`,
-							});
-						} else {
-							uni.navigateTo({
-								url: "/subPackages/ruzhu/typeSelect?id_type=1",
-							});
-						}
-					});
-			},
-		},
-	};
-</script>
-
-<style lang="less">
-	page {
-		background: #f5f5f5 !important;
-	}
-
-	.my-page {
-		/* min-height: 100vh; */
-		position: relative;
-		padding-bottom: 50rpx;
-		padding-top: var(--status-bar-height);
-		background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/825812de-54b3-486a-a3a0-2c4a1fb9fd28.png");
-		background-position: 0 0;
-		background-size: 100%;
-		background-repeat: no-repeat;
-		padding-bottom: 150rpx;
-	}
-
-	// .my-page::before {
-	//   content: "";
-	//   position: fixed;
-	//   top: 0;
-	//   left: 0;
-	//   right: 0;
-	//   height: 489rpx !important;
-	//   background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/825812de-54b3-486a-a3a0-2c4a1fb9fd28.png");
-	//   background-size: cover;
-	//   background-position: center top;
-	//   background-repeat: no-repeat;
-	//   z-index: -1;
-	// }
-
-	/* 确保内容在背景之上 */
-	.user-section,
-	.order-section,
-	.function-list,
-	.user-stats,
-	.image-list,
-	.imageText-list,
-	.info_section {
-		position: relative;
-		z-index: 99;
-		margin: 0 30rpx;
-	}
-
-	/* 用户信息区域 */
-	.user-section {
-		background-color: transparent;
-		box-sizing: border-box;
-		padding-bottom: 40rpx;
-		padding-top: 26rpx;
-
-		.upgradeBanner {
-			padding-top: 40rpx;
-			width: 690rpx;
-			height: 114rpx;
-			position: relative;
-
-			.upgradeBanner-img {
-				width: 690rpx;
-				height: 114rpx;
-			}
-
-			.upgradeBanner-btn {
-				position: absolute;
-				left: 304rpx;
-				bottom: 20rpx;
-				width: 100rpx;
-				height: 40rpx;
-			}
-		}
-
-		.user-info {
-			display: flex;
-			flex-flow: row nowrap;
-			justify-content: space-between;
-			align-items: center;
-
-			.user-info-left {
-				display: flex;
-				flex-flow: row nowrap;
-				justify-content: flex-start;
-				align-items: center;
-
-				.avatar {
-					width: 124rpx;
-					height: 124rpx;
-					border: 4rpx solid #fff;
-					box-sizing: border-box;
-					border-radius: 64rpx;
-					margin-right: 20rpx;
-					overflow: hidden;
-					position: relative;
-
-					.avatar-img {
-						width: 116rpx;
-						height: 116rpx;
-						border-radius: 64rpx;
-						margin-right: 20rpx;
-					}
-
-					.avatar-button {
-						position: absolute;
-						inset: 0;
-						margin: auto;
-					}
-				}
-
-				.user-detail {
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					align-items: flex-start;
-
-					.nickname {
-						font-weight: 500;
-						font-size: 32rpx;
-						color: #333333;
-						line-height: 45rpx;
-						text-align: left;
-						font-style: normal;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						.nickname-text {
-							max-width: 250rpx;
-							white-space: nowrap;
-							overflow: hidden;
-							text-overflow: ellipsis;
-						}
-
-						.inviteCode {
-							padding: 6rpx;
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #7e4e5b;
-							line-height: 28rpx;
-							text-align: left;
-							font-style: normal;
-							background: rgba(255, 255, 255, 0.3);
-							border-radius: 6rpx;
-							margin-left: 6rpx;
-						}
-					}
-
-					.user-detail-tip {
-						font-weight: 400;
-						font-size: 22rpx;
-						color: #999999;
-						line-height: 30rpx;
-						text-align: left;
-						font-style: normal;
-						margin-top: 12rpx;
-					}
-
-					.user-identity {
-						margin-top: 10rpx;
-						border: 1rpx solid #e8101e;
-						border-radius: 22rpx;
-						width: 112rpx;
-						height: 44rpx;
-						line-height: 44rpx;
-						text-align: center;
-						background-color: rgba(255, 241, 241, 1);
-
-						.identity-text {
-							font-size: 20rpx;
-							color: #e8101e;
-							font-weight: 400;
-						}
-					}
-				}
-			}
-
-			.user-info-right {
-				transform: translateY(14rpx);
-
-				.wallet_content {
-					height: 48rpx;
-					padding: 0rpx 16rpx;
-					display: flex;
-					align-items: center;
-					background: rgba(252, 67, 124, 0.1);
-					border-radius: 24rpx;
-					border: 1rpx solid rgba(232, 16, 30, 0.15);
-				}
-
-				.wallet_content_img {
-					width: 29rpx;
-					height: 29rpx;
-					margin-right: 2rpx;
-				}
-
-				.wallet_content_text {
-					font-family:
-						PingFangSC,
-						PingFang SC;
-					font-weight: 500;
-					font-size: 22rpx;
-					color: #666666;
-					line-height: 30rpx;
-					text-align: left;
-				}
-			}
-		}
-	}
-
-	.authentication {
-		display: flex;
-		margin-top: 20rpx;
-
-		.authentication_content {
-			height: 48rpx;
-			padding: 0rpx 20rpx;
-			display: flex;
-			align-items: center;
-			background: #ffe8e8;
-			border-radius: 24rpx;
-			border: 1rpx solid rgba(232, 16, 30, 0.19);
-
-			.authentication_img {
-				width: 27rpx;
-				height: 29rpx;
-				margin-right: 7rpx;
-			}
-
-			.authentication_text {
-				font-family:
-					PingFangSC,
-					PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				line-height: 37rpx;
-				color: #333333;
-			}
-		}
-	}
-
-	.inviteMessage {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 54rpx;
-		background: linear-gradient(320deg, #ffffff 0%, #ffffff 100%);
-		border-radius: 19rpx;
-		padding-right: 40rpx;
-
-		.inviteMessage_content {
-			height: 80rpx;
-			padding: 0rpx 20rpx;
-			display: flex;
-			align-items: center;
-			border-radius: 24rpx;
-
-			.inviteMessage_img {
-				width: 42rpx;
-				height: 42rpx;
-				margin-right: 20rpx;
-				flex-shrink: 0;
-			}
-
-			.inviteMessage_text {
-				font-family:
-					PingFangSC,
-					PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				line-height: 37rpx;
-				color: #333333;
-			}
-		}
-
-		.btn_img {
-			width: 130rpx;
-			height: 54rpx;
-		}
-	}
-
-	.bottom0 {
-		margin-bottom: 0;
-	}
-
-	.user-stats {
-		border-radius: 20rpx;
-		background-color: #fff;
-		box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.05);
-		display: flex;
-		justify-content: space-around;
-	}
-
-	.stat-item {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.stat-icon {
-		width: 64rpx;
-		height: 64rpx;
-		margin-bottom: 8rpx;
-	}
-
-	.stat-label {
-		font-size: 26rpx;
-		color: #252525;
-		font-weight: 400;
-	}
-
-	.order-card {
-		// background: linear-gradient(180deg, #FBF5F8 0%, #F6F6F6 100%);
-		border-radius: 30rpx 30rpx 0rpx 0rpx;
-		// padding-top: 30rpx;
-		display: flex;
-		flex-direction: column;
-		gap: 20rpx;
-	}
-
-	/* 订单状态区域 */
-	.order-section {
-		background: #ffffff;
-		box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(210, 213, 224, 0.5);
-		border-radius: 24rpx;
-		margin-bottom: 24rpx;
-		padding: 30rpx 20rpx 40rpx 20rpx;
-
-		.order-title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			line-height: 45rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 30rpx;
-		}
-
-		.order-status {
-			display: flex;
-			justify-content: space-between;
-			padding: 0rpx;
-			box-sizing: border-box;
-
-			.status-item {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.status-icon {
-					width: 200rpx;
-					height: 169rpx;
-				}
-			}
-		}
-	}
-
-	/* 功能列表 */
-	.function-list {
-		background: #ffffff;
-		border-radius: 24rpx;
-		padding: 30rpx;
-		padding-bottom: 50rpx;
-
-		.function-title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #252525;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 50rpx;
-		}
-
-		.function-grid {
-			display: flex;
-			flex-direction: column;
-			gap: 63rpx;
-
-			.grid-item {
-				display: flex;
-				align-items: center;
-				position: relative;
-				gap: 21rpx;
-
-				.icon-wrapper {
-					width: 42rpx;
-					height: 42rpx;
-					position: relative;
-					// margin-bottom: 12rpx;
-
-					.grid-icon {
-						width: 42rpx;
-						height: 42rpx;
-					}
-				}
-
-				.grid-text {
-					font-weight: 400;
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 42rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-
-			.grid-item::after {
-				position: absolute;
-				content: "";
-				width: 12rpx;
-				height: 24rpx;
-				right: 0rpx;
-				background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/gray_right_icon.png");
-				background-size: cover;
-			}
-		}
-
-		.lineCard-title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #252525;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 24rpx;
-		}
-
-		.lineCard-grid {
-			display: flex;
-			justify-content: space-between;
-			flex-wrap: wrap;
-			gap: 20rpx 0;
-
-			image {
-				width: 310rpx;
-				height: 120rpx;
-			}
-		}
-	}
-
-	/* 功能列表 */
-	.image-list {
-		background: #ffffff;
-		border-radius: 24rpx;
-		padding: 30rpx 20rpx;
-
-		.image-title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #252525;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 20rpx;
-		}
-
-		image {
-			width: 100%;
-			height: 148rpx;
-		}
-	}
-
-	.imageText-list {
-		background: #ffffff;
-		border-radius: 24rpx;
-		padding: 29rpx 27rpx 40rpx;
-
-		.imageText-title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #252525;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 11rpx;
-		}
-
-		.imageText-content {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			image {
-				width: 245rpx;
-				height: 171rpx;
-			}
-
-			.text-status {
-				font-family:
-					PingFangSC,
-					PingFang SC;
-				font-weight: 500;
-				font-size: 30rpx;
-				color: #000000;
-				margin-top: 20rpx;
-				margin-bottom: 22rpx;
-			}
-
-			.text-next {
-				font-family:
-					PingFangSC,
-					PingFang SC;
-				font-weight: 400;
-				font-size: 26rpx;
-				line-height: 37rpx;
-				color: #666666;
-				text-align: center;
-			}
-		}
-	}
-
-	.my-page::before {
-		height: 420rpx;
-	}
-
-	button {
-		background: transparent !important;
-		border: none !important;
-		border-radius: 0 !important;
-		padding: 0 !important;
-		min-width: auto !important;
-		height: auto !important;
-		line-height: normal !important;
-		color: inherit !important;
-		-webkit-tap-highlight-color: transparent !important;
-	}
-
-	button::after {
-		border: none !important;
-	}
-
-
-	.info_section {
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 20rpx;
-
-		.info_section_item {
-			width: 336rpx;
-			height: 193rpx;
-			background-size: cover;
-			background-position: center;
-			box-sizing: border-box;
-			display: flex;
-			flex-direction: column;
-			padding: 23rpx 26rpx 20rpx 26rpx;
-
-			.info_section_item_header {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding-bottom: 16rpx;
-				border-bottom: 2rpx solid rgba(210, 213, 224, 0.15);
-
-				.info_section_item_header_left {
-					display: flex;
-					align-items: center;
-					gap: 11rpx;
-				}
-
-				.info_section_item_img {
-					width: 35rpx;
-					height: 38rpx;
-				}
-
-				.info_section_item_label {
-					font-weight: 500;
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 38rpx;
-					text-align: left;
-					font-style: normal;
-				}
-
-				.info_section_item_header_right {
-					image {
-						width: 10rpx;
-						height: 20rpx;
-					}
-				}
-			}
-
-			.info_section_item_subtitle {
-				font-size: 22rpx;
-				color: #999999;
-				line-height: 30rpx;
-				margin-top: 12rpx;
-				margin-bottom: 6rpx;
-			}
-
-			.info_section_item_content {
-				display: flex;
-				align-items: baseline;
-				font-family: DINPro, DINPro;
-				font-weight: 500;
-				font-size: 36rpx;
-				color: #333333;
-
-				.info_section_item_content_unit {
-					font-family:
-						PingFangSC,
-						PingFang SC;
-					font-weight: 500;
-					font-size: 20rpx;
-					color: #333333;
-					margin-left: 3rpx;
-				}
-			}
-		}
-	}
-
-	.user_detail_tip {
-		display: flex;
-		align-items: center;
-		gap: 12rpx;
-		margin-top: 10rpx;
-
-		.user_detail_tip_phone {
-			max-width: 230rpx;
-			height: 36rpx;
-			line-height: 36rpx;
-			border-radius: 6rpx;
-			font-size: 24rpx;
-			color: #666666;
-			box-sizing: border-box;
-			display: flex;
-			align-items: center;
-			gap: 7rpx;
-
-			image {
-				width: 8rpx;
-				height: 14rpx;
-			}
-		}
-
-		.user_detail_tip_invite_name {
-			max-width: 246rpx;
-			font-size: 22rpx;
-		}
-	}
-
-	.imagePure {
-		width: 690rpx;
-		margin: 0 auto;
-
-		image {
-			width: 100%;
-		}
-	}
+<template>
+	<view class="my-page">
+		<!-- 顶部导航栏 -->
+		<!-- <custom-navbar
+      title="我的"
+      :show-back="false"
+      title-color="#333333"
+      :backgroundColor="backgroundColor"
+    ></custom-navbar> -->
+
+		<!-- 用户信息区域 -->
+		<view class="user-section" v-if="isLogin">
+			<view class="user-info">
+				<view class="user-info-left">
+					<view class="avatar">
+						<image :src="!userInfo.head_photo ? baseAvartar : userInfo.head_photo" mode="aspectFill"
+							class="avatar-img"></image>
+						<button class="avatar-button"></button>
+						<!-- open-type="chooseAvatar" -->
+						<!-- @chooseavatar="getAvatar" -->
+					</view>
+
+					<view class="user-detail" @click="goToProfile">
+						<view class="nickname">
+							<text class="nickname-text">{{
+								userInfo.name || userInfo.nick_name || ""
+							}}</text>
+						</view>
+						<view class="user_detail_tip">
+							<view class="user_detail_tip_phone" v-if="id_type !== 0">
+								资料编辑
+								<image mode="aspectFill"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6a4b7bc9-174a-471a-9bf5-6ba167005960" />
+							</view>
+							<view v-else class="user_detail_tip_phone" style="color: #999999">美融融小程序欢迎您</view>
+						</view>
+					</view>
+				</view>
+				<view class="user-info-right" @click="goToWallet">
+					<view class="wallet_content">
+						<image
+							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/931c0992-5243-4c70-ab2b-b99b430661c8.png"
+							mode="aspectFill" class="wallet_content_img"></image>
+						<view class="wallet_content_text">钱包余额：<text style="color: #e8101e">{{ userInfo.money }}元</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="authentication" v-if="id_type == 2 && !isBind">
+				<view @click="goTypeSelect" class="authentication_content">
+					<image mode="aspectFill" class="authentication_img"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ed8bc685-33bd-48cf-8058-85b07b9be0dc.png" />
+					<view class="authentication_text">申请成为平台商家</view>
+				</view>
+			</view>
+			<view class="inviteMessage" v-if="inviteList.length > 0">
+				<view class="inviteMessage_content">
+					<image mode="widthFix" class="inviteMessage_img"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9d15ac-ece5-4481-ae30-62f76ace032f.png" />
+					<view class="inviteMessage_text">您有{{ inviteList.length }}条商家邀请</view>
+				</view>
+				<image @click="goToInviteList" mode="aspectFill" class="btn_img"
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/defe90dd-3e35-4582-ad45-b36f68681bcc.png" />
+			</view>
+		</view>
+		<!-- 用户相关信息 -->
+		<view class="user-section" v-else>
+			<view class="user-info">
+				<view class="user-info-left" @click="goLogin">
+					<image
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b48d973-d219-4cac-b206-675c192d0cff"
+						mode="aspectFill" class="avatar"></image>
+					<view class="user-detail">
+						<text class="nickname"> 请点击登录 </text>
+						<text class="user-detail-tip">美融融商家欢迎您</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="order-card">
+			<template v-for="card in currentCardList">
+				<view class="function-list" v-if="card.type == 'line'">
+					<view class="function-title">{{ card.title }}</view>
+					<view class="function-grid">
+						<view class="grid-item" v-for="(item, index) in card.list" :key="index"
+							@click="handleFunction(item)">
+							<view class="icon-wrapper">
+								<image :src="item.icon" class="grid-icon" mode="widthFix"></image>
+							</view>
+							<text class="grid-text">{{ item.text }}</text>
+						</view>
+					</view>
+				</view>
+				<view class="function-list" style="padding: 24rpx; padding-bottom: 28rpx"
+					v-if="card.type == 'lineCard'">
+					<view class="lineCard-title">{{ card.title }}</view>
+					<view class="lineCard-grid">
+						<image v-for="(item, index) in card.list" :src="item.url" mode="widthFix"
+							@click="handleFunction(item)"></image>
+					</view>
+				</view>
+				<view class="imagePure" v-if="card.type == 'imagePure'">
+					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
+				</view>
+				<view class="image-list" v-if="card.type == 'image'">
+					<view class="image-title">{{ card.title }}</view>
+					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
+				</view>
+				<view class="listcard-list" v-if="card.type == 'listcard'">
+					<view class="function-title">{{ card.title }}</view>
+					<view class="listcard-item" v-for="(item, index) in card.list" :key="index">
+						<image @click="handleFunction(item)" :src="item.url" mode="widthFix"></image>
+						<view class="listcard-title">{{ item.title }}</view>
+						<view class="listcard-text">{{ item.text }}</view>
+					</view>
+				</view>
+				<view class="imageText-list" v-if="card.type == 'imageText'">
+					<view class="lineCard-title">{{ card.title }}</view>
+					<view class="imageText-content">
+						<image :src="card.url" mode="widthFix"></image>
+						<view class="text-status">入驻成功啦！</view>
+						<view class="text-next">下一步:等待<text style="color: #e8101e">专属门店商家邀约绑定</text>，解锁订单资源与服</view>
+						<view class="text-next">务通道，开启高效变现、共创共赢的新旅程～</view>
+					</view>
+				</view>
+			</template>
+		</view>
+
+		<tipsPopup2 :show="tipShow" @closePopup="closePopup" sureText="确认" @okBtn="okBtn">
+			{{ tipsText }}
+		</tipsPopup2>
+		<TabBar :selected="2"></TabBar>
+	</view>
+</template>
+
+<script>
+import TabBar from "@/components/tabbar/tabbar.vue"
+import tipsPopup2 from "@/components/tips-popup/tips-popup2";
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+import request from "@/utils/request";
+export default {
+	components: {
+		CustomNavbar,
+		tipsPopup2,
+		TabBar
+	},
+	data() {
+		return {
+			tipType: "", //提示弹窗类型
+			userInfo: {},
+			baseAvartar: "https://app.mrrweb.com.cn" + "/public/images/headanimal.png",
+			cardList: [{
+				type: "image",
+				title: "基础功能",
+				id_type: 0,
+				url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/aa9fa8d6-8d85-4dce-875a-e71e02595198.png",
+				path: "/pages/ruzhu/ruzhu",
+			},
+			{
+				type: "lineCard",
+				title: "管理中心",
+
+				list: [{
+					title: "员工管理",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9d847e84-e4ca-44c0-b9fb-e33803a67457.png",
+					path: "/pages/shop/staff/manage",
+					go_id_type: 1,
+				},
+				{
+					title: "服务分配",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d27ea76-2a81-4374-8033-5eef76598f9c.png",
+					path: "/pages/shop/staff/distribution-service",
+					go_id_type: 1,
+				},
+				{
+					title: "店铺装修",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png",
+					// https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png
+					path: "/pages/shop/staff/distribution-service",
+					go_id_type: 1,
+				},
+				{
+					title: "财务管理",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/edafae37-8258-4e1c-9dcc-019484117047.png",
+					path: "/pages/shop/staff/distribution-service",
+					go_id_type: 1,
+				},
+				],
+			},
+			{
+				type: "lineCard",
+				title: "交易项目",
+
+				list: [{
+					title: "服务管理",
+					path: "/pages/artisan/service-list",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0076bdee-f1c6-412d-9f05-187189a855a6.png",
+				},
+				{
+					title: "工位管理",
+					path: "/pages/shop/workSpace/list",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6568df0b-e646-4593-804b-a21ed0b35ede.png",
+				},
+				{
+					title: "购买服务",
+					path: "/pages/shop/buy-service",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6c9aa5ea-63aa-4a86-8858-cb58d303114f.png",
+				},
+				{
+					title: "购买工时",
+					path: "/pages/shop/manHour/buyManHour",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c40cddcb-6a43-4355-b25d-ab3e53e17982.png",
+				},
+				],
+			},
+			{
+				type: "lineCard",
+				title: "交易订单",
+
+				list: [{
+					title: "用户订单",
+					path: "/pages/shop/userorders",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b94e033c-836b-404c-85e9-9a7ba7680919.png",
+				},
+				{
+					title: "工位订单",
+					path: "/pages/shop/workSpace/saleList",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b5ede46f-71f9-4718-87a8-3aa4ba99c490.png",
+				},
+				{
+					title: "服务订单",
+					path: "/pages/shop/buy-order",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/673f1dac-1693-4f0a-aec4-c196aa72382b.png",
+				},
+				{
+					title: "购买工时",
+					path: "/pages/shop/manHour/saleList",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/72520b2a-804c-4987-84ca-25e5247e65a2.png",
+				},
+				],
+			},
+			{
+				type: "lineCard",
+				title: "营销中心",
+
+				list: [{
+					title: "拼团管理",
+					path: "/pages/shop/groupBuying/list",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/569c2ba5-2f39-4a3f-b36d-026c480d8203.png",
+				},
+				{
+					title: "日常推广",
+					path: "/pages/promotion/promotion",
+					go_id_type: 1,
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/90d92ff7-4110-4ebd-8207-e6370699a1b6.png",
+				},
+				],
+			},
+			{
+				type: "lineCard",
+				title: "平台自营项目",
+				id_type: 1,
+				self_state: true,
+				list: [{
+					text: "自营服务",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa0c9545-91f4-4a73-b5fe-fa1217aa768e.png",
+					path: "/pages/selfOperated/list",
+				},
+				{
+					text: "自营订单",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfeff761-7448-4f31-a4e9-ee12b088d6a8.png",
+					path: "/pages/shop/userorders?serviceType=2",
+				},
+				],
+			},
+			{
+				type: "imagePure",
+				title: "",
+				id_type: 1,
+				self_state: false,
+				url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/30b42fe6-21f9-443f-a091-5439d57e3593.png",
+				path: "/pages/selfOperated/agreement?title=平台自营项目介绍&type=18",
+			},
+			{
+				type: "listcard",
+				title: "我的服务",
+				list: [
+					{
+						text: "我的收藏",
+						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/83fa7f51-dda3-494b-a50e-f15f8fdcdb9c.png",
+						path: "/pages/my/myFavorite",
+					},
+					{
+						text: "设置",
+						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d1173680-386b-4db3-a74c-64108da6cec9.png",
+						path: "/pages/settings/index",
+					},
+					{
+						text: "联系客服",
+						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bbac7f8-940a-414a-be0b-e6faf5215f63.png",
+						path: "/pages/contact/contact",
+					},
+				],
+			},
+			],
+
+			isLogin: false,
+			tipsText: "",
+			tipShow: false,
+			scrollTop: 0,
+			inviteList: [],
+			// 账号停用弹窗控制
+			stopUseModal: false,
+		};
+	},
+	onPageScroll(e) {
+		this.scrollTop = e.scrollTop;
+	},
+	computed: {
+		id_type() {
+			return this.userInfo?.id_type || 0;
+		},
+		isBind() {
+			return this.userInfo.bind_count > 0;
+		},
+
+		// 判断是否账号已停止使用
+		isAccountDisabled() {
+			return this.userInfo?.is_ok === 2;
+		},
+
+		currentCardList() {
+			return this.cardList
+				.filter((card) => this.checkShow(card))
+				.map((item) => ({
+					...item,
+					list: item.list?.filter((card) => this.checkShow(card)),
+				}));
+		},
+		backgroundColor() {
+			if (this.scrollTop > 10) {
+				return `rgba(255, 255, 255, ${0.02 * this.scrollTop});`;
+			}
+			return "transparent";
+		},
+	},
+	onLoad() {
+		uni.hideTabBar();
+		const systemInfo = uni.getSystemInfoSync();
+		const statusBarHeight = systemInfo.statusBarHeight;
+		// 导航栏主体高度：iOS一般44px，Android一般48px（可自定义）
+		const navMainHeight = systemInfo.platform === "ios" ? 44 : 48;
+		// 绑定2个CSS变量：状态栏高度、导航栏主体高度
+		this.cssVars = {
+			"--status-bar-height": `${statusBarHeight}px`,
+			"--nav-main-height": `${navMainHeight}px`,
+		};
+	},
+	onShow() {
+		this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+		if (!this.isLogin) { } else {
+			// 获取用户信息
+			this.getUserInfo();
+		}
+	},
+	methods: {
+		// 检查是否允许访问的方法
+		checkAccess(item) {
+			// 如果账号未停止使用，允许访问所有
+			if (!this.isAccountDisabled) {
+				return true;
+			}
+
+			// 账号已停止使用时，只允许特定的路径访问
+			// 允许访问的路径列表
+			const allowedPaths = [
+				"/subPackages/other/contact/contact", // 联系平台
+			];
+
+			const allowedTypes = ["logout"]; // 退出登录
+
+			// 检查是否在允许列表中
+			if (item.type && allowedTypes.includes(item.type)) {
+				return true;
+			}
+
+			if (item.path && allowedPaths.includes(item.path)) {
+				return true;
+			}
+
+			// 其他情况不允许访问
+			this.showStopUseModal();
+			return false;
+		},
+
+		// 显示账号停用提示
+		showStopUseModal() {
+			uni.showModal({
+				title: "提示",
+				content: "您的账号已停止使用。若有疑问或恢复需求，请尽快联系平台工作人员核实处理。",
+				showCancel: false,
+				confirmText: "我知道了",
+			});
+		},
+
+		checkShow(card) {
+			if (card.id_type != undefined && card.id_type != this.id_type) {
+				return false;
+			}
+			if (card.isNeedLogin != undefined) {
+				return this.isLogin;
+			}
+			if (
+				card.self_state != undefined &&
+				(card.self_state ?
+					this.userInfo.self_state != 1 :
+					this.userInfo.self_state == 1)
+			) {
+				return false;
+			}
+			return true;
+		},
+		// 去权益界面
+		goToRights() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			uni.navigateTo({
+				url: "/subPackages/other/agreement/agreement?type=16&title=权益说明",
+			});
+		},
+		goToWallet() {
+			uni.navigateTo({
+				url: "/pages/wallet/wallet",
+			});
+		},
+		saveToast() {
+			setTimeout(() => {
+				uni.showToast({
+					title: "保存成功！",
+					icon: "none",
+				});
+			}, 500);
+		},
+		async getAvatar(e) {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			console.log("getAvatar:", e);
+			const tempFilePath = e.detail.avatarUrl; // 获取临时文件路径
+			try {
+				// 4. 生成唯一文件名（防止OSS文件覆盖，推荐格式：目录/时间戳-随机数.后缀）
+				const filename = `${Date.now()}-${Math.floor(
+					Math.random() * 1000,
+				)}.jpg`;
+
+				// 5. 显示上传中loading（提升用户体验）
+				uni.showLoading({
+					title: "上传中...",
+					mask: true,
+				});
+
+				// 6. 调用后端接口，获取OSS临时上传参数（关键：OSS不允许前端直接传密钥，需后端签名）
+				const ossConfig = await this.getOssUploadConfig(filename);
+				if (!ossConfig) {
+					uni.hideLoading();
+					uni.showToast({
+						title: "获取上传配置失败",
+						icon: "none",
+					});
+					return;
+				}
+
+				// 7. 上传图片到阿里云OSS（使用UniApp uploadFile，适配小程序）
+				await this.uploadToOss(tempFilePath, ossConfig);
+
+				// 8. 上传成功后续操作（如更新页面头像、通知后端更新用户信息）
+				const ossFileUrl = `${ossConfig.host}/${ossConfig.dir}${filename}`; // OSS文件最终URL
+				uni.hideLoading();
+				uni.showToast({
+					title: "头像上传成功",
+				});
+				console.log("OSS图片URL:", ossFileUrl);
+				this.saveProfile(ossFileUrl);
+			} catch (error) {
+				uni.hideLoading();
+				console.error("头像上传异常:", error);
+			}
+		},
+		// 保存资料
+		saveProfile(url) {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			uni.showLoading({
+				title: "保存中...",
+			});
+			let head_photo = url;
+			let {
+				nick_name,
+				sex,
+				dependency
+			} = this.userInfo;
+			request
+				.post("/syr/User/editUser", {
+					nick_name,
+					head_photo,
+					sex,
+					dependency,
+				})
+				.then((res) => {
+					uni.hideLoading();
+					this.userInfo.head_photo = url;
+					uni.showToast({
+						title: "保存成功！",
+						icon: "none",
+					});
+				});
+		},
+		//调用后端接口，获取OSS临时上传参数（关键：OSS不允许前端直接传密钥，需后端签名）
+		async getOssUploadConfig(filename) {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			try {
+				// 调用后端接口，传递文件名（后端需根据filename生成对应的dir和key）
+				const res = await request.post("/user/getalioss", {
+					type: 1, // 后端定义的业务类型（如1=头像）
+					kind: 1, // 后端定义的参数（按实际接口调整）
+					filename: filename, // 告知后端当前要上传的文件名，用于生成OSS的key
+				});
+				return {
+					...res,
+					filename,
+				}; // 格式示例：{ host: "https://xxx.oss-cn-beijing.aliyuncs.com", policy: "...", OSSAccessKeyId: "...", signature: "...", dir: "user/avatar/" }
+			} catch (error) {
+				console.error("获取OSS配置失败:", error);
+				throw error;
+			}
+		},
+		//上传oss
+		async uploadToOss(tempFilePath, ossConfig) {
+			return new Promise((resolve, reject) => {
+				// 构造OSS上传的FormData参数（严格按OSS要求的字段名）
+				const formData = {
+					name: ossConfig.filename, // 文件名（与后端协商的key一致）
+					policy: ossConfig.policy, // OSS临时授权policy
+					OSSAccessKeyId: ossConfig
+						.ossAccessKeyId, // 临时AccessKeyId（注意字段名：后端返回可能是ossAccessKeyId或OSSAccessKeyId，需对齐）
+					signature: ossConfig.signature, // 签名
+					success_action_status: "200", // OSS上传成功后返回200状态码（必须设置）
+					key: ossConfig.dir + ossConfig.filename ||
+						ossConfig.dir + tempFilePath.split("/")
+							.pop(), // OSS存储的完整key（dir + filename，核心字段）
+				};
+
+				// 调用UniApp上传API（小程序推荐用这个，比fetch稳定）
+				uni.uploadFile({
+					url: ossConfig.host, // OSS的Endpoint（如https://xxx.oss-cn-beijing.aliyuncs.com）
+					filePath: tempFilePath, // 小程序临时文件路径
+					name: "file", // OSS要求的文件字段名（固定为"file"，后端需与OSS配置一致）
+					formData: formData, // OSS上传所需的表单参数
+					timeout: 30000, // 超时时间（30秒，防止大文件上传超时）
+					success: (uploadRes) => {
+						// OSS上传成功的判断：statusCode为200且响应体为空（OSS特性）
+						if (uploadRes.statusCode === 200) {
+							resolve();
+						} else {
+							reject(new Error(`OSS上传失败，状态码: ${uploadRes.statusCode}`));
+						}
+					},
+					fail: (err) => {
+						reject(new Error(`上传请求失败: ${err.errMsg}`));
+					},
+				});
+			});
+		},
+		closePopup() {
+			this.tipShow = false;
+			//uni.showTabBar();
+		},
+
+		okBtn() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			if (this.tipType == "tjRuzhu") {
+				getApp().globalData.artisanType = 2;
+				if (this.userInfo.is_ok == 2) {
+					uni.navigateTo({
+						url: "/subPackages/ruzhu/stopuse",
+					});
+					return;
+				}
+				//如果现在身份是推荐官认证中身份是推荐官
+				if (
+					this.userInfo.id_type == 1 &&
+					this.userInfo.auth_info?.id_type == 1
+				) {
+					uni.navigateTo({
+						url: "/subPackages/ruzhu/complete?id_type=1",
+					});
+					return;
+				}
+				if (!this.userInfo.auth_info?.apply_state) {
+					//如果没有认证中信息
+					uni.navigateTo({
+						url: "/subPackages/ruzhu/complete",
+					});
+				} else {
+					//如果认证中信息apply_state状态不同
+					if (this.userInfo.auth_info.apply_state == 1) {
+						uni.navigateTo({
+							url: "/subPackages/ruzhu/submitres?applyState=1",
+						});
+					} else if (this.userInfo.auth_info.apply_state == 2) {
+						uni.navigateTo({
+							url: "/subPackages/ruzhu/submitres?applyState=2",
+						});
+					} else if (this.userInfo.auth_info.apply_state == 3) {
+						uni.navigateTo({
+							url: "/subPackages/ruzhu/submitres?applyState=3",
+						});
+					}
+				}
+			} else if (this.tipType == "login") {
+				uni.navigateTo({
+					url: "/pages/blogPopup/blogPopup",
+				});
+			}
+			// uni.showTabBar();
+		},
+		getUserInfo() {
+			request.post("/sj/user/getUser").then((result) => {
+				this.userInfo = result.data;
+				uni.setStorageSync("syrId", result.data.id);
+			});
+			this.getInviteList();
+		},
+		async goLogin() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			this.tipsText = "您现在还未登录，是否确定登录？";
+			this.tipShow = true;
+			this.tipType = "login";
+			uni.hideTabBar();
+		},
+
+		goToOrderList(type) {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			if (!this.isLogin) {
+				uni.showToast({
+					title: "您暂未登录，无法使用此功能！",
+					icon: "none",
+				});
+				return;
+			}
+		},
+		logout() {
+			uni.showModal({
+				title: "提示",
+				content: "确定要退出登录吗？",
+				success: (res) => {
+					if (res.confirm) {
+						// uni.removeStorageSync('access_token');
+						// uni.removeStorageSync('refresh_token');
+						uni.clearStorageSync();
+						// TODO: 实现退出登录逻辑
+						uni.reLaunch({
+							url: "/pages/home/home",
+						});
+					}
+				},
+			});
+		},
+		async handleFunction(item) {
+			// 如果是退出登录，直接处理，不检查账号状态
+			if (this.isLogin && item.type === "setting") {
+				uni.navigateTo({
+					url: `/pages/settings/index`,
+				});
+				return;
+			}
+
+			// 检查账号状态，如果不允许访问，直接返回
+			if (!this.checkAccess(item)) {
+				return;
+			}
+
+			// if (!this.isLogin) {
+			//   uni.showToast({
+			//     title: "您暂未登录，无法使用此功能！",
+			//     icon: "none",
+			//   });
+			//   return;
+			// }
+
+			if (item.path == "/pages/ruzhu/ruzhu") {
+				request.post("/sj/userSjAuth/details", {
+					type: 1
+				}).then((res) => {
+					if (res.code == 200 && res.data && res.data.apply_state != 2) {
+						uni.navigateTo({
+							url: `/pages/ruzhu/submitres?identity=${res.data.id_type}&applyState=${res.data.apply_state}`,
+						});
+					} else {
+						uni.navigateTo({
+							url: item.path,
+						});
+					}
+				});
+
+				return;
+			}
+			if (item.type) {
+				uni.navigateTo({
+					url: `${item.path}?type=${item.type}`,
+				});
+			} else {
+				if (item.go_id_type == 1 && this.userInfo?.id_type == 0) {
+					uni.showToast({
+						title: `您暂未入驻，无法使用${item.title}！`,
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.isLogin && item.go_id_type) {
+					uni.showToast({
+						title: `您暂未登录，无法使用${item.title}！`,
+						icon: "none",
+					});
+					return;
+				}
+				uni.navigateTo({
+					url: `${item.path}`,
+				});
+			}
+		},
+		goToProfile() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			if (this.userInfo.id_type == 0) {
+				return;
+			}
+			uni.navigateTo({
+				url: "/pages/artisan/profile",
+			});
+		},
+		goToInviteList() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			if (this.userInfo.id_type == 0) {
+				return;
+			}
+			uni.navigateTo({
+				url: "/subPackages/affiliated/inviteList?type=" + this.id_type,
+			});
+		},
+		getInviteList() {
+			request
+				.post("/syr/sjSyrBind/inviteList", {
+					page: 1,
+					limit: 999
+				})
+				.then((res) => {
+					this.inviteList = res.data.list;
+				});
+		},
+		goTypeSelect() {
+			// 添加访问检查
+			if (this.isAccountDisabled) {
+				this.showStopUseModal();
+				return;
+			}
+			request
+				.post("/syr/userSyrAuth/details", {
+					type: 1,
+					id_type: 1
+				})
+				.then((res) => {
+					if (res.code == 200 && res.data && res.data.apply_state != 2) {
+						uni.navigateTo({
+							url: `/subPackages/ruzhu/submitres?identity=${res.data.id_type}&applyState=${res.data.apply_state}`,
+						});
+					} else {
+						uni.navigateTo({
+							url: "/subPackages/ruzhu/typeSelect?id_type=1",
+						});
+					}
+				});
+		},
+	},
+};
+</script>
+
+<style lang="less">
+page {
+	background: #f5f5f5 !important;
+}
+
+.my-page {
+	/* min-height: 100vh; */
+	position: relative;
+	padding-bottom: 50rpx;
+	padding-top: var(--status-bar-height);
+	background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/825812de-54b3-486a-a3a0-2c4a1fb9fd28.png");
+	background-position: 0 0;
+	background-size: 100%;
+	background-repeat: no-repeat;
+	padding-bottom: 150rpx;
+}
+
+// .my-page::before {
+//   content: "";
+//   position: fixed;
+//   top: 0;
+//   left: 0;
+//   right: 0;
+//   height: 489rpx !important;
+//   background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/825812de-54b3-486a-a3a0-2c4a1fb9fd28.png");
+//   background-size: cover;
+//   background-position: center top;
+//   background-repeat: no-repeat;
+//   z-index: -1;
+// }
+
+/* 确保内容在背景之上 */
+.user-section,
+.order-section,
+.function-list,
+.user-stats,
+.image-list,
+.imageText-list,
+.info_section {
+	position: relative;
+	z-index: 99;
+	margin: 0 30rpx;
+}
+
+/* 用户信息区域 */
+.user-section {
+	background-color: transparent;
+	box-sizing: border-box;
+	padding-bottom: 40rpx;
+	padding-top: 26rpx;
+
+	.upgradeBanner {
+		padding-top: 40rpx;
+		width: 690rpx;
+		height: 114rpx;
+		position: relative;
+
+		.upgradeBanner-img {
+			width: 690rpx;
+			height: 114rpx;
+		}
+
+		.upgradeBanner-btn {
+			position: absolute;
+			left: 304rpx;
+			bottom: 20rpx;
+			width: 100rpx;
+			height: 40rpx;
+		}
+	}
+
+	.user-info {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: space-between;
+		align-items: center;
+
+		.user-info-left {
+			display: flex;
+			flex-flow: row nowrap;
+			justify-content: flex-start;
+			align-items: center;
+
+			.avatar {
+				width: 124rpx;
+				height: 124rpx;
+				border: 4rpx solid #fff;
+				box-sizing: border-box;
+				border-radius: 64rpx;
+				margin-right: 20rpx;
+				overflow: hidden;
+				position: relative;
+
+				.avatar-img {
+					width: 116rpx;
+					height: 116rpx;
+					border-radius: 64rpx;
+					margin-right: 20rpx;
+				}
+
+				.avatar-button {
+					position: absolute;
+					inset: 0;
+					margin: auto;
+				}
+			}
+
+			.user-detail {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: flex-start;
+
+				.nickname {
+					font-weight: 500;
+					font-size: 32rpx;
+					color: #333333;
+					line-height: 45rpx;
+					text-align: left;
+					font-style: normal;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.nickname-text {
+						max-width: 250rpx;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+
+					.inviteCode {
+						padding: 6rpx;
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #7e4e5b;
+						line-height: 28rpx;
+						text-align: left;
+						font-style: normal;
+						background: rgba(255, 255, 255, 0.3);
+						border-radius: 6rpx;
+						margin-left: 6rpx;
+					}
+				}
+
+				.user-detail-tip {
+					font-weight: 400;
+					font-size: 22rpx;
+					color: #999999;
+					line-height: 30rpx;
+					text-align: left;
+					font-style: normal;
+					margin-top: 12rpx;
+				}
+
+				.user-identity {
+					margin-top: 10rpx;
+					border: 1rpx solid #e8101e;
+					border-radius: 22rpx;
+					width: 112rpx;
+					height: 44rpx;
+					line-height: 44rpx;
+					text-align: center;
+					background-color: rgba(255, 241, 241, 1);
+
+					.identity-text {
+						font-size: 20rpx;
+						color: #e8101e;
+						font-weight: 400;
+					}
+				}
+			}
+		}
+
+		.user-info-right {
+			transform: translateY(14rpx);
+
+			.wallet_content {
+				height: 48rpx;
+				padding: 0rpx 16rpx;
+				display: flex;
+				align-items: center;
+				background: rgba(252, 67, 124, 0.1);
+				border-radius: 24rpx;
+				border: 1rpx solid rgba(232, 16, 30, 0.15);
+			}
+
+			.wallet_content_img {
+				width: 29rpx;
+				height: 29rpx;
+				margin-right: 2rpx;
+			}
+
+			.wallet_content_text {
+				font-family:
+					PingFangSC,
+					PingFang SC;
+				font-weight: 500;
+				font-size: 22rpx;
+				color: #666666;
+				line-height: 30rpx;
+				text-align: left;
+			}
+		}
+	}
+}
+
+.authentication {
+	display: flex;
+	margin-top: 20rpx;
+
+	.authentication_content {
+		height: 48rpx;
+		padding: 0rpx 20rpx;
+		display: flex;
+		align-items: center;
+		background: #ffe8e8;
+		border-radius: 24rpx;
+		border: 1rpx solid rgba(232, 16, 30, 0.19);
+
+		.authentication_img {
+			width: 27rpx;
+			height: 29rpx;
+			margin-right: 7rpx;
+		}
+
+		.authentication_text {
+			font-family:
+				PingFangSC,
+				PingFang SC;
+			font-weight: 500;
+			font-size: 26rpx;
+			line-height: 37rpx;
+			color: #333333;
+		}
+	}
+}
+
+.inviteMessage {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: 54rpx;
+	background: linear-gradient(320deg, #ffffff 0%, #ffffff 100%);
+	border-radius: 19rpx;
+	padding-right: 40rpx;
+
+	.inviteMessage_content {
+		height: 80rpx;
+		padding: 0rpx 20rpx;
+		display: flex;
+		align-items: center;
+		border-radius: 24rpx;
+
+		.inviteMessage_img {
+			width: 42rpx;
+			height: 42rpx;
+			margin-right: 20rpx;
+			flex-shrink: 0;
+		}
+
+		.inviteMessage_text {
+			font-family:
+				PingFangSC,
+				PingFang SC;
+			font-weight: 500;
+			font-size: 26rpx;
+			line-height: 37rpx;
+			color: #333333;
+		}
+	}
+
+	.btn_img {
+		width: 130rpx;
+		height: 54rpx;
+	}
+}
+
+.bottom0 {
+	margin-bottom: 0;
+}
+
+.user-stats {
+	border-radius: 20rpx;
+	background-color: #fff;
+	box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.05);
+	display: flex;
+	justify-content: space-around;
+}
+
+.stat-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.stat-icon {
+	width: 64rpx;
+	height: 64rpx;
+	margin-bottom: 8rpx;
+}
+
+.stat-label {
+	font-size: 26rpx;
+	color: #252525;
+	font-weight: 400;
+}
+
+.order-card {
+	// background: linear-gradient(180deg, #FBF5F8 0%, #F6F6F6 100%);
+	border-radius: 30rpx 30rpx 0rpx 0rpx;
+	// padding-top: 30rpx;
+	display: flex;
+	flex-direction: column;
+	gap: 20rpx;
+}
+
+/* 订单状态区域 */
+.order-section {
+	background: #ffffff;
+	box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(210, 213, 224, 0.5);
+	border-radius: 24rpx;
+	margin-bottom: 24rpx;
+	padding: 30rpx 20rpx 40rpx 20rpx;
+
+	.order-title {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #333333;
+		line-height: 45rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 30rpx;
+	}
+
+	.order-status {
+		display: flex;
+		justify-content: space-between;
+		padding: 0rpx;
+		box-sizing: border-box;
+
+		.status-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.status-icon {
+				width: 200rpx;
+				height: 169rpx;
+			}
+		}
+	}
+}
+
+/* 功能列表 */
+.function-list {
+	background: #ffffff;
+	border-radius: 24rpx;
+	padding: 30rpx;
+	padding-bottom: 50rpx;
+
+	.function-title {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 50rpx;
+	}
+
+	.function-grid {
+		display: flex;
+		flex-direction: column;
+		gap: 63rpx;
+
+		.grid-item {
+			display: flex;
+			align-items: center;
+			position: relative;
+			gap: 21rpx;
+
+			.icon-wrapper {
+				width: 42rpx;
+				height: 42rpx;
+				position: relative;
+				// margin-bottom: 12rpx;
+
+				.grid-icon {
+					width: 42rpx;
+					height: 42rpx;
+				}
+			}
+
+			.grid-text {
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		.grid-item::after {
+			position: absolute;
+			content: "";
+			width: 12rpx;
+			height: 24rpx;
+			right: 0rpx;
+			background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/gray_right_icon.png");
+			background-size: cover;
+		}
+	}
+
+	.lineCard-title {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 24rpx;
+	}
+
+	.lineCard-grid {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		gap: 20rpx 0;
+
+		image {
+			width: 310rpx;
+			height: 120rpx;
+		}
+	}
+}
+
+/* 功能列表 */
+.listcard-list {
+	position: relative;
+	z-index: 99;
+	margin: 0 30rpx;
+	background: #ffffff;
+	border-radius: 24rpx;
+	padding: 30rpx 20rpx;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+
+	.function-title {
+		width: 100%;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 20rpx;
+	}
+
+	.listcard-item {
+		width: 33.33%;
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		image {
+			width: 50rpx;
+			height: 50rpx;
+			margin: 0 auto 10rpx;
+			display: block;
+		}
+
+		.listcard-title {
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #252525;
+			line-height: 32rpx;
+			text-align: center;
+			margin-bottom: 8rpx;
+		}
+
+		.listcard-text {
+			font-size: 24rpx;
+			color: #999999;
+			line-height: 28rpx;
+			text-align: center;
+		}
+	}
+}
+
+.image-list {
+	background: #ffffff;
+	border-radius: 24rpx;
+	padding: 30rpx 20rpx;
+
+	.image-title {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 20rpx;
+	}
+
+	image {
+		width: 100%;
+		height: 148rpx;
+	}
+}
+
+.imageText-list {
+	background: #ffffff;
+	border-radius: 24rpx;
+	padding: 29rpx 27rpx 40rpx;
+
+	.imageText-title {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 11rpx;
+	}
+
+	.imageText-content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		image {
+			width: 245rpx;
+			height: 171rpx;
+		}
+
+		.text-status {
+			font-family:
+				PingFangSC,
+				PingFang SC;
+			font-weight: 500;
+			font-size: 30rpx;
+			color: #000000;
+			margin-top: 20rpx;
+			margin-bottom: 22rpx;
+		}
+
+		.text-next {
+			font-family:
+				PingFangSC,
+				PingFang SC;
+			font-weight: 400;
+			font-size: 26rpx;
+			line-height: 37rpx;
+			color: #666666;
+			text-align: center;
+		}
+	}
+}
+
+.my-page::before {
+	height: 420rpx;
+}
+
+button {
+	background: transparent !important;
+	border: none !important;
+	border-radius: 0 !important;
+	padding: 0 !important;
+	min-width: auto !important;
+	height: auto !important;
+	line-height: normal !important;
+	color: inherit !important;
+	-webkit-tap-highlight-color: transparent !important;
+}
+
+button::after {
+	border: none !important;
+}
+
+
+.info_section {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 20rpx;
+
+	.info_section_item {
+		width: 336rpx;
+		height: 193rpx;
+		background-size: cover;
+		background-position: center;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+		padding: 23rpx 26rpx 20rpx 26rpx;
+
+		.info_section_item_header {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding-bottom: 16rpx;
+			border-bottom: 2rpx solid rgba(210, 213, 224, 0.15);
+
+			.info_section_item_header_left {
+				display: flex;
+				align-items: center;
+				gap: 11rpx;
+			}
+
+			.info_section_item_img {
+				width: 35rpx;
+				height: 38rpx;
+			}
+
+			.info_section_item_label {
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 38rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.info_section_item_header_right {
+				image {
+					width: 10rpx;
+					height: 20rpx;
+				}
+			}
+		}
+
+		.info_section_item_subtitle {
+			font-size: 22rpx;
+			color: #999999;
+			line-height: 30rpx;
+			margin-top: 12rpx;
+			margin-bottom: 6rpx;
+		}
+
+		.info_section_item_content {
+			display: flex;
+			align-items: baseline;
+			font-family: DINPro, DINPro;
+			font-weight: 500;
+			font-size: 36rpx;
+			color: #333333;
+
+			.info_section_item_content_unit {
+				font-family:
+					PingFangSC,
+					PingFang SC;
+				font-weight: 500;
+				font-size: 20rpx;
+				color: #333333;
+				margin-left: 3rpx;
+			}
+		}
+	}
+}
+
+.user_detail_tip {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	margin-top: 10rpx;
+
+	.user_detail_tip_phone {
+		max-width: 230rpx;
+		height: 36rpx;
+		line-height: 36rpx;
+		border-radius: 6rpx;
+		font-size: 24rpx;
+		color: #666666;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		gap: 7rpx;
+
+		image {
+			width: 8rpx;
+			height: 14rpx;
+		}
+	}
+
+	.user_detail_tip_invite_name {
+		max-width: 246rpx;
+		font-size: 22rpx;
+	}
+}
+
+.imagePure {
+	width: 690rpx;
+	margin: 0 auto;
+
+	image {
+		width: 100%;
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
new file mode 100644
index 0000000..87b6899
--- /dev/null
+++ b/pages/my/myFavorite.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

From 057147d385725865d794e0337af18b423bb90d98 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Fri, 22 May 2026 14:36:49 +0800
Subject: [PATCH 035/118] =?UTF-8?q?=E5=95=86=E5=AE=B6=E6=94=B9=E7=89=88-?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tabbar/tabbar.vue              |   56 +-
 pages.json                                |    6 +
 pages/home/components/brand-card.vue      |  203 ++++
 pages/home/home.vue                       | 1215 +++++++++++++++------
 static/images/tabbar/new_home.png         |  Bin 10121 -> 15920 bytes
 static/images/tabbar/new_home_gray.png    |  Bin 5901 -> 3739 bytes
 static/images/tabbar/new_message.png      |  Bin 4354 -> 15646 bytes
 static/images/tabbar/new_message_gray.png |  Bin 3405 -> 4590 bytes
 static/images/tabbar/new_my.png           |  Bin 11842 -> 16122 bytes
 static/images/tabbar/new_my_gray.png      |  Bin 7798 -> 4071 bytes
 static/images/tabbar/new_order.png        |  Bin 10395 -> 15597 bytes
 static/images/tabbar/new_order_gray.png   |  Bin 5722 -> 3573 bytes
 12 files changed, 1102 insertions(+), 378 deletions(-)
 create mode 100644 pages/home/components/brand-card.vue

diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 6bbe3f5..2cbb408 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -1,7 +1,9 @@
 <template>
-	<uv-tabbar fixed :value="selected" @change="change1" activeColor="#ee0a24" :placeholder="false"
+	<uv-tabbar fixed :value="selected" @change="change1" activeColor="#FF4767 " :placeholder="false"
 		:safeAreaInsetBottom="false" :customStyle="{height:`110rpx`}">
-		<uv-tabbar-item v-for="(item,index) in $store.state.tabbarList" :key="index" :badge="getNum(index)"
+		<!-- <uv-tabbar-item v-for="(item,index) in $store.state.tabbarList" :key="index" :text="item.text" -->
+		<uv-tabbar-item v-for="(item,index) in tabbarList" :key="index" :text="item.text"
+			:badge="getNum(index)"
 			:customStyle="{height:`110rpx`}">
 			<template v-slot:active-icon>
 				<image class="icon" :src="item.selectedIconPath"></image>
@@ -30,6 +32,12 @@
 						"selectedIconPath": "/static/images/tabbar/new_home.png",
 						"pagePath": "/pages/home/home"
 					},
+                    {
+                        "iconPath": "/static/images/tabbar/new_order_gray.png",
+                        "text": "订单",
+                        "selectedIconPath": "/static/images/tabbar/new_order.png",
+                        "pagePath": "/pages/order/all-orders"
+                    },
 					{
 						"iconPath": "/static/images/tabbar/new_message_gray.png",
 						"text": "消息",
@@ -51,32 +59,32 @@
 			}
 		},
 		async created() {
-			if (!this.$store.state.tabbarList.length) {
-				let isnNetwork = uni.getStorageSync("isnNetwork");
-				if (isnNetwork) {
-					await this.getButtonImg()
-				} else {
-					uni.getNetworkType({
-						success: (res) => {
-							console.log(res.networkType);
-							if (res.networkType == "none") {
+			// if (!this.$store.state.tabbarList.length) {
+			// 	let isnNetwork = uni.getStorageSync("isnNetwork");
+			// 	if (isnNetwork) {
+			// 		await this.getButtonImg()
+			// 	} else {
+			// 		uni.getNetworkType({
+			// 			success: (res) => {
+			// 				console.log(res.networkType);
+			// 				if (res.networkType == "none") {
 
-								this.$store.commit("setTabbarList", this.tabbarList)
-							} else {
-								// 页面加载逻辑
-								uni.setStorageSync("isnNetwork", 1);
-								this.getButtonImg()
-							}
-						},
-					});
-				}
+			// 					this.$store.commit("setTabbarList", this.tabbarList)
+			// 				} else {
+			// 					// 页面加载逻辑
+			// 					uni.setStorageSync("isnNetwork", 1);
+			// 					this.getButtonImg()
+			// 				}
+			// 			},
+			// 		});
+			// 	}
 
-			}
+			// }
 
 		},
 		methods: {
 			getNum(index) {
-				if (index == 1) {
+				if (index == 2) {
 					return this.messageNum
 				} else {
 					return 0
@@ -114,8 +122,8 @@
 
 <style lang="scss">
 	.icon {
-		height: 98rpx;
-		width: 98rpx;
+		height: 54rpx;
+		width: 54rpx;
 	}
 	::v-deep .uv-tabbar__content{
 		z-index: 999!important;
diff --git a/pages.json b/pages.json
index f10ced4..7448da0 100644
--- a/pages.json
+++ b/pages.json
@@ -971,6 +971,12 @@
 				"selectedIconPath": "/static/images/tabbar/home_icon_active.png",
 				"pagePath": "pages/home/home"
 			},
+			{
+				"iconPath": "/static/images/tabbar/new_order_gray.png",
+				"text": "订单",
+				"selectedIconPath": "/static/images/tabbar/new_order.png",
+				"pagePath": "pages/order/all-orders"
+			},
 			{
 				"iconPath": "/static/images/tabbar/new_message_gray.png",
 				"text": "消息",
diff --git a/pages/home/components/brand-card.vue b/pages/home/components/brand-card.vue
new file mode 100644
index 0000000..308ad03
--- /dev/null
+++ b/pages/home/components/brand-card.vue
@@ -0,0 +1,203 @@
+<template>
+  <view class="brand-card-comp" @click="onClick">
+    <image class="brand-bg" :src="item.bgSrc" mode="aspectFill"></image>
+    <image class="mask-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9bca353c-fa74-407e-a69e-6f5e9aa43955.png" mode="widthFix"></image>
+    
+    <view class="card-content">
+      <view class="avatar-wrapper" style="border-color: #F7E5D7;">
+        <image class="avatar-img" :src="item.avatar || 'https://dummyimage.com/100x100/ccc/fff.png&text=logo'"></image>
+      </view>
+      
+      <text class="brand-name">{{ item.name }}</text>
+      
+      <view class="tags-container">
+        <view 
+          class="tag-item" 
+          v-for="(tag, idx) in displayTags" 
+          :key="idx" 
+          :style="getTagStyle(tag)"
+        >
+          <image class="tag-icon" v-if="tag.icon" :src="tag.icon"></image>
+          <text class="tag-text">{{ tag.text }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+// 预定义的标签库（固定内容）
+const TAG_LIBRARY = {
+  franchise: {   // 品牌加盟
+    text: '品牌加盟',
+    color: '#8D4C1B ',
+    borderColor: '#D6CAC0 ',
+    icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60816ae2-92ee-4473-9eca-562e1200dbca.png'
+  },
+  recruit: {     // 学院招募
+    text: '学院招募',
+    color: '#E5505F',
+    borderColor: '#EFCFD2 ',
+    icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fd0699b9-9f3c-4b1e-8693-d0c9ec7eabc3.png'
+  },
+  more: {        // 更多详情
+    text: '更多详情',
+    color: '#333333',
+    borderColor: '#ECECEC',
+    icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cec453ce-f3fc-4881-8f2c-9ec5c61e759c.png'
+  }
+}
+
+export default {
+  name: 'brand-card',
+  props: {
+    // 基础信息
+    item: {
+      type: Object,
+      default: () => ({})
+    },
+    // 新方式：传入标签 key 数组，例如 ['franchise', 'recruit']
+    tagKeys: {
+      type: Array,
+      default: null
+    }
+  },
+  computed: {
+    // 最终要显示的标签列表（优先使用 tagKeys，否则兼容旧数据 item.tags）
+    displayTags() {
+      if (this.tagKeys && this.tagKeys.length) {
+        return this.tagKeys.map(key => TAG_LIBRARY[key]).filter(v => v)
+      }
+      // 兼容旧数据：如果 item.tags 存在且为数组，则直接使用（但建议逐步迁移）
+      if (this.item.tags && Array.isArray(this.item.tags)) {
+        return this.item.tags
+      }
+      return []
+    },
+    tagsLength() {
+      return this.displayTags.length
+    }
+  },
+  methods: {
+    onClick() {
+      this.$emit('click', this.item)
+    },
+    getTagStyle(tag) {
+      const len = this.tagsLength
+      let sizeStyle = {}
+      if (len === 1) {
+        sizeStyle = {
+          width: '288rpx',
+          height: '42rpx',
+          padding: '0 12rpx',
+          boxSizing: 'border-box'
+        }
+      } else if (len === 2) {
+        sizeStyle = {
+          width: '134rpx',
+          height: '42rpx',
+          padding: '0 12rpx',
+          boxSizing: 'border-box'
+        }
+      }
+      return {
+        ...sizeStyle,
+        color: tag.color,
+        borderColor: tag.borderColor
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.brand-card-comp {
+  width: 328rpx;
+  height: 339rpx;
+  position: relative;
+  border-radius: 21rpx;
+  overflow: hidden;
+  background-color: #fff;
+}
+.brand-bg {
+  width: 100%;
+  height: 184rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1;
+}
+.mask-bg {
+  width: 100%;
+  height: 251rpx;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 2;
+  display: block;
+}
+.card-content {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  z-index: 3;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-bottom: 24rpx;
+}
+.avatar-wrapper {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  border: 2rpx solid;
+  background-color: #fff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+  margin-top: -38rpx;
+  margin-bottom: 12rpx;
+}
+.avatar-img {
+  width: 100%;
+  height: 100%;
+}
+.brand-name {
+  font-size: 24rpx;
+  font-weight: 500;
+  color: #333333;
+  line-height: 34rpx;
+  margin-bottom: 12rpx;
+}
+.tags-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 20rpx;
+  flex-wrap: wrap;
+}
+.tag-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 21rpx;
+  border: 1rpx solid;
+  background-color: transparent;
+  padding: 7rpx 12rpx;
+}
+.tag-icon {
+  width: 24rpx;
+  height: 22rpx;
+  margin-right: 6rpx;
+  flex-shrink: 0;
+}
+.tag-text {
+  font-size: 20rpx;
+  line-height: 28rpx;
+  white-space: nowrap;
+  margin-top: 4rpx;
+  padding-right: 2rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 65b041a..11a7fac 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,41 +1,153 @@
 <template>
   <view class="homePage">
-    <view class="home-navbar">
-      <!-- <custom-navbar
-        title=""
-        :show-back="false"
-        title-color="#333333"
-        :backgroundColor="backgroundColor"
-      ></custom-navbar> -->
-      <view class="home_info">
-        <view class="home_info_left">
-          <view class="home_info_left_text" v-if="userInfo.id_type == 1">
-            <view class="nameText line-1">{{ nameText }}</view>
-            <view class="set_btn" @click="goAcceptSet">营业设置</view>
-          </view>
-          <view class="home_info_left_text" v-else-if="userInfo.id_type == 2">
-            <view class="nameText line-1">{{ nameText }}</view>
-            <view class="set_btn" @click="goAcceptSet">营业设置</view>
-          </view>
-          <view class="home_info_left_text" v-else>{{ nameText }}</view>
-          <view class="home_info_left_tip">{{ tipText }}</view>
-        </view>
-        <view class="home_info_right">
-         
-          <image
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/616767e1-e935-4c9c-a8e1-a099b6db4084.png"
-            class="home_info_right_img"
-          ></image>
+    <image class="page-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0901dc51-ff5a-427f-aab1-993d80aced79.png" mode="widthFix"></image>
+
+    <view class="header-section">
+      <view class="user-info">
+        <image class="avatar" :src="currentAvatar"></image>
+        <view class="info-text">
+          <view class="name">{{ currentName }}</view>
+          <view class="desc">欢迎登录美融融商家版</view>
         </view>
       </view>
-      <filters
-        :isLogin="isLogin"
-        :selfState="userInfo.self_state"
-        @secondClassLength="(e) => (secondLength = e)"
-      ></filters>
+      
+      <view class="status-toggle" :class="{ 'is-closed': !isOpenStore }" @tap="toggleStatus" v-if="isLogin && isSettled">
+        <text class="status-text">{{ isOpenStore ? '营业中' : '休息中' }}</text>
+        <view class="toggle-dot"></view>
+      </view>
     </view>
-	<upload-app-vue></upload-app-vue>
-	<TabBar :selected="0"></TabBar>
+
+    <view class="quick-actions card-box" v-if="isLogin && isSettled">
+      <view class="action-item" v-for="(item, index) in quickActions" :key="index">
+        <image class="action-icon" :src="item.icon"></image>
+        <text class="action-text">{{ item.name }}</text>
+      </view>
+    </view>
+
+    <view class="order-stats-basic card-box" v-if="isLogin && isSettled">
+      <view class="card-header">
+        <view class="header-left">
+          <text class="title">接单管理</text>
+          <text class="update-time">更新时间：{{ orderBasic.updateTime }}</text>
+          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png"></image>
+        </view>
+        <view class="header-right">更多数据 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image></view>
+      </view>
+      <view class="stats-content">
+        <view class="stat-item">
+          <text class="num">{{ orderBasic.waitStart }}</text>
+          <text class="label">待开始</text>
+        </view>
+        <view class="stat-item">
+          <text class="num">{{ orderBasic.waitFinish }}</text>
+          <text class="label">待完成</text>
+        </view>
+        <view class="stat-item">
+          <text class="num">{{ orderBasic.finished }}</text>
+          <text class="label">已完成</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="order-stats-detail card-box" v-if="isLogin && isSettled">
+      <view class="card-header">
+        <view class="header-left">
+          <text class="title">当日实时数据</text>
+          <text class="update-time">更新时间：{{ orderDetail.updateTime }}</text>
+          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png"></image>
+        </view>
+      </view>
+      <view class="detail-content">
+        <view class="score-dashboard">
+          <view class="ring-track"></view>
+          <view class="ring-progress" :style="{'background': progressGradient}"></view>
+          <view class="dot start-dot" v-if="displayScore > 0"></view>
+          <view class="dot end-dot" v-if="displayScore > 0" :style="{'transform': `rotate(-${displayScoreDeg}deg) translateY(-67rpx)`}"></view>
+          <text class="score-num">{{ displayScore.toFixed(1) }}</text>
+          <image class="score-tag-img" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/52005bc0-2896-407d-8826-f34539637d20.png" mode="aspectFit"></image>
+        </view>
+
+        <view class="detail-grid">
+          <view class="grid-item">
+            <text class="label">访问人数</text>
+            <view class="val-box"><text class="val">{{ orderDetail.visitors }}</text> <text class="unit">人</text></view>
+            <text class="yesterday">昨日{{ orderDetail.yVisitors }}人</text>
+          </view>
+          <view class="grid-item">
+            <text class="label">下单量</text>
+            <view class="val-box"><text class="val">{{ orderDetail.orders }}</text> <text class="unit">单</text></view>
+            <text class="yesterday">昨日{{ orderDetail.yOrders }}单</text>
+          </view>
+          <view class="grid-item">
+            <text class="label">成交金额</text>
+            <view class="val-box"><text class="val">{{ orderDetail.amount }}</text> <text class="unit">万</text></view>
+            <text class="yesterday">昨日{{ orderDetail.yAmount }}万</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="settlement-guide card-box" v-if="isLogin && !isSettled">
+      <view class="guide-header">
+          <view class="guide-body">
+            <text class="guide-text">认证店铺信息，接单必经之路</text>
+            <view class="guide-btn" @tap="goToSettle">去入驻</view>
+          </view>
+      </view>
+    </view>
+
+    <view class="notice-bar card-box">
+      <image class="notice-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/75f624b8-a6ed-4787-9380-1a087062805b.png"></image>
+      <swiper class="notice-swiper" vertical autoplay circular interval="3000">
+        <swiper-item v-for="(msg, index) in noticeList" :key="index" @tap="goToNotice(msg)">
+          <text class="notice-text line-1">{{ msg.title }}</text>
+        </swiper-item>
+      </swiper>
+      <view class="notice-btn" @tap="goToNoticeList">点击查看</view>
+    </view>
+
+    <view class="brands-section card-box">
+      <view class="card-header">
+        <view class="header-left"><text class="title" style="margin-left: 10rpx;">精选品牌</text></view>
+        <view class="header-right">更多品牌 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image></view>
+      </view>
+      
+      <view class="brand-grid">
+        <brand-card 
+          class="brand-card-wrap"
+          v-for="(item, index) in brands" 
+          :key="index" 
+          :item="item"
+          :tagKeys="item.tagKeys"
+        ></brand-card>
+      </view>
+    </view>
+
+    <view class="skills-section card-box">
+      <view class="card-header">
+        <view class="header-left"><text class="title">技能集市</text></view>
+        <view class="header-right">更多技能 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image> </view>
+      </view>
+      <view class="skill-list">
+        <view class="skill-item" v-for="(item, index) in skills" :key="index">
+          <view class="cover-box">
+            <image class="cover" :src="item.coverSrc"></image>
+            <image class="play-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5c1ddfef-a200-424a-a9dc-03d9395568f6.png"></image>
+          </view>
+          <view class="skill-info">
+            <view class="skill-title line-2">{{ item.title }}</view>
+            <view class="skill-type" :class="item.typeClass">
+              <image class="type-icon" src="https://dummyimage.com/30x30/ccc/fff.png&text=I"></image>
+              <text class="type-text">{{ item.type }}</text>
+            </view>
+            <view class="skill-stats"> <image class="view-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2409b64a-56bb-4d9e-a4cc-5b3444fcf097.png"></image>{{ item.views }}观看 · {{ item.time }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view style="height: 120rpx;"></view> 
+    <TabBar :selected="0"></TabBar>
   </view>
 </template>
 
@@ -43,388 +155,783 @@
 import TabBar from "@/components/tabbar/tabbar.vue"
 import projectTabs from "./components/project-tabs.vue";
 import request from "@/utils/request";
-
 import filters from "./components/filters.vue";
 import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+import BrandCard from "./components/brand-card.vue";
+
 export default {
-  data() {
-    return {
-      secondLength: 2, //2级菜单所占排数
-      name: "",
-      statusBarHeight: 0,
-      listQuery: {},
-      latitude: "",
-      longitude: getApp().globalData.longitude,
-      latitude: getApp().globalData.latitude,
-      servers_region: getApp().globalData.servers_region,
-      address: getApp().globalData.address,
-      isLogin: false,
-      backgroundColor: "transparent",
-      syrId: null,
-      userInfo: {},
-      isShowCheckShop: false,
-      sjInfo: {},
-      sjList: [],
-    };
-  },
   components: {
     filters,
     projectTabs,
     CustomNavbar,
-	TabBar
+    TabBar,
+    BrandCard
+  },
+  data() {
+    return {
+      isLogin: false, // 是否登录，onShow生命周期中会通过token判定
+      userInfo: {},   // 用户信息数据源
+      syrId: null,
+
+      isOpenStore: false, // true为营业中（圆点在右），false为休息中（圆点在左）。由后续逻辑决定初始化状态。
+      displayScore: 0, 
+      animationTimer: null,
+
+      // 通知公告数据：预留接口，支持最新6条轮播
+      noticeList: [
+        { id: 1, title: '商家券更新了！品牌专区上新了！', url: '/pages/...' },
+        { id: 2, title: '系统维护通知：今晚凌晨将进行升级', url: '/pages/...' },
+        { id: 3, title: '平台新政策发布，请及时查看', url: '/pages/...' }
+      ],
+
+      quickActions: [
+        { name: '扫码验券', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png' },
+        { name: '服务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a90f02a2-9d39-440a-ad20-a4337bcd1b38.png' },
+        { name: '工位管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4c503603-6c2f-4a7a-9329-5e54b8ca769e.png' },
+        { name: '财务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/728c659e-e395-4473-b83e-7e04539f7ec6.png' }
+      ],
+      orderBasic: { updateTime: '15:30', waitStart: 23, waitFinish: 43, finished: 234 },
+      orderDetail: { updateTime: '15:30', score: '82.2', visitors: 0, yVisitors: 100, orders: 234, yOrders: 1000, amount: '1.34', yAmount: '1.4' },
+
+      brands: [
+        { name: '蜜丝卡伦美甲美睫', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['franchise', 'recruit'] },
+        { name: 'ALNL 清莲爱丽', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['recruit'] },
+        { name: 'IL COLPO依宝美容', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['franchise'] },
+        { name: '蜜丝卡伦美甲美睫', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['more'] }
+      ],
+      skills: [
+        { title: '穿戴甲的操作视频扫码验券操作123564798', type: '平台课程', views: '83.6万', time: '7小时前', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' },
+        { title: '脸部按摩操作步骤详情', type: '脸缘品牌', views: '8334', time: '1天前', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' },
+        { title: '全身SPA的操作视频操作教程', type: '平台课程', views: '2344', time: '3天前', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' },  
+        { title: '穿戴甲的操作视频扫码验券操作...', type: '平台课程', views: '836', time: '4月26日', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' }
+      ]
+    };
   },
   computed: {
-    shopText() {
-      if (!this.isLogin) return "请选择门店";
-      if (this.sjInfo && this.sjInfo.id) return this.sjInfo.name;
-      return "全部门店";
+    // 状态管理判定
+    // 是否已入驻 (0: 未入驻, -1: 入驻第一步, >0: 已认证) 只要不等于0，说明已经开启了入驻流程
+    isSettled() {
+      if (!this.isLogin || !this.userInfo) return false;
+      return this.userInfo.id_type !== 0; 
+    },
+    // 是否认证通过 (根据规则，> 0 说明认证通过了)
+    isCertified() {
+      if (!this.isLogin || !this.userInfo) return false;
+      return this.userInfo.id_type > 0;
+    },
+    // 是否配置了营业时间
+    hasBusinessTime() {
+      return this.isLogin && !!this.userInfo.business_time;
     },
-    tipText() {
-      if (!this.isLogin) return "登录后可体验更多服务";
-      if (this.userInfo.id_type == 1) return "欢迎登陆美融融商家！";
 
-      return "入驻后可体验更多服务";
+    // 根据登录状态动态返回头像
+    currentAvatar() {
+      if (!this.isLogin || !this.userInfo.head_photo) {
+        return 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4099a78b-d3bd-4cf5-8599-68dfe751af16.png'; // 默认未登录头像
+      }
+      return this.userInfo.head_photo;
     },
-    nameText() {
-      if (!this.isLogin) return "欢迎登录美融融商家";
-      if (this.userInfo.id_type == 1){
-		  return this.userInfo.name || this.userInfo.nick_name;
-	  }
-      return "欢迎使用美融融商家";
+    // 根据登录状态动态返回昵称
+    currentName() {
+      if (!this.isLogin) return '未登录';
+      return this.userInfo.name || this.userInfo.nick_name || '手机用户';
     },
-    // 判断是否账号已停止使用
-    isAccountDisabled() {
-      return this.userInfo?.is_ok === 2;
+    displayScoreDeg() {
+      const score = this.displayScore || 0;
+      const percentage = Math.min(Math.max(score, 0), 100);
+      return (percentage / 100) * 360;
     },
+    progressGradient() {
+      return `conic-gradient(
+        transparent 0deg,
+        transparent calc(360deg - ${this.displayScoreDeg}deg),
+        #FF4D4F calc(360deg - ${this.displayScoreDeg}deg),
+        #FF4D4F 360deg
+      )`;
+    }
   },
   onShow() {
+    // 登录判定逻辑
     this.isLogin = uni.getStorageSync("accessToken") ? true : false;
     if (this.isLogin) {
       this.getUserInfo();
     }
   },
   onLoad() {
-	  uni.hideTabBar();
+    uni.hideTabBar();
+    this.getNoticeList();   // 获取最新通知
+  },
+  mounted() {
+    this.animateScore();
+  },
+  watch: {
+    'orderDetail.score'() {
+      this.animateScore();
+    }
   },
-
   methods: {
-    // 显示账号停用提示
-    showStopUseModal() {
-      uni.showModal({
-        title: "提示",
-        content:
-          "您的账号已停止使用。若有疑问或恢复需求，请尽快联系平台工作人员核实处理。",
-        showCancel: false,
-        confirmText: "我知道了",
-      });
-    },
-
-    goAcceptSet() {
-      // 添加访问检查
-      if (this.isAccountDisabled) {
-        this.showStopUseModal();
-        return;
-      }
-      uni.navigateTo({
-        url: "/pages/shop/set",
-      });
-    },
     getUserInfo() {
       request.post("/sj/user/getUser").then((result) => {
         this.userInfo = result.data;
-        //存储用户id
         uni.setStorageSync("syrId", result.data.id);
         this.syrId = result.data.id;
+
+        // 获取完用户信息后，初始化营业开关的状态
+        this.initStoreStatus();
       });
     },
-  },
+
+    // 接口预留：获取通知公告（仅拉取当前角色关联的最新6条）
+    getNoticeList() {
+      // request.post('/api/notice/getLatest', { role: 'merchant', limit: 6 }).then(res => {
+      //   this.noticeList = res.data;
+      // })
+    },
+    
+    // 跳转：通知详情页
+    goToNotice(msg) {
+      if(msg.url) {
+        uni.navigateTo({ url: msg.url });
+      }
+    },
+
+    // 跳转：公告列表页
+    goToNoticeList() {
+      // uni.navigateTo({ url: '/pages/notice/list' });
+    },
+
+    // 跳转：去入驻
+    goToSettle() {
+      uni.navigateTo({ url: '/pages/ruzhu/ruzhu' });
+    },
+
+    // 初始化按钮状态
+    initStoreStatus() {
+      // 如果未认证，或者（已认证但未配置时间），默认都是休息中
+      if (!this.isCertified || (this.isCertified && !this.hasBusinessTime)) {
+        this.isOpenStore = false;
+      } else {
+        // 认证通过且配置了时间，根据后端真实数据控制 (self_state 1为营业, 0为休息)
+        this.isOpenStore = this.userInfo.self_state === 1; 
+      }
+    },
+
+    // 营业中 / 休息中 按钮逻辑判断
+    toggleStatus() {
+      // 1、入驻未认证 (id_type == -1)，弹窗提示未完善项，引导完善
+      if (!this.isCertified) {
+        uni.showModal({
+          title: '提示',
+          content: '请先完善认证信息',
+          confirmText: '去完善',
+          success: (res) => {
+            if (res.confirm) {
+              // uni.navigateTo({ url: '/pages/artisan/syr-info-change' });
+            }
+          }
+        });
+        return;
+      }
+
+      // 2、入驻认证通过，未配置营业时间，默认休息中，跳转至营业时间管理
+      if (this.isCertified && !this.hasBusinessTime) {
+        uni.showToast({ title: '请先配置营业时间', icon: 'none' });
+        setTimeout(() => {
+          // uni.navigateTo({ url: '/pages/shop/business-time' });
+        }, 800);
+        return;
+      }
+
+      // 3、认证通过并配置时间，仅作为开关，不跳转页面
+      if (this.isCertified && this.hasBusinessTime) {
+        this.isOpenStore = !this.isOpenStore;
+        // 预留接口：发送请求同步给后端当前状态
+        // request.post('/api/store/toggleStatus', { status: this.isOpenStore ? 1 : 0 });
+      }
+    },
+
+    animateScore() {
+      const target = parseFloat(this.orderDetail.score) || 0;
+      if (this.animationTimer) clearInterval(this.animationTimer);
+
+      const start = this.displayScore; 
+      const change = target - start; 
+      
+      if (Math.abs(change) < 0.05) {
+        this.displayScore = target;
+        return;
+      }
+
+      const frames = 30; 
+      const duration = 600; 
+      let currentFrame = 0;
+
+      this.animationTimer = setInterval(() => {
+        currentFrame++;
+        const progress = currentFrame / frames;
+        const easeProgress = 1 - Math.pow(1 - progress, 3); 
+        
+        this.displayScore = start + change * easeProgress;
+
+        if (currentFrame >= frames) {
+          this.displayScore = target;
+          clearInterval(this.animationTimer);
+        }
+      }, duration / frames);
+    }
+  }
 };
 </script>
 
 <style lang="scss">
-page {
-  // background: linear-gradient(to bottom, #fafafa, #ffffff);
-  background: #f5f5f5;
-}
+  page {
+    background: #f5f6f8;
+  }
 
-.homePage {
-  background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bf0dd63c-4205-4af5-a29f-8a9b4ee4188b.png");
-  background-position: 0 0;
-  background-size: 100%;
-  background-repeat: no-repeat;
+  .homePage {
+    position: relative;
+    min-height: 100vh;
+    padding: 0 24rpx;
+    padding-top: 100rpx; 
 
-  .home-navbar {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    .home_info {
-      height: 238rpx;
-      box-sizing: border-box;
+    .page-bg {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      z-index: 0;
+    }
+
+    // 通用卡片样式
+    .card-box {
+      position: relative;
+      z-index: 1;
+      background: #ffffff;
+      border-radius: 24rpx;
+      margin-bottom: 24rpx;
+      padding: 20rpx 30rpx 30rpx;
+    }
+
+    .more-right-icon {
+      width: 8rpx;
+      height: 14rpx;
+      margin-left: 6rpx;
+    }
+
+    // 通用卡片头部
+    .card-header {
       display: flex;
       justify-content: space-between;
-      align-items: flex-end;
-      padding: 0rpx 0rpx 0 30rpx;
-      .home_info_left {
-        padding-bottom: 30rpx;
-        .home_info_left_text {
-          font-family:
-            PingFangSC,
-            PingFang SC;
-          font-weight: 500;
-          font-size: 32rpx;
-          color: #333333;
-          text-align: left;
-          font-style: normal;
-          display: flex;
-          align-items: center;
-          .set_btn {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            width: 108rpx;
-            height: 34rpx;
-            background: linear-gradient(180deg, #eb6248 0%, #ea4e45 100%);
-            border-radius: 20rpx;
-            font-family:
-              PingFangSC,
-              PingFang SC;
-            font-weight: 500;
-            font-size: 20rpx;
-            color: #ffffff;
-            line-height: 28rpx;
-          }
-        }
-        .home_info_left_tip {
-          margin-top: 5rpx;
-          font-family:
-            PingFangSC,
-            PingFang SC;
-          font-weight: 400;
-          font-size: 26rpx;
-          color: #979797;
-          line-height: 37rpx;
-          text-align: left;
-          font-style: normal;
-        }
-      }
-
-      .home_info_right {
-        padding-right: 30rpx;
-        height: 181rpx;
+      align-items: center;
+      margin-bottom: 24rpx;
+      
+      .header-left {
         display: flex;
         align-items: center;
-        justify-content: center;
-        .change_shop {
-          box-sizing: border-box;
+        .title {
+          margin-right: 20rpx;
+          font-family: PingFangSC, PingFang SC;
+          font-weight: 500;
+          font-size: 30rpx;
+          color: #101010;
+          line-height: 42rpx;
+          text-align: left;
+          font-style: normal;
+        }
+        .update-time {
+          font-family: PingFangSC, PingFang SC;
+          font-weight: 400;
+          font-size: 20rpx;
+          color: #8E694D;
+          line-height: 28rpx;
+          text-align: left;
+          font-style: normal;
+          margin-top: -4rpx;
+        }
+        .refresh-icon {
+          width: 18rpx;
+          height: 18rpx;
+          margin-left: 10rpx;
+        }
+      }
+      .header-right {
+        font-weight: 400;
+        font-size: 20rpx;
+        color: #666666;
+        line-height: 28rpx;
+      }
+    }
+
+    // 1. 顶部信息
+    .header-section {
+      position: relative;
+      z-index: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 40rpx;
+
+      .user-info {
+        display: flex;
+        align-items: center;
+        .avatar {
+          width: 96rpx;
+          height: 96rpx;
+          border-radius: 50%;
+          margin-right: 20rpx;
+        }
+        .name {
+          font-weight: 500;
+          font-size: 30rpx;
+          color: #333333;
+          line-height: 42rpx;
+          margin-bottom: 8rpx;
+        }
+        .desc {
+          font-weight: 400;
+          font-size: 20rpx;
+          color: #858796;
+          line-height: 28rpx;
+        }
+      }
+      
+      // 营业中/休息中滑块核心样式区
+      .status-toggle {
+        position: relative;
+        width: 173rpx;
+        height: 62rpx;
+        display: flex;
+        align-items: center;
+        border-radius: 31rpx;
+        box-sizing: border-box;
+        overflow: hidden; 
+        
+        background-image: linear-gradient(
+          316deg,
+          rgba(255, 161, 203, 1) 0,
+          rgba(251, 143, 180, 1) 49.381741%,
+          rgba(255, 130, 239, 1) 100%
+        );
+        transition: all 0.3s ease;
+
+        &::before {
+          content: "";
+          position: absolute;
+          top: 0; left: 0; width: 100%; height: 100%;
+          background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/269c1024-34ec-42af-8b20-1ce047c9851b.png") no-repeat center;
+          background-size: 100% 100%;
+          opacity: 0; 
+          z-index: 1;
+          transition: opacity 0.3s ease;
+        }
+
+        .status-text {
+          position: absolute;
+          font-weight: 500;
+          font-size: 28rpx;
+          color: #FFFFFF;
+          line-height: 40rpx;
+          z-index: 3;
+          left: 22rpx;
+          transition: transform 0.3s cubic-bezier(0.25, 1, 0.5, 1);
+        }
+
+        .toggle-dot {
+          position: absolute;
+          top: 5rpx;
+          right: 5rpx; 
+          width: 52rpx;
+          height: 52rpx;
+          background: #fff;
+          border-radius: 50%;
+          z-index: 3;
+          transition: transform 0.35s cubic-bezier(0.25, 1, 0.5, 1);
+        }
+
+        &.is-closed {
+          &::before {
+            opacity: 1;
+          }
+          .status-text {                
+            transform: translateX(46rpx); 
+          }
+          .toggle-dot {
+            transform: translate(-113rpx ,2rpx);
+          }
+        }
+      }
+    }
+
+    // 入驻引导卡片
+    .settlement-guide {
+      padding: 0; // 去除内部留白，让背景图贴边
+      overflow: hidden;
+      
+      .guide-header {
+        width: 100%;
+        height: 248rpx;
+        background: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/138ccbc3-486d-4287-b67f-f809de99e408.png');
+        background-size: cover;
+      }
+
+      .guide-body {
+        padding: 90rpx 0 50rpx;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .guide-text {
+          margin-bottom: 20rpx;
+          font-weight: 400;
+          font-size: 28rpx;
+          color: #333333;
+          line-height: 40rpx;
+        }
+
+        .guide-btn {
+          width: 534rpx;
+          height: 70rpx;
+          border-radius: 55rpx;
+          border: 1rpx solid #FF4767;
+          
+          color: #FF4767;
+          font-weight: 500;
+          font-size: 28rpx;
           display: flex;
           align-items: center;
           justify-content: center;
-          gap: 10rpx;
-          max-width: 270rpx;
-          height: 64rpx;
-          font-size: 28rpx;
-          background: rgba(255, 255, 255, 0.24);
-          border-radius: 33rpx;
-          border: 1rpx solid #bab8bf;
-          padding: 16rpx 13rpx 16rpx 20rpx;
-          .change_shop_logo {
-            width: 34rpx;
-            height: 32rpx;
-            flex-shrink: 0;
-          }
-          .change_down_logo {
-            flex-shrink: 0;
-            width: 16rpx;
-            height: 10rpx;
-          }
-          .line-1 {
-            font-size: 28rpx;
-          }
-        }
-        .home_info_right_img {
-          width: 367rpx;
-          height: 143rpx;
         }
       }
     }
-  }
-}
 
-//搜索组件样式渗透
-::v-deep .uni-input-placeholder {
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #cccccc;
-  line-height: 34rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-::v-deep .uv-icon__img {
-  width: 34rpx !important;
-  height: 34rpx !important;
-}
-
-//列表样式
-.list-item {
-  align-items: flex-start;
-  background: #ffffff;
-  border-radius: 20rpx;
-  margin-bottom: 20rpx;
-
-  .list-item-left {
-    .list-item-left-img {
-      width: 172rpx;
-      height: 172rpx;
-      margin-right: 30rpx;
-    }
-  }
-
-  .list-item-right {
-    height: 172rpx;
-    align-content: space-between;
-    flex-wrap: wrap;
-    display: flex;
-    flex: 1;
-    padding-bottom: 30rpx;
-    border: none;
-
-    .list-item-right-left {
-      font-weight: 500;
-      font-size: 30rpx;
-      color: #333333;
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-    }
-
-    .list-item-right-right {
-      font-weight: 500;
-      font-size: 34rpx;
-      color: #e8101e;
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-      width: 100%;
+    // 2. 快捷入口
+    .quick-actions {
       display: flex;
-      flex-wrap: nowrap;
-      justify-content: space-between;
-      align-items: center;
+      justify-content: space-around;
+      padding: 30rpx 10rpx;
+      background: #F3F4FD;
+      
+      .action-item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        .action-icon {
+          width: 60rpx;
+          height: 60rpx;
+          margin-bottom: 13rpx;
+        }
+        .action-text {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #101010;
+          line-height: 33rpx;
+          text-align: left;
+          font-style: normal;
+        }
+      }
+    }
 
-      .list-item-right-right-img {
-        font-weight: 400;
-        font-size: 24rpx;
-        color: #ffffff;
-        line-height: 33rpx;
-        text-align: left;
-        font-style: normal;
+    // 3. 基础订单
+    .order-stats-basic {
+        background: linear-gradient( 176deg, #F0F4FF 0%, #FFFFFF 100%);
+        border-radius: 20rpx;
+        border: 1rpx solid #FFFFFF;
+      .stats-content {
+        display: flex;
+        justify-content: space-around;
+        text-align: center;
+        .num {
+          display: block;
+          font-weight: 500;
+          font-size: 40rpx;
+          color: #333333;
+          line-height: 56rpx;
+          font-style: normal;
+        }
+        .label {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #666666;
+          line-height: 33rpx;
+          text-align: left;
+          font-style: normal;
+        }
+      }
+    }
+
+    // 4. 详细订单
+    .order-stats-detail {
+      .detail-content {
         display: flex;
         align-items: center;
-        justify-content: center;
-        width: 94rpx;
-        height: 44rpx;
-        background: linear-gradient(122deg, #fe78b3 0%, #e8101e 100%);
-        border-radius: 22rpx;
+        
+        .score-dashboard {
+          position: relative;
+          width: 140rpx;
+          height: 140rpx;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          margin-right: 40rpx;
+          flex-shrink: 0;
+
+          .ring-track {
+            position: absolute;
+            width: 130rpx; 
+            height: 130rpx;
+            top: 5rpx;
+            left: 5rpx;
+            background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4189620a-fd4f-42eb-9977-817e521b4f12.png") no-repeat center;
+            background-size: contain;
+            z-index: 1;
+          }
+
+          .ring-progress {
+            position: absolute;
+            top: 2rpx;
+            left: 0;
+            width: 140rpx;
+            height: 140rpx;
+            border-radius: 50%;
+            mask: radial-gradient(transparent 62rpx, #000 65rpx);
+            -webkit-mask: radial-gradient(transparent 62rpx, #000 65rpx);
+            z-index: 2;
+          }
+
+          .dot {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            width: 7rpx;   
+            height: 7rpx;
+            background: #FF4D4F;
+            border-radius: 50%;
+            z-index: 3;    
+            margin-top: -3.5rpx; 
+            margin-left: -3.5rpx; 
+          }
+
+          .start-dot {
+            transform: translateY(-66rpx);
+          }
+
+          .end-dot {
+            transform-origin: center center;
+            margin-left: -4rpx;
+            margin-top: -2rpx;
+          }
+
+          .score-num {
+            position: absolute;
+            font-family: AlimamaShuHeiTi, sans-serif;
+            font-weight: bold;
+            font-size: 34rpx;
+            color: #333333;
+            z-index: 3;
+          }
+
+          .score-tag-img {
+            position: absolute;
+            bottom: -10rpx;
+            width: 85rpx;
+            height: 35rpx;
+            z-index: 4; 
+          }
+        }
+
+        .detail-grid {
+          flex: 1;
+          display: flex;
+          justify-content: space-between;
+
+          .grid-item {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            
+            .label {
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #888888;
+              line-height: 33rpx;
+              margin-bottom: 12rpx;
+            }
+            
+            .val-box {
+              display: flex;
+              align-items: baseline;
+              margin-bottom: 6rpx;
+              
+              .val {
+                font-weight: 500;
+                font-size: 40rpx;
+                color: #333333;
+                line-height: 56rpx;
+              }
+              .unit {
+                font-weight: 400;
+                font-size: 24rpx;
+                color: #888888;
+                line-height: 33rpx;
+                margin-left: 6rpx;
+              }
+            }
+            
+            .yesterday {
+              margin-top: 6rpx;
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #888888;
+              line-height: 33rpx;
+              text-align: center;
+            }
+          }
+        }
       }
     }
-  }
-}
 
-.list-container {
-  padding: 0rpx !important;
-}
-
-.list-scroll {
-  margin-top: 0rpx !important;
-}
-.line-1 {
-  white-space: nowrap; /* 防止文本换行 */
-  overflow: hidden; /* 隐藏溢出的内容 */
-  text-overflow: ellipsis; /* 显示省略号来代表被裁剪的文本 */
-}
-.nameText {
-  max-width: 233rpx;
-  margin-right: 12rpx;
-}
-.mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 100vh;
-  width: 100vw;
-  background-color: rgba(0, 0, 0, 0.4);
-  z-index: 1000;
-}
-.change_shop {
-  position: relative;
-  .select_box {
-    box-sizing: border-box;
-    position: absolute;
-    top: 70rpx;
-    right: 0;
-    width: 471rpx;
-    background-color: #fff;
-    overflow-y: auto;
-    z-index: 10000;
-    border-radius: 32rpx;
-    padding: 30rpx 24rpx 20rpx 24rpx; /* 调整上下内边距 */
-    max-height: 60vh;
-
-    /* 添加滚动条样式 */
-    &::-webkit-scrollbar {
-      width: 8rpx;
-    }
-
-    &::-webkit-scrollbar-track {
-      background: #f1f1f1;
-      border-radius: 4rpx;
-    }
-
-    &::-webkit-scrollbar-thumb {
-      background: #c1c1c1;
-      border-radius: 4rpx;
-    }
-
-    &::-webkit-scrollbar-thumb:hover {
-      background: #a8a8a8;
-    }
-
-    .select_item {
-      margin-bottom: 20rpx;
-      padding-bottom: 20rpx;
-      border-bottom: 2rpx solid #f1f1f1;
+    // 5. 通知横幅 (跑马灯改造)
+    .notice-bar {
       display: flex;
-      gap: 10rpx;
       align-items: center;
+      padding: 13rpx 30rpx;
+      background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/3d9c6b4b-ef6f-4242-abd4-6194d13e02dc.png");
+      background-size: contain;
 
-      &:last-child {
-        margin-bottom: 0;
-        border-bottom: none;
+      .notice-icon {
+        width: 25rpx;
+        height: 21rpx;
+        margin-right: 16rpx;
       }
-
-      .line-1 {
-        max-width: 311rpx;
+      
+      .notice-swiper {
         flex: 1;
+        height: 40rpx; // 限制高度刚好显示一行
+        line-height: 40rpx;
+
+        .notice-text {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #30353C;
+        }
       }
-      .tag {
-        width: 102rpx;
-        height: 40rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        color: #fff;
-        border-radius: 10rpx;
-        font-size: 26rpx;
-        flex-shrink: 0;
-      }
-      .red {
-        background-color: #fe5855;
-      }
-      .gray {
-        background: #999999;
+
+      .notice-btn {
+        font-weight: 400;
+        font-size: 18rpx;
+        color: #8D4C1B;
+        padding: 2rpx 15rpx;
+        border-radius: 30rpx;
+        border: 1rpx solid #8d4c1b50;
+        margin-left: 10rpx;
       }
     }
+
+    // 6. 精选品牌 (精简后的包裹容器)
+    .brands-section {
+      padding: 20rpx 20rpx;
+      .brand-grid {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        
+        .brand-card-wrap {
+          width: 48.5%; // 240rpx 宽度
+          margin-bottom: 14rpx;
+        }
+      }
+    }
+
+    // 7. 技能集市
+    .skills-section {
+      .skill-list {
+        display: flex;
+        flex-direction: column;
+      }
+      .skill-item {
+        display: flex;
+        margin-bottom: 30rpx;
+        &:last-child { margin-bottom: 0; }
+
+        .cover-box {
+          position: relative;
+          width: 224rpx;
+          height: 126rpx;
+          border-radius: 16rpx;
+          overflow: hidden;
+          margin-right: 24rpx;
+          flex-shrink: 0;
+
+          .cover { 
+            width: 100%; 
+            height: 100%; 
+          }
+          .play-icon {
+            position: absolute;
+            top: 50%; left: 50%;
+            transform: translate(-50%, -50%);
+            width: 39rpx; height: 39rpx;
+          }
+        }
+
+        .skill-info {
+          flex: 1;
+          display: flex;
+          min-width: 0;
+          flex-direction: column;
+          justify-content: space-between;
+
+          .skill-title {
+            display: block; 
+            font-size: 28rpx;
+            color: #333;
+            font-weight: 400;
+            line-height: 40rpx;
+            overflow: hidden;
+            text-overflow: ellipsis; 
+            white-space: nowrap;
+          }
+          .skill-type {
+            display: flex;
+            align-items: center;
+            font-size: 22rpx;
+            margin-top: 10rpx;
+            
+            .type-icon { 
+              width: 26rpx; 
+              height: 26rpx; 
+              margin-right: 8rpx; 
+              border-radius: 50%;
+            }
+            .type-text {
+              background: #f9d3d760;
+              border-radius: 7rpx;
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #E55463;
+              line-height: 33rpx;
+              padding: 2rpx 10rpx;
+            }
+          }
+          .skill-stats {
+            font-size: 22rpx;
+            color: #999;
+            margin-top: 10rpx;
+            display: flex;
+            align-items: center;
+            .view-icon {
+              width: 26rpx;
+              height: 22rpx;
+              margin-right: 8rpx;
+              margin-top: -2rpx;
+            }
+          }
+        }
+      }
+    }
+
+    .line-1 { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+    .line-2 { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; }
   }
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/static/images/tabbar/new_home.png b/static/images/tabbar/new_home.png
index b53545b88d0a6c0da21d701af15e43884100071b..d7b21fa97789998b016012041755122bc91f1710 100644
GIT binary patch
literal 15920
zcmV-0KF`64P)<h;3K|Lk000e1NJLTq003+N003+V1^@s6k7ifR000mGNkl<ZcmeFZ
z3)E(5Rp0slKj;0bsxMW21)6(bXl@NMK+B*8!64Tx!L<@eGLp42ngyb9C6kE>0W)1S
zt`*lLIu~>~;~H@inW({FxXd6ZLPO-TR0JgrLgXS~({$7K?yBml?>jrc|32^g)koVv
z({@8}alU7tec#W1_CC)!=Y8Mm9{T3-4OM|}HtZX!UD7uj_RWUf^9qz?t&hF*TJ%js
z1-@=O?9L6@@WBCc+Z}uPdiD=KuAcj{7u0ip=<nCFU-}dEoR|Cv_<QQvFM0H?!(U?J
z>(a1I1A;ejs>VpxOsQN?e#w@e^^#}Rb6)zhz-Q#uhpOf`NcA&i{dmbgEBlRQe}pFf
z3C;Xh_1u?!+d9NwI`lPfSV_CLJ&LXcK#KhET8Gv1e)OQ8^Rj=W^QVt%jJHbTM}UXK
z%>C#!4hx7Q6zCFF{bTz49-8;TdiG2IW*t8KHD4on+-Ku!wisIA!0t*4Zo`B=d{|=W
zng8(q^K*arUur)2>5_k{tcONjqP3iAhF}y5P!Ghrcn|#q*}tmyUh~KG>>v7pzbuWr
zuNr157ywadF8L-n9g%$G@L?Z0a%9mT1|K<MU3K$*z3<w8QmYdm8>N3-@>wx(NrG4~
zOlOQ>gQHZA7KC7vHELX?OX=;a>pj=}UOn$+PhB+MxaU)=yqDHMNvY;;FzQUXnngpS
zt~h+Sxjud0i<bG{_l3W%TaI5<RX>UR5Ew+Gsdm$ZDB%wl&@?*@i2^F`;t)0|ps+35
z#B%VH*q!g$dG^bGp`P)Q^AUbSj-_DtQtGKuLV>AU${H#XAUg?^@z|>#>!)9N<<RYC
zUsCV>{M)PM*V3DdqHE|PLj{kdNSx3_rHxSl8Ri5GKmY?lTgjs_p6#;6#^eWU|JFyj
zP5!OeexpIEaj)b|L8!$N>d0YkdEz$LEO<||M6)i_ho@&8c<hhX_VfYXAD-T3eIlKd
zlwi_29Gz5}7VPLJZgp%g=t33{Y~x)&?3xBAPGW8_bk%%rdHf2y?KSnhA3daRpd%~#
z3#Ch4xb3AH>o7E{sl%MpsPDUq=M!)xJL<8I^@;8GJo1q@U;7UH{@3z!dbMkAX{1v4
z%rvSS1g4v!z>3UM?-aU)D0G3{z=>gTYA6~Rx`azkdoZNT-x|NTc6R=-p7r;?Bm6f4
zP^EjGCbjS$Z|m^kUH%GoQg&18FT2co<lnab^*jH;*0B@s$LQO;2?S7)LYjh5;IQ+i
z;OIjZH@7sQl*Y!8Mqn#;Ss=R1Q+d9XutFbP)pTqYubdM@91AY#!t(siooD^Xk#B@I
zNvcKe_h7KltbXyNFf?nSId`+bJ+Av<>vwNIU!VR@|6$(oPuJ|z28Aw4X<O#`6Zhb`
zL~G(@g+>W8Ktr4uL$)#Ug1Hs8L(9ZL09o=-9}aER97Eigh#}pNcaBFrT>jR_%TK=?
z{J6=FeAxd~e>(q8J>wsq-M;^op4Kb7``J+v2X;LUAGVGhp)!$Nq1|0|-G}}Db8Z~l
z2mbxj=bdBkpXd5(u}})C9Jnyl6@*Vvc+W#-r=-@ZrO<P3i7~+zGZpXskity8yC5Q0
zoPg*g8WnjIxy4@eF!{T`P5!$tkpISa%YT(O{3ky~e$2(H%P*6kh3<tIyyW@U*8lUS
z|F3@OH=nQn3Xk#C<iy%3>8^*_Rj2r?curmQYYR`a^!Rh9Cw}^>SB~;qOMZ~qNur2(
zEOkM#EE-W-j_Tqf97rfSosgV2JyJy6`uLkh;3wi?sS^5@2L~|5Mme@t@{=E{@%_~P
zIZu@@eu%uaCEaqH=FeUyef+c1hd(8K;?JZ%yH0h>?W(QSmd-x-{5toHe^;-6*B{nv
ze&eOgL(l~L`a@QDx3c)6qzmrw;ZuHjUg`T5{+zcBoq6*Ec0T&Cw{l-&%Xy;2U4Ln2
zuyz_Did<t&cY&dKmr&?rHDI7^=3*>;DHS1XZ2O*xA!Nlyn*-wm`{k!SNq#Y#`trw0
z``~Z5MfK57sowQL>75^tfA1sGAALgl*q_RO_$Siuenh_V59IfJ2-#<?8*Vw1$u8A-
zXZ;Jk;awl8U;3^8VKc+m6SLyGHGN9dhDQ$b%6{YsWeR)6sas&!>+WZLX8)7tliTkz
zPY3R8Vhf<zOfx}ykr5F}Y^;`b(HDj~(PHYp7~+eqgmoI7CI{#s62v(J=;H1tJVxV1
z-0~jzaCD5%T`&Fqho%4cNAgGb?)ds!<l`sg6M>V`iEZf)@EvzZ$AD{Zls@$FZk|5y
zvD5VV8_uk%`{~@%e|&!3+kd});m!Bm8>PPTK{dXz(J70rVza+?=UX7ptDXI?`#U>3
z^$rXkQXM&kr0f+xnxImO+Rq?C1KD&!STw{y?Mz_>shyUip&2R>C@}!yh23Fi@oYrF
zWEWn*v*}sf0w0YjHdkLSzxO}UtdB@ne?dBVVu5)_+6H#ms>IP=n2|-dO%v0+kAF^j
z*9Z6ccRzASH{WJW(?#`wgRie&dF#KepZ)do^mRB`>D`)@Wu-*Y6^E~=yaj&W-do^7
z?c4d(RX^?WFWTdPWKlJ#vE>w;T>>SL)Vsr~dD(GGWcUyxjZ9ht+d-ItJ>iI9sDN@c
z5NOC62hY^V^NF`TowiT9@mBf$ACo`$QR%vyrQ__L?KA=q#~KNLxKkr@2bfU>F=Lp<
zu^aWL*R1s0zkkU8`P0L9oE&w=Y0s?(pZoju>i_>mrviL!sPUDip?nVP+HJo7i-23;
z(NCUzznwd-f3xKuWkY1SJh~{bXaF`vVOYMh{)()Smox*pWfr`6%DHWYzm+>4bD|FI
z-h{?(PAvQ&+fI+XSmUp8hdS>p)$K>+4}V&E?}t>^Uaz`?U9z*S%1#moeu|?)^lVxt
z%1q2_Y%-$W1)3KB9d_igJEr=>Pn@N9esHC0Zjxsm()nlp+|Fy>`kH$4oA<}{YXM)j
zVdTv+7@Y~vt;0a*>weC8Wk0$9O_y!y*n6b$^kv!E5f*g?2)z)L$m-%~$ovTiuJF^K
zTFit@*r%q|tR*@Za^$rfGlm8-pK-dT@8<K<lP{HI`I;N#_wt<j)YYmylen$9D6%*V
z%m996qJ<Aeq-7!zf*izwJ`8yTDHv&AUD$ei+xo(d2mS6p+R}$Vp*niPK4bs$b#(vx
z>;Hb^Q)7BxLuzoBbC7zLw&-AVSf`F>T%jj?_Nr&Pw%_S79=<GWF<)vy*br2Id8?xy
zU9=J+7zV`{m=%SPCk2%Te@tU*c&H;nFV87sgXF@8$j|*Y>6}CIt;c!kp>QAiq<r)^
zS3U95tXWL3K+iW|dx8+iHzP{ohb6MKrj_+Z7aT<(w}b|{PMkQXkA7yK-^VlZ##;#P
z2kQJoudjde=2z%GK3KsQ&p?hTby8duhYx%AgE8L)im#bYzUK`;;O+4y$!GQAIN_%p
zS*M8F^`QW!@Tld9kZYrYc32>`bV9~1`%^L%Npr+OAkIdo74%acCtdz1ncI}F;ce~%
zA7yv(a&dy^R3_xsg_Q`vl*E7;nR9*B*f5)klc?24#PLZUi=fX^+lqz&YuhlHUnjTE
z)E92r-yZ`$#mmXb?Jb>o`u|w}?^|DcU)~~F63MJbma`@s9Z9pA;>26w```AqvHhMK
z|HZI>o&~OKvnC1?N9fc{6r$$H&>_zPXLKzWasUkhMF^(n1)`9parR2mq_(F?{T5h=
z&f>-5yPmA^!1H=1<+GEn;(2xS4&{xnh@Y>Yia3O$?!+~I*=fO^(7;!+;iT$6P6)zB
zhfl0xA5minVxz^b&+8NNEOvW7L$}{?K!5ac=>s2=Za=O%uzIF$S-rb{>5Zp;E?Rrt
z8z@=cMV!*6S^PrGZRfGR?z;P(_JmKI_A8QqthhCFQ&@4ZZHiQ~StX++nZGWi1hvr*
z4I0sUiWnSiWa>syNHXGrP(n?ze940~zT;cueY^qQ%!>uLzv7`^GcOh7F_$ILnP7Y!
zpKKX|hgRg!%Dihi4zLzijQW6-Fme+uN=Ok)n<J_KW{Ny?e5y{@_Q}(fZ%%&i!}3jh
zTQa7Lbo!a^s9$&spWJn?9xU-xJaQl%2BN&agLDNu>$cl|<J_~i_WgF*e?2)yo}9(^
ze!b9K))8dEKrTLyL|bCzY%e!FV#pf(92Zz{*-<+Lj$Qadris*^{76lgK3u(v_yAma
z(BFEyM$PhEJ+<-6AiUJ?8OW7`=7ahfiNVZmRAnTL<QD%Ko@o>pNUl0!&dT(=5S=)J
z1CXr?9cVwD#)3}gvzm%;P<-tT<WdLgoYQ`>{>^XvSX}NcNV>bRn4jqxk-%IL%+5M(
z=g{jZ$WyXT`XO;L0=21C&LT&zSNPe;=$ehe7#gu<rUBn|l4N6p@yu0^cLc&xlI7D+
zQ{{Pe)*;ogJETusEq(GD^|unlop&;c)b%HhhN+h&e2a@`S1#<BSIn_Ize-Ln#E6gL
zvKUJ+C1QeehFnl=BFj9X1L1Q)1z2BST+#uiJK#J|`O2$4ndjPxl@6WuPj~+9TYk3V
z-3zBIr^AqJr_#*fBg>1%Ra$LtZT-8Fznx^dAr%8Gb6X5qlVo%1r#lLb)Cb|<uHv;1
zUKBEQMj<J707WpgZM>+DC7pMOpF19<v42bEnZSot>4uy5JjM2z*)@c+P3*Ke3_hEI
zJR#VCA}lGB3q;YB0-GGN<3cM&ZCuy_+H-`Z$$KP_7^m6m1{HHDw1?E|AHwZ)N&9j~
z@F%&*KFV|U_(}V;1An`I^=+@OSH0>l{CSPpD3n-@*2m$)WCqQx@Z?Q5zgim4R~Z4O
zK`AYn$uL<Ix0Np4j#WYy;EH#Anl%zju~%%Q34OU*R*|#l8k5GuAIQ%gJgd`~8*Y{U
zgm2OLim2#x%-e_gnNs#7L6?YGIfpHkrG(t=N0P&N0Lq=9(2G+HL4@c6L}a^tWwng{
zDrTAxOhXE+o8;gCvSK}g_S89@f&Z%brl8+sKl~~AIB&80ww|U3J?`!G^KatEIO5;K
zK^7vulDay}!yv}?%@2M#`M-EkqGrJbQ(W6(6{W(Qs|q9TM`#QW;A^-pss?{4DAS~<
z*iHbRi!BQ^3)N(eM?X~cVAit3%LLD>@tJE>Cr>InB2&$r2606msXK~r#1WV|3}({g
zMZYDaQ95&INbnsCf02Lq=(8MD>Vq6beofN|89$m(<e0ukSCPRBxxi_bW6L~Rz-6E5
zVKQQ+d`_#Y_^f!_G2!!Qz8$%;Uh|em^c?r#L`I#qPx)R^$KQ9;!&uZSl7E$zznVFd
zgL4lY&^T21Xu)O4+!g~ODy&EsFmmRwl_PeAA`3;ST1^^{zgRl!pmfIxRo=F~aI<E<
z|4Wf#%M=p+X@+g}ZqX7?9Mv)_9|H(2+oFZyL|@ZtNoC=v%QnQk000mGNkl<Z$dtpJ
zu;Yvh>lFfaxgsMc(G0WB=0m4JKsSdAtYd+VPH7mBH3hI4;ycyQ$=@`~ANiDY^KC-@
zz&d!wTWH#obPta4=X?$y@wDUrMe^y^5X+D_8&D3j_O1%M3x4JjZ5Fv8io)ayuh46s
zZ4{Ap17gSGaFx$IP1EBqQU9oToNp>Vb1jSFwYXv_-Ufk=kvuG$ITP39U^6pOpb4)X
zZb5J|e~m}Z*bOA)gd5F+W=;9EK==!trj@$jV^SqA=8z{T7@46ROml>NnxNQ)jtz9#
z5{)yBrdf+G4KqR`&xKaU__cs%T5+rQJfEYp&iM8EmA5@jU*)l0R=lz#Y5RS*eW&F9
z7P=>ra>rA7jfEXFXEf5_Pf^MeiASDWmTg&Z%rKyActF@2d!KWV=hcOBzQM@L#iy@R
z7G+$jU%{n<>3@(z_d|=rz)TE8L|tt1yvQ5@MaMidbHvAMEMztrnE;-oVTncrTkw(`
z8M_D<iAIPfEe+Dbqj%&qLD+5R;M_J#Lj+ONgZI)gP77^Mh?)B&FHZTDJ3pq*^T9e}
z|F71s{?7CCRUFLl#n!b`|C>Z`Z4S$Z?p1(g{=k-OPFju<KCwZRMV5zV65T0*%~C86
zD@R>$w#K6#%Hs&-P248<d0yK*yQ-8OJ5s2a!mH!XGJGk2mL-MfOxzTMWgv{Nuz>`b
z9Xd(OX%FR2UU5pHktIKcM>m6wT-^vOblZ}@X;9PXQhdS3F0$q$_mIJDyT)P;S^JTV
z)ML%dGi%6KS^4Q_rw-_#UtO<#+uzjPJO(B6Vry+b|K-`D{|)z!MZ}Dv0BTIpYBXCj
z1%OUHnO{Pz-D6-q+RohCY@?=`R?Egk7w|TCfohu<iZ9$Gef|b<KLZLo0oH76dk`m>
z7=-G$&ZO`i47=q;f_#v<5Rfk=k!bo(yQ70Pk&D7+mhvQb;jN;up^NCD6?yEz760gI
zf^2DU+cZLWLkqkMZEtzq_zfoRzR-njd`cW##s187(seiRVm0sAnWw+1UiYrQhvq8|
z(qV;d#xhUt{6LeoIziBaAxxqzpTwmri-Xy17M((YBQ&QpF?AI(&t7h+vAN_ys`L52
zIJ@cdG%G*X=k|v~)VcjRG5LrPEK3W9fa&H?MKYD(Gt#)0i~JZR^7DiWpDyZz2{gG(
zDJEFJ3>2#m#8tU9Q`F><;ucL4O=v(Kdl5#d1AP3v#v2<EKk@}65g*v<*b^5H_9CXi
z#hP{XjS^pC&)YjIetiAO?SKF77wan=EOBk|j3cbf->c3_%OXK(X9tIvnIw>A1Z>9w
z4{)v;B^-1{0G||KU@=|%0FCnxY2xi~T+Ob!<tTG3rJu3IRJMZ@AF)^q-b{g@T4&9<
zC(Ou@Cx;mur2up`g;ok}ii5osEbS0W*lcWtZosFoUhB9{BxsMkgjgDr48*o*gjbPI
z$W4B%2w9qHuqWneUrWqycyHwPRwa4nGjf4<=PhQvj;4L?M%DKA7-vlXvR?aceml~a
zJhFU8yFHFQg$kY(T51t&uw|2^7R;j*YDk;|BiK+Robo4!(kvl&1Jpy$l^?`stdl%t
zuHn~UejP3v*LFrv-k5SHh7l2KFt?QN7h5g`af%@-Q=pb$4{Zk<N#s)Q075ncWy$0g
z+LOECjU#8SG`Y}6X6KfNB66F?NTPur<kL36lk%cekQ!DXa|CPC5GRlL4~_UvW1oyH
z^cpg+Y?&#XM+0{o?d<HYGsiF0Yk%uui0^V_+E&cd{ERL(HCZqdHcdzZclN=srBWJ4
zg=q}}A`~DNu;W=43&*BB$@f1?<6#$w-;b2%m2czqeHJzW<Bw-T^s1%Y1M_w#j);Za
z8*Apb;T#{UrXkznq`_{mt!avE;0Dd*h)B_UNHeB`g6)v!m=H`8DPyaF2|1$|dXEV-
z6kJp0TGO^XsbkB?h*88+`y`IEkqccQjUmD+O^%(IQ_;nTj{#*bKG*Vy=(~>2)xk4=
zy<U6OKHbHU>4?|kGMgk40K;wwu}F`;Gy%qrW(d11zU{H?TV_!}-df!Xgo5Xa_QemB
z<{kN3w*9TQsWeBUj!!u6C_UmNEy<Md6yap%F~S;x$J5pflqe2(#7Gh(&&lW_$5xgp
z${b8#WGjUmV9^X&Z69_f#=xeA<rEVfS{oVml_rrx7kYwVh_%g5lb6_uFZ_+XyorS&
z_8x;&p^51UY@qEVArlFeIC!3kFAvD+A|1N@pCb8lV_<0EAdknC@+Zk8p@`RjQL~cr
zwkEcqc`=xgSDSD`78~J<nasjhmpo7)i7TgW;=4g?Jd0wfXR<6AAb-o;0>g$GaE6iQ
zq4hD4Nh4f>GBMMu@TccsIHQD*VRAFYn8SeWWlg<8^E@KPYzn?9VCV!#F6@`45ife0
zW(sUCG31FcX|!&DCkdZ4qrgJG_z&y`I#1Dw80B?L<1-}>^m*a2xo}wnulwc#FZl=S
zwQo5W>n|EuulXw8wV^9uDR>SI2^)USY(_}oqejz1Os3d?Z9>j0?2H2vZ-jIHQB1Zw
zKi_vpWMM{N>;w(fv56abPXSSY02ek{9Ogyr8IYxcuFUj+5G0@GbHZi}au5f0f-kZA
zkQrN8nV9hz6mdpAn^qbhKwkVj(a`XjyZzzE&>|<EE%P#x=Cll*0yIp+61cG8*6oVi
z1KA`ak8WclTgqHwe!lG1?R;5WI|p^>oFioNMI&L8cZ3IXQk)Idm<hlPC3xnujgn;B
z6a73i&neu<#?#E7(XB4Iznp&%lkd;i=B=bCLQiRW8chj>p9lPqf{UaDU|Y}<dXXZu
zBd_9&o;fNmHh$JfL1Js{5n(P!z<uQ!djat&lm%^k@RZ48O!2dXOvGgp<pRxY@?Zoc
z<++2e0{A%g)6z(-Y1>jDHj&vDw(*TkMHYU8@mFk-S(fr;0v~s3^53Zc@Qw?$=NO?e
zsgll+!cq(vWl<=L00lkIk$YK0%nD`SP)mb+q{7mgu+_o+^1(ASpWw^f8*Ww~*q8(Z
z1B@|)BB4z2U>H_mmzR#}ZidIeL}#wZ&D@2kFO1j<OZ12Yy8s3jzQPzq;urZlJOMn=
zRmn7J#w7CC*f2r|c5<AC8e=%yng<S&+yx#IHbpEO+LE9Hu~pkz+Qh(CwiJvkcG1cB
zHcu_$pV%k)_Vp;=J?`+^+G(f#_e9<uSW^ti49k|ZhR`f3JHut9EKmYtKTAR%wK(#D
zx3vi7l6=9re1hN6xcQhSKA(wMoW$_4O^GdutCF*A&XQZ7q@iX0W+i{NhnOBdK{kLs
zekdm5%wUE}<OamC@K9_5$UGHih5>P+Fmv#l6#+~RgF@Tnn8^pq4W5P!?bQ~h@gGu(
z@7TtUW*Uf$+hlUs>?ko;+p;@FoTg(JfG=W1Zsyk7w)lRP-H|z-LG<0hbt{L<spgsf
zEX$}09w;fIin@^)h6UJI&rKmm5UWBK65Da^LFBV^?5HBPh=Dq8JDdtYBzY)T_@EHV
z;aS7XgKZWS9f63BfT6-D0BtZ)5iFyy621))#Rgo#$hnr3-4MI%0BcBr0dBCwn1M2p
zJ;@U<1=FNCdZP#rikrPA!bCsdfeM{K_=#pHJaRP<w|VAV>tk;|>#3WCyzQ*P=hQT;
z#`M^F*B{(Z>m%w4-KS21f<?fjdDa9J8lA!7u(1IKe35`Xq<|zJIzyh|PwdEdY->hd
z%wk~nq$F<C!Y`k3ER)y3j@@B%!IX@xDjG@g!3LrSRy}M>iD6ODjS5Eav4<?^BF-FJ
zGbw^5l~v7Z5q2^sfM<p}zvOSJB2#IQk0~&$V2Enw94eM0URpee9Uri58QaAU8+@By
z%XW2H7fo{f@>?8nQm23-W0uOZf1Zbq&Ab1{17?y;Zt4Rn+%BLt(7K$W9~8K_@Xb;R
z&jqqOXKbhQ&!p(=)MLk#-<^izV;TYu-7xT#Jgg*amuw>dSoACoWCfCt>C_RQLR82L
zaX;6<8Hp2&iX2GI>)hjjkC{(KW_FF;HtP9Mf{lKLECQqnRVBqv9FT<#3zt%S<f7oB
zxGi7P;k9B8<e~|VZTteB)V8f7KjstiZW1`QnKv?F<9z4JyxQ8@{b%4rCYc`Qyg=3m
zLs4@j;z4qqd`J|=01<lZArK=~e<P&RPZJ&0V0Xz=H_Dm36B^`VYB1D^iK4}m#A`^l
zC1E2=jsOq`3uj8%i@g<`+$==~2r@P#rG>RDT5oX_v=q5GmJ5m4%wbt#{u$>P+O{A8
zOBB1%iDt~K0ku-_ng{~#))5DKv9rWFix>)o#xycvBkr)?^_i5qMDExD3SgHxn%;@C
zrJ7IO5+k}Zc#g#Czrvm?&0<$LMM9v+IAOtKPaqYiT%9^VB9^v!(=oCnmCrayV6IuS
zt!>trDJn6`Dqzwi!NaMrDZ>J0fumw6Wp;U>D8NMD;IPKPvVnPMfYSsts?ZQSvNAf3
zII<o<=sm$J`XMuihvgxerintDLe3&Pn&&pQA`cW7l(DNo^xzpF3H%3ZR@)YFM4a{^
ze)GtJ9XYVjla>o$kbBlxyC0xQiC{h4=bU2F7=l{K!Vx;yaI<od{Gya+N6<TL?B@e>
zSu1oiNy(Ozyrl`835P6`sKx}g2DgxTFo&r*K4r^xFSK_yGI<E0y4bt4m4nnkjvCCc
zv;)MfWDWc$<{Hof1~fwAV^r$A3wassAP+#IXdV&BG^A{eY0?1KG-TfR3ch$Fv{x!m
zl93Nf_z!HNUubm5JP{KtbfLXVkM_wNk&76?lu$}u)A;iZD^V;?ZDe!RBXA%m6v*Iu
zM1qAP%4_Bv0!;}i+dd5qEwlIunN4wq(!d?)N<tz@Q+|-}%Mg6WiVcDlHYUa_X2h-+
z6k4Z_G<0B(MXXz~O`H(zhmLCY+?ltc5Cv3e3<E=nE9}NZ;l(kA=HyL84Afu}KrR{;
z+e*<RBVfr2DfBatcop10lhP>SiTPrahE-@{w5^Gaje+L5pyE$hnlfbTU|qF*89YdD
z86^}<j8+`BIcHcUXhw=t1u-L=(E$vCG77#3$MBd{BveVnDULO!NhT4K<S_m~8Z>%Q
z&SOt9&XN#mn3y(mBVZIcz)GALjfIVgS&|}4YDI_<W>`b!Ps*ugE{;ytA~JD@lHZK&
z9FgHMbSB5b@SziXCo&42BF?O*SWAiA28PTdbaUgO_=ub!7?U&&K`@{rPb?2PF`$FZ
zE-hqji@k~G#`t&^A7zKGx|){*X=rnp1fUC0lBrPEsUtMNKutpiyT%~_Y?-j~j4I;H
z0HVt4DhnwlpA#Q2NtbigQ8s8LX>3fA1X2>MCWudVX@ERbBvLKM&sInwhm-9rs`F`^
zl1OmZhm@4JNu(0<iMVFY+#Te>SapoZ3w?4>YK4tF$@#-Bv316k000mGNkl<ZdPp^p
zZ$-xKJlL#J*k`SZ4!*$38o`Awav=|ttwqP$hSWOd7LXibAFu~uF*xTOj3lVWeM*l4
zV!;&^IP{|IGlf{10l^535kV`CE*aV+XA&JGl}X3221zHWPIMJlOUT0q;#XsmWEnhL
z9GpywLCz_D!UBLVaRf8B?Usx4fUe@_Ps0szL?&c=Aq^~w9a*u+Vw#e(>81FT`vOqp
zyT0T{J~a?}lDD|<G)Y?n9}1670raLZW*vk{5{S{a9DA^$PfbDtv9Dn*@*&|X<YlW2
zujM#Jm1Mi2bP9)-n2e$XD@Ot&!(28=7n%eOCW$#T#VEG@$fSVr8<9^?;K8%NN-{J7
zzu92o8ru|eOw5@HkQMfVF2EWxHpU)rrP$F0q8IkFILOQK3z-W^ShpXJkwND{JrgL!
zBC3pinz1Z(lKB%dh7wo!5EiMWtdBS~BuCh~p~PD9pf0wY+a0<Z#!yO}&~3MoXRXkh
zm=j12Cccno9vQ!bXHg|-KrVye3nA^2mIP!0HVek33PCDTDV6)#V}twsesEQaw=Szp
zXm6T8@|_6bBG1*s)I~xAdT^y0`84pE7MmjG$Rb4$WP%<-k6avc@EB-^6gnX06UiYL
z7Y137hfq%%#E&=^gEd-S;7QBDa%AT4kOqeRA-s!b<Oq!qsK6p;;oEpZ?#yHfzlN+;
zRu_D-jE#{6vaXgB!^mUrwO{x&GqScrZZj!)Em=x%3z>w!7-&d0DEfs?IU4K;n+(yn
zLm|tkA#=+!&#y624%4i`g77J@Isq05ZRi<X@ngr$!6cbR8o8hqtSC;w&R}Y9VlJ@?
zzWv3V<jtm%kOfMy#U~3i_Q+jJJQF`4a;=UlWzIrg*vSZi+&;q_xwfp>^n4~BGLwIW
z25iY`6#4hu=qof$5_ayn$O(D)UN6l{eBm!>VPkO1$Y1M&Y}QmGW<qH%cz^@8WdhmY
zVJt}l8iKn@npu#*Y|ZGazsw9R8Q!LdG|;A#Br$-<6+EHKLTs5u$<~;xU<DzwNfWt|
z=UWQFXCZ}Nft*}2a%DbzWcMy=EOJC%(bKdd9Jc{f*kD_tndpUnwpjxPo&>ARk(Y;(
z;jQe-nE-{o@fB+jxQxDcB*FSNNKEo|%ZP=YX;#}t4zGb6UjYRuwLtD*_?Cf1Iz;WU
zhja^as>+!O!TmZMjIc-=gp$My1TPPUWdqA=7Yb-kQYItGf)xDDkjz5Ml1MCxEVL!$
zEkiz|o>^3xs~6bF^BGPi7;y%R4RjhT(8xpEme32c$Sh05jxMB=Q{uxEwwWt9cZoul
zm_i<ZP0IzQbq*!+VXn3zj)^M^HK)$EqzN15H+G61J{LzCj8=-DbJxKLUFLS?86=EO
zYgusHio@tY8F&S)!IlEzxHCq?cH)eUfCAQBt?448X`f}H=IU4go~F$tKXK*FNvIRE
zM3P3HaEdHooB?ad*t+$Wyaoy*v0#gxP;#zd=-3&1+@xVimWL$l-8|(ceo}SMJIND(
zu51l*)1cVUb~`GEZ3%u5d-ScaBw}(#Y-vg^*rPXed;^KO=q#@r61_4Xwqh=k$6_Oi
zm_qJpf+n7=@D;nP5t9rwL4oWVZXKz*7FysylH1^!&st4e;{L!1+k7Y$i^V>P7FgT@
zCw}ZR6Bf1;Nf$|E*9;O9i7SarB-n`)CwemKr15j?vJm_?evUkV?ZD3-Ld~lNXGZ3T
zps(oIF;5{MG^B=Pe2OXgX&kyV$Da!-g)z2)VotXWj-4M%r7p2i{E0KBNi+GEtpOG|
zbWPL&e-XeQ@_+{`nD}Zyj@?3Mj-lvfYS4PCYlDx*GPl+T?3w~u%U`YO;6S9oYCQ?i
zDIOVGj%q2QHO4xNT`w#PFpCp1voMpy3~Uk<IwyG``VrkUWQr&j;4B_GMI7Mx4`g`>
z2(7_<$VGf57XFEEaQtUtjES$Dz%sex8@WBH!eeI>Lzal8H6I-U37yC%-x<o})&9g`
zx0z?PS(AwGK>`jK7ch3+KztNkas$MLBj)MmPeaOlEr(7lc!f8-O}CN)Sj&NQA-I4b
zqOc4l&cT6Qy2OEGjf3LXfTlO!IvJC&NYsFmgjpmBn4KqhlT;^-{R}O1kr#_^93FZ5
z6Kl$1Op%GVLkycd5(nOmSA<|W&;w{${7tijt(ZSCwzlL)K1_b<<D~C;qE^p)iu|l^
zmH*1)<tJV$J@o!k?3l9xxiYyRJPny#YpgWFlZ(ub&?LTyQ`TbSBA=$Gm4uJT6%(m_
zO_dnrr7;v)<|=e@cp7ahaa$L8VhEj<;}nJ6BBH731WY#qn$eH1<*Jj+Uu0&I&|-2U
z$Q30g<Z`Pi=I^;8%f!GOTN25lMlWz^cv2cwkz>=lvT18ZXNoYx&!#kl&%BvuCe}<r
zW@G{io4iFXJPoqhMUsf=$39Hc3%^s-4?JJvnNO0RaIwZC9wg^~*7Bh9<clwmAM<dH
z@3>6*p6`&q?K1fR=V;Ji$+E3EaV8U!$+9L-GQ2{gD_aVmJWN3bb^#h>Kusfy4fcx6
z@bT07h;Ne?lQNf-wQ=r&bz@E>!kKB*hT=$|K!gb#Tt<OgaCqeXCb?^8b#k2$MWfh7
zf(1_8=yLBjiOpF6O)KazO&Z)TJch=!)y093wua``vs3a+Ok8}tZzUr)et|SRSj;ow
zugq!54}XBh-}<W>&$?WG@Ocvcb^N62#-pk)+^YH7TY#HYH{7PW8CiaK#YXo(M}Ep<
zq{|;Iopq)Xmy;ywG^E5?=9px5q=yw=VDm-5M(@OOd~iZ1)+j^UA`}n|ux>>r%S}r%
zw5&czJs8iRKoo08BVrgFz_GVjFi=9+IJ<F{LT5XIMN%cgrjX8JhzYGEk*k$LnxfVg
z1@}-v=e8hR1aEA!OS1dYNP;T`$sB{ln+2PO<syjRFmWaz{=^>8G6iDp>1j{U^u2#Y
zzTa7@{5wCIGJp04)#qtY{x$OLcS!k9S<}E<kE?E?Vb`Ghvl}HEDtwfGP;~jDR1e`t
zU*=UHIg?9r9$Zj@?sc%#G^Chc(<DXCnv}H<OOaVhel3e#<blx9H7&JXhG4`Wl#yiy
zFF+sC3&lBfa3I>o5jK+(kbpxuJLh~oWyIuaQ?voi;!NTS7{Q>pEYc*F!eb_7AwaFT
z0FZa1;B%##SR%&ERa_*V+odA3Wty(mL+{&?m?JhiuqA)bxA!wC8P`q6R9D}mx{U^P
zjwZ477;8Fs16+LhXJ%=vZaXd^_ah!CU-}?!(fDy27W0d><f|^pGB)C33N3O+0Lgl7
za6rOLeZ)3|xnP5%XuCBZ8hPOsRrdrwgNQ*CDl3a&U_%E3<c|TPY4%rR_!)o}Q7h5o
z3oTPcitJqNT=glUDYypHQPhoIS$JQuB#J)v22Z^chfD#A+hBInYFfchxDE*$PZP!C
zqQJl4%dC#r#oL>n%}d0??ysUbb=@s0c9W_TRp%g%<Pw0~m4!~64aTK!lQ-P1d}-?Y
z@l3n$fjxh6(1hVwski{=VRf9~)L?@(FtTJYu)GJrM-MVGt?6JVC!+v2jT>obbHFa7
z<%P&O4jT+@qXTTq4hRh34ZGCBS};XZ5@;-m1)1U&O-wTu-K4U3HW6TRzo)@P@rB<^
zA&MrX2xH%*X=~rooZYxXGfg!O?U>+V4r4bxg_nhgJ%Hd`SUjJUXHt^f04a6y!GXv(
zcrP7UAhP567tAzG#f!+<@_A=#vkoz@D7wdxOybb8)PP8c)Vf;BP-Yz%louKeI%xO}
z9bAZ{A;<sv>y=~V6o|6Fp5aPlP<$4QSLoJ52M6}bnzpb<<H0kDkYFXLX(jSPCgqAO
zl6Mw3B&Xn^v7Kp>07F+ANCPJLF-@99Oy~l{Ezm$A$5f`lg*>;=5&D7WO5bvECsWxK
zc?OZ2%!#1}P7JjS;?H4e(MdwB)=N6c?`t<7gD9D|%HrZsCm~EQgf6m$L68M5GMFAp
z(QVXLAH#CX1hxcU(wYtiEDr7>Tqx3c&=Qdwvq%waG>F3<oR`r}fea4V1R=U@+0fh?
zZ7@pb7HEu9$i{SO1dJ`1+h8S8>>L|JBeKx!Dvd1~JlK8QYG{n28$)CNK6P^@@}fCo
z;$p}miCx&`88>)2kgR_0<iDCBCuJQ*))-$%H7&(dIU)-Vc+CXg8M0fCo|KZ$1?R+?
zQd;4Kt;t6Lqw+wv#^|6V{9;$(0|-l&*0f1aoJt&xH!)g*P>M+taiZSqos!}swiUT@
zgboH`2Ws2UCdvNLj7^!4Yj6^zz@`zVu%ghd&o1&LQD{^626Sd;iCB&;ewC&oGrEGG
z);Mt*CSvU0(qPy5;TLcbo~69m)$J#e-dzJZwjwyde7(ltfGllrXvdlpBW&e=s>xSz
zI(WKt`hJ-d+TIkk84Tm!Wq{5wrxAg*+bl#{L=yF?@Zij0aLI@RLx$JcXO}nzu#D37
zLU3-?8bg=dJ1{taMjISDU`!ZNCrelgoT4U?ZW4TOitiMfW>lO8JBh^@{R}8FaBhu*
zW(iw&qs((_l6eUUKhyNsWWIbv7>{^J(vb419x8DH!|Is90dZ_FWa~EgOW0?QnCwD6
z3J_LjACxF&Q4O(%6saONrvS3>%bO%xuI`A9T$q$Npkre$(n1&z>o@fgc}CYVOf#r#
zP{ZeiLqnp54hFoYg9GB&V94HSd$E`>J7Ok@G)?R<QFI5JZB9&0Tgr#s*oK}-+<<t=
z$O}j86T>uYrm2Hx-XN}MRCI%QgBV7qH1@nhsfhajs-0w5tO6T4IIvf?myYhPAh|{!
zyoSvjK4YK6dh7{oX`-B#GH(i<!q}F_m=)C&JJyd0LK$BfJs^S8qyTh@<$z6&XyBGX
zn1$dmboD}E7;6|Vh|J0L!!?AAbJHSF=-_~D37KtqOtQfw=S&WtomI#hv#2z#&^fQ*
z@LEa2P9!J%G_B;8TSa3`qi3^F<S3K|CDx2C4fX@imtxP0L0-Q}fPm{^FGTR&f#eXo
z;J}6s4kTJ`iFu((uBUCO^F~*e93M#*`Fco3ICvZJr04_2ri2__i6cCwp^dz;5g1);
zAfbBflD4mwu?R%9!O)gDi?bU#AXIPzCq_3{OfGgx3hJ>^_%YE$WTr`?`0~_p2Ty~A
zz#}&=7V&i&fv>Z3vZLZ3y5&}EiXCTsgv{rhA<5E7E<1z29Ec-&P!G&^@m{)xoc78>
z$2U0tIS^`*N3T8d@Km&*3mc~v!K>ArI@m)tg2+<~u&GPoXYq$#E#pFs3_hC%4cs!u
zf+Uy!c=K8xgV4c&O~By5URh{yY_Kv3Q9Wn^&G5uCs%0brPhQII5)CMl>)YN6Z=OwM
zY-rHTVrrV?u?28tZf=vra(|<NjzT#v8`$f>elp0NA=yFNL$PMq000faNkl<ZoYrGQ
z1~+hGC^mNsvKSm#gBpknPJN&xax?1?Cc-oqYK7hfXVYg-s`c0=OXE-tl0CR+4Tu9Q
zOV~9ai5;j1Q#8(=eWPLslybz8B81!{6SVqppO@2y#)pY)@PseX)0AZ=3^@g#wxkJV
z>{4u+;}jnpxw+!TU}wVTmN!pBO7pXm_(q|CE)x1`e{2r`BI{g^#O)M=14(d$L)$q^
z!2!W<@LoEyK;mw2=-33anS(^^tT9+7S4s8~lZ+OVeXA434$Y#|qHkH`K-0+6?52qk
ze}S9Vax61IAN<bk_es7M&~gxTAvka7V48tMT5t#D#GpgsKu*yO2yhBZLSkZt2AqZg
zMKeqj3*9^|O;mWAGQdVJ<VIy0)-Nf<Orwh3mCtiCS9pAw_|zcYE`xp3!GSOv+;r9i
zksJf@-QcDv(FVsa=E2<xRvlYt+sc}qd=2fvlC3eV=9;GMk|pH9#;0IQLPWj9fi7|c
z3fLH|A+}l{V~yp*hjY!a%cy%T(gFvNEYBwr3oQ|>>0ls%BMZ)Az$vClz6RA!;kgCQ
z$knnTM}}@`1U4q|=+aPP6iriXXq31O8h;ip(WsVV*UvBGD-Lp9QX(H%5$`U6VzoRt
z5Zet7{gohbW7C+qGFV57+O;ANMyDd=^J<*5tu(W2_1xg_Vx1eleUOLW(B9+~xt3!r
zXgSwBei~}WCNP9;{3&Fe!Uc_r20EyrG6Pg&>Sq!a1uYUXO;9E_Qz3U_Vn&9(;0+!$
zCO8dr8ijfBQehfb@Y#Xgn`tEzrvUY>6GP_iVRE`Nq;!!5H^g$CaLCp{1m6`T&&Y!V
z8(PeTTSDfI*_z~$XOS8UIwoV^>Uftd=75P&X8l?p&;sIX$G{3LXKPsQMSE>5?OCmK
z=*n08F`8fO!i%7+E3}O>bZ`Jt8@$li;%Hmuo13CpUN@?Yg5tJ}1{5zC*%?~vJ)y_G
zvcTxGAawbbUXekYCMkZwnAe0;1M|iPAH-7TA_sk0V9Biy4oLC_OX?WXE)Ee{a9~3_
zD+i1qivSmTvsMw$<iu_J4%W3}ax7am`HBM^Jpyf@OpSraL)%MEp~n~}^r-W169-bx
zdj=c$3fo8fEy#%g2nZbv7?5&aAhw}`=X`a;WR=88R6r88nF?ABR%42ue<LBVX;x%T
zQ#QM8!pB^-@o}2Of^$m@kG+|rVw3zUC%`~Pa04fXl7FCe5rhEt%0e^WV!O<(n6@mo
z0R#-iR^*e4hNeLRl14<OQC>~Q6x|wXjcxoykl2F+@17&_WsX|QJErS;_rD#N$O?l!
z<Bb3K%Fpq=;6K2CmZKnp?6ThaYdZX1keLWw<9tDC$?O_UDKf9+Bqn$VZvcMLV+`GI
zT0EyjBb0`u5yn5XILsV0Xojq09eyP_b7Xad$^6QZIf4U@0wOpN-3Et7r40_fHdk<9
zudL}k!jSmd<}I57?BU0Ot)nz-7CJN_%h*Dwe2SI_!&+>Hq7OLh4j7Tfby^=-tf@Wd
z(3P+J1)N?5s6iaY6Vziv2M3nfy1{iTU%XQE+ya&8G=sz?CNCgZG^1&B%5x}Snv+<W
zz?>2jQS414om(RDjL)EP9xz%ihDsrDQT!s`;Lwq8aOgY3Mi(52euMYYkp=e3$T2Bb
z<_pn)!4}W0)wm;alUs5PT}iNQmIevlUenmcM(}~s=0IQb)f+CW-q2r!&ph`L|A^c4
zZ?0S4%}AhzY_9|k4v37`c<0mC%M?_(^0Ppon?unBt>|J89eE`K+%-YC3CVP-d1Q^H
z$V_8R+!<f7Kutro0WJB-5E&Z`y&;1eI5C9Z0<l5BPy;81HhR=e2L~eGi-j?=k(|Jq
zRwvEw>io>@9DTLPkkC7M!*A&5nno8K2&uM_g1PNqsr5mWHFYQCUwhHcnRViYbo!Um
zH1JZC5XNnTp+jnow?F!MA~9PQFj9D+lf;K&3we2xJ!B0jV1t2X!Qt^uLj_$zmL!7k
z6Eg9k*~Ai1S#@NAo(sd^fC;+6p<}a)v18_r7aWLwgG0A3cEJHi1!GfzoUp6J+?q~s
zE4-~_*_IfKExROi%OHZ2cW{7sS;AsZnK4n~1@p!6<a(3V2di0AcY%E6;p1n$;}ze}
zjrbMjp;y>6R9<8W91NJ5^1>0U<J+3AzDXh>ar=@j(V$M;na(XzXrpS;Bn8tX#cz!r
z+5=Nd6A!HLqhxNm%7L4wAz2)?22k_hj13*!z=<Jq3MA$RH;vN<V*)2_usC81YFXq!
z=ee~yHV*8+tws_|gQBo(OT%(vf|tfv$^e2lVAd+Jo(4g(z{wx<Mfbl3u1B;@e7V!v
z@Azjwx#Rhn*!%&&Fpv=pFeFZlpc5bXjMNEIWOG}vQ3oVNp5h}bK#rbbgX3Gts2jbu
zH5W$fmLfQ}MI-FRFIeFP9sCu6xNQ>*WZ)Xq5M7AiuLR8LG0k;g>(+5#b*vI6KyJd<
zCg;QgSRrQyvMfi~E%sS(fafvl9`R3|z|*w#uUoc0#d1x4d34Tizw#Z2-to^am&W%?
z{-kxvl})A`!GZ0ouGY@yvdfT8L$;-486XM4%4Q4+-Zpwb98IT5EHR?!(?Cp}MW8Q*
znHK-V#Enn#ISZls!0wCa7IKOl)VjTNWOoI7Z9?w_>^=FUSJTPbBe#=y)&M4d1t8V=
zbAgKd*Wl<H2o`+<#tg|<=^=-HS$mFn?qR<?X}QjN$IE~D(9@4Uf=9~Js{B)u|HQT=
z%U(bn+i(9EXG;tr7q|fBfNwg9LMzWU<OOZV$g<a09DEt&8rLM529^*GYz$_oaR{kt
zt&hk<2HzEIatLmqB)b?oAydTQK*!=#03*oJL-$~g$dnk^+v^y?ZNMoyP;A;3A2lGv
zXSw)z>{R`P?KVNvgJ_Mvs*?{No)2C5^4~f8%9sBb4ZL(Zx$_{xv-|XddDagx$&c;)
z=@<S<U4P4ay)_;60bt*BbnIUpbpYCXKwAU(baX_ve>&=Y<EVhKkIypu$I-DrcniEb
zI<{6vJ4Rw+JNEB8>fxPkY6@Xiyuo|v$O2jE28aG?Au;3Am|GsW!Y3x+R5TD7OzXr|
zrgdJ}2%j{oap>6Y!s4OQ8@Db#@3(fvYhn|6&E7MV58FKF-hb%rFMktF{CV(Car^vN
zt0&$6yXv&9-_dG1UR%@g#?X9$d)$1-CS;L&A3FE~w6%4-_H7+EIz^6sYznOX==Sp&
z2f0_!E9liYF7p$-C`h0YCq~#_QRpT(dCdgh9T=1-cEN!Sy$;iJ?4kR1t@sQ%&1qoX
z0T{yoq&7J8E-cMrH6NPx9sA*3@g5>!_OSOZ=}RxYW7>D{@5s}iIg4esETVTqrt(<w
z25SvT+2+d4?GBq1z=|D<ovr+dvnWJvjls=pec;<v@I3;&+b<Z%a87I3(7^$6@j7>D
zEJoxeAZuws$8(ck`V?!{?QyMdKmKAr^r6S@%62`&U8(LJnV)dMwZq#ltl>Z2EFudm
z7MT=fo<o_+mNzdbEY<-da~{$>z-5VS<72Zhd<vPd<I!5M5_09(;JtKY4G4GfUfOE^
z*4+(S*fb<JNy(!xN=tW+p}TXirfGb9wc37xpYV{+ekl)1@TFAup4|WKqdz&Fe#dj9
z@tbLiESb+zOR+7RWOZucseZ{4FC#^Uv5S50Oh;fDotlPcH*(J>0%MpHBRF9A4Gw*0
zz*Lb1-xc8A;^07-4bG%_CrJE_{L96P&7GlYkyux*W<A>vz5jn+1b2NNcP+m6rM~R4
z+s5S=|93RupKIkCYUVX13nhaBJD@bqvJsjb0Mm@<1ud>%V^<UfZ?Urg@lwU2kqfsL
zgl>m8iDQEy?>yQTVQ_%h+ThT4hK+86#iSb>!hFTCY0w7SH{1H3rwh-0kuN%j&q7~5
z0<(R2gL_kJUQwqfUifokr!JrN?fc&)^TI$eO&V!TNM6}x%iJDIG|*Vls5Hrj7YEqL
zpd@Hc>LYRRQ;L~5fejrT*eeSi|H#EefuIcz9sMp2!Ay~XdaOlF-<{Li*Tei)rk|U(
zR+mo~o%es(-nl#ORO;@S-Mcov{F0mfEf4vL>BPy$l;$7OT(6gWtDJ@a+-CX$Ofgc-
zV4!yzd^Zzb+!oWwZjd-43n-^GI7@^M4qztc32H#Ki$mu^*x=AnZgA+0Z*V|~AI05*
z+p&7nr0Hd2OqXq4c-}wvL(jSa+1(!FZd=|5hJNa$x2&Fc@vp6(eBlp{?ayC2jRW6W
z^ZY&B<X+-2e%xbq#F~!qV^d>$fX89Y^O2@K9X6noJFn69{3hgYY^Zs`bMVd^wX^dk
z&ER?G4Vnv>fncBj?SVokzk$co0vkH`F2I^!ZPnqs1pAf5dC4^S1=DJJ%5?19N31SB
z@9+BJvtR3npM9h5!7=WE&wb+J%P&9aZ+XBcww`$5dsa`l@O9JUAM$@rkAKjs8lLdb
z1z#5a!9O!S9zOJC7yQfwtR8j$zqh*N{1>b)I{$^ca53}-F1g<eRtx>T;4g-Y&i`I~
z?gZz;-%Ysq{2!SvKL2O#5-vLT|5{yg-s}AEbKmWUo&9lN<`aL>;(e)x{YB$`)BirI
zz&9Iq9~Jh#3j585-B*>pkK%r_VfRsC@2jx?1pom5|BNU<B>(^b21!IgR09BV4?G2b
Sk;yaw0000<MNUMnLSTZB9*xuh

literal 10121
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
YVUWqxH?iDKLo86Tl1dVP#7%<#3zC&*Bme*a

diff --git a/static/images/tabbar/new_home_gray.png b/static/images/tabbar/new_home_gray.png
index 96f2b0f8b4f22e386c9bd516faf8b3344a03e498..3e86ab4f78a9eccb29121747bc6b4ac2d936df8b 100644
GIT binary patch
literal 3739
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
FV1muc0Wkmo

literal 5901
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

diff --git a/static/images/tabbar/new_message.png b/static/images/tabbar/new_message.png
index d78e8931b208ed7bddd1e8edd35b30fa99418deb..4467983908bf1724e70fc81bc88cd70aac202c57 100644
GIT binary patch
literal 15646
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
Ef}kTeFaQ7m

literal 4354
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

diff --git a/static/images/tabbar/new_message_gray.png b/static/images/tabbar/new_message_gray.png
index ad691445dcd3839c4b23309e28d5d5bd3c6f3b24..2f7eaf3c24f597b30420932205a21efc1b3151bd 100644
GIT binary patch
literal 4590
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
Y0NHVzGukOT8UO$Q07*qoM6N<$g4NXMS^xk5

literal 3405
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

diff --git a/static/images/tabbar/new_my.png b/static/images/tabbar/new_my.png
index 797ed38de6aecdddbc8dace1f35d6be8957cc68d..c6a2563ebe3ad696c82c5b046fad0aa86143146a 100644
GIT binary patch
literal 16122
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
M07*qoM6N<$g7okeKL7v#

literal 11842
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
W-<Eo33~Yc~05TGa;&q}%LH`4%u9OY{

diff --git a/static/images/tabbar/new_my_gray.png b/static/images/tabbar/new_my_gray.png
index 6db8a24a61d99cbb920292963ae66711c825eb2c..85bce0eac4544921eb5510cfa985da5df7d10295 100644
GIT binary patch
literal 4071
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
Z0|4kZGBegK#LEBx002ovPDHLkV1nyu!pZ;u

literal 7798
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

diff --git a/static/images/tabbar/new_order.png b/static/images/tabbar/new_order.png
index 54d44a342856f697c436b0c9158052e1e7252024..356dacfd85580ab8ab9c07d646d92b237a484556 100644
GIT binary patch
literal 15597
zcmV<JJQBl+P)<h;3K|Lk000e1NJLTq003+N003+V1^@s6k7ifR000mGNkl<ZcmeFZ
z3)pUFS>O5pKkNPW&L-y*Nsv<lgp-^qQ?V$5r~$1-uu!mE^)Mq*r#e=di-T8X$3ttW
zSFh=GI<<C2XB69tR;|~l(?Jr{3QR|EsvJ{L6bU(ybF$Chy8HXz>wUld?PP}}kRZ8a
z?RBsFd_VVLJ?mZH`v!)-a6F_s@P&arq{bzEVPIbv*nRInNft-&T>-H+vJD;lmmU5>
zcGx`+0!_xmR7%yugcQ=IgEtWQUq<+x4=fEo-e|atqXqjJ$`uRj4~?)k`rQ~gClYKG
z@5YG!Qk)O^z&4FdH+Rv#f}vcop8+8hboBcA>z<_-U%OxL{^Z;BqVN8YUi6)}>9X&f
zkHdFCU%mr%+2y6nE}w%>0=FakFmNSsMP2rqztU?w#4iu(z?enf{iSlC_d|Bg{{7vy
zH@*M;))iM+@4oJvblJ5Z(6RaVHP3$^^XIGTQjAVhf6R3lwg1jFvfY5<#1mg7#tRVt
zkmUE&WtV@rUi6xm>mhuM2P5|kDzL<cS_o-B!@1%Li$T5V9lW95cE-he=QZzC&2N?J
ziHli=0H@OCQw$2#5~q5Ai$2!{P_N~oJ`G$-(6=(Uch`$w^SDoA_j#*&zz0^^)w%uq
z-9r+`%U`jq^^~XhJ%4=m(7tP*CvCl3!(WP)GlL3b1VmYfDM2GHb7?F1$e@p(k-@EP
zpziJbQqBHP^|jymRrhB2`KBKaWJ0uU>8j}VeukwSZ<1dAi_1Ffs`vcXZ;fYM<mb__
z{~PVO-TQd)(1e$~n2N(?0zm`=61p15212*1`f7Mq=M>rnVxvA<3>6%JjMq7G{fBzd
z<u45XP=VuBeU=&1h;)tqLG9naM0@{J{El~Av8-|SR}Wo!k-y~6w=SNJ>aDW2u+$7u
z45PpblsE>|5>8`{krr(($6$fhxUXoBpRrT*6%Tc+c(^G`$MH(#U#zdW{0Vx99OJXi
zlSZV4>4LO>zxySE&nU5*-f_bR{Cws3z@(c$X<hxvN!#<!+0!}r$r?a*ig$3a!)#;>
zQP9ec3I=RTz})np*RdOtz{o-3jsao^iU8YC3a#bH+M$Ahvo-l&gK>)V^BYp_XPn^)
zMP^uu#IDi}PwnEL&yM=Yz8fdqaieuA)7f+VH{tVFfmqUT5E-P`EraGU#pYlD6Rk&4
zz^p<h&4nB=q1Zr}4nWZ|4hBe&LMOQBl_LalA=6r?KHS$_YSy!L*>}Av^yfQ_&on`L
zu&LPE&(2Dq>@0RwNM%qTKRi|kZ}%rx=T6sMbLvE|-y{a0Zrp&htV|~Kg0rIvo3a>0
z0Aer<Wa9ByK%@$fs`=2$F{G`P^vDaOFMXQ)g1;(#-B+l-@deULze@Ge7pPwHd^t2S
zzx0LBFO*&eyz;XDxwg0eUR8bH8vY0H<-j)sUk^M9*ppTMB4OO$#WSct`|aOv?cd*|
zc6QcRO8d^C`%jQAxXF*b^vlLYr)ZqJ=i|@9@CnK!Xtb2w(ydnyLOF`hv?cnO2NnRV
zW=narL67(c&}KKWJ5<=#-czJ!KUI3k3#8{hQ@Z$(steAQ&ODub(CytTodP^;pK47P
zd?51jI9DJ0#1kdu@3#PsIv@TLAi4id@b@#czYatP`?){I{aupQ(YAQ4QAmcB&nqdz
z`Xh!VeR6fvr0r8DUGryW>%gsleVX-y#ZJ*c9aj^HrpH|-4VTK+U<XAVT0G7|w^=5m
z*x@&ViG#hTNq)*>r58U}e(WQp$b`+YZTZ@p<@bF|{{0Wj|M7kDmH%0O`yYV+|2052
zzhGVQGvB6f{n6LzTYv0(^=&`;J^I!k0e<Xz^qp`14*kGCd!>H(r~iij-EaRb-F8QI
z;g>Tw7SiYRpz_aTy>6ql|4quy%CK&@UgIPCetG)X!S|+!y%%lY{NlR)&wh43cI!uL
z`{=)^xn9IX)I(_ZTw<CO7*>IcT{nw%M~+N6LIXw*igeB(0}QtxeNTP7G(~Uu;1TJM
z7}7ibv-F1_l|FvG^r_pVI}b>Q4@*amNk@+^a2R|9XpG<CqkFJ9Q-=<nuY-rr)!`%1
zhfmWjcbundZn#(<_}DY_i*J9KzWXO$s~`T~->mn4^uMdBtz`MR0;;_4OVQ%q2kntR
zgkSy&OTVbRT)dp8(M4P1tVf=5+CQlI!~dn``IpM`%T(H1-1Qlhf&r(|azE)3tIBeA
zo`(v|I*2F96YfdTlE4*>@f<QS{MVi-UwFRe?c(KwSCc=vR(jV5q)&cI+TP|R1({1Y
zNXtdsF?}xiz~(d;=K{ujZAt>#OW=JtY+>)UTzrML>f!yvxBP_O{PX{3U3Jw8&(Hq6
z4-v+FuxS(Oa1+UTKVL6B^{J&BZm{zARbJU|zvY|v9p3&!`t$c@`QZTO7PFvMN^Wm>
zq(zMF41gxlYxJX=uI#cIL!1h`8Hk5%nvaA5+Jl(bJcEzJv(LmA`7s9bhkqh{^b@Mk
zVjtp@&pQ)K!al=JwZ>i?=rIeiK<qGsAz7}WV_G;{*+qO1Y6XXqGycc6S9<S<U!q_B
zga1(9u>WC5AM`UN-0LExoiuq2?oTOFzGAxcQtR6P^5pH?KJ{DkeC%gbet0ZRQ&V**
zrhy^?jZV`dOXI~slO}eQD1J=rrV%^rk$DZ-akDJrQ^cKd6E72W5pROTtL<a*AMxnB
z;T91_V&{=ZtR(CB5qc)RD7g(IK%D_b4B6*e+;m@1aza`)@8J=63UMh0NzT|`fAe#6
z&gwVoHLuBFBYn_->_2^Ma!pF~zjVd^^{{x!cn@DOJ?-Pu*UyI!z02}fP=o@eA*F&`
zLN`sL2_Vs^Vn|hR&_Z6K50=;?=qG95N7IWqwvnMPNt3a(ltEtlXarJi&+<pEQQdk6
z^0i&owy+fkM90E5F`!W+&ly2*02)(~n;;|EfzDygL1V_SilG(BuH|t$eE8YA?V^9O
zkvv$K?%bEq49h$QW4iuZ>zRML_gh!<>X#(<qo8O}KpdvosUg_x4B9HSj9N|evXhY5
zFu;)cH^c=f<uG@CwLqFOq%_l#*<ISVN6xTrytUs1@swu~STcUv9Jw=)TlrVwt`MY_
z!)h9_$RYVEN9f=UL?6JsMH^iCeB%+>I)uSBe|x>^2fv~19;8cZy-%Uvq&L-@GAyj;
zy*IwmRX?RNcNurKNEon#2Yn%XBF|ydXjq{ynmM@32Qv2n@kLg~7`gDT$bk~hoQe!k
z)7YJNwscI&XVv)F_2Sh+Z5xBcC@Ez1p8;Bq3=Ux>P9(c^&BrMO(2q@U`+&19h(%Zw
zqD}h}W)DJMNFZ~@cH2K(FMm0GiQs_;I&jZHNh>KV2K(7zylBjKUikgUuP7QY)9g9g
z;zBcuB8z5>HJ!l-J2L=fC_oh<d(J~OjCRNdBj+kilp{I`34&w!d^`6n)nhJFoprh@
zO}+Ux)!{=}&@z|iK@yxZ5>lYQd?wl|bmCazVXNYwLjX9S!-Z>T02K^6t{WP%&+rYo
zAi*5pEnw9S;fF8PlfEY3l5An|fS==@BC__btgf*3OM2(+U#?^R2UIN6NYUg@bZx1~
z7(#}U#%&u#&XHxTu*Ic}R~m_Z=$X*l+>_gpGu*srNHqKO(==cF2u;s?qU!N{Ze4gD
zj?&<9IQZMjHdesAfH+J*8=ifxD&?QTry%SwQF!G*9)yu(Ek|RFsiWnPt%!U>2Zs-Y
zuG%A0%!WUF<nQ3~eN~mOv>pwP2GM7KrjsX)!V09qxzS#B%>~=y4`B1$PE(Ov`9}zv
zB<Swux+w#GY2HZd!b$O?Ng0r`%hFKr$UtjoBDBNvy6z`mEIs~F@;PTomc-vxW>C8M
zcImnsRkz=%{*%B~FF&x!3EwX;q;A$5#Ou72E5hUlT6P|RIZ>g6;1oL1`^Hg37QBJz
zLk9;o`l`L$APe`28!p!W^b23DU-|7<>W%~7j`?>pH2zYB`Yg{)nRg3AE-cOoq5a&{
zb;{4H{D|(p5T@&>m2ORh37tZ7XNm*b$e4)+1oLQ9)BR<T(l$0kim`(06rL;>f061@
z=c`sL4IX`U<cQ|m4{BU<lXUgR<&WQ>ZN74fePYoF87Auliv$f*+yqH2kIzbUWTYXM
zOa{thQ!O{^=Ol<j1K37_VVf)%eT1lkS{7n0hDXCri|p9E(!1aH<@yD_75T28_+Gx!
z`rEqdz295Mj=h?E&yC4v3UvC@xsr{q@b<fJdAT%RKvI$|3AbU20XXTAy2j;#9w7s*
za#U#xfA~t~pYShyOW`aLYeqIMI#=egSEp=gK32;1shjW6__G@{K5+v(idXk^*|U~6
zL2Nh&zAS^xtP|j~i(x6YM3+pSLxmknDLG}rBVutdWx|jj0&bADiI0$SHrW^SoDnx0
z9qvtU<YGIU*ZuHO1Rp)NS0Cgnt)KeUSL^bB{Ezh3xBpXy_I!XQCcyoJdv|*IQ|#G4
zR7sEof@T;_6-lKLg*?kPUo<CG(-8v`Q1j3T#;^d}A|@_YO#PS(R6P2spK*u}ACa&5
zl<LNtReXtCh$v8*{xXLQ#*)$G%$mhMLNvFL2s=q+h<c43c9BGwJc6k~(1T7CbateP
zTgYJBhbe1^*6yR$`n8NDh_xleJN7L@UkL9!aF%}McV4R3{xAQW9r$;tX$#H$I!W`>
z+i&0Y&Tpm_Pol@<Ve)V{-?sW7ku<S31tK(7pssT}@`(t@%xa#DiiXo6Zw(E;VXuAr
z<ZW!`ZPiV;YFvAxeDnx*=?8^!8h_>@caU&VTiKoFW-ucX2N5N5i*4aIWEH%n-bIjN
zB|r^`<$>WWEP){o%M%E(TB=>fp<4lAwHnkoVrOMOjJ4}91`~n#ds5`8Yj1q4e)3m;
zRR8Gb{%yVg`qOq<-YZFzd$M8m=U*`~jK8147ob!KPKE*P8B8)sB4KdRI`abC)?h%~
zN#RuD$YUopF)Tgyi=@50V4*06<?H!5gqI0|=G4xM0r4@RX=XsgfZ>ENc66E~+m`i8
z;Y-mMtInjCd_i#7;{_paDvz=d4lbOELwm;q`G$^N9Agu_TOC;-GVEBLodeTDVxh*9
zL@%@oMrLk_5B=GT^p<~jW&Or`&(BKt1@OGP8EadzwzqEkT3h@Q3D=g0k>?Z@o5!{6
zelp48a3gY7LD4$#awm<6yIZn{Or9cVJ?cVfYiheZ_Qv(RROC^Zc-Sep4aGsU@Rri@
z0vDH(u;3AljzH)TL>>h<hHV5=P;yD4Mvp`puw`inBr!Cat%?kP1;^PXlnUDyOBiY4
zrN)uPHcyU;$*jgy+-RC8wqYoAp%2yuUw_L}b=AABto{Fzzgcvz2T|^B<4&id___)r
zk$H`KOYbT=MzJxnBJ(r`GUA5hEaW*woY>Zd=c@MY?NxN-EK_GG000mGNkl<ZsLZe`
zzf*~E;M`5if-y#BF%)piB`DK-Y%OIywpsVDcQO^(mW@8rO$=)}g5y+DH#B;OK>>{$
zvEc>JnGhl;Qow-_8yRGuDbVBxD3IY~7#@>1^uQ@Hz}an)2P3cG+wQ!iZaVaP^?g5f
zQOEo=7s|W4mULO6<zJ^H9zh_529V{$IXWlFSOW=WiZiz2C?O2c2!W4*eb%Y+xo2va
zhSs*mjkoY(aZI)wx+^8gY8xjQenJ)`;wJ@=3L^t5Rt6$#M`Fz|1_W&!ONq?LLpV$>
zJkmitQHg~NTZz2HVGQwOdN9yj`-}~ZR|C7ptPSlR0z9-bgfS+yjA2f|j-02;V2$P{
z8C~qWee99t(|);L^DlXv_DUzcjFU<c9(m#SKAAN6>y?TqLfV)bZGZ+~uszd+wH{J=
z)R2WD8o3x-fUBl0UZ5U*A<`j!1e9(*pgF(xq9l|8xips8J&7$<{L?@%VtR-J#Gs)S
z5?$&yOm<lSBQZm)*3m%4%0y#B;)E@MC1QpYM?qvoM3`a2sX{@6W2ZD1S;c^-p0enA
zD6NYfvgNUdk;e#aY#d*7u?uZv(FKHGu(#{!^XbR_F)QBVN$2jaOHRWRyNkS0b02bb
z=brpiR2Sf}AfZDs1W%V{TJ1tcARIeL#U|ghBb&7?9XzCo7YvguqIh766+EWUk%CIi
z=4Q}3CP)byS)ng_vklJ9LxH^;+6JnCJ_`x9p1=bpLLA7NtAq*#c~b)?0t`oBNHn`F
ziN?EM9FR}gCSRH#{qjOFDZ>yl9(R+lZ{4&~C06+8@H4cbkJ}7BM(6LS*Z$L&veHS<
zaZ)M5vY%cuR6sN|oRL_pj9df<7*aEqW|#7Bm~9`+LP$puOMG+T^Ustid>ox+ei~`N
z!Vd^t_z1v7IY?hNO%ZXxoKOQO4TBM&i77l3r_lBw$;5OW6V-B2P@9w&`;t)R1kfZV
z`DtQJXf-{AvEpoMkk@>4fLHJ|zJ~>045Iy^Jq^2un@6H$Yzw&nGbjcsP0<ZCZ)lmd
zRzF$$|M`VF$uUkMYmqg0JH)w*iWx-^ENmV(YC7Xt083H5x;Q%CpFK!qD=;4Q@W$c;
zqi(rf#g<5MCF3%<LRBJIaS_R<@w3DmW@%OchS<^&?ntaQuF-mHLN<iDG2yZtCQI%R
za+GKVg&VdOU1d2-*#TamTFKK&nx-{CuN$uwk9F({P-Ng@0A<$2-a!1^gFuKbyx;>y
zpFzdP@x^43xd-aJIgfFg4()lZPI9oyNu-PDQH?AL5(ni&L#XR*B7(qBao0+r(;VfY
zhgl&n&D@!F-kB2mnQtye9)<i3w*(?CmcqY3|7g9Gv}R?;#>e<g$b!Q!esESF7Got$
z@L)R^lki4ILlhl?861Z+cNW9&Bm?0+^2kCv0Rw0JY63&2xk_{6gUr-p8ZUeV_B6EY
z9xKDppdWw-*^JOuY?e6KVy_LX(1#|zh}AZY>)Y!G{{?@jlFzPl?4nN~DeiR1k`@!M
zu{a74I&2t-p{z8quPB3E5NHa}xo60OV(6T2<U7H6Zol+-n1r#37IjXb06NDIjgH{h
z3-i*Nl`RQ<DV|}#%@45@I`qWm+J1>B_!-E6l(N=z;V>gGyl8Nm8;~c7MjDxD;xZH*
zO;nm3Kedh;h~d}(LZ`+PAts3!&10LJU>V9?eaIhuVrcQ-tF68NBP*S7vib@94rBY&
z9Y$-jG9t?sk15Ihk5-hF=FR9csJZ1Ngg7?ioYQ4n6GQavw+RN261He3)cQ0}TO$Um
zG+7)8F6hy61e{Ck#BtV?k+~xkelU`;iL0&Q2@4*V(587d_UJ`}y6IsjYa3l2b7`tp
zL#A<MtB_Z0;k_P2<UK%Sa%{6hhXfy6$A0j^Fs#S~9~}Qc`0UiIAA7Mz^x=iA6G#4*
z`muj?fp#6Nu#4M8QY-zXd<d?6heN6yBa6+h9L#`b#KN+T$a0eOI<!mU?9&vB`L;XN
zlg6t3XG4i0N#)QqN6^BW#b!l@0K}d|y6BOtHP~fL@nszaD>gVl+hF+iC8v?55JfaZ
z(U}|>lp>FQV#vtTz!@AHZ)Fg~nIvN)?DN?3`t!>SHhdaw;+6+?+#JwixQ-ohwT8tO
z8+7dh7Pf5%7QBJjX&QWQcS^slYkiD0zB{5}wv%%@2=-!wyo#pGuo0yQ>?A@Vx83&3
zgfTwn49zrTHu~EStm7cZU4vE<CtPC2(YB1vTn&yaC^m`dwLCbo+2S4uWi-k-Vh&xh
zt)%5N3uyr~q2)#128PKCeR$EZlBM_=`HDJ0gQ3WqAq+Wo=;PD&@CwlA;0#>EY&+Hv
z@|MvDLknGeciV<;*rgM;^zAb3I>s*gMA9USq<|FASSbdVFi9lcg09GERdKf$Z-L@7
zN`)=He%Qk#kKRSooeT`y3}-Hy3mCHog%Ls~h#;|&0aAn*t@Ys-C?Z9URZy((Gg1LF
z>(As^8e}CYy6|R+<O5*BV-Nvy(eS+F7~0TgN7abiP=#lB0?)(|jTDWwhcbZP9q?@r
zb_R@Xc1iStZhLf<`0dXE;MT9@v1!=ZmDZTX3u^yc_h@~LHNHD4L=6;_%I5IU^U_Mn
zRvA9xD(FaPo+1mtoACS~8RR<-#8OzQlh)9Lf~P!&QisZV67vp`STHjG3hM!cMvj`3
zSZZ0UW~@|}ZHcoXM$pDek;}_J=mKC=xj;L)(AashNQ@kZJhpf`SZQLhI|_YmVh!@3
zv8kojz7CIn?Bb(ovnwrc=ye=TLxK2<xI*t9v?WJ3NwJ-H#Xq~AtM!3qP2CMyazJWK
zf`S#Y0X>%?OHwe&LqbXLJrr^9g+}r730;v69Y$cFu#n0;4%v-qK<v%X2`$?qJXnhL
z;9A07xw<))h6^3JkXb{}<^rd{K!OXWT1n6}c1D-AS)G2YG?3faatb`sBpgOJo=7xO
zn&fH7W6;-prVTAGB@>vx(XgoidV>YVPzxT4tne3LK&-h#hmQ}q#yVaG2d~HztEOjb
zeT+4}8|p%H0g7hQp?rjZGMth<!H32*9n?Y_EWmjX8E)@h%^n)Zj!CmPto~N0B+RtL
z#v0p*mS3|ip$s2vXt8qK3wo1u_<`R*7CUj2i++rl%flMzERF(*VFn=@GtrRz@hxm>
zU_K_Pu_YQ+W-vBRR$((oiBG>lZefUhfov}5<0I3PHE&{QEw40vLlZ+i5Nspgu_I1&
zX3fY0;lcA5JKuU>MNap0#yJrE1~WWs$a5*8G$?ng%|g;L6B!(SmiA0a4f*+`m{fL?
z(zvLxvn^AM@iqJ)K@eO421>T^;Io8ld<!wB%s;dOEud({+NH>fOLD6?utpJQC<n1T
zG{ejeUqUS*Gq7e@ZIY5tlz|C{U<MPL0$1w?u0uj^K>T4{vFl+h^5`0{H~OYy3$M0Y
zuN8U?J29qd=hdEQI_Y82q!PPGPz!AjEpmR!7rHqYBs|*M5Urpylsw|-oU~_4EoO(A
zc(yeIr6HjxbA`0648M>$#ll0X(21iz>%epDQP|E^St~;kT(u0!CBch0wzV9Ngl}N1
znSVyuo6SQWD{UJIbb;ECMo##vUpAy31bSnexC-4nWk}Od#THlwXhqgO=tL~>`4*WN
zM%fC4R`fvogPX@bys-^$k9!|jO4j;VXcmFsL^?^%X>y0qBv<f2yd@i34Jjhw!Q(@G
zB~{4np<x~eE;)3P6ZX-C#>emjUg)t(1Y%jJ)rW-z7j~?nRQRj7gZhMGZRCT&6l<{{
zGIWky3NJ`JkQc*3H!N+y#G9-cP!{!;WIn4HP^GD<hi1BIOTigPAoQ>zOVfjetvsn?
zMGtQve8)rP_-3s@ctEiM*Ou@7kyxpQqRCWhEDj%sG>N7!cBQ-$7rTqe2}X^LJqvat
zh-VMs)?iZr4T-;#Bt?cE_*4KH<|2Z+a7o5z$ckM>0i9Dr8rX-nqh~P{|E%7bupXf$
z1&cgn8K1;9{?i!nmTWl#(a@N3V-1O2)^;8eIroQfhKG-^Q7~~EPuPSvc%y5XwXsbs
zMFtp~?8<<kg=|B&9kJ|b=UXSD>g0!we1SAbq7nRkwa|0`Ufs3D#?YY_J=WndGYe{s
zXJRHnQM6N_hw?nfRJLUj?qr7vAR&~n6-U|1q#Pe&5|Xgwgw8To)axrIvLgcufUYFA
z*^xsUkqyhlG6O0@3xydHO*89m%M$wJ;2s)-hA-@8Y@wqQ_Hk8sPtwG0Y}v*Jydo~^
z3Aw3LYbboe8@U=LHNBQc-@CADQ!le7Peg{zJsPmnn35C3&_#0qLDMz*80*LZUPkiy
zl>SI03SnC!Stn^D8%t8NSp?{WXwYV@j*Cj@ggvg|lsm3)UyCKr>K%l^HtUF^L=GCt
zr)<R#d!e_Q5NeW_NOOG|GHXO}3_FpBIO03t2TimI#3}Okz<!$4b^}BBZuI7}4SOL=
zql4oU9NzIm7d}wLckCO8i7v9GAIr^=p0y22<;;@7Cjo2oFL!6?;DFWzgic{nnk0cF
zl1SsbaWs*WMo%)y+CzinidAPXv~5{p?(lhg3PTJfc_BlmX_7tU$Yq|m?we#_BTrbA
zhAj`twi0a`FoG^|#U3`QLL`%6`26<7%8_9v59|!!TdY~r=(QA@fy740lqI?8giP4W
zL$Ouz=TRw!?zUr*0pRb(3mx0t0}NfPt=Iud?BK+}uXS1uA}qvRuSu?(9l{i`#!1jJ
z=EuPfEu>B_(yylTk)}Kz(iDoUJXR<s4I0oQp`yS6q`)NB$(vXdV6vORN_?I&$;bGk
zmd`v*{;Dt0_&Z;t>Dyi;fydweYWY<!(CQV>mtOW<jhFm2jc<64^kVG3`q`?ldZxzn
zo*{k3(=?v*6xCmOqQ;k8Dn0FD>5DIsFMSk0+kTOJ$wkV4jjTtWFFoQs)dgp%9)7xX
z=00f;i6pTA%~Xbz=7t_q5|_ZKMQiznuGmnsksGY=*|njO2^^c~+9&#!v!<4VmMp~G
zuDb@LbT~~52C}o-J~ljC3dl1i4GqZLanYsOf=B^g$t<2bZJJgTHMo0;5}VjJHa0_U
zdu|fLlXMNKWwDXEnX4c8n+)t(^2Lvk9&v%j7d>3#qVtviSAqOzbbk2x(!<YHoqvve
z-Z|2FXG!Or4S>%&OFEk$RL?v^b;jwc(@v94+XvpK`C+F@4||w&$|=%5FyGX8&t7@&
zKI!z+HJ^(gy51$Wl$^!@PfDJmM$veuMzDGy3=-Nv1`>!($Dlq<=)sYD@CQ4*1Nav4
zJ<$Ly$8l=mcU^s)PGaGL1473f6grTh1V^UmAV3PuFtX)(QC6GDt-t~XJ8LGP0t{$k
zNNc@GGWvuV#O}{KWTLR~%`eovwMRO%EgcCQQ-SL+^kHZ~t~~(K000mGNkl<ZhmNQK
zA37=>1P&jS;RWx5=#WLf=#I(w>&Pr0JtiIH6Y%J)3f_j!S0Z`gLS~jw{!=}2Uw(R_
z5b`z+E^-s{)T4E-MeZ$!500Hf1I8!y$P^82WCf`~^Fpt&ptU|&ZB5+`(LDOzJBAA<
zeP0VqK#%?$X?f`Qw;UqEGQH-rVlzw<DHb-i`5-M%3Jj8(k*Amu-546coXpUf2Bd)1
z6gjcaJ6(0^UZtrdBr;O5ZvUZfB(8oew+uNR=o1W`Fd*iP(9i>Y+YM?(mUY4xv?nYq
zncXf!$TE3Fmj_DmI~j?}(@Hf>5-|olqGdcLduYfU8M!Mq4MRm7Pb+)|{_uP}EW;X#
zUHf3u^hBTHujRmEA?|ujVzy<cnB%zQRL-zM87?8f6-<-@kj7{(<e{VL!XX$yrI7wU
z4l56hB!pZvNm(zvv7II<iKE-Dp_v#d1{1lLapTRf92sk_h2a>M6#JyL=u2k(BK&4>
zCCU7g4MDx&$dXTEa_F#8LmSA=R>_wXWrBr{Jh_8KuIj-JnL5gG#yEPQk^?>kt=R9v
z8E7E#1>>jX7z?`l)n<WY3)l;7o0=#Hb2~UYh^Ax1$q<o2RDoxskY<5BWRi1|g4X)(
z5{VA(z%*c>pDD~hWP>3^FA9_K=Pn%h*DZHQdE`Ye)_39qti!TgNsg;w9E_fnppYBj
zG@NZh6W5Z-Ls>^c1F%l>wvvx*jj`;cB41%U@;4oRHPK9R2`>EFJ~HYl{K9YK-l8w~
zM5eWE=)f`<^1;{WHu?n*ZI0vAMzY3vu_&=XphRn+gMpY7*rp&r*g#2ODIwit)tVOm
zJBdydPb_$mToRo<RHpFoz)Z|}Oez|aAqrbFu!J^r{rlgQw)w2#jm<Pm0d{QY+9D23
zEp!U-=<+Evo9{Gh@0P?%#3G-hy_53gG++HRcK*xc_^_5&*sga-hLks4k(+3`j~*r8
zA*Hd&hkQ-GMqkism}K%#4Z<e2sWrF(S@;F4$eg^}C$X3MJ0`JdVV`IkpXB1>GOy|2
zfEGSO%V1;3y$)iE0$Oc(u)l2NER*6WD9INIq`)*fNe&V<%@N5i2@Z`k9v=^U(aq@c
zKck&t^`|#z{y%<G^+z9-Z@ERf;|}?bJ5~ImJq{k=W#fRxp*uAnIw0r&Y2eU7jbn#3
zj_{k@(L)UT2td;rx@X=ZfXbiRgPWk>c`m5mE}*B9Su^X__7VBc!^(fEr_?g>Ib<s}
zWH1?)hx<k|L$9_ON=>2`QA_9ohYuYr>W^-bPl{~OWoSdu(ZoLC8sF_wEiqRhlgW^R
z14w1$!6!gu>yQK}!Lxpwn8iagh!iJ^F@sBzv$Mlui!TM6;+&#V2();-m`9SZ7fmud
z%J~m^-uC;Nf9~zt{@J&we*W#!zr9NJ)~n=S`dw}R>N_?6U%+qvzncG__iFoXf1t|$
z!`tt@PkQGEHUEECOMmbY&F}jY=|i88uf9h5$S0MX!5_a#b<K^c>u;Aob-U)9ZqvB!
zfP9EI(3z_ECEC-_Ov=e8HG~&=7IFm!#ij=8OuezunihJm>0nXwM%FaG@iBHHX3M&X
z5*=DocR^0GcVu2u!E3097P?97gL|hz%%}~{d<$KgT;?%jmSkw1NGCKj@|#&6T@<0l
zLlqj^ek4x#WJq8Ga~gpzMHVRx2HTIVE_9_i@v)g0a(R+Hl=Y3>44=nl;%LM<dXl9v
z1D$(k42fOcde$909y?BQBZfM+_>$+4%vvoQD`)_HB{sQc9m5N{0o(8=4sepNskRAC
z(D2xbn#AK?>jTZ2x*K9^BP&2!=-|LI1U{FvK%RmdyU>W2S8If}r3rs05i~TwNi0nz
zDNQT%OW_Jnl4)oP4xVV7r!A#vrkR6=)ii0F7;}Knoh}Gk#1?va$oPdevcxey^B9UO
zLsQ#x0|k@IqNkqNU^@~cjY40;GB%CTX;2S#gSE^$@r_QDn9sV+FpNI*qC<(#BC`bD
zIV4_yn2D><<gCeRn)Oo;o$GV-^&T%qLvmcT9vU-%G~6!mhK?%s@E#IYRi+EbDL%z%
zooEVCiY2)WAUb0sc(3*-^ceUuq?zQigEUqu1~h2il)HUeA!2x@8N|x&EDAI)4u#J=
zkYg7*{*DdtN3XMz6C0i&$_^U5ka${RYVS(I-vM@*Ct?lS1uxdv0Yo*d<{8jpj}V(h
zjvu~;k4@JNA6mij4dA=*_<9YI(_00!9B3BeuGi|x+*P{p21UIC5S+Z$Gn)|6cYs*J
zWI-o!_#{T-MFBHCsU!!jG>!st2igR|rm!s<7@25R@#w6?Vqg_pc+vbRLuvmZL&w&8
z7&>o;iXE~-pS$10(|Wy`_$KZ=$cvbB%U9ZlpOsko+$C@LtZQuZtN13@g4a5pC+s{F
z*-{gHWcX&i$kqIi+An%*N9MIW_Ng&8UiU6EWKOJt?g`q1DMSxlV1N?>UTeq#p@Rcx
z)p)TCt0a<zgSq<+9nc=jX%u{tFYbD=Llm1dJ#w0vCYgerT{5u?G6ZmTT>Kn4vfgDG
zWMU>(`>xbO@10_aU79yePss5Z*k@Rs4}CQ28(DGFsMmM<*NRqT9S?H0M2?DnVz6s0
z)-^YWhPCL1B5Q~&I_wu7ovpSD4#Xz7fg8Zxy`2jlJM@V}95#{-9Sl?vW!EfrUhRul
z4nX3u$ainSkiGMi=5a@Naw#r_2h)`7mh7bHYS1xYZd)mTCy4_4MS|T_3|JG5gHB8n
zBRekx6*AMX#A_bf_?n?PyNzb;445^{8qV;r84RxAH-i*)igm=_UBY&zQ#H0EVg`B*
z<iaO$L~NzmK#`M(so0`d=#9(-;_Udc6gfWaYwDt8W$n;_H@e7yxPnf0nm<DD5Y6x5
zEI9K>ym*8T*o)4#Y)2(05r_67OL1no3@U|KN}+~!?$m|}8MiUA(S;89NrIjjtfnm<
zIo!>B@tcM@-=aU~$r>+zfyS%9R?{nADF3Y&X!T8Bq478PdFAWAO!}H<%g^Uq{pUVS
z{<1ID_-~#hJ>zlm7xR<K6CW+{ZGYt_lvDUNo}A49lTUJ6ZlaZvqsS?;+!V<tyfO&n
z<rG7n(@KI@*GQfo6bTSl!&(4dMh-*<QXde+abz*U2UhZlyDTc5{HQxJjDUUDfvkfg
zx1mYEUa+9!)0n?m8jCxJ1e5|vD9!Go)`e+IGWtrfCP4<&cX|fX_N19R82!XfF|=up
z`K`;3eT3#)4ru=Ko3wq+t(vdn@1`3MYQB{}aPQ=g<HNJ&Bc*vJu2-6Qp%KF=enP2J
zPgR|Ms(k*r62F1fS*P*xL9XOgV<k_M#9A}C37NR5oLs?TeUVR~cV^3m6kA&Yu&rR_
zFgisJv&%-*Cu|jU<fw&ht#NcVe&K<bf$n}*`S#ca3hxaL9gvnGhQ2EZ<H&;5YgtY*
zUEn0A5%4=7&fL{AjY)INqsa_xV4Kes^?+8&W3L-S<7S%W$MHMZsr-KRNxtdGcZ=kx
zdphiU(n!%Q$;$aZ&*br0G_lC1){n#FYu40QN$BRm?g49>;AtTZHlW1X;OH&IzM*yW
zOjb_eR*=duax)=lnwZ!+{w+rs8kBQw74k$N*q;}X1NO3zZP~^UK1GHOAVHC9gXI%&
z*vg_LAfR$L_FzafG+7J=A%-NHke!zA0v%gZ0L@bxhL89x?9Zc%&f%-5!@bS}c42Mh
zMTen{ym&C63{LP$Zrn)X#U-@Elb<NgrrxHdt}nc)Z4A0(sd;v8$k+wYdoXzLqDM)O
z=zH(-$U?jIG)T*FoLcyuEACgTU;$QTHO>u<QsM&NHXAw^X!{M0jU=boG=xGOjJt+q
z`0T8r2=~yeG(>~DnK!lgRm&ONw32zG8B)jih#l4gdL$f86zj~y&W)q2JyufkN2W1k
zW9T7)1h4So=(;S&&I0r86=s4Kb_POsOB`Wr7%ZgQ$FhO8GfDt?39RKvxP`jwb@uy&
zbD*Mw4i02UjUx}B3ySSYAxe^{tVU4<EgDgSJ1jI4$Y8`yntOmu1Z?z?4dlU!Eq>w=
zTG!sB!7smk_b2`X0Y{EXES+8DX-m$I_E1HZ_~hC3k;hU$1yOqqOXMqKv<r||KlaT~
zPzhV%YwWXons0k9=t{xsnDBOZ%XtdLA3)3XBqz?lk--FTVS9;ip?DlhP3Ia|Uh9!p
z@d|$zSig9Pf=sh1f&^GLJPmO_Vlp^Br#xv)lNK38GB8ib!2%C<T#>vd?DInL!H;Wt
z%z1qFoFSdDPY#@ZihSBB(y9F6yl)MsY{`J|7mvCga&`<khz80-;v0MCvydD`e6fy9
zy|D=%tcjWW80wp8Sg~`kr5-}l^uiW4+qTtldL88AF#dqr78)J>R`V^h;-knRTdw68
z3%dLD^s9d8{U!Y|pu2*!UKkwuuHdyi*gY_cNg@>Qbwi3mGQ0*FWEy04Qa^@TH)Q^<
znn^kd8{9e?m)&VTSLzctF5kL;>Sp;UKYbiN%ug%)d~)D`bjJbt;6d=64ZiJm`Hq9Y
zod7z1j`5xFciw>>{ve-+rV`fKX_SZhaBdpQwlu5^sf;E7N`Fww_%3q#ldo&0F_)WG
z^o70S-!f?<i+|+t7dCAd8%Z`dt`KTD))_6#Nv^*pj16pX=naU2{e+gJ80$vf2_Oy5
z|5F=gQX0)*iiC^8mgI((LE*n6=T2sDJ-qlZH0KeR0gZf?STnY1T5NRqD6jH2YyRkU
zn*a1V<);x{%K&e<P4f-B=HGO?bn5|LP<Y(k&M*%jk@CM)%a4%x9OP#OlY1p!Zm8sG
zTh3Z0b8;~2d4xs)ohQm}eyIgr&M0ho8rw2BK)s<ikb!Jy8=JMhSVHa3VyvTpqj#&K
zMiX=o;9_9xj<q^ocLgcsietgivji;=8moWK7coexdU2LaBGZENj1QP$Cc#?a18p9c
zZI4~yE3o&l#<Y@qm##D;D;{m}^&aBIhgb0m&acV%<qKW4J#q6$^rY~;TggXcxrtAf
z%9_G2(DH%bSZ+&9mBXwneB0LS08Bb}kzZ(ZT20#(I{x6$PF!?G7P_E?EIkWt<b|z}
zmn?gU%{|4PmX)Qkpp#!u+pgcm@lO}67j%!;<N8|L1lR2c;n0yx3hgE^kOB-)m>P!$
z%m73~iqy=`GM{mI{D~c=kzq|TJFt0dH}T9+D!YNd+e93KDlaGEQ7d+7<4L@>Nj1oa
z_={}FhNn5gKVprgQI6dpeRv0BR{#!DWYA^7qJ%c~MqYynk7b9UjKK~RcJg8$U3w(^
zLT|wEfg-kuXAhp+>I2WlC%yO``;S%4KP0(dCV~UJTSzUV_+BxQ7kam@ZEjoN94t&B
zN;6HPouL3psKAv>+J>%@u-It^3c745&Ftn+ntOPb*hyZ)<1NnN000brNkl<ZjDGMp
zRNEzf2AH@WQgTIKfTtBK10j~-#hRTH>og6&O=#m*$g=hV_(YzVEvH_vIyY;Udv~TC
zHTkG*nOO27H@4+09Uk8`9l6b7@P%!Bf&<1!$YtNG^?~J@x(9T|SI%!?2=BL9h-{$o
zUufG+OI8lsvK?{<&)40?ut`uXm0|<f%qfP(3f|Ks(_m%i4E!S>Jo2!~FclsfvD<{q
zKxFMl;}auqkP3~z*Ml&2f%YMG)20a4A7e#>r5ReJR&7h_@M9B)RGfIh$TcQ>+_iN>
zBLj%2(RS#jX&$T9F~OIYcsNLAkp{yWet|N*1U#Y-9o3=}_68(<6zCJH#`k#f{{6Ew
z-YA)K4I4Tbs7$f3dN>#!$2YN?^IzH)z6@soH8G%IlC0nWw2%v2A}tEm#BM;B;iRDo
z9X)pWVzx|y-FPrQCDupAReXaeM2cS}R&@Awd~jsZWyr;Hn)sZ;*VtBSfi4f?;20XY
zfL;^ciP4y~!9q8KYc-CRlYwRYLq`{EY&NkKTfoMS^;-`uC7vYc5^*efHC?Usf$5t1
zH0X@0-k6t<-%&>($S%ChibW!0kzQy`M_02nU&D?*Hh1%83N?*Svx3LOT|3Asve4|b
z!Hy~*1seMr88CL3^?*&<_*8Vr78?qH7cdhiGJ(U(gSGL;MCb==34g~IkcZ4au}&EZ
zoxmH&I>v7)%M$cPH_M8y@ib<SY1`57ieX~|#9zqWz?zY*LBVTz=-9+I^mfhvF{uYe
zF82k-w0afJ*8+>Vy<o1Exr(bB#9=@r5tu)IllZ%o^;wQ$(sb?`nmCjJs%4XcF;etR
zPmuv8Sb&Bmo@3v<)HGpjE)-mV&{b^Lw7_YW@e^kGAIHnwWX&UBfU&Rm0j+Dj<>X-Z
zPBZoeomd+i6FV^SqOn>XE=z@tI0|~l2U+O$ld*}N6ko1j@`zj<jy}#7KG$wN>7w@{
z?K4(Q+}q{Ux4rHf;=PP#9e>D})si+CVRn+%xM{Osvek0T*WM}}Ii~HSv+{UT3I}=z
zOhb!|Sdr1_G_P$ECm~ukB(FhYwMq6ALK5rIIN@)w`3wql3b?3wDOlK)hh~d#T(p$Z
z)xg?)k&~AfTEyIdLnBY@&;>o?TwCKXd<ovR%sQc?x2@0tdl!vO^de@7101^TgdI>r
zziGSGSSaNL-zPZZ?QeXSYW(-|60C9PyF$W877P@R!|e}zLNmWji6k4+kkBTD4Kz<|
z&Q2&XkX885B3S4y42vClbSm2L5QUT1aYIXaBwC7$n2Qdc9c1E}d<uCPS+Fbzn}LQl
zH-$LBkqaEKE&l8{;xWzb3m<vt#Fg;}H1G!>mxo8NwinoP7Lc;;fW(J8>(`-n&WLxI
z`$C-YjyL>on(N1D9h;30>bg6Kg*PuEp$)(N!E05w@;8}Tk|rtGmPl?X#+U+0vgK<U
z-VQB^osxnHr$AW>7Wx8$W#R+bVd~gJW*Aw+#A-WP8#;9eyE38Bo7~D_0+9{HR|W&I
zFH4FKNYixGycM?0mLs<%pn&l5fL&w)MJ_`qht)P>fW5v22@GlIw&`Jq-=SRx(p}tr
zB+q!q8{aVG%OxKJh;ON{?rVw)6}$s{4Rq`eKdw1{mst|YiQ;g8v22TrBoYT&FYZnt
ztk9=Wck_qhYy3-ApP?Z`_kY=BY}k<{V&E&*3vGt((Ae(8Lhty;8M;y1Bo_j#Ws7_$
z{zx^pR!4Z8_gi87<pd2#ZR3sqItO@rNWw-#9z*JNB$1aKdn-6{YxPh3s7G;^Yv;gY
zhrVCL=~unsr&#MU%Qtr;l*LGF9VN0gDceoXAGu!hCvTN2Jiw_W9X-L+ykzJK0}d^t
z0PJAa0HvUSvm>xeNb^~Tw@gf){Sw$2u%(WHEd*oa8e3a!YhudK)Zplb$|0=iWh=4N
z>sZn#?^zwLX*y<P(HGK155c<4$IrAFaO_0<;0D%oY`N^%LAS1bt{bNv`CqX(;Y4!+
zf4`X1uYALm8uN38{N5yJ5(*^928ZUU8KnFlGavcwt99(AJGB(&mTQ1Ww8D1s@N2rl
zpP(DEX(%SGTicl?DRzKDw;y)sGqlAP2K~a*FwsCnYFmh4U}J0I6yoSpU-017U3*uD
zSYuo03VSsqF9e|#49{AmDS_LcU1VEPN2bsU4`35gEyIM59bb4MjnWCnIDz{N7+yrK
zKJBX4Jsa0=DZVQ&2#H202Z=z3(i+!|cj)NbJ|Jz+>fAa}D}FZi0b~Z+AUt4`Dzd^P
z#fG<GXsUsN?ikR*PT^4-J~|@{lv+qSR`}=xGC2UDZMVJ}v2J)?+xe_IQmg5ZZNi`=
zHgwwxw#2bsN4Qmly~9yrD`$<^p!6EBj~uBsxcFIX+;Yy(=p+YTCz0Myk$K3SdDZKG
z_KZVYPb`^lMRePz3$e|k@#wq$m?2r>Tp9zhDJsHsai*XO9W2Sl4k!=|F|t#Tqc{F7
z7fNhwc9?R6U(?tLR_H5$x&Yg1f9S}gUqfjcN5`JkLGUs48dmGX000<8o}C-IEXiDU
z*3xoBW?J4D5hh$uJnciZJ%5XzZGI0rQ56pFpa%y0uJ1p1)>W_jhewY1k(Bb^(um(7
z@-}d{^T?GS()Ne0lPDmK(xy1D0nr$n^laHy4kHslTm=g|H)I&BXkiPDedJ5yhC&OS
zY|hwO8($$)VuE9DXqh-X`uOAiNbQ*p@p8e7MTACWiEF^DtpJa@h$@%x#8St>c0=#*
zy0_!+?s>xbJAWwO)p*=h@IdhA|K96vKjW%5{PbB@z5Xk=C!K5gB`*CqvHv|aeGq&-
zul)xP|H6OL_D4Up?2;5_nvGJ>6-@CJ8t|HyCEE=p!{E~>mkdMdCSoIC<Ci$1X$v+g
z{7Q&;ff$}W<twGtQEg3!d7(JSuK<TM@lxT5k6;rNNDe^9=TTRPnihm<CF^Mec$`3o
zzZbCm&sG<o^KU+#8LNCc^=Gd;=eJ&e>ls(Q?$^$E$Lrs~WAhu&yz=!=0bjr{A9m)I
zuk)UL&s|NY?t9zVvvt6`VC>y<fS*qeL_YRLx2I`sLBk8%MZP-Fw&8)@F+y+bVv|_j
zv+8vO9;fU%P<vJfy=Uu?R?}f^jiVa*9c%ZH=mA4=?;_g8Y<ft+4iCYNAkZR*@EUNv
zALnn3$DaLz_h!$E_h$0o>ir6D`|3x(xVEN$ojcYPUlh#EujBO6fC7o;2^)jU*-;B5
z%kW00wLCUWD>i)Awf~R}V3#!%+c-xjtNjOpKo7}6ti%q+Kz3vpfRrORve2Ial*Yf9
zE<Wd#wom%;u{$KI?q>gD=nQT3jK_S3C;fniw#_iKhNitV+%%bPDUA-;bPBMo9i4?q
zUm(VsmLN{Bi9Z5K1`R2(S+gu5Xt0qtw6JA@EOX&h;}H5xk7JtkeOs5D{aW9LVP%n#
z%jXMB&%F32XRp4otWQ!v4<=19jSLP%9xNJMrddF6g<RW(7Ibi-H@5L9x&Mi)&@0u0
z%Th#w7WN7ceO!(qe9NQP18|hD;a7u~t{#8xzq&us$mIT*Klrv=&v@jO)6uP`%l;92
z+)*r9X%Y?F(1uo;irhU6jLb{K4nJgL(7>Zm&<)V>&7&?nJ`Ue@*nsUJflmNEa0j99
z;Lo@pnf4ue#@1ucyYl`<CcFFV^5EP1*^f9dJ^fKXK5F$e2J+LMynJWb!^z{(LM~Za
z!0?7fCl1J36v!ztLjla2-6HlPHv=@6z)tM=BLh9aCpFYhkL{yRn=U@@$Nh*$9QaJ)
zQ_W}M_PO!#GcLS-`r<G8o^kBhW3^gcUc<lc;e(>Vl@w@l?>@7;!iz>DQx7LJ1H?As
z$O@67N3cV;K8g<Tz+OzQ8o#c|mrv95*wrQHeUBf1;q{-*BA?d-+Z5)fKj!AulP-A6
z>d6<qVjS^fWWTD0-t6IDk;i-ZEV!D1TmxLE5`T@4>-gj8I_$3V7}rS?a<Bmb_I3DO
zCxIUb$mfxCHSyj9{0eKoS(;xp?K|?A)g@=YV)dAF-r~ocb+aCT<DLfg0EB*ULiiaM
z-nn|xg}=7-#EY(&F1_H@t0zAEd0UrW_^j2X7d&Bg>BBF9zhrgk`2h42&c9@O+_{&m
zp0I|{k2~j*Rq!R?2MQi{&J(sSIrmwsOU`*7@anC{oqNUVlJkG<WMAHXwq1G14eYZm
z_@VCqg@HZ9CisPcJ;Vm~UjYCB|NoEwS=;~s00v1!K~w_(>&El;NpYg`00000NkvXX
Hu0mjf2DU2~

literal 10395
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
A{Qv*}

diff --git a/static/images/tabbar/new_order_gray.png b/static/images/tabbar/new_order_gray.png
index baebf74e2811c3f002abd3a2ce0ef66f548b2486..697f86cc5af43e2deab56b521125e79008f9d0c0 100644
GIT binary patch
literal 3573
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

literal 5722
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
R+hTzhkfE*#q8^Tk{U4YxgXaJM


From c2978b30dbb13a8153a529456a2d668dba9dfe99 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Fri, 22 May 2026 15:51:48 +0800
Subject: [PATCH 036/118] 1

---
 pages/home/home.vue | 219 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 171 insertions(+), 48 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 11a7fac..02740e1 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -18,7 +18,7 @@
     </view>
 
     <view class="quick-actions card-box" v-if="isLogin && isSettled">
-      <view class="action-item" v-for="(item, index) in quickActions" :key="index">
+      <view class="action-item" v-for="(item, index) in quickActions" :key="index" @tap="handleQuickAction(item)">
         <image class="action-icon" :src="item.icon"></image>
         <text class="action-text">{{ item.name }}</text>
       </view>
@@ -29,7 +29,7 @@
         <view class="header-left">
           <text class="title">接单管理</text>
           <text class="update-time">更新时间：{{ orderBasic.updateTime }}</text>
-          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png"></image>
+          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png" @tap="fetchOrderNum"></image>
         </view>
         <view class="header-right">更多数据 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image></view>
       </view>
@@ -54,7 +54,7 @@
         <view class="header-left">
           <text class="title">当日实时数据</text>
           <text class="update-time">更新时间：{{ orderDetail.updateTime }}</text>
-          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png"></image>
+          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png" @tap="fetchRealTimeData"></image>
         </view>
       </view>
       <view class="detail-content">
@@ -177,38 +177,26 @@ export default {
       displayScore: 0, 
       animationTimer: null,
 
-      // 通知公告数据：预留接口，支持最新6条轮播
+      // 通知公告数据
       noticeList: [
-        { id: 1, title: '商家券更新了！品牌专区上新了！', url: '/pages/...' },
-        { id: 2, title: '系统维护通知：今晚凌晨将进行升级', url: '/pages/...' },
-        { id: 3, title: '平台新政策发布，请及时查看', url: '/pages/...' }
+        { id: 0, title: '暂无最新公告', url: '' }
       ],
 
       quickActions: [
-        { name: '扫码验券', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png' },
-        { name: '服务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a90f02a2-9d39-440a-ad20-a4337bcd1b38.png' },
-        { name: '工位管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4c503603-6c2f-4a7a-9329-5e54b8ca769e.png' },
-        { name: '财务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/728c659e-e395-4473-b83e-7e04539f7ec6.png' }
+        { name: '扫码验券', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png' , path: 'scan'},
+        { name: '服务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a90f02a2-9d39-440a-ad20-a4337bcd1b38.png' , path: '/pages/artisan/service-list'},
+        { name: '工位管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4c503603-6c2f-4a7a-9329-5e54b8ca769e.png' , path: '/pages/shop/workSpace/list'},
+        { name: '财务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/728c659e-e395-4473-b83e-7e04539f7ec6.png' , path: '/pages/wallet/wallet'}
       ],
-      orderBasic: { updateTime: '15:30', waitStart: 23, waitFinish: 43, finished: 234 },
-      orderDetail: { updateTime: '15:30', score: '82.2', visitors: 0, yVisitors: 100, orders: 234, yOrders: 1000, amount: '1.34', yAmount: '1.4' },
+      orderBasic: { updateTime: '--:--', waitStart: 0, waitFinish: 0, finished: 0 },
+      orderDetail: { updateTime: '--:--', score: '0.0', visitors: 0, yVisitors: 0, orders: 0, yOrders: 0, amount: '0.00', yAmount: '0.00' },
 
-      brands: [
-        { name: '蜜丝卡伦美甲美睫', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['franchise', 'recruit'] },
-        { name: 'ALNL 清莲爱丽', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['recruit'] },
-        { name: 'IL COLPO依宝美容', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['franchise'] },
-        { name: '蜜丝卡伦美甲美睫', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['more'] }
-      ],
-      skills: [
-        { title: '穿戴甲的操作视频扫码验券操作123564798', type: '平台课程', views: '83.6万', time: '7小时前', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' },
-        { title: '脸部按摩操作步骤详情', type: '脸缘品牌', views: '8334', time: '1天前', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' },
-        { title: '全身SPA的操作视频操作教程', type: '平台课程', views: '2344', time: '3天前', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' },  
-        { title: '穿戴甲的操作视频扫码验券操作...', type: '平台课程', views: '836', time: '4月26日', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' }
-      ]
+      brands: [],
+      skills: []
     };
   },
   computed: {
-    // 状态管理判定
+    // 💡 状态管理核心判定
     // 是否已入驻 (0: 未入驻, -1: 入驻第一步, >0: 已认证) 只要不等于0，说明已经开启了入驻流程
     isSettled() {
       if (!this.isLogin || !this.userInfo) return false;
@@ -251,18 +239,18 @@ export default {
     }
   },
   onShow() {
-    // 登录判定逻辑
+    // 继承 1.0 的登录判定逻辑
     this.isLogin = uni.getStorageSync("accessToken") ? true : false;
     if (this.isLogin) {
       this.getUserInfo();
     }
+    // 通知、品牌、技能 这三个接口不强依赖登录，无论登没登录都获取
+    this.fetchNoticeList();
+    this.fetchBrandList();
+    this.fetchSkillList();
   },
   onLoad() {
     uni.hideTabBar();
-    this.getNoticeList();   // 获取最新通知
-  },
-  mounted() {
-    this.animateScore();
   },
   watch: {
     'orderDetail.score'() {
@@ -270,28 +258,160 @@ export default {
     }
   },
   methods: {
+    // 处理金刚区点击事件 (包含扫码验券核心逻辑)
+    handleQuickAction(item) {
+      if (item.name === '扫码验券') {
+        uni.scanCode({
+          success: (res) => {
+            const code = res.result;
+            if (code) {
+              uni.showLoading({ title: '查询订单中...' });
+              request.post('/sj/poster/getOrderByCode', { server_code: code }).then(result => {
+                uni.hideLoading();
+                if (result.code === 200 && result.data) {
+                  // TODO: 这里扫码成功获取到订单数据(result.data)，后续可弹窗或跳转到核销确认页
+                  // 预留核销接口调用逻辑: request.post('/sj/poster/useOrderServerCode', { id: result.data.order_id, order_type: result.data.order_type, server_code: code })
+                  uni.showToast({ title: '获取订单成功', icon: 'success' });
+                } else {
+                  uni.showToast({ title: result.msg || '未找到该订单', icon: 'none' });
+                }
+              }).catch(() => {
+                uni.hideLoading();
+                uni.showToast({ title: '网络异常', icon: 'none' });
+              });
+            }
+          }
+        });
+      } // 2. 通用跳转逻辑
+      else if (item.path) {
+        uni.navigateTo({
+          url: item.path,
+          fail: () => {
+            uni.showToast({ title: '页面开发中...', icon: 'none' });
+          }
+        });
+      }
+    },
+
+    // 格式化时间 (提取 HH:mm)
+    formatTime(dateTimeStr) {
+      if (!dateTimeStr) return '--:--';
+      const arr = dateTimeStr.split(' ');
+      if (arr.length > 1) {
+        return arr[1].substring(0, 5); // 截取 HH:mm
+      }
+      return dateTimeStr;
+    },
+
     getUserInfo() {
       request.post("/sj/user/getUser").then((result) => {
-        this.userInfo = result.data;
-        uni.setStorageSync("syrId", result.data.id);
-        this.syrId = result.data.id;
+        if(result.code === 200 && result.data) {
+          this.userInfo = result.data;
+          uni.setStorageSync("syrId", result.data.id);
+          this.syrId = result.data.id;
 
-        // 获取完用户信息后，初始化营业开关的状态
-        this.initStoreStatus();
+          // 获取完用户信息后，初始化营业开关的状态
+          this.initStoreStatus();
+
+          // 如果已入驻，才获取接单管理和实时数据
+          if (this.isSettled) {
+            this.fetchOrderNum();
+            this.fetchRealTimeData();
+          }
+        }
       });
     },
 
-    // 接口预留：获取通知公告（仅拉取当前角色关联的最新6条）
-    getNoticeList() {
-      // request.post('/api/notice/getLatest', { role: 'merchant', limit: 6 }).then(res => {
-      //   this.noticeList = res.data;
-      // })
+    // 获取：接单管理不同状态订单数量
+    fetchOrderNum() {
+      request.post("/sj/poster/orderNum").then(res => {
+        if(res.code === 200 && res.data) {
+          this.orderBasic = {
+            updateTime: this.formatTime(res.data.now_date),
+            waitStart: res.data.dfw || 0,
+            waitFinish: res.data.dwc || 0,
+            finished: res.data.yqx || 0 // 备注：接口返回只有dfw, dwc, yqx(已取消)。暂时将第三个坑位放为yqx，或你后期让后端加字段
+          };
+        }
+      });
+    },
+
+    // 获取：首页实时数据
+    fetchRealTimeData() {
+      request.post("/sj/poster/realTimeData").then(res => {
+        if(res.code === 200 && res.data) {
+          const today = res.data.today || {};
+          const yesterday = res.data.yesterday || {};
+          
+          this.orderDetail = {
+            updateTime: this.formatTime(res.data.now_date),
+            score: today.rating_num || 0,
+            visitors: today.visitor_num || 0,
+            yVisitors: yesterday.visitor_num || 0,
+            orders: today.place_order || 0,
+            yOrders: yesterday.place_order || 0,
+            amount: today.deal_money || 0,
+            yAmount: yesterday.deal_money || 0
+          };
+        }
+      });
+    },
+
+    // 获取：通知公告列表
+    fetchNoticeList() {
+      request.post('/sj/notice/list', { page: 1, limit: 6 }).then(res => {
+        if(res.code === 200 && res.data && res.data.list.length > 0) {
+          this.noticeList = res.data.list;
+        }
+      });
+    },
+
+    // 获取：品牌列表
+    fetchBrandList() {
+      // 假设首页只拉取推荐的前4条
+      request.post('/sj/brand/list', { page: 1, limit: 4 }).then(res => {
+        if(res.code === 200 && res.data && res.data.list) {
+          this.brands = res.data.list.map(item => {
+            let tags = [];
+            // 根据接口字段动态生成标签映射
+            if (item.franchise_state === 1) tags.push('franchise');
+            if (item.student_state === 1) tags.push('recruit');
+            if (tags.length === 0) tags.push('more'); 
+            
+            return {
+              id: item.id,
+              name: item.name,
+              bgSrc: item.cover_img || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg',
+              avatar: item.logo_img || 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar',
+              tagKeys: tags
+            };
+          });
+        }
+      });
+    },
+
+    // 获取：技能集市列表
+    fetchSkillList() {
+      request.post('/sj/skill/list', { page: 1, limit: 4 }).then(res => {
+        if(res.code === 200 && res.data && res.data.list) {
+          this.skills = res.data.list.map(item => {
+            return {
+              id: item.id,
+              title: item.name,
+              type: item.link_name || '平台课程',
+              views: item.browse_num || 0,
+              time: item.create_time ? item.create_time.split(' ')[0] : '', // 只取日期
+              coverSrc: item.cover_img || 'https://dummyimage.com/200x150/ccc/fff.png&text=Video'
+            };
+          });
+        }
+      });
     },
     
-    // 跳转：通知详情页
+    // 💡 跳转：通知详情页
     goToNotice(msg) {
-      if(msg.url) {
-        uni.navigateTo({ url: msg.url });
+      if(msg.id) {
+        uni.navigateTo({ url: `/pages/notice/detail?id=${msg.id}` });
       }
     },
 
@@ -316,7 +436,7 @@ export default {
       }
     },
 
-    // 营业中 / 休息中 按钮逻辑判断
+    // 💡 营业中 / 休息中 按钮逻辑判断
     toggleStatus() {
       // 1、入驻未认证 (id_type == -1)，弹窗提示未完善项，引导完善
       if (!this.isCertified) {
@@ -345,8 +465,11 @@ export default {
       // 3、认证通过并配置时间，仅作为开关，不跳转页面
       if (this.isCertified && this.hasBusinessTime) {
         this.isOpenStore = !this.isOpenStore;
-        // 预留接口：发送请求同步给后端当前状态
-        // request.post('/api/store/toggleStatus', { status: this.isOpenStore ? 1 : 0 });
+        // 同步给后端当前状态
+        const newState = this.isOpenStore ? 1 : 0;
+        // request.post('/api/store/toggleStatus', { self_state: newState }).then(() => {
+        //    uni.showToast({ title: this.isOpenStore ? '已开启营业' : '已休息', icon: 'none' });
+        // });
       }
     },
 
@@ -591,7 +714,7 @@ export default {
         .guide-btn {
           width: 534rpx;
           height: 70rpx;
-          border-radius: 55rpx;
+          border-radius: 35rpx;
           border: 1rpx solid #FF4767;
           
           color: #FF4767;

From d008710130af8bf03ec85e1edacc43c1b849b03f Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 26 May 2026 10:12:26 +0800
Subject: [PATCH 037/118] =?UTF-8?q?=E5=85=AC=E5=91=8A=E9=80=9A=E7=9F=A5+?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          |  26 +-
 pages/home/home.vue                 | 233 +++++++++++++-----
 pages/notice/detail.vue             | 359 ++++++++++++++++++++++++++++
 pages/notice/notice_list.vue        | 298 +++++++++++++++++++++++
 pages/shop/verify/manual-verify.vue | 153 ++++++++++++
 pages/shop/verify/verify-order.nvue | 216 +++++++++++++++++
 6 files changed, 1218 insertions(+), 67 deletions(-)
 create mode 100644 pages/notice/detail.vue
 create mode 100644 pages/notice/notice_list.vue
 create mode 100644 pages/shop/verify/manual-verify.vue
 create mode 100644 pages/shop/verify/verify-order.nvue

diff --git a/pages.json b/pages.json
index 28e5211..8fc687b 100644
--- a/pages.json
+++ b/pages.json
@@ -150,7 +150,13 @@
 			}
 		},
 		{
-			"path": "pages/add/add",
+			"path": "pages/notice/notice_list",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/notice/detail",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -584,6 +590,24 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/shop/verify/verify-order",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/shop/verify/manual-verify",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/shop/verify/verify-order-detail",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/shop/photoAlbum/photoManage",
 			"style": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 11a7fac..28f631d 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -18,7 +18,7 @@
     </view>
 
     <view class="quick-actions card-box" v-if="isLogin && isSettled">
-      <view class="action-item" v-for="(item, index) in quickActions" :key="index">
+      <view class="action-item" v-for="(item, index) in quickActions" :key="index" @tap="handleQuickAction(item)">
         <image class="action-icon" :src="item.icon"></image>
         <text class="action-text">{{ item.name }}</text>
       </view>
@@ -29,7 +29,7 @@
         <view class="header-left">
           <text class="title">接单管理</text>
           <text class="update-time">更新时间：{{ orderBasic.updateTime }}</text>
-          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png"></image>
+          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png" @tap="fetchOrderNum"></image>
         </view>
         <view class="header-right">更多数据 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image></view>
       </view>
@@ -54,7 +54,7 @@
         <view class="header-left">
           <text class="title">当日实时数据</text>
           <text class="update-time">更新时间：{{ orderDetail.updateTime }}</text>
-          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png"></image>
+          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png" @tap="fetchRealTimeData"></image>
         </view>
       </view>
       <view class="detail-content">
@@ -173,41 +173,32 @@ export default {
       userInfo: {},   // 用户信息数据源
       syrId: null,
 
-      isOpenStore: false, // true为营业中（圆点在右），false为休息中（圆点在左）。由后续逻辑决定初始化状态。
       displayScore: 0, 
       animationTimer: null,
 
-      // 通知公告数据：预留接口，支持最新6条轮播
+      // 通知公告数据
       noticeList: [
-        { id: 1, title: '商家券更新了！品牌专区上新了！', url: '/pages/...' },
-        { id: 2, title: '系统维护通知：今晚凌晨将进行升级', url: '/pages/...' },
-        { id: 3, title: '平台新政策发布，请及时查看', url: '/pages/...' }
+        { id: 0, title: '暂无最新公告', url: '' }
       ],
 
       quickActions: [
-        { name: '扫码验券', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png' },
-        { name: '服务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a90f02a2-9d39-440a-ad20-a4337bcd1b38.png' },
-        { name: '工位管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4c503603-6c2f-4a7a-9329-5e54b8ca769e.png' },
-        { name: '财务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/728c659e-e395-4473-b83e-7e04539f7ec6.png' }
+        { name: '扫码验券', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png' , path: '/pages/shop/verify/verify-order'},
+        { name: '服务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a90f02a2-9d39-440a-ad20-a4337bcd1b38.png' , path: '/pages/artisan/service-list'},
+        { name: '工位管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4c503603-6c2f-4a7a-9329-5e54b8ca769e.png' , path: '/pages/shop/workSpace/list'},
+        { name: '财务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/728c659e-e395-4473-b83e-7e04539f7ec6.png' , path: '/pages/wallet/wallet'}
       ],
-      orderBasic: { updateTime: '15:30', waitStart: 23, waitFinish: 43, finished: 234 },
-      orderDetail: { updateTime: '15:30', score: '82.2', visitors: 0, yVisitors: 100, orders: 234, yOrders: 1000, amount: '1.34', yAmount: '1.4' },
+      orderBasic: { updateTime: '--:--', waitStart: 0, waitFinish: 0, finished: 0 },
+      orderDetail: { updateTime: '--:--', score: '0.0', visitors: 0, yVisitors: 0, orders: 0, yOrders: 0, amount: '0.00', yAmount: '0.00' },
 
-      brands: [
-        { name: '蜜丝卡伦美甲美睫', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['franchise', 'recruit'] },
-        { name: 'ALNL 清莲爱丽', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['recruit'] },
-        { name: 'IL COLPO依宝美容', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['franchise'] },
-        { name: '蜜丝卡伦美甲美睫', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg', avatar: 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar', tagKeys: ['more'] }
-      ],
-      skills: [
-        { title: '穿戴甲的操作视频扫码验券操作123564798', type: '平台课程', views: '83.6万', time: '7小时前', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' },
-        { title: '脸部按摩操作步骤详情', type: '脸缘品牌', views: '8334', time: '1天前', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' },
-        { title: '全身SPA的操作视频操作教程', type: '平台课程', views: '2344', time: '3天前', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' },  
-        { title: '穿戴甲的操作视频扫码验券操作...', type: '平台课程', views: '836', time: '4月26日', coverSrc: 'https://dummyimage.com/200x150/ccc/fff.png&text=Video' }
-      ]
+      brands: [],
+      skills: []
     };
   },
   computed: {
+    // 营业状态：true(营业中) / false(休息中)
+    isOpenStore() {
+      return this.userInfo.order_taking === 1;
+    },
     // 状态管理判定
     // 是否已入驻 (0: 未入驻, -1: 入驻第一步, >0: 已认证) 只要不等于0，说明已经开启了入驻流程
     isSettled() {
@@ -256,13 +247,13 @@ export default {
     if (this.isLogin) {
       this.getUserInfo();
     }
+    // 通知、品牌、技能 这三个接口不强依赖登录，无论登没登录都获取
+    this.fetchNoticeList();
+    this.fetchBrandList();
+    this.fetchSkillList();
   },
   onLoad() {
     uni.hideTabBar();
-    this.getNoticeList();   // 获取最新通知
-  },
-  mounted() {
-    this.animateScore();
   },
   watch: {
     'orderDetail.score'() {
@@ -270,34 +261,154 @@ export default {
     }
   },
   methods: {
+    // 处理金刚区点击事件 (包含扫码验券核心逻辑)
+    handleQuickAction(item) {
+      if (item.name === '扫码验券') {
+        console.log('准备跳转到自定义扫码页...');
+
+      uni.navigateTo({
+        url: '/pages/shop/verify/verify-order',
+        fail: (err) => {
+          console.error('跳转失败：', err);
+        }
+      });
+      return;
+      } // 2. 通用跳转逻辑
+      else if (item.path) {
+        uni.navigateTo({
+          url: item.path,
+          fail: () => {
+            uni.showToast({ title: '页面开发中...', icon: 'none' });
+          }
+        });
+      }
+    },
+
+    // 格式化时间 (提取 HH:mm)
+    formatTime(dateTimeStr) {
+      if (!dateTimeStr) return '--:--';
+      const arr = dateTimeStr.split(' ');
+      if (arr.length > 1) {
+        return arr[1].substring(0, 5); // 截取 HH:mm
+      }
+      return dateTimeStr;
+    },
+
     getUserInfo() {
       request.post("/sj/user/getUser").then((result) => {
-        this.userInfo = result.data;
-        uni.setStorageSync("syrId", result.data.id);
-        this.syrId = result.data.id;
+        if(result.code === 200 && result.data) {
+          this.userInfo = result.data;
+          uni.setStorageSync("syrId", result.data.id);
+          this.syrId = result.data.id;
 
-        // 获取完用户信息后，初始化营业开关的状态
-        this.initStoreStatus();
+          // 获取完用户信息后，初始化营业开关的状态
+          this.initStoreStatus();
+
+          // 如果已入驻，才获取接单管理和实时数据
+          if (this.isSettled) {
+            this.fetchOrderNum();
+            this.fetchRealTimeData();
+          }
+        }
       });
     },
 
-    // 接口预留：获取通知公告（仅拉取当前角色关联的最新6条）
-    getNoticeList() {
-      // request.post('/api/notice/getLatest', { role: 'merchant', limit: 6 }).then(res => {
-      //   this.noticeList = res.data;
-      // })
+    // 获取：接单管理不同状态订单数量
+    fetchOrderNum() {
+      request.post("/sj/poster/orderNum").then(res => {
+        if(res.code === 200 && res.data) {
+          this.orderBasic = {
+            updateTime: this.formatTime(res.data.now_date),
+            waitStart: res.data.dfw || 0,
+            waitFinish: res.data.dwc || 0,
+            finished: res.data.yqx || 0 // 备注：接口返回只有dfw, dwc, yqx(已取消)。暂时将第三个坑位放为yqx，或你后期让后端加字段
+          };
+        }
+      });
+    },
+
+    // 获取：首页实时数据
+    fetchRealTimeData() {
+      request.post("/sj/poster/realTimeData").then(res => {
+        if(res.code === 200 && res.data) {
+          const today = res.data.today || {};
+          const yesterday = res.data.yesterday || {};
+          
+          this.orderDetail = {
+            updateTime: this.formatTime(res.data.now_date),
+            score: today.rating_num || 0,
+            visitors: today.visitor_num || 0,
+            yVisitors: yesterday.visitor_num || 0,
+            orders: today.place_order || 0,
+            yOrders: yesterday.place_order || 0,
+            amount: today.deal_money || 0,
+            yAmount: yesterday.deal_money || 0
+          };
+        }
+      });
+    },
+
+    // 获取：通知公告列表
+    fetchNoticeList() {
+      request.post('/sj/notice/list', { page: 1, limit: 6 }).then(res => {
+        if(res.code === 200 && res.data && res.data.list.length > 0) {
+          this.noticeList = res.data.list;
+        }
+      });
+    },
+
+    // 获取：品牌列表
+    fetchBrandList() {
+      // 假设首页只拉取推荐的前4条
+      request.post('/sj/brand/list', { page: 1, limit: 4 }).then(res => {
+        if(res.code === 200 && res.data && res.data.list) {
+          this.brands = res.data.list.map(item => {
+            let tags = [];
+            // 根据接口字段动态生成标签映射
+            if (item.franchise_state === 1) tags.push('franchise');
+            if (item.student_state === 1) tags.push('recruit');
+            if (tags.length === 0) tags.push('more'); 
+            
+            return {
+              id: item.id,
+              name: item.name,
+              bgSrc: item.cover_img || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg',
+              avatar: item.logo_img || 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar',
+              tagKeys: tags
+            };
+          });
+        }
+      });
+    },
+
+    // 获取：技能集市列表
+    fetchSkillList() {
+      request.post('/sj/skill/list', { page: 1, limit: 4 }).then(res => {
+        if(res.code === 200 && res.data && res.data.list) {
+          this.skills = res.data.list.map(item => {
+            return {
+              id: item.id,
+              title: item.name,
+              type: item.link_name || '平台课程',
+              views: item.browse_num || 0,
+              time: item.create_time ? item.create_time.split(' ')[0] : '', // 只取日期
+              coverSrc: item.cover_img || 'https://dummyimage.com/200x150/ccc/fff.png&text=Video'
+            };
+          });
+        }
+      });
     },
     
     // 跳转：通知详情页
     goToNotice(msg) {
-      if(msg.url) {
-        uni.navigateTo({ url: msg.url });
+      if(msg.id) {
+        uni.navigateTo({ url: `/pages/notice/detail?id=${msg.id}` });
       }
     },
 
     // 跳转：公告列表页
     goToNoticeList() {
-      // uni.navigateTo({ url: '/pages/notice/list' });
+      uni.navigateTo({ url: '/pages/notice/notice_list' });
     },
 
     // 跳转：去入驻
@@ -318,36 +429,26 @@ export default {
 
     // 营业中 / 休息中 按钮逻辑判断
     toggleStatus() {
-      // 1、入驻未认证 (id_type == -1)，弹窗提示未完善项，引导完善
+      // 校验逻辑保留你之前的认证状态检查
       if (!this.isCertified) {
-        uni.showModal({
-          title: '提示',
-          content: '请先完善认证信息',
-          confirmText: '去完善',
-          success: (res) => {
-            if (res.confirm) {
-              // uni.navigateTo({ url: '/pages/artisan/syr-info-change' });
-            }
-          }
-        });
+        uni.showModal({ title: '提示', content: '请先完善认证信息', confirmText: '去完善' });
         return;
       }
-
-      // 2、入驻认证通过，未配置营业时间，默认休息中，跳转至营业时间管理
       if (this.isCertified && !this.hasBusinessTime) {
         uni.showToast({ title: '请先配置营业时间', icon: 'none' });
-        setTimeout(() => {
-          // uni.navigateTo({ url: '/pages/shop/business-time' });
-        }, 800);
         return;
       }
 
-      // 3、认证通过并配置时间，仅作为开关，不跳转页面
-      if (this.isCertified && this.hasBusinessTime) {
-        this.isOpenStore = !this.isOpenStore;
-        // 预留接口：发送请求同步给后端当前状态
-        // request.post('/api/store/toggleStatus', { status: this.isOpenStore ? 1 : 0 });
-      }
+      // 真正的请求逻辑
+      let newStatus = this.userInfo.order_taking == 1 ? 2 : 1;
+      request.post("/sj/sjordertaking", {
+        order_taking: newStatus,
+        sjid: this.syrId // 使用你在 getUserInfo 存入的 sjId/syrId
+      }).then((res) => {
+        // 成功后重新拉取最新信息以更新 UI
+        this.getUserInfo();
+        uni.showToast({ title: newStatus == 1 ? '已开启营业' : '已休息', icon: 'none' });
+      });
     },
 
     animateScore() {
@@ -591,7 +692,7 @@ export default {
         .guide-btn {
           width: 534rpx;
           height: 70rpx;
-          border-radius: 55rpx;
+          border-radius: 35rpx;
           border: 1rpx solid #FF4767;
           
           color: #FF4767;
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
new file mode 100644
index 0000000..ac75361
--- /dev/null
+++ b/pages/notice/detail.vue
@@ -0,0 +1,359 @@
+<template>
+  <view class="notice-detail-page">
+    <!-- 自定义顶部导航组件 -->
+    <custom-navbar 
+      title="公告通知详情" 
+      :showBack="true" 
+      backgroundColor="linear-gradient(180deg, #E6ECFB 0%, #FFFFFF 100%)"
+      :showHeadle="true"
+      borderBottom="none"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" 
+      @onHeadleClick="handleShare"
+      
+    />
+
+    <!-- 页面主要内容 -->
+    <view class="page-content">
+      <!-- 加载状态 -->
+      <view v-if="loading" class="loading-container">
+        <view class="loading-icon"></view>
+        <text class="loading-text">加载中...</text>
+      </view>
+
+      <!-- 详情内容 -->
+      <view v-else-if="detailData.id" class="detail-card">
+        <!-- 标题 -->
+        <text class="detail-title">{{ detailData.title }}</text>
+        
+        <!-- 发布时间 -->
+        <view class="detail-time">
+          <text class="time-text">时间：{{ formatTime(detailData.create_time) }}</text>
+          <text class="browse-text"> <image class="browse-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6133cbef-5861-40f8-80f5-d8a86477c94f.png" mode="aspectFit"></image> {{ detailData.browse_num }}</text>
+        </view>
+
+        <!-- 富文本内容 -->
+        <view class="detail-content">
+          <rich-text :nodes="detailData.content"></rich-text>
+        </view>
+      </view>
+
+      <!-- 空状态或错误 -->
+      <view v-else-if="!loading && !detailData.id" class="empty-container">
+        <image class="empty-img" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c5e7b2a-3d4f-4b1e-9a7c-6e8f2d1b4a5c.png" mode="aspectFit"></image>
+        <text class="empty-text">公告不存在或已删除</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import CustomNavbar from '@/components/custom-navbar/custom-navbar.vue';
+import request from '@/utils/request';
+
+export default {
+  components: {
+    CustomNavbar
+  },
+  data() {
+    return {
+      loading: false,       // 加载状态
+      detailData: {         // 公告详情数据
+        id: null,
+        title: '',
+        create_time: '',
+        content: ''
+      }
+    };
+  },
+  onLoad(options) {
+    const id = options.id;
+    if (id) {
+      this.fetchNoticeDetail(id);
+    } else {
+      uni.showToast({
+        title: '参数错误',
+        icon: 'none'
+      });
+      setTimeout(() => {
+        uni.navigateBack();
+      }, 1500);
+    }
+  },
+  methods: {
+    // 获取公告详情
+    fetchNoticeDetail(id) {
+      this.loading = true;
+      request.post('/sj/notice/details', { id: id })
+        .then(res => {
+          if (res.code === 200 && res.data) {
+            this.detailData = res.data;
+            // 动态设置页面标题（可选）
+            uni.setNavigationBarTitle({
+              title: this.detailData.title || '公告详情'
+            });
+          } else {
+            uni.showToast({
+              title: res.msg || '获取详情失败',
+              icon: 'none'
+            });
+          }
+        })
+        .catch(err => {
+          console.error('获取公告详情失败:', err);
+          uni.showToast({
+            title: '网络异常，请稍后重试',
+            icon: 'none'
+          });
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+
+    formatTime(timeStr) {
+      if (!timeStr) return '--:--:--';
+      let formatted = timeStr;
+      if (timeStr.includes('.') && !timeStr.includes('-')) {
+        const match = timeStr.match(/(\d{4})\.(\d{2})\.(\d{2})(\d{2}:\d{2}:\d{2})/);
+        if (match) {
+          formatted = `${match[1]}-${match[2]}-${match[3]} ${match[4]}`;
+        } else {
+          formatted = timeStr.replace(/\./g, '-');
+        }
+      }
+      // 如果是标准格式直接返回，否则返回原字符串
+      if (formatted.includes('-') && formatted.includes(':')) {
+        // 转换回点分隔显示，以匹配设计图风格: 2026.05.08 15:00:00
+        const datePart = formatted.split(' ')[0];
+        const timePart = formatted.split(' ')[1] || '';
+        if (datePart && datePart.includes('-')) {
+          const dotDate = datePart.replace(/-/g, '.');
+          return `${dotDate} ${timePart}`.trim();
+        }
+        return formatted;
+      }
+      return timeStr;
+    },
+
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.notice-detail-page {
+  min-height: 100vh;
+  background-color: #fff;
+}
+
+.page-content {
+  // padding: 20rpx 24rpx 60rpx;
+}
+
+// 加载状态
+.loading-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 120rpx 0;
+
+  .loading-icon {
+    width: 60rpx;
+    height: 60rpx;
+    border: 4rpx solid #e0e0e0;
+    border-top-color: #FF4767;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+    margin-bottom: 20rpx;
+  }
+
+  .loading-text {
+    font-size: 26rpx;
+    color: #999;
+  }
+}
+
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+// 详情卡片
+.detail-card {
+  background: #ffffff;
+  border-radius: 24rpx;
+  padding: 20rpx 30rpx;
+  margin-bottom: 30rpx;
+
+  .detail-title {
+    display: block;
+    margin-bottom: 14rpx;
+    font-weight: 500;
+    font-size: 40rpx;
+    color: #333333;
+    line-height: 56rpx;
+  }
+
+  .detail-time {
+    display: flex;
+    align-items: center;
+    margin-bottom: 30rpx;
+    justify-content: space-between;  // 两端对齐
+    // border-bottom: 1rpx solid #f0f0f0;
+
+    .time-icon {
+      width: 28rpx;
+      height: 28rpx;
+      margin-right: 10rpx;
+      opacity: 0.6;
+    }
+
+    .time-text {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #B6B6B6;
+      line-height: 40rpx;
+    }
+    .browse-icon {
+      width: 38rpx;
+      height: 22rpx;
+      // margin-right: 10rpx;
+    }
+    .browse-text {
+      margin-right: 10rpx;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #B08463;
+      line-height: 40rpx;
+    }
+  }
+
+  .detail-content {
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #2A2A2A;
+    line-height: 40rpx;
+    overflow-x: hidden;
+    
+    // 对rich-text内部样式进行补充
+    ::v-deep img {
+      max-width: 100%;
+      height: auto;
+      display: block;
+      margin: 30rpx 0;
+    }
+    
+    ::v-deep p {
+      margin-bottom: 20rpx;          // 重置外边距，避免多余间距
+      padding: 0;
+    }
+
+    // 在需要分段的地方手动创建间距
+    ::v-deep br {
+      display: block;     // 让 <br> 标签表现正常
+      margin-bottom: 30rpx; // 控制段落间距
+    }
+  }
+}
+
+// 空状态
+.empty-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 150rpx 0;
+
+  .empty-img {
+    width: 200rpx;
+    height: 200rpx;
+    margin-bottom: 30rpx;
+    opacity: 0.6;
+  }
+
+  .empty-text {
+    font-size: 28rpx;
+    color: #999;
+  }
+}
+
+// 底部会员营销卡片（根据设计图样式）
+.member-card {
+  background: linear-gradient(135deg, #FFE6E8 0%, #FFF0E6 100%);
+  border-radius: 24rpx;
+  padding: 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 20rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
+  
+  .member-info {
+    flex: 1;
+    
+    .member-price {
+      display: block;
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #FF4767;
+      line-height: 44rpx;
+      margin-bottom: 8rpx;
+    }
+    
+    .member-desc {
+      display: block;
+      font-size: 24rpx;
+      color: #333;
+      line-height: 34rpx;
+      margin-bottom: 12rpx;
+    }
+    
+    .member-tag {
+      display: flex;
+      align-items: center;
+      
+      .tag-text, .tag-gift {
+        font-size: 20rpx;
+        background: rgba(255, 71, 103, 0.15);
+        padding: 4rpx 12rpx;
+        border-radius: 20rpx;
+        color: #FF4767;
+        margin-right: 12rpx;
+      }
+      
+      .tag-gift {
+        background: rgba(255, 193, 7, 0.2);
+        color: #E6A100;
+      }
+    }
+  }
+  
+  .member-btn {
+    background: linear-gradient(135deg, #FF4767, #FF6B8A);
+    border-radius: 48rpx;
+    padding: 14rpx 28rpx;
+    text-align: center;
+    min-width: 160rpx;
+    box-shadow: 0 4rpx 12rpx rgba(255, 71, 103, 0.3);
+    
+    .btn-text {
+      display: block;
+      font-size: 26rpx;
+      font-weight: 600;
+      color: #FFFFFF;
+      line-height: 36rpx;
+    }
+    
+    .btn-sub {
+      display: block;
+      font-size: 20rpx;
+      color: rgba(255, 255, 255, 0.9);
+      line-height: 28rpx;
+    }
+  }
+  
+}
+::v-deep .icon-headle {
+    width: 32rpx !important;
+    height: 32rpx !important;
+}
+</style>
\ No newline at end of file
diff --git a/pages/notice/notice_list.vue b/pages/notice/notice_list.vue
new file mode 100644
index 0000000..b2441e5
--- /dev/null
+++ b/pages/notice/notice_list.vue
@@ -0,0 +1,298 @@
+<template>
+  <view class="notice-page">
+    <!-- 自定义顶部导航组件 -->
+    <custom-navbar title="公告通知" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true"
+			headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" @onHeadleClick="addAddress">
+		</custom-navbar>
+    
+    <!-- 主要内容区域 -->
+    <view class="page-content">
+      <!-- 加载状态 -->
+      <view v-if="loading" class="loading-container">
+        <view class="loading-icon"></view>
+        <text class="loading-text">加载中...</text>
+      </view>
+      
+      <!-- 公告列表 -->
+      <view v-else-if="noticeList.length > 0" class="notice-list">
+        <view 
+          class="notice-item" 
+          v-for="(item, index) in noticeList" 
+          :key="item.id"
+          @tap="goToDetail(item)"
+        >
+          <view class="item-main">
+            <text class="item-title line-2">{{ item.title }}</text>
+            <view class="item-time">
+              <text class="time-text">发布时间：{{ formatTime(item.create_time) }}</text>
+            </view>
+          </view>
+          <!-- <image class="arrow-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png" mode="aspectFit"></image> -->
+        </view>
+        
+        <!-- 加载更多状态 -->
+        <view v-if="loadingMore" class="load-more">
+          <text>加载更多...</text>
+        </view>
+        <view v-else-if="!hasMore && noticeList.length > 0" class="no-more">
+          <text>没有更多了</text>
+        </view>
+      </view>
+      
+      <!-- 空状态 -->
+      <view v-else class="empty-container">
+        <image class="empty-img" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c5e7b2a-3d4f-4b1e-9a7c-6e8f2d1b4a5c.png" mode="aspectFit"></image>
+        <text class="empty-text">暂无公告通知</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import CustomNavbar from '@/components/custom-navbar/custom-navbar.vue';
+import request from '@/utils/request';
+
+export default {
+  components: {
+    CustomNavbar
+  },
+  data() {
+    return {
+      loading: false,        // 首次加载状态
+      loadingMore: false,    // 加载更多状态
+      noticeList: [],        // 公告列表数据
+      page: 1,               // 当前页码
+      limit: 10,             // 每页数量
+      total: 0,              // 总记录数
+      hasMore: true          // 是否还有更多数据
+    };
+  },
+  onLoad() {
+    this.fetchNoticeList(true);
+  },
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.fetchNoticeList(true);
+  },
+  // 上拉加载更多
+  onReachBottom() {
+    if (!this.loadingMore && this.hasMore && !this.loading) {
+      this.fetchNoticeList(false);
+    }
+  },
+  methods: {
+    // 获取公告列表
+    fetchNoticeList(reset = true) {
+      if (reset) {
+        this.page = 1;
+        this.hasMore = true;
+        this.loading = true;
+      } else {
+        if (!this.hasMore) return;
+        this.loadingMore = true;
+      }
+      
+      request.post('/sj/notice/list', {
+        page: this.page,
+        limit: this.limit
+      }).then(res => {
+        if (res.code === 200 && res.data) {
+          const list = res.data.list || [];
+          const total = res.data.total || 0;
+          this.total = total;
+          
+          if (reset) {
+            this.noticeList = list;
+          } else {
+            this.noticeList = [...this.noticeList, ...list];
+          }
+          
+          // 判断是否还有更多数据
+          this.hasMore = this.noticeList.length < total;
+          
+          // 如果还有更多数据，页码加1
+          if (this.hasMore && !reset) {
+            this.page++;
+          }
+        } else {
+          if (reset) this.noticeList = [];
+          this.hasMore = false;
+        }
+      }).catch(err => {
+        console.error('获取公告列表失败:', err);
+        if (reset) this.noticeList = [];
+        uni.showToast({
+          title: '加载失败，请稍后重试',
+          icon: 'none'
+        });
+      }).finally(() => {
+        this.loading = false;
+        this.loadingMore = false;
+        // 停止下拉刷新
+        if (reset) {
+          uni.stopPullDownRefresh();
+        }
+      });
+    },
+    
+    // 格式化时间
+    formatTime(timeStr) {
+      if (!timeStr) return '--:--:--';
+      // 处理多种时间格式：2026-06-10 15:00:00 或 2026.06.1015:00:00
+      let formatted = timeStr;
+      // 如果是点分隔的格式，转换为标准格式
+      if (timeStr.includes('.') && !timeStr.includes('-')) {
+        formatted = timeStr.replace(/\./g, '-');
+        // 处理日期和时间连在一起的情况，如 "2026.06.1015:00:00" -> "2026-06-10 15:00:00"
+        if (formatted.match(/\d{4}-\d{2}-\d{2}\d{2}:\d{2}:\d{2}/)) {
+          formatted = formatted.replace(/(\d{4}-\d{2}-\d{2})(\d{2}:\d{2}:\d{2})/, '$1 $2');
+        }
+      }
+      // 如果已经是标准格式，直接返回
+      if (formatted.includes('-') && formatted.includes(':')) {
+        return formatted;
+      }
+      return timeStr;
+    },
+    
+    // 跳转到详情页
+    goToDetail(item) {
+      if (item.id) {
+        uni.navigateTo({
+          url: `/pages/notice/detail?id=${item.id}`
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.notice-page {
+  min-height: 100vh;
+  background-color: #f5f6f8;
+}
+
+.page-content {
+  padding: 20rpx 20rpx 40rpx;
+}
+
+// 加载中样式
+.loading-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 120rpx 0;
+  
+  .loading-icon {
+    width: 60rpx;
+    height: 60rpx;
+    border: 4rpx solid #e0e0e0;
+    border-top-color: #FF4767;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+    margin-bottom: 20rpx;
+  }
+  
+  .loading-text {
+    font-size: 26rpx;
+    color: #999;
+  }
+}
+
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+// 公告列表
+.notice-list {
+  .notice-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background: #ffffff;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 20rpx;
+    // box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+    transition: all 0.2s ease;
+    
+    .item-main {
+      flex: 1;
+      min-width: 0; // 防止文字溢出
+      
+      .item-title {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: #101010;
+        line-height: 42rpx;
+        margin-bottom: 16rpx;
+      }
+      
+      .item-time {
+        display: flex;
+        align-items: center;
+        
+        .time-icon {
+          width: 24rpx;
+          height: 24rpx;
+          margin-right: 8rpx;
+          opacity: 0.6;
+        }
+        
+        .time-text {
+          font-size: 22rpx;
+          color: #999;
+          line-height: 30rpx;
+        }
+      }
+    }
+  }
+}
+
+// 加载更多
+.load-more, .no-more {
+  text-align: center;
+  padding: 30rpx 0;
+  font-size: 24rpx;
+  color: #999;
+}
+
+// 空状态
+.empty-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 150rpx 0;
+  
+  .empty-img {
+    width: 200rpx;
+    height: 200rpx;
+    margin-bottom: 30rpx;
+    opacity: 0.6;
+  }
+  
+  .empty-text {
+    font-size: 28rpx;
+    color: #999;
+  }
+}
+
+// 多行省略
+.line-2 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  word-break: break-all;
+}
+
+
+::v-deep .icon-headle {
+    width: 32rpx !important;
+    height: 32rpx !important;
+}
+
+</style>
\ No newline at end of file
diff --git a/pages/shop/verify/manual-verify.vue b/pages/shop/verify/manual-verify.vue
new file mode 100644
index 0000000..3f3a5b3
--- /dev/null
+++ b/pages/shop/verify/manual-verify.vue
@@ -0,0 +1,153 @@
+<template>
+  <view class="manual-verify">
+    <CustomNavbar title="" backgroundColor="#FFFFFF"></CustomNavbar>
+
+    <view class="content">
+      <view class="tip">请输入6位核销码</view>
+
+      <view class="code-inputs" @tap="focusInput">
+        <view
+          class="input-box"
+          :class="{ filled: code[i-1] }"
+          v-for="i in 6"
+          :key="i"
+        >
+          {{ code[i-1] || '' }}
+        </view>
+      </view>
+
+      <input
+        class="hidden-input"
+        type="number"
+        maxlength="6"
+        :value="code"
+        :focus="inputFocus"
+        @input="onInput"
+        @blur="resetFocus"
+        confirm-type="done"
+      />
+
+      <button class="confirm-btn" :class="{ active: code.length === 6 }" @tap="submitCode">
+        确认
+      </button>
+    </view>
+  </view>
+</template>
+
+<script>
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+import request from "@/utils/request";
+
+export default {
+  components: { CustomNavbar },
+  data() {
+    return {
+      code: '',
+      inputFocus: false
+    };
+  },
+  methods: {
+    focusInput() {
+      this.inputFocus = false;
+      this.$nextTick(() => {
+        this.inputFocus = true;
+      });
+    },
+    resetFocus() {
+      this.inputFocus = false;
+    },
+    onInput(e) {
+      let value = e.detail.value;
+      value = value.replace(/\D/g, '');
+      if (value.length > 6) value = value.slice(0, 6);
+      this.code = value;
+    },
+    submitCode() {
+      if (this.code.length !== 6) {
+        uni.showToast({ title: '请输入6位核销码', icon: 'none' });
+        return;
+      }
+      request.post('/sj/poster/useOrderServerCode', {
+        server_code: this.code,
+        id: this.orderId,
+        order_type: this.orderType
+      }).then(res => {
+        if (res.code === 200) {
+          uni.showToast({ title: '核销成功' });
+          setTimeout(() => uni.navigateBack(), 1500);
+        } else {
+          uni.showToast({ title: res.msg || '核销失败', icon: 'none' });
+        }
+      }).catch(() => {
+        uni.showToast({ title: '网络异常', icon: 'none' });
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.manual-verify {
+  padding-top: 150rpx;
+  background-color: #fff;
+  min-height: 100vh;
+
+  .tip {
+    font-weight: 500;
+    font-size: 46rpx;
+    color: #333333;
+    line-height: 65rpx;
+    text-align: left;
+    margin-bottom: 80rpx;
+    margin-left: 48rpx;
+  }
+
+  .code-inputs {
+    display: flex;
+    justify-content: center;
+    gap: 24rpx;
+    margin-bottom: 80rpx;
+    padding: 0 30rpx;
+
+    .input-box {
+      width: 88rpx;
+      height: 88rpx;
+      border-radius: 12rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 48rpx;
+      font-weight: 500;
+      color: #333;
+      background-color: #F3F3F3;
+    }
+  }
+
+  .confirm-btn {
+    margin: 0 49rpx;
+    background: #ff476685;
+    color: #fff;
+    border-radius: 88rpx;
+    height: 96rpx;
+    line-height: 96rpx;
+    font-size: 36rpx;
+    font-weight: 500;
+    box-shadow: 0 8rpx 20rpx rgba(255, 71, 103, 0.2);
+    transition: all 0.2s;
+
+    &.active {
+      background: #FF4767;
+    }
+  }
+
+  .hidden-input {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 2px;
+    height: 2px;
+    opacity: 0;
+    background: transparent;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/shop/verify/verify-order.nvue b/pages/shop/verify/verify-order.nvue
new file mode 100644
index 0000000..911dc25
--- /dev/null
+++ b/pages/shop/verify/verify-order.nvue
@@ -0,0 +1,216 @@
+<template>
+  <view class="verify-page">
+    
+    <barcode 
+      class="barcode-view" 
+      autostart="true" 
+      flash="false" 
+      zoom="false"
+      frameColor="#FF4767"      scanbarColor="#FF4767"
+      @marked="onScanCode">
+    </barcode>
+
+    <view class="full-mask"></view>
+
+    <view class="nav-bar" :style="{ paddingTop: statusBarHeight + 'px', height: (statusBarHeight + 44) + 'px' }">
+      <view class="back-btn" @tap="goBack">
+        <image class="back-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ea671fc8-435e-46fe-ba69-6d728328149a.png"></image>
+      </view>
+      <text class="nav-title">扫码验券</text>
+      <view class="right-placeholder"></view>
+    </view>
+
+    <view class="bottom-bar">
+      <view class="action-btn" @tap="goToManualVerify">
+        <image class="btn-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/acb1ead0-d0d7-4db1-b779-7bb1cffa6594.png"></image>
+        <text class="btn-text">输入核销码</text>
+      </view>
+      
+      <view class="action-btn" @tap="chooseFromAlbum">
+        <image class="btn-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/7d6de32b-091d-4103-8138-14ae217e5f47.png"></image>
+        <text class="btn-text">相册</text>
+      </view>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request";
+
+export default {
+  data() {
+    return {
+      statusBarHeight: 44, // 默认状态栏高度
+      isProcessing: false  // 防抖开关
+    }
+  },
+  onLoad() {
+    const sysInfo = uni.getSystemInfoSync();
+    if(sysInfo.statusBarHeight) {
+      this.statusBarHeight = sysInfo.statusBarHeight;
+    }
+  },
+  methods: {
+    goBack() {
+      uni.navigateBack();
+    },
+
+    // nvue 下 barcode 的回调事件叫 @marked
+    onScanCode(e) {
+      if (this.isProcessing) return;
+      this.isProcessing = true;
+      
+      // 并且扫码获取的内容在 e.detail.message 里
+      const code = e.detail.message;
+      this.handleCodeResult(code);
+    },
+
+    // 统一处理扫码结果
+    handleCodeResult(code) {
+      if (!code) {
+        this.isProcessing = false;
+        return;
+      }
+      
+      uni.showLoading({ title: '查询订单中...' });
+      
+      request.post('/sj/poster/getOrderByCode', { server_code: code }).then(result => {
+        uni.hideLoading();
+        
+        if (result.code === 200 && result.data) {
+          uni.showToast({ title: '扫码成功！', icon: 'none' });
+          const orderDataStr = encodeURIComponent(JSON.stringify(result.data));
+          uni.navigateTo({
+            url: `/pages/shop/verify/verify-order-detail?data=${orderDataStr}`
+          });
+        } else {
+          // 如果无效，立即退出页面回首页
+          uni.showToast({ title: result.msg, icon: 'none' });
+          
+          // 延迟 500ms 让用户看到 Toast，然后自动退回主页
+          setTimeout(() => {
+            uni.navigateBack({ delta: 1 });
+          }, 500);
+        }
+      }).catch((err) => {
+        uni.hideLoading();
+        uni.showToast({ title: '请求失败，退出重试', icon: 'none' });
+        setTimeout(() => {
+            uni.navigateBack({ delta: 1 });
+        }, 800);
+      });
+    },
+
+    chooseFromAlbum() {
+      uni.chooseImage({
+        count: 1,
+        success: (res) => {
+          uni.scanCode({
+            onlyFromCamera: false, 
+            scanType: ['qrCode'],
+            success: (scanRes) => {
+              this.handleCodeResult(scanRes.result);
+            }
+          });
+        }
+      });
+    },
+
+    goToManualVerify() {
+      uni.navigateTo({ url: '/pages/shop/verify/manual-verify' }); 
+    }
+  }
+};
+</script>
+
+<style>
+.verify-page {
+  flex: 1;
+  background-color: #000000;
+}
+
+.barcode-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.full-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.nav-bar {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+}
+
+.back-btn {
+  width: 60rpx;
+  height: 88rpx;
+  justify-content: center;
+  align-items: flex-start;
+}
+
+.back-icon {
+  width: 18rpx;
+  height: 36rpx;
+}
+
+.nav-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #FFFFFF;
+}
+
+.right-placeholder {
+  width: 60rpx;
+}
+
+.bottom-bar {
+  position: absolute;
+  bottom: 80rpx;
+  left: 0;
+  right: 0;
+  height: 120rpx;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-around;
+}
+
+.action-btn {
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  width: 325rpx;
+  height: 105rpx;
+  background-color: rgba(0, 0, 0, 0.4);
+  border-radius: 20rpx;
+}
+
+.btn-icon {
+  width: 40rpx;
+  height: 38rpx;
+  margin-right: 16rpx;
+}
+
+.btn-text {
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #FFFFFF;
+}
+</style>
\ No newline at end of file

From 3c3159d5d8c10ee92c22b536a11f0db3edcaaf9e Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 26 May 2026 13:58:25 +0800
Subject: [PATCH 038/118] =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=9C=AA=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E9=A1=B5=E9=9D=A2+=E6=89=AB=E7=A0=81=E5=85=A8?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                |   6 +
 pages/shop/verify/manual-verify.vue       |  26 +-
 pages/shop/verify/verify-fail.vue         | 105 +++++
 pages/shop/verify/verify-order-detail.vue | 457 ++++++++++++++++++++++
 pages/shop/verify/verify-order.nvue       |  26 +-
 5 files changed, 600 insertions(+), 20 deletions(-)
 create mode 100644 pages/shop/verify/verify-fail.vue
 create mode 100644 pages/shop/verify/verify-order-detail.vue

diff --git a/pages.json b/pages.json
index 8fc687b..eda9f0c 100644
--- a/pages.json
+++ b/pages.json
@@ -602,6 +602,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/shop/verify/verify-fail",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/shop/verify/verify-order-detail",
 			"style": {
diff --git a/pages/shop/verify/manual-verify.vue b/pages/shop/verify/manual-verify.vue
index 3f3a5b3..26f883d 100644
--- a/pages/shop/verify/manual-verify.vue
+++ b/pages/shop/verify/manual-verify.vue
@@ -67,19 +67,27 @@ export default {
         uni.showToast({ title: '请输入6位核销码', icon: 'none' });
         return;
       }
-      request.post('/sj/poster/useOrderServerCode', {
-        server_code: this.code,
-        id: this.orderId,
-        order_type: this.orderType
+      
+      uni.showLoading({ title: '查询订单中...', mask: true });
+      
+      // 统一调用查询接口，不要在这里调用核销接口
+      request.post('/sj/poster/getOrderByCode', {
+        server_code: this.code
       }).then(res => {
-        if (res.code === 200) {
-          uni.showToast({ title: '核销成功' });
-          setTimeout(() => uni.navigateBack(), 1500);
+        uni.hideLoading();
+        if (res.code === 200 && res.data) {
+          // 查询成功，带上数据跳 detail 页
+          const orderDataStr = encodeURIComponent(JSON.stringify(res.data));
+          uni.navigateTo({
+            url: `/pages/shop/verify/verify-order-detail?data=${orderDataStr}`
+          });
         } else {
-          uni.showToast({ title: res.msg || '核销失败', icon: 'none' });
+          // 查询不到，跳 fail 页
+          uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });
         }
       }).catch(() => {
-        uni.showToast({ title: '网络异常', icon: 'none' });
+        uni.hideLoading();
+        uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });
       });
     }
   }
diff --git a/pages/shop/verify/verify-fail.vue b/pages/shop/verify/verify-fail.vue
new file mode 100644
index 0000000..7a9f822
--- /dev/null
+++ b/pages/shop/verify/verify-fail.vue
@@ -0,0 +1,105 @@
+<template>
+  <view class="verify-fail-page">
+    <!-- 自定义导航栏 -->
+    <custom-navbar title="" :showBack="true" backgroundColor="#FFFFFF" borderBottom="none"></custom-navbar>
+
+    <view class="fail-content">
+      <!-- 失败图标 -->
+      <image class="fail-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/3d7aec4c-beae-4d82-83ca-1244e9af4af7.png" mode="aspectFit"></image>
+      
+      <!-- 失败文案 -->
+      <view class="fail-title">核销未成功</view>
+      <view class="fail-message">未找到订单信息，请核对二维码是否正确！</view>
+
+      <!-- 重新扫码按钮 -->
+      <view class="rescan-btn" @tap="rescan">
+        重新扫码验券
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+
+export default {
+  components: { CustomNavbar },
+  data() {
+    return {};
+  },
+  methods: {
+    rescan() {
+      // 返回到扫码页面（verify-order）
+      uni.navigateBack({
+        delta: 1, // 退回上一页，即扫码页
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+page {
+  background-color: #fff;
+}
+.verify-fail-page {
+  min-height: 100vh;
+  background-color: #fff;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.fail-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+//   padding: 0 60rpx;
+  margin-top: -250rpx;
+}
+
+.fail-icon {
+  width: 300rpx;
+  height: 257rpx;
+  margin-bottom: -10rpx;
+}
+
+.fail-title {
+  font-weight: 500;
+font-size: 36rpx;
+color: #333333;
+line-height: 50rpx;
+  margin-bottom: 9rpx;
+}
+
+.fail-message {
+  font-weight: 400;
+    font-size: 26rpx;
+    color: #999999;
+    line-height: 37rpx;
+  text-align: center;
+  margin-bottom: 60rpx;
+}
+
+.rescan-btn {
+  width: 329rpx;
+height: 98rpx;
+  border-radius: 49rpx;
+    border: 1rpx solid #FF4767;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #FF4767;
+  transition: all 0.2s;
+  
+  &:active {
+    transform: scale(0.98);
+    background: #e63e5b;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/shop/verify/verify-order-detail.vue b/pages/shop/verify/verify-order-detail.vue
new file mode 100644
index 0000000..8d93cec
--- /dev/null
+++ b/pages/shop/verify/verify-order-detail.vue
@@ -0,0 +1,457 @@
+<template>
+  <view class="page">
+    <custom-navbar title="订单核销详情" :showBack="true" backgroundColor="#F5F5F5" :show-headle="true" borderBottom="none">
+    </custom-navbar>
+
+    <scroll-view class="scroll-content" scroll-y="true">
+      <view class="page-header">
+        <image class="header-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/be13b4f4-c0db-4f39-b9fc-0e69c13b72ee.png" mode="aspectFit"></image>
+        <view class="header-text-box">
+          <view class="header-title">工时订单</view>
+          <view class="header-sub">请确认核销订单信息～</view>
+        </view>
+      </view>
+
+      <view class="card">
+        <view class="card-title">顾客信息</view>
+        <view class="customer-info">
+          <text>{{ orderData.customerName || '--' }}</text>
+          <text class="ml-10">{{ orderData.customerPhone || '--' }}</text>
+        </view>
+      </view>
+
+      <view class="card">
+        <view class="card-title">预约信息</view>
+        <view class="goods-block">
+          <image class="goods-img" :src="orderData.goodsImg" mode="aspectFill"></image>
+          <view class="goods-detail">
+            <view class="goods-top">
+              <text class="goods-name">{{ orderData.goodsName || '--' }}</text>
+              <text class="goods-quantity">x{{ orderData.goodsNum || 1 }}</text>
+            </view>
+            <view class="goods-price"><text class="money-symbol1">¥</text>{{ formatPrice(orderData.goodsPrice) }}</view>
+          </view>
+        </view>
+
+        <view class="price-row mt-10">
+          <text class="label">服务售价</text>
+          <view class="val-box">
+            <text class="old-price">¥{{ formatPrice(orderData.originalPrice) }}</text>
+            <text class="new-price">¥{{ formatPrice(orderData.actualPrice) }}</text>
+          </view>
+        </view>
+        <view class="price-row mt-15">
+          <text class="label">用户实付</text>
+          <text class="new-price">¥{{ formatPrice(orderData.payPrice) }}</text>
+        </view>
+
+        <view class="dashed-divider"></view>
+
+        <view class="settle-row">
+          <text class="settle-label">商家结算基数</text>
+          <text class="settle-val"><text class="money-symbol2">¥</text>{{ formatPrice(orderData.settlePrice) }}</text>
+        </view>
+      </view>
+
+      <view class="bottom-placeholder"></view>
+    </scroll-view>
+
+    <view class="bottom-btn-wrapper">
+      <view class="confirm-btn" @tap="confirmVerify" :class="{ 'btn-disabled': isVerifying }">
+        <text class="btn-text">{{ isVerifying ? '核销中...' : '确认核销' }}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request";
+
+export default {
+  data() {
+    return {
+      statusBarHeight: 44,
+      orderData: {
+        orderId: '',
+        customerName: '',
+        customerPhone: '',
+        goodsImg: '',
+        goodsName: '',
+        goodsNum: 1,
+        goodsPrice: 0,
+        originalPrice: 0,
+        actualPrice: 0,
+        payPrice: 0,
+        settlePrice: 0
+      },
+      isVerifying: false
+    };
+  },
+  onLoad(options) {
+    const sysInfo = uni.getSystemInfoSync();
+    if (sysInfo.statusBarHeight) {
+      this.statusBarHeight = sysInfo.statusBarHeight;
+    }
+
+    if (options.data) {
+      try {
+        const parsedData = JSON.parse(decodeURIComponent(options.data));
+        this.mapOrderData(parsedData);
+      } catch (e) {
+        console.error('解析订单数据失败', e);
+        uni.showToast({ title: '订单数据异常', icon: 'none' });
+      }
+    } else {
+      // uni.showToast({ title: '未获取到订单信息', icon: 'none' });
+      console.log('未获取到订单信息');
+    }
+  },
+  methods: {
+    // 精准映射 /sj/poster/getOrderByCode 接口返回的 data 字段
+    mapOrderData(data) {
+      this.orderData = {
+        orderId: data.order_id || '',
+        customerName: data.user_name || '--',
+        customerPhone: data.user_phone || '--',
+        goodsImg: data.order_photo || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/default_goods.png',
+        goodsName: data.order_title || '--',
+        goodsNum: data.order_num || 1,
+        goodsPrice: data.cost_money || 0,
+        originalPrice: data.line_money || 0,
+        actualPrice: data.cost_money || 0,
+        payPrice: data.pay_money || 0,
+        settlePrice: data.jiesuan_jine_yiju || 0
+      };
+    },
+    formatPrice(price) {
+      if (price === null || price === undefined) return '0.00';
+      const num = parseFloat(price);
+      if (isNaN(num)) return '0.00';
+      return num.toFixed(2);
+    },
+    goBack() {
+      uni.navigateBack();
+    },
+    confirmVerify() {
+      if (this.isVerifying) return;
+      if (!this.orderData.orderId) {
+        uni.showToast({ title: '订单ID缺失，无法核销', icon: 'none' });
+        return;
+      }
+      uni.showModal({
+        title: '确认核销',
+        content: '确定要将此订单标记为已核销吗？',
+        success: (res) => {
+          if (res.confirm) {
+            this.doVerify();
+          }
+        }
+      });
+    },
+    doVerify() {
+      this.isVerifying = true;
+      uni.showLoading({ title: '核销中...', mask: true });
+
+      // 调用核销接口
+      request.post('/sj/poster/useOrderServerCode', {
+        id: this.orderData.orderId
+      }).then(res => {
+        uni.hideLoading();
+        if (res.code === 200) {
+          uni.showToast({ title: '核销成功', icon: 'success' });
+          setTimeout(() => {
+            uni.navigateBack();
+          }, 1500);
+        } else {
+          uni.showToast({ title: res.msg || '核销失败，请重试', icon: 'none' });
+          this.isVerifying = false;
+        }
+      }).catch(err => {
+        uni.hideLoading();
+        console.error('核销请求异常', err);
+        uni.showToast({ title: '网络异常，核销失败', icon: 'none' });
+        this.isVerifying = false;
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background-color: #F5F5F5;
+  position: relative;
+}
+
+/* 自定义导航栏 */
+.nav-bar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  background-color: #ffffff;
+  z-index: 10;
+  box-sizing: border-box;
+}
+
+.back-btn {
+  width: 60rpx;
+  height: 100%;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.back-icon {
+  width: 18rpx;
+  height: 36rpx;
+}
+
+.nav-title {
+  font-size: 34rpx;
+  font-weight: 500;
+  color: #333333;
+}
+
+.right-placeholder {
+  width: 60rpx;
+}
+
+/* 可滚动内容区域 */
+.scroll-content {
+  padding-top: 40rpx; 
+  flex: 1;
+  padding-bottom: 20rpx;
+  box-sizing: border-box;
+}
+
+/* 页面头部：订单类型标识 */
+.page-header {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 40rpx 30rpx 10rpx;
+
+  .header-icon {
+    width: 99rpx;
+    height: 95rpx;
+    margin-right: 20rpx;
+  }
+  .header-text-box {
+    display: flex;
+    flex-direction: column;
+    .header-title {
+      font-weight: 500;
+      font-size: 36rpx;
+      color: #333333;
+      line-height: 50rpx;
+      margin-bottom: 12rpx;
+    }
+    .header-sub {
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #999999;
+      line-height: 33rpx;
+    }
+  }
+}
+
+/* 卡片通用样式 */
+.card {
+  background-color: #ffffff;
+  border-radius: 20rpx;
+  margin: 24rpx 30rpx;
+  padding: 20rpx;
+  box-shadow: none;
+  
+  .card-title {
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+    line-height: 42rpx;
+    margin-bottom: 24rpx;
+  }
+}
+
+/* 顾客信息 */
+.customer-info {
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #666666;
+  line-height: 40rpx;
+  .ml-10 {
+    margin-left: 6rpx;
+  }
+}
+
+/* 商品基础信息块 */
+.goods-block {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 30rpx;
+
+  .goods-img {
+    width: 120rpx;
+    height: 127rpx;
+    border-radius: 12rpx;
+    background-color: #f0f0f0;
+    margin-right: 20rpx;
+    flex-shrink: 0;
+  }
+
+  .goods-detail {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    .goods-top {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: flex-start;
+
+      .goods-name {
+        font-weight: 500;
+        font-size: 30rpx;
+        color: #333333;
+        line-height: 42rpx;
+        max-width: 380rpx;
+      }
+      .goods-quantity {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666666;
+        line-height: 40rpx;
+      }
+    }
+
+    .goods-price {
+      font-weight: 500;
+      font-size: 36rpx;
+      color: #333333;
+      line-height: 50rpx;
+    }
+    .money-symbol1 {
+      font-size: 24rpx;
+    }
+  }
+}
+
+/* 价格明细行 */
+.price-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: baseline;
+  
+  &.mt-10 { margin-top: 20rpx; }
+  &.mt-15 { margin-top: 30rpx; }
+
+  .label {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #666666;
+    line-height: 37rpx;
+  }
+
+  .val-box {
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+
+    .old-price {
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #999999;
+      line-height: 37rpx;
+      text-decoration: line-through;
+      margin-right: 16rpx;
+    }
+  }
+
+  .new-price {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #333333;
+    line-height: 37rpx;
+  }
+}
+
+/* 虚线分割线 */
+.dashed-divider {
+  width: 100%;
+  height: 1px;
+  border-bottom: 2rpx solid #f5f5f5;
+  margin: 30rpx 0;
+}
+
+/* 商家结算基数栏 */
+.settle-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: baseline;
+
+  .settle-label {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #333333;
+    line-height: 37rpx;
+    margin-right: 12rpx;
+  }
+
+  .settle-val {
+    font-weight: 500;
+    font-size: 40rpx;
+    color: #FF4767;
+    line-height: 56rpx;
+  }
+  .money-symbol2 {
+    font-size: 26rpx;
+    margin-right: 5rpx;
+  }
+}
+
+.bottom-placeholder {
+  height: 160rpx;
+}
+
+/* 底部按钮容器 */
+.bottom-btn-wrapper {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: #f5f5f5;
+  padding: 20rpx 40rpx 60rpx; // 底部安全区
+}
+
+.confirm-btn {
+  background-color: #FF4767;
+  height: 98rpx;
+  border-radius: 49rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  transition: opacity 0.2s;
+}
+
+.btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #ffffff;
+}
+
+.btn-disabled {
+  opacity: 0.6;
+}
+</style>
\ No newline at end of file
diff --git a/pages/shop/verify/verify-order.nvue b/pages/shop/verify/verify-order.nvue
index 911dc25..4e6e8c8 100644
--- a/pages/shop/verify/verify-order.nvue
+++ b/pages/shop/verify/verify-order.nvue
@@ -2,6 +2,7 @@
   <view class="verify-page">
     
     <barcode 
+      ref="barcode"
       class="barcode-view" 
       autostart="true" 
       flash="false" 
@@ -51,6 +52,13 @@ export default {
       this.statusBarHeight = sysInfo.statusBarHeight;
     }
   },
+  onShow() {
+    // 从失败页退回来时，确保开关打开，并重新唤醒底层的扫码引擎
+    this.isProcessing = false;
+    if (this.$refs.barcode) {
+      this.$refs.barcode.start(); // 重新开始扫描
+    }
+  },
   methods: {
     goBack() {
       uni.navigateBack();
@@ -84,21 +92,17 @@ export default {
           uni.navigateTo({
             url: `/pages/shop/verify/verify-order-detail?data=${orderDataStr}`
           });
+          // 延迟重置防抖，避免重复扫码跳转
+          setTimeout(() => { this.isProcessing = false; }, 1000);
         } else {
-          // 如果无效，立即退出页面回首页
-          uni.showToast({ title: result.msg, icon: 'none' });
-          
-          // 延迟 500ms 让用户看到 Toast，然后自动退回主页
-          setTimeout(() => {
-            uni.navigateBack({ delta: 1 });
-          }, 500);
+          // 失败直接跳 fail 页
+          this.isProcessing = false; // 必须马上重置，保证退回该页时能继续扫
+          uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });
         }
       }).catch((err) => {
         uni.hideLoading();
-        uni.showToast({ title: '请求失败，退出重试', icon: 'none' });
-        setTimeout(() => {
-            uni.navigateBack({ delta: 1 });
-        }, 800);
+        this.isProcessing = false;
+        uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });
       });
     },
 

From 0c6ce0950614c9ebbcf025fecc5facfd8391f257 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 26 May 2026 14:04:05 +0800
Subject: [PATCH 039/118] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 63 ++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index ef95923..28f631d 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -182,7 +182,7 @@ export default {
       ],
 
       quickActions: [
-        { name: '扫码验券', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png' , path: 'scan'},
+        { name: '扫码验券', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png' , path: '/pages/shop/verify/verify-order'},
         { name: '服务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a90f02a2-9d39-440a-ad20-a4337bcd1b38.png' , path: '/pages/artisan/service-list'},
         { name: '工位管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4c503603-6c2f-4a7a-9329-5e54b8ca769e.png' , path: '/pages/shop/workSpace/list'},
         { name: '财务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/728c659e-e395-4473-b83e-7e04539f7ec6.png' , path: '/pages/wallet/wallet'}
@@ -195,7 +195,11 @@ export default {
     };
   },
   computed: {
-    // 💡 状态管理核心判定
+    // 营业状态：true(营业中) / false(休息中)
+    isOpenStore() {
+      return this.userInfo.order_taking === 1;
+    },
+    // 状态管理判定
     // 是否已入驻 (0: 未入驻, -1: 入驻第一步, >0: 已认证) 只要不等于0，说明已经开启了入驻流程
     isSettled() {
       if (!this.isLogin || !this.userInfo) return false;
@@ -238,7 +242,7 @@ export default {
     }
   },
   onShow() {
-    // 继承 1.0 的登录判定逻辑
+    // 登录判定逻辑
     this.isLogin = uni.getStorageSync("accessToken") ? true : false;
     if (this.isLogin) {
       this.getUserInfo();
@@ -260,27 +264,15 @@ export default {
     // 处理金刚区点击事件 (包含扫码验券核心逻辑)
     handleQuickAction(item) {
       if (item.name === '扫码验券') {
-        uni.scanCode({
-          success: (res) => {
-            const code = res.result;
-            if (code) {
-              uni.showLoading({ title: '查询订单中...' });
-              request.post('/sj/poster/getOrderByCode', { server_code: code }).then(result => {
-                uni.hideLoading();
-                if (result.code === 200 && result.data) {
-                  // TODO: 这里扫码成功获取到订单数据(result.data)，后续可弹窗或跳转到核销确认页
-                  // 预留核销接口调用逻辑: request.post('/sj/poster/useOrderServerCode', { id: result.data.order_id, order_type: result.data.order_type, server_code: code })
-                  uni.showToast({ title: '获取订单成功', icon: 'success' });
-                } else {
-                  uni.showToast({ title: result.msg || '未找到该订单', icon: 'none' });
-                }
-              }).catch(() => {
-                uni.hideLoading();
-                uni.showToast({ title: '网络异常', icon: 'none' });
-              });
-            }
-          }
-        });
+        console.log('准备跳转到自定义扫码页...');
+
+      uni.navigateTo({
+        url: '/pages/shop/verify/verify-order',
+        fail: (err) => {
+          console.error('跳转失败：', err);
+        }
+      });
+      return;
       } // 2. 通用跳转逻辑
       else if (item.path) {
         uni.navigateTo({
@@ -407,7 +399,7 @@ export default {
       });
     },
     
-    // 💡 跳转：通知详情页
+    // 跳转：通知详情页
     goToNotice(msg) {
       if(msg.id) {
         uni.navigateTo({ url: `/pages/notice/detail?id=${msg.id}` });
@@ -435,7 +427,7 @@ export default {
       }
     },
 
-    // 💡 营业中 / 休息中 按钮逻辑判断
+    // 营业中 / 休息中 按钮逻辑判断
     toggleStatus() {
       // 校验逻辑保留你之前的认证状态检查
       if (!this.isCertified) {
@@ -447,15 +439,16 @@ export default {
         return;
       }
 
-      // 3、认证通过并配置时间，仅作为开关，不跳转页面
-      if (this.isCertified && this.hasBusinessTime) {
-        this.isOpenStore = !this.isOpenStore;
-        // 同步给后端当前状态
-        const newState = this.isOpenStore ? 1 : 0;
-        // request.post('/api/store/toggleStatus', { self_state: newState }).then(() => {
-        //    uni.showToast({ title: this.isOpenStore ? '已开启营业' : '已休息', icon: 'none' });
-        // });
-      }
+      // 真正的请求逻辑
+      let newStatus = this.userInfo.order_taking == 1 ? 2 : 1;
+      request.post("/sj/sjordertaking", {
+        order_taking: newStatus,
+        sjid: this.syrId // 使用你在 getUserInfo 存入的 sjId/syrId
+      }).then((res) => {
+        // 成功后重新拉取最新信息以更新 UI
+        this.getUserInfo();
+        uni.showToast({ title: newStatus == 1 ? '已开启营业' : '已休息', icon: 'none' });
+      });
     },
 
     animateScore() {

From f6ed231d124eb8747da6cf458f4da81fa02d18d6 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 26 May 2026 14:29:00 +0800
Subject: [PATCH 040/118] =?UTF-8?q?=E6=89=93=E5=BC=80=E7=9B=B8=E5=86=8C?=
 =?UTF-8?q?=E5=8F=88=E5=87=BA=E7=8E=B0=E6=89=AB=E7=A0=81=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/verify/verify-order.nvue | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/pages/shop/verify/verify-order.nvue b/pages/shop/verify/verify-order.nvue
index 4e6e8c8..83e98c2 100644
--- a/pages/shop/verify/verify-order.nvue
+++ b/pages/shop/verify/verify-order.nvue
@@ -106,17 +106,40 @@ export default {
       });
     },
 
+    // 从相册选择图片并识别二维码
     chooseFromAlbum() {
       uni.chooseImage({
         count: 1,
+        sourceType: ['album'], // 仅限相册
         success: (res) => {
+          const filePath = res.tempFilePaths[0];
+          uni.showLoading({ title: '识别中...' });
+
+          // #ifdef APP-PLUS
+          // 调用 App 底层引擎，静默解析本地图片，绝不弹出原生扫码界面
+          plus.barcode.scan(
+            filePath,
+            (type, result) => {
+              uni.hideLoading();
+              // 成功识别到二维码，直接将内容丢给你的处理逻辑
+              this.handleCodeResult(result);
+            },
+            (error) => {
+              uni.hideLoading();
+              uni.showToast({ title: '未识别到有效二维码', icon: 'none' });
+            }
+          );
+          // #endif
+
+          // #ifndef APP-PLUS
+          // 非 App 环境（比如小程序兜底），才走普通的 scanCode
+          uni.hideLoading();
           uni.scanCode({
-            onlyFromCamera: false, 
-            scanType: ['qrCode'],
             success: (scanRes) => {
               this.handleCodeResult(scanRes.result);
             }
           });
+          // #endif
         }
       });
     },

From 2f9055454c16d9aae66db8d735c217e2dd50bbe8 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 26 May 2026 18:06:07 +0800
Subject: [PATCH 041/118] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2+=E6=8A=80=E8=83=BD=E9=9B=86=E5=B8=82?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                           |   3 +-
 pages/home/components/skill-card.vue | 190 ++++++++
 pages/home/home.vue                  |  23 +-
 pages/my/my.vue                      |   2 +-
 pages/my/myFavorite.vue              | 672 ++++++++++++++++++++++++++-
 5 files changed, 859 insertions(+), 31 deletions(-)
 create mode 100644 pages/home/components/skill-card.vue

diff --git a/pages.json b/pages.json
index eda9f0c..cca5aea 100644
--- a/pages.json
+++ b/pages.json
@@ -985,7 +985,8 @@
 		{
 			"path": "pages/my/myFavorite",
 			"style": {
-				"navigationBarTitleText": "我的收藏"
+				"navigationBarTitleText": "我的收藏",
+				"navigationStyle": "custom"
 			}
 		}
 
diff --git a/pages/home/components/skill-card.vue b/pages/home/components/skill-card.vue
new file mode 100644
index 0000000..0b0ee2c
--- /dev/null
+++ b/pages/home/components/skill-card.vue
@@ -0,0 +1,190 @@
+<template>
+  <view class="skill-item" @click="handleClick">
+    <view class="cover-box">
+      <image class="cover" :src="item.coverSrc" mode="aspectFill"></image>
+      <image 
+        class="play-icon" 
+        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5c1ddfef-a200-424a-a9dc-03d9395568f6.png"
+      ></image>
+    </view>
+    <view class="skill-info">
+      <view class="skill-title line-2">{{ item.title }}</view>
+      <view class="skill-type" :class="typeClass">
+        <image class="type-icon" :src="item.typeIcon || defaultTypeIcon"></image>
+        <text class="type-text">{{ item.type || '平台课程' }}</text>
+      </view>
+      <view class="skill-stats">
+        <image 
+          class="view-icon" 
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2409b64a-56bb-4d9e-a4cc-5b3444fcf097.png"
+        ></image>
+        {{ formatViews(item.views) }}观看 · {{ item.time }}
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'SkillItem',
+  props: {
+    item: {
+      type: Object,
+      required: true,
+      default: () => ({
+        id: null,
+        title: '',
+        coverSrc: '',
+        type: '平台课程',
+        views: 0,
+        time: '',
+        typeIcon: ''
+      })
+    }
+  },
+  data() {
+    return {
+      defaultTypeIcon: 'https://dummyimage.com/30x30/ccc/fff.png&text=I'  // 用于占位
+    }
+  },
+  computed: {
+    typeClass() {
+      const typeMap = {
+        '平台课程': 'platform-course',
+        '脸缘品牌': 'brand-course',
+        '品牌课程': 'brand-course'
+      }
+      return typeMap[this.item.type] || 'platform-course'
+    }
+  },
+  methods: {
+    formatViews(views) {
+      if (!views) return '0'
+      if (views >= 10000) {
+        return (views / 10000).toFixed(1) + 'w'
+      }
+      return views.toString()
+    },
+    handleClick() {
+      // 跳转到技能/课程详情页
+      if (this.item.id) {
+        uni.navigateTo({
+          url: `/pages/skill/detail?id=${this.item.id}`
+        })
+      } else {
+        uni.showToast({ title: '详情页开发中', icon: 'none' })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.skill-item {
+  display: flex;
+  margin-bottom: 20rpx;
+  
+  &:last-child {
+    margin-bottom: 0;
+  }
+
+  .cover-box {
+    position: relative;
+    width: 224rpx;
+    height: 126rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+    margin-right: 24rpx;
+    flex-shrink: 0;
+
+    .cover { 
+      width: 100%; 
+      height: 100%; 
+    }
+    
+    .play-icon {
+      position: absolute;
+      top: 50%; 
+      left: 50%;
+      transform: translate(-50%, -50%);
+      width: 39rpx; 
+      height: 39rpx;
+    }
+  }
+
+  .skill-info {
+    flex: 1;
+    display: flex;
+    min-width: 0;
+    flex-direction: column;
+    justify-content: space-between;
+
+    .skill-title {
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      font-size: 28rpx;
+      color: #333;
+      font-weight: 400;
+      line-height: 40rpx;
+    }
+    
+    .skill-type {
+      display: flex;
+      align-items: center;
+      font-size: 22rpx;
+      margin-top: 10rpx;
+      
+      .type-icon { 
+        width: 26rpx; 
+        height: 26rpx; 
+        margin-right: 8rpx; 
+        border-radius: 50%;
+      }
+      
+      .type-text {
+        border-radius: 7rpx;
+        font-weight: 400;
+        font-size: 24rpx;
+        line-height: 33rpx;
+        padding: 2rpx 10rpx;
+      }
+      
+      &.platform-course .type-text {
+        background: #f9d3d760;
+        color: #E55463;
+      }
+      
+      &.brand-course .type-text {
+        background: #e6f7ff;
+        color: #1890ff;
+      }
+    }
+    
+    .skill-stats {
+      font-size: 22rpx;
+      color: #999;
+      margin-top: 10rpx;
+      display: flex;
+      align-items: center;
+      
+      .view-icon {
+        width: 26rpx;
+        height: 22rpx;
+        margin-right: 8rpx;
+        margin-top: -2rpx;
+      }
+    }
+  }
+}
+
+.line-2 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+}
+
+</style>
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 28f631d..4a21518 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -129,20 +129,11 @@
         <view class="header-right">更多技能 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image> </view>
       </view>
       <view class="skill-list">
-        <view class="skill-item" v-for="(item, index) in skills" :key="index">
-          <view class="cover-box">
-            <image class="cover" :src="item.coverSrc"></image>
-            <image class="play-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5c1ddfef-a200-424a-a9dc-03d9395568f6.png"></image>
-          </view>
-          <view class="skill-info">
-            <view class="skill-title line-2">{{ item.title }}</view>
-            <view class="skill-type" :class="item.typeClass">
-              <image class="type-icon" src="https://dummyimage.com/30x30/ccc/fff.png&text=I"></image>
-              <text class="type-text">{{ item.type }}</text>
-            </view>
-            <view class="skill-stats"> <image class="view-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2409b64a-56bb-4d9e-a4cc-5b3444fcf097.png"></image>{{ item.views }}观看 · {{ item.time }}</view>
-          </view>
-        </view>
+        <skill-card 
+          v-for="(item, index) in skills" 
+          :key="index" 
+          :item="item"
+        ></skill-card>
       </view>
     </view>
 
@@ -158,6 +149,7 @@ import request from "@/utils/request";
 import filters from "./components/filters.vue";
 import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
 import BrandCard from "./components/brand-card.vue";
+import SkillCard from "./components/skill-card.vue";
 
 export default {
   components: {
@@ -165,7 +157,8 @@ export default {
     projectTabs,
     CustomNavbar,
     TabBar,
-    BrandCard
+    BrandCard,
+    SkillCard
   },
   data() {
     return {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 9e3c59a..51468d0 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -175,7 +175,7 @@ export default {
 				},
 				{
 					title: "店铺装修",
-					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png",
 					// https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png
 					path: "/pages/shop/staff/distribution-service",
 					go_id_type: 1,
diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index 87b6899..af8a226 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -1,22 +1,666 @@
 <template>
-	<view>
-		
-	</view>
+  <view class="collection-page">
+
+    <custom-navbar title="我的收藏" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true" borderBottom="none"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" @onHeadleClick="addAddress">
+    </custom-navbar>
+    
+    <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view>
+
+    <view class="tab-bar-wrap" :style="{ top: navHeight + 'px' }">
+      <view class="tab-bar">
+        <view class="tab-items">
+          <view 
+            class="tab-item" 
+            :class="{ active: currentTab === 'brand' }"
+            @tap="switchTab('brand')"
+          >
+            收藏的品牌
+          </view>
+          <view 
+            class="tab-item" 
+            :class="{ active: currentTab === 'course' }"
+            @tap="switchTab('course')"
+          >
+            收藏的课程
+          </view>
+        </view>
+        <view class="filter-area" @tap="toggleFilterPanel">
+          <text class="filter-text">筛选</text>
+          <image class="filter-icon" :src="filterIcon" mode="aspectFit" :class="{ 'rotate': filterVisible }"></image>
+        </view>
+      </view>
+    </view>
+
+    <view class="filter-panel" :class="{ 'show': filterVisible }" :style="{ top: filterTop + 'px' }" catchtouchmove="true">
+      <view class="filter-mask" @tap="closeFilterPanel"></view>
+      <view class="filter-container">
+        
+        <scroll-view scroll-y class="filter-scroll" v-if="currentTab === 'brand'">
+          <view class="filter-group" v-for="group in brandFilterData" :key="group.id">
+            <view class="group-title">{{ group.title }}</view>
+            <view class="pill-list">
+              <view 
+                class="pill-item" 
+                v-for="sub in group.children" 
+                :key="sub.id"
+                :class="{ active: selectedSecondIds.includes(sub.id) }"
+                @tap="toggleSecondSelect(sub.id)"
+              >
+                {{ sub.title }}
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+
+        <view v-else class="course-filter">
+          <view 
+            class="course-type-item"
+            :class="{ active: selectedCourseType === 'platform' }"
+            @tap="selectCourseType('platform')"
+          >
+            平台课程
+          </view>
+          <view 
+            class="course-type-item"
+            :class="{ active: selectedCourseType === 'brand' }"
+            @tap="selectCourseType('brand')"
+          >
+            品牌课程
+          </view>
+        </view>
+
+        <view class="filter-footer">
+          <view class="reset-btn" @tap="resetFilter">重置</view>
+          <view class="confirm-btn" @tap="applyFilterAndClose">确定</view>
+        </view>
+      </view>
+    </view>
+
+    <view class="collection-content" v-if="currentTab === 'brand'">
+      <view class="brand-grid" v-if="filteredBrandList.length > 0">
+        <brand-card 
+          class="brand-card-wrap"
+          v-for="(item, index) in filteredBrandList" 
+          :key="index" 
+          :item="item"
+          :tagKeys="item.tagKeys"
+          @click="goToBrandDetail(item)"
+        ></brand-card>
+      </view>
+      <view class="empty-state" v-else>
+        <image class="empty-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png"></image>
+      </view>
+    </view>
+
+    <view class="collection-content" v-else>
+      <view class="course-list" v-if="filteredCourseList.length > 0">
+        <skill-card 
+          v-for="(item, index) in filteredCourseList" 
+          :key="index" 
+          :item="item"
+        ></skill-card>
+      </view>
+      <view class="empty-state" v-else>
+        <image class="empty-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png"></image>
+      </view>
+    </view>
+
+    <view style="height: 120rpx;"></view>
+    <TabBar :selected="3"></TabBar>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
+import TabBar from "@/components/tabbar/tabbar.vue"
+import BrandCard from "@/pages/home/components/brand-card.vue"
+import SkillCard from "@/pages/home/components/skill-card.vue" 
+import request from "@/utils/request"
+
+// 数据模式开关：true=调用真实接口，false=使用模拟数据
+const USE_REAL_API = true
+
+export default {
+  components: {
+    TabBar,
+    BrandCard,
+    SkillCard
+  },
+  data() {
+    return {
+      navHeight: 0,    // 动态计算的导航栏高度
+      filterTop: 0,    // 动态计算的筛选框顶部起点
+      
+      currentTab: 'brand',
+      // 筛选相关
+      filterVisible: false,
+      
+      // 品牌筛选下拉数据 (合并一级和二级)
+      brandFilterData: [],
+      selectedSecondIds: [],   // 选中的二级ID数组
+      
+      // 课程筛选
+      selectedCourseType: '',  // 'platform' 或 'brand'
+      // 原始数据（收藏的数据）
+      rawBrandList: [],
+      rawCourseList: [],
+      // 展示数据（过滤后）
+      filteredBrandList: [],
+      filteredCourseList: []
+    }
+  },
+  computed: {
+    filterIcon() {
+      // 这里的图标链接可以统一成一个，配合CSS的旋转动画更好看
+      return 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png'
+    }
+  },
+  onLoad() {
+    // 精准计算吸顶高度与下拉框起点，防止蒙版遮挡白色的Tab区
+    const sysInfo = uni.getSystemInfoSync()
+    const sbh = sysInfo.statusBarHeight || 0
+    this.navHeight = sbh 
+    // Tab栏自身的高度大约为 106rpx，转化为 px 叠加上去
+    this.filterTop = this.navHeight + uni.upx2px(106)
+
+    this.loadFilterCategories()
+    this.loadData()
+  },
+  methods: {
+    goBack() {
+      uni.navigateBack()
+    },
+    addAddress() {
+      // 外部方法占位
+    },
+    switchTab(tab) {
+      if (this.currentTab === tab) return
+      this.currentTab = tab
+      // 重置筛选（不同tab筛选条件独立）
+      if (tab === 'brand') {
+        this.resetBrandFilter()
+      } else {
+        this.resetCourseFilter()
+      }
+      this.loadData()
+      this.closeFilterPanel()
+    },
+    // 筛选面板控制
+    toggleFilterPanel() {
+      this.filterVisible = !this.filterVisible
+    },
+    closeFilterPanel() {
+      this.filterVisible = false
+    },
+    
+    // 加载一级分类并自动组装其对应的二级分类，兼容 state === 1
+    async loadFilterCategories() {
+      try {
+        const syrId = uni.getStorageSync('syrId') || 1; 
+        const res = await request.post('/sj/firstclass', { id: syrId })
+        if ((res.code === 200 || res.state === 1) && res.data) {
+          const firstClasses = res.data;
+          
+          // 并发请求所有的二级分类
+          const promises = firstClasses.map(async (first) => {
+            try {
+              const subRes = await request.post('/sj/secondclass', { id: first.id })
+              return {
+                id: first.id,
+                title: first.title,
+                children: ((subRes.code === 200 || subRes.state === 1) && subRes.data) ? subRes.data : []
+              }
+            } catch(e) {
+              return { id: first.id, title: first.title, children: [] }
+            }
+          });
+          
+          const filterData = await Promise.all(promises);
+          // 过滤掉没有子分类的项，避免面板出现光秃秃的标题
+          this.brandFilterData = filterData.filter(group => group.children.length > 0);
+        } else {
+          this.brandFilterData = []
+        }
+      } catch (error) {
+        console.error('获取分类字典失败', error)
+      }
+    },
+
+    toggleSecondSelect(secId) {
+      const index = this.selectedSecondIds.indexOf(secId)
+      if (index === -1) {
+        this.selectedSecondIds.push(secId)
+      } else {
+        this.selectedSecondIds.splice(index, 1)
+      }
+    },
+    // 课程筛选
+    selectCourseType(type) {
+      // 点击已选中的则取消选中
+      if(this.selectedCourseType === type){
+        this.selectedCourseType = ''
+      }else{
+        this.selectedCourseType = type
+      }
+    },
+    // 重置品牌筛选
+    resetBrandFilter() {
+      this.selectedSecondIds = []
+      this.applyBrandFilter()
+    },
+    resetCourseFilter() {
+      this.selectedCourseType = ''
+      this.applyCourseFilter()
+    },
+    resetFilter() {
+      if (this.currentTab === 'brand') {
+        this.resetBrandFilter()
+      } else {
+        this.resetCourseFilter()
+      }
+    },
+    applyFilterAndClose() {
+      if (this.currentTab === 'brand') {
+        this.applyBrandFilter()
+      } else {
+        this.applyCourseFilter()
+      }
+      this.closeFilterPanel()
+    },
+    // 品牌过滤逻辑（根据二级分类ID相交判断）
+    applyBrandFilter() {
+      if (!this.rawBrandList.length) {
+        this.filteredBrandList = []
+        return
+      }
+      if (this.selectedSecondIds.length === 0) {
+        this.filteredBrandList = [...this.rawBrandList]
+      } else {
+        this.filteredBrandList = this.rawBrandList.filter(brand => {
+          return brand.secondClassIds && brand.secondClassIds.some(id => this.selectedSecondIds.includes(id))
+        })
+      }
+    },
+    // 课程过滤逻辑（根据课程类型）
+    applyCourseFilter() {
+      if (!this.rawCourseList.length) {
+        this.filteredCourseList = []
+        return
+      }
+      if (!this.selectedCourseType) {
+        this.filteredCourseList = [...this.rawCourseList]
+      } else {
+        this.filteredCourseList = this.rawCourseList.filter(course => {
+          if (this.selectedCourseType === 'platform') return course.type === '平台课程'
+          if (this.selectedCourseType === 'brand') return course.type === '品牌课程'
+          return true
+        })
+      }
+    },
+    // 加载原始数据（根据当前Tab）
+    loadData() {
+      if (this.currentTab === 'brand') {
+        this.loadBrandList()
+      } else {
+        this.loadCourseList()
+      }
+    },
+    async loadBrandList() {
+      if (USE_REAL_API) {
+        await this.fetchRealBrandList()
+      } else {
+        this.mockBrandList()
+      }
+      this.applyBrandFilter()
+    },
+    async loadCourseList() {
+      if (USE_REAL_API) {
+        await this.fetchRealCourseList()
+      } else {
+        this.mockCourseList()
+      }
+      this.applyCourseFilter()
+    },
+
+    // ============ 真实接口调用 ============
+    async fetchRealBrandList() {
+      try {
+        const res = await request.post('/sj/brand/list', { page: 1, limit: 100 })
+        if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
+          const collectedBrands = res.data.list.filter(item => item.collect_state === 1)
+          this.rawBrandList = collectedBrands.map(item => {
+            let tags = []
+            if (item.franchise_state === 1) tags.push('franchise')
+            if (item.student_state === 1) tags.push('recruit')
+            if (tags.length === 0) tags.push('more') 
+            
+            return {
+              id: item.id,
+              name: item.name,
+              bgSrc: item.cover_img || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/default.jpg',
+              avatar: item.logo_img || 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar',
+              tagKeys: tags,
+              secondClassIds: item.second_class_ids ? item.second_class_ids.split(',').map(Number) : []
+            }
+          })
+        } else {
+          this.rawBrandList = []
+        }
+      } catch (error) {
+        console.error('获取品牌收藏失败', error)
+      }
+    },
+    async fetchRealCourseList() {
+      try {
+        const res = await request.post('/sj/skill/list', { page: 1, limit: 100 })
+        if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
+          const collectedCourses = res.data.list.filter(item => item.collect_state === 1)
+          this.rawCourseList = collectedCourses.map(item => {
+            return {
+              id: item.id,
+              title: item.name,
+              coverSrc: item.cover_img,
+              type: item.link_name || (item.link_type === 1 ? '平台课程' : '品牌课程'),
+              link_type: item.link_type,
+              views: item.browse_num || 0,
+              time: item.create_time ? this.formatTimeAgo(item.create_time) : '', 
+              typeIcon: item.link_logo || ''
+            }
+          })
+        } else {
+          this.rawCourseList = []
+        }
+      } catch (error) {
+        console.error('获取课程收藏失败', error)
+      }
+    },
+
+    formatTimeAgo(timeStr) {
+      const now = new Date()
+      const time = new Date(timeStr.replace(/-/g, '/'))
+      const diff = Math.floor((now - time) / 1000)
+      if (diff < 3600) return Math.floor(diff / 60) + '分钟前'
+      if (diff < 86400) return Math.floor(diff / 3600) + '小时前'
+      if (diff < 604800) return Math.floor(diff / 86400) + '天前'
+      return timeStr.split(' ')[0]
+    },
+    goToBrandDetail(item) {
+      if (item.id) {
+        uni.navigateTo({ url: `/pages/brand/detail?id=${item.id}` })
+      }
+    },
+
+    // ============ 模拟数据兜底 ============
+    mockBrandList() {
+      this.rawBrandList = [
+        {
+          id: 1, name: '脸缘品牌', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          avatar: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          tagKeys: ['franchise', 'recruit'], secondClassIds: [76, 77]
+        },
+        {
+          id: 2, name: '美肌工坊', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          avatar: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          tagKeys: ['franchise'], secondClassIds: [78]
+        },
+        {
+          id: 3, name: '悦容堂', bgSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          avatar: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg',
+          tagKeys: ['recruit'], secondClassIds: [201, 202]
+        }
+      ]
+    },
+    mockCourseList() {
+      this.rawCourseList = [
+        { id: 1, title: '穿戴甲的操作视频扫码验券操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', views: 836000, time: '7小时前' },
+        { id: 2, title: '全身SPA的操作视频操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', views: 2344, time: '3天前' },
+        { id: 3, title: '高级面部护理手法详解', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', views: 56700, time: '1周前' }
+      ]
+    }
+  }
+}
 </script>
 
-<style>
+<style lang="scss" scoped>
+.collection-page {
+  min-height: 100vh;
+  background: #fff;
+}
 
+/* 将页面左右 padding 转移到内容区，保证 Tab 背景贯穿全屏 */
+.tab-bar-wrap {
+  position: sticky; /* 吸顶，保证滑动页面时一直显示在最前面 */
+  background: #fff;
+  padding: 10rpx 24rpx;
+  z-index: 101;
+}
+
+.tab-bar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: transparent;
+  padding: 10rpx 0;
+  
+  .tab-items {
+    display: flex;
+    align-items: center;
+    
+    .tab-item {
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #777777;
+      background: #f5f5f5;
+      border-radius: 27rpx;
+      margin-right: 40rpx;
+      padding: 9rpx 24rpx;
+      transition: all 0.3s ease;
+      
+      &.active {
+        color: #FF4767;
+        background: #FFECEF;
+        border: 1rpx solid #FFB0BD;
+		border-radius: 29rpx;
+      }
+    }
+  }
+  
+  .filter-area {
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    
+    .filter-text {
+      font-size: 24rpx;
+      color: #666666;
+      margin-right: 6rpx;
+    }
+    
+    .filter-icon {
+      width: 16rpx;
+      height: 10rpx;
+      transition: transform 0.3s ease;
+      /* 展开时图标倒转 */
+      &.rotate {
+        transform: rotate(180deg);
+      }
+    }
+  }
+}
+
+/* 核心抽屉动画布局 */
+.filter-panel {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 100; /* 低于 Tab区的101，保证隐藏时躲在其后 */
+  pointer-events: none; /* 面板关闭时，穿透点击到底部列表 */
+  overflow: hidden; /* 防止抽屉向上滑出时外溢 */
+
+  &.show {
+    pointer-events: auto; /* 打开时恢复点击拦截 */
+    .filter-mask {
+      opacity: 1;
+    }
+    .filter-container {
+      transform: translateY(50rpx); /* 滑出 */
+    }
+  }
+
+  .filter-mask {
+    position: absolute;
+    top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(0,0,0,0.4);
+    opacity: 0;
+    transition: opacity 0.3s ease-in-out;
+  }
+  
+  .filter-container {
+    position: absolute;
+    top: 0; left: 0; right: 0;
+    background: #fff;
+    border-radius: 0 0 30rpx 30rpx;
+    padding: 40rpx 30rpx;
+    max-height: 80vh;
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 10rpx 20rpx rgba(0,0,0,0.05);
+    transform: translateY(-100%); /* 默认隐藏在上方（即Tab背后） */
+    transition: transform 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
+  }
+}
+
+/* 垂直分组设计的样式（图3） */
+.filter-scroll {
+  max-height: 50vh;
+}
+.filter-group {
+  margin-bottom: 30rpx;
+
+  .group-title {
+    font-weight: 500;
+	font-size: 28rpx;
+	color: #333333;
+	line-height: 40rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .pill-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20rpx; 
+  }
+}
+
+/* 通用胶囊按钮 */
+.pill-item {
+  width: calc(25% - 16rpx); /* 25%是一行四个，减去间距 */
+  height: 58rpx;
+  background: #F5F5F5;
+  font-weight: 400;
+	font-size: 26rpx;
+	color: #333333;
+	line-height: 37rpx;
+  
+  /* 使用 flex 居中 */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  
+  border-radius: 12rpx;
+  transition: all 0.3s;
+  box-sizing: border-box; /* 防止 padding 会撑大盒子 */
+  
+  &.active {
+    background: #FFF0F2;
+    color: #FF4767;
+    border: 1rpx solid #FFB0BD;
+  }
+}
+
+.course-filter {
+  display: flex;
+  gap: 20rpx;
+  /* padding: 20rpx 0 40rpx; */
+  
+  .course-type-item {
+    background: #F5F5F5;
+    color: #666666;
+    font-size: 26rpx;
+    padding: 12rpx 40rpx;
+    border-radius: 12rpx;
+    
+    &.active {
+      background: #FFF0F2;
+      color: #FF4767;
+    }
+  }
+}
+
+.filter-footer {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20rpx;
+  padding-top: 20rpx;
+  /* border-top: 1rpx solid #F5F5F5; */
+  
+  .reset-btn, .confirm-btn {
+    width: 47%;
+    text-align: center;
+    padding: 20rpx 0;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+  }
+  
+  .reset-btn {
+    background: #F5F5F5;
+    color: #666;
+  }
+  
+  .confirm-btn {
+    background: #FF4767;
+    color: #fff;
+  }
+}
+
+/* 内容区缩进补充 */
+.collection-content {
+  padding: 0 24rpx;
+  margin-top: 20rpx;
+}
+
+.brand-grid {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  
+  .brand-card-wrap {
+    width: 49.2%;
+    margin-bottom: 20rpx;
+  }
+}
+
+.course-list {
+  display: flex;
+  flex-direction: column;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 120rpx 0;
+  
+  .empty-icon {
+    width: 346rpx;
+    height: 373rpx;
+  }
+}
+
+::v-deep .icon-headle {
+    width: 32rpx !important;
+    height: 32rpx !important;
+}
 </style>
\ No newline at end of file

From c0f5ca513b27804cd148b62bc45b149f0154d8a8 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 27 May 2026 14:52:36 +0800
Subject: [PATCH 042/118] =?UTF-8?q?1.=E9=A6=96=E9=A1=B5=E6=9C=AA=E5=85=A5?=
 =?UTF-8?q?=E9=A9=BB=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=202.=E7=B2=BE?=
 =?UTF-8?q?=E9=80=89=E5=93=81=E7=89=8C=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=203.=E6=8A=80=E8=83=BD=E9=9B=86=E5=B8=82=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                         |  12 +
 pages/home/home.vue                |  61 ++--
 pages/jingxuan/selected-brands.vue | 472 +++++++++++++++++++++++++++
 pages/jingxuan/selected-skills.vue | 490 +++++++++++++++++++++++++++++
 4 files changed, 1001 insertions(+), 34 deletions(-)
 create mode 100644 pages/jingxuan/selected-brands.vue
 create mode 100644 pages/jingxuan/selected-skills.vue

diff --git a/pages.json b/pages.json
index cca5aea..e228fa3 100644
--- a/pages.json
+++ b/pages.json
@@ -988,6 +988,18 @@
 				"navigationBarTitleText": "我的收藏",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/jingxuan/selected-skills",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/jingxuan/selected-brands",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}
 
 
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4a21518..a7cb1dd 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -87,11 +87,11 @@
       </view>
     </view>
 
-    <view class="settlement-guide card-box" v-if="isLogin && !isSettled">
-      <view class="guide-header">
+    <view class="settlement-guide card-box" v-if="isLogin && !isCertified">
+      <view class="guide-header" :style="{ backgroundImage: 'url(' + (isSettled ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c3a6cdd8-0447-4b50-a8cc-7bab1eedb502.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/138ccbc3-486d-4287-b67f-f809de99e408.png') + ')' }">
           <view class="guide-body">
-            <text class="guide-text">认证店铺信息，接单必经之路</text>
-            <view class="guide-btn" @tap="goToSettle">去入驻</view>
+            <text class="guide-text">{{ isSettled ? '完成认证，开启您的接单之路' : '入驻美融融，生意更轻松' }}</text>
+            <view class="guide-btn" @tap="goToSettle">{{ isSettled ? '去认证' : '去入驻' }}</view>
           </view>
       </view>
     </view>
@@ -109,7 +109,7 @@
     <view class="brands-section card-box">
       <view class="card-header">
         <view class="header-left"><text class="title" style="margin-left: 10rpx;">精选品牌</text></view>
-        <view class="header-right">更多品牌 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image></view>
+        <view class="header-right" @tap="goToBrandList">更多品牌 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image></view>
       </view>
       
       <view class="brand-grid">
@@ -126,7 +126,7 @@
     <view class="skills-section card-box">
       <view class="card-header">
         <view class="header-left"><text class="title">技能集市</text></view>
-        <view class="header-right">更多技能 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image> </view>
+        <view class="header-right" @tap="goToSkillList">更多技能 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image> </view>
       </view>
       <view class="skill-list">
         <skill-card 
@@ -162,14 +162,13 @@ export default {
   },
   data() {
     return {
-      isLogin: false, // 是否登录，onShow生命周期中会通过token判定
-      userInfo: {},   // 用户信息数据源
+      isLogin: false, 
+      userInfo: {},   
       syrId: null,
 
       displayScore: 0, 
       animationTimer: null,
 
-      // 通知公告数据
       noticeList: [
         { id: 0, title: '暂无最新公告', url: '' }
       ],
@@ -254,11 +253,20 @@ export default {
     }
   },
   methods: {
+    goToBrandList() {
+      uni.navigateTo({
+        url: '/pages/jingxuan/selected-brands'
+      });
+    },
+    goToSkillList() {
+      uni.navigateTo({
+        url: '/pages/jingxuan/selected-skills'
+      });
+    },
     // 处理金刚区点击事件 (包含扫码验券核心逻辑)
     handleQuickAction(item) {
       if (item.name === '扫码验券') {
         console.log('准备跳转到自定义扫码页...');
-
       uni.navigateTo({
         url: '/pages/shop/verify/verify-order',
         fail: (err) => {
@@ -293,7 +301,6 @@ export default {
           this.userInfo = result.data;
           uni.setStorageSync("syrId", result.data.id);
           this.syrId = result.data.id;
-
           // 获取完用户信息后，初始化营业开关的状态
           this.initStoreStatus();
 
@@ -314,7 +321,7 @@ export default {
             updateTime: this.formatTime(res.data.now_date),
             waitStart: res.data.dfw || 0,
             waitFinish: res.data.dwc || 0,
-            finished: res.data.yqx || 0 // 备注：接口返回只有dfw, dwc, yqx(已取消)。暂时将第三个坑位放为yqx，或你后期让后端加字段
+            finished: res.data.yqx || 0 // 备注：接口返回只有dfw, dwc, yqx(已取消)。暂时将第三个坑位放为yqx，或后期让后端加字段
           };
         }
       });
@@ -385,13 +392,14 @@ export default {
               type: item.link_name || '平台课程',
               views: item.browse_num || 0,
               time: item.create_time ? item.create_time.split(' ')[0] : '', // 只取日期
-              coverSrc: item.cover_img || 'https://dummyimage.com/200x150/ccc/fff.png&text=Video'
+              coverSrc: item.cover_img || 'https://dummyimage.com/200x150/ccc/fff.png&text=Video',
+              typeIcon: item.link_logo || ''
             };
           });
         }
       });
     },
-    
+
     // 跳转：通知详情页
     goToNotice(msg) {
       if(msg.id) {
@@ -422,7 +430,6 @@ export default {
 
     // 营业中 / 休息中 按钮逻辑判断
     toggleStatus() {
-      // 校验逻辑保留你之前的认证状态检查
       if (!this.isCertified) {
         uni.showModal({ title: '提示', content: '请先完善认证信息', confirmText: '去完善' });
         return;
@@ -431,19 +438,15 @@ export default {
         uni.showToast({ title: '请先配置营业时间', icon: 'none' });
         return;
       }
-
-      // 真正的请求逻辑
       let newStatus = this.userInfo.order_taking == 1 ? 2 : 1;
       request.post("/sj/sjordertaking", {
         order_taking: newStatus,
-        sjid: this.syrId // 使用你在 getUserInfo 存入的 sjId/syrId
+        sjid: this.sjId 
       }).then((res) => {
-        // 成功后重新拉取最新信息以更新 UI
         this.getUserInfo();
         uni.showToast({ title: newStatus == 1 ? '已开启营业' : '已休息', icon: 'none' });
       });
     },
-
     animateScore() {
       const target = parseFloat(this.orderDetail.score) || 0;
       if (this.animationTimer) clearInterval(this.animationTimer);
@@ -496,7 +499,6 @@ export default {
       z-index: 0;
     }
 
-    // 通用卡片样式
     .card-box {
       position: relative;
       z-index: 1;
@@ -512,7 +514,6 @@ export default {
       margin-left: 6rpx;
     }
 
-    // 通用卡片头部
     .card-header {
       display: flex;
       justify-content: space-between;
@@ -556,7 +557,6 @@ export default {
       }
     }
 
-    // 1. 顶部信息
     .header-section {
       position: relative;
       z-index: 1;
@@ -656,16 +656,15 @@ export default {
       }
     }
 
-    // 入驻引导卡片
     .settlement-guide {
-      padding: 0; // 去除内部留白，让背景图贴边
+      padding: 0; 
       overflow: hidden;
       
       .guide-header {
         width: 100%;
         height: 248rpx;
-        background: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/138ccbc3-486d-4287-b67f-f809de99e408.png');
         background-size: cover;
+        /* 背景图由动态 style 接管 */
       }
 
       .guide-body {
@@ -698,7 +697,6 @@ export default {
       }
     }
 
-    // 2. 快捷入口
     .quick-actions {
       display: flex;
       justify-content: space-around;
@@ -725,7 +723,6 @@ export default {
       }
     }
 
-    // 3. 基础订单
     .order-stats-basic {
         background: linear-gradient( 176deg, #F0F4FF 0%, #FFFFFF 100%);
         border-radius: 20rpx;
@@ -753,7 +750,6 @@ export default {
       }
     }
 
-    // 4. 详细订单
     .order-stats-detail {
       .detail-content {
         display: flex;
@@ -885,7 +881,6 @@ export default {
       }
     }
 
-    // 5. 通知横幅 (跑马灯改造)
     .notice-bar {
       display: flex;
       align-items: center;
@@ -901,7 +896,7 @@ export default {
       
       .notice-swiper {
         flex: 1;
-        height: 40rpx; // 限制高度刚好显示一行
+        height: 40rpx; 
         line-height: 40rpx;
 
         .notice-text {
@@ -922,7 +917,6 @@ export default {
       }
     }
 
-    // 6. 精选品牌 (精简后的包裹容器)
     .brands-section {
       padding: 20rpx 20rpx;
       .brand-grid {
@@ -931,13 +925,12 @@ export default {
         justify-content: space-between;
         
         .brand-card-wrap {
-          width: 48.5%; // 240rpx 宽度
+          width: 48.5%; 
           margin-bottom: 14rpx;
         }
       }
     }
 
-    // 7. 技能集市
     .skills-section {
       .skill-list {
         display: flex;
diff --git a/pages/jingxuan/selected-brands.vue b/pages/jingxuan/selected-brands.vue
new file mode 100644
index 0000000..4fee4f3
--- /dev/null
+++ b/pages/jingxuan/selected-brands.vue
@@ -0,0 +1,472 @@
+<template>
+  <view>
+    <custom-navbar 
+      title="精选品牌" 
+      :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60ae3383-6ff6-4f42-818b-d9b09a9bd0e0.png'" 
+      :showUser="true"
+      backgroundColor="url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce2e62e1-c26a-45c8-a49d-7ed00b2ce02c.png') center 20%/cover no-repeat" 
+      titleColor="#333" 
+      borderBottom="none"
+      :show-headle="true"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png"
+      @onHeadleClick="">
+    </custom-navbar>
+
+    <serviecFirstTab 
+      :tabs="tabs" 
+      :activeId="activeId" 
+      activeColor="#FF4767" 
+      @tab-click="tabClick" 
+      bgColor="#fff">
+    </serviecFirstTab>
+
+    <CommonList 
+      ref="brandListRef" 
+      :apiUrl="'/sj/brand/list'" 
+      :initialQuery="{}"
+      :listScrollHeight="`calc(100vh - ${statusBarHeight * 2 + 250}rpx)`"
+      @data-loaded="handleDataLoaded">
+      
+      <template #headerScroll>
+        <view class="icon-tabs">
+          <view 
+            v-for="item in iconTabs" 
+            :key="item.id" 
+            class="icon-tab"
+            :class="{active: currentSecondClass == item.id}" 
+            @click="selectSecondClass(item.id)">
+            <image :src="item.photo" class="icon-img" mode="aspectFill"></image>
+            <text class="icon-text">{{ item.title }}</text>
+          </view>
+        </view>
+
+        <view class="sort-bar">
+          <view class="sort-item" @tap="toggleSort('time')">
+            <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
+            <view class="arrows">
+              <image class="arrow-icon" :src="orderType === 1 ? iconPinkUp : iconGreyUp"></image>
+              <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
+            </view>
+          </view>
+          
+          <view class="sort-item" @tap="toggleSort('view')">
+            <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
+            <view class="arrows">
+              <image class="arrow-icon" :src="orderType === 3 ? iconPinkUp : iconGreyUp"></image>
+              <image class="arrow-icon" :src="orderType === 4 ? iconPinkDown : iconGreyDown"></image>
+            </view>
+          </view>
+        </view>
+      </template>
+
+      <template #listData="{ list }">
+        <view class="zhanwei">
+        <view class="brand-grid">
+          <brand-card
+            class="brand-card-wrap"
+            v-for="(brand, idx) in enrichedBrandList(list)"
+            :key="brand.id || idx"
+            :item="brand"
+            :tagKeys="brand._tagKeys"
+            @click="handleBrandClick(brand)"
+          />
+        </view>
+        </view>
+      </template>
+
+      <template #empty>
+        <noData></noData>
+      </template>
+    </CommonList>
+  </view>
+</template>
+
+<script>
+import request from "../../utils/request";
+import serviecFirstTab from "@/components/common/service-first-tab.vue";
+import CommonList from "@/components/common/CommonList.vue";
+import brandCard from "@/pages/home/components/brand-card.vue";
+import noData from "@/components/noData/noData.vue";
+
+export default {
+  components: {
+    serviecFirstTab,
+    CommonList,
+    brandCard,
+    noData
+  },
+  data() {
+    return {
+      statusBarHeight: 0,
+      navHeight: 0, 
+      
+      // 当前选中的一级/二级分类ID（页面顶部点击用）
+      activeId: "",            
+      currentSecondClass: "", 
+      tabs: [],               
+      iconTabs: [],           
+      
+      selectedSecondIds: [],  // 抽屉里选中的分类ID
+      
+      // 额外筛选参数
+      orderType: 1,           
+      
+      // 排序图标资源
+      iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
+      iconGreyDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfffb601-6877-4608-a3eb-88695b05c6c2.png',
+      iconPinkUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bc84dff-e120-4d4b-a33e-25d68e065654.png',
+      iconPinkDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ff2c2c9d-694a-4adf-b737-66b07f4a63ae.png',
+    };
+  },
+  onLoad(options) {
+    const systemInfo = uni.getSystemInfoSync();
+    this.statusBarHeight = systemInfo.statusBarHeight;
+    this.navHeight = this.statusBarHeight + 44; 
+
+    if (options.id) {
+      this.activeId = options.id;
+    }
+    this.getFirstClass();
+    
+    // 初始化时一并获取抽屉内的级联字典数据
+    this.loadFilterCategories();
+  },
+  methods: {
+    // ============ 排序逻辑 ============
+    toggleSort(type) {
+      if (type === 'time') {
+        this.orderType = this.orderType === 1 ? 2 : 1;
+      } else if (type === 'view') {
+        this.orderType = this.orderType === 3 ? 4 : 3;
+      }
+      this.refreshBrandList();
+    },
+
+    // ============ 页面内分类逻辑 ============
+    getFirstClass() {
+      request.post("/sj/firstclass").then((res) => {
+        this.tabs = res.data || [];
+        if (this.tabs.length && !this.activeId) {
+          this.activeId = this.tabs[0].id;
+        }
+        this.getSecondClassList();
+        this.refreshBrandList();
+      });
+    },
+
+    getSecondClassList() {
+      if (!this.activeId) return;
+      request.post('/sj/secondclass', { id: this.activeId }).then((res) => {
+        this.iconTabs = res.data || [];
+      });
+    },
+
+    selectSecondClass(id) {
+      if(this.currentSecondClass === id){
+        this.currentSecondClass = "";
+      } else {
+        this.currentSecondClass = id;
+      }
+      // 页面上点击了圆形图标，则清空抽屉里的选择
+      this.selectedSecondIds = []; 
+      this.refreshBrandList();
+    },
+
+    tabClick(id) {
+      if (this.activeId === id) return;
+      this.activeId = id;
+      this.currentSecondClass = ""; 
+      this.getSecondClassList();    
+      this.refreshBrandList();
+    },
+
+    // ============ 刷新列表核心 ============
+    refreshBrandList() {
+      // 如果抽屉里选了分类，优先传抽屉的参数；否则传圆形图标选中的分类
+      const targetSecondClass = this.selectedSecondIds.length > 0 
+        ? this.selectedSecondIds.join(',') 
+        : this.currentSecondClass;
+
+      const params = {
+        first_class: this.activeId || undefined,
+        second_class: targetSecondClass || undefined,
+        order_type: this.orderType
+      };
+
+      Object.keys(params).forEach(key => {
+        if (params[key] === undefined) delete params[key];
+      });
+
+      if(this.$refs.brandListRef) {
+        this.$refs.brandListRef.manualRefresh(params);
+      }
+    },
+
+    enrichedBrandList(list) {
+      if (!list || !list.length) return [];
+      return list.map(brand => {
+        const tagKeys = [];
+        if (brand.franchise_state === 1) tagKeys.push('franchise');
+        if (brand.student_state === 1) tagKeys.push('recruit');
+        if (tagKeys.length === 0) tagKeys.push('more');
+        
+        return {
+          ...brand,
+          name: brand.name,
+          bgSrc: brand.cover_img || 'https://dummyimage.com/300x200/ccc/fff.png',
+          avatar: brand.logo_img || 'https://dummyimage.com/100x100/ccc/fff.png',
+          _tagKeys: tagKeys
+        };
+      });
+    },
+
+    handleBrandClick(brand) {
+      uni.navigateTo({
+        url: `/pages/brand/detail?id=${brand.id}`
+      });
+    },
+
+    handleDataLoaded(data) {
+      console.log("品牌列表加载完成", data);
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+// 保证右侧搜索图标大小合适
+::v-deep .icon-headle {
+  width: 32rpx !important;
+  height: 32rpx !important;
+}
+
+// 一级类目 Tab 样式微调
+.service-first-tab {
+  border-bottom: none;
+  padding-bottom: 27rpx;
+  position: relative;
+  z-index: 101;
+}
+
+::v-deep .service-first-tab{
+    box-shadow: none !important;
+}
+
+/* ================= 抽屉下拉样式 ================= */
+.filter-panel {
+  position: fixed;
+  left: 0; right: 0; bottom: 0;
+  z-index: 100;
+  pointer-events: none;
+  overflow: hidden;
+
+  &.show {
+    pointer-events: auto;
+    .filter-mask { opacity: 1; }
+    .filter-container { transform: translateY(0); }
+  }
+
+  .filter-mask {
+    position: absolute;
+    top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(0,0,0,0.4);
+    opacity: 0;
+    transition: opacity 0.3s ease-in-out;
+  }
+  
+  .filter-container {
+    position: absolute;
+    top: 0; left: 0; right: 0;
+    background: #fff;
+    border-radius: 0 0 30rpx 30rpx;
+    padding: 140rpx 30rpx 40rpx;
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 10rpx 20rpx rgba(0,0,0,0.05);
+    transform: translateY(-100%);
+    transition: transform 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
+  }
+}
+
+.filter-scroll {
+  max-height: 50vh;
+}
+.filter-group {
+  margin-bottom: 30rpx;
+
+  .group-title {
+    font-weight: 500;
+    font-size: 28rpx;
+    color: #333333;
+    line-height: 40rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .pill-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20rpx 10rpx; /* 控制行间距和列间距 */
+  }
+}
+
+/* 通用胶囊按钮 (一行四个) */
+.pill-item {
+  width: calc(25% - 8rpx); /* 精确计算一行四个 */
+  height: 58rpx;
+  background: #F5F5F5;
+  font-weight: 400;
+  font-size: 24rpx; /* 字号略小以防溢出 */
+  color: #333333;
+  line-height: 37rpx;
+  
+  /* flex 居中文字 */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  
+  border-radius: 12rpx;
+  transition: all 0.3s;
+  box-sizing: border-box; 
+  white-space: nowrap;
+  
+  &.active {
+    background: #FFF0F2;
+    color: #FF4767;
+    border: 1rpx solid #FFB0BD;
+  }
+}
+
+.filter-footer {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 40rpx;
+  .reset-btn, .confirm-btn {
+    width: 47%;
+    text-align: center;
+    padding: 22rpx 0;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+  }
+  .reset-btn { background: #F5F5F5; color: #666; }
+  .confirm-btn { background: #FF4767; color: #fff; }
+}
+
+/* ================= 其他页面样式 ================= */
+// 二级类目图标行
+.icon-tabs {
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: flex-start;
+  align-items: center;
+  column-gap: 36rpx;
+  row-gap: 30rpx;
+  background: transparent;
+  padding: 0 0 0 30rpx;                      
+  margin-bottom: 30rpx;
+}
+
+.icon-tab {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.icon-img {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+  border: 2rpx solid transparent; 
+}
+
+.icon-text {
+  margin-top: 10rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #333333;
+  line-height: 33rpx;
+  text-align: left;
+}
+
+.icon-tab.active .icon-text {
+  color: #FF4767;
+  line-height: 33rpx;
+}
+
+.icon-tab.active .icon-img {
+  border: 2rpx solid #FF4767;
+}
+
+// 排序栏样式
+.sort-bar {
+  display: flex;
+  align-items: center;
+  padding: 0 30rpx;
+  margin-bottom: 24rpx;
+  gap: 60rpx;
+  
+  .sort-item {
+    display: flex;
+    align-items: center;
+    
+    .sort-text {
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #666666;
+      line-height: 37rpx;
+      margin-right: 6rpx;
+      
+      &.active {
+        color: #FF4767;
+        font-weight: 500;
+      }
+    }
+    
+    .arrows {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      
+      .arrow-icon {
+        width: 14rpx;
+        height: 8rpx;
+        margin: 2rpx 0;
+      }
+    }
+  }
+}
+
+// 品牌卡片网格
+.zhanwei {
+    background-color: #f5f5f5;
+    padding: 20rpx 0 0 0 ;
+    border-radius: 20rpx 20rpx 0rpx 0rpx;
+}
+.brand-grid {
+  background-color: #ffffff;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  padding: 20rpx 24rpx;
+  row-gap: 24rpx;
+  border-radius: 20rpx 20rpx 0rpx 0rpx;
+  
+  .brand-card-wrap {
+    width: 48.5%; 
+  }
+}
+
+.common-list {
+  ::v-deep .list-container {
+    padding: 0;
+  }
+  ::v-deep .list-scroll {
+    margin-top: 0rpx;
+  }
+}
+
+.service-list {
+  background-color: #f5f5f5;
+  border-radius: 20rpx 20rpx 0 0;
+}
+</style>
\ No newline at end of file
diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
new file mode 100644
index 0000000..739e6c4
--- /dev/null
+++ b/pages/jingxuan/selected-skills.vue
@@ -0,0 +1,490 @@
+<template>
+  <view class="skill-market-page">
+    
+    <custom-navbar 
+      title="技能集市" 
+      :showBack="true" 
+      backgroundColor="#FFFFFF" 
+      :show-headle="true" 
+      borderBottom="none"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" 
+      @onHeadleClick="goToSearch">
+    </custom-navbar>
+    
+    <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view>
+
+    <view class="official-author-block" v-if="linkType === 1">
+      <image class="author-avatar" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bbe832bf-aae6-4579-b3cc-246d252488c3" mode="aspectFill"></image>
+      <view class="author-info">
+        <text class="author-name">美融融官方</text>
+        <text class="author-desc">发布了658视频</text>
+      </view>
+    </view>
+
+    <view class="sort-bar-wrap" :style="{ top: navHeight + 'px' }">
+      <view class="sort-bar">
+        <view class="left-sorts">
+          <view class="sort-item" @tap="toggleSort('time')">
+            <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
+            <view class="arrows">
+              <image class="arrow-icon" :src="orderType === 1 ? iconPinkUp : iconGreyUp"></image>
+              <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
+            </view>
+          </view>
+          
+          <view class="sort-item" @tap="toggleSort('view')">
+            <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
+            <view class="arrows">
+              <image class="arrow-icon" :src="orderType === 3 ? iconPinkUp : iconGreyUp"></image>
+              <image class="arrow-icon" :src="orderType === 4 ? iconPinkDown : iconGreyDown"></image>
+            </view>
+          </view>
+        </view>
+
+        <view class="right-filter" @tap="toggleFilterPanel">
+          <text class="filter-text">筛选</text>
+          <image class="filter-icon" :src="filterIcon" :class="{ 'rotate': filterVisible }"></image>
+        </view>
+      </view>
+
+      <view class="filter-panel" :class="{ 'show': filterVisible }" catchtouchmove="true">
+        <view class="filter-mask" @tap="closeFilterPanel"></view>
+        <view class="filter-container">
+          <text class="group-title">课程类型</text>
+          <view class="course-filter">
+            <view class="course-type-item" :class="{ active: linkType === '' }" @tap="selectAndApply('')">全部</view>
+            <view class="course-type-item" :class="{ active: linkType === 1 }" @tap="selectAndApply(1)">平台课程</view>
+            <view class="course-type-item" :class="{ active: linkType === 2 }" @tap="selectAndApply(2)">品牌课程</view>
+          </view>
+        </view>
+      </view>
+    </view> <view class="list-container">
+      <view v-if="skillList.length > 0">
+        <skill-card 
+          v-for="(item, index) in skillList" 
+          :key="item.id || index" 
+          :item="item"
+          @click="goToDetail(item)"
+        ></skill-card>
+      </view>
+      
+      <view class="empty-state" v-else>
+        <image class="empty-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png"></image>
+      </view>
+    </view>
+    
+    <view style="height: 60rpx;"></view>
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request"
+import SkillCard from "@/pages/home/components/skill-card.vue" 
+
+// 数据模式开关：true=调用真实接口，false=使用模拟数据
+const USE_REAL_API = true
+
+export default {
+  components: { SkillCard },
+  data() {
+    return {
+      navHeight: 0,
+      
+      // 排序与筛选参数
+      orderType: 1, // 1:时间降序, 2:时间升序, 3:浏览量降序, 4:浏览量升序 (默认1)
+      linkType: '', // '':全部, 1:平台课程, 2:品牌课程
+      
+      filterVisible: false,
+      
+      // 列表数据与分页
+      skillList: [],
+      page: 1,
+      limit: 10,
+      isFinished: false,
+      
+      // 排序图标资源
+      iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
+      iconGreyDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfffb601-6877-4608-a3eb-88695b05c6c2.png',
+      iconPinkUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bc84dff-e120-4d4b-a33e-25d68e065654.png',
+      iconPinkDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ff2c2c9d-694a-4adf-b737-66b07f4a63ae.png',
+      
+      // 模拟的本地全量数据（仅在 USE_REAL_API=false 时使用）
+      mockDatabase: []
+    }
+  },
+  computed: {
+    filterIcon() {
+      // 漏斗图标，默认灰色
+      return 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png'
+    }
+  },
+  onLoad() {
+    // 动态计算导航栏与下拉起点
+    const sysInfo = uni.getSystemInfoSync()
+    const sbh = sysInfo.statusBarHeight || 0
+    this.navHeight = sbh 
+    // Navbar(44px) + SortBar(大概88rpx -> 44px) = 88px 左右
+    this.filterTop = this.navHeight + uni.upx2px(106)
+    
+    this.initMockData()
+    this.fetchData(true)
+  },
+  // 触底加载更多
+  onReachBottom() {
+    if (!this.isFinished) {
+      this.fetchData(false)
+    }
+  },
+  methods: {
+    goToSearch() {
+      uni.showToast({ title: '搜索功能开发中', icon: 'none' })
+    },
+    
+    // 点击排序
+    toggleSort(type) {
+      if (type === 'time') {
+        if (this.orderType === 1) this.orderType = 2
+        else this.orderType = 1
+      } else if (type === 'view') {
+        if (this.orderType === 3) this.orderType = 4
+        else this.orderType = 3
+      }
+      
+      this.fetchData(true)
+    },
+    
+    // 筛选面板控制
+    toggleFilterPanel() {
+      this.filterVisible = !this.filterVisible
+    },
+    closeFilterPanel() {
+      this.filterVisible = false
+    },
+    
+    // 💡 匹配设计图交互：选择选项后立刻应用并收起下拉框
+    selectAndApply(typeVal) {
+      this.linkType = typeVal;
+      this.closeFilterPanel();
+      this.fetchData(true);
+    },
+    
+    // 获取列表数据 (统一入口)
+    async fetchData(isReset = false) {
+      if (isReset) {
+        this.page = 1
+        this.isFinished = false
+        this.skillList = []
+      }
+      
+      if (USE_REAL_API) {
+        uni.showLoading({ title: '加载中...' })
+        try {
+          const params = {
+            page: this.page,
+            limit: this.limit,
+            order_type: this.orderType
+          }
+          if (this.linkType) params.link_type = this.linkType
+          
+          const res = await request.post('/sj/skill/list', params)
+          if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
+            const list = res.data.list.map(item => this.formatApiData(item))
+            
+            if (list.length < this.limit) this.isFinished = true
+            this.skillList = isReset ? list : this.skillList.concat(list)
+            this.page++
+          } else {
+            this.isFinished = true
+          }
+        } catch (e) {
+          uni.showToast({ title: '加载失败', icon: 'none' })
+        } finally {
+          uni.hideLoading()
+        }
+      } else {
+        // ========== 模拟数据请求环境 ==========
+        uni.showLoading({ title: '模拟加载中...' })
+        setTimeout(() => {
+          let list = [...this.mockDatabase]
+          
+          // 1. 模拟筛选
+          if (this.linkType) {
+            list = list.filter(item => item.link_type === this.linkType)
+          }
+          
+          // 2. 模拟排序
+          list.sort((a, b) => {
+            if (this.orderType === 1) return b.timestamp - a.timestamp // 时间降序
+            if (this.orderType === 2) return a.timestamp - b.timestamp // 时间升序
+            if (this.orderType === 3) return b.views - a.views         // 浏览量降序
+            if (this.orderType === 4) return a.views - b.views         // 浏览量升序
+            return 0
+          })
+          
+          // 3. 模拟分页
+          const start = (this.page - 1) * this.limit
+          const end = start + this.limit
+          const pageData = list.slice(start, end)
+          
+          if (pageData.length < this.limit) this.isFinished = true
+          this.skillList = isReset ? pageData : this.skillList.concat(pageData)
+          this.page++
+          uni.hideLoading()
+        }, 500)
+      }
+    },
+    
+    // 格式化接口数据
+    formatApiData(item) {
+      return {
+        id: item.id,
+        title: item.name,
+        coverSrc: item.cover_img || 'https://dummyimage.com/300x200/ccc/fff.png',
+        type: item.link_name || (item.link_type === 1 ? '平台课程' : '品牌课程'),
+        link_type: item.link_type,
+        views: item.browse_num || 0,
+        time: item.create_time ? this.formatTimeAgo(item.create_time) : '', 
+        typeIcon: item.link_logo || ''
+      }
+    },
+
+    formatTimeAgo(timeStr) {
+      const now = new Date()
+      const time = new Date(timeStr.replace(/-/g, '/'))
+      const diff = Math.floor((now - time) / 1000)
+      if (diff < 3600) return Math.floor(diff / 60) + '分钟前'
+      if (diff < 86400) return Math.floor(diff / 3600) + '小时前'
+      if (diff < 604800) return Math.floor(diff / 86400) + '天前'
+      return timeStr.split(' ')[0]
+    },
+
+    goToDetail(item) {
+      if (item.id) {
+        uni.navigateTo({ url: `/pages/skill/detail?id=${item.id}` })
+      } else {
+        uni.showToast({ title: '详情页开发中', icon: 'none' })
+      }
+    },
+
+    //  初始化模拟数据
+    initMockData() {
+      this.mockDatabase = [
+        { id: 1, title: '穿戴甲的操作视频扫码验券操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 836000, time: '7小时前', timestamp: Date.now() - 7*3600000 },
+        { id: 2, title: '脸部按摩操作步骤详情', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, views: 8334, time: '1天前', timestamp: Date.now() - 24*3600000 },
+        { id: 3, title: '全身SPA的操作视频操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 2344, time: '3天前', timestamp: Date.now() - 3*24*3600000 },
+        { id: 4, title: '高级面部护理手法详解最新版', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 836, time: '4月26日', timestamp: Date.now() - 30*24*3600000 },
+        { id: 5, title: '光疗美甲进阶全方位解析', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, views: 12000, time: '2小时前', timestamp: Date.now() - 2*3600000 }
+      ]
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.skill-market-page {
+  min-height: 100vh;
+  background: #fff;
+}
+
+/* 官方作者展示块 */
+.official-author-block {
+  display: flex;
+  align-items: center;
+  padding: 24rpx 30rpx;
+  background: #fff;
+  border-bottom: 10rpx solid #F5F5F5;
+
+  .author-avatar {
+    width: 70rpx;
+    height: 70rpx;
+    border-radius: 50%;
+    margin-right: 20rpx;
+    // border: 2rpx solid #F5F5F5;
+  }
+
+  .author-info {
+    display: flex;
+    flex-direction: column;
+
+    .author-name {
+      font-weight: 500;
+      font-size: 28rpx;
+      color: #333333;
+      line-height: 40rpx;
+      margin-bottom: 4rpx;
+    }
+
+    .author-desc {
+      font-weight: 400;
+      font-size: 20rpx;
+      color: #999999;
+      line-height: 28rpx;
+    }
+  }
+}
+
+.sort-bar-wrap {
+  position: sticky;
+  background: #fff;
+  z-index: 101;
+//   border-bottom: 1rpx solid #F5F5F5;
+}
+
+.sort-bar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx 30rpx;
+  
+  .left-sorts {
+    display: flex;
+    align-items: center;
+    gap: 80rpx;
+    
+    .sort-item {
+      display: flex;
+      align-items: center;
+      
+      .sort-text {
+        font-size: 28rpx;
+        color: #333333;
+        margin-right: 6rpx;
+        font-weight: 400;
+        
+        &.active {
+          color: #FF4767;
+          font-weight: 500;
+        }
+      }
+      
+      .arrows {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        
+        .arrow-icon {
+          width: 14rpx;
+          height: 8rpx;
+          margin: 2rpx 0;
+        }
+      }
+    }
+  }
+
+  .right-filter {
+    display: flex;
+    align-items: center;
+    
+    .filter-text {
+      font-size: 26rpx;
+      color: #666666;
+      margin-right: 8rpx;
+    }
+    
+    .filter-icon {
+      width: 18rpx;
+      height: 12rpx;
+      transition: transform 0.3s ease;
+      &.rotate {
+        transform: rotate(180deg);
+      }
+    }
+  }
+}
+
+.list-container {
+  padding: 30rpx 24rpx;
+}
+
+/* 抽屉筛选面板：使用 absolute 脱离计算 */
+.filter-panel {
+  position: absolute;
+  top: 100%; /* 从 sort-bar-wrap 底部开始向下延伸 */
+  left: 0; right: 0;
+  height: 100vh;
+  z-index: 100;
+  pointer-events: none;
+  overflow: hidden;
+
+  &.show {
+    pointer-events: auto;
+    .filter-mask { opacity: 1; }
+    .filter-container { transform: translateY(0); }
+  }
+
+  .filter-mask {
+    position: absolute;
+    top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(0,0,0,0.4);
+    opacity: 0;
+    transition: opacity 0.3s ease-in-out;
+  }
+  
+  .filter-container {
+    position: absolute;
+    top: 0; left: 0; right: 0;
+    background: #fff;
+    border-radius: 0 0 24rpx 24rpx;
+    padding: 30rpx 30rpx 40rpx;
+    display: flex;
+    flex-direction: column;
+    // box-shadow: 0 10rpx 20rpx rgba(0,0,0,0.05);
+    transform: translateY(-100%);
+    transition: transform 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
+  }
+}
+
+.group-title {
+  font-weight: 500;
+  font-size: 28rpx;
+  color: #333333;
+  margin-bottom: 24rpx;
+  display: block;
+}
+
+.course-filter {
+  display: flex;
+  gap: 20rpx;
+  
+  .course-type-item {
+    background: #F5F5F5;
+    color: #333333;
+    font-size: 26rpx;
+    padding: 12rpx 36rpx;
+    border-radius: 12rpx;
+    border: 1rpx solid transparent;
+    transition: all 0.2s;
+    
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    
+    &.active {
+      background: #FFF0F2;
+      color: #FF4767;
+      border-color: #FFB0BD;
+    }
+  }
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 120rpx 0;
+  
+  .empty-icon {
+    width: 346rpx;
+    height: 373rpx;
+  }
+}
+::v-deep .icon-headle {
+    width: 32rpx !important;
+    height: 32rpx !important;
+}
+::v-deep .back-icon {
+    width: 28rpx !important;
+    height: 36rpx !important;
+}
+</style>
\ No newline at end of file

From bbe660cbfc7467ec31ba1543e942ec1b593fbee1 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 27 May 2026 15:04:43 +0800
Subject: [PATCH 043/118] =?UTF-8?q?syr=E6=94=B9sj=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index a7cb1dd..84065dd 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -164,7 +164,7 @@ export default {
     return {
       isLogin: false, 
       userInfo: {},   
-      syrId: null,
+      sjId: null,
 
       displayScore: 0, 
       animationTimer: null,
@@ -299,8 +299,8 @@ export default {
       request.post("/sj/user/getUser").then((result) => {
         if(result.code === 200 && result.data) {
           this.userInfo = result.data;
-          uni.setStorageSync("syrId", result.data.id);
-          this.syrId = result.data.id;
+          uni.setStorageSync("sjId", result.data.id);
+          this.sjId = result.data.id;
           // 获取完用户信息后，初始化营业开关的状态
           this.initStoreStatus();
 

From 1d611bee0bc3a285971e82eb5830e3f07984fa48 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 27 May 2026 15:45:10 +0800
Subject: [PATCH 044/118] =?UTF-8?q?tabbar=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tabbar/tabbar.vue | 292 +++++++++++++++++++++--------------
 store/index.js               |  37 +++--
 2 files changed, 192 insertions(+), 137 deletions(-)

diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 2cbb408..1f9f3aa 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -1,131 +1,183 @@
 <template>
-	<uv-tabbar fixed :value="selected" @change="change1" activeColor="#FF4767 " :placeholder="false"
-		:safeAreaInsetBottom="false" :customStyle="{height:`110rpx`}">
-		<!-- <uv-tabbar-item v-for="(item,index) in $store.state.tabbarList" :key="index" :text="item.text" -->
-		<uv-tabbar-item v-for="(item,index) in tabbarList" :key="index" :text="item.text"
-			:badge="getNum(index)"
-			:customStyle="{height:`110rpx`}">
-			<template v-slot:active-icon>
-				<image class="icon" :src="item.selectedIconPath"></image>
-			</template>
-			<template v-slot:inactive-icon>
-				<image class="icon" :src="item.iconPath"></image>
-			</template>
-		</uv-tabbar-item>
-	</uv-tabbar>
+    <uv-tabbar
+        v-if="tabbarReady"
+        :key="refreshKey"
+        fixed
+        :value="currentTabIndex"
+        @change="onTabChange"
+        activeColor="#FF4767"
+        :placeholder="false"
+        :safeAreaInsetBottom="false"
+        :customStyle="{height:'110rpx'}"
+    >
+        <uv-tabbar-item
+            v-for="(item, idx) in tabbarList"
+            :key="idx"
+            :name="idx"
+            :text="item.text"
+            :badge="getNum(idx)"
+            :customStyle="{height:'110rpx'}"
+            @click="onItemClick(idx)"
+        >
+            <template v-slot:active-icon>
+                <image class="icon" :src="item.selectedIconPath"></image>
+            </template>
+            <template v-slot:inactive-icon>
+                <image class="icon" :src="item.iconPath"></image>
+            </template>
+        </uv-tabbar-item>
+    </uv-tabbar>
 </template>
 
 <script>
-	import request from "@/utils/request";
-	export default {
-		name: "tab-bar",
-		props: {
-			selected: {
-				type: [Number, String]
-			}
-		},
-		data() {
-			return {
-				tabbarList: [{
-						"iconPath": "/static/images/tabbar/new_home_gray.png",
-						"text": "首页",
-						"selectedIconPath": "/static/images/tabbar/new_home.png",
-						"pagePath": "/pages/home/home"
-					},
-                    {
-                        "iconPath": "/static/images/tabbar/new_order_gray.png",
-                        "text": "订单",
-                        "selectedIconPath": "/static/images/tabbar/new_order.png",
-                        "pagePath": "/pages/order/all-orders"
-                    },
-					{
-						"iconPath": "/static/images/tabbar/new_message_gray.png",
-						"text": "消息",
-						"selectedIconPath": "/static/images/tabbar/new_message.png",
-						"pagePath": "/pages/message/message"
-					},
-					{
-						"iconPath": "/static/images/tabbar/new_my_gray.png",
-						"text": "我的",
-						"selectedIconPath": "/static/images/tabbar/new_my.png",
-						"pagePath": "/pages/my/my"
-					}
-				]
-			};
-		},
-		computed: {
-			messageNum() {
-				return this.$store.state.messageNum || 0
-			}
-		},
-		async created() {
-			// if (!this.$store.state.tabbarList.length) {
-			// 	let isnNetwork = uni.getStorageSync("isnNetwork");
-			// 	if (isnNetwork) {
-			// 		await this.getButtonImg()
-			// 	} else {
-			// 		uni.getNetworkType({
-			// 			success: (res) => {
-			// 				console.log(res.networkType);
-			// 				if (res.networkType == "none") {
+import { mapState, mapMutations } from 'vuex';
+import request from "@/utils/request";
 
-			// 					this.$store.commit("setTabbarList", this.tabbarList)
-			// 				} else {
-			// 					// 页面加载逻辑
-			// 					uni.setStorageSync("isnNetwork", 1);
-			// 					this.getButtonImg()
-			// 				}
-			// 			},
-			// 		});
-			// 	}
+export default {
+    name: "tab-bar",
+    // 不再需要 props.selected，完全由 Vuex 控制高亮
+    data() {
+        return {
+            refreshKey: 0,          // 强制重建标识
+            tabbarReady: false,     // 组件就绪标识
+            tabbarList: [           // tab 配置
+                {
+                    iconPath: "/static/images/tabbar/new_home_gray.png",
+                    text: "首页",
+                    selectedIconPath: "/static/images/tabbar/new_home.png",
+                    pagePath: "/pages/home/home"
+                },
+                {
+                    iconPath: "/static/images/tabbar/new_order_gray.png",
+                    text: "订单",
+                    selectedIconPath: "/static/images/tabbar/new_order.png",
+                    pagePath: "/pages/order/all-orders"
+                },
+                {
+                    iconPath: "/static/images/tabbar/new_message_gray.png",
+                    text: "消息",
+                    selectedIconPath: "/static/images/tabbar/new_message.png",
+                    pagePath: "/pages/message/message"
+                },
+                {
+                    iconPath: "/static/images/tabbar/new_my_gray.png",
+                    text: "我的",
+                    selectedIconPath: "/static/images/tabbar/new_my.png",
+                    pagePath: "/pages/my/my"
+                }
+            ]
+        };
+    },
+    computed: {
+        // 从 Vuex 获取全局高亮索引
+        ...mapState(['currentTabIndex', 'messageNum'])
+    },
+    watch: {
+        // 当 tabbarList 内容变化（如异步更新图标）时，强制重建组件
+        tabbarList: {
+            deep: true,
+            handler() {
+                this.rebuildTabbar();
+            }
+        }
+    },
+    created() {
+        // 初始化时延迟显示，避免闪烁
+        this.tabbarReady = false;
+        this.$nextTick(() => {
+            this.tabbarReady = true;
+            // 如果需要异步加载图标，取消下面注释
+            // this.getButtonImg();
+        });
+    },
+    methods: {
+        ...mapMutations(['SET_CURRENT_TAB_INDEX']),
 
-			// }
+        // 设置全局选中索引（简化调用）
+        setCurrentTabIndex(index) {
+            this.SET_CURRENT_TAB_INDEX(index);
+        },
 
-		},
-		methods: {
-			getNum(index) {
-				if (index == 2) {
-					return this.messageNum
-				} else {
-					return 0
-				}
-			},
-			//获取头部背景图片
-			async getButtonImg() {
-				let res = await request.post("/sj/poster/getButtonImg", {});
-				if (res.code == 200) {
-					// if (res.data?.photo) {
-					// 	this.topBgImage = res.data?.photo + '?time=666'
-					// }
-					this.tabbarList.forEach((item, index) => {
-						if (res.data[index].iconPath) {
-							item.iconPath = res.data[index].iconPath
-						}
-						if (res.data[index].selectedIconPath) {
-							item.selectedIconPath = res.data[index].selectedIconPath
-						}
-					})
-				}
-				this.$store.commit("setTabbarList", this.tabbarList)
-			},
-			change1(val) {
-				// 因为在pages中配置了需要跳转的页面为 tabbar页面 
-				// 所以不能使用navigateTo 只能使用下面这个方法跳转。
-				uni.switchTab({
-					url: this.tabbarList[val].pagePath
-				})
-				this.messageUpudateNum()
-			}
-		}
-	}
+        // 强制重建 uv-tabbar（用于异步更新图标后）
+        rebuildTabbar() {
+            this.tabbarReady = false;
+            this.$nextTick(() => {
+                this.refreshKey++;
+                this.tabbarReady = true;
+            });
+        },
+
+        // 获取角标数字（只有消息 tab 且数量 > 0 才显示）
+        getNum(index) {
+            if (index === 2 && this.messageNum > 0) {
+                return this.messageNum;
+            }
+            return null;
+        },
+
+        // 异步更新图标（保留你的业务逻辑）
+        async getButtonImg() {
+            try {
+                let res = await request.post("/sj/poster/getButtonImg", {});
+                if (res.code === 200) {
+                    this.tabbarList.forEach((item, index) => {
+                        if (res.data[index]?.iconPath) {
+                            item.iconPath = res.data[index].iconPath;
+                        }
+                        if (res.data[index]?.selectedIconPath) {
+                            item.selectedIconPath = res.data[index].selectedIconPath;
+                        }
+                    });
+                    this.$store.commit("setTabbarList", this.tabbarList);
+                    // 图标更新后，强制重建组件
+                    this.rebuildTabbar();
+                }
+            } catch (err) {
+                console.error('getButtonImg 请求失败', err);
+            }
+        },
+
+        // uv-tabbar 的 change 事件（组件内部触发）
+        onTabChange(val) {
+            const idx = parseInt(val, 10);
+            this.doJump(idx);
+        },
+
+        // 手动点击 item 时触发
+        onItemClick(idx) {
+            this.doJump(idx);
+        },
+
+        // 实际跳转逻辑 + 更新全局高亮
+        doJump(index) {
+            const idx = parseInt(index, 10);
+            if (isNaN(idx) || !this.tabbarList[idx]) return;
+
+            // 先更新全局高亮（立即生效）
+            this.setCurrentTabIndex(idx);
+
+            // 跳转页面
+            const targetPage = this.tabbarList[idx].pagePath;
+            uni.switchTab({
+                url: targetPage,
+                fail: (err) => console.error('switchTab 失败', err)
+            });
+
+            // 保留你原有的消息更新方法
+            if (typeof this.messageUpudateNum === 'function') {
+                this.messageUpudateNum();
+            }
+        }
+    }
+};
 </script>
 
 <style lang="scss">
-	.icon {
-		height: 54rpx;
-		width: 54rpx;
-	}
-	::v-deep .uv-tabbar__content{
-		z-index: 999!important;
-	}
+.icon {
+    height: 54rpx;
+    width: 54rpx;
+}
+::v-deep .uv-tabbar__content {
+    z-index: 999 !important;
+}
 </style>
\ No newline at end of file
diff --git a/store/index.js b/store/index.js
index 35999ac..2daceb7 100644
--- a/store/index.js
+++ b/store/index.js
@@ -6,40 +6,43 @@ Vue.use(Vuex);
 
 const store = new Vuex.Store({
 	state: {
-			messageNum: 0,//底部消息数量
-		sjServiceList:{},//商家分配手艺人时服务数据shop/staff
-		tabbarList: [], //底部设置
-		reservationTime: {}, // 预约时刻信息
-		reservationSyr: {}, // 预约手艺人人信息
-		reservationAddress: {}, // 预约地址信息
-		selectStore: {}, //选择的门店信息
-		wxShareType: 0, // 正式版:0，测试版:1，体验版:2
-		//公共的变量，这里的变量不能随便修改，只能通过触发mutations的方法才能改变
+		messageNum: 0,                 // 底部消息数量
+		// ========== 新增：全局当前选中的 tab 索引 ==========
+		currentTabIndex: 0,            // 用于自定义 tabbar 高亮
+		// ============================================
+		sjServiceList: {},             // 商家分配手艺人时服务数据shop/staff
+		tabbarList: [],                // 底部设置
+		reservationTime: {},           // 预约时刻信息
+		reservationSyr: {},            // 预约手艺人人信息
+		reservationAddress: {},        // 预约地址信息
+		selectStore: {},               // 选择的门店信息
+		wxShareType: 0,                // 正式版:0，测试版:1，体验版:2
 		searchCity: {
 			center: "117.330043,38.372266",
 			name: "黄骅",
 		},
-		systemInfo: uni.getSystemInfoSync(), //设备信息
-		//是否有定位权限
+		systemInfo: uni.getSystemInfoSync(),
 		isLocation: false,
-		//路由
 		baseUrl: "",
-		//手机和app信息
 		version: {
 			VersionCode: "",
 			DeviceBrand: "",
 			DeviceType: "",
 		},
-		//商家信息
 		sjInfo: {},
-		workSpaceSJClassList: [], //商家工位分类列表
-		workHourSJClassList: [], //商家工时分类列表
+		workSpaceSJClassList: [],
+		workHourSJClassList: [],
 	},
 	mutations: {
-		//写入底部消息数量
+		// 写入底部消息数量
 		setMessageNum(state, newval) {
 			state.messageNum = newval;
 		},
+		// ========== 新增：设置全局当前选中 tab 索引 ==========
+		SET_CURRENT_TAB_INDEX(state, index) {
+			state.currentTabIndex = index;
+		},
+		// ==============================================
 		clearServiceState(state) {
 			state.reservationTime = {};
 			state.reservationSyr = {};

From a9455ce98d78c20ffe0f5e810b48a8dedb0e998a Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 27 May 2026 16:38:14 +0800
Subject: [PATCH 045/118] tabbar bug

---
 components/tabbar/tabbar.vue | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 1f9f3aa..a72a431 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -69,8 +69,34 @@ export default {
         };
     },
     computed: {
-        // 从 Vuex 获取全局高亮索引
-        ...mapState(['currentTabIndex', 'messageNum'])
+        // 保留对消息数量的映射
+        ...mapState(['messageNum']),
+        
+        // ========= 动态计算当前高亮索引 =========
+        // 替代原先直接获取 Vuex 的方式，改为根据当前真实路由计算，解决刷新状态丢失问题
+        currentTabIndex() {
+            try {
+                // 获取当前页面栈
+                const pages = getCurrentPages();
+                if (pages && pages.length > 0) {
+                    // 获取当前页面实例
+                    const currentPage = pages[pages.length - 1];
+                    // 拼接当前页面路径（兼容不同平台获取路由的方式）
+                    const currentPath = '/' + (currentPage.route || currentPage.__route__);
+                    
+                    // 在 tabbarList 中查找匹配当前路径的索引
+                    const index = this.tabbarList.findIndex(item => item.pagePath === currentPath);
+                    if (index !== -1) {
+                        return index;
+                    }
+                }
+                // 如果由于某些原因匹配不到，降级去取 Vuex 中的值（防止其他极端情况报错）
+                return this.$store.state.currentTabIndex || 0;
+            } catch (e) {
+                return this.$store.state.currentTabIndex || 0;
+            }
+        }
+        // =================================================
     },
     watch: {
         // 当 tabbarList 内容变化（如异步更新图标）时，强制重建组件
@@ -153,7 +179,7 @@ export default {
             const idx = parseInt(index, 10);
             if (isNaN(idx) || !this.tabbarList[idx]) return;
 
-            // 先更新全局高亮（立即生效）
+            // 依然更新全局高亮，确保其他可能依赖 Vuex 状态的逻辑正常运行
             this.setCurrentTabIndex(idx);
 
             // 跳转页面

From b6945acf9b6717f8bc44623b3acf23825854a101 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 28 May 2026 10:41:27 +0800
Subject: [PATCH 046/118] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=81=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E5=88=97=E8=A1=A8=E4=B8=8E=E8=AF=A6=E6=83=85=E3=80=81?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E7=B2=BE=E9=80=89=E3=80=81=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E3=80=81=E6=80=BB=E6=90=9C=E7=B4=A2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                            |   6 +
 pages/home/components/notice-card.vue | 101 +++++++
 pages/home/home.vue                   | 398 +++++++++++++++++++++-----
 pages/jingxuan/selected-brands.vue    |  42 ++-
 pages/jingxuan/selected-skills.vue    |   4 +-
 pages/my/myFavorite.vue               |   9 +-
 pages/notice/detail.vue               |   3 -
 pages/notice/notice_list.vue          | 164 +++--------
 pages/search_common/search.vue        | 363 +++++++++++++++++++++++
 9 files changed, 880 insertions(+), 210 deletions(-)
 create mode 100644 pages/home/components/notice-card.vue
 create mode 100644 pages/search_common/search.vue

diff --git a/pages.json b/pages.json
index e228fa3..029437b 100644
--- a/pages.json
+++ b/pages.json
@@ -227,6 +227,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/search_common/search",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/settings/index",
 			"style": {
diff --git a/pages/home/components/notice-card.vue b/pages/home/components/notice-card.vue
new file mode 100644
index 0000000..bfcbdf0
--- /dev/null
+++ b/pages/home/components/notice-card.vue
@@ -0,0 +1,101 @@
+<template>
+  <view class="notice-item" @tap="handleClick">
+    <view class="item-main">
+      <text class="item-title line-2">{{ item.title }}</text>
+      <view class="item-time">
+        <text class="time-text">发布时间：{{ formattedTime }}</text>
+      </view>
+    </view>
+    </view>
+</template>
+
+<script>
+export default {
+  name: "NoticeCard",
+  props: {
+    // 接收外部传入的公告对象数据
+    item: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  computed: {
+    // 利用计算属性自动处理时间格式化
+    formattedTime() {
+      const timeStr = this.item.create_time;
+      if (!timeStr) return '--:--:--';
+      
+      let formatted = timeStr;
+      if (timeStr.includes('.') && !timeStr.includes('-')) {
+        formatted = timeStr.replace(/\./g, '-');
+        if (formatted.match(/\d{4}-\d{2}-\d{2}\d{2}:\d{2}:\d{2}/)) {
+          formatted = formatted.replace(/(\d{4}-\d{2}-\d{2})(\d{2}:\d{2}:\d{2})/, '$1 $2');
+        }
+      }
+      if (formatted.includes('-') && formatted.includes(':')) {
+        return formatted;
+      }
+      return timeStr;
+    }
+  },
+  methods: {
+    handleClick() {
+      // 触发组件的 click 事件，把当前项的数据抛出去
+      this.$emit('click', this.item);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.notice-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: #ffffff;
+  border-radius: 20rpx;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+  transition: all 0.2s ease;
+  
+  .item-main {
+    flex: 1;
+    min-width: 0; // 防止文字溢出
+    
+    .item-title {
+      font-size: 30rpx;
+      font-weight: 500;
+      color: #101010;
+      line-height: 42rpx;
+      margin-bottom: 16rpx;
+    }
+    
+    .item-time {
+      display: flex;
+      align-items: center;
+      
+      .time-icon {
+        width: 24rpx;
+        height: 24rpx;
+        margin-right: 8rpx;
+        opacity: 0.6;
+      }
+      
+      .time-text {
+        font-size: 22rpx;
+        color: #999;
+        line-height: 30rpx;
+      }
+    }
+  }
+}
+
+// 多行省略
+.line-2 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  word-break: break-all;
+}
+</style>
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 84065dd..5a3ba8f 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -3,7 +3,7 @@
     <image class="page-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0901dc51-ff5a-427f-aab1-993d80aced79.png" mode="widthFix"></image>
 
     <view class="header-section">
-      <view class="user-info">
+      <view class="user-info" @tap="handleLoginRedirect">
         <image class="avatar" :src="currentAvatar"></image>
         <view class="info-text">
           <view class="name">{{ currentName }}</view>
@@ -17,6 +17,70 @@
       </view>
     </view>
 
+    <view class="setup-modal-mask" v-if="showSetupModal" catchtouchmove="true">
+      <view class="setup-modal-content">
+        <image class="modal-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ac2cb4aa-a7c5-4776-98f4-b77e9c0cfa85.png"></image>
+        
+        <view class="modal-header">
+          <text>温馨提示</text>
+        </view>
+
+        <view class="modal-body">
+          <text class="modal-subtitle">发布服务请完善以下资料：</text>
+          
+          <view class="missing-list">
+            <view class="missing-item" v-if="!hasBusinessTime">
+              <view class="item-left">
+                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png"></image>
+                <view class="item-texts">
+                  <text class="item-title">营业时间未配置</text>
+                  <text class="item-desc">请完善店铺的营业时间</text>
+                </view>
+              </view>
+              <view class="item-right orange" @tap="goToBusinessTime">去配置</view>
+            </view>
+
+            <view class="missing-item" v-if="!hasServiceSkill">
+              <view class="item-left">
+                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png"></image>
+                <view class="item-texts">
+                  <text class="item-title">服务技能未配置</text>
+                  <text class="item-desc">请完善服务技能</text>
+                </view>
+              </view>
+              <view class="item-right orange" @tap="goToServiceSkill">去配置</view>
+            </view>
+
+            <view class="missing-item" v-if="!isCertified">
+              <view class="item-left">
+                <image class="item-icon" :src="userInfo.id_type === -1 ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'"></image>
+                <view class="item-texts">
+                  <text class="item-title">{{ userInfo.id_type === -1 ? '资质认证中' : '资质未认证' }}</text>
+                  <text class="item-desc">请完成资质认证</text>
+                </view>
+              </view>
+              <view class="item-right" :class="userInfo.id_type === -1 ? 'grey' : 'orange'" @tap="goToAuth">
+                {{ userInfo.id_type === -1 ? '查看进度' : '去认证' }}
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view class="modal-footer">
+          <view class="btn-know" @tap="closeSetupModal">知道了</view>
+        </view>
+      </view>
+    </view>
+
+    <view class="settlement-guide card-box" v-if="isLogin && isUserInfoLoaded && !isCertified">
+      <view class="guide-header" :style="{ backgroundImage: 'url(' + (isSettled ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c3a6cdd8-0447-4b50-a8cc-7bab1eedb502.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/138ccbc3-486d-4287-b67f-f809de99e408.png') + ')' }">
+          <view class="guide-body">
+            <text class="guide-text">{{ isSettled ? '完成认证，开启您的接单之路' : '入驻美融融，生意更轻松' }}</text>
+            <view class="guide-btn" @tap="goToSettle">{{ isSettled ? '去认证' : '去入驻' }}</view>
+          </view>
+      </view>
+    </view>
+
     <view class="quick-actions card-box" v-if="isLogin && isSettled">
       <view class="action-item" v-for="(item, index) in quickActions" :key="index" @tap="handleQuickAction(item)">
         <image class="action-icon" :src="item.icon"></image>
@@ -87,15 +151,6 @@
       </view>
     </view>
 
-    <view class="settlement-guide card-box" v-if="isLogin && !isCertified">
-      <view class="guide-header" :style="{ backgroundImage: 'url(' + (isSettled ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c3a6cdd8-0447-4b50-a8cc-7bab1eedb502.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/138ccbc3-486d-4287-b67f-f809de99e408.png') + ')' }">
-          <view class="guide-body">
-            <text class="guide-text">{{ isSettled ? '完成认证，开启您的接单之路' : '入驻美融融，生意更轻松' }}</text>
-            <view class="guide-btn" @tap="goToSettle">{{ isSettled ? '去认证' : '去入驻' }}</view>
-          </view>
-      </view>
-    </view>
-
     <view class="notice-bar card-box">
       <image class="notice-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/75f624b8-a6ed-4787-9380-1a087062805b.png"></image>
       <swiper class="notice-swiper" vertical autoplay circular interval="3000">
@@ -143,6 +198,9 @@
 </template>
 
 <script>
+// 全局变量：用于控制每次杀进程启动后，只在首页弹一次弹窗
+let hasShownSetupModal = false;
+
 import TabBar from "@/components/tabbar/tabbar.vue"
 import projectTabs from "./components/project-tabs.vue";
 import request from "@/utils/request";
@@ -163,15 +221,17 @@ export default {
   data() {
     return {
       isLogin: false, 
+      isUserInfoLoaded: false, // 新增：标识用户信息是否已经加载完毕
       userInfo: {},   
+      authDetails: null, // 用于存储获取到的真实入驻详情配置
       sjId: null,
 
+      showSetupModal: false, //  弹窗开关控制
+
       displayScore: 0, 
       animationTimer: null,
 
-      noticeList: [
-        { id: 0, title: '暂无最新公告', url: '' }
-      ],
+      noticeList: [{ id: 0, title: '', url: '' }],
 
       quickActions: [
         { name: '扫码验券', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png' , path: '/pages/shop/verify/verify-order'},
@@ -187,24 +247,43 @@ export default {
     };
   },
   computed: {
-    // 营业状态：true(营业中) / false(休息中)
-    isOpenStore() {
-      return this.userInfo.order_taking === 1;
+    // 判断是否具备接单的大前提条件
+    canOpenStore() {
+      return this.hasBusinessTime && this.hasServiceSkill && this.isCertified;
     },
+    // 修复：使用 authDetails 里的真实接口返回字段判定服务技能
+    hasServiceSkill() {
+      // 只要 authDetails 里拿到了后端的 servers_kill 且该数组有内容，就说明配置过了
+      return this.authDetails && Array.isArray(this.authDetails.servers_kill) && this.authDetails.servers_kill.length > 0;
+    },
+    
+    // 状态显示完全由计算属性控制，去除了手动修改可能导致的冲突
+    isOpenStore() {
+      // 如果连开门的前提条件都没满足，强制显示“休息中”
+      if (!this.canOpenStore) {
+        return false; 
+      }
+      // 满足条件后，听后端的 (使用 == 防止后端返回字符串 "1")
+      return this.userInfo.order_taking == 1; 
+    },
+
     // 状态管理判定
     // 是否已入驻 (0: 未入驻, -1: 入驻第一步, >0: 已认证) 只要不等于0，说明已经开启了入驻流程
     isSettled() {
-      if (!this.isLogin || !this.userInfo) return false;
+      // 加上 typeof 判断，防止初始空对象时 undefined !== 0 造成的误判
+      if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
       return this.userInfo.id_type !== 0; 
     },
     // 是否认证通过 (根据规则，> 0 说明认证通过了)
     isCertified() {
-      if (!this.isLogin || !this.userInfo) return false;
+      if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
       return this.userInfo.id_type > 0;
     },
-    // 是否配置了营业时间
+    // 优化：兼容判定营业时间（userInfo 和 authDetails 里只要有就算配置了）
     hasBusinessTime() {
-      return this.isLogin && !!this.userInfo.business_time;
+      const timeFromUser = this.userInfo && this.userInfo.business_time;
+      const timeFromAuth = this.authDetails && this.authDetails.business_time;
+      return this.isLogin && !!(timeFromUser || timeFromAuth);
     },
 
     // 根据登录状态动态返回头像
@@ -253,34 +332,51 @@ export default {
     }
   },
   methods: {
-    goToBrandList() {
-      uni.navigateTo({
-        url: '/pages/jingxuan/selected-brands'
+    // 处理登录跳转
+    handleLoginRedirect() {
+    // 如果 isLogin 为 false（未登录状态），则跳转到登录页
+    if (!this.isLogin) {
+      uni.navigateTo({ 
+        url: '/pages/blogPopup/blogPopup' 
       });
+    }
+  },
+    //  弹窗中的快捷跳转功能
+    closeSetupModal() {
+      this.showSetupModal = false;
+    },
+    goToBusinessTime() {
+      this.showSetupModal = false;
+      uni.navigateTo({ url: '/pages/shop/business-time' });
+    },
+    goToServiceSkill() {
+      this.showSetupModal = false;
+      uni.navigateTo({ url: '/pages/shop/service-skills' });
+    },
+    goToAuth() {
+      this.showSetupModal = false;
+      uni.navigateTo({ url: '/pages/ruzhu/ruzhu' });
+    },
+
+    goToBrandList() {
+      uni.navigateTo({ url: '/pages/jingxuan/selected-brands' });
     },
     goToSkillList() {
-      uni.navigateTo({
-        url: '/pages/jingxuan/selected-skills'
-      });
+      uni.navigateTo({ url: '/pages/jingxuan/selected-skills' });
     },
     // 处理金刚区点击事件 (包含扫码验券核心逻辑)
     handleQuickAction(item) {
       if (item.name === '扫码验券') {
-        console.log('准备跳转到自定义扫码页...');
-      uni.navigateTo({
-        url: '/pages/shop/verify/verify-order',
-        fail: (err) => {
-          console.error('跳转失败：', err);
-        }
-      });
-      return;
+        uni.navigateTo({
+          url: '/pages/shop/verify/verify-order',
+          fail: (err) => { console.error('跳转失败：', err); }
+        });
+        return;
       } // 2. 通用跳转逻辑
-      else if (item.path) {
+        else if (item.path) {
         uni.navigateTo({
           url: item.path,
-          fail: () => {
-            uni.showToast({ title: '页面开发中...', icon: 'none' });
-          }
+          fail: () => { uni.showToast({ title: '页面开发中...', icon: 'none' }); }
         });
       }
     },
@@ -297,31 +393,51 @@ export default {
 
     getUserInfo() {
       request.post("/sj/user/getUser").then((result) => {
-        if(result.code === 200 && result.data) {
+        if(result.code == 200 && result.data) {
           this.userInfo = result.data;
+          this.isUserInfoLoaded = true; // 数据回来了，允许相关 UI 进行渲染
           uni.setStorageSync("sjId", result.data.id);
           this.sjId = result.data.id;
-          // 获取完用户信息后，初始化营业开关的状态
-          this.initStoreStatus();
 
-          // 如果已入驻，才获取接单管理和实时数据
+          // 如果在系统里（即使没通过认证），检查一下条件
           if (this.isSettled) {
             this.fetchOrderNum();
             this.fetchRealTimeData();
+
+            // 必须先去拉取认证详情（包含服务技能配置），再判断弹窗逻辑
+            this.fetchAuthDetails();
           }
         }
       });
     },
 
-    // 获取：接单管理不同状态订单数量
+    // 获取入驻、修改资料审核详情（获取服务技能、营业时间等准确数据）
+    fetchAuthDetails() {
+      request.post("/sj/userSjAuth/details", {
+        type: 1, // 审核类型 1入驻申请
+        id_type: '1' // 平台商家
+      }).then(res => {
+        if (res.code == 200 && res.data) {
+          this.authDetails = res.data;
+        }
+        
+        // 只有确保拉到了配置详情后，再来判断三大件有没有配全
+        // 如果没有配全，且是首次大退打开进入首页，拉起弹窗
+        if (!this.canOpenStore && !hasShownSetupModal) {
+          this.showSetupModal = true;
+          hasShownSetupModal = true;
+        }
+      });
+    },
+
     fetchOrderNum() {
       request.post("/sj/poster/orderNum").then(res => {
-        if(res.code === 200 && res.data) {
+        if(res.code == 200 && res.data) {
           this.orderBasic = {
             updateTime: this.formatTime(res.data.now_date),
             waitStart: res.data.dfw || 0,
             waitFinish: res.data.dwc || 0,
-            finished: res.data.yqx || 0 // 备注：接口返回只有dfw, dwc, yqx(已取消)。暂时将第三个坑位放为yqx，或后期让后端加字段
+            finished: res.data.yqx || 0 
           };
         }
       });
@@ -330,7 +446,7 @@ export default {
     // 获取：首页实时数据
     fetchRealTimeData() {
       request.post("/sj/poster/realTimeData").then(res => {
-        if(res.code === 200 && res.data) {
+        if(res.code == 200 && res.data) {
           const today = res.data.today || {};
           const yesterday = res.data.yesterday || {};
           
@@ -351,7 +467,7 @@ export default {
     // 获取：通知公告列表
     fetchNoticeList() {
       request.post('/sj/notice/list', { page: 1, limit: 6 }).then(res => {
-        if(res.code === 200 && res.data && res.data.list.length > 0) {
+        if(res.code == 200 && res.data && res.data.list.length > 0) {
           this.noticeList = res.data.list;
         }
       });
@@ -359,12 +475,10 @@ export default {
 
     // 获取：品牌列表
     fetchBrandList() {
-      // 假设首页只拉取推荐的前4条
       request.post('/sj/brand/list', { page: 1, limit: 4 }).then(res => {
-        if(res.code === 200 && res.data && res.data.list) {
+        if(res.code == 200 && res.data && res.data.list) {
           this.brands = res.data.list.map(item => {
             let tags = [];
-            // 根据接口字段动态生成标签映射
             if (item.franchise_state === 1) tags.push('franchise');
             if (item.student_state === 1) tags.push('recruit');
             if (tags.length === 0) tags.push('more'); 
@@ -384,14 +498,14 @@ export default {
     // 获取：技能集市列表
     fetchSkillList() {
       request.post('/sj/skill/list', { page: 1, limit: 4 }).then(res => {
-        if(res.code === 200 && res.data && res.data.list) {
+        if(res.code == 200 && res.data && res.data.list) {
           this.skills = res.data.list.map(item => {
             return {
               id: item.id,
               title: item.name,
               type: item.link_name || '平台课程',
               views: item.browse_num || 0,
-              time: item.create_time ? item.create_time.split(' ')[0] : '', // 只取日期
+              time: item.create_time ? item.create_time.split(' ')[0] : '', 
               coverSrc: item.cover_img || 'https://dummyimage.com/200x150/ccc/fff.png&text=Video',
               typeIcon: item.link_logo || ''
             };
@@ -402,51 +516,51 @@ export default {
 
     // 跳转：通知详情页
     goToNotice(msg) {
-      if(msg.id) {
-        uni.navigateTo({ url: `/pages/notice/detail?id=${msg.id}` });
-      }
+      if(msg.id) { uni.navigateTo({ url: `/pages/notice/detail?id=${msg.id}` }); }
     },
-
-    // 跳转：公告列表页
+    // 跳转：通知公告列表页
     goToNoticeList() {
       uni.navigateTo({ url: '/pages/notice/notice_list' });
     },
-
     // 跳转：去入驻
     goToSettle() {
       uni.navigateTo({ url: '/pages/ruzhu/ruzhu' });
     },
 
-    // 初始化按钮状态
-    initStoreStatus() {
-      // 如果未认证，或者（已认证但未配置时间），默认都是休息中
-      if (!this.isCertified || (this.isCertified && !this.hasBusinessTime)) {
-        this.isOpenStore = false;
-      } else {
-        // 认证通过且配置了时间，根据后端真实数据控制 (self_state 1为营业, 0为休息)
-        this.isOpenStore = this.userInfo.self_state === 1; 
-      }
-    },
-
     // 营业中 / 休息中 按钮逻辑判断
     toggleStatus() {
-      if (!this.isCertified) {
-        uni.showModal({ title: '提示', content: '请先完善认证信息', confirmText: '去完善' });
+      const currentStatus = this.userInfo.order_taking;
+      const isCurrentlyResting = currentStatus != 1; // 当前不是营业中即为休息中
+
+      // 强力拦截：在休息中且三大件没配全，想要营业时拦截弹窗
+      if (isCurrentlyResting && !this.canOpenStore) {
+        this.showSetupModal = true;
         return;
       }
-      if (this.isCertified && !this.hasBusinessTime) {
-        uni.showToast({ title: '请先配置营业时间', icon: 'none' });
-        return;
-      }
-      let newStatus = this.userInfo.order_taking == 1 ? 2 : 1;
+
+      // 准备切换的新状态
+      let newStatus = currentStatus == 1 ? 2 : 1;
+      
+      // 加入一个防连点的 Loading
+      uni.showLoading({ title: '切换中...', mask: true });
+
+      // 发起请求告诉后端
       request.post("/sj/sjordertaking", {
         order_taking: newStatus,
         sjid: this.sjId 
       }).then((res) => {
-        this.getUserInfo();
+        uni.hideLoading();
+        // 因为上一次的严格判断误伤了你，这里回归你最原始的写法，直接假定成功
+        this.userInfo.order_taking = newStatus; // 强行改一下本地状态让按钮动过去
+        this.getUserInfo(); // 无论如何刷新一下真实数据
         uni.showToast({ title: newStatus == 1 ? '已开启营业' : '已休息', icon: 'none' });
+      }).catch(() => {
+        // 只有在彻底断网报错的情况下，才会弹下面这个
+        uni.hideLoading();
+        uni.showToast({ title: '网络异常，切换失败', icon: 'none' });
       });
     },
+
     animateScore() {
       const target = parseFloat(this.orderDetail.score) || 0;
       if (this.animationTimer) clearInterval(this.animationTimer);
@@ -485,6 +599,134 @@ export default {
     background: #f5f6f8;
   }
 
+  /* ============ 提示弹窗样式 ============ */
+  .setup-modal-mask {
+    position: fixed;
+    top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(0, 0, 0, 0.5);
+    z-index: 9999;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    
+    .setup-modal-content {
+      width: 630rpx;
+      height: 775rpx; /* 根据要求绝对固定宽高 */
+      background: #FFFFFF;
+      border-radius: 32rpx;
+      position: relative;
+      display: flex;
+      flex-direction: column;
+      
+      .modal-bg {
+        position: absolute;
+        top: 0; left: 0;
+        width: 630rpx;
+        height: 265rpx;
+        z-index: 0;
+      }
+      
+      .modal-header {
+        position: relative;
+        z-index: 1;
+        height: 150rpx;
+        display: flex;
+        align-items: flex-end;
+        justify-content: center;
+        padding-bottom: 20rpx;
+        
+        text {
+          font-size: 36rpx;
+          font-weight: bold;
+          color: #333333;
+          letter-spacing: 2rpx;
+        }
+      }
+      
+      .modal-body {
+        position: relative;
+        z-index: 1;
+        flex: 1;
+        padding: 50rpx 40rpx;
+        
+        .modal-subtitle {
+          font-size: 28rpx;
+          color: #333333;
+          margin-bottom: 40rpx;
+          display: block;
+        }
+        
+        .missing-list {
+          display: flex;
+          flex-direction: column;
+          gap: 46rpx; /* 间距拉开显得不那么拥挤 */
+          
+          .missing-item {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            
+            .item-left {
+              display: flex;
+              align-items: center;
+              
+              .item-icon {
+                width: 36rpx;
+                height: 36rpx;
+                margin-right: 16rpx;
+              }
+              
+              .item-texts {
+                display: flex;
+                flex-direction: column;
+                
+                .item-title {
+                  font-size: 30rpx;
+                  color: #333333;
+                  font-weight: 500;
+                  margin-bottom: 8rpx;
+                }
+                
+                .item-desc {
+                  font-size: 24rpx;
+                  color: #999999;
+                }
+              }
+            }
+            
+            .item-right {
+              font-size: 26rpx;
+              font-weight: 400;
+              
+              &.orange { color: #FF7B00; }
+              &.grey { color: #999999; }
+            }
+          }
+        }
+      }
+      
+      .modal-footer {
+        position: relative;
+        z-index: 1;
+        padding: 0 50rpx 50rpx;
+        
+        .btn-know {
+          width: 100%;
+          height: 88rpx;
+          background: #FF4767;
+          border-radius: 44rpx;
+          color: #FFFFFF;
+          font-size: 32rpx;
+          font-weight: 500;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+      }
+    }
+  }
+  /* ==================================== */
+
   .homePage {
     position: relative;
     min-height: 100vh;
@@ -589,7 +831,6 @@ export default {
         }
       }
       
-      // 营业中/休息中滑块核心样式区
       .status-toggle {
         position: relative;
         width: 173rpx;
@@ -664,7 +905,6 @@ export default {
         width: 100%;
         height: 248rpx;
         background-size: cover;
-        /* 背景图由动态 style 接管 */
       }
 
       .guide-body {
diff --git a/pages/jingxuan/selected-brands.vue b/pages/jingxuan/selected-brands.vue
index 4fee4f3..61d6d79 100644
--- a/pages/jingxuan/selected-brands.vue
+++ b/pages/jingxuan/selected-brands.vue
@@ -9,7 +9,7 @@
       borderBottom="none"
       :show-headle="true"
       headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png"
-      @onHeadleClick="">
+      @onHeadleClick="goToSearch">
     </custom-navbar>
 
     <serviecFirstTab 
@@ -132,6 +132,46 @@ export default {
     this.loadFilterCategories();
   },
   methods: {
+    // 跳转搜索页
+    goToSearch() {
+      uni.navigateTo({
+        url: '/pages/search_common/search?type=brand' // 告诉搜索页，我要搜品牌
+      });
+    },
+
+    // 加载一级分类并自动组装其对应的二级分类，兼容 state === 1
+    async loadFilterCategories() {
+      try {
+        const syrId = uni.getStorageSync('syrId') || 1; 
+        const res = await request.post('/sj/firstclass', { id: syrId })
+        if ((res.code === 200 || res.state === 1) && res.data) {
+          const firstClasses = res.data;
+          
+          // 并发请求所有的二级分类
+          const promises = firstClasses.map(async (first) => {
+            try {
+              const subRes = await request.post('/sj/secondclass', { id: first.id })
+              return {
+                id: first.id,
+                title: first.title,
+                children: ((subRes.code === 200 || subRes.state === 1) && subRes.data) ? subRes.data : []
+              }
+            } catch(e) {
+              return { id: first.id, title: first.title, children: [] }
+            }
+          });
+          
+          const filterData = await Promise.all(promises);
+          // 过滤掉没有子分类的项，避免面板出现光秃秃的标题
+          this.brandFilterData = filterData.filter(group => group.children.length > 0);
+        } else {
+          this.brandFilterData = []
+        }
+      } catch (error) {
+        console.error('获取分类字典失败', error)
+      }
+    },
+    
     // ============ 排序逻辑 ============
     toggleSort(type) {
       if (type === 'time') {
diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index 739e6c4..681bf30 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -137,7 +137,9 @@ export default {
   },
   methods: {
     goToSearch() {
-      uni.showToast({ title: '搜索功能开发中', icon: 'none' })
+      uni.navigateTo({
+            url: '/pages/search_common/search?type=skill' // 告诉搜索页，我要搜技能
+        });
     },
     
     // 点击排序
diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index af8a226..d6274da 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -2,7 +2,7 @@
   <view class="collection-page">
 
     <custom-navbar title="我的收藏" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true" borderBottom="none"
-      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" @onHeadleClick="addAddress">
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" @onHeadleClick="goToSearch">
     </custom-navbar>
     
     <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view>
@@ -167,6 +167,13 @@ export default {
     this.loadData()
   },
   methods: {
+    // 跳转搜索页
+    goToSearch() {
+      // this.currentTab 的值刚好是 'brand' 或 'course'
+		uni.navigateTo({
+			url: `/pages/search_common/search?type=collection_${this.currentTab}` 
+		});
+    },
     goBack() {
       uni.navigateBack()
     },
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index ac75361..ab31e7f 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -7,9 +7,6 @@
       backgroundColor="linear-gradient(180deg, #E6ECFB 0%, #FFFFFF 100%)"
       :showHeadle="true"
       borderBottom="none"
-      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" 
-      @onHeadleClick="handleShare"
-      
     />
 
     <!-- 页面主要内容 -->
diff --git a/pages/notice/notice_list.vue b/pages/notice/notice_list.vue
index b2441e5..11402a3 100644
--- a/pages/notice/notice_list.vue
+++ b/pages/notice/notice_list.vue
@@ -1,34 +1,30 @@
 <template>
   <view class="notice-page">
     <!-- 自定义顶部导航组件 -->
-    <custom-navbar title="公告通知" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true"
-			headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" @onHeadleClick="addAddress">
-		</custom-navbar>
-    
-    <!-- 主要内容区域 -->
+    <custom-navbar 
+      title="公告通知" 
+      :showBack="true" 
+      backgroundColor="#FFFFFF" 
+      :show-headle="true"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" 
+      @onHeadleClick="goToSearch"
+    />
+
     <view class="page-content">
       <!-- 加载状态 -->
       <view v-if="loading" class="loading-container">
         <view class="loading-icon"></view>
         <text class="loading-text">加载中...</text>
       </view>
-      
+
       <!-- 公告列表 -->
       <view v-else-if="noticeList.length > 0" class="notice-list">
-        <view 
-          class="notice-item" 
-          v-for="(item, index) in noticeList" 
+        <NoticeCard 
+          v-for="item in noticeList" 
           :key="item.id"
-          @tap="goToDetail(item)"
-        >
-          <view class="item-main">
-            <text class="item-title line-2">{{ item.title }}</text>
-            <view class="item-time">
-              <text class="time-text">发布时间：{{ formatTime(item.create_time) }}</text>
-            </view>
-          </view>
-          <!-- <image class="arrow-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png" mode="aspectFit"></image> -->
-        </view>
+          :item="item" 
+          @click="goToDetail"
+        />
         
         <!-- 加载更多状态 -->
         <view v-if="loadingMore" class="load-more">
@@ -38,7 +34,6 @@
           <text>没有更多了</text>
         </view>
       </view>
-      
       <!-- 空状态 -->
       <view v-else class="empty-container">
         <image class="empty-img" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c5e7b2a-3d4f-4b1e-9a7c-6e8f2d1b4a5c.png" mode="aspectFit"></image>
@@ -50,37 +45,44 @@
 
 <script>
 import CustomNavbar from '@/components/custom-navbar/custom-navbar.vue';
+import NoticeCard from '@/pages/home/components/notice-card.vue';
 import request from '@/utils/request';
 
 export default {
   components: {
-    CustomNavbar
+    CustomNavbar,
+    NoticeCard   // 注册组件
   },
   data() {
     return {
-      loading: false,        // 首次加载状态
-      loadingMore: false,    // 加载更多状态
-      noticeList: [],        // 公告列表数据
-      page: 1,               // 当前页码
-      limit: 10,             // 每页数量
-      total: 0,              // 总记录数
-      hasMore: true          // 是否还有更多数据
+      loading: false,
+      loadingMore: false,
+      noticeList: [],
+      page: 1,
+      limit: 10,
+      total: 0,
+      hasMore: true
     };
   },
   onLoad() {
     this.fetchNoticeList(true);
   },
-  // 下拉刷新
   onPullDownRefresh() {
     this.fetchNoticeList(true);
   },
-  // 上拉加载更多
   onReachBottom() {
     if (!this.loadingMore && this.hasMore && !this.loading) {
       this.fetchNoticeList(false);
     }
   },
   methods: {
+    // 跳转搜索页
+    goToSearch() {
+      uni.navigateTo({
+        url: '/pages/search_common/search?type=notice'
+      });
+    },
+    
     // 获取公告列表
     fetchNoticeList(reset = true) {
       if (reset) {
@@ -90,8 +92,10 @@ export default {
       } else {
         if (!this.hasMore) return;
         this.loadingMore = true;
+        // 非重置时页码+1
+        this.page++;
       }
-      
+
       request.post('/sj/notice/list', {
         page: this.page,
         limit: this.limit
@@ -109,18 +113,15 @@ export default {
           
           // 判断是否还有更多数据
           this.hasMore = this.noticeList.length < total;
-          
-          // 如果还有更多数据，页码加1
-          if (this.hasMore && !reset) {
-            this.page++;
-          }
         } else {
           if (reset) this.noticeList = [];
           this.hasMore = false;
+          // 非重置且请求失败时回滚页码
+          if (!reset && this.page > 1) this.page--;
         }
       }).catch(err => {
         console.error('获取公告列表失败:', err);
-        if (reset) this.noticeList = [];
+        if (!reset && this.page > 1) this.page--; // 回滚页码
         uni.showToast({
           title: '加载失败，请稍后重试',
           icon: 'none'
@@ -128,34 +129,13 @@ export default {
       }).finally(() => {
         this.loading = false;
         this.loadingMore = false;
-        // 停止下拉刷新
         if (reset) {
           uni.stopPullDownRefresh();
         }
       });
     },
     
-    // 格式化时间
-    formatTime(timeStr) {
-      if (!timeStr) return '--:--:--';
-      // 处理多种时间格式：2026-06-10 15:00:00 或 2026.06.1015:00:00
-      let formatted = timeStr;
-      // 如果是点分隔的格式，转换为标准格式
-      if (timeStr.includes('.') && !timeStr.includes('-')) {
-        formatted = timeStr.replace(/\./g, '-');
-        // 处理日期和时间连在一起的情况，如 "2026.06.1015:00:00" -> "2026-06-10 15:00:00"
-        if (formatted.match(/\d{4}-\d{2}-\d{2}\d{2}:\d{2}:\d{2}/)) {
-          formatted = formatted.replace(/(\d{4}-\d{2}-\d{2})(\d{2}:\d{2}:\d{2})/, '$1 $2');
-        }
-      }
-      // 如果已经是标准格式，直接返回
-      if (formatted.includes('-') && formatted.includes(':')) {
-        return formatted;
-      }
-      return timeStr;
-    },
-    
-    // 跳转到详情页
+    // 跳转到详情页（接收 NoticeCard 组件 $emit 传递的 item）
     goToDetail(item) {
       if (item.id) {
         uni.navigateTo({
@@ -177,7 +157,6 @@ export default {
   padding: 20rpx 20rpx 40rpx;
 }
 
-// 加载中样式
 .loading-container {
   display: flex;
   flex-direction: column;
@@ -204,54 +183,6 @@ export default {
 @keyframes spin {
   to { transform: rotate(360deg); }
 }
-
-// 公告列表
-.notice-list {
-  .notice-item {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    background: #ffffff;
-    border-radius: 20rpx;
-    padding: 30rpx;
-    margin-bottom: 20rpx;
-    // box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
-    transition: all 0.2s ease;
-    
-    .item-main {
-      flex: 1;
-      min-width: 0; // 防止文字溢出
-      
-      .item-title {
-        font-size: 30rpx;
-        font-weight: 500;
-        color: #101010;
-        line-height: 42rpx;
-        margin-bottom: 16rpx;
-      }
-      
-      .item-time {
-        display: flex;
-        align-items: center;
-        
-        .time-icon {
-          width: 24rpx;
-          height: 24rpx;
-          margin-right: 8rpx;
-          opacity: 0.6;
-        }
-        
-        .time-text {
-          font-size: 22rpx;
-          color: #999;
-          line-height: 30rpx;
-        }
-      }
-    }
-  }
-}
-
-// 加载更多
 .load-more, .no-more {
   text-align: center;
   padding: 30rpx 0;
@@ -259,7 +190,6 @@ export default {
   color: #999;
 }
 
-// 空状态
 .empty-container {
   display: flex;
   flex-direction: column;
@@ -279,20 +209,4 @@ export default {
     color: #999;
   }
 }
-
-// 多行省略
-.line-2 {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  overflow: hidden;
-  word-break: break-all;
-}
-
-
-::v-deep .icon-headle {
-    width: 32rpx !important;
-    height: 32rpx !important;
-}
-
 </style>
\ No newline at end of file
diff --git a/pages/search_common/search.vue b/pages/search_common/search.vue
new file mode 100644
index 0000000..f91b2a3
--- /dev/null
+++ b/pages/search_common/search.vue
@@ -0,0 +1,363 @@
+<template>
+  <view class="search-page">
+    <view class="search-header" :style="{ paddingTop: statusBarHeight + 'px' }">
+      <view class="header-content">
+        <image class="back-icon" src="/static/images/back.png" @tap="goBack"></image>
+        
+        <view class="search-box">
+          <input 
+            class="search-input" 
+            v-model="keyword" 
+            :placeholder="placeholderText" 
+            placeholder-class="search-placeholder"
+            focus 
+            confirm-type="search" 
+            @confirm="handleSearch"
+          />
+          <!-- <view v-if="keyword" class="clear-icon" @tap="clearSearch">✕</view> -->
+          <text class="search-btn" @tap="handleSearch">搜索</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view>
+
+    <view class="result-container">
+      
+      <view v-if="loading && page === 1" class="loading-tips">加载中...</view>
+      
+      <view v-else-if="searchType === 'notice' && resultList.length > 0">
+        <notice-card 
+          v-for="item in resultList" 
+          :key="item.id" 
+          :item="item"
+          @click="goToDetail(item)"
+        />
+      </view>
+
+      <view v-else-if="(searchType === 'brand' || searchType === 'collection_brand') && resultList.length > 0" class="brand-grid">
+        <brand-card 
+          class="brand-card-wrap"
+          v-for="item in resultList" 
+          :key="item.id" 
+          :item="item"
+          :tagKeys="item.tagKeys || []"
+          @click="goToDetail(item)"
+        />
+      </view>
+
+      <view v-else-if="(searchType === 'skill' || searchType === 'collection_course') && resultList.length > 0" class="course-list">
+        <skill-card 
+          v-for="item in resultList" 
+          :key="item.id" 
+          :item="item"
+          @click="goToDetail(item)"
+        />
+      </view>
+
+      <view v-else-if="!loading && hasSearched && resultList.length === 0" class="empty-state">
+        <image class="empty-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4e4320d1-cc5c-4312-890c-f1eb8381fdd2.png"></image>
+        <text>未搜索到相关内容哦~</text>
+      </view>
+
+      <view v-if="resultList.length > 0" class="load-more-text">
+        <text v-if="loading && page > 1">正在加载更多...</text>
+        <text v-else-if="!hasMore">没有更多了</text>
+      </view>
+      
+    </view>
+  </view>
+</template>
+
+<script>
+import BrandCard from "@/pages/home/components/brand-card.vue";
+import SkillCard from "@/pages/home/components/skill-card.vue";
+import NoticeCard from "@/pages/home/components/notice-card.vue";
+import request from '@/utils/request';
+
+export default {
+  components: {
+    BrandCard,
+    SkillCard,
+    NoticeCard
+  },
+  data() {
+    return {
+      statusBarHeight: 0,
+      navHeight: 0,
+      searchType: '', 
+      keyword: '',
+      resultList: [],
+      
+      loading: false, 
+      hasSearched: false, 
+      
+      // 分页相关
+      page: 1,
+      limit: 10,
+      hasMore: true
+    };
+  },
+  computed: {
+    placeholderText() {
+      const map = {
+        'notice': '搜索公告通知',
+        'brand': '搜索精选品牌',
+        'skill': '搜索技能课程',
+        'collection_brand': '搜索收藏品牌的内容',
+        'collection_course': '搜索收藏课程的内容'
+      };
+      return map[this.searchType] || '请输入搜索内容';
+    }
+  },
+  onLoad(options) {
+    const systemInfo = uni.getSystemInfoSync();
+    this.statusBarHeight = systemInfo.statusBarHeight;
+    this.navHeight = this.statusBarHeight + 44; 
+    
+    if (options.type) {
+      this.searchType = options.type;
+    }
+  },
+  onReachBottom() {
+    if (this.hasMore && !this.loading) {
+      this.page++;
+      this.loadData(false);
+    }
+  },
+  methods: {
+    goBack() {
+      uni.navigateBack();
+    },
+    
+    clearSearch() {
+      this.keyword = '';
+      this.resultList = [];
+      this.hasSearched = false;
+      this.page = 1;
+      this.hasMore = true;
+    },
+
+    handleSearch() {
+      if (!this.keyword.trim()) {
+        return uni.showToast({ title: '请输入搜索内容', icon: 'none' });
+      }
+      this.hasSearched = true;
+      this.page = 1;
+      this.hasMore = true;
+      this.loadData(true);
+    },
+    
+    async loadData(isReset) {
+      this.loading = true;
+
+      try {
+        let apiUrl = '';
+        let params = { page: this.page, limit: this.limit };
+
+        switch (this.searchType) {
+          case 'notice':
+            apiUrl = '/sj/notice/list';
+            params.title = this.keyword;
+            break;
+          case 'brand':
+            apiUrl = '/sj/brand/list';
+            params.name = this.keyword;
+            break;
+          case 'skill':
+            apiUrl = '/sj/skill/list';
+            params.name = this.keyword;
+            break;
+          case 'collection_brand':
+            apiUrl = '/sj/brand/collectList';
+            params.name = this.keyword;
+            break;
+          case 'collection_course':
+            apiUrl = '/sj/skill/collectList';
+            params.name = this.keyword;
+            break;
+          default:
+            throw new Error('未知的搜索类型');
+        }
+
+        const res = await request.post(apiUrl, params);
+        
+        if (res.code === 200 && res.data) {
+          const list = res.data.list || [];
+          // 文档里总数叫 count，不是 total
+          const totalCount = res.data.count || 0; 
+          
+          let formattedList = list;
+          
+          if (this.searchType === 'brand' || this.searchType === 'collection_brand') {
+            formattedList = list.map(item => {
+              let tags = [];
+              if (item.franchise_state === 1) tags.push('franchise');
+              if (item.student_state === 1) tags.push('recruit');
+              if (tags.length === 0) tags.push('more');
+              return {
+                ...item,
+                name: item.name,
+                bgSrc: item.cover_img || 'https://dummyimage.com/300x200/ccc/fff.png',
+                avatar: item.logo_img || 'https://dummyimage.com/100x100/ccc/fff.png',
+                tagKeys: tags
+              };
+            });
+          } else if (this.searchType === 'skill' || this.searchType === 'collection_course') {
+            formattedList = list.map(item => ({
+              ...item,
+              title: item.name,
+              coverSrc: item.cover_img || 'https://dummyimage.com/300x200/ccc/fff.png',
+              type: item.link_name || (item.link_type === 1 ? '平台课程' : '品牌课程'),
+              views: item.browse_num || 0,
+              typeIcon: item.link_logo || ''
+            }));
+          }
+
+          if (isReset) {
+            this.resultList = formattedList;
+          } else {
+            this.resultList = [...this.resultList, ...formattedList];
+          }
+          
+          // 根据接口文档返回的 count 来判断是否还有更多
+          this.hasMore = this.resultList.length < totalCount;
+          
+        } else {
+          if (isReset) this.resultList = [];
+          this.hasMore = false;
+        }
+      } catch (e) {
+        console.error('搜索异常:', e);
+        uni.showToast({ title: '搜索失败，请重试', icon: 'none' });
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    goToDetail(item) {
+      if (!item.id) return;
+      
+      if (this.searchType === 'notice') {
+        uni.navigateTo({ url: `/pages/notice/detail?id=${item.id}` });
+      } else if (this.searchType === 'brand' || this.searchType === 'collection_brand') {
+        uni.navigateTo({ url: `/pages/brand/detail?id=${item.id}` });
+      } else if (this.searchType === 'skill' || this.searchType === 'collection_course') {
+        uni.navigateTo({ url: `/pages/skill/detail?id=${item.id}` });
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.search-page {
+  min-height: 100vh;
+  background: #F5F5F5;
+}
+
+.search-header {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  background-color: #F5F5F5;
+  z-index: 999;
+  
+  .header-content {
+    height: 44px;
+    display: flex;
+    align-items: center;
+    padding: 0 24rpx;
+    
+    .back-icon {
+      width: 28rpx;
+      height: 28rpx;
+      padding-right: 20rpx;
+    }
+    
+    .search-box {
+      flex: 1;
+      height: 74rpx;
+      background: #fff;
+      border-radius: 37rpx;
+      display: flex;
+      align-items: center;
+      padding: 0 6rpx 0 24rpx;
+      
+      .search-input {
+        flex: 1;
+        font-size: 28rpx;
+      }
+      .search-placeholder {
+        color: #CCCCCC;
+      }
+      
+      .clear-icon {
+        font-size: 28rpx;
+        color: #999;
+        padding: 10rpx 20rpx;
+      }
+    }
+    
+    .search-btn {
+      width: 110rpx;
+      height: 62rpx;
+      line-height: 62rpx;
+      background: #FF4767;
+      border-radius: 31rpx;
+      font-size: 28rpx;
+      color: #fff;
+      text-align: center;
+    }
+  }
+}
+
+.result-container {
+  padding: 24rpx;
+}
+
+.loading-tips {
+  text-align: center;
+  padding: 100rpx 0;
+  color: #999;
+  font-size: 28rpx;
+}
+
+.brand-grid {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  .brand-card-wrap { width: 48.5%; margin-bottom: 24rpx; }
+}
+
+.course-list {
+  display: flex;
+  flex-direction: column;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 200rpx 0;
+  
+  .empty-icon {
+    width: 200rpx;
+    height: 200rpx;
+    margin-bottom: 20rpx;
+  }
+  text {
+    font-size: 28rpx;
+    color: #999;
+  }
+}
+
+.load-more-text {
+  text-align: center;
+  padding: 30rpx 0;
+  font-size: 24rpx;
+  color: #999;
+}
+</style>
\ No newline at end of file

From 66760ee72a5d951ad3a8fbd65ec1ab35fb1049fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Thu, 28 May 2026 11:38:03 +0800
Subject: [PATCH 047/118] =?UTF-8?q?=E5=85=A5=E4=BD=8F=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/qualification_sj copy.vue | 1963 +++++++++++++++++++++++++
 pages/ruzhu/successruzhu.vue          |   94 ++
 2 files changed, 2057 insertions(+)
 create mode 100644 pages/ruzhu/qualification_sj copy.vue
 create mode 100644 pages/ruzhu/successruzhu.vue

diff --git a/pages/ruzhu/qualification_sj copy.vue b/pages/ruzhu/qualification_sj copy.vue
new file mode 100644
index 0000000..921f2f0
--- /dev/null
+++ b/pages/ruzhu/qualification_sj copy.vue	
@@ -0,0 +1,1963 @@
+<template>
+  <view class="qualification-page">
+    <!-- 营业执照部分 -->
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">营业执照</text>
+      </view>
+
+      <!-- 资质照片 -->
+      <view class="form-item box-cont">
+        <text class="label required">资质照片</text>
+        <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
+        <view class="upload-container">
+          <view class="upload-box" @click="chooseImage('uscc_photo')">
+            <view class="upload-camera license-upload">
+              <image v-if="formData.uscc_photo" :src="formData.uscc_photo" mode="aspectFill" class="preview-image"></image>
+              <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/92bd4268-b4d7-4725-8664-9e44f828c7d9" mode="aspectFit" class="camera-icon"></image>
+              <!-- 识别状态遮罩 -->
+              <!-- <view v-if="isRecognizing && recognizeType === 'uscc_photo'" class="recognize-overlay">
+                <view class="recognize-loading"></view>
+                <text class="recognize-text">识别中...</text>
+              </view> -->
+            </view>
+          </view>
+          <text class="upload-label required">请上传营业执照原件</text>
+        </view>
+      </view>
+
+      <!-- 商户类型 -->
+      <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+          <text class="label required">商户类型</text>
+        </view>
+        <input type="text" v-model="formData.uscc_type" placeholder="请输入商户类型" 
+               placeholder-class="placeholder" class="input" 
+               @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <!-- 营业执照信息 -->
+      <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+          <text class="label required">证件号码</text>
+          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_num')"></image>
+        </view>
+        <input type="text" v-model="formData.uscc_num" placeholder="请输入营业执照的证件号码" 
+               placeholder-class="placeholder" class="input" 
+               @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+          <text class="label required">企业名称</text>
+          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_name')"></image>
+        </view>
+        <input type="text" v-model="formData.uscc_name" placeholder="请输入营业执照的企业名称" 
+               placeholder-class="placeholder" class="input" 
+               @input="saveFormDataToLocalDebounce" />
+      </view>
+    </view>
+
+    <!-- 法人信息部分 -->
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text>法人信息</text>
+      </view>
+
+    <!-- 身份证照片部分 -->
+    <view class="section">
+      <view class="box-cont">
+        <view class="form-item">
+          <text class="label required">身份证照片</text>
+          <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
+          
+          <view class="idcard-upload-vertical-container">
+            <!-- 身份证正面 -->
+            <view class="idcard-upload-vertical-item">
+              <view class="upload-box" @click="chooseImage('legal_idcard_positive')">
+                <view class="upload-camera idcard-front">
+                  <image v-if="formData.legal_idcard_positive" :src="formData.legal_idcard_positive" mode="aspectFill" class="preview-image"></image>
+                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/043b0c97-79c1-4f95-810f-c33e3d5269a3" mode="aspectFit" class="camera-icon"></image>
+                  <!-- 识别状态遮罩 -->
+                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_positive'" class="recognize-overlay">
+                    <view class="recognize-loading"></view>
+                    <text class="recognize-text">识别中...</text>
+                  </view> -->
+                </view>
+              </view>
+              <text class="upload-label required">请上传身份证正面（人像面）</text>
+            </view>
+            
+            <!-- 身份证反面 -->
+            <view class="idcard-upload-vertical-item">
+              <view class="upload-box" @click="chooseImage('legal_idcard_negative')">
+                <view class="upload-camera idcard-back">
+                  <image v-if="formData.legal_idcard_negative" :src="formData.legal_idcard_negative" mode="aspectFill" class="preview-image"></image>
+                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/203cfdf4-2501-44e6-8565-ad251c6bf0fa" mode="aspectFit" class="camera-icon"></image>
+                  <!-- 识别状态遮罩 -->
+                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_negative'" class="recognize-overlay">
+                    <view class="recognize-loading"></view>
+                    <text class="recognize-text">识别中...</text>
+                  </view> -->
+                </view>
+              </view>
+              <text class="upload-label required">请上传身份证反面（国徽面）</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+      <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+          <text class="label required">法人代表</text>
+          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('legal_name')"></image>
+        </view>
+        <input type="text" v-model="formData.legal_name" placeholder="请输入营业执照的法人代表" 
+               placeholder-class="placeholder" class="input" 
+               @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">法人联系方式</text>
+        <input type="number" v-model="formData.legal_phone" placeholder="请输入法人的联系方式" 
+              placeholder-class="placeholder" class="input" 
+              @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">法人身份证号</text>
+        <input type="idcard" v-model="formData.legal_idcard_num" placeholder="请输入法人身份证号" 
+               placeholder-class="placeholder" class="input" 
+               @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <!-- 身份证有效期 -->
+      <view class="form-item box-cont">
+        <text class="label required">身份证有效期至</text>
+        <view class="radio-group">
+          <view class="radio-item" @click="setIdcardValidType('permanent')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
+              <image v-if="formData.legal_idcard_expiry_type === 'permanent'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+            </view>
+            <text class="radio-label">长久有效</text>
+          </view>
+          <view class="radio-item" @click="setIdcardValidType('date')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
+              <image v-if="formData.legal_idcard_expiry_type === 'date'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+            </view>
+            <text class="radio-label">指定日期有效</text>
+          </view>
+        </view>
+      </view>
+
+      <!-- 身份证有效期日期选择 -->
+      <view class="box-cont">
+        <view class="date-range-container">
+          <view class="date-item">
+            <text class="date-label">开始日期</text>
+            <view class="date-picker-box" @click="openDatePicker('idcard_start_date')">
+              <text :class="formData.idcard_start_date ? 'date-value' : 'placeholder'">
+                {{formatDateForDisplay(formData.idcard_start_date) || '请选择日期'}}
+              </text>
+              <view class="date-divider"></view>
+              <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649" class="date-arrow" mode="aspectFit"></image>
+            </view>
+          </view>
+          <view class="date-item">
+            <text class="date-label">结束日期</text>
+            <view class="date-picker-box" :class="{ disabled: formData.legal_idcard_expiry_type === 'permanent' }" 
+                  @click="formData.legal_idcard_expiry_type !== 'permanent' && openDatePicker('idcard_end_date')">
+              <text :class="formData.idcard_end_date ? 'date-value' : 'placeholder'">
+                {{formatDateForDisplay(formData.idcard_end_date) || '请选择日期'}}
+              </text>
+              <view class="date-divider"></view>
+              <image :src="formData.legal_idcard_expiry_type === 'permanent' ? 
+                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9a757f-a36c-46bb-a59f-2caddac5365b' : 
+                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649'" 
+                class="date-arrow" mode="aspectFit"></image>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+
+    <!-- 日期选择器 -->
+    <view class="popup" :class="{ show: showDatePickerFlag }">
+      <view class="popup-mask" @click="hideDatePicker"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="cancel-text" @click="hideDatePicker">取消</text>
+          <text class="title">选择日期</text>
+          <text class="confirm-text" @click="confirmDate">确定</text>
+        </view>
+        <view class="region-body">
+          <picker-view :value="dateValue" @change="bindDateChange" class="picker-scroll" 
+                      :indicator-style="indicatorStyle" mode="date" fields="day">
+            <picker-view-column>
+              <view class="picker-item" v-for="(year, index) in years" :key="index">{{year}}年</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(month, index) in months" :key="index">{{month}}月</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(day, index) in days" :key="index">{{day}}日</view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 提示信息弹窗 -->
+    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+      <view class="tip-popup-mask" @click="hideTipPopup"></view>
+      <view class="tip-popup-content">
+        <!-- 弹窗背景图片 -->
+        <image class="tip-popup-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770" mode="aspectFit"></image>
+        
+        <!-- 弹窗内容 -->
+        <view class="tip-popup-body">
+          <view class="tip-title">{{ tipTitle }}</view>
+          <view class="tip-image-container">
+            <image class="tip-image" :src="tipImage" mode="widthFix"></image>
+          </view>
+          <view class="tip-buttons">
+            <view class="tip-btn cancel" @click="hideTipPopup">
+              <text class="btn-text">取消</text>
+            </view>
+            <view class="tip-btn confirm" @click="hideTipPopup">
+              <text class="btn-text">我已了解</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+
+  </view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import { debounce } from '@/utils/debounce.js';
+import uploadImage from '../../utils/uploadImage';
+import permissionUtils from '../../utils/per';
+import locationService from '../../utils/locationService';
+import { recognizeIdCard, recognizeBusinessLicense, formatDateFromNumber, parseValidPeriod } from '../../utils/orc';
+
+export default {
+  data() {
+    const currentDate = new Date();
+    const currentYear = new Date().getFullYear();
+    const years = Array.from({length: 130}, (_, i) => 1970 + i);
+    const months = Array.from({length: 12}, (_, i) => i + 1);
+    const days = Array.from({length: 31}, (_, i) => i + 1);
+    
+    // 从本地存储加载数据
+    const loadedData = this.loadFormDataFromLocal();
+    
+    return {
+      userId: null,
+      // 使用本地存储初始化数据
+      formData: loadedData || {
+        uscc_type: '',
+        uscc_photo: '',
+        uscc_num: '',
+        uscc_name: '',
+        license_valid_type: '',
+        license_start_date: '',
+        license_end_date: '',
+        legal_name: '',
+        legal_phone: '',
+        legal_idcard_num: '',
+        legal_idcard_expiry_type: '',
+        idcard_start_date: '',
+        idcard_end_date: '',
+        legal_idcard_positive: '',
+        legal_idcard_negative: ''
+      },
+      showDatePickerFlag: false,
+      showTipPopupFlag: false, // 提示弹窗显示状态
+      currentDateField: '',
+      years,
+      months,
+      days,
+      dateValue: [currentYear - 1970, currentDate.getMonth(), currentDate.getDate() - 1], // 默认选中今天
+      indicatorStyle: 'height: 68rpx;',
+      tipTitle: '', // 提示弹窗标题
+      tipImage: '', // 提示弹窗图片
+      isSubmit: false, // 防止重复提交
+
+      // 识别状态
+      isRecognizing: false,
+      recognizeType: '', // 'legal_idcard_positive', 'legal_idcard_negative', 'uscc_photo'
+      identity: 2
+    }
+  },
+  computed: {
+    
+  },
+  
+  // 添加 watch 监听表单数据变化
+  watch: {
+    'formData.uscc_num'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.uscc_name'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.legal_name'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.legal_phone'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.legal_idcard_num'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.uscc_photo'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.legal_idcard_positive'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.legal_idcard_negative'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    }
+  },
+  
+  // 页面生命周期
+  onLoad(options) {
+	  console.log(1111112222)
+
+    // 获取用户信息，用于图片上传
+    this.getUserInfo();
+    
+    // 检查全局状态中是否有数据（从前一页面带过来的）
+    this.checkGlobalData();
+  },
+  
+  onShow() {
+    // 页面显示时重新从本地存储加载数据
+    const localData = this.loadFormDataFromLocal();
+    if (localData) {
+      // 合并数据，避免覆盖已有数据
+      this.formData = { ...this.formData, ...localData };
+    }
+    
+    // 检查全局状态
+    this.checkGlobalData();
+  },
+  
+  onHide() {
+    // 页面隐藏时保存数据
+    this.saveFormDataToLocal();
+  },
+  
+  onUnload() {
+    // 页面卸载时保存数据
+    this.saveFormDataToLocal();
+  },
+  
+  methods: {
+    // 检查全局数据
+    checkGlobalData() {
+      if (getApp().globalData.qualificationData) {
+        // 如果全局有数据，合并到当前表单
+        this.formData = { ...this.formData, ...getApp().globalData.qualificationData };
+        // 保存到本地存储
+        this.saveFormDataToLocal();
+        // 清空全局数据，避免重复使用
+        // delete getApp().globalData.qualificationData;
+        getApp().globalData.qualificationData = null;
+      }
+    },
+    
+    // 从本地存储加载数据
+    loadFormDataFromLocal() {
+      try {
+        const stored = uni.getStorageSync('qualification_form_data');
+        if (stored) {
+          console.log('从本地存储加载数据:', stored);
+          return stored;
+        }
+      } catch (e) {
+        console.log('读取本地存储失败:', e);
+      }
+      return null;
+    },
+    
+    // 保存数据到本地存储（带防抖）
+    saveFormDataToLocalDebounce: debounce(function() {
+      this.saveFormDataToLocal();
+    }, 500),
+    
+    // 保存数据到本地存储
+    saveFormDataToLocal() {
+      try {
+        uni.setStorageSync('qualification_form_data', this.formData);
+        console.log('数据已保存到本地存储');
+      } catch (e) {
+        console.log('保存数据失败:', e);
+      }
+    },
+    
+    // 清空本地存储（在表单提交成功后调用）
+    clearFormDataLocal() {
+      try {
+        uni.removeStorageSync('qualification_form_data');
+        console.log('已清空本地存储数据');
+      } catch (e) {
+        console.log('清空数据失败:', e);
+      }
+    },
+
+    // 获取用户信息
+    getUserInfo() {
+      return new Promise((resolve, reject) => {
+        request.post('/sj/user/getuser').then(result => {
+          if (result.state === 1) {
+            this.userId = result.data.id;
+            console.log('用户ID获取成功:', this.userId);
+            resolve(this.userId);
+          } else {
+            console.error('获取用户信息失败:', result.msg);
+            reject(result.msg);
+          }
+        }).catch(error => {
+          console.error('获取用户信息接口错误:', error);
+          reject(error);
+        });
+      });
+    },
+
+    getFormData() {
+        return {
+          ...this.formData,
+          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
+          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
+          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
+          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
+        };
+    },
+
+    // 添加日期格式化方法
+    formatDateForDisplay(dateStr) {
+      if (!dateStr) return '';
+      if (dateStr === '长久有效') return '长久有效';
+      
+      // 如果是 YYYY-MM-DD 格式，转换为 年月日 格式显示
+      if (dateStr.includes('-')) {
+        const [year, month, day] = dateStr.split('-');
+        return `${year}年${parseInt(month)}月${parseInt(day)}日`;
+      }
+      
+      return dateStr; // 如果已经是年月日格式，直接返回
+    },
+
+    // 将日期转换为后端需要的格式
+    formatDateForBackend(dateStr) {
+      if (!dateStr) return '';
+      if (dateStr === '长久有效') return 'permanent'; // 根据后端需求返回
+      
+      // 将 年月日 格式转换为 YYYY-MM-DD
+      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
+      if (match) {
+        const year = match[1];
+        const month = match[2].padStart(2, '0');
+        const day = match[3].padStart(2, '0');
+        return `${year}-${month}-${day}`;
+      }
+      
+      return dateStr; // 如果已经是 YYYY-MM-DD 格式，直接返回
+    },
+
+    // 显示提示弹窗
+    showTipPopup(field) {
+      // 根据字段设置对应的标题和图片
+      const tipConfig = {
+        'uscc_num': {
+          title: '如何找到证件号码',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/72856aac-f0ac-49a1-a7f1-be3220ecb314'
+        },
+        'uscc_name': {
+          title: '如何找到企业名称',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
+        },
+        'legal_name': {
+          title: '如何找到法人代表',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/24859872-da37-4beb-8e33-7743813bb5a1'
+        }
+      };
+      
+      if (tipConfig[field]) {
+        this.tipTitle = tipConfig[field].title;
+        this.tipImage = tipConfig[field].image;
+        // 确保图片已加载再显示弹窗
+        this.ensureImageLoaded(this.tipImage).then(() => {
+          this.showTipPopupFlag = true;
+        }).catch(() => {
+          // 即使加载失败也显示弹窗，避免用户无法操作
+          this.showTipPopupFlag = true;
+        });
+      }
+    },
+
+    // 确保图片加载完成
+    ensureImageLoaded(src) {
+      return new Promise((resolve, reject) => {
+        const img = new Image();
+        img.onload = () => resolve();
+        img.onerror = () => reject();
+        img.src = src;
+        
+        // 设置超时，避免长时间等待
+        setTimeout(() => resolve(), 500);
+      });
+    },
+    
+    // 隐藏提示弹窗
+    hideTipPopup() {
+      this.showTipPopupFlag = false;
+    },
+
+
+    // 设置营业执照有效期类型
+    setLicenseValidType(type) {
+      this.formData.license_valid_type = type;
+      if (type === 'permanent') {
+        // 选择长久有效时，设置结束日期为"长久有效"
+        this.formData.license_end_date = '长久有效';
+      } else {
+        // 选择指定日期时，如果之前是长久有效，清空结束日期
+        if (this.formData.license_end_date === '长久有效') {
+          this.formData.license_end_date = '';
+        }
+      }
+      // 保存到本地存储
+      this.saveFormDataToLocal();
+    },
+    
+    // 设置身份证有效期类型
+    setIdcardValidType(type) {
+      this.formData.legal_idcard_expiry_type = type;
+      if (type === 'permanent') {
+        // 选择长久有效时，设置结束日期为"长久有效"
+        this.formData.idcard_end_date = '长久有效';
+      } else {
+        // 选择指定日期时，如果之前是长久有效，清空结束日期
+        if (this.formData.idcard_end_date === '长久有效') {
+          this.formData.idcard_end_date = '';
+        }
+        // 如果已有开始日期，自动计算20年后的结束日期
+        if (this.formData.idcard_start_date && !this.formData.idcard_end_date) {
+          const match = this.formData.idcard_start_date.match(/(\d+)年(\d+)月(\d+)日/);
+          if (match) {
+            const year = parseInt(match[1]) + 20;
+            const month = match[2];
+            const day = match[3];
+            this.formData.idcard_end_date = `${year}年${month}月${day}日`;
+          }
+        }
+      }
+      // 保存到本地存储
+      this.saveFormDataToLocal();
+    },
+    
+    
+    // 选择商户类型
+    selectMerchantType(item) {
+      this.formData.uscc_type = item.value;
+      // 保存到本地存储
+      this.saveFormDataToLocal();
+    },
+    
+    // 确认商户类型选择
+    confirmMerchantType() {
+      this.hideMerchantTypePicker();
+    },
+    
+    // 打开日期选择器
+    openDatePicker(field) {
+      this.currentDateField = field;
+      
+      // 设置日期选择器的初始值
+      const currentDate = new Date();
+      let initialDate = currentDate;
+      
+      // 如果该字段已经有值，解析该值作为初始值
+      if (this.formData[field]) {
+        const dateStr = this.formData[field];
+        const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
+        if (match) {
+          initialDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
+        }
+      }
+      
+      // 计算picker-view的value
+      const yearIndex = this.years.indexOf(initialDate.getFullYear());
+      const monthIndex = initialDate.getMonth();
+      const dayIndex = initialDate.getDate() - 1;
+      
+      this.dateValue = [
+        yearIndex >= 0 ? yearIndex : 0,
+        monthIndex,
+        dayIndex
+      ];
+      
+      this.showDatePickerFlag = true;
+    },
+    
+    // 隐藏日期选择器
+    hideDatePicker() {
+      this.showDatePickerFlag = false;
+    },
+    
+    // 日期选择变化
+    bindDateChange(e) {
+      this.dateValue = e.detail.value;
+    },
+
+    // 确认日期选择
+    confirmDate() {
+      const [yearIndex, monthIndex, dayIndex] = this.dateValue;
+      const year = this.years[yearIndex];
+      const month = this.months[monthIndex];
+      const day = this.days[dayIndex];
+      const dateStr = `${year}年${month}月${day}日`;
+      const selectedDate = new Date(year, month - 1, day);
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+      
+      // 验证日期逻辑
+      if (this.currentDateField.endsWith('_start_date')) {
+        // 开始日期验证：不能选择今天之后的日期
+        if (selectedDate > today) {
+          uni.showToast({
+            title: '开始日期不能晚于今天',
+            icon: 'none'
+          });
+          return;
+        }
+        
+        // 如果对应的结束日期已经设置，检查开始日期是否晚于结束日期
+        const relatedEndField = this.currentDateField.replace('_start_date', '_end_date');
+        if (this.formData[relatedEndField] && this.formData[relatedEndField] !== '长久有效') {
+          const endDateStr = this.formData[relatedEndField];
+          const match = endDateStr.match(/(\d+)年(\d+)月(\d+)日/);
+          if (match) {
+            const endDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
+            if (selectedDate > endDate) {
+              uni.showToast({
+                title: '开始日期不能晚于结束日期',
+                icon: 'none'
+              });
+              return;
+            }
+          }
+        }
+        // 如果是身份证开始日期，自动计算结束日期
+        if (this.currentDateField === 'idcard_start_date') {
+          // 如果是"长久有效"类型，不自动设置结束日期
+          if (this.formData.legal_idcard_expiry_type === 'date') {
+            const endYear = year + 20;
+            const endDateStr = `${endYear}年${month}月${day}日`;
+            this.formData.idcard_end_date = endDateStr;
+          } else if (this.formData.legal_idcard_expiry_type === 'permanent') {
+            // 如果是"长久有效"类型，保持结束日期为"长久有效"
+            this.formData.idcard_end_date = '长久有效';
+          }
+        }
+
+      } else if (this.currentDateField.endsWith('_end_date')) {
+        const relatedStartField = this.currentDateField.replace('_end_date', '_start_date');
+        if (this.formData[relatedStartField]) {
+          const startDateStr = this.formData[relatedStartField];
+          const match = startDateStr.match(/(\d+)年(\d+)月(\d+)日/);
+          if (match) {
+            const startDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
+            if (selectedDate <= startDate) {
+              uni.showToast({
+                title: '结束日期必须晚于开始日期',
+                icon: 'none'
+              });
+              return;
+            }
+          }
+        } else {
+          // 如果没有设置开始日期，结束日期不能早于今天
+          if (selectedDate < today) {
+            uni.showToast({
+              title: '结束日期不能早于今天',
+              icon: 'none'
+            });
+            return;
+          }
+        }
+      }
+      
+      this.formData[this.currentDateField] = dateStr;
+      // 保存到本地存储
+      this.saveFormDataToLocal();
+      this.hideDatePicker();
+    },
+    
+    // 选择图片
+    async chooseImage(type) {
+      try {
+        const systemInfo = uni.getSystemInfoSync()
+        
+        if (systemInfo.platform === 'ios') {
+          this.openCamera(type);
+        } else {
+          let xcpermission = '';
+          let xjpermission = '';
+          if (systemInfo.platform === 'ios') {
+            xcpermission = 'photo_library',
+            xjpermission = 'camera'
+          } else {
+            xcpermission = `android.permission.READ_EXTERNAL_STORAGE,android.permission.WRITE_EXTERNAL_STORAGE`
+            xjpermission = 'android.permission.CAMERA'
+          }
+          const xjfirstRequest = !plus.storage.getItem(`perm_${xjpermission}`)
+          const xcfirstRequest = !plus.storage.getItem(`perm_${xcpermission}`)
+          if (xcfirstRequest || xjfirstRequest) {
+            this.isShowPer = true;
+          }
+
+          // 检查权限
+          const xc = await permissionUtils.checkPermission('photo_library', '需要相册权限用于上传照片');
+          const xj = await permissionUtils.checkPermission('camera', '需要相机权限用于拍摄照片');
+          if (xc.granted && xj.granted) {
+            this.openCamera(type);
+            return;
+          }
+
+          // 请求权限
+          const result1 = await permissionUtils.requestPermission('photo_library', '我们需要访问您的相册以上传图片/视频');
+          const result2 = await permissionUtils.requestPermission('camera', '我们需要访问您的相机以上传图片/视频');
+          if (result1 && result2) {
+            this.openCamera(type);
+          } else {
+            locationService.openAppSettings();
+          }
+        }
+      } catch (err) {
+        console.log('选择图片出错:', err);
+        // 出错时也直接调用图片选择
+        this.openCamera(type);
+      }
+    },
+
+    async openCamera(type) {
+      try {
+        // 确保用户信息正确
+        if (!this.userId) {
+          console.log('重新获取用户信息...');
+          await this.getUserInfo();
+        }
+        
+        if (!this.identity) {
+          this.identity = getApp().globalData.artisanType;
+        }
+
+        // 直接使用 uni.chooseImage
+        const chooseResult = await new Promise((resolve, reject) => {
+          uni.chooseImage({
+            count: 1,
+            sizeType: ['compressed'],
+            sourceType: ['album', 'camera'],
+            success: resolve,
+            fail: reject
+          });
+        });
+
+        if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) {
+          uni.hideLoading();
+          return;
+        }
+
+        const tempFilePath = chooseResult.tempFilePaths[0];
+        
+        // 直接构造文件对象
+        const file = {
+          path: tempFilePath,
+          size: 0
+        };
+
+        // 显示上传loading
+        uni.showLoading({
+          title: '上传中...',
+          mask: true
+        });
+
+        // 手动调用上传
+        const result = await this.directUpload(file, this.userId, this.identity + 1);
+        
+        // 上传成功，更新loading显示为识别中
+        uni.hideLoading();
+        
+        if (result) {
+          this.formData[type] = result;
+          
+          // 上传成功后自动识别
+          if (type === 'uscc_photo') {
+            await this.recognizeBusinessLicense(result);
+          } else if (type === 'legal_idcard_positive') {
+            await this.recognizeIdCardFront(result);
+          } else if (type === 'legal_idcard_negative') {
+            await this.recognizeIdCardBack(result);
+          }
+          
+          // 保存到本地存储
+          this.saveFormDataToLocal();
+        }
+      } catch (err) {
+        uni.hideLoading();
+        console.log('上传图片错误:', err);
+        
+        if (!err.errMsg || !err.errMsg.includes('cancel')) {
+          uni.showToast({
+            title: '上传失败，请重试',
+            icon: 'none'
+          });
+        }
+      }
+    },
+
+    // 直接上传方法
+    async directUpload(file, userId, type) {
+      try {
+        let date = new Date().getTime();
+        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
+        
+        // 生成安全的文件名
+        let fileExtension = 'jpg';
+        if (file.path.includes('.')) {
+          let parts = file.path.split('.');
+          let ext = parts[parts.length - 1].toLowerCase();
+          if (ext && ext.length <= 4) {
+            fileExtension = ext;
+          }
+        }
+        
+        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
+        console.log('安全文件名:', name);
+
+        // 获取OSS配置
+        const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
+        
+        // 直接上传到OSS
+        return await new Promise((resolve, reject) => {
+          uni.uploadFile({
+            url: ossConfig.host,
+            filePath: file.path,
+            name: 'file',
+            formData: {
+              key: ossConfig.dir + name,
+              policy: ossConfig.policy,
+              OSSAccessKeyId: ossConfig.ossAccessKeyId,
+              success_action_status: '200',
+              signature: ossConfig.signature
+            },
+            success: (res) => {
+              if (res.statusCode === 200) {
+                const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
+                resolve(fileUrl);
+              } else {
+                reject(new Error('上传失败'));
+              }
+            },
+            fail: reject
+          });
+        });
+        
+      } catch (error) {
+        console.error('直接上传失败:', error);
+        throw error;
+      }
+    },
+
+    /**
+     * 识别营业执照
+     */
+    async recognizeBusinessLicense(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'uscc_photo';
+        // uni.showLoading({
+        //   title: '正在识别营业执照...',
+        //   mask: true
+        // });
+        
+        // 调用OCR接口
+        const result = await recognizeBusinessLicense(imageUrl);
+        console.log('营业执照识别结果:', result);
+
+        const hasRecognizedData = this.checkBusinessLicenseRecognition(result);
+        if (!hasRecognizedData) {
+          uni.showToast({
+            title: '未识别到营业执照信息，请手动填写或重新拍摄',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isRecognizing = false;
+          return;
+        }
+        
+        // 填充营业执照信息
+        let recognizedFields = 0;
+
+        // 企业名称：如果识别结果为"无"，就设置为空字符串
+        if (result.uscc_name && result.uscc_name.trim() && result.uscc_name !== '无') {
+          this.formData.uscc_name = result.uscc_name;
+          recognizedFields++;
+        } else {
+          // 如果是"无"或空值，设置为空字符串
+          this.formData.uscc_name = '';
+        }
+        
+        if (result.uscc_num && result.uscc_num.trim()) {
+          this.formData.uscc_num = result.uscc_num;
+          recognizedFields++;
+        }
+        
+        // 如果需要营业执照法人与法人代表关联则取消注释
+        // if (result.legal_name && result.legal_name.trim()) {
+        //   this.formData.legal_name = result.legal_name;
+        //   recognizedFields++;
+        // }
+
+        if (result.uscc_type && result.uscc_type.trim()) {
+          this.formData.uscc_type = result.uscc_type;
+          recognizedFields++;
+        }
+
+        // 根据识别的字段数量给出不同的提示
+        if (recognizedFields > 0) {
+        } else {
+          uni.showToast({
+            title: '识别完成，但未获取到有效信息',
+            icon: 'none',
+            duration: 3000
+          });
+        }
+        
+      } catch (error) {
+        uni.showToast({
+          title: error.message || '识别失败，请手动填写',
+          icon: 'none',
+          // duration: 3000
+        });
+        console.error('营业执照识别失败:', error);
+        
+      } finally {
+        this.isRecognizing = false;
+        uni.hideLoading();
+      }
+    },
+
+    // 检查营业执照识别结果是否有效
+    checkBusinessLicenseRecognition(result) {
+      const requiredFields = ['uscc_num', 'uscc_name', 'legal_name', 'uscc_type'];
+      
+      for (const field of requiredFields) {
+        if (result[field] && result[field].trim()) {
+          return true;
+        }
+      }
+      
+      return false;
+    },
+    
+    /**
+     * 识别身份证正面
+     */
+    async recognizeIdCardFront(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'legal_idcard_positive';
+        
+        uni.showLoading({
+          title: '正在识别身份证正面...',
+          mask: true
+        });
+        
+        // 调用OCR接口
+        const result = await recognizeIdCard(imageUrl, 1);
+
+        // 验证是否真的识别到了数据
+        const hasRecognizedData = this.checkIdCardFrontRecognition(result);
+        
+        if (!hasRecognizedData) {
+          uni.hideLoading();
+          uni.showToast({
+            title: '未识别到身份证信息，请手动填写或重新拍摄',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isRecognizing = false;
+          return;
+        }
+        
+        // 填充身份证正面信息
+        if (result.name) {
+          this.formData.legal_name = result.name;
+        }
+        
+        if (result.id_number) {
+          this.formData.legal_idcard_num = result.id_number;
+        }
+        
+        uni.showToast({
+          title: '身份证正面识别成功',
+          icon: 'none'
+        });
+        
+      } catch (error) {
+        console.error('身份证正面识别失败:', error);
+        uni.showToast({
+          title: error.message || '识别失败，请手动填写',
+          icon: 'none',
+          duration: 3000
+        });
+      } finally {
+        this.isRecognizing = false;
+        uni.hideLoading();
+      }
+    },
+
+    // 检查身份证正面识别结果是否有效
+    checkIdCardFrontRecognition(result) {
+      return (result.name && result.name.trim()) || (result.id_number && result.id_number.trim());
+    },
+    
+    /**
+     * 识别身份证反面
+     */
+    async recognizeIdCardBack(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'legal_idcard_negative';
+        
+        uni.showLoading({
+          title: '正在识别身份证反面...',
+          mask: true
+        });
+        
+        // 调用OCR接口
+        const result = await recognizeIdCard(imageUrl, 2);
+
+        // 验证是否真的识别到了数据
+        const hasRecognizedData = this.checkIdCardBackRecognition(result);
+        
+        if (!hasRecognizedData) {
+          uni.hideLoading();
+          uni.showToast({
+            title: '未识别到身份证有效期信息，请手动填写或重新拍摄',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isRecognizing = false;
+          return;
+        }
+        
+        // 解析有效期
+        const validPeriod = parseValidPeriod(result.start_date, result.end_date);
+        
+        // 填充有效期数据
+        if (validPeriod.startDate) {
+          this.formData.idcard_start_date = validPeriod.startDate;
+        }
+        
+        if (validPeriod.isPermanent) {
+          this.formData.legal_idcard_expiry_type = 'permanent';
+          this.formData.idcard_end_date = '长久有效';
+        } else if (validPeriod.endDate) {
+          this.formData.legal_idcard_expiry_type = 'date';
+          this.formData.idcard_end_date = validPeriod.endDate;
+        }
+        
+        // 如果是长期有效，自动选择对应的选项
+        if (validPeriod.isPermanent) {
+          this.setIdcardValidType('permanent');
+        } else {
+          this.setIdcardValidType('date');
+        }
+        
+        uni.showToast({
+          title: '身份证反面识别成功',
+          icon: 'none'
+        });
+        
+      } catch (error) {
+        console.error('身份证反面识别失败:', error);
+        uni.showToast({
+          title: error.message || '识别失败，请手动填写',
+          icon: 'none',
+          duration: 3000
+        });
+      } finally {
+        this.isRecognizing = false;
+        uni.hideLoading();
+      }
+    },
+
+    // 检查身份证反面识别结果是否有效
+    checkIdCardBackRecognition(result) {
+      return (result.start_date && result.start_date.trim()) || 
+            (result.end_date && result.end_date.trim());
+    },
+
+    // 验证表单数据
+    validateForm() {
+      // 按照表单从上到下的顺序定义验证规则
+      const validationRules = [
+        { field: 'uscc_photo', message: '请上传营业执照照片' },
+        { field: 'uscc_type', message: '请输入商户类型' },
+        { field: 'uscc_num', message: '请输入营业执照号码' },
+        { field: 'uscc_name', message: '请输入企业名称' },
+                { field: 'legal_idcard_positive', message: '请上传身份证正面照片' },
+        { field: 'legal_idcard_negative', message: '请上传身份证反面照片' },
+        { field: 'legal_name', message: '请输入法人代表' },
+        { field: 'legal_phone', message: '请输入法人联系方式' },
+        { field: 'legal_idcard_num', message: '请输入法人身份证号' },
+        { 
+          condition: () => !this.formData.legal_idcard_expiry_type, 
+          message: '请选择身份证有效期类型' 
+        },
+        { 
+          condition: () => !this.formData.idcard_start_date, 
+          message: '请选择身份证开始日期' 
+        },
+        {
+          condition: () => {
+            if (this.formData.legal_idcard_expiry_type === 'data' && !this.formData.idcard_end_date) {
+              return true;
+            }
+            // 如果选择长久有效，则不需要结束日期
+            return false;
+          },
+          message: '请选择身份证结束日期' 
+        },
+      ];
+
+      // 按顺序验证
+      for (let rule of validationRules) {
+        let isValid = true;
+        
+        if (rule.field) {
+          // 简单字段验证
+          if (!this.formData[rule.field]) {
+            isValid = false;
+          }
+        } else if (rule.condition) {
+          // 条件验证
+          if (rule.condition()) {
+            isValid = false;
+          }
+        }
+        
+        if (!isValid) {
+          uni.showToast({
+            title: rule.message,
+            icon: 'none'
+          });
+          return false;
+        }
+      }
+      
+      // 验证手机号格式
+      if (!/^1[3-9]\d{9}$/.test(this.formData.legal_phone)) {
+        uni.showToast({
+          title: '请输入正确的手机号码',
+          icon: 'none'
+        });
+        return false;
+      }
+      
+      // 验证身份证格式
+      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.formData.legal_idcard_num)) {
+        uni.showToast({
+          title: '请输入正确的身份证号码',
+          icon: 'none'
+        });
+        return false;
+      }
+      
+      return true;
+    },
+
+    // 将日期字符串转换为Date对象
+    parseDateString(dateStr) {
+      if (!dateStr) return null;
+      
+      // 处理年月日格式
+      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
+      if (match) {
+        return new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
+      }
+      
+      // 处理 YYYY-MM-DD 格式
+      if (dateStr.includes('-')) {
+        const dateParts = dateStr.split('-');
+        if (dateParts.length === 3) {
+          return new Date(parseInt(dateParts[0]), parseInt(dateParts[1]) - 1, parseInt(dateParts[2]));
+        }
+      }
+      
+      return null;
+    },
+
+    // 保存表单数据（在进入下一步时调用）
+    // 修改后的 saveFormData 方法
+    saveFormData() {
+      console.log('开始验证表单数据');
+      console.log('表单数据:', this.formData);
+      console.log('法人姓名:', this.formData.legal_name);
+      console.log('法人身份证号:', this.formData.legal_idcard_num);
+      
+      if (this.validateForm()) {
+        console.log('表单验证通过，开始验证法人信息');
+        
+        // 验证法人姓名与身份证号是否匹配
+        return this.checkIdCardAndName();
+      }
+      
+      console.log('表单验证失败');
+      return false;
+    },
+
+    // 修改后的 checkIdCardAndName 方法，添加详细调试
+    async checkIdCardAndName() {
+      if (this.isSubmit) {
+        console.log(' 重复提交被阻止 ');
+        return false;
+      }
+
+      this.isSubmit = true;
+
+      try {
+        console.log('开始调用身份验证接口');
+        console.log('请求参数:', {
+          name: this.formData.legal_name,
+          idcard: this.formData.legal_idcard_num
+        });
+        
+        uni.showLoading({
+          title: '验证身份信息...'
+        });
+
+        // 调用身份验证接口
+        const checkRes = await request.post('/user/check', {
+          name: this.formData.legal_name,
+          idcard: this.formData.legal_idcard_num
+        });
+
+        uni.hideLoading();
+        
+        console.log('身份验证接口返回结果 ');
+        console.log('完整响应:', checkRes);
+        console.log('响应Code:', checkRes.Code);
+        console.log('响应state:', checkRes.state);
+        console.log('响应msg:', checkRes.msg);
+        console.log('响应data:', checkRes.data);
+        console.log('响应ResultObject:', checkRes.ResultObject);
+        
+        if (checkRes.ResultObject) {
+          console.log('ResultObject.BizCode:', checkRes.ResultObject.BizCode);
+          console.log('ResultObject其他属性:', Object.keys(checkRes.ResultObject));
+        }
+
+        // 根据参考代码的验证逻辑，但需要先检查响应结构
+        if (checkRes.Code === '401') {
+          console.log(' Code 401 验证失败 ');
+          uni.showToast({
+            title: '您的身份证号与姓名不匹配',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isSubmit = false;
+          return false;
+        }
+        
+        // 检查多种可能的响应结构
+        if (checkRes.ResultObject) {
+          // 如果 ResultObject 有 BizCode 属性
+          if (checkRes.ResultObject.BizCode && checkRes.ResultObject.BizCode != '1') {
+            console.log(' BizCode 验证失败 ');
+            uni.showToast({
+              title: '您的身份证号与姓名不匹配',
+              icon: 'none',
+              duration: 3000
+            });
+            this.isSubmit = false;
+            return false;
+          }
+          
+          // 如果有其他表示失败的字段
+          if (checkRes.ResultObject.success === false || checkRes.ResultObject.result === false) {
+            console.log('success/result 验证失败');
+            uni.showToast({
+              title: '您的身份证号与姓名不匹配',
+              icon: 'none',
+              duration: 3000
+            });
+            this.isSubmit = false;
+            return false;
+          }
+        }
+        
+        // 检查直接返回的状态字段
+        if (checkRes.state && checkRes.state !== 1) {
+          console.log('state 验证失败');
+          uni.showToast({
+            title: checkRes.msg || '您的身份证号与姓名不匹配',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isSubmit = false;
+          return false;
+        }
+        
+        // 如果直接返回 success: false
+        if (checkRes.success === false) {
+          console.log('success 验证失败');
+          uni.showToast({
+            title: checkRes.message || '您的身份证号与姓名不匹配',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isSubmit = false;
+          return false;
+        }
+
+        console.log('身份验证通过 ');
+        
+        // 验证通过，创建提交给后端的数据副本，将日期转换为 YYYY-MM-DD 格式
+        const submitData = {
+          ...this.formData,
+          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
+          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
+          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
+          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
+        };
+
+        console.log('submitData:', submitData);
+
+        // 将表单数据保存到全局或本地存储，以便在下一步使用
+        getApp().globalData.qualificationData = submitData;
+        
+        this.isSubmit = false;
+        return true;
+
+      } catch (error) {
+        uni.hideLoading();
+        console.error('身份验证接口调用失败');
+        console.error('错误信息:', error);
+        console.error('错误详情:', error.response || error.message || error);
+        
+        // 根据错误类型显示不同的提示
+        let errorMessage = '身份验证失败';
+        
+        if (error.response) {
+          console.error('响应状态:', error.response.status);
+          console.error('响应数据:', error.response.data);
+          errorMessage = `服务器错误: ${error.response.status}`;
+        } else if (error.message) {
+          errorMessage = error.message;
+        } else if (error.errMsg) {
+          errorMessage = error.errMsg;
+        }
+        
+        uni.showToast({
+          title: errorMessage,
+          icon: 'none',
+          duration: 3000
+        });
+        
+        this.isSubmit = false;
+        return false;
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.qualification-page {
+  /* padding: 0rpx 0; */
+}
+
+.section {
+  margin-bottom: 30rpx;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30rpx;
+}
+
+.title-bar {
+  width: 6rpx;
+  height: 30rpx;
+  background-color: #E8101E;
+  margin-right: 7rpx;
+  border-radius: 5rpx;
+}
+
+.title-text {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #1D2129;
+  line-height: 48rpx;
+  text-align: left;
+  font-style: normal;
+}
+
+.section-title text {
+  font-size: 36rpx;
+  color: #1D2129;
+  font-weight: 500;
+}
+
+.box-cont {
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  margin-bottom: 24rpx;
+  margin-left: 8rpx;
+  margin-right: 8rpx;
+  box-shadow: none;
+}
+
+.form-item {
+  padding: 24rpx 22rpx;
+}
+
+.form-item-one {
+  display: flex;
+  align-items: center;
+  padding: 24rpx;
+}
+
+.label-wrapper {
+  display: inline-flex;
+  align-items: center;
+}
+
+.label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  line-height: 1;
+}
+
+.label-icon {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 8rpx;
+  align-items: center;
+}
+
+.required::before {
+  content: '*';
+  color: #FF0000;
+  margin-right: 4rpx;
+}
+
+.upload-tip {
+  font-size: 26rpx;
+  color: #999;
+  margin: 16rpx 0 24rpx 0;
+  font-weight: 400;
+  font-family: PingFangSC, PingFang SC;
+  text-align: left;
+  font-style: normal;
+}
+
+.upload-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.upload-box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.upload-camera {
+  width: 446rpx;
+  height: 298rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 48rpx;
+  overflow: hidden;
+  background-color: #F8F9FD;
+  position: relative;
+}
+
+.idcard-upload-vertical-container {
+  display: flex;
+  flex-direction: column;
+  padding: 24rpx;
+}
+
+.idcard-upload-vertical-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 40rpx;
+}
+
+.idcard-upload-vertical-item:last-child {
+  margin-bottom: 0;
+}
+
+.upload-label.required::before {
+  content: '*';
+  color: #FF0000;
+  margin-right: 4rpx;
+}
+
+.license-upload {
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+
+.idcard-front {
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+
+.idcard-back {
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+
+.camera-icon {
+  width: 446rpx;
+  height: 298rpx;
+  border-radius: 48rpx;
+}
+
+.preview-image {
+  border-radius: 48rpx;
+  width: 100%;
+  height: 100%;
+}
+
+/* 识别状态样式 */
+.recognize-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.6);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border-radius: 48rpx;
+}
+
+.recognize-loading {
+  width: 60rpx;
+  height: 60rpx;
+  border: 4rpx solid #fff;
+  border-top: 4rpx solid #E8101E;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  margin-bottom: 16rpx;
+}
+
+.recognize-text {
+  color: #fff;
+  font-size: 24rpx;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+.picker-content {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  flex: 1;
+}
+
+.picker-content text {
+  margin-right: 19rpx;
+}
+
+/* 日期选择框竖线分隔符 */
+.date-divider {
+  width: 2rpx;
+  height: 30rpx;
+  background-color: #E9E9E9;
+  margin: 0 15rpx 0 0;
+}
+
+/* 置灰状态下的竖线 */
+.date-picker-box.disabled .date-divider {
+  background-color: #F3F3F3;
+}
+
+/* 确保日期文字区域可以自动扩展 */
+.date-picker-box text {
+  flex: 1;
+}
+
+.arrow-right {
+  width: 14rpx;
+  height: 26rpx;
+}
+
+
+.placeholder {
+  color: #999999;
+  font-size: 28rpx;
+}
+
+.picker-value {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.input {
+  flex: 1;
+  font-size: 28rpx;
+  color: #333333;
+  text-align: right;
+  margin-left: 20rpx;
+}
+
+.radio-group {
+  display: flex;
+  margin-top: 24rpx;
+  width: 100%;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 130rpx;
+}
+
+.radio {
+  width: 30rpx;
+  height: 30rpx;
+  border: 2rpx solid #DDDDDD;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16rpx;
+}
+
+.radio.checked {
+  background-color: #E8101E;
+  border-color: #E8101E;
+}
+
+.radio-icon-image {
+  width: 32rpx;
+  height: 32rpx;
+}
+
+.radio-label {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+/* 日期范围容器样式 */
+.date-range-container {
+  padding: 24rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.date-item {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.date-item:first-child {
+  margin-right: 24rpx;
+}
+
+.date-label {
+  font-size: 28rpx;
+  color: #333333;
+  margin-bottom: 16rpx;
+  font-weight: 500;
+  margin-left: 8rpx;
+}
+
+.date-picker-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border: 2rpx solid #E9E9E9;
+  border-radius: 10rpx;
+  padding: 12rpx 19rpx;
+  background-color: transparent;
+}
+
+.date-picker-box.disabled {
+  border: 2rpx solid #F3F3F3;
+}
+
+.date-picker-box.disabled .date-value,
+.date-picker-box.disabled .placeholder {
+  color: #CCCCCC;
+}
+
+.date-value {
+  font-size: 28rpx;
+  color: #333;
+}
+
+.date-arrow {
+  width: 35rpx;
+  height: 33rpx;
+}
+
+.upload-label {
+  font-family: Helvetica;
+  font-size: 28rpx;
+  color: #999;
+  line-height: 40rpx;
+  text-align: left;
+  font-style: normal;
+  margin-top: 24rpx;
+}
+
+/* 弹出框样式 */
+.popup {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.popup-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+  position: relative;
+  background-color: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+  padding: 32rpx;
+  transform: translateY(100%);
+  transition: transform 0.3s ease;
+  max-height: 70vh;
+}
+
+.popup.show .popup-content {
+  transform: translateY(0);
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 32rpx;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999999;
+  padding: 16rpx;
+}
+
+.popup-body {
+  max-height: 400rpx;
+  overflow-y: auto;
+}
+
+.radio-list .radio-item {
+  margin-bottom: 32rpx;
+}
+
+.popup-footer {
+  margin-top: 32rpx;
+}
+
+.popup-btn {
+  height: 88rpx;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+}
+
+.popup-btn .btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #FFFFFF;
+}
+
+.cancel-text, .confirm-text {
+  font-size: 32rpx;
+  padding: 16rpx;
+}
+
+.cancel-text {
+  color: #666666;
+}
+
+.confirm-text {
+  color: #E8101E;
+  font-weight: 500;
+}
+
+.picker-scroll {
+  height: 400rpx;
+}
+
+.picker-item {
+  height: 68rpx;
+  line-height: 68rpx;
+  text-align: center;
+  font-size: 28rpx;
+}
+
+/* 提示弹窗样式 */
+.tip-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.tip-popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.tip-popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.tip-popup-content {
+  position: relative;
+  width: 620rpx;
+  height: 810rpx;
+}
+
+.tip-popup-bg {
+  width: 620rpx;
+  height: 810rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.tip-popup-body {
+  position: relative;
+  flex-direction: column;
+  padding: 80rpx 20rpx 40rpx 20rpx;
+  box-sizing: border-box;
+}
+
+.tip-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  text-align: center;
+  margin-top: 107rpx;
+  margin-bottom: 37rpx;
+}
+
+.tip-image-container {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 50rpx;
+}
+
+.tip-image {
+  width: 90%;
+  max-height: 400rpx;
+}
+
+.tip-buttons {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 28rpx;
+}
+
+.tip-btn {
+  width: 250rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.tip-btn.cancel {
+  border: #E8101E 2rpx solid;
+  background-color: transparent;
+  color: #e8101e;
+}
+
+.tip-btn.confirm {
+  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  color: #FFFFFF;
+}
+
+.tip-btn .btn-text {
+  color: inherit;
+}
+</style>
\ No newline at end of file
diff --git a/pages/ruzhu/successruzhu.vue b/pages/ruzhu/successruzhu.vue
new file mode 100644
index 0000000..f817e70
--- /dev/null
+++ b/pages/ruzhu/successruzhu.vue
@@ -0,0 +1,94 @@
+<template>
+	<view class="pages">
+		<custom-navbar title="入驻成功" :showBack="true"></custom-navbar>
+		<view class="title-icon">恭喜您！</view>
+		<!-- <view class="title-icon">{{data.residency_notice}}</view> -->
+		<view class="title-content">成功入驻成为美融融门店</view>
+		<!-- <view class="title-content">{{data.approve_notice}}</view> -->
+		<view class="erweimabox">
+			<view class="erweimab">
+				<!-- <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/26bd4004-c7aa-4997-9f31-8562060e7659.jpeg" mode="" style="width: 404rpx;height: 404rpx;"></image> -->
+				<image :src="data.photo" mode="widthFix" style="width: 404rpx;border-radius:25rpx ;margin: 37rpx 0 0 36rpx;"></image>
+			</view>
+			<view class="kefubtn">扫码联系专属客服</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+  // 核心：用 props 接收
+  props: {
+    data: {
+      type: Object, // 类型：对象
+      default: () => ({}) // 默认空对象
+    }
+  },
+  
+  onLoad() {
+    // 在 JS 里使用
+    console.log(this.data,'--------------------')
+  }
+}
+</script>
+
+<style>
+	.kefubtn{
+		height: 42rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 30rpx;
+		color: #5A5A5A;
+		line-height: 42rpx;
+		text-align: center;
+		font-style: normal;
+		margin-top: 23rpx;
+	}
+	.pages {
+		background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/467f6b5f-32dc-4ba3-847a-22be4569c45e.png');
+		background-size: 100%;
+		background-repeat: no-repeat;
+	}
+
+	.erweimab {
+		margin: 70rpx 0 0 103rpx;
+		width: 477rpx;
+		height: 477rpx;
+		background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e5461570-10e3-4e11-a6ca-8543f106639a.png');
+		background-size: 100%;
+		background-repeat: no-repeat;
+	}
+
+	.erweimabox {
+		margin: 71rpx 0 0 6rpx;
+		width: 690rpx;
+		height: 690rpx;
+		background: #FFFFFF;
+		border-radius: 62rpx;
+		border: 1rpx solid #F2F4F6;
+	}
+
+	.title-icon {
+		margin-left: 283rpx;
+		height: 67rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 48rpx;
+		color: #333333;
+		line-height: 67rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.title-content {
+		margin: 14rpx 0 0 195rpx;
+		height: 42rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 30rpx;
+		color: #666666;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+	}
+</style>
\ No newline at end of file

From 27d41076797316979e6d2233cd3511089fe189aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Thu, 28 May 2026 11:38:59 +0800
Subject: [PATCH 048/118] =?UTF-8?q?=E5=85=A5=E4=BD=8F=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/step-tab/step-tab.vue |  109 +-
 pages.json                       |    6 +
 pages/artisan/profile.vue        | 1587 ++++++-------
 pages/ruzhu/qualification_sj.vue | 2965 +++++++++---------------
 pages/ruzhu/ruzhu.vue            |  575 ++---
 pages/ruzhu/sj-info.vue          | 3618 ++++++++++--------------------
 6 files changed, 3219 insertions(+), 5641 deletions(-)

diff --git a/components/step-tab/step-tab.vue b/components/step-tab/step-tab.vue
index 1615bfe..228ad96 100644
--- a/components/step-tab/step-tab.vue
+++ b/components/step-tab/step-tab.vue
@@ -1,63 +1,54 @@
 <template>
   <view class="step-tab">
     <view class="step-container">
-      <!-- 步骤1: 入驻协议 -->
       <view class="step-item" :class="getStepClass(0)">
         <view class="step-icon">
-          <image 
-            v-if="currentStep === 0" 
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d" 
+          <image
+            v-if="mappedStep === 0"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d"
             class="step-img active-circle"
             mode="aspectFit"
           />
-          <view v-else-if="currentStep > 0" class="step-done">1</view>
+          <view v-else-if="mappedStep > 0" class="step-done">1</view>
           <view v-else class="step-number">1</view>
         </view>
-        <text class="step-text" :class="{ active: currentStep === 0 }">入驻协议</text>
+        <text class="step-text" :class="{ active: mappedStep === 0 }">入驻协议</text>
       </view>
-      
-      <!-- 第一个连接线 -->
+
       <view class="line-segment line-1">
         <view class="line-progress" :class="{ active: line1Active, deactivating: line1Deactivating }"></view>
       </view>
-      
-      <!-- 步骤2: 根据身份显示不同信息 -->
+
       <view class="step-item" :class="getStepClass(1)">
         <view class="step-icon">
-          <image 
-            v-if="currentStep === 1" 
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d" 
+          <image
+            v-if="mappedStep === 1"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d"
             class="step-img active-circle"
             mode="aspectFit"
           />
-          <view v-else-if="currentStep > 1" class="step-done">2</view>
+          <view v-else-if="mappedStep > 1" class="step-done">2</view>
           <view v-else class="step-number">2</view>
         </view>
-        <text class="step-text" :class="{ active: currentStep === 1 }">
-          {{ identity === 1 ? '个人信息' : '资质信息' }}
-        </text>
+        <text class="step-text" :class="{ active: mappedStep === 1 }">基本信息</text>
       </view>
-      
-      <!-- 第二个连接线 -->
+
       <view class="line-segment line-2">
         <view class="line-progress" :class="{ active: line2Active, deactivating: line2Deactivating }"></view>
       </view>
-      
-      <!-- 步骤3: 根据身份显示不同信息 -->
+
       <view class="step-item" :class="getStepClass(2)">
         <view class="step-icon">
-          <image 
-            v-if="currentStep === 2" 
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d" 
+          <image
+            v-if="mappedStep === 2"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d"
             class="step-img active-circle"
             mode="aspectFit"
           />
-          <view v-else-if="currentStep > 2" class="step-done">3</view>
+          <view v-else-if="mappedStep > 2" class="step-done">3</view>
           <view v-else class="step-number">3</view>
         </view>
-        <text class="step-text" :class="{ active: currentStep === 2 }">
-          {{ identity === 1 ? '资质信息' : '门店信息' }}
-        </text>
+        <text class="step-text" :class="{ active: mappedStep === 2 }">资质认证</text>
       </view>
     </view>
   </view>
@@ -67,32 +58,23 @@
 export default {
   name: "StepTab",
   props: {
-    // 当前步骤索引 (0, 1, 2)
-    currentStep: {
+    mappedStep: {
       type: Number,
       default: 0
-    },
-    // 身份类型：1-手艺人，2-商家
-    identity: {
-      type: Number,
-      default: 2
     }
   },
   data() {
     return {
-      prevStep: 0, // 记录上一步骤
-      line1Active: false, // 第一条线激活状态
-      line2Active: false, // 第二条线激活状态
-      line1Deactivating: false, // 第一条线正在取消激活
-      line2Deactivating: false // 第二条线正在取消激活
+      prevStep: 0,
+      line1Active: false,
+      line2Active: false,
+      line1Deactivating: false,
+      line2Deactivating: false
     };
   },
   watch: {
-    // 监听currentStep变化，处理线条动画
-    currentStep(newVal, oldVal) {
+    mappedStep(newVal, oldVal) {
       this.prevStep = oldVal;
-      
-      // 处理前进动画
       if (newVal > oldVal) {
         if (newVal >= 1) {
           this.line1Active = true;
@@ -102,38 +84,34 @@ export default {
           this.line2Active = true;
           this.line2Deactivating = false;
         }
-      } 
-      // 处理返回动画
-      else if (newVal < oldVal) {
+      } else if (newVal < oldVal) {
         if (newVal < 2) {
           this.line2Deactivating = true;
           setTimeout(() => {
             this.line2Active = false;
             this.line2Deactivating = false;
-          }, 300); // 与动画持续时间匹配
+          }, 300);
         }
         if (newVal < 1) {
           this.line1Deactivating = true;
           setTimeout(() => {
             this.line1Active = false;
             this.line1Deactivating = false;
-          }, 300); // 与动画持续时间匹配
+          }, 300);
         }
       }
     }
   },
   mounted() {
-    // 初始化线条状态
-    this.line1Active = this.currentStep >= 1;
-    this.line2Active = this.currentStep >= 2;
+    this.line1Active = this.mappedStep >= 1;
+    this.line2Active = this.mappedStep >= 2;
   },
   methods: {
-    // 获取步骤的CSS类名
     getStepClass(stepIndex) {
-      if (stepIndex === this.currentStep) {
+      if (stepIndex === this.mappedStep) {
         return 'active';
       }
-      else if (stepIndex < this.currentStep) {
+      else if (stepIndex < this.mappedStep) {
         return 'completed';
       }
       return '';
@@ -259,35 +237,16 @@ export default {
   transform-origin: left center;
 }
 
-/* 激活状态的线条 - 前进动画 */
 .line-progress.active {
   width: 100%;
   background-color: #E8101E;
   transition: width 0.3s ease;
 }
 
-/* 取消激活状态的线条 - 返回动画 */
 .line-progress.deactivating {
   width: 0%;
   background-color: #E8101E;
   transition: width 0.3s ease;
   transform-origin: right center;
 }
-
-/* 响应式调整 */
-@media (max-width: 750rpx) {
-  .step-container {
-    /* padding: 5rpx 40rpx; */
-  }
-  
-  .line-segment {
-    /* width: 100rpx; */
-  }
-  
-  /* .line-1,
-  .line-2 {
-    margin-left: 15rpx;
-    margin-right: 15rpx;
-  } */
-}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages.json b/pages.json
index 029437b..26b1390 100644
--- a/pages.json
+++ b/pages.json
@@ -1006,6 +1006,12 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/ruzhu/successruzhu",
+			"style": {
+				"navigationBarTitleText": "入驻成功"
+			}
 		}
 
 
diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index e73858c..a85a145 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -1,768 +1,821 @@
-<template>
-  <view class="profile-page">
-    <!-- 自定义顶部导航栏 -->
-    <view class="custom-navbar">
-      <!-- 左侧返回按钮和标题 -->
-      <view class="navbar-left">
-        <image class="back-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/456f4e6c-e86a-42c9-a272-484db9af6c7c" mode="aspectFit" @click="handleBack"></image>
-        <text class="navbar-title">我的资料</text>
-      </view>
-      
-      <!-- 右侧状态栏 -->
-      <view class="navbar-right">
-        <!-- <view class="nav-status-item" @click="handleShareWechat">
-          <image class="nav-status-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8a412688-b794-4407-bba6-a6dc65d75f08" mode="aspectFit"></image>
-          <text class="nav-status-text">分享到微信</text>
-        </view>
-        <view class="nav-status-item" @click="handleViewShop">
-          <image class="nav-status-icon" :src="identity == '2' ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2b5de852-2d35-4786-a643-d20cabb3eaee' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/85638da9-804e-4811-8378-d1bb6007f99d'" mode="aspectFit"></image>
-          <text class="nav-status-text">{{ identity == '2' ? '查看店铺' : '查看手艺人' }}</text>
-        </view> -->
-      </view>
-    </view>
-    
-    <!-- 内容区域 -->
-    <view class="content">
-      <!-- 基础资料部分 -->
-      <view class="section-card">
-        <view class="section-header">
-          <view class="title-bar"></view>
-          <text class="section-title">基础资料</text>
-        </view>
-        <text class="section-desc">店铺信息将影响顾客到店消费体验，请确保信息准确。</text>
-        
-        <view class="subsection">
-          <view class="subsection-content">
-            <!-- 营业时间（商家） / 服务时间（手艺人） -->
-            <view class="info-item" @click="navigateToTimeSetting">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21f1efaf-0c17-49b0-a2b2-e0fd573b92b3" mode="aspectFit"></image>
-                <text class="item-label">{{ identity == '2' ? '营业时间' : '服务时间' }}</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-            <!-- 服务技能 -->
-            <view class="info-item" @click="navigateToServiceSkill">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b90e2322-a261-4c17-a581-85010c3bc112" mode="aspectFit"></image>
-                <text class="item-label">服务技能</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-            
-            <!-- 门店信息 -->
-            <view class="info-item" v-if="identity == '2'" @click="navigateToShopInfo">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e9618006-db69-446e-92e1-ba9dd81e79f9" mode="aspectFit"></image>
-                <text class="item-label">门店信息</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-
-            <!-- 服务区域（手艺人显示） -->
-            <view class="info-item" v-if="identity == '1'" @click="navigateToServiceArea">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a35603b1-50fb-4248-9f2e-2dd4d5e249c0" mode="aspectFit"></image>
-                <text class="item-label">服务区域</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-
-            <!-- 个人信息（手艺人显示） -->
-            <view class="info-item" v-if="identity == '1'" @click="navigateToPersonalInfo">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/77dc7a16-3b86-44e5-8acc-5f3b85ffc137" mode="aspectFit"></image>
-                <text class="item-label">个人信息</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-			
-			<!-- 个人信息（手艺人显示） -->
-			<view class="info-item"  @click="navigateToimg">
-			  <view class="info-left">
-			    <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/53a9d1e1-e2d2-4001-b599-82e0c0747f1a.png" mode="aspectFit"></image>
-			    <text class="item-label">相册管理</text>
-			  </view>
-			  <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-			</view>
-			
-			<!-- 个人信息（手艺人显示） -->
-			<view class="info-item"  @click="navigateTovideo">
-			  <view class="info-left">
-			    <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6fc821cd-8dd1-41f1-8854-889fb5f76b78.png" mode="aspectFit"></image>
-			    <text class="item-label">视频管理</text>
-			  </view>
-			  <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-			</view>
-			
-          </view>
-        </view>
-      </view>
-
-      <!-- 经营资质部分 -->
-      <view class="section-card">
-        <view class="section-header">
-          <view class="title-bar"></view>
-          <text class="section-title">经营资质</text>
-        </view>
-        
-        <view class="subsection-content">
-          <!-- 资质信息 -->
-          <view class="info-item" @click="navigateToQualification">
-            <view class="info-left">
-              <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2677692c-5931-4ac7-846e-b6d321184789" mode="aspectFit"></image>
-              <text class="item-label">资质信息</text>
-            </view>
-            <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-          </view>
-          
-          <!-- 所属门店（手艺人显示） -->
-          <view class="info-item" v-if="identity == '1'" @click="navigateToBelongShop">
-            <view class="info-left">
-              <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b5541cb5-58c1-4e72-b88f-5cf6450338a8" mode="aspectFit"></image>
-              <text class="item-label">所属门店</text>
-            </view>
-            <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import { handleImgSizeUni } from '@/utils/service.js'
-import request from "../../utils/request";
-
-export default {
-  data() {
-    return {
-      identity: '',
-      currentUserId: '', // 当前用户ID
-      userInfo: {}, // 用户信息
-      sharing: false // 添加分享状态标记
-    }
-  },
-  onLoad() {
-    // 页面显示时重新加载身份信息，确保数据最新
-    this.loadIdentity()
-    console.log('当前身份:', this.identity)
-    // 加载用户信息
-    this.loadUserInfo()
-  },
-  onShow() {
-    // 页面显示时也重新加载，确保数据最新
-    this.loadIdentity()
-    this.loadUserInfo()
-  },
-  methods: {
-    // 返回按钮处理
-    handleBack() {
-      uni.navigateBack()
-    },
-    
-    // 分享到微信
-    handleShareWechat() {
-      console.log('分享到微信')
-      
-      this.handleShareProcess()
-    },
-
-    async handleShareProcess() {
-      // 如果正在分享中，防止重复点击
-      if (this.sharing) {
-        return;
-      }
-      
-      // 设置分享状态
-      this.sharing = true;
-
-      try {
-        // 显示加载提示
-        uni.showLoading({
-          title: '正在准备分享...',
-          mask: true
-        });
-
-        // 确保用户信息已加载
-        if (!this.currentUserId) {
-          await this.loadUserInfo()
-        }
-        
-        // 检查是否已加载用户信息
-        if (!this.currentUserId) {
-          uni.showToast({
-            title: '无法获取用户信息',
-            icon: 'none'
-          })
-          return
-        }
-        
-        // 根据环境处理
-        // #ifdef APP-PLUS
-        this.handleAppAutoShare()
-        // #endif
-        
-        // #ifdef MP-WEIXIN
-        this.handleMpAutoShare()
-        // #endif
-        
-        // #ifdef H5
-        this.handleH5Share()
-        // #endif
-        } catch (error) {
-        console.error('分享过程出错:', error);
-        uni.hideLoading();
-        this.sharing = false;
-        uni.showToast({
-          title: '分享失败，请重试',
-          icon: 'none'
-        });
-      }
-    },
-    
-    // H5环境分享
-    handleH5Share() {
-      // 在H5环境，通常使用浏览器的分享功能或复制链接
-      const shareUrl = window.location.href
-      uni.showModal({
-        title: '分享提示',
-        // content: `请复制链接分享给好友：${shareUrl}`,
-        content: `请在美融融Plus APP 环境下使用此功能`,
-
-        showCancel: false,
-        confirmText: '好的',
-        success: (res) => {
-          if (res.confirm) {
-            // // 复制链接到剪贴板
-            // uni.setClipboardData({
-            //   data: shareUrl,
-            //   success: () => {
-            //     uni.showToast({
-            //       title: '链接已复制',
-            //       icon: 'success'
-            //     })
-            //   }
-            // })
-          }
-        }
-      })
-    },
-    
-    // 小程序环境处理
-    handleMpAutoShare() {
-      // 小程序无法自动触发分享，跳转后提示用户手动操作
-      const url = this.identity == '2' 
-        ? `/pages/user/store-detail?id=${this.currentUserId}` 
-        : `/pages/user/syr-detail?id=${this.currentUserId}`;
-      
-      uni.navigateTo({
-        url: url,
-        success: () => {
-          setTimeout(() => {
-            uni.showToast({
-              title: '请点击右上角分享',
-              icon: 'none',
-              duration: 2000
-            });
-          }, 500);
-        }
-      });
-    },
-    
-    // APP环境自动分享
-    handleAppAutoShare() {
-      if (!this.currentUserId) {
-        uni.showToast({
-          title: '无法获取用户信息',
-          icon: 'none'
-        });
-        return;
-      }
-
-      // 清除旧的分享标记
-      uni.removeStorage({
-        key: 'share_success'
-      });
-      
-      // 跳转到店铺主页并自动触发分享
-      const url = this.identity == '2' 
-        ? `/pages/user/store-detail?id=${this.currentUserId}&autoShare=1` 
-        : `/pages/user/syr-detail?id=${this.currentUserId}&autoShare=1`;
-      
-      uni.navigateTo({
-        url: url,
-        success: () => {
-          console.log('跳转成功，将自动触发分享');
-          // 跳转成功后立即隐藏loading，避免页面闪烁
-          setTimeout(() => {
-            uni.hideLoading();
-            this.sharing = false;
-          }, 200);
-        },
-        fail: () => {
-          console.log('跳转失败:', err);
-          uni.hideLoading();
-          this.sharing = false;
-          this.showManualShareOption();
-        }
-      });
-    },
-    
-    // 执行APP分享
-    executeAppShare(imageUrl) {
-      // 备用图片地址
-      const backupImageUrl = "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/yh/1756713709528-717.png?x-oss-process=image/resize,p_40"
-      
-      // 根据身份设置不同的分享标题
-      const shareTitle = this.identity == '2' 
-        ? "好友刚推了个超赞商家！点开认识TA ~" 
-        : "好友刚推了个超赞手艺人！点开认识TA ~"
-      
-      // 生成分享配置
-      const shareConfig = {
-        provider: "weixin",
-        scene: "WXSceneSession",
-        type: 5,
-        title: shareTitle,
-        miniProgram: {
-          id: "gh_89c92e18b70b", // 小程序原始ID
-          path: this.getSharePath(), // 动态分享路径
-          type: 0, // 正式版
-          webUrl: "https://www.baidu.com/", // 降级网页地址
-        },
-        imageUrl: imageUrl,
-        success: (res) => {
-          console.log("分享成功:", JSON.stringify(res))
-          uni.showToast({
-            title: '分享成功',
-            icon: 'success'
-          })
-        },
-        fail: (err) => {
-          console.log("分享失败:", JSON.stringify(err))
-          // 尝试使用备用图片
-          if (imageUrl !== backupImageUrl) {
-            console.log("尝试使用备用图片分享...")
-            this.executeAppShare(backupImageUrl)
-          } else {
-            uni.showToast({
-              title: '分享失败',
-              icon: 'none'
-            })
-          }
-        }
-      }
-
-      // 检查是否支持分享API
-      if (uni.share) {
-        uni.share(shareConfig)
-      } else {
-        uni.showToast({
-          title: '当前环境不支持分享',
-          icon: 'none'
-        })
-      }
-    },
-    
-    // 获取分享路径
-    getSharePath() {
-      // 根据身份生成不同的分享路径
-      if (this.identity == '2') {
-        // 商家分享店铺详情页
-        return `/pages/user/store-detail?id=${this.currentUserId || ''}`
-      } else {
-        // 手艺人分享个人主页
-        return `/pages/user/syr-detail?id=${this.currentUserId || ''}`
-      }
-    },
-    
-    // 查看店铺
-    async handleViewShop() {
-      console.log('查看店铺')
-      
-      // 确保用户信息已加载
-      if (!this.currentUserId) {
-        await this.loadUserInfo()
-      }
-      
-      // 如果仍然没有用户ID，提示用户手动输入或联系客服
-      if (!this.currentUserId) {
-        uni.showModal({
-          title: '提示',
-          content: '无法获取用户信息，请联系客服或稍后重试',
-          showCancel: false,
-          confirmText: '确定'
-        })
-        return
-      }
-      
-      // 根据身份跳转到不同的页面
-      if (this.identity == '2') {
-        // 商家跳转到店铺主页
-        uni.navigateTo({
-          url: '/pages/user/store-detail?id=' + this.currentUserId
-        })
-      } else {
-        // 手艺人跳转到个人主页
-        uni.navigateTo({
-          url: '/pages/user/syr-detail?id=' + this.currentUserId
-        })
-      }
-    },
-    
-    // 加载用户信息 - 主要使用接口获取
-    async loadUserInfo() {
-      try {
-        // 根据身份设置type参数（参考个人中心页面的逻辑）
-        let type = 1 // 默认值
-        if (this.identity == '1') {
-          type = 2 // 手艺人
-        } else if (this.identity == '2') {
-          type = 3 // 商家
-        }
-        
-        console.log('调用接口获取用户信息，type:', type)
-        
-        // 调用接口获取用户信息
-        const result = await request.post('/user/getuser', { type })
-        
-        if (result.data && result.data.id) {
-          this.userInfo = result.data
-          this.currentUserId = result.data.id
-          
-          // 存储到本地，避免重复调用
-          uni.setStorageSync('userInfo', result.data)
-          console.log('从接口获取用户信息成功:', this.userInfo)
-        } else {
-          console.log('接口返回数据异常:', result)
-        }
-      } catch (error) {
-        console.log('获取用户信息失败:', error)
-        
-        // 降级方案：尝试从其他可能的位置获取用户ID
-        this.tryAlternativeUserInfo()
-      }
-    },
-    
-    // 备用方案：从其他位置获取用户信息
-    tryAlternativeUserInfo() {
-      try {
-        const app = getApp()
-        
-        // 方法1: 从全局数据获取用户ID
-        if (app.globalData.userInfo && app.globalData.userInfo.id) {
-          this.currentUserId = app.globalData.userInfo.id
-          this.userInfo = app.globalData.userInfo
-          console.log('从全局数据获取用户ID:', this.currentUserId)
-          return
-        }
-        
-        // 方法2: 从本地存储获取完整的用户信息
-        const userInfo = uni.getStorageSync('userInfo')
-        if (userInfo && userInfo.id) {
-          this.currentUserId = userInfo.id
-          this.userInfo = userInfo
-          console.log('从存储获取用户ID:', this.currentUserId)
-          return
-        }
-        
-        // 方法3: 直接获取用户ID
-        const userId = uni.getStorageSync('userId')
-        if (userId) {
-          this.currentUserId = userId
-          console.log('从存储获取用户ID:', userId)
-          return
-        }
-        
-        console.log('所有获取用户信息的方法都失败了')
-      } catch (e) {
-        console.log('备用方案获取用户信息失败:', e)
-      }
-    },
-
-    loadIdentity() {
-      // 从全局数据获取身份
-      const app = getApp()
-      const globalIdentity = app.globalData.artisanType
-      console.log('从全局数据获取身份:', globalIdentity)
-      
-      if (globalIdentity) {
-        this.identity = globalIdentity
-        uni.setStorageSync('user_identity', globalIdentity)
-      } else {
-        // 如果全局数据没有，尝试从本地存储获取
-        const localIdentity = uni.getStorageSync('user_identity')
-        if (localIdentity) {
-          this.identity = localIdentity
-          console.log('从本地存储获取身份:', localIdentity)
-        } else {
-          console.log('未获取到身份信息')
-          // 默认设为手艺人
-          this.identity = '1'
-        }
-      }
-      
-      console.log('当前身份:', this.identity)
-    },
-    
-    navigateToTimeSetting() {
-      if (this.identity == '2') {
-        // 商家跳转到营业时间页面
-        uni.navigateTo({
-          url: '/pages/shop/business-time'
-        })
-      } else {
-        // 手艺人跳转到服务时间页面
-        uni.navigateTo({
-          url: '/pages/artisan/service-time'
-        })
-      }
-    },
-    
-    navigateToServiceSkill() {
-      if (this.identity == '2') {
-        // 商家跳转到商家服务技能页面
-        uni.navigateTo({
-          url: '/pages/shop/service-skills'
-        })
-      } else {
-        // 手艺人跳转到手艺人服务技能页面
-        uni.navigateTo({
-          url: '/pages/artisan/service-skills'
-        })
-      }
-    },
-    
-    navigateToShopInfo() {  // 商家：门店信息 
-      uni.navigateTo({
-        url: '/pages/shop/sj-info-change'
-      })
-    },
-    
-    navigateToServiceArea() {  // 手艺人：服务区域
-      uni.navigateTo({
-        url: '/pages/artisan/service-area'
-      })
-    },
-    
-    navigateToPersonalInfo() {  // 手艺人：个人信息
-      uni.navigateTo({
-        url: '/pages/artisan/syr-info-change'
-      })
-    },
-	
-	navigateToimg() {  // 图片管理
-	  uni.navigateTo({
-	    url: '/pages/shop/photoAlbum/photoManage?type=1'
-	  })
-	},
-	
-	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;
-}
-
-/* 自定义导航栏样式 */
-.custom-navbar {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 108rpx; /* 使用标准导航栏高度 */
-  background: white;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 32rpx;
-  z-index: 999;
-  box-sizing: border-box;
-  /* 适配不同机型的顶部安全区域 */
-  padding-top: var(--status-bar-height);
-  height: calc(128rpx + var(--status-bar-height));
-}
-
-/* 导航栏左侧 */
-.navbar-left {
-  display: flex;
-  align-items: center;
-}
-
-.back-icon {
-  width: 16rpx;
-  height: 32rpx;
-  margin-right: 23rpx;
-}
-
-.navbar-title {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 500;
-	font-size: 32rpx;
-	color: #333333;
-	line-height: 45rpx;
-	text-align: left;
-	font-style: normal;
-}
-
-/* 导航栏右侧状态栏 */
-.navbar-right {
-  display: flex;
-  align-items: center;
-}
-
-.nav-status-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-left: 11rpx;
-  padding: 16rpx;
-}
-
-.nav-status-icon {
-  width: 44rpx;
-  height: 44rpx;
-  margin-bottom: 7rpx;
-}
-
-.nav-status-text {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 400;
-	font-size: 20rpx;
-	color: #333333;
-	line-height: 28rpx;
-	text-align: left;
-	font-style: normal;
-}
-
-.content {
-  padding: 20rpx;
-  /* 动态计算内容区域的上边距 */
-  padding-top: calc(128rpx + var(--status-bar-height) + 20rpx);
-}
-
-/* 部分卡片 */
-.section-card {
-  background: white;
-  border-radius: 20rpx;
-  padding: 20rpx 20rpx 0 20rpx;
-  margin-bottom: 20rpx;
-}
-
-.section-header {
-  display: flex;
-  align-items: center;
-  margin-bottom: 8rpx;
-}
-
-.section-title {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 500;
-	font-size: 32rpx;
-	color: #1D2129;
-	line-height: 48rpx;
-	text-align: left;
-	font-style: normal;
-}
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 10rpx;
-  border-radius: 5rpx;
-}
-
-.section-desc {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 400;
-	font-size: 24rpx;
-	color: #666666;
-	line-height: 33rpx;
-	text-align: left;
-	font-style: normal;
-	margin-left: 20rpx;
-	letter-spacing: 0.5rpx; 
-}
-
-/* 子部分 */
-.subsection {
-  /* margin-top: 10rpx; */
-  /* margin-left: 17rpx; */
-}
-
-.subsection-content {
-  border-radius: 12rpx;
-  overflow: hidden;
-  margin-left: 17rpx;
-}
-
-/* 信息项 */
-.info-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 32rpx 0 ;
-  border-bottom: 1rpx solid #f0f0f0;
-}
-
-.info-item:last-child {
-  border-bottom: none;
-}
-
-.info-left {
-  display: flex;
-  align-items: center;
-}
-
-.item-icon {
-  width: 48rpx;
-  height: 48rpx;
-  margin-right: 24rpx;
-}
-
-.item-label {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #333333;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.arrow-right {
-  margin-right: 19rpx;
-  width: 11rpx;
-  height: 22rpx;
-}
+<template>
+	<view class="profile-page">
+		<!-- 自定义顶部导航栏 -->
+		<view class="custom-navbar">
+			<!-- 左侧返回按钮和标题 -->
+			<view class="navbar-left">
+				<image class="back-icon"
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/456f4e6c-e86a-42c9-a272-484db9af6c7c"
+					mode="aspectFit" @click="handleBack"></image>
+				<text class="navbar-title">我的资料</text>
+			</view>
+
+			<!-- 右侧状态栏 -->
+			<view class="navbar-right">
+				<!-- <view class="nav-status-item" @click="handleShareWechat">
+          <image class="nav-status-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8a412688-b794-4407-bba6-a6dc65d75f08" mode="aspectFit"></image>
+          <text class="nav-status-text">分享到微信</text>
+        </view>
+        <view class="nav-status-item" @click="handleViewShop">
+          <image class="nav-status-icon" :src="identity == '2' ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2b5de852-2d35-4786-a643-d20cabb3eaee' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/85638da9-804e-4811-8378-d1bb6007f99d'" mode="aspectFit"></image>
+          <text class="nav-status-text">{{ identity == '2' ? '查看店铺' : '查看手艺人' }}</text>
+        </view> -->
+			</view>
+		</view>
+
+		<!-- 内容区域 -->
+		<view class="content">
+			<!-- 基础资料部分 -->
+			<view class="section-card">
+				<view class="section-header">
+					<view class="title-bar"></view>
+					<text class="section-title">基础资料</text>
+				</view>
+				<text class="section-desc">店铺信息将影响顾客到店消费体验，请确保信息准确。</text>
+
+				<view class="subsection">
+					<view class="subsection-content">
+						<!-- 营业时间（商家） / 服务时间（手艺人） -->
+						<view class="info-item" @click="navigateToTimeSetting">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21f1efaf-0c17-49b0-a2b2-e0fd573b92b3"
+									mode="aspectFit"></image>
+								<text class="item-label">{{ identity == '2' ? '营业时间' : '服务时间' }}</text>
+							</view>
+							<view>
+								<image
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+									mode="widthFix"
+									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;">
+								</image>
+								<text style="margin-right: 16rpx; color: #ec5d57;">待完善</text>
+								<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
+								</image>
+							</view>
+						</view>
+						<!-- 服务技能 -->
+						<view class="info-item" @click="navigateToServiceSkill">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b90e2322-a261-4c17-a581-85010c3bc112"
+									mode="aspectFit"></image>
+								<text class="item-label">服务技能</text>
+							</view>
+							<view>
+								<image
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+									mode="widthFix"
+									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;">
+								</image>
+								<text style="margin-right: 16rpx; color: #389930;">已认证</text>
+								<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
+								</image>
+							</view>
+						</view>
+
+						<!-- 门店信息 -->
+						<view class="info-item" v-if="identity == '2'" @click="navigateToShopInfo">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e9618006-db69-446e-92e1-ba9dd81e79f9"
+									mode="aspectFit"></image>
+								<text class="item-label">门店信息</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 服务区域（手艺人显示） -->
+						<view class="info-item" v-if="identity == '1'" @click="navigateToServiceArea">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a35603b1-50fb-4248-9f2e-2dd4d5e249c0"
+									mode="aspectFit"></image>
+								<text class="item-label">服务区域</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 个人信息（手艺人显示） -->
+						<view class="info-item" v-if="identity == '1'" @click="navigateToPersonalInfo">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/77dc7a16-3b86-44e5-8acc-5f3b85ffc137"
+									mode="aspectFit"></image>
+								<text class="item-label">个人信息</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 个人信息（手艺人显示） -->
+						<view class="info-item" @click="navigateToimg">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/53a9d1e1-e2d2-4001-b599-82e0c0747f1a.png"
+									mode="aspectFit"></image>
+								<text class="item-label">相册管理</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 个人信息（手艺人显示） -->
+						<view class="info-item" @click="navigateTovideo">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6fc821cd-8dd1-41f1-8854-889fb5f76b78.png"
+									mode="aspectFit"></image>
+								<text class="item-label">视频管理</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+					</view>
+				</view>
+			</view>
+
+			<!-- 经营资质部分 -->
+			<view class="section-card">
+				<view class="section-header">
+					<view class="title-bar"></view>
+					<text class="section-title">经营资质</text>
+				</view>
+
+				<view class="subsection-content">
+					<!-- 资质信息 -->
+					<view class="info-item" @click="navigateToQualification">
+						<view class="info-left">
+							<image class="item-icon"
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2677692c-5931-4ac7-846e-b6d321184789"
+								mode="aspectFit"></image>
+							<text class="item-label">资质信息</text>
+						</view>
+						<view>
+							<image
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+								mode="widthFix"
+								style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;">
+							</image>
+							<text style="margin-right: 16rpx; color: #e59e45;">审核中</text>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
+							</image>
+						</view>
+					</view>
+
+					<!-- 所属门店（手艺人显示） -->
+					<view class="info-item" v-if="identity == '1'" @click="navigateToBelongShop">
+						<view class="info-left">
+							<image class="item-icon"
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b5541cb5-58c1-4e72-b88f-5cf6450338a8"
+								mode="aspectFit"></image>
+							<text class="item-label">所属门店</text>
+						</view>
+						<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		handleImgSizeUni
+	} from '@/utils/service.js'
+	import request from "../../utils/request";
+
+	export default {
+		data() {
+			return {
+				identity: '',
+				currentUserId: '', // 当前用户ID
+				userInfo: {}, // 用户信息
+				sharing: false // 添加分享状态标记
+			}
+		},
+		onLoad() {
+			// 页面显示时重新加载身份信息，确保数据最新
+			this.loadIdentity()
+			console.log('当前身份:', this.identity)
+			// 加载用户信息
+			this.loadUserInfo()
+		},
+		onShow() {
+			// 页面显示时也重新加载，确保数据最新
+			this.loadIdentity()
+			this.loadUserInfo()
+		},
+		methods: {
+			// 返回按钮处理
+			handleBack() {
+				uni.navigateBack()
+			},
+
+			// 分享到微信
+			handleShareWechat() {
+				console.log('分享到微信')
+
+				this.handleShareProcess()
+			},
+
+			async handleShareProcess() {
+				// 如果正在分享中，防止重复点击
+				if (this.sharing) {
+					return;
+				}
+
+				// 设置分享状态
+				this.sharing = true;
+
+				try {
+					// 显示加载提示
+					uni.showLoading({
+						title: '正在准备分享...',
+						mask: true
+					});
+
+					// 确保用户信息已加载
+					if (!this.currentUserId) {
+						await this.loadUserInfo()
+					}
+
+					// 检查是否已加载用户信息
+					if (!this.currentUserId) {
+						uni.showToast({
+							title: '无法获取用户信息',
+							icon: 'none'
+						})
+						return
+					}
+
+					// 根据环境处理
+					// #ifdef APP-PLUS
+					this.handleAppAutoShare()
+					// #endif
+
+					// #ifdef MP-WEIXIN
+					this.handleMpAutoShare()
+					// #endif
+
+					// #ifdef H5
+					this.handleH5Share()
+					// #endif
+				} catch (error) {
+					console.error('分享过程出错:', error);
+					uni.hideLoading();
+					this.sharing = false;
+					uni.showToast({
+						title: '分享失败，请重试',
+						icon: 'none'
+					});
+				}
+			},
+
+			// H5环境分享
+			handleH5Share() {
+				// 在H5环境，通常使用浏览器的分享功能或复制链接
+				const shareUrl = window.location.href
+				uni.showModal({
+					title: '分享提示',
+					// content: `请复制链接分享给好友：${shareUrl}`,
+					content: `请在美融融Plus APP 环境下使用此功能`,
+
+					showCancel: false,
+					confirmText: '好的',
+					success: (res) => {
+						if (res.confirm) {
+							// // 复制链接到剪贴板
+							// uni.setClipboardData({
+							//   data: shareUrl,
+							//   success: () => {
+							//     uni.showToast({
+							//       title: '链接已复制',
+							//       icon: 'success'
+							//     })
+							//   }
+							// })
+						}
+					}
+				})
+			},
+
+			// 小程序环境处理
+			handleMpAutoShare() {
+				// 小程序无法自动触发分享，跳转后提示用户手动操作
+				const url = this.identity == '2' ?
+					`/pages/user/store-detail?id=${this.currentUserId}` :
+					`/pages/user/syr-detail?id=${this.currentUserId}`;
+
+				uni.navigateTo({
+					url: url,
+					success: () => {
+						setTimeout(() => {
+							uni.showToast({
+								title: '请点击右上角分享',
+								icon: 'none',
+								duration: 2000
+							});
+						}, 500);
+					}
+				});
+			},
+
+			// APP环境自动分享
+			handleAppAutoShare() {
+				if (!this.currentUserId) {
+					uni.showToast({
+						title: '无法获取用户信息',
+						icon: 'none'
+					});
+					return;
+				}
+
+				// 清除旧的分享标记
+				uni.removeStorage({
+					key: 'share_success'
+				});
+
+				// 跳转到店铺主页并自动触发分享
+				const url = this.identity == '2' ?
+					`/pages/user/store-detail?id=${this.currentUserId}&autoShare=1` :
+					`/pages/user/syr-detail?id=${this.currentUserId}&autoShare=1`;
+
+				uni.navigateTo({
+					url: url,
+					success: () => {
+						console.log('跳转成功，将自动触发分享');
+						// 跳转成功后立即隐藏loading，避免页面闪烁
+						setTimeout(() => {
+							uni.hideLoading();
+							this.sharing = false;
+						}, 200);
+					},
+					fail: () => {
+						console.log('跳转失败:', err);
+						uni.hideLoading();
+						this.sharing = false;
+						this.showManualShareOption();
+					}
+				});
+			},
+
+			// 执行APP分享
+			executeAppShare(imageUrl) {
+				// 备用图片地址
+				const backupImageUrl =
+					"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/yh/1756713709528-717.png?x-oss-process=image/resize,p_40"
+
+				// 根据身份设置不同的分享标题
+				const shareTitle = this.identity == '2' ?
+					"好友刚推了个超赞商家！点开认识TA ~" :
+					"好友刚推了个超赞手艺人！点开认识TA ~"
+
+				// 生成分享配置
+				const shareConfig = {
+					provider: "weixin",
+					scene: "WXSceneSession",
+					type: 5,
+					title: shareTitle,
+					miniProgram: {
+						id: "gh_89c92e18b70b", // 小程序原始ID
+						path: this.getSharePath(), // 动态分享路径
+						type: 0, // 正式版
+						webUrl: "https://www.baidu.com/", // 降级网页地址
+					},
+					imageUrl: imageUrl,
+					success: (res) => {
+						console.log("分享成功:", JSON.stringify(res))
+						uni.showToast({
+							title: '分享成功',
+							icon: 'success'
+						})
+					},
+					fail: (err) => {
+						console.log("分享失败:", JSON.stringify(err))
+						// 尝试使用备用图片
+						if (imageUrl !== backupImageUrl) {
+							console.log("尝试使用备用图片分享...")
+							this.executeAppShare(backupImageUrl)
+						} else {
+							uni.showToast({
+								title: '分享失败',
+								icon: 'none'
+							})
+						}
+					}
+				}
+
+				// 检查是否支持分享API
+				if (uni.share) {
+					uni.share(shareConfig)
+				} else {
+					uni.showToast({
+						title: '当前环境不支持分享',
+						icon: 'none'
+					})
+				}
+			},
+
+			// 获取分享路径
+			getSharePath() {
+				// 根据身份生成不同的分享路径
+				if (this.identity == '2') {
+					// 商家分享店铺详情页
+					return `/pages/user/store-detail?id=${this.currentUserId || ''}`
+				} else {
+					// 手艺人分享个人主页
+					return `/pages/user/syr-detail?id=${this.currentUserId || ''}`
+				}
+			},
+
+			// 查看店铺
+			async handleViewShop() {
+				console.log('查看店铺')
+
+				// 确保用户信息已加载
+				if (!this.currentUserId) {
+					await this.loadUserInfo()
+				}
+
+				// 如果仍然没有用户ID，提示用户手动输入或联系客服
+				if (!this.currentUserId) {
+					uni.showModal({
+						title: '提示',
+						content: '无法获取用户信息，请联系客服或稍后重试',
+						showCancel: false,
+						confirmText: '确定'
+					})
+					return
+				}
+
+				// 根据身份跳转到不同的页面
+				if (this.identity == '2') {
+					// 商家跳转到店铺主页
+					uni.navigateTo({
+						url: '/pages/user/store-detail?id=' + this.currentUserId
+					})
+				} else {
+					// 手艺人跳转到个人主页
+					uni.navigateTo({
+						url: '/pages/user/syr-detail?id=' + this.currentUserId
+					})
+				}
+			},
+
+			// 加载用户信息 - 主要使用接口获取
+			async loadUserInfo() {
+				try {
+					// 根据身份设置type参数（参考个人中心页面的逻辑）
+					let type = 1 // 默认值
+					if (this.identity == '1') {
+						type = 2 // 手艺人
+					} else if (this.identity == '2') {
+						type = 3 // 商家
+					}
+
+					console.log('调用接口获取用户信息，type:', type)
+
+					// 调用接口获取用户信息
+					const result = await request.post('/user/getuser', {
+						type
+					})
+
+					if (result.data && result.data.id) {
+						this.userInfo = result.data
+						this.currentUserId = result.data.id
+
+						// 存储到本地，避免重复调用
+						uni.setStorageSync('userInfo', result.data)
+						console.log('从接口获取用户信息成功:', this.userInfo)
+					} else {
+						console.log('接口返回数据异常:', result)
+					}
+				} catch (error) {
+					console.log('获取用户信息失败:', error)
+
+					// 降级方案：尝试从其他可能的位置获取用户ID
+					this.tryAlternativeUserInfo()
+				}
+			},
+
+			// 备用方案：从其他位置获取用户信息
+			tryAlternativeUserInfo() {
+				try {
+					const app = getApp()
+
+					// 方法1: 从全局数据获取用户ID
+					if (app.globalData.userInfo && app.globalData.userInfo.id) {
+						this.currentUserId = app.globalData.userInfo.id
+						this.userInfo = app.globalData.userInfo
+						console.log('从全局数据获取用户ID:', this.currentUserId)
+						return
+					}
+
+					// 方法2: 从本地存储获取完整的用户信息
+					const userInfo = uni.getStorageSync('userInfo')
+					if (userInfo && userInfo.id) {
+						this.currentUserId = userInfo.id
+						this.userInfo = userInfo
+						console.log('从存储获取用户ID:', this.currentUserId)
+						return
+					}
+
+					// 方法3: 直接获取用户ID
+					const userId = uni.getStorageSync('userId')
+					if (userId) {
+						this.currentUserId = userId
+						console.log('从存储获取用户ID:', userId)
+						return
+					}
+
+					console.log('所有获取用户信息的方法都失败了')
+				} catch (e) {
+					console.log('备用方案获取用户信息失败:', e)
+				}
+			},
+
+			loadIdentity() {
+				// 从全局数据获取身份
+				const app = getApp()
+				const globalIdentity = app.globalData.artisanType
+				console.log('从全局数据获取身份:', globalIdentity)
+
+				if (globalIdentity) {
+					this.identity = globalIdentity
+					uni.setStorageSync('user_identity', globalIdentity)
+				} else {
+					// 如果全局数据没有，尝试从本地存储获取
+					const localIdentity = uni.getStorageSync('user_identity')
+					if (localIdentity) {
+						this.identity = localIdentity
+						console.log('从本地存储获取身份:', localIdentity)
+					} else {
+						console.log('未获取到身份信息')
+						// 默认设为手艺人
+						this.identity = '1'
+					}
+				}
+
+				console.log('当前身份:', this.identity)
+			},
+
+			navigateToTimeSetting() {
+				if (this.identity == '2') {
+					// 商家跳转到营业时间页面
+					uni.navigateTo({
+						url: '/pages/shop/business-time'
+					})
+				} else {
+					// 手艺人跳转到服务时间页面
+					uni.navigateTo({
+						url: '/pages/artisan/service-time'
+					})
+				}
+			},
+
+			navigateToServiceSkill() {
+				if (this.identity == '2') {
+					// 商家跳转到商家服务技能页面
+					uni.navigateTo({
+						url: '/pages/shop/service-skills'
+					})
+				} else {
+					// 手艺人跳转到手艺人服务技能页面
+					uni.navigateTo({
+						url: '/pages/artisan/service-skills'
+					})
+				}
+			},
+
+			navigateToShopInfo() { // 商家：门店信息 
+				uni.navigateTo({
+					url: '/pages/shop/sj-info-change'
+				})
+			},
+
+			navigateToServiceArea() { // 手艺人：服务区域
+				uni.navigateTo({
+					url: '/pages/artisan/service-area'
+				})
+			},
+
+			navigateToPersonalInfo() { // 手艺人：个人信息
+				uni.navigateTo({
+					url: '/pages/artisan/syr-info-change'
+				})
+			},
+
+			navigateToimg() { // 图片管理
+				uni.navigateTo({
+					url: '/pages/shop/photoAlbum/photoManage?type=1'
+				})
+			},
+
+			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;
+	}
+
+	/* 自定义导航栏样式 */
+	.custom-navbar {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 108rpx;
+		/* 使用标准导航栏高度 */
+		background: white;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 32rpx;
+		z-index: 999;
+		box-sizing: border-box;
+		/* 适配不同机型的顶部安全区域 */
+		padding-top: var(--status-bar-height);
+		height: calc(128rpx + var(--status-bar-height));
+	}
+
+	/* 导航栏左侧 */
+	.navbar-left {
+		display: flex;
+		align-items: center;
+	}
+
+	.back-icon {
+		width: 16rpx;
+		height: 32rpx;
+		margin-right: 23rpx;
+	}
+
+	.navbar-title {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #333333;
+		line-height: 45rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	/* 导航栏右侧状态栏 */
+	.navbar-right {
+		display: flex;
+		align-items: center;
+	}
+
+	.nav-status-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-left: 11rpx;
+		padding: 16rpx;
+	}
+
+	.nav-status-icon {
+		width: 44rpx;
+		height: 44rpx;
+		margin-bottom: 7rpx;
+	}
+
+	.nav-status-text {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #333333;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.content {
+		padding: 20rpx;
+		/* 动态计算内容区域的上边距 */
+		padding-top: calc(128rpx + var(--status-bar-height) + 20rpx);
+	}
+
+	/* 部分卡片 */
+	.section-card {
+		background: white;
+		border-radius: 20rpx;
+		padding: 20rpx 20rpx 0 20rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.section-header {
+		display: flex;
+		align-items: center;
+		margin-bottom: 8rpx;
+	}
+
+	.section-title {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #1D2129;
+		line-height: 48rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.title-bar {
+		width: 6rpx;
+		height: 30rpx;
+		background-color: #E8101E;
+		margin-right: 10rpx;
+		border-radius: 5rpx;
+	}
+
+	.section-desc {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #666666;
+		line-height: 33rpx;
+		text-align: left;
+		font-style: normal;
+		margin-left: 20rpx;
+		letter-spacing: 0.5rpx;
+	}
+
+	/* 子部分 */
+	.subsection {
+		/* margin-top: 10rpx; */
+		/* margin-left: 17rpx; */
+	}
+
+	.subsection-content {
+		border-radius: 12rpx;
+		overflow: hidden;
+		margin-left: 17rpx;
+	}
+
+	/* 信息项 */
+	.info-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 32rpx 0;
+		border-bottom: 1rpx solid #f0f0f0;
+	}
+
+	.info-item:last-child {
+		border-bottom: none;
+	}
+
+	.info-left {
+		display: flex;
+		align-items: center;
+	}
+
+	.item-icon {
+		width: 48rpx;
+		height: 48rpx;
+		margin-right: 24rpx;
+	}
+
+	.item-label {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.arrow-right {
+		margin-right: 19rpx;
+		width: 11rpx;
+		height: 22rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue
index 921f2f0..dcc1be6 100644
--- a/pages/ruzhu/qualification_sj.vue
+++ b/pages/ruzhu/qualification_sj.vue
@@ -1,1963 +1,1002 @@
-<template>
-  <view class="qualification-page">
-    <!-- 营业执照部分 -->
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text class="title-text">营业执照</text>
-      </view>
-
-      <!-- 资质照片 -->
-      <view class="form-item box-cont">
-        <text class="label required">资质照片</text>
-        <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
-        <view class="upload-container">
-          <view class="upload-box" @click="chooseImage('uscc_photo')">
-            <view class="upload-camera license-upload">
-              <image v-if="formData.uscc_photo" :src="formData.uscc_photo" mode="aspectFill" class="preview-image"></image>
-              <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/92bd4268-b4d7-4725-8664-9e44f828c7d9" mode="aspectFit" class="camera-icon"></image>
-              <!-- 识别状态遮罩 -->
-              <!-- <view v-if="isRecognizing && recognizeType === 'uscc_photo'" class="recognize-overlay">
-                <view class="recognize-loading"></view>
-                <text class="recognize-text">识别中...</text>
-              </view> -->
-            </view>
-          </view>
-          <text class="upload-label required">请上传营业执照原件</text>
-        </view>
-      </view>
-
-      <!-- 商户类型 -->
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">商户类型</text>
-        </view>
-        <input type="text" v-model="formData.uscc_type" placeholder="请输入商户类型" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <!-- 营业执照信息 -->
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">证件号码</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_num')"></image>
-        </view>
-        <input type="text" v-model="formData.uscc_num" placeholder="请输入营业执照的证件号码" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">企业名称</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_name')"></image>
-        </view>
-        <input type="text" v-model="formData.uscc_name" placeholder="请输入营业执照的企业名称" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-    </view>
-
-    <!-- 法人信息部分 -->
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text>法人信息</text>
-      </view>
-
-    <!-- 身份证照片部分 -->
-    <view class="section">
-      <view class="box-cont">
-        <view class="form-item">
-          <text class="label required">身份证照片</text>
-          <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
-          
-          <view class="idcard-upload-vertical-container">
-            <!-- 身份证正面 -->
-            <view class="idcard-upload-vertical-item">
-              <view class="upload-box" @click="chooseImage('legal_idcard_positive')">
-                <view class="upload-camera idcard-front">
-                  <image v-if="formData.legal_idcard_positive" :src="formData.legal_idcard_positive" mode="aspectFill" class="preview-image"></image>
-                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/043b0c97-79c1-4f95-810f-c33e3d5269a3" mode="aspectFit" class="camera-icon"></image>
-                  <!-- 识别状态遮罩 -->
-                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_positive'" class="recognize-overlay">
-                    <view class="recognize-loading"></view>
-                    <text class="recognize-text">识别中...</text>
-                  </view> -->
-                </view>
-              </view>
-              <text class="upload-label required">请上传身份证正面（人像面）</text>
-            </view>
-            
-            <!-- 身份证反面 -->
-            <view class="idcard-upload-vertical-item">
-              <view class="upload-box" @click="chooseImage('legal_idcard_negative')">
-                <view class="upload-camera idcard-back">
-                  <image v-if="formData.legal_idcard_negative" :src="formData.legal_idcard_negative" mode="aspectFill" class="preview-image"></image>
-                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/203cfdf4-2501-44e6-8565-ad251c6bf0fa" mode="aspectFit" class="camera-icon"></image>
-                  <!-- 识别状态遮罩 -->
-                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_negative'" class="recognize-overlay">
-                    <view class="recognize-loading"></view>
-                    <text class="recognize-text">识别中...</text>
-                  </view> -->
-                </view>
-              </view>
-              <text class="upload-label required">请上传身份证反面（国徽面）</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">法人代表</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('legal_name')"></image>
-        </view>
-        <input type="text" v-model="formData.legal_name" placeholder="请输入营业执照的法人代表" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <text class="label required">法人联系方式</text>
-        <input type="number" v-model="formData.legal_phone" placeholder="请输入法人的联系方式" 
-              placeholder-class="placeholder" class="input" 
-              @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <text class="label required">法人身份证号</text>
-        <input type="idcard" v-model="formData.legal_idcard_num" placeholder="请输入法人身份证号" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <!-- 身份证有效期 -->
-      <view class="form-item box-cont">
-        <text class="label required">身份证有效期至</text>
-        <view class="radio-group">
-          <view class="radio-item" @click="setIdcardValidType('permanent')">
-            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
-              <image v-if="formData.legal_idcard_expiry_type === 'permanent'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
-            </view>
-            <text class="radio-label">长久有效</text>
-          </view>
-          <view class="radio-item" @click="setIdcardValidType('date')">
-            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
-              <image v-if="formData.legal_idcard_expiry_type === 'date'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
-            </view>
-            <text class="radio-label">指定日期有效</text>
-          </view>
-        </view>
-      </view>
-
-      <!-- 身份证有效期日期选择 -->
-      <view class="box-cont">
-        <view class="date-range-container">
-          <view class="date-item">
-            <text class="date-label">开始日期</text>
-            <view class="date-picker-box" @click="openDatePicker('idcard_start_date')">
-              <text :class="formData.idcard_start_date ? 'date-value' : 'placeholder'">
-                {{formatDateForDisplay(formData.idcard_start_date) || '请选择日期'}}
-              </text>
-              <view class="date-divider"></view>
-              <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649" class="date-arrow" mode="aspectFit"></image>
-            </view>
-          </view>
-          <view class="date-item">
-            <text class="date-label">结束日期</text>
-            <view class="date-picker-box" :class="{ disabled: formData.legal_idcard_expiry_type === 'permanent' }" 
-                  @click="formData.legal_idcard_expiry_type !== 'permanent' && openDatePicker('idcard_end_date')">
-              <text :class="formData.idcard_end_date ? 'date-value' : 'placeholder'">
-                {{formatDateForDisplay(formData.idcard_end_date) || '请选择日期'}}
-              </text>
-              <view class="date-divider"></view>
-              <image :src="formData.legal_idcard_expiry_type === 'permanent' ? 
-                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9a757f-a36c-46bb-a59f-2caddac5365b' : 
-                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649'" 
-                class="date-arrow" mode="aspectFit"></image>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-
-    <!-- 日期选择器 -->
-    <view class="popup" :class="{ show: showDatePickerFlag }">
-      <view class="popup-mask" @click="hideDatePicker"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="cancel-text" @click="hideDatePicker">取消</text>
-          <text class="title">选择日期</text>
-          <text class="confirm-text" @click="confirmDate">确定</text>
-        </view>
-        <view class="region-body">
-          <picker-view :value="dateValue" @change="bindDateChange" class="picker-scroll" 
-                      :indicator-style="indicatorStyle" mode="date" fields="day">
-            <picker-view-column>
-              <view class="picker-item" v-for="(year, index) in years" :key="index">{{year}}年</view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(month, index) in months" :key="index">{{month}}月</view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(day, index) in days" :key="index">{{day}}日</view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 提示信息弹窗 -->
-    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
-      <view class="tip-popup-mask" @click="hideTipPopup"></view>
-      <view class="tip-popup-content">
-        <!-- 弹窗背景图片 -->
-        <image class="tip-popup-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770" mode="aspectFit"></image>
-        
-        <!-- 弹窗内容 -->
-        <view class="tip-popup-body">
-          <view class="tip-title">{{ tipTitle }}</view>
-          <view class="tip-image-container">
-            <image class="tip-image" :src="tipImage" mode="widthFix"></image>
-          </view>
-          <view class="tip-buttons">
-            <view class="tip-btn cancel" @click="hideTipPopup">
-              <text class="btn-text">取消</text>
-            </view>
-            <view class="tip-btn confirm" @click="hideTipPopup">
-              <text class="btn-text">我已了解</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-
-  </view>
-</template>
-
-<script>
-import request from '../../utils/request';
-import { debounce } from '@/utils/debounce.js';
-import uploadImage from '../../utils/uploadImage';
-import permissionUtils from '../../utils/per';
-import locationService from '../../utils/locationService';
-import { recognizeIdCard, recognizeBusinessLicense, formatDateFromNumber, parseValidPeriod } from '../../utils/orc';
-
-export default {
-  data() {
-    const currentDate = new Date();
-    const currentYear = new Date().getFullYear();
-    const years = Array.from({length: 130}, (_, i) => 1970 + i);
-    const months = Array.from({length: 12}, (_, i) => i + 1);
-    const days = Array.from({length: 31}, (_, i) => i + 1);
-    
-    // 从本地存储加载数据
-    const loadedData = this.loadFormDataFromLocal();
-    
-    return {
-      userId: null,
-      // 使用本地存储初始化数据
-      formData: loadedData || {
-        uscc_type: '',
-        uscc_photo: '',
-        uscc_num: '',
-        uscc_name: '',
-        license_valid_type: '',
-        license_start_date: '',
-        license_end_date: '',
-        legal_name: '',
-        legal_phone: '',
-        legal_idcard_num: '',
-        legal_idcard_expiry_type: '',
-        idcard_start_date: '',
-        idcard_end_date: '',
-        legal_idcard_positive: '',
-        legal_idcard_negative: ''
-      },
-      showDatePickerFlag: false,
-      showTipPopupFlag: false, // 提示弹窗显示状态
-      currentDateField: '',
-      years,
-      months,
-      days,
-      dateValue: [currentYear - 1970, currentDate.getMonth(), currentDate.getDate() - 1], // 默认选中今天
-      indicatorStyle: 'height: 68rpx;',
-      tipTitle: '', // 提示弹窗标题
-      tipImage: '', // 提示弹窗图片
-      isSubmit: false, // 防止重复提交
-
-      // 识别状态
-      isRecognizing: false,
-      recognizeType: '', // 'legal_idcard_positive', 'legal_idcard_negative', 'uscc_photo'
-      identity: 2
-    }
-  },
-  computed: {
-    
-  },
-  
-  // 添加 watch 监听表单数据变化
-  watch: {
-    'formData.uscc_num'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.uscc_name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_phone'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_num'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.uscc_photo'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_positive'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_negative'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    }
-  },
-  
-  // 页面生命周期
-  onLoad(options) {
-	  console.log(1111112222)
-
-    // 获取用户信息，用于图片上传
-    this.getUserInfo();
-    
-    // 检查全局状态中是否有数据（从前一页面带过来的）
-    this.checkGlobalData();
-  },
-  
-  onShow() {
-    // 页面显示时重新从本地存储加载数据
-    const localData = this.loadFormDataFromLocal();
-    if (localData) {
-      // 合并数据，避免覆盖已有数据
-      this.formData = { ...this.formData, ...localData };
-    }
-    
-    // 检查全局状态
-    this.checkGlobalData();
-  },
-  
-  onHide() {
-    // 页面隐藏时保存数据
-    this.saveFormDataToLocal();
-  },
-  
-  onUnload() {
-    // 页面卸载时保存数据
-    this.saveFormDataToLocal();
-  },
-  
-  methods: {
-    // 检查全局数据
-    checkGlobalData() {
-      if (getApp().globalData.qualificationData) {
-        // 如果全局有数据，合并到当前表单
-        this.formData = { ...this.formData, ...getApp().globalData.qualificationData };
-        // 保存到本地存储
-        this.saveFormDataToLocal();
-        // 清空全局数据，避免重复使用
-        // delete getApp().globalData.qualificationData;
-        getApp().globalData.qualificationData = null;
-      }
-    },
-    
-    // 从本地存储加载数据
-    loadFormDataFromLocal() {
-      try {
-        const stored = uni.getStorageSync('qualification_form_data');
-        if (stored) {
-          console.log('从本地存储加载数据:', stored);
-          return stored;
-        }
-      } catch (e) {
-        console.log('读取本地存储失败:', e);
-      }
-      return null;
-    },
-    
-    // 保存数据到本地存储（带防抖）
-    saveFormDataToLocalDebounce: debounce(function() {
-      this.saveFormDataToLocal();
-    }, 500),
-    
-    // 保存数据到本地存储
-    saveFormDataToLocal() {
-      try {
-        uni.setStorageSync('qualification_form_data', this.formData);
-        console.log('数据已保存到本地存储');
-      } catch (e) {
-        console.log('保存数据失败:', e);
-      }
-    },
-    
-    // 清空本地存储（在表单提交成功后调用）
-    clearFormDataLocal() {
-      try {
-        uni.removeStorageSync('qualification_form_data');
-        console.log('已清空本地存储数据');
-      } catch (e) {
-        console.log('清空数据失败:', e);
-      }
-    },
-
-    // 获取用户信息
-    getUserInfo() {
-      return new Promise((resolve, reject) => {
-        request.post('/sj/user/getuser').then(result => {
-          if (result.state === 1) {
-            this.userId = result.data.id;
-            console.log('用户ID获取成功:', this.userId);
-            resolve(this.userId);
-          } else {
-            console.error('获取用户信息失败:', result.msg);
-            reject(result.msg);
-          }
-        }).catch(error => {
-          console.error('获取用户信息接口错误:', error);
-          reject(error);
-        });
-      });
-    },
-
-    getFormData() {
-        return {
-          ...this.formData,
-          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
-          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
-          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
-          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
-        };
-    },
-
-    // 添加日期格式化方法
-    formatDateForDisplay(dateStr) {
-      if (!dateStr) return '';
-      if (dateStr === '长久有效') return '长久有效';
-      
-      // 如果是 YYYY-MM-DD 格式，转换为 年月日 格式显示
-      if (dateStr.includes('-')) {
-        const [year, month, day] = dateStr.split('-');
-        return `${year}年${parseInt(month)}月${parseInt(day)}日`;
-      }
-      
-      return dateStr; // 如果已经是年月日格式，直接返回
-    },
-
-    // 将日期转换为后端需要的格式
-    formatDateForBackend(dateStr) {
-      if (!dateStr) return '';
-      if (dateStr === '长久有效') return 'permanent'; // 根据后端需求返回
-      
-      // 将 年月日 格式转换为 YYYY-MM-DD
-      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-      if (match) {
-        const year = match[1];
-        const month = match[2].padStart(2, '0');
-        const day = match[3].padStart(2, '0');
-        return `${year}-${month}-${day}`;
-      }
-      
-      return dateStr; // 如果已经是 YYYY-MM-DD 格式，直接返回
-    },
-
-    // 显示提示弹窗
-    showTipPopup(field) {
-      // 根据字段设置对应的标题和图片
-      const tipConfig = {
-        'uscc_num': {
-          title: '如何找到证件号码',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/72856aac-f0ac-49a1-a7f1-be3220ecb314'
-        },
-        'uscc_name': {
-          title: '如何找到企业名称',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
-        },
-        'legal_name': {
-          title: '如何找到法人代表',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/24859872-da37-4beb-8e33-7743813bb5a1'
-        }
-      };
-      
-      if (tipConfig[field]) {
-        this.tipTitle = tipConfig[field].title;
-        this.tipImage = tipConfig[field].image;
-        // 确保图片已加载再显示弹窗
-        this.ensureImageLoaded(this.tipImage).then(() => {
-          this.showTipPopupFlag = true;
-        }).catch(() => {
-          // 即使加载失败也显示弹窗，避免用户无法操作
-          this.showTipPopupFlag = true;
-        });
-      }
-    },
-
-    // 确保图片加载完成
-    ensureImageLoaded(src) {
-      return new Promise((resolve, reject) => {
-        const img = new Image();
-        img.onload = () => resolve();
-        img.onerror = () => reject();
-        img.src = src;
-        
-        // 设置超时，避免长时间等待
-        setTimeout(() => resolve(), 500);
-      });
-    },
-    
-    // 隐藏提示弹窗
-    hideTipPopup() {
-      this.showTipPopupFlag = false;
-    },
-
-
-    // 设置营业执照有效期类型
-    setLicenseValidType(type) {
-      this.formData.license_valid_type = type;
-      if (type === 'permanent') {
-        // 选择长久有效时，设置结束日期为"长久有效"
-        this.formData.license_end_date = '长久有效';
-      } else {
-        // 选择指定日期时，如果之前是长久有效，清空结束日期
-        if (this.formData.license_end_date === '长久有效') {
-          this.formData.license_end_date = '';
-        }
-      }
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    // 设置身份证有效期类型
-    setIdcardValidType(type) {
-      this.formData.legal_idcard_expiry_type = type;
-      if (type === 'permanent') {
-        // 选择长久有效时，设置结束日期为"长久有效"
-        this.formData.idcard_end_date = '长久有效';
-      } else {
-        // 选择指定日期时，如果之前是长久有效，清空结束日期
-        if (this.formData.idcard_end_date === '长久有效') {
-          this.formData.idcard_end_date = '';
-        }
-        // 如果已有开始日期，自动计算20年后的结束日期
-        if (this.formData.idcard_start_date && !this.formData.idcard_end_date) {
-          const match = this.formData.idcard_start_date.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const year = parseInt(match[1]) + 20;
-            const month = match[2];
-            const day = match[3];
-            this.formData.idcard_end_date = `${year}年${month}月${day}日`;
-          }
-        }
-      }
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    
-    // 选择商户类型
-    selectMerchantType(item) {
-      this.formData.uscc_type = item.value;
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    // 确认商户类型选择
-    confirmMerchantType() {
-      this.hideMerchantTypePicker();
-    },
-    
-    // 打开日期选择器
-    openDatePicker(field) {
-      this.currentDateField = field;
-      
-      // 设置日期选择器的初始值
-      const currentDate = new Date();
-      let initialDate = currentDate;
-      
-      // 如果该字段已经有值，解析该值作为初始值
-      if (this.formData[field]) {
-        const dateStr = this.formData[field];
-        const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-        if (match) {
-          initialDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-        }
-      }
-      
-      // 计算picker-view的value
-      const yearIndex = this.years.indexOf(initialDate.getFullYear());
-      const monthIndex = initialDate.getMonth();
-      const dayIndex = initialDate.getDate() - 1;
-      
-      this.dateValue = [
-        yearIndex >= 0 ? yearIndex : 0,
-        monthIndex,
-        dayIndex
-      ];
-      
-      this.showDatePickerFlag = true;
-    },
-    
-    // 隐藏日期选择器
-    hideDatePicker() {
-      this.showDatePickerFlag = false;
-    },
-    
-    // 日期选择变化
-    bindDateChange(e) {
-      this.dateValue = e.detail.value;
-    },
-
-    // 确认日期选择
-    confirmDate() {
-      const [yearIndex, monthIndex, dayIndex] = this.dateValue;
-      const year = this.years[yearIndex];
-      const month = this.months[monthIndex];
-      const day = this.days[dayIndex];
-      const dateStr = `${year}年${month}月${day}日`;
-      const selectedDate = new Date(year, month - 1, day);
-      const today = new Date();
-      today.setHours(0, 0, 0, 0);
-      
-      // 验证日期逻辑
-      if (this.currentDateField.endsWith('_start_date')) {
-        // 开始日期验证：不能选择今天之后的日期
-        if (selectedDate > today) {
-          uni.showToast({
-            title: '开始日期不能晚于今天',
-            icon: 'none'
-          });
-          return;
-        }
-        
-        // 如果对应的结束日期已经设置，检查开始日期是否晚于结束日期
-        const relatedEndField = this.currentDateField.replace('_start_date', '_end_date');
-        if (this.formData[relatedEndField] && this.formData[relatedEndField] !== '长久有效') {
-          const endDateStr = this.formData[relatedEndField];
-          const match = endDateStr.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const endDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-            if (selectedDate > endDate) {
-              uni.showToast({
-                title: '开始日期不能晚于结束日期',
-                icon: 'none'
-              });
-              return;
-            }
-          }
-        }
-        // 如果是身份证开始日期，自动计算结束日期
-        if (this.currentDateField === 'idcard_start_date') {
-          // 如果是"长久有效"类型，不自动设置结束日期
-          if (this.formData.legal_idcard_expiry_type === 'date') {
-            const endYear = year + 20;
-            const endDateStr = `${endYear}年${month}月${day}日`;
-            this.formData.idcard_end_date = endDateStr;
-          } else if (this.formData.legal_idcard_expiry_type === 'permanent') {
-            // 如果是"长久有效"类型，保持结束日期为"长久有效"
-            this.formData.idcard_end_date = '长久有效';
-          }
-        }
-
-      } else if (this.currentDateField.endsWith('_end_date')) {
-        const relatedStartField = this.currentDateField.replace('_end_date', '_start_date');
-        if (this.formData[relatedStartField]) {
-          const startDateStr = this.formData[relatedStartField];
-          const match = startDateStr.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const startDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-            if (selectedDate <= startDate) {
-              uni.showToast({
-                title: '结束日期必须晚于开始日期',
-                icon: 'none'
-              });
-              return;
-            }
-          }
-        } else {
-          // 如果没有设置开始日期，结束日期不能早于今天
-          if (selectedDate < today) {
-            uni.showToast({
-              title: '结束日期不能早于今天',
-              icon: 'none'
-            });
-            return;
-          }
-        }
-      }
-      
-      this.formData[this.currentDateField] = dateStr;
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-      this.hideDatePicker();
-    },
-    
-    // 选择图片
-    async chooseImage(type) {
-      try {
-        const systemInfo = uni.getSystemInfoSync()
-        
-        if (systemInfo.platform === 'ios') {
-          this.openCamera(type);
-        } else {
-          let xcpermission = '';
-          let xjpermission = '';
-          if (systemInfo.platform === 'ios') {
-            xcpermission = 'photo_library',
-            xjpermission = 'camera'
-          } else {
-            xcpermission = `android.permission.READ_EXTERNAL_STORAGE,android.permission.WRITE_EXTERNAL_STORAGE`
-            xjpermission = 'android.permission.CAMERA'
-          }
-          const xjfirstRequest = !plus.storage.getItem(`perm_${xjpermission}`)
-          const xcfirstRequest = !plus.storage.getItem(`perm_${xcpermission}`)
-          if (xcfirstRequest || xjfirstRequest) {
-            this.isShowPer = true;
-          }
-
-          // 检查权限
-          const xc = await permissionUtils.checkPermission('photo_library', '需要相册权限用于上传照片');
-          const xj = await permissionUtils.checkPermission('camera', '需要相机权限用于拍摄照片');
-          if (xc.granted && xj.granted) {
-            this.openCamera(type);
-            return;
-          }
-
-          // 请求权限
-          const result1 = await permissionUtils.requestPermission('photo_library', '我们需要访问您的相册以上传图片/视频');
-          const result2 = await permissionUtils.requestPermission('camera', '我们需要访问您的相机以上传图片/视频');
-          if (result1 && result2) {
-            this.openCamera(type);
-          } else {
-            locationService.openAppSettings();
-          }
-        }
-      } catch (err) {
-        console.log('选择图片出错:', err);
-        // 出错时也直接调用图片选择
-        this.openCamera(type);
-      }
-    },
-
-    async openCamera(type) {
-      try {
-        // 确保用户信息正确
-        if (!this.userId) {
-          console.log('重新获取用户信息...');
-          await this.getUserInfo();
-        }
-        
-        if (!this.identity) {
-          this.identity = getApp().globalData.artisanType;
-        }
-
-        // 直接使用 uni.chooseImage
-        const chooseResult = await new Promise((resolve, reject) => {
-          uni.chooseImage({
-            count: 1,
-            sizeType: ['compressed'],
-            sourceType: ['album', 'camera'],
-            success: resolve,
-            fail: reject
-          });
-        });
-
-        if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) {
-          uni.hideLoading();
-          return;
-        }
-
-        const tempFilePath = chooseResult.tempFilePaths[0];
-        
-        // 直接构造文件对象
-        const file = {
-          path: tempFilePath,
-          size: 0
-        };
-
-        // 显示上传loading
-        uni.showLoading({
-          title: '上传中...',
-          mask: true
-        });
-
-        // 手动调用上传
-        const result = await this.directUpload(file, this.userId, this.identity + 1);
-        
-        // 上传成功，更新loading显示为识别中
-        uni.hideLoading();
-        
-        if (result) {
-          this.formData[type] = result;
-          
-          // 上传成功后自动识别
-          if (type === 'uscc_photo') {
-            await this.recognizeBusinessLicense(result);
-          } else if (type === 'legal_idcard_positive') {
-            await this.recognizeIdCardFront(result);
-          } else if (type === 'legal_idcard_negative') {
-            await this.recognizeIdCardBack(result);
-          }
-          
-          // 保存到本地存储
-          this.saveFormDataToLocal();
-        }
-      } catch (err) {
-        uni.hideLoading();
-        console.log('上传图片错误:', err);
-        
-        if (!err.errMsg || !err.errMsg.includes('cancel')) {
-          uni.showToast({
-            title: '上传失败，请重试',
-            icon: 'none'
-          });
-        }
-      }
-    },
-
-    // 直接上传方法
-    async directUpload(file, userId, type) {
-      try {
-        let date = new Date().getTime();
-        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
-        
-        // 生成安全的文件名
-        let fileExtension = 'jpg';
-        if (file.path.includes('.')) {
-          let parts = file.path.split('.');
-          let ext = parts[parts.length - 1].toLowerCase();
-          if (ext && ext.length <= 4) {
-            fileExtension = ext;
-          }
-        }
-        
-        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
-        console.log('安全文件名:', name);
-
-        // 获取OSS配置
-        const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
-        
-        // 直接上传到OSS
-        return await new Promise((resolve, reject) => {
-          uni.uploadFile({
-            url: ossConfig.host,
-            filePath: file.path,
-            name: 'file',
-            formData: {
-              key: ossConfig.dir + name,
-              policy: ossConfig.policy,
-              OSSAccessKeyId: ossConfig.ossAccessKeyId,
-              success_action_status: '200',
-              signature: ossConfig.signature
-            },
-            success: (res) => {
-              if (res.statusCode === 200) {
-                const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
-                resolve(fileUrl);
-              } else {
-                reject(new Error('上传失败'));
-              }
-            },
-            fail: reject
-          });
-        });
-        
-      } catch (error) {
-        console.error('直接上传失败:', error);
-        throw error;
-      }
-    },
-
-    /**
-     * 识别营业执照
-     */
-    async recognizeBusinessLicense(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'uscc_photo';
-        // uni.showLoading({
-        //   title: '正在识别营业执照...',
-        //   mask: true
-        // });
-        
-        // 调用OCR接口
-        const result = await recognizeBusinessLicense(imageUrl);
-        console.log('营业执照识别结果:', result);
-
-        const hasRecognizedData = this.checkBusinessLicenseRecognition(result);
-        if (!hasRecognizedData) {
-          uni.showToast({
-            title: '未识别到营业执照信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 填充营业执照信息
-        let recognizedFields = 0;
-
-        // 企业名称：如果识别结果为"无"，就设置为空字符串
-        if (result.uscc_name && result.uscc_name.trim() && result.uscc_name !== '无') {
-          this.formData.uscc_name = result.uscc_name;
-          recognizedFields++;
-        } else {
-          // 如果是"无"或空值，设置为空字符串
-          this.formData.uscc_name = '';
-        }
-        
-        if (result.uscc_num && result.uscc_num.trim()) {
-          this.formData.uscc_num = result.uscc_num;
-          recognizedFields++;
-        }
-        
-        // 如果需要营业执照法人与法人代表关联则取消注释
-        // if (result.legal_name && result.legal_name.trim()) {
-        //   this.formData.legal_name = result.legal_name;
-        //   recognizedFields++;
-        // }
-
-        if (result.uscc_type && result.uscc_type.trim()) {
-          this.formData.uscc_type = result.uscc_type;
-          recognizedFields++;
-        }
-
-        // 根据识别的字段数量给出不同的提示
-        if (recognizedFields > 0) {
-        } else {
-          uni.showToast({
-            title: '识别完成，但未获取到有效信息',
-            icon: 'none',
-            duration: 3000
-          });
-        }
-        
-      } catch (error) {
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          // duration: 3000
-        });
-        console.error('营业执照识别失败:', error);
-        
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查营业执照识别结果是否有效
-    checkBusinessLicenseRecognition(result) {
-      const requiredFields = ['uscc_num', 'uscc_name', 'legal_name', 'uscc_type'];
-      
-      for (const field of requiredFields) {
-        if (result[field] && result[field].trim()) {
-          return true;
-        }
-      }
-      
-      return false;
-    },
-    
-    /**
-     * 识别身份证正面
-     */
-    async recognizeIdCardFront(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'legal_idcard_positive';
-        
-        uni.showLoading({
-          title: '正在识别身份证正面...',
-          mask: true
-        });
-        
-        // 调用OCR接口
-        const result = await recognizeIdCard(imageUrl, 1);
-
-        // 验证是否真的识别到了数据
-        const hasRecognizedData = this.checkIdCardFrontRecognition(result);
-        
-        if (!hasRecognizedData) {
-          uni.hideLoading();
-          uni.showToast({
-            title: '未识别到身份证信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 填充身份证正面信息
-        if (result.name) {
-          this.formData.legal_name = result.name;
-        }
-        
-        if (result.id_number) {
-          this.formData.legal_idcard_num = result.id_number;
-        }
-        
-        uni.showToast({
-          title: '身份证正面识别成功',
-          icon: 'none'
-        });
-        
-      } catch (error) {
-        console.error('身份证正面识别失败:', error);
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          duration: 3000
-        });
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查身份证正面识别结果是否有效
-    checkIdCardFrontRecognition(result) {
-      return (result.name && result.name.trim()) || (result.id_number && result.id_number.trim());
-    },
-    
-    /**
-     * 识别身份证反面
-     */
-    async recognizeIdCardBack(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'legal_idcard_negative';
-        
-        uni.showLoading({
-          title: '正在识别身份证反面...',
-          mask: true
-        });
-        
-        // 调用OCR接口
-        const result = await recognizeIdCard(imageUrl, 2);
-
-        // 验证是否真的识别到了数据
-        const hasRecognizedData = this.checkIdCardBackRecognition(result);
-        
-        if (!hasRecognizedData) {
-          uni.hideLoading();
-          uni.showToast({
-            title: '未识别到身份证有效期信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 解析有效期
-        const validPeriod = parseValidPeriod(result.start_date, result.end_date);
-        
-        // 填充有效期数据
-        if (validPeriod.startDate) {
-          this.formData.idcard_start_date = validPeriod.startDate;
-        }
-        
-        if (validPeriod.isPermanent) {
-          this.formData.legal_idcard_expiry_type = 'permanent';
-          this.formData.idcard_end_date = '长久有效';
-        } else if (validPeriod.endDate) {
-          this.formData.legal_idcard_expiry_type = 'date';
-          this.formData.idcard_end_date = validPeriod.endDate;
-        }
-        
-        // 如果是长期有效，自动选择对应的选项
-        if (validPeriod.isPermanent) {
-          this.setIdcardValidType('permanent');
-        } else {
-          this.setIdcardValidType('date');
-        }
-        
-        uni.showToast({
-          title: '身份证反面识别成功',
-          icon: 'none'
-        });
-        
-      } catch (error) {
-        console.error('身份证反面识别失败:', error);
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          duration: 3000
-        });
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查身份证反面识别结果是否有效
-    checkIdCardBackRecognition(result) {
-      return (result.start_date && result.start_date.trim()) || 
-            (result.end_date && result.end_date.trim());
-    },
-
-    // 验证表单数据
-    validateForm() {
-      // 按照表单从上到下的顺序定义验证规则
-      const validationRules = [
-        { field: 'uscc_photo', message: '请上传营业执照照片' },
-        { field: 'uscc_type', message: '请输入商户类型' },
-        { field: 'uscc_num', message: '请输入营业执照号码' },
-        { field: 'uscc_name', message: '请输入企业名称' },
-                { field: 'legal_idcard_positive', message: '请上传身份证正面照片' },
-        { field: 'legal_idcard_negative', message: '请上传身份证反面照片' },
-        { field: 'legal_name', message: '请输入法人代表' },
-        { field: 'legal_phone', message: '请输入法人联系方式' },
-        { field: 'legal_idcard_num', message: '请输入法人身份证号' },
-        { 
-          condition: () => !this.formData.legal_idcard_expiry_type, 
-          message: '请选择身份证有效期类型' 
-        },
-        { 
-          condition: () => !this.formData.idcard_start_date, 
-          message: '请选择身份证开始日期' 
-        },
-        {
-          condition: () => {
-            if (this.formData.legal_idcard_expiry_type === 'data' && !this.formData.idcard_end_date) {
-              return true;
-            }
-            // 如果选择长久有效，则不需要结束日期
-            return false;
-          },
-          message: '请选择身份证结束日期' 
-        },
-      ];
-
-      // 按顺序验证
-      for (let rule of validationRules) {
-        let isValid = true;
-        
-        if (rule.field) {
-          // 简单字段验证
-          if (!this.formData[rule.field]) {
-            isValid = false;
-          }
-        } else if (rule.condition) {
-          // 条件验证
-          if (rule.condition()) {
-            isValid = false;
-          }
-        }
-        
-        if (!isValid) {
-          uni.showToast({
-            title: rule.message,
-            icon: 'none'
-          });
-          return false;
-        }
-      }
-      
-      // 验证手机号格式
-      if (!/^1[3-9]\d{9}$/.test(this.formData.legal_phone)) {
-        uni.showToast({
-          title: '请输入正确的手机号码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      // 验证身份证格式
-      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.formData.legal_idcard_num)) {
-        uni.showToast({
-          title: '请输入正确的身份证号码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      return true;
-    },
-
-    // 将日期字符串转换为Date对象
-    parseDateString(dateStr) {
-      if (!dateStr) return null;
-      
-      // 处理年月日格式
-      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-      if (match) {
-        return new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-      }
-      
-      // 处理 YYYY-MM-DD 格式
-      if (dateStr.includes('-')) {
-        const dateParts = dateStr.split('-');
-        if (dateParts.length === 3) {
-          return new Date(parseInt(dateParts[0]), parseInt(dateParts[1]) - 1, parseInt(dateParts[2]));
-        }
-      }
-      
-      return null;
-    },
-
-    // 保存表单数据（在进入下一步时调用）
-    // 修改后的 saveFormData 方法
-    saveFormData() {
-      console.log('开始验证表单数据');
-      console.log('表单数据:', this.formData);
-      console.log('法人姓名:', this.formData.legal_name);
-      console.log('法人身份证号:', this.formData.legal_idcard_num);
-      
-      if (this.validateForm()) {
-        console.log('表单验证通过，开始验证法人信息');
-        
-        // 验证法人姓名与身份证号是否匹配
-        return this.checkIdCardAndName();
-      }
-      
-      console.log('表单验证失败');
-      return false;
-    },
-
-    // 修改后的 checkIdCardAndName 方法，添加详细调试
-    async checkIdCardAndName() {
-      if (this.isSubmit) {
-        console.log(' 重复提交被阻止 ');
-        return false;
-      }
-
-      this.isSubmit = true;
-
-      try {
-        console.log('开始调用身份验证接口');
-        console.log('请求参数:', {
-          name: this.formData.legal_name,
-          idcard: this.formData.legal_idcard_num
-        });
-        
-        uni.showLoading({
-          title: '验证身份信息...'
-        });
-
-        // 调用身份验证接口
-        const checkRes = await request.post('/user/check', {
-          name: this.formData.legal_name,
-          idcard: this.formData.legal_idcard_num
-        });
-
-        uni.hideLoading();
-        
-        console.log('身份验证接口返回结果 ');
-        console.log('完整响应:', checkRes);
-        console.log('响应Code:', checkRes.Code);
-        console.log('响应state:', checkRes.state);
-        console.log('响应msg:', checkRes.msg);
-        console.log('响应data:', checkRes.data);
-        console.log('响应ResultObject:', checkRes.ResultObject);
-        
-        if (checkRes.ResultObject) {
-          console.log('ResultObject.BizCode:', checkRes.ResultObject.BizCode);
-          console.log('ResultObject其他属性:', Object.keys(checkRes.ResultObject));
-        }
-
-        // 根据参考代码的验证逻辑，但需要先检查响应结构
-        if (checkRes.Code === '401') {
-          console.log(' Code 401 验证失败 ');
-          uni.showToast({
-            title: '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-        
-        // 检查多种可能的响应结构
-        if (checkRes.ResultObject) {
-          // 如果 ResultObject 有 BizCode 属性
-          if (checkRes.ResultObject.BizCode && checkRes.ResultObject.BizCode != '1') {
-            console.log(' BizCode 验证失败 ');
-            uni.showToast({
-              title: '您的身份证号与姓名不匹配',
-              icon: 'none',
-              duration: 3000
-            });
-            this.isSubmit = false;
-            return false;
-          }
-          
-          // 如果有其他表示失败的字段
-          if (checkRes.ResultObject.success === false || checkRes.ResultObject.result === false) {
-            console.log('success/result 验证失败');
-            uni.showToast({
-              title: '您的身份证号与姓名不匹配',
-              icon: 'none',
-              duration: 3000
-            });
-            this.isSubmit = false;
-            return false;
-          }
-        }
-        
-        // 检查直接返回的状态字段
-        if (checkRes.state && checkRes.state !== 1) {
-          console.log('state 验证失败');
-          uni.showToast({
-            title: checkRes.msg || '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-        
-        // 如果直接返回 success: false
-        if (checkRes.success === false) {
-          console.log('success 验证失败');
-          uni.showToast({
-            title: checkRes.message || '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-
-        console.log('身份验证通过 ');
-        
-        // 验证通过，创建提交给后端的数据副本，将日期转换为 YYYY-MM-DD 格式
-        const submitData = {
-          ...this.formData,
-          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
-          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
-          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
-          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
-        };
-
-        console.log('submitData:', submitData);
-
-        // 将表单数据保存到全局或本地存储，以便在下一步使用
-        getApp().globalData.qualificationData = submitData;
-        
-        this.isSubmit = false;
-        return true;
-
-      } catch (error) {
-        uni.hideLoading();
-        console.error('身份验证接口调用失败');
-        console.error('错误信息:', error);
-        console.error('错误详情:', error.response || error.message || error);
-        
-        // 根据错误类型显示不同的提示
-        let errorMessage = '身份验证失败';
-        
-        if (error.response) {
-          console.error('响应状态:', error.response.status);
-          console.error('响应数据:', error.response.data);
-          errorMessage = `服务器错误: ${error.response.status}`;
-        } else if (error.message) {
-          errorMessage = error.message;
-        } else if (error.errMsg) {
-          errorMessage = error.errMsg;
-        }
-        
-        uni.showToast({
-          title: errorMessage,
-          icon: 'none',
-          duration: 3000
-        });
-        
-        this.isSubmit = false;
-        return false;
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.qualification-page {
-  /* padding: 0rpx 0; */
-}
-
-.section {
-  margin-bottom: 30rpx;
-}
-
-.section-title {
-  display: flex;
-  align-items: center;
-  margin-bottom: 30rpx;
-}
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 7rpx;
-  border-radius: 5rpx;
-}
-
-.title-text {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #1D2129;
-  line-height: 48rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.section-title text {
-  font-size: 36rpx;
-  color: #1D2129;
-  font-weight: 500;
-}
-
-.box-cont {
-  background: #FFFFFF;
-  border-radius: 20rpx;
-  margin-bottom: 24rpx;
-  margin-left: 8rpx;
-  margin-right: 8rpx;
-  box-shadow: none;
-}
-
-.form-item {
-  padding: 24rpx 22rpx;
-}
-
-.form-item-one {
-  display: flex;
-  align-items: center;
-  padding: 24rpx;
-}
-
-.label-wrapper {
-  display: inline-flex;
-  align-items: center;
-}
-
-.label {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-  line-height: 1;
-}
-
-.label-icon {
-  width: 26rpx;
-  height: 26rpx;
-  margin-left: 8rpx;
-  align-items: center;
-}
-
-.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
-
-.upload-tip {
-  font-size: 26rpx;
-  color: #999;
-  margin: 16rpx 0 24rpx 0;
-  font-weight: 400;
-  font-family: PingFangSC, PingFang SC;
-  text-align: left;
-  font-style: normal;
-}
-
-.upload-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.upload-box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.upload-camera {
-  width: 446rpx;
-  height: 298rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 48rpx;
-  overflow: hidden;
-  background-color: #F8F9FD;
-  position: relative;
-}
-
-.idcard-upload-vertical-container {
-  display: flex;
-  flex-direction: column;
-  padding: 24rpx;
-}
-
-.idcard-upload-vertical-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-bottom: 40rpx;
-}
-
-.idcard-upload-vertical-item:last-child {
-  margin-bottom: 0;
-}
-
-.upload-label.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
-
-.license-upload {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.idcard-front {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.idcard-back {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.camera-icon {
-  width: 446rpx;
-  height: 298rpx;
-  border-radius: 48rpx;
-}
-
-.preview-image {
-  border-radius: 48rpx;
-  width: 100%;
-  height: 100%;
-}
-
-/* 识别状态样式 */
-.recognize-overlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.6);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  border-radius: 48rpx;
-}
-
-.recognize-loading {
-  width: 60rpx;
-  height: 60rpx;
-  border: 4rpx solid #fff;
-  border-top: 4rpx solid #E8101E;
-  border-radius: 50%;
-  animation: spin 1s linear infinite;
-  margin-bottom: 16rpx;
-}
-
-.recognize-text {
-  color: #fff;
-  font-size: 24rpx;
-}
-
-@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
-.picker-content {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  flex: 1;
-}
-
-.picker-content text {
-  margin-right: 19rpx;
-}
-
-/* 日期选择框竖线分隔符 */
-.date-divider {
-  width: 2rpx;
-  height: 30rpx;
-  background-color: #E9E9E9;
-  margin: 0 15rpx 0 0;
-}
-
-/* 置灰状态下的竖线 */
-.date-picker-box.disabled .date-divider {
-  background-color: #F3F3F3;
-}
-
-/* 确保日期文字区域可以自动扩展 */
-.date-picker-box text {
-  flex: 1;
-}
-
-.arrow-right {
-  width: 14rpx;
-  height: 26rpx;
-}
-
-
-.placeholder {
-  color: #999999;
-  font-size: 28rpx;
-}
-
-.picker-value {
-  font-size: 28rpx;
-  color: #333333;
-}
-
-.input {
-  flex: 1;
-  font-size: 28rpx;
-  color: #333333;
-  text-align: right;
-  margin-left: 20rpx;
-}
-
-.radio-group {
-  display: flex;
-  margin-top: 24rpx;
-  width: 100%;
-}
-
-.radio-item {
-  display: flex;
-  align-items: center;
-  margin-right: 130rpx;
-}
-
-.radio {
-  width: 30rpx;
-  height: 30rpx;
-  border: 2rpx solid #DDDDDD;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 16rpx;
-}
-
-.radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
-}
-
-.radio-icon-image {
-  width: 32rpx;
-  height: 32rpx;
-}
-
-.radio-label {
-  font-size: 28rpx;
-  color: #333333;
-}
-
-/* 日期范围容器样式 */
-.date-range-container {
-  padding: 24rpx;
-  display: flex;
-  justify-content: space-between;
-}
-
-.date-item {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-.date-item:first-child {
-  margin-right: 24rpx;
-}
-
-.date-label {
-  font-size: 28rpx;
-  color: #333333;
-  margin-bottom: 16rpx;
-  font-weight: 500;
-  margin-left: 8rpx;
-}
-
-.date-picker-box {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border: 2rpx solid #E9E9E9;
-  border-radius: 10rpx;
-  padding: 12rpx 19rpx;
-  background-color: transparent;
-}
-
-.date-picker-box.disabled {
-  border: 2rpx solid #F3F3F3;
-}
-
-.date-picker-box.disabled .date-value,
-.date-picker-box.disabled .placeholder {
-  color: #CCCCCC;
-}
-
-.date-value {
-  font-size: 28rpx;
-  color: #333;
-}
-
-.date-arrow {
-  width: 35rpx;
-  height: 33rpx;
-}
-
-.upload-label {
-  font-family: Helvetica;
-  font-size: 28rpx;
-  color: #999;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-  margin-top: 24rpx;
-}
-
-/* 弹出框样式 */
-.popup {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 999;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.popup-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.popup-content {
-  position: relative;
-  background-color: #FFFFFF;
-  border-radius: 24rpx 24rpx 0 0;
-  padding: 32rpx;
-  transform: translateY(100%);
-  transition: transform 0.3s ease;
-  max-height: 70vh;
-}
-
-.popup.show .popup-content {
-  transform: translateY(0);
-}
-
-.popup-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 32rpx;
-}
-
-.popup-title {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.popup-close {
-  font-size: 40rpx;
-  color: #999999;
-  padding: 16rpx;
-}
-
-.popup-body {
-  max-height: 400rpx;
-  overflow-y: auto;
-}
-
-.radio-list .radio-item {
-  margin-bottom: 32rpx;
-}
-
-.popup-footer {
-  margin-top: 32rpx;
-}
-
-.popup-btn {
-  height: 88rpx;
-  border-radius: 44rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-}
-
-.popup-btn .btn-text {
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #FFFFFF;
-}
-
-.cancel-text, .confirm-text {
-  font-size: 32rpx;
-  padding: 16rpx;
-}
-
-.cancel-text {
-  color: #666666;
-}
-
-.confirm-text {
-  color: #E8101E;
-  font-weight: 500;
-}
-
-.picker-scroll {
-  height: 400rpx;
-}
-
-.picker-item {
-  height: 68rpx;
-  line-height: 68rpx;
-  text-align: center;
-  font-size: 28rpx;
-}
-
-/* 提示弹窗样式 */
-.tip-popup {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 1000;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.tip-popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.tip-popup-mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.tip-popup-content {
-  position: relative;
-  width: 620rpx;
-  height: 810rpx;
-}
-
-.tip-popup-bg {
-  width: 620rpx;
-  height: 810rpx;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.tip-popup-body {
-  position: relative;
-  flex-direction: column;
-  padding: 80rpx 20rpx 40rpx 20rpx;
-  box-sizing: border-box;
-}
-
-.tip-title {
-  font-size: 36rpx;
-  font-weight: bold;
-  color: #333;
-  text-align: center;
-  margin-top: 107rpx;
-  margin-bottom: 37rpx;
-}
-
-.tip-image-container {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 50rpx;
-}
-
-.tip-image {
-  width: 90%;
-  max-height: 400rpx;
-}
-
-.tip-buttons {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 28rpx;
-}
-
-.tip-btn {
-  width: 250rpx;
-  height: 80rpx;
-  border-radius: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 32rpx;
-  font-weight: 500;
-}
-
-.tip-btn.cancel {
-  border: #E8101E 2rpx solid;
-  background-color: transparent;
-  color: #e8101e;
-}
-
-.tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-  color: #FFFFFF;
-}
-
-.tip-btn .btn-text {
-  color: inherit;
-}
-</style>
\ No newline at end of file
+<template>
+  <view class="qualification-page">
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">门店信息</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+          <text class="label required">店铺名称</text>
+        </view>
+        <input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+      <view class="form-item-two box-cont" @click="showLocationPopup">
+        <text class="label required">门店所在地</text>
+        <view class="picker-content">
+          <text :class="formData.dependency ? 'picker-value' : 'placeholder'">
+            {{ formData.dependency || '请选择' }}
+          </text>
+          <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+            class="arrow-right" mode="aspectFit"></image>
+        </view>
+      </view>
+      <view class="form-item-two box-cont" @click="getAddressInfo">
+        <text class="label required">门店详细地址</text>
+        <view class="picker-content">
+          <text :class="formData.address ? 'picker-value' : 'placeholder'">
+            {{ formData.address || '请选择' }}
+          </text>
+          <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+            class="arrow-right" mode="aspectFit"></image>
+        </view>
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">联系人信息</text>
+      </view>
+
+      <view class="form-item box-cont">
+        <text class="label required">您的身份</text>
+        <view class="radio-group">
+          <view class="radio-item" @click="setContactType('1')">
+            <view class="radio" :class="{ checked: formData.contact_type === '1' }">
+              <image v-if="formData.contact_type === '1'"
+                src="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="setContactType('2')">
+            <view class="radio" :class="{ checked: formData.contact_type === '2' }">
+              <image v-if="formData.contact_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>
+        </view>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">联系人</text>
+        <input type="text" v-model="formData.contact_name" placeholder="请输入" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">联系人电话</text>
+        <input type="number" v-model="formData.contact_phone" placeholder="请输入联系电话" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label">备用联系人电话</text>
+        <input type="number" v-model="formData.backup_phone" placeholder="请输入备用联系电话" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">其他信息</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">邀请码</text>
+        <input type="text" v-model="formData.invite_code" placeholder="请输入邀请码" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+      <view class="invite-tip box-cont">
+        <text class="invite-tip-text">请填写邀请人的邀请码，若没有邀请人请填写13131313</text>
+      </view>
+    </view>
+
+    <view class="popup" :class="{ show: showLocationPopupFlag }">
+      <view class="popup-mask" @click="hideLocationPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择所在地</text>
+          <text class="popup-close" @click="hideLocationPopup">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
+            :value="locationValue">
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
+                {{ item.province }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in locatinCitys" :key="index">
+                {{ item.city }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in locationAreas" :key="index">
+                {{ item.area }}
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideLocationPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmLocationSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+      <view class="tip-popup-mask" @click="hideTipPopup"></view>
+      <view class="tip-popup-content">
+        <image class="tip-popup-bg"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
+          mode="aspectFit"></image>
+
+        <view class="tip-popup-body">
+          <view class="tip-title">{{ tipTitle }}</view>
+          <view class="tip-image-container">
+            <image class="tip-image" :src="tipImage" mode="widthFix"></image>
+          </view>
+          <view class="tip-buttons">
+            <view class="tip-btn cancel" @click="hideTipPopup">
+              <text class="btn-text">取消</text>
+            </view>
+            <view class="tip-btn confirm" @click="hideTipPopup">
+              <text class="btn-text">我已了解</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import { debounce } from '@/utils/debounce.js';
+import ChinaCitys from '../../static/data/ChinaCitys.json';
+
+export default {
+  data() {
+    const loadedData = this.loadFormDataFromLocal();
+
+    return {
+      userId: null,
+      formData: loadedData || {
+        name: '',
+        contact_type: '1',
+        contact_name: '',
+        contact_phone: '',
+        backup_phone: '',
+        invite_code: '',
+        dependency: '',
+        address: '',
+        dependency_code: '',
+        dependency_province: '',
+        dependency_city: '',
+        longitude: '',
+        latitude: ''
+      },
+      showTipPopupFlag: false,
+      indicatorStyle: 'height: 68rpx;',
+      tipTitle: '',
+      tipImage: '',
+      isSubmit: false,
+      identity: 2,
+
+      ChinaCitys: ChinaCitys,
+      locatinCitys: [],
+      locationAreas: [],
+      locationValue: [0, 0, 0],
+      showLocationPopupFlag: false
+    }
+  },
+  computed: {
+
+  },
+
+  watch: {
+    'formData.name'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.contact_name'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.contact_phone'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.backup_phone'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.invite_code'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.dependency'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.address'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    }
+  },
+
+  created() {
+    this.getUserInfo();
+    this.checkGlobalData();
+    this.setupAddressListener();
+  },
+
+  onShow() {
+    const localData = this.loadFormDataFromLocal();
+    if (localData) {
+      this.formData = {
+        ...this.formData,
+        ...localData
+      };
+    }
+
+    this.checkGlobalData();
+    this.checkAddressData();
+  },
+
+  onUnload() {
+    this.saveFormDataToLocal();
+  },
+
+  beforeDestroy() {
+    if (this.addressListener) {
+      uni.$off('address-selected', this.addressListener);
+    }
+    if (this.sjAddressListener) {
+      uni.$off('address-selected-for-sj', this.sjAddressListener);
+    }
+  },
+
+  mounted() {
+    this.locatinCitys = this.ChinaCitys[0].citys;
+    this.locationAreas = this.locatinCitys[0].areas;
+  },
+
+  onHide() {
+    this.saveFormDataToLocal();
+  },
+
+  methods: {
+    checkGlobalData() {
+      if (getApp().globalData.qualificationData) {
+        this.formData = {
+          ...this.formData,
+          ...getApp().globalData.qualificationData
+        };
+        this.saveFormDataToLocal();
+        getApp().globalData.qualificationData = null;
+      }
+    },
+
+    loadFormDataFromLocal() {
+      try {
+        const stored = uni.getStorageSync('qualification_form_data');
+        if (stored) {
+          console.log('从本地存储加载数据:', stored);
+          return stored;
+        }
+      } catch (e) {
+        console.log('读取本地存储失败:', e);
+      }
+      return null;
+    },
+
+    saveFormDataToLocalDebounce: debounce(function () {
+      this.saveFormDataToLocal();
+    }, 500),
+
+    saveFormDataToLocal() {
+      try {
+        uni.setStorageSync('qualification_form_data', this.formData);
+        console.log('数据已保存到本地存储');
+      } catch (e) {
+        console.log('保存数据失败:', e);
+      }
+    },
+
+    clearFormDataLocal() {
+      try {
+        uni.removeStorageSync('qualification_form_data');
+        console.log('已清空本地存储数据');
+      } catch (e) {
+        console.log('清空数据失败:', e);
+      }
+    },
+
+    getUserInfo() {
+      return new Promise((resolve, reject) => {
+        request.post('/sj/user/getuser').then(result => {
+          if (result.state === 1) {
+            this.userId = result.data.id;
+            console.log('用户ID获取成功:', this.userId);
+            resolve(this.userId);
+          } else {
+            console.error('获取用户信息失败:', result.msg);
+            reject(result.msg);
+          }
+        }).catch(error => {
+          console.error('获取用户信息接口错误:', error);
+          reject(error);
+        });
+      });
+    },
+
+    getFormData() {
+      return { ...this.formData };
+    },
+
+    saveFormData() {
+      if (!this.formData.name) {
+        uni.showToast({ title: '请输入店铺名称', icon: 'none' });
+        return false;
+      }
+      if (!this.formData.dependency) {
+        uni.showToast({ title: '请选择门店所在地', icon: 'none' });
+        return false;
+      }
+      if (!this.formData.address) {
+        uni.showToast({ title: '请选择门店详细地址', icon: 'none' });
+        return false;
+      }
+      if (!this.formData.contact_name) {
+        uni.showToast({ title: '请输入联系人', icon: 'none' });
+        return false;
+      }
+      if (!this.formData.contact_phone) {
+        uni.showToast({ title: '请输入联系人电话', icon: 'none' });
+        return false;
+      }
+      if (!/^1[3-9]\d{9}$/.test(this.formData.contact_phone)) {
+        uni.showToast({ title: '请输入正确的手机号码', icon: 'none' });
+        return false;
+      }
+      if (!this.formData.invite_code) {
+        uni.showToast({ title: '请输入邀请码', icon: 'none' });
+        return false;
+      }
+      this.saveFormDataToLocal();
+      return true;
+    },
+
+    setContactType(type) {
+      this.$set(this.formData, 'contact_type', type);
+      this.saveFormDataToLocal();
+    },
+
+    showTipPopup(field) {
+      const tipConfig = {
+        'name': {
+          title: '如何找到店铺名称',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
+        }
+      };
+
+      if (tipConfig[field]) {
+        this.tipTitle = tipConfig[field].title;
+        this.tipImage = tipConfig[field].image;
+        this.showTipPopupFlag = true;
+      }
+    },
+
+    hideTipPopup() {
+      this.showTipPopupFlag = false;
+    },
+
+    showLocationPopup() {
+      this.showLocationPopupFlag = true;
+    },
+
+    hideLocationPopup() {
+      this.showLocationPopupFlag = false;
+    },
+
+    bindChangeLocation(e) {
+      this.locationValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.locatinCitys = this.ChinaCitys[index1].citys;
+      this.locationAreas = this.locatinCitys[index2].areas;
+    },
+
+    confirmLocationSelect() {
+      let valueArr = this.locationValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+      let province = this.ChinaCitys[index1].province;
+      let city = this.locatinCitys[index2].city;
+      let area = this.locationAreas[index3].area;
+      this.formData.dependency = province + '-' + city + '-' + area;
+
+      this.formData.address = '';
+      this.formData.longitude = '';
+      this.formData.latitude = '';
+
+      if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+        let provinceCode = this.ChinaCitys[index1].code.toString();
+        this.formData.dependency_province = provinceCode.substring(0, 6);
+      }
+      if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
+        let cityCode = this.locatinCitys[index2].code.toString();
+        this.formData.dependency_city = cityCode.substring(0, 6);
+      }
+      if (this.locationAreas[index3] && this.locationAreas[index3].code) {
+        let areaCode = this.locationAreas[index3].code.toString();
+        this.formData.dependency_code = areaCode.substring(0, 6);
+      }
+
+      this.saveFormDataToLocal();
+      this.hideLocationPopup();
+    },
+
+    buildRegionTextForSearch() {
+      const dependency = String(this.formData.dependency || '').trim();
+      if (!dependency) return '';
+
+      const parts = dependency.split('-');
+      const province = parts[0] || '';
+      const city = parts[1] || '';
+      const district = parts[2] || '';
+
+      let regionText = '';
+      if (province) regionText += province;
+      if (city && city !== province) regionText += city;
+      if (district) regionText += district;
+
+      return regionText;
+    },
+
+    getAddressValueForSearch() {
+      const rawAddress = String(this.formData.address || '').trim();
+      if (!rawAddress) return '';
+
+      const dependencyText = String(this.formData.dependency || '').trim();
+      const regionText = this.buildRegionTextForSearch();
+
+      let detail = rawAddress;
+
+      if (regionText && detail.indexOf(regionText) === 0) {
+        detail = detail.slice(regionText.length).trim();
+      } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+        detail = detail.slice(dependencyText.length).trim();
+      }
+
+      detail = detail.replace(/^[\s,-]+/, '').trim();
+
+      return detail || rawAddress;
+    },
+
+    getAddressInfo() {
+      this.saveFormDataToLocal();
+
+      const dependency = String(this.formData.dependency || '').trim();
+      const dependencyCode = String(this.formData.dependency_code || '').trim();
+      const address = this.getAddressValueForSearch();
+      const longitude = String(this.formData.longitude || '').trim();
+      const latitude = String(this.formData.latitude || '').trim();
+
+      const hasDependency = !!dependency;
+      const hasAddress = !!address;
+      const hasLocation = !!(longitude && latitude);
+
+      let params = 'source=sj_info';
+
+      if (hasDependency) {
+        params += `&dependency=${encodeURIComponent(dependency)}`;
+        if (dependencyCode) {
+          params += `&dependency_code=${dependencyCode}`;
+        }
+      }
+
+      if (hasAddress) {
+        params += `&address=${encodeURIComponent(address)}`;
+      }
+
+      if (hasLocation) {
+        params += `&longitude=${longitude}&latitude=${latitude}`;
+      }
+
+      if (!hasDependency && !hasAddress && !hasLocation) {
+        params += '&init_current_location=1&silent_locate=1';
+      }
+
+      uni.navigateTo({
+        url: `/pages/address/search?${params}`
+      });
+    },
+
+    setupAddressListener() {
+      this.addressListener = (addressData) => {
+        this.handleAddressSelected(addressData);
+      };
+      this.sjAddressListener = (addressData) => {
+        this.handleAddressSelected(addressData);
+      };
+      uni.$on('address-selected', this.addressListener);
+      uni.$on('address-selected-for-sj', this.sjAddressListener);
+    },
+
+    checkAddressData() {
+      try {
+        const storedAddress = uni.getStorageSync('sj_selected_address');
+        if (storedAddress) {
+          this.handleAddressSelected(storedAddress);
+          uni.removeStorageSync('sj_selected_address');
+          return;
+        }
+      } catch (e) { }
+
+      if (getApp().globalData && getApp().globalData.selectedAddress) {
+        this.handleAddressSelected(getApp().globalData.selectedAddress);
+        delete getApp().globalData.selectedAddress;
+      }
+
+      try {
+        const selectedAddress = uni.getStorageSync('selectedAddress');
+        if (selectedAddress) {
+          this.handleAddressSelected(selectedAddress);
+          uni.removeStorageSync('selectedAddress');
+        }
+      } catch (e) { }
+    },
+
+    handleAddressSelected(addressData) {
+      if (!addressData) return;
+
+      let detailAddress = '';
+      if (addressData.address) {
+        detailAddress = String(addressData.address).trim();
+      } else if (addressData.name) {
+        detailAddress = String(addressData.name).trim();
+
+        const regionParts = [];
+        if (addressData.pname) regionParts.push(addressData.pname);
+        if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData.cityname);
+        if (addressData.adname) regionParts.push(addressData.adname);
+
+        const regionText = regionParts.join('');
+
+        if (regionText && detailAddress.indexOf(regionText) === 0) {
+          detailAddress = detailAddress.slice(regionText.length).trim();
+        }
+
+        detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
+      }
+
+      this.formData.address = detailAddress;
+
+      if (addressData.location) {
+        const [longitude, latitude] = String(addressData.location).split(',');
+        this.formData.longitude = longitude || '';
+        this.formData.latitude = latitude || '';
+      }
+
+      if (addressData.pname || addressData.cityname || addressData.adname) {
+        const locationParts = [];
+        if (addressData.pname) locationParts.push(addressData.pname);
+        if (addressData.cityname) locationParts.push(addressData.cityname);
+        if (addressData.adname) locationParts.push(addressData.adname);
+        this.formData.dependency = locationParts.join('-');
+      }
+
+      this.formData.dependency_province = addressData.provinceCode || '';
+      this.formData.dependency_city = addressData.cityCode || '';
+      this.formData.dependency_code = addressData.districtCode || '';
+
+      this.saveFormDataToLocal();
+      this.$forceUpdate();
+    }
+  }
+}
+</script>
+
+<style scoped>
+.qualification-page {}
+
+.section {
+  margin-bottom: 30rpx;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30rpx;
+}
+
+.title-bar {
+  width: 6rpx;
+  height: 30rpx;
+  background-color: #E8101E;
+  margin-right: 7rpx;
+  border-radius: 5rpx;
+}
+
+.title-text {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #1D2129;
+  line-height: 48rpx;
+  text-align: left;
+  font-style: normal;
+}
+
+.section-title text {
+  font-size: 36rpx;
+  color: #1D2129;
+  font-weight: 500;
+}
+
+.box-cont {
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  margin-bottom: 24rpx;
+  margin-left: 8rpx;
+  margin-right: 8rpx;
+  box-shadow: none;
+}
+
+.form-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+}
+
+.form-item-one {
+  display: flex;
+  align-items: center;
+  padding: 24rpx;
+}
+
+.form-item-two {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+}
+
+.form-item-two>text.label {
+  flex-shrink: 0;
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.label-wrapper {
+  display: inline-flex;
+  align-items: center;
+}
+
+.label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  line-height: 1;
+}
+
+.label-icon {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 8rpx;
+  align-items: center;
+}
+
+.required::before {
+  content: '*';
+  color: #FF0000;
+  margin-right: 4rpx;
+}
+
+.picker-content {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  flex: 1;
+}
+
+.picker-content text {
+  margin-right: 19rpx;
+}
+
+.arrow-right {
+  width: 14rpx;
+  height: 26rpx;
+}
+
+.placeholder {
+  color: #999999;
+  font-size: 28rpx;
+}
+
+.picker-value {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.input {
+  flex: 1;
+  font-size: 28rpx;
+  color: #333333;
+  text-align: right;
+  margin-left: 20rpx;
+}
+
+.radio-group {
+  display: flex;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 130rpx;
+}
+
+.radio {
+  width: 30rpx;
+  height: 30rpx;
+  border: 2rpx solid #DDDDDD;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16rpx;
+}
+
+.radio.checked {
+  background-color: #E8101E;
+  border-color: #E8101E;
+}
+
+.radio-icon-image {
+  width: 32rpx;
+  height: 32rpx;
+}
+
+.radio-label {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.invite-tip {
+  padding: 24rpx;
+}
+
+.invite-tip-text {
+  font-size: 26rpx;
+  color: #999999;
+  line-height: 40rpx;
+}
+
+.popup {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.popup-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+  position: relative;
+  background-color: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+  padding: 32rpx;
+  transform: translateY(100%);
+  transition: transform 0.3s ease;
+  max-height: 70vh;
+}
+
+.popup.show .popup-content {
+  transform: translateY(0);
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 32rpx;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999999;
+  padding: 16rpx;
+}
+
+.popup-footer {
+  margin-top: 32rpx;
+  display: flex;
+  justify-content: space-between;
+  gap: 20rpx;
+  padding: 0 24rpx 24rpx;
+}
+
+.popup-btn {
+  flex: 1;
+  height: 88rpx;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+}
+
+.popup-btn.cancel {
+  background-color: #F5F5F5;
+}
+
+.popup-btn.confirm {
+  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+}
+
+.popup-btn .btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #FFFFFF;
+}
+
+.popup-btn.cancel .btn-text {
+  color: #666666;
+}
+
+.popup-btn.confirm .btn-text {
+  color: #FFFFFF;
+}
+
+.region-body {
+  height: 400rpx;
+}
+
+.picker-scroll {
+  height: 400rpx;
+}
+
+.picker-item {
+  height: 68rpx;
+  line-height: 68rpx;
+  text-align: center;
+  font-size: 28rpx;
+}
+
+.tip-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.tip-popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.tip-popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.tip-popup-content {
+  position: relative;
+  width: 620rpx;
+  height: 810rpx;
+}
+
+.tip-popup-bg {
+  width: 620rpx;
+  height: 810rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.tip-popup-body {
+  position: relative;
+  flex-direction: column;
+  padding: 80rpx 20rpx 40rpx 20rpx;
+  box-sizing: border-box;
+}
+
+.tip-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  text-align: center;
+  margin-top: 107rpx;
+  margin-bottom: 37rpx;
+}
+
+.tip-image-container {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 50rpx;
+}
+
+.tip-image {
+  width: 90%;
+  max-height: 400rpx;
+}
+
+.tip-buttons {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 28rpx;
+}
+
+.tip-btn {
+  width: 250rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.tip-btn.cancel {
+  border: #E8101E 2rpx solid;
+  background-color: transparent;
+  color: #e8101e;
+}
+
+.tip-btn.confirm {
+  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  color: #FFFFFF;
+}
+
+.tip-btn .btn-text {
+  color: inherit;
+}
+</style>
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 86104a5..92ee357 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -4,23 +4,23 @@
 		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
 
 		<!-- 步骤切换 -->
-		<step-tab :currentStep="currentStep" :identity="identity"></step-tab>
+		<step-tab v-if="currentStep !== 2" :mappedStep="mappedStep"></step-tab>
 
 		<!-- 内容区域根据身份和步骤显示不同内容 -->
 		<view class="content">
-			<!-- 入驻协议内容 -->
 			<view class="xieyi_content" v-if="currentStep === 0">
 				<rich-text :nodes="textData.text"></rich-text>
 			</view>
 
-			<!-- 步骤1: 根据身份显示不同内容 -->
 			<view v-else-if="currentStep === 1">
-				<!-- 手艺人显示个人信息，商家显示资质信息 -->
 				<qualification-info ref="qualificationInfo"></qualification-info>
 			</view>
-			<!-- 步骤2: 根据身份显示不同内容 -->
+
 			<view v-else-if="currentStep === 2">
-				<!-- 手艺人显示资质信息，商家显示门店信息 -->
+				<successruzhu :data="successData"></successruzhu>
+			</view>
+
+			<view v-else-if="currentStep === 3">
 				<store-info ref="storeInfo"></store-info>
 			</view>
 		</view>
@@ -28,7 +28,7 @@
 
 		<!-- 底部按钮区域 -->
 		<view class="bottom-fixed">
-			<!-- 步骤0: 入驻协议 - 只显示下一步 -->
+			<!-- 步骤0: 入驻协议 -->
 			<view v-if="currentStep === 0" class="step-0-buttons">
 				<view class="agree">
 					<image v-if="!isAgree" src="/static/images/agree_n.png" class="agree-btn" mode="aspectFit"
@@ -38,24 +38,36 @@
 					<text class="agree-tip">我已阅读并同意以上协议</text>
 				</view>
 				<view class="next-btn" @click="goNext">
-					<text class="next-text">下一步，填写资质信息</text>
+					<text class="next-text">下一步，填写基本信息</text>
 				</view>
 			</view>
 
-			<!-- 步骤1: 资质信息 - 显示上一步和下一步 -->
+			<!-- 步骤1: 资质信息 -->
 			<view v-else-if="currentStep === 1" class="step-1-buttons">
 				<view class="button-row">
 					<view class="prev-btn" @click="goPrev">
 						<text class="prev-text">上一步</text>
 					</view>
 					<view class="next-btn" @click="goNext">
-						<text class="next-text">下一步，填写门店信息</text>
+						<text class="next-text">提交入驻</text>
 					</view>
 				</view>
 			</view>
 
-			<!-- 步骤2: 门店信息 - 显示上一步和提交申请 -->
+			<!-- 步骤2: 提交成功 -->
 			<view v-else-if="currentStep === 2" class="step-2-buttons">
+				<view class="button-row">
+					<view class="prev-btn" @click="topt">
+						<text class="prev-text">进入平台</text>
+					</view>
+					<view class="submit-btn" @click="goNext">
+						<text class="submit-text">去完成资质认证</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 步骤3: 门店信息 -->
+			<view v-else-if="currentStep === 3" class="step-2-buttons">
 				<view class="button-row">
 					<view class="prev-btn" @click="goPrev">
 						<text class="prev-text">上一步</text>
@@ -74,16 +86,18 @@
 	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, // 当前步骤索引
+				currentStep:3, // 当前步骤索引
 				isAgree: false,
 				identity: null,
 				textData: {},
@@ -92,6 +106,7 @@
 				navTitle: '商家入驻', // 默认标题
 				qualificationData: null, // 新增：保存资质信息
 				storeInfoData: null, // 新增：保存门店信息
+				successData:{},//入驻提示
 				// 新增：缓存手艺人数据
 				artisanDataCache: {
 					personalInfo: null,
@@ -99,6 +114,14 @@
 				}
 			}
 		},
+		computed: {
+			mappedStep() {
+				if (this.currentStep === 0) return 0;
+				if (this.currentStep === 1) return 1;
+				if (this.currentStep === 3) return 2;
+				return 0;
+			}
+		},
 		async onLoad(options) {
 			this.identity = 2;
 			await this.getUserInfoSync()
@@ -113,6 +136,11 @@
 		},
 
 		methods: {
+			topt(){
+				uni.switchTab({
+					url:'/pages/home/home'
+				})
+			},
 			// 获取用户信息（复用不可服务时间页面的方法）
 			async getUserInfoSync() {
 				await request.post('/sj/userSjAuth/details', {
@@ -122,59 +150,36 @@
 						let data = result.data
 						if (getApp().globalData.artisanType == 2) {
 
-							//储存已有的商家入驻信息
 							let qualification_form_data = {
-								"uscc_num": data.uscc_num,
-								"uscc_name": data.uscc_name,
-								"legal_name": data.legal_name,
-								"legal_phone": data.legal_phone,
-								"legal_idcard_num": data.legal_idcard_num,
-								"uscc_photo": data.uscc_photo,
-								"legal_idcard_positive": data.legal_idcard_positive,
-								"legal_idcard_negative": data.legal_idcard_negative,
-								"uscc_type": data.uscc_type,
-								"license_valid_type": data.uscc_expiry_type,
-							}
-							if (data.uscc_expiry) {
-								let expirys = data.uscc_expiry.split(' —— ')
-								qualification_form_data.license_start_date = expirys[0]
-								qualification_form_data.license_end_date = expirys[1]
-							}
-							if (data.legal_idcard_expiry) {
-								let expirys = data.legal_idcard_expiry.split(' —— ')
-								qualification_form_data.idcard_start_date = expirys[0]
-								if (expirys[1]) {
-									qualification_form_data.legal_idcard_expiry_type = "date"
-									qualification_form_data.idcard_end_date = expirys[1]
-								} else {
-									qualification_form_data.legal_idcard_expiry_type = "permanent"
-									qualification_form_data.idcard_end_date = ""
-								}
-
-							}
-							uni.setStorageSync('qualification_form_data', qualification_form_data);
-							let store_invite_state = {
-								"currentValidatingCode": data.invite_code_other
-							}
-							uni.setStorageSync('store_invite_state', store_invite_state);
-							let store_info_form_data = {
-								"head_photo": data.head_photo,
-								"name": data.name,
-								"business_time": data.business_time,
-								"servers_kill": data.servers_kill,
-								"dependency": data.dependency,
-								"address": data.address,
-								"apply_state": data.apply_state,
-								"invite_code_other": data.invite_code_other,
-								"major": data.major,
-								"dependency_code": data.dependency_code,
-								"dependency_province": data.dependency_province,
-								"dependency_city": data.dependency_city,
-								"longitude": data.longitude,
-								"latitude": data.latitude
-							}
-							console.log(111111111, store_info_form_data)
-							uni.setStorageSync('store_info_form_data', store_info_form_data);
+							"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);
 						}
 
 					}
@@ -182,65 +187,6 @@
 					console.error('获取用户信息接口错误:', error);
 				});
 			},
-			/**
-			 * 解析身份证有效期字符串，转换为中文日期格式（兼容低版本iOS，支持结束日期为空/长期）
-			 * @param {string} expiryStr 原有效期字符串，格式如："2016-01-29 —— 2026-01-29" | "2016-01-29 —— " | "2016-01-29 —— 长期"
-			 * @returns {Object} 包含开始和结束日期的对象
-			 */
-			parseIdCardExpiry(expiryStr) {
-				// 初始化默认值
-				let id_card_start_date = '';
-				let id_card_end_date = '';
-
-				try {
-					// 1. 分割字符串：兼容多种分隔符（——、--、—、-），并去除前后空格
-					const dateParts = expiryStr.split(/\s*[-—]{1,2}\s*/).map(str => str.trim());
-					// 提取开始和结束日期部分（处理分割后长度不足的情况）
-					const startStr = dateParts[0] || '';
-					const endStr = dateParts[1] || '';
-
-					// 2. 日期解析函数（核心：兼容低版本iOS）
-					const formatDateToChinese = (dateStr) => {
-						// 若为空，直接返回空
-						if (!dateStr) return '';
-						// 若为“长期”，直接返回“长期”
-						if (dateStr === '长期') return '长期';
-
-						// 关键：低版本iOS不支持“yyyy-mm-dd”，替换为“yyyy/mm/dd”
-						const compatibleStr = dateStr.replace(/-/g, '/');
-						const date = new Date(compatibleStr);
-
-						// 检查日期是否有效
-						if (isNaN(date.getTime())) {
-							return ''; // 解析失败则返回空
-						}
-
-						// 获取年、月、日（去掉前导零）
-						const year = date.getFullYear();
-						const month = date.getMonth() + 1;
-						const day = date.getDate();
-
-						return `${year}年${month}月${day}日`;
-					};
-
-					// 3. 解析开始日期（必须有值，否则置空）
-					if (startStr) {
-						id_card_start_date = formatDateToChinese(startStr);
-					}
-
-					// 4. 解析结束日期（支持空、长期、正常日期）
-					id_card_end_date = formatDateToChinese(endStr);
-
-				} catch (err) {
-					console.error('解析身份证有效期失败：', err);
-				}
-
-				// 5. 返回结果
-				return {
-					id_card_start_date,
-					id_card_end_date
-				};
-			},
 			// 检查并传递地址给商家组件
 			checkAndPassAddressToSj() {
 				try {
@@ -248,38 +194,15 @@
 					if (sjAddress) {
 						console.log('找到商家地址数据，准备传递:', sjAddress);
 
-						// 延迟执行，确保组件已渲染
 						setTimeout(() => {
-							if (this.identity === 2 && this.$refs.storeInfo) {
-								console.log('传递地址给商家组件');
-
-								// 传递给商家组件
-								if (typeof this.$refs.storeInfo.handleAddressSelected === 'function') {
-									this.$refs.storeInfo.handleAddressSelected(sjAddress);
-								} else if (this.$refs.storeInfo.formData) {
-									// 直接设置数据
-									this.$refs.storeInfo.formData.address = sjAddress.address || sjAddress
-										.name;
-									this.$refs.storeInfo.formData.longitude = sjAddress.longitude;
-									this.$refs.storeInfo.formData.latitude = sjAddress.latitude;
-
-									// 设置省市区信息
-									if (sjAddress.pname || sjAddress.cityname || sjAddress.adname) {
-										const locationParts = [];
-										if (sjAddress.pname) locationParts.push(sjAddress.pname);
-										if (sjAddress.cityname) locationParts.push(sjAddress.cityname);
-										if (sjAddress.adname) locationParts.push(sjAddress.adname);
-										this.$refs.storeInfo.formData.dependency = locationParts.join('-');
-									}
-
-									this.$refs.storeInfo.saveFormDataToLocal();
-									this.$refs.storeInfo.$forceUpdate();
-								}
-
-								// 清理存储
-								uni.removeStorageSync('sj_selected_address');
+						if (this.identity === 2 && this.$refs.qualificationInfo) {
+							console.log('传递地址给资质组件');
+							if (typeof this.$refs.qualificationInfo.handleAddressSelected === 'function') {
+								this.$refs.qualificationInfo.handleAddressSelected(sjAddress);
 							}
-						}, 300);
+						}
+						uni.removeStorageSync('sj_selected_address');
+					}, 300);
 					}
 				} catch (e) {
 					console.error('处理商家地址失败:', e);
@@ -400,82 +323,32 @@
 
 			// 审核提交方法
 			async submitForReview() {
-				// 提交前确保有用户信息
 				const userInfo = await this.checkAndGetUserInfo();
 				if (!userInfo) {
 					return;
 				}
 
-				uni.showLoading({
-					title: '提交中...'
-				});
+				uni.showLoading({ title: '提交中...' });
 
 				try {
-					console.log('=== 提交审核调试信息 ===');
-					console.log('身份类型:', this.identity);
-					console.log('门店信息数据:', this.storeInfoData);
-					console.log('资质信息数据:', this.qualificationData);
-					console.log('个人信息数据:', this.personalInfoData);
-
-
-					let apiUrl = '';
-					let formData = {};
-
-
-
-					if (this.identity === 2) {
-						// 商家入驻
-						apiUrl = '/sj/userSjAuth/apply';
-
-						// 确保重新获取最新数据
-						if (this.$refs.storeInfo) {
-							if (!this.$refs.storeInfo.saveFormData()) {
-								uni.hideLoading();
-								return;
-							}
-							this.storeInfoData = this.$refs.storeInfo.getFormData();
-							console.log('重新获取的门店信息:', this.storeInfoData);
-						}
-
-						// 验证服务技能是否存在
-						if (!this.storeInfoData || !this.storeInfoData.servers_kill || this.storeInfoData
-							.servers_kill.length === 0) {
-							uni.hideLoading();
-							uni.showToast({
-								title: '请选择服务技能',
-								icon: 'none'
-							});
-							return;
-						}
-
-						formData = this.buildBusinessData(this.qualificationData, this.storeInfoData);
-					}
-
-					console.log('提交的数据:', formData);
-					console.log('API URL:', apiUrl);
-
-					formData.type = 1
-					formData.id_type = 1
-
-					const res = await request.post(apiUrl, formData);
+					let formData = this.buildBusinessData(this.qualificationData, {});
+					formData.type = 1;
+					formData.id_type = 1;
 
+					const res = await request.post('/sj/userSjAuth/applyOne', formData);
 					uni.hideLoading();
 
-					if (res.state == 1  || res.code == 200) {
-						// 提交成功后清除缓存数据
-
+					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,
-							success: () => {
-								setTimeout(() => {
-									uni.redirectTo({
-										url: `./submitres?identity=${this.identity}&applyState=1`
-									});
-								}, 1500);
-							}
+							duration: 1500
 						});
+						setTimeout(() => {
+							this.currentStep = 2;
+						}, 1500);
 					} else {
 						uni.showToast({
 							title: res.msg || '提交失败',
@@ -484,7 +357,6 @@
 					}
 				} catch (error) {
 					uni.hideLoading();
-					console.error('提交审核失败:', error);
 					uni.showToast({
 						title: '提交失败，请重试',
 						icon: 'none'
@@ -492,106 +364,63 @@
 				}
 			},
 
-			// 优化日期格式化方法
-			formatDateForBackend(dateStr) {
-				if (!dateStr) return '';
-				if (dateStr === '长久有效' || dateStr === '长久有效') return '';
-
-				// 将 年月日 格式转换为 YYYY-MM-DD
-				const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-				if (match) {
-					const year = match[1];
-					const month = match[2].padStart(2, '0');
-					const day = match[3].padStart(2, '0');
-					return `${year}-${month}-${day}`;
-				}
-
-				// 如果已经是 YYYY-MM-DD 格式，直接返回
-				return dateStr;
-			},
-
 			// 构建商家数据
 			buildBusinessData(qualificationData, storeData) {
-				// 根据接口文档构建数据
+				console.log(qualificationData,'storeDatastoreDatastoreData');
 				const formData = {};
 
-				// 服务技能处理 - 添加更严格的验证
-				if (storeData && storeData.servers_kill && storeData.servers_kill.length > 0) {
-					// 确保 servers_kill 是数组
-					formData.servers_kill = Array.isArray(storeData.servers_kill) ?
-						storeData.servers_kill : [storeData.servers_kill];
-
-					console.log('服务技能数组:', formData.servers_kill);
-				} else {
-					console.warn('警告：没有服务技能数据');
-					formData.servers_kill = [];
-				}
-
-				// 营业执照信息
 				if (qualificationData.uscc_type) {
-					formData.uscc_type = qualificationData.uscc_type === 'individual' ? 1 : 2;
+					formData.uscc_type = qualificationData.uscc_type;
 				}
-				if (qualificationData.uscc_photo) {
-					formData.uscc_photo = qualificationData.uscc_photo;
+				// 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.uscc_num) {
-					formData.uscc_num = qualificationData.uscc_num;
+				if (qualificationData.backup_phone) {
+					formData.backup_phone = qualificationData.backup_phone;
 				}
-				if (qualificationData.uscc_name) {
-					formData.uscc_name = qualificationData.uscc_name;
+				if (qualificationData.contact_type) {
+					formData.contact_type = qualificationData.contact_type;
 				}
-				if (qualificationData.license_valid_type) {
-					formData.uscc_expiry_type = qualificationData.license_valid_type === 'permanent' ? 1 : 2;
+				if (qualificationData.invite_code) {
+					formData.invite_code_other = qualificationData.invite_code;
+				}
+				if (qualificationData.contact_name) {
+					formData.contact_name = qualificationData.contact_name;
 				}
 
-				// 格式化有效期
-				if (qualificationData.license_start_date) {
-					const startDate = this.formatDateForBackend(qualificationData.license_start_date);
+				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 (qualificationData.license_valid_type === 'permanent') {
-						// 长久有效格式：开始日期 + " ——        "
-						formData.uscc_expiry = `${startDate} ——        `;
-					} else if (qualificationData.license_end_date) {
-						// 指定日期格式：开始日期 + " —— " + 结束日期
-						const endDate = this.formatDateForBackend(qualificationData.license_end_date);
-						formData.uscc_expiry = `${startDate} —— ${endDate}`;
-					}
-				}
-
-				// 法人信息
-				if (qualificationData.legal_name) {
-					formData.legal_name = qualificationData.legal_name;
-				}
-				if (qualificationData.legal_phone) {
-					formData.legal_phone = qualificationData.legal_phone;
-				}
-				if (qualificationData.legal_idcard_num) {
-					formData.legal_idcard_num = qualificationData.legal_idcard_num;
-				}
-				if (qualificationData.legal_idcard_expiry_type) {
-					formData.legal_idcard_expiry_type = qualificationData.legal_idcard_expiry_type === 'permanent' ? 1 : 2;
-				}
-
-				// 格式化有效期
-				if (qualificationData.idcard_start_date) {
-					const idcardStartDate = this.formatDateForBackend(qualificationData.idcard_start_date);
-
-					if (qualificationData.legal_idcard_expiry_type === 'permanent') {
-						formData.legal_idcard_expiry = `${idcardStartDate} ——        `;
-					} else if (qualificationData.idcard_end_date) {
-						const idcardEndDate = this.formatDateForBackend(qualificationData.idcard_end_date);
-						formData.legal_idcard_expiry = `${idcardStartDate} —— ${idcardEndDate}`;
-					}
-				}
-
-				if (qualificationData.legal_idcard_positive) {
-					formData.legal_idcard_positive = qualificationData.legal_idcard_positive;
-				}
-				if (qualificationData.legal_idcard_negative) {
-					formData.legal_idcard_negative = qualificationData.legal_idcard_negative;
-				}
-
-				// 门店信息
+				// if (storeData && 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;
 				}
@@ -601,86 +430,38 @@
 				if (storeData.business_time) {
 					formData.business_time = storeData.business_time;
 				}
-				if (storeData.servers_kill && storeData.servers_kill.length > 0) {
-					// 直接传递数组
-					formData.servers_kill = storeData.servers_kill;
-					console.log('服务技能数组:', formData.servers_kill);
-				} else {
-					formData.servers_kill = [];
-					console.warn('警告：没有服务技能数据');
-				}
-
-				console.log('最终 formData 中的 servers_kill:', formData.servers_kill);
-				console.log('=== 调试结束 ===');
-
-				if (storeData.dependency) {
-					formData.dependency = storeData.dependency;
-
-					// 地址编码
-					if (storeData.dependency_code) {
-						formData.dependency_code = storeData.dependency_code;
-					}
-					if (storeData.dependency_province) {
-						formData.dependency_province = storeData.dependency_province;
-					}
-					if (storeData.dependency_city) {
-						formData.dependency_city = storeData.dependency_city;
-					}
-				}
-				if (storeData.address) {
-					formData.address = storeData.address;
-				}
-				// 经纬度
-				if (storeData.longitude) formData.longitude = storeData.longitude;
-				if (storeData.latitude) formData.latitude = storeData.latitude;
-
-				// 其他信息
 				if (storeData.apply_state) {
 					formData.get_msg_method = storeData.apply_state;
 				}
-				if (storeData.invite_code_other) {
-					formData.invite_code_other = storeData.invite_code_other;
-				}
 				if (storeData.major) {
 					formData.major = storeData.major;
 				}
+				
 
-				// 账号信息 - 直接从登录时输入的手机号获取
-				// 注意：这里使用 qualificationData 或 storeData 中的手机号，或者从全局获取
 				const userInfo = uni.getStorageSync('userInfo');
-
 				if (userInfo && userInfo.account) {
 					formData.account = userInfo.account;
 				} else {
-					// 如果全局没有，尝试从本地存储的登录信息获取
 					const loginAccount = uni.getStorageSync('loginAccount');
 					if (loginAccount) {
 						formData.account = loginAccount;
+					} else if (qualificationData.contact_phone) {
+						formData.contact_name = qualificationData.contact_name;
 					} else {
-						// 最后尝试：从资质信息或门店信息中获取手机号
-						if (qualificationData.legal_phone) {
-							formData.account = qualificationData.legal_phone;
-						} else {
-							console.error('无法获取账号信息');
-							uni.showToast({
-								title: '无法获取用户账号',
-								icon: 'none'
-							});
-							return null;
-						}
+						console.error('无法获取账号信息');
+						uni.showToast({
+							title: '无法获取用户账号',
+							icon: 'none'
+						});
+						return null;
 					}
 				}
 
-				console.log('使用的账号:', formData.account);
 				return formData;
 
 			},
 
 			async goNext() {
-				console.log('当前步骤:', this.currentStep);
-				console.log('身份类型:', this.identity);
-
-				// 步骤0需要同意协议
 				if (this.currentStep === 0 && !this.isAgree) {
 					uni.showToast({
 						title: '请阅读并同意以上协议',
@@ -689,68 +470,55 @@
 					return;
 				}
 
-				// 步骤1需要验证信息
 				if (this.currentStep === 1) {
-					console.log('商家验证资质信息');
-					// 商家验证资质信息
 					if (this.$refs.qualificationInfo) {
 						const isValid = await this.$refs.qualificationInfo.saveFormData();
 						if (!isValid) {
-							console.log('商家资质信息验证失败');
 							return;
 						}
 						this.qualificationData = this.$refs.qualificationInfo.getFormData();
-						console.log(' 商家资质信息验证通过 ');
 					}
+					await this.submitForReview();
+					return;
 				}
 
-				// 步骤2需要验证信息
-				if (this.currentStep === 2) {
-					// 商家验证门店信息
-					if (this.$refs.storeInfo) {
-						const isValid = await this.$refs.storeInfo.saveFormData();
-						if (!isValid) {
-							console.log('商家门店信息验证失败');
-							return;
-						}
-						this.storeInfoData = this.$refs.storeInfo.getFormData();
-						console.log('商家门店信息验证通过');
-					}
-				}
-
-				if (this.currentStep < 2) {
+				if (this.currentStep < 3) {
 					this.currentStep++;
-					console.log('切换到步骤:', this.currentStep);
-
-					// 步骤切换后滚动到顶部
 					setTimeout(() => {
 						this.scrollToTop();
 					}, 100);
-
-				} else {
-					this.completeRegistration();
 				}
 			},
 
-			submitApplication() {
-				// 商家验证门店信息
+			async submitApplication() {
 				if (this.$refs.storeInfo) {
 					if (!this.$refs.storeInfo.saveFormData()) {
 						return;
 					}
 					this.storeInfoData = this.$refs.storeInfo.getFormData();
-					console.log('商家门店信息数据:', this.storeInfoData);
 				}
 
-				// 提交前确认邀请码
-				if (this.$refs.storeInfo && this.$refs.storeInfo.confirmInviteCodeBeforeSubmit) {
-					this.$refs.storeInfo.confirmInviteCodeBeforeSubmit(() => {
-						// 确认后执行提交逻辑
-						this.completeRegistration();
-					});
-				} else {
-					// 不支持邀请码确认，直接提交
-					this.completeRegistration();
+				uni.showLoading({ title: '提交中...' });
+				try {
+					let formData = {};
+					if (this.qualificationData) {
+						Object.assign(formData, this.qualificationData);
+					}
+					if (this.storeInfoData) {
+						Object.assign(formData, this.storeInfoData);
+					}
+					formData.type = 1;
+					formData.id_type = 1;
+					const res = await request.post('/sj/userSjAuth/apply', formData);
+					uni.hideLoading();
+					if (res.state == 1 || res.code == 200) {
+						uni.showToast({ title: '提交成功', icon: 'none' });
+					} else {
+						uni.showToast({ title: res.msg || '提交失败', icon: 'none' });
+					}
+				} catch (error) {
+					uni.hideLoading();
+					uni.showToast({ title: '提交失败，请重试', icon: 'none' });
 				}
 			},
 
@@ -759,11 +527,6 @@
 					this.currentStep--;
 				}
 			},
-			completeRegistration() {
-				// 提交审核的逻辑
-				this.submitForReview();
-			},
-			// 添加滚动到顶部的方法
 			scrollToTop() {
 				uni.pageScrollTo({
 					scrollTop: 0,
@@ -850,7 +613,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+		background: #FF4767;
 		border-radius: 49rpx;
 	}
 
@@ -875,7 +638,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+		background: #FF4767;
 		border-radius: 49rpx;
 	}
 
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 6e4a47a..ae76b31 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -1,2433 +1,1191 @@
-<template>
-  <view class="store-info-page">
-    <!-- 门店信息标题 -->
-    <view class="section-title">
-      <view class="title-bar"></view>
-      <text>门店信息</text>
-    </view>
-
-    <!-- 店铺logo -->
-    <view class="form-item box-cont">
-        <view class="label-wrapper">
-            <text class="label required">店铺logo</text>
-            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('head_photo')"></image>
-        </view>
-      <view class="upload-box" @click="chooseImage('head_photo')">
-        <image v-if="formData.head_photo" :src="formData.head_photo" mode="aspectFill" class="logo-image"></image>
-        <view class="upload-placeholder" v-else>
-          <image src="/static/images/upload-img.png" mode="aspectFit" class="upload-icon"></image>
-        </view>
+<template>
+  <view class="sj-info-page">
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">营业执照</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">资质照片</text>
+        <text class="upload-desc">请保证照片上的文字清晰、无遮挡、证件边角可见</text>
+        <view class="" @click="chooseImage('business_license')">
+          <image v-if="formData.business_license" :src="formData.business_license" mode="aspectFill"
+            class="upload-preview"></image>
+          <view class="" v-else>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa75ea1c-8f9d-4b2a-8d0c-b94de516afd0.png"
+              mode="widthFix" class="upload-camera-img"></image>
+          </view>
+        </view>
+        <text class="required placeholder1">请上传营业执照原件</text>
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">商户类型</text>
+        <input type="text" v-model="formData.household_type" placeholder="请输入商户类型" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">证件号码</text>
+        <view class="picker-content">
+          <input type="text" v-model="formData.license_number" placeholder="请输入营业执照的证件号码"
+            placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
+          <image class="label-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+            mode="aspectFit" @click.stop="showTipPopup('license_number')"></image>
+        </view>
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">营业名称</text>
+        <input type="text" v-model="formData.business_name" placeholder="请输入营业执照的企业名称" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-two box-cont" @click="showRegionPicker">
+        <text class="label required">注册地区</text>
+        <view class="picker-content">
+          <text :class="formData.register_region ? 'picker-value' : 'placeholder1'">
+            {{ formData.register_region || '请选择' }}
+          </text>
+          <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+            class="arrow-right" mode="aspectFit"></image>
+        </view>
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">注册详细地址</text>
+        <view class="picker-content">
+          <input type="text" v-model="formData.register_address" placeholder="请输入注册地址" placeholder-class="placeholder"
+            class="input" @input="saveFormDataToLocalDebounce" />
+        </view>
       </view>
-    </view>
-
-    <!-- 店铺名称 -->
-    <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-            <text class="label required">店铺名称</text>
-            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('name')"></image>
+	  <view class="form-item-column box-cont">
+	    <text class="label required">营业执照有效期至：</text>
+	    <view class="radio-group">
+	      <view class="radio-item" @click="setIdcardExpiryType('permanent')">
+	        <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
+	          <image v-if="formData.legal_idcard_expiry_type === 'permanent'"
+	            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+	            class="radio-icon-image" mode="aspectFit"></image>
+	        </view>
+	        <text class="radio-label">永久有效</text>
+	      </view>
+	      <view class="radio-item" @click="setIdcardExpiryType('date')">
+	        <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
+	          <image v-if="formData.legal_idcard_expiry_type === 'date'"
+	            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+	            class="radio-icon-image" mode="aspectFit"></image>
+	        </view>
+	        <text class="radio-label">指定日期有效</text>
+	      </view>
+	    </view>
+	  </view>
+	  <view class="date-row box-cont">
+	    <view class="date-col" @click="showDatePicker('start')">
+	      <text class="date-label">开始日期</text>
+	      <view class="date-input-box">
+	        <text :class="formData.idcard_start_date ? 'date-value' : 'date-placeholder'">
+	          {{ formData.idcard_start_date || '选择日期' }}
+	        </text>
+	        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+	          class="date-icon" mode="aspectFit"></image>
+	      </view>
+	    </view>
+	    <view class="date-col" @click="showDatePicker('end')">
+	      <text class="date-label">结束日期</text>
+	      <view class="date-input-box">
+	        <text :class="formData.idcard_end_date ? 'date-value' : 'date-placeholder'">
+	          {{ formData.idcard_end_date || '选择日期' }}
+	        </text>
+	        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+	          class="date-icon" mode="aspectFit"></image>
+	      </view>
+	    </view>
+	  </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">法人信息</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">身份证照片</text>
+        <text class="upload-desc">请保证照片上的文字清晰、无遮挡、证件边角可见</text>
+        <view class="upload-area" @click="chooseImage('id_card_front')">
+          <image v-if="formData.id_card_front" :src="formData.id_card_front" mode="aspectFill" class="upload-preview">
+          </image>
+          <view class="" v-else>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa75ea1c-8f9d-4b2a-8d0c-b94de516afd0.png"
+              mode="widthFix" class="upload-camera-img" style="margin-left: -30rpx;"></image>
+          </view>
+          <text class="placeholder1 required">请上传身份证正面(人像面)</text>
+        </view>
+        <view class="upload-area" @click="chooseImage('id_card_back')" style="margin-top: 48rpx;">
+          <image v-if="formData.id_card_back" :src="formData.id_card_back" mode="aspectFill" class="upload-preview">
+          </image>
+          <view class="" v-else>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa75ea1c-8f9d-4b2a-8d0c-b94de516afd0.png"
+              mode="widthFix" class="upload-camera-img" style="margin-left: -30rpx;"></image>
+          </view>
+          <text class="placeholder1 required">请上传身份证反面(国徽面)</text>
+        </view>
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">法人代表</text>
+        <input type="text" v-model="formData.legal_person" placeholder="请输入营业执照的法人代表" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">法人联系方式</text>
+        <input type="number" v-model="formData.legal_phone" placeholder="请输入法人的联系方式" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">法人身份证号</text>
+        <input type="text" v-model="formData.legal_id_number" placeholder="请输入法人的身份证号码" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-column box-cont">
+        <text class="label required">营业执照有效期至：</text>
+        <view class="radio-group">
+          <view class="radio-item" @click="setIdcardExpiryType('permanent')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
+              <image v-if="formData.legal_idcard_expiry_type === 'permanent'"
+                src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+                class="radio-icon-image" mode="aspectFit"></image>
+            </view>
+            <text class="radio-label">永久有效</text>
+          </view>
+          <view class="radio-item" @click="setIdcardExpiryType('date')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
+              <image v-if="formData.legal_idcard_expiry_type === 'date'"
+                src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+                class="radio-icon-image" mode="aspectFit"></image>
+            </view>
+            <text class="radio-label">指定日期有效</text>
+          </view>
+        </view>
+      </view>
+      <view class="date-row box-cont">
+        <view class="date-col" @click="showDatePicker('start')">
+          <text class="date-label">开始日期</text>
+          <view class="date-input-box">
+            <text :class="formData.idcard_start_date ? 'date-value' : 'date-placeholder'">
+              {{ formData.idcard_start_date || '选择日期' }}
+            </text>
+            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+              class="date-icon" mode="aspectFit"></image>
+          </view>
+        </view>
+        <view class="date-col" @click="showDatePicker('end')">
+          <text class="date-label">结束日期</text>
+          <view class="date-input-box">
+            <text :class="formData.idcard_end_date ? 'date-value' : 'date-placeholder'">
+              {{ formData.idcard_end_date || '选择日期' }}
+            </text>
+            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+              class="date-icon" mode="aspectFit"></image>
+          </view>
+        </view>
+      </view>
+
+    </view>
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">其他信息</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">行业资质</text>
+        <view class="image-list">
+          <view class="image-item" v-for="(img, index) in formData.industry_qualifications" :key="'industry-' + index">
+            <image :src="img" mode="aspectFill" class="qualification-image"></image>
+            <view class="image-delete" @click="removeImage('industry_qualifications', index)">×</view>
+          </view>
+          <view class="image-add" @click="chooseMultiImage('industry_qualifications')"
+            v-if="formData.industry_qualifications.length < 9">
+            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png" mode="aspectFit" class="upload-icon-small"></image>
+            <text class="add-text">添加照片</text>
+          </view>
         </view>
-      <input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" 
-             placeholder-class="placeholder" class="input" 
-             @input="saveFormDataToLocalDebounce" />
-    </view>
-
-    <!-- 营业时间 -->
-    <view class="form-item-two box-cont" @click="openTimePicker">
-      <text class="label required">营业时间</text>
-      <view class="picker-content">
-        <text :class="formData.business_time ? 'picker-value' : 'placeholder'">
-          {{formData.business_time || '请输入营业时间'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 服务技能 -->
-    <view class="form-item-two box-cont" @click="showServicePopup">
-      <text class="label required">服务技能（多选）</text>
-      <view class="picker-content">
-        <text :class="formData.servers_kill.length > 0 ? 'picker-value' : 'placeholder'" v-if="formData.servers_kill">
-          {{selectedServicesText || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 门店所在地 -->
-    <view class="form-item-two box-cont" @click="showLocationPopup">
-      <text class="label required">门店所在地：</text>
-      <view class="picker-content">
-        <text :class="formData.dependency ? 'picker-value' : 'placeholder'">
-          {{formData.dependency || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 门店详细地址 -->
-    <view class="form-item-two box-cont" @click="getAddressInfo">
-      <text class="label required">门店详细地址：</text>
-      <view class="picker-content">
-        <text :class="formData.address ? 'picker-value' : 'placeholder'">
-          {{formData.address || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 其他信息标题 -->
-    <view class="section-title">
-      <view class="title-bar"></view>
-      <text>其他信息</text>
-    </view>
-
-    <!-- 获取消息方式 -->
-    <!-- <view class="form-item-two box-cont" @click="openMessageMethodPicker">
-      <text class="label required">获取消息方式：</text>
-      <view class="picker-content">
-        <text :class="formData.apply_state ? 'picker-value' : 'placeholder'">
-          {{messageMethodText || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view> -->
-
-    <!-- 邀请码 -->
-    <view class="form-item-one-yqr box-cont invite-code-container">
-        <view class="invite-code-top">
-            <view class="label-wrapper">
-              <text class="label required">邀请码</text>
-            </view>
-            <input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码" 
-                  placeholder-class="placeholder" class="input" 
-                  :disabled="hasExistingInviter"
-                  @input="handleInviteCodeInput" />
-        </view>
-        
-        <!-- 分割线 -->
-        <view class="divider"></view>
-        
-        <!-- 邀请人信息 -->
-        <view class="invite-info-container">
-          <!-- 默认提示 -->
-          <text v-if="!formData.invite_code_other" class="invite-tip">
-            请填写邀请人的邀请码，若没有邀请人请填写13131313
-          </text>
-          
-          <!-- 验证中 -->
-          <view v-else-if="inviteCodeValidating" class="invite-validating">
-            <text>验证中...</text>
-          </view>
-          
-          <!-- 验证失败 -->
-          <view v-else-if="inviteCodeError" class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
-            <text>邀请码无效</text>
-          </view>
-          
-          <!-- 特殊邀请码13131313 -->
-          <view v-else-if="formData.invite_code_other === '13131313' && !inviterInfo" class="invite-tip">
-            请填写邀请人的邀请码，若没有邀请人请填写13131313
-          </view>
-          
-          <!-- 显示邀请人信息 -->
-          <view v-else-if="inviterInfo" class="inviter-info">
-            <text class="inviter-label">邀请人：</text>
-            <text class="inviter-name">{{ inviterInfo.name || inviterInfo.nick_name }}</text>
-            <text class="inviter-divider">/</text>
-            <text class="inviter-phone">{{ inviterInfo.account }}</text>
-          </view>
-          
-          <!-- 其他情况（接口返回成功但没有认证铁军的邀请码） -->
-          <view v-else class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
-              <text>邀请码无效</text>
-          </view>
-        </view>
-    </view>
-
-    <!-- 专业经验 -->
-    <view class="form-item-two box-cont" @click="openExperiencePicker">
-      <text class="label required">专业经验：</text>
-      <view class="picker-content">
-        <text :class="formData.major ? 'picker-value' : 'placeholder'">
-          {{experienceText || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 服务技能弹出框 -->
-    <view class="popup" :class="{ show: showServicePopupFlag }">
-      <view class="popup-mask" @click="hideServicePopup"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="popup-title">选择服务技能</text>
-          <text class="popup-close" @click="hideServicePopup">×</text>
-        </view>
-        <view class="popup-body">
-          <view class="checkbox-list">
-            <view class="checkbox-item" v-for="(item, index) in serviceList" :key="index"
-                  @click="toggleServiceSelect(index)">
-              <view class="checkbox" :class="{ checked: item.checked }">
-                <image v-if="item.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" mode="aspectFit"></image>
-              </view>
-              <text class="checkbox-label">{{item.title}}</text>
-            </view>
-          </view>
-        </view>
-        <view class="popup-footer">
-          <view class="popup-btn cancel" @click="hideServicePopup">
-            <text class="btn-text">取消</text>
-          </view>
-          <view class="popup-btn confirm" @click="confirmServiceSelect">
-            <text class="btn-text">确定</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 所在地选择弹出框 -->
-    <view class="popup" :class="{ show: showLocationPopupFlag }">
-      <view class="popup-mask" @click="hideLocationPopup"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="popup-title">选择所在地</text>
-          <text class="popup-close" @click="hideLocationPopup">×</text>
-        </view>
-        <view class="region-body">
-          <picker-view @change="bindChangeLocation" class="picker-scroll"
-                      :indicator-style="indicatorStyle" :value="locationValue">
-            <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">
-                {{item.province}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">
-                {{item.city}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in locationAreas" :key="index">
-                {{item.area}}
-              </view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-        <view class="popup-footer">
-          <view class="popup-btn cancel" @click="hideLocationPopup">
-            <text class="btn-text">取消</text>
-          </view>
-          <view class="popup-btn confirm" @click="confirmLocationSelect">
-            <text class="btn-text">确定</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 营业时间选择器 -->
-    <view class="popup" :class="{ show: showTimePicker }">
-      <view class="popup-mask" @click="hideTimePopup"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="cancel-text" @click="hideTimePopup">取消</text>
-          <text class="title">选择营业时间</text>
-          <text class="confirm-text" @click="confirmTime">确定</text>
-        </view>
-        <view class="time-range">
-          <view class="time-block" :class="{ active: timeType === 'start' }"
-                @click="switchTimeType('start')">
-            <text class="time-value">{{formatTime(startTime)}}</text>
-            <text class="time-label">开始时间</text>
-          </view>
-          <text class="time-separator">至</text>
-          <view class="time-block" :class="{ active: timeType === 'end' }"
-                @click="switchTimeType('end')">
-            <text class="time-value">{{formatTime(endTime)}}</text>
-            <text class="time-label">结束时间</text>
-          </view>
-        </view>
-        <view class="region-body">
-          <picker-view :value="pickerValue" @change="handleTimeChange" class="picker-scroll"
-                      :indicator-style="indicatorStyle">
-            <picker-view-column>
-              <view class="picker-item" v-for="(hour, index) in hours" :key="index">
-                {{hour}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
-                {{minute}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item">-</view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(hour, index) in hours" :key="index">
-                {{hour}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
-                {{minute}}
-              </view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 提示信息弹窗 -->
-    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
-      <view class="tip-popup-mask" @click="hideTipPopup"></view>
-      <view class="tip-popup-content">
-        <!-- 弹窗背景图片 -->
-        <image class="tip-popup-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770" mode="aspectFit"></image>
-        
-        <!-- 弹窗内容 -->
-        <view class="tip-popup-body">
-          <view class="tip-title">{{ tipTitle }}</view>
-          <view class="tip-image-container">
-            <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
-          </view>
-          <view class="tip-buttons">
-            <view class="tip-btn cancel" @click="hideTipPopup">
-              <text class="btn-text">取消</text>
-            </view>
-            <view class="tip-btn confirm" @click="hideTipPopup">
-              <text class="btn-text">我已了解</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 邀请码确认弹窗 -->
-    <uni-popup ref="existingInvitePopup" type="center" :mask-click="false">
-      <view class="invite-popup-content">
-        <view class="invite-popup-header">
-          <text class="invite-popup-title">请确认邀请信息</text>
-        </view>
-        <view class="invite-popup-body">
-          <view class="invite-item">
-            <text class="invite-label">邀请码</text>
-            <text class="invite-value">{{ existingInviterInfo && existingInviterInfo.invite_code }}</text>
-          </view>
-          <view class="invite-item">
-            <text class="invite-label">邀请人</text>
-            <text class="invite-value">{{ (existingInviterInfo && (existingInviterInfo.name || existingInviterInfo.nick_name)) || '' }}</text>
-          </view>
-        </view>
-        <view class="invite-popup-footer">
-          <view class="invite-btn cancel" @click="cancelInviteConfirm">关闭</view>
-          <view class="invite-btn confirm" @click="useExistingInviteCode">确认</view>
-        </view>
-      </view>
-    </uni-popup>
-
-  </view>
-</template>
-
-<script>
-import request from '../../utils/request';
-import ChinaCitys from '../../static/data/ChinaCitys.json';
-import { debounce } from '@/utils/debounce.js';
-
-export default {
-  data() {
-    const loadedData = this.loadFormDataFromLocal();
-    
-    return {
-      formData: loadedData || {
-        head_photo: '',
-        name: '',
-        business_time: '',
-        servers_kill: [],
-        dependency: '',
-        address: '',
-        apply_state: '',
-        invite_code_other: '',
-        major: '',
-        dependency_code: '',        // 区code
-        dependency_province: '',    // 省code  
-        dependency_city: '',        // 市code
-        longitude: '',              // 经度
-        latitude: '',               // 纬度
-      },
-      ChinaCitys: ChinaCitys,
-      locatinCitys: [],
-      locationAreas: [],
-      locationValue: [0, 0, 0],
-      showServicePopupFlag: false,
-      serviceList: [],
-      selectedServicesText: '',
-      showLocationPopupFlag: false,
-      showTimePicker: false,
-      pickerValue: [8, 0, 0, 18, 0],
-      hours: Array.from({ length: 24 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
-      minutes: Array.from({ length: 60 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
-      timeType: 'start',
-      indicatorStyle: 'height: 68rpx;',
-      messageMethodText: '',
-      experienceText: '',
-      showTipPopupFlag: false,
-      tipTitle: '',
-      tipImage: '',
-      currentTipType: '',
-      userId: null,
-      userMobile: null,           // 新增：当前用户手机号
-      identity: 2,
-      tipImagesPreloaded: false,
-      tipPopupBg: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770',
-      
-      // 邀请码相关字段
-      inviteCodeValidating: false,
-      inviteCodeError: false,
-      inviterInfo: null,
-      currentValidatingCode: '',
-      
-      // 已有邀请人信息（用户之前作为手艺人被邀请）
-      existingInviterInfo: null,
-      hasExistingInviter: false,      // 控制输入框禁用
-      hasAutoReplacedInvite: false,   // 是否已自动替换（防止被覆盖）
-      
-      fromAddressPage: false,
-      addressListener: null,
-
-      // 抖动效果控制
-      shakeInviteError: false,
-
-      inviteValidationTimer: null, // 邀请码验证定时器
-    }
-  },
-  
-  computed: {
-    startTime() {
-      return {
-        hour: this.hours[this.pickerValue[0]],
-        minute: this.minutes[this.pickerValue[1]]
-      }
-    },
-    endTime() {
-      return {
-        hour: this.hours[this.pickerValue[3]],
-        minute: this.minutes[this.pickerValue[4]]
-      }
-    }
-  },
-  
-  watch: {
-    'name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.head_photo'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.invite_code_other'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.address'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    }
-  },
-  
-  onLoad() {
-    uni.$on('address-selected-for-sj', (addressData) => {
-      this.handleAddressSelected(addressData);
-    });
-  },
-
-  onUnload() {
-    uni.$off('address-selected-for-sj');
-  },
-  
-  async mounted() {
-    // 先获取用户信息（含手机号）
-    await this.getUserInfo();
-    this.preloadTipImages();
-
-    this.locatinCitys = this.ChinaCitys[0].citys;
-    this.locationAreas = this.locatinCitys[0].areas;
-    this.loadServiceSkills();
-    this.updateSelectedServicesText();
-
-    // 初始化消息方式和专业经验显示文本
-    if (this.formData.apply_state) {
-      const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-      this.messageMethodText = methods[this.formData.apply_state - 1] || '';
-    }
-    
-    if (this.formData.major) {
-      const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-      this.experienceText = experiences[this.formData.major - 1] || '';
-    }
-    
-    this.setupAddressListener();
-    
-    // 【关键】检查并强制使用已绑定的邀请人（手艺人原邀请码）
-    await this.forceUseExistingInviter();
-    
-    // 如果没有自动替换，再处理普通邀请码输入
-    if (!this.hasAutoReplacedInvite && this.formData.invite_code_other) {
-      this.validateInviteCode(this.formData.invite_code_other);
-    }
-  },
-
-  beforeDestroy() {
-    if (this.addressListener) {
-      uni.$off('address-selected', this.addressListener);
-    }
-  },
-
-  onShow() {
-    this.checkAddressData();
-    
-    // 如果已自动替换，避免被本地存储覆盖（只恢复非邀请码字段）
-    if (this.hasAutoReplacedInvite) {
-      const localData = this.loadFormDataFromLocal();
-      if (localData) {
-        const { invite_code_other, ...otherData } = localData;
-        Object.keys(otherData).forEach(key => {
-          if (this.formData[key] !== undefined && key !== 'invite_code_other') {
-            this.formData[key] = otherData[key];
-          }
-        });
-        this.restoreServiceSkillsSelection();
-        this.updateSelectedServicesTextImmediately();
-      }
-    } else {
-      // 原有恢复逻辑
-      const localData = this.loadFormDataFromLocal();
-      if (localData) {
-        Object.assign(this.formData, localData);
-
-        // 立即更新显示文本（即使在 serviceList 加载完成前）
-        this.updateSelectedServicesTextImmediately();
-
-        // 恢复服务技能的选中状态
-        if (this.serviceList.length > 0) {
-          this.restoreServiceSkillsSelection();
-        }
-        
-        // 恢复获取消息方式的显示文本
-        if (this.formData.apply_state) {
-          const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-          this.messageMethodText = methods[this.formData.apply_state - 1] || '';
-        }
-        
-        // 恢复专业经验的显示文本
-        if (this.formData.major) {
-          const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-          this.experienceText = experiences[this.formData.major - 1] || '';
-        }
-      }
-
-      // 重新从本地存储加载邀请码验证状态
-      this.loadInviteStateFromLocal();
-      
-      this.checkGlobalData();
-
-      // 邀请码验证
-      if (this.formData.invite_code_other) {
-        this.validateInviteCode(this.formData.invite_code_other);
-      }
-    }
-  },
-
-  onHide() {
-    this.saveFormDataToLocal();
-  },
-  
-  onUnload() {
-    this.saveFormDataToLocal();
-  },
-  
-  methods: {
-    // ========== 新增：强制使用已绑定的邀请人（商家端） ==========
-    async forceUseExistingInviter() {
-      if (this.hasAutoReplacedInvite) return false;
-      
-      // 需要用户手机号
-      if (!this.userMobile) {
-        console.log('用户手机号未获取，跳过强制替换');
-        return false;
-      }
-      
-      try {
-        // 1. 调用商家端接口查询已绑定的邀请码
-        const res = await request.post('/sj/User/getBInviteCode', {
-          account: this.userMobile,
-          type: 2   // 2=商家入驻
-        });
-        
-        console.log('查询已有邀请码结果:', res);
-        
-        if (res && res.code === 200 && res.data) {
-          // 兼容字段：可能是 invite_code 或 invite_code_other
-          const oldInviteCode = res.data.invite_code || res.data.invite_code_other;
-          
-          if (oldInviteCode) {
-            console.log('检测到已绑定邀请码:', oldInviteCode);
-            
-            // 2. 用邀请码获取完整的邀请人信息
-            const inviteRes = await request.post('/user/user/getInvite', {
-              invite_code: oldInviteCode
-            });
-            
-            console.log('获取邀请人信息结果:', inviteRes);
-            
-            if (inviteRes && inviteRes.code === 200 && inviteRes.data && inviteRes.data.account) {
-              const fullInviterInfo = inviteRes.data;
-              
-              // 强制填充
-              this.formData.invite_code_other = oldInviteCode;
-              this.hasExistingInviter = true;       // 控制输入框禁用
-              this.hasAutoReplacedInvite = true;
-              this.inviteCodeError = false;
-              this.inviterInfo = fullInviterInfo;
-              this.currentValidatingCode = oldInviteCode;
-              this.existingInviterInfo = fullInviterInfo;
-              
-              // 保存状态
-              this.saveInviteStateToLocal();
-              this.saveFormDataToLocal();
-              
-              // 不在页面加载时弹窗，改为在提交申请时弹窗
-              return true;
-            } else {
-              console.error('获取邀请人信息失败，邀请码可能无效');
-            }
-          } else {
-            console.log('接口返回成功但无邀请码数据');
-          }
-        } else {
-          console.log('查询已有邀请码接口异常:', res?.msg);
-        }
-      } catch (error) {
-        console.error('强制替换邀请人失败:', error);
-      }
-      return false;
-    },
-    
-    // 显示已有邀请人确认弹窗（复用原有方法，但内容更准确）
-    showExistingInviteTipPopup() {
-      this.$nextTick(() => {
-        if (this.$refs.existingInvitePopup) {
-          this.$refs.existingInvitePopup.open();
-        } else {
-          uni.showModal({
-            title: '请确认邀请信息',
-            content: `邀请码：${this.existingInviterInfo?.invite_code}\n邀请人：${this.existingInviterInfo?.name || this.existingInviterInfo?.nick_name}`,
-            confirmText: '确认',
-            cancelText: '关闭',
-            success: (res) => {
-              if (res.confirm) {
-                this.useExistingInviteCode();
-              } else {
-                // 用户关闭弹窗：清空邀请码，允许手动输入（与铁军端行为一致）
-                this.formData.invite_code_other = '';
-                this.hasExistingInviter = false;
-                this.hasAutoReplacedInvite = false;
-                this.inviterInfo = null;
-                this.existingInviterInfo = null;
-                this.saveFormDataToLocal();
-              }
-            }
-          });
-        }
-      });
-    },
-    
-    // 确认使用已有邀请码（用户点击确认）
-    useExistingInviteCode() {
-      if (this.existingInviterInfo) {
-        // 保存邀请码状态
-        const inviteState = {
-          inviterInfo: this.existingInviterInfo,
-          inviteCodeError: false,
-          currentValidatingCode: this.existingInviterInfo.invite_code
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        this.saveFormDataToLocal();
-      }
-      this.hideExistingInviteTipPopup();
-      
-      // 执行提交回调
-      if (this.submitCallback) {
-        this.submitCallback();
-        this.submitCallback = null;
-      }
-    },
-    
-    // 隐藏已有邀请人确认弹窗
-    hideExistingInviteTipPopup() {
-      if (this.$refs.existingInvitePopup) {
-        this.$refs.existingInvitePopup.close();
-      }
-    },
-    
-    // 取消邀请码确认
-    cancelInviteConfirm() {
-      // 关闭弹窗
-      this.hideExistingInviteTipPopup();
-    },
-    
-    // 显示邀请码确认弹窗
-    showInviteConfirmPopup(inviterData) {
-      this.$nextTick(() => {
-        // 使用 existingInvitePopup 组件显示确认弹窗
-        if (this.$refs.existingInvitePopup) {
-          // 将邀请人信息存入 existingInviterInfo 以便弹窗显示
-          this.existingInviterInfo = inviterData;
-          this.$refs.existingInvitePopup.open();
-        } else {
-          // 降级方案
-          uni.showModal({
-            title: '请确认邀请信息',
-            content: `邀请码：${inviterData?.invite_code}\n邀请人：${inviterData?.name || inviterData?.nick_name}`,
-            confirmText: '确认',
-            cancelText: '取消',
-            success: (res) => {
-              if (res.confirm) {
-                // 确认使用该邀请码
-                this.saveInviteStateToLocal();
-              } else {
-                // 取消，清空邀请码
-                this.formData.invite_code_other = '';
-                this.inviterInfo = null;
-                this.inviteCodeError = false;
-                this.saveInviteStateToLocal();
-              }
-            }
-          });
-        }
-      });
-    },
-    
-    // 提交申请前确认邀请码（供父组件调用）
-    confirmInviteCodeBeforeSubmit(callback) {
-      this.submitCallback = callback;
-      
-      // 如果邀请码是13131313，显示确认弹窗，邀请人显示为"暂无邀请人"
-      if (this.formData.invite_code_other === '13131313') {
-        this.showInviteConfirmPopup({ invite_code: '13131313', name: '暂无邀请人' });
-      } else if (this.inviterInfo && this.formData.invite_code_other) {
-        // 如果有已验证的邀请人信息，显示确认弹窗
-        this.showInviteConfirmPopup(this.inviterInfo);
-      } else {
-        // 没有邀请码或未验证，直接提交
-        if (this.submitCallback) {
-          this.submitCallback();
-        }
-      }
-    },
-    
-    // 获取用户信息（含手机号）
-    getUserInfo() {
-      return request.post('/sj/User/getUser').then(result => {
-        this.userId = result.data.id;
-        // 获取手机号（根据实际接口字段调整）
-        this.userMobile = result.data.mobile || result.data.account;
-        if (this.userMobile) {
-          getApp().globalData.userMobile = this.userMobile;
-        }
-        console.log('用户ID获取成功:', this.userId, '手机号:', this.userMobile);
-      }).catch(err => {
-        console.error('获取用户信息失败:', err);
-      });
-    },
-    
-    // 从本地存储加载邀请码验证状态
-    loadInviteStateFromLocal() {
-      try {
-        const inviteState = uni.getStorageSync('store_invite_state');
-        if (inviteState) {
-          console.log('加载邀请码验证状态:', inviteState);
-          
-          // 恢复邀请码验证状态
-          this.inviterInfo = inviteState.inviterInfo || null;
-          this.inviteCodeError = inviteState.inviteCodeError || false;
-          this.currentValidatingCode = inviteState.currentValidatingCode || '';
-          
-          // 特殊处理：如果当前邀请码是13131313，确保状态正确
-          if (this.formData.invite_code_other === '13131313') {
-            console.log('检测到特殊邀请码13131313，重置验证状态');
-            this.inviteCodeError = false;
-            this.inviterInfo = null;
-            this.currentValidatingCode = '13131313';
-          }
-          
-          // 如果正在验证的邀请码与当前表单中的一致，保持验证状态
-          if (this.currentValidatingCode === this.formData.invite_code_other) {
-            // 状态已恢复，无需额外操作
-          } else {
-            // 如果不一致，重新验证
-            if (this.formData.invite_code_other && this.formData.invite_code_other.trim() !== '') {
-              console.log('邀请码不一致，重新验证:', this.formData.invite_code_other);
-              this.handleInviteCodeInput({ detail: { value: this.formData.invite_code_other } });
-            }
-          }
-        } else {
-          // 如果没有保存的状态，重置为初始状态
-          this.resetInviteCodeState();
-        }
-      } catch (e) {
-        console.log('加载邀请码验证状态失败:', e);
-        this.resetInviteCodeState();
-      }
-    },
-
-    // 新增方法：重置邀请码状态
-    resetInviteCodeState() {
-      this.inviteCodeValidating = false;
-      this.inviteCodeError = false;
-      this.inviterInfo = null;
-      this.currentValidatingCode = '';
-      this.shakeInviteError = false;
-    },
-
-    // 新增方法：专门保存邀请码验证状态
-    saveInviteStateToLocal() {
-      try {
-        const inviteState = {
-          inviterInfo: this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode || this.formData.invite_code_other || ''
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        
-        console.log('邀请码验证状态已保存:', {
-          hasInviterInfo: !!this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode
-        });
-      } catch (e) {
-        console.log('保存邀请码验证状态失败:', e);
-      }
-    },
-    
-    // 触发邀请码错误抖动效果
-    triggerInviteErrorShake() {
-      // 触发抖动效果
-      this.shakeInviteError = true;
-      
-      // 滚动到邀请码容器位置
-      this.$nextTick(() => {
-        // 使用uni.createSelectorQuery获取邀请码容器的位置
-        const query = uni.createSelectorQuery().in(this);
-        query.select('.invite-code-container').boundingClientRect((rect) => {
-          if (rect) {
-            // 获取当前窗口高度
-            const windowHeight = uni.getSystemInfoSync().windowHeight;
-            
-            // 判断邀请码容器是否已经在可视区域内
-            // 计算容器在屏幕中的位置比例（0-1之间）
-            const containerTopRatio = rect.top / windowHeight;
-            const containerBottomRatio = (rect.top + rect.height) / windowHeight;
-            
-            // 如果容器已经在屏幕中上部（顶部在屏幕中间以上），就不需要滚动
-            // 或者容器整体都在屏幕内，也不需要滚动
-            if (containerTopRatio >= 0 && containerTopRatio < 0.7 && 
-                containerBottomRatio <= 1) {
-              console.log('邀请码容器已在可视区域内，不需要滚动');
-              return;
-            }
-            
-            // 滚动到邀请码容器位置，减去一些偏移量让用户体验更好
-            uni.pageScrollTo({
-              scrollTop: rect.top - 50,
-              duration: 300
-            });
-          }
-        }).exec();
-      });
-
-      // 0.5秒后重置抖动状态
-      setTimeout(() => {
-        this.shakeInviteError = false;
-      }, 500);
-    },
-    
-    // 处理邀请码输入
-    handleInviteCodeInput(e) {
-      // 如果已经被强制替换为已有邀请人，禁止任何手动修改
-      if (this.hasAutoReplacedInvite) {
-        console.log('已强制使用原邀请人，禁止修改邀请码');
-        this.formData.invite_code_other = this.inviterInfo ? this.inviterInfo.invite_code : '';
-        return;
-      }
-      
-      const code = e.detail ? e.detail.value : this.formData.invite_code_other;
-      
-      console.log('邀请码输入:', code);
-      
-      // 立即重置状态
-      this.inviteCodeValidating = false;
-      this.inviteCodeError = false;
-      this.inviterInfo = null;
-      
-      // 如果邀请码为空，不进行验证
-      if (!code || code.trim() === '') {
-        this.formData.invite_code_other = '';
-        this.saveFormDataToLocalDebounce();
-        // 保存空状态
-        this.saveInviteStateToLocal();
-        return;
-      }
-      
-      this.formData.invite_code_other = code;
-      this.saveFormDataToLocalDebounce();
-      
-      // 【关键修复】如果是13131313，立即通过验证并取消任何正在进行的验证
-      if (code === '13131313') {
-        console.log('检测到特殊邀请码13131313，立即通过');
-        
-        // 清除任何可能的定时器
-        if (this.inviteValidationTimer) {
-          clearTimeout(this.inviteValidationTimer);
-          this.inviteValidationTimer = null;
-        }
-        
-        // 立即更新状态
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = false;
-        this.inviterInfo = null;
-        this.currentValidatingCode = code;
-        
-        // 特殊邀请码也需要保存状态
-        const inviteState = {
-          inviterInfo: null,
-          inviteCodeError: false,
-          currentValidatingCode: code
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        
-        // 强制更新视图
-        this.$forceUpdate();
-        return;
-      }
-      
-      // 记录当前正在验证的邀请码
-      this.currentValidatingCode = code;
-      
-      // 立即保存状态（验证中）
-      this.saveInviteStateToLocal();
-      
-      // 清除之前的定时器
-      if (this.inviteValidationTimer) {
-        clearTimeout(this.inviteValidationTimer);
-        this.inviteValidationTimer = null;
-      }
-      
-      // 设置新的定时器
-      this.inviteValidationTimer = setTimeout(() => {
-        // 检查邀请码是否变化
-        if (this.formData.invite_code_other !== this.currentValidatingCode) {
-          console.log('邀请码已变化，取消验证');
-          return;
-        }
-        
-        // 再次检查是否是13131313（双重检查）
-        if (this.formData.invite_code_other === '13131313') {
-          console.log('双重检查：检测到特殊邀请码13131313');
-          this.inviteCodeValidating = false;
-          this.inviteCodeError = false;
-          this.inviterInfo = null;
-          this.currentValidatingCode = '13131313';
-          
-          const inviteState = {
-            inviterInfo: null,
-            inviteCodeError: false,
-            currentValidatingCode: '13131313'
-          };
-          uni.setStorageSync('store_invite_state', inviteState);
-          return;
-        }
-        
-        console.log('开始验证邀请码:', this.formData.invite_code_other);
-        this.validateInviteCode(this.formData.invite_code_other);
-        
-        // 清理定时器
-        this.inviteValidationTimer = null;
-      }, 600); // 适当增加延迟时间
-    },
-    
-    // 验证邀请码
-    async validateInviteCode(code) {
-      console.log('开始验证邀请码:', code);
-
-      // 特殊邀请码13131313直接通过
-      if (code === '13131313') {
-        console.log('特殊邀请码13131313，直接通过');
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = false;
-        this.inviterInfo = null;
-        this.currentValidatingCode = code;
-        // 特殊邀请码也需要保存状态
-        const inviteState = {
-          inviterInfo: null,
-          inviteCodeError: false,
-          currentValidatingCode: code
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-
-        // 强制更新视图
-        this.$forceUpdate();
-        return;
-      }
-      
-      // 如果邀请码为空
-      if (!code || code.trim() === '') {
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = false;
-        this.inviterInfo = null;
-        this.currentValidatingCode = '';
-        const inviteState = {
-          inviterInfo: null,
-          inviteCodeError: false,
-          currentValidatingCode: ''
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        return;
-      }
-      
-      // 设置验证中状态
-      this.inviteCodeValidating = true;
-      this.inviteCodeError = false;
-      this.inviterInfo = null;
-      this.currentValidatingCode = code;
-      
-      try {
-        // 调用接口验证邀请码
-        const response = await request.post('/user/user/getInvite', {
-          invite_code: code
-        });
-        
-        console.log('邀请码验证响应:', response);
-        
-        // 验证完成
-        this.inviteCodeValidating = false;
-        
-        if (response && response.code === 200 && response.data) {
-          const userData = response.data;
-
-          //检查返回的数据是否有效
-          if (userData.account) {
-              // 邀请码有效，保存邀请人信息
-              this.inviterInfo = userData;
-              this.inviteCodeError = false;
-              console.log('邀请码验证通过，邀请人:', userData);
-              
-              // 不在输入时弹窗，改为在提交申请时弹窗
-          } else {
-              // 接口返回数据但没有account字段，说明不是有效邀请人
-              console.log('接口返回数据无效，没有account字段:', userData);
-              this.inviterInfo = null;
-              this.inviteCodeError = true;
-          }
-        } else {
-          // 接口返回错误或数据为空
-          console.log('接口返回错误:', response?.msg || '未知错误');
-          this.inviterInfo = null;
-          this.inviteCodeError = true;
-        }
-      } catch (error) {
-        console.error('验证邀请码失败:', error);
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = true;
-        this.inviterInfo = null;
-      } finally {
-        // 无论成功失败都保存状态
-        const inviteState = {
-          inviterInfo: this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-      }
-    },
-    
-    // 从本地存储加载数据
-    loadFormDataFromLocal() {
-      try {
-        const stored = uni.getStorageSync('store_info_form_data');
-        if (stored) {
-          console.log('从本地存储加载门店数据:', stored);
-          
-          // 同时加载邀请码验证状态
-          const inviteState = uni.getStorageSync('store_invite_state');
-          if (inviteState) {
-            this.inviterInfo = inviteState.inviterInfo;
-            this.inviteCodeError = inviteState.inviteCodeError || false;
-            this.currentValidatingCode = inviteState.currentValidatingCode || '';
-            console.log('加载邀请码验证状态:', inviteState);
-          }
-          
-          return stored;
-        }
-      } catch (e) {
-        console.log('读取门店数据失败:', e);
-      }
-      return null;
-    },
-    
-    // 保存数据到本地存储
-    saveFormDataToLocal() {
-      try {
-        uni.setStorageSync('store_info_form_data', this.formData);
-
-        // 同时保存邀请码验证状态
-        const inviteState = {
-          inviterInfo: this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        console.log('门店数据已保存到本地存储');
-      } catch (e) {
-        console.log('保存门店数据失败:', e);
-      }
-    },
-    
-    // 防抖保存
-    saveFormDataToLocalDebounce() {
-      // 使用debounce函数
-      if (!this._saveDebounce) {
-        this._saveDebounce = debounce(() => {
-          this.saveFormDataToLocal();
-        }, 500);
-      }
-      this._saveDebounce();
-    },
-    
-    // 清空本地存储
-    clearFormDataLocal() {
-      try {
-        uni.removeStorageSync('store_info_form_data');
-        console.log('已清空门店数据');
-      } catch (e) {
-        console.log('清空门店数据失败:', e);
-      }
-    },
-
-    // 立即更新已选择服务技能的显示文本（不依赖 serviceList）
-    updateSelectedServicesText() {
-      if (this.formData.servers_kill && this.formData.servers_kill.length > 0) {
-        if (this.serviceList.length > 0) {
-          const selectedServices = this.serviceList
-            .filter(item => this.formData.servers_kill.includes(item.id))
-            .map(item => {
-              item.checked = true;
-              return item.title;
-            });
-          this.selectedServicesText = selectedServices.join('、');
-        } else {
-          // serviceList 还未加载，显示数量
-          this.selectedServicesText = `已选择${this.formData.servers_kill.length}项`;
-        }
-      } else {
-        this.selectedServicesText = '';
-      }
-    },
-    
-    // 立即更新所有显示文本（用于 onShow 恢复）
-    updateSelectedServicesTextImmediately() {
-      // 恢复服务技能显示文本
-      this.updateSelectedServicesText();
-      
-      // 恢复获取消息方式的显示文本
-      if (this.formData.apply_state) {
-        const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-        this.messageMethodText = methods[this.formData.apply_state - 1] || '';
-      }
-      
-      // 恢复专业经验的显示文本
-      if (this.formData.major) {
-        const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-        this.experienceText = experiences[this.formData.major - 1] || '';
-      }
-    },
-
-    // 地址相关方法 
-
-    setupAddressListener() {
-      this.addressListener = (addressData) => {
-        this.handleAddressSelected(addressData);
-      };
-      uni.$on('address-selected', this.addressListener);
-    },
-    
-    // 检查地址数据
-    checkAddressData() {
-      try {
-        const sjAddress = uni.getStorageSync('sj_selected_address');
-        if (sjAddress) {
-          this.handleAddressSelected(sjAddress);
-          uni.removeStorageSync('sj_selected_address');
-          return;
-        }
-      } catch (e) {}
-      
-      if (getApp().globalData && getApp().globalData.selectedAddress) {
-        this.handleAddressSelected(getApp().globalData.selectedAddress);
-        delete getApp().globalData.selectedAddress;
-      }
-      
-      try {
-        const storedAddress = uni.getStorageSync('selectedAddress');
-        if (storedAddress) {
-          this.handleAddressSelected(storedAddress);
-          uni.removeStorageSync('selectedAddress');
-        }
-      } catch (e) {}
-    },
-    
-    // 处理地址选择结果
-    handleAddressSelected(addressData) {
-      if (!addressData) return
-
-      // 详细地址优先取 address，不再优先取完整地址 name
-      let detailAddress = ''
-      if (addressData.address) {
-        detailAddress = String(addressData.address).trim()
-      } else if (addressData.name) {
-        detailAddress = String(addressData.name).trim()
-
-        const regionParts = []
-        if (addressData.pname) regionParts.push(addressData.pname)
-        if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData.cityname)
-        if (addressData.adname) regionParts.push(addressData.adname)
-
-        const regionText = regionParts.join('')
-        const regionTextWithDash = regionParts.join('-')
-
-        if (regionText && detailAddress.indexOf(regionText) === 0) {
-          detailAddress = detailAddress.slice(regionText.length).trim()
-        } else if (regionTextWithDash && detailAddress.indexOf(regionTextWithDash) === 0) {
-          detailAddress = detailAddress.slice(regionTextWithDash.length).trim()
-        }
-
-        detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim()
-      }
-
-      this.formData.address = detailAddress
-
-      if (addressData.location) {
-        const [longitude, latitude] = String(addressData.location).split(',')
-        this.formData.longitude = longitude || ''
-        this.formData.latitude = latitude || ''
-      }
-
-      if (addressData.pname || addressData.cityname || addressData.adname) {
-        const locationParts = []
-        if (addressData.pname) locationParts.push(addressData.pname)
-        if (addressData.cityname) locationParts.push(addressData.cityname)
-        if (addressData.adname) locationParts.push(addressData.adname)
-        this.formData.dependency = locationParts.join('-')
-      }
-
-      this.formData.dependency_province = addressData.provinceCode || ''
-      this.formData.dependency_city = addressData.cityCode || ''
-      this.formData.dependency_code = addressData.districtCode || ''
-
-      this.saveFormDataToLocal()
-      this.$forceUpdate()
-    },
-    
-    // 检查全局数据
-    checkGlobalData() {
-      if (getApp().globalData.storeInfoData) {
-        Object.assign(this.formData, getApp().globalData.storeInfoData);
-        this.saveFormDataToLocal();
-        // delete getApp().globalData.storeInfoData;
-        getApp().globalData.qualificationData = null;
-      }
-    },
-    
-    // 更新已选择服务技能的显示文本（兼容 serviceList 加载后）
-    updateSelectedServicesText() {
-      if (this.formData.servers_kill && this.formData.servers_kill.length > 0 && this.serviceList.length > 0) {
-        const selectedServices = this.serviceList
-          .filter(item => this.formData.servers_kill.includes(item.id))
-          .map(item => {
-            item.checked = true;
-            return item.title;
-          });
-        this.selectedServicesText = selectedServices.join('、');
-      }
-    },
-    
-    // 获取用户信息（原始版本，已在上方扩展）
-    // getUserInfo() 已在上方重写
-    
-    getFormData() {
-      return this.formData;
-    },
-    
-    // 预加载提示弹窗图片
-    preloadTipImages() {
-      const images = [
-        this.tipPopupBg, // 弹窗背景图片
-        'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9', // 店铺logo提示图片
-        'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'  // 店铺名称提示图片
-      ];
-      
-      console.log('开始预加载提示弹窗图片...');
-      
-      // 使用 Promise.all 确保所有图片都加载完成
-      const loadPromises = images.map(src => this.loadImage(src));
-      
-      Promise.all(loadPromises)
-        .then(() => {
-          console.log('所有提示弹窗图片预加载完成');
-          this.tipImagesPreloaded = true;
-        })
-        .catch(error => {
-          console.warn('部分图片预加载失败:', error);
-          // 即使部分图片加载失败，也设置为预加载完成，避免影响用户操作
-          this.tipImagesPreloaded = true;
-        });
-    },
-    
-    // 加载单个图片
-    loadImage(src) {
-      return new Promise((resolve, reject) => {
-        const img = new Image();
-        img.onload = () => {
-          console.log('图片加载成功:', src);
-          resolve();
-        };
-        img.onerror = () => {
-          console.warn('图片加载失败:', src);
-          reject(new Error(`图片加载失败: ${src}`));
-        };
-        img.src = src;
-      });
-    },
-    
-    // 显示提示弹窗
-    showTipPopup(field) {
-      const tipConfig = {
-        'head_photo': {
-          title: '如何查看店铺logo',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9'
-        },
-        'name': {
-          title: '如何查看店铺名称',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
-        }
-      };
-      
-      if (tipConfig[field]) {
-        this.currentTipType = field; // 设置当前类型
-        this.tipTitle = tipConfig[field].title;
-        this.tipImage = tipConfig[field].image;
-        // 等待图片预加载完成后再显示弹窗
-        if (this.tipImagesPreloaded) {
-          this.showTipPopupFlag = true;
-        } else {
-          // 如果图片还没预加载完成，立即加载当前图片
-          console.log('图片还未预加载完成，立即加载当前图片');
-          this.loadImage(this.tipImage).then(() => {
-            this.showTipPopupFlag = true;
-          }).catch(() => {
-            // 即使加载失败也显示弹窗，避免用户无法操作
-            this.showTipPopupFlag = true;
-          });
-        }
-      }
-    }, 
-    
-    // 隐藏提示弹窗
-    hideTipPopup() {
-      this.showTipPopupFlag = false;
-    },
-    
-    // 加载服务技能列表
-    async loadServiceSkills() {
-      try {
-        const res = await request.post('/sj/firstclass');
-        this.serviceList = res.data.map(item => ({
-          ...item,
-          checked: false
-        }));
-        // 加载完成后立即恢复选中状态
-        this.restoreServiceSkillsSelection();
-        // 再次更新显示文本，确保显示具体的技能名称
-        this.updateSelectedServicesText();
-      } catch (error) {
-        console.error('加载服务技能失败:', error);
-      }
-    },
-    
-    // 恢复服务技能选择状态
-    restoreServiceSkillsSelection() {
-      if (this.formData.servers_kill && this.formData.servers_kill.length > 0) {
-        this.serviceList.forEach(item => {
-          item.checked = this.formData.servers_kill.includes(item.id);
-        });
-        this.updateSelectedServicesText();
-      }
-    },
-    
-    // 选择图片
-    chooseImage(type) {
-      this.openCamera(type);
-    },
-    
-    async openCamera(type) {
-      try {
-        const chooseResult = await new Promise((resolve, reject) => {
-          uni.chooseImage({
-            count: 1,
-            sizeType: ['compressed'],
-            sourceType: ['album', 'camera'],
-            success: resolve,
-            fail: reject
-          });
-        });
-        
-        if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) {
-          return;
-        }
-        
-        const tempFilePath = chooseResult.tempFilePaths[0];
-        const file = { path: tempFilePath, size: 0 };
-        const result = await this.directUpload(file, this.userId, this.identity + 1);
-        
-        if (result) {
-          this.formData[type] = result;
-          this.saveFormDataToLocal();
-        }
-      } catch (err) {
-        console.log('上传图片错误:', err);
-      }
-    },
-    
-    // 直接上传方法
-    async directUpload(file, userId, type) {
-      try {
-        let date = new Date().getTime();
-        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
-        
-        let fileExtension = 'jpg';
-        if (file.path.includes('.')) {
-          let parts = file.path.split('.');
-          let ext = parts[parts.length - 1].toLowerCase();
-          if (ext && ext.length <= 4) {
-            fileExtension = ext;
-          }
-        }
-        
-        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
-        const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
-        
-        return await new Promise((resolve, reject) => {
-          uni.uploadFile({
-            url: ossConfig.host,
-            filePath: file.path,
-            name: 'file',
-            formData: {
-              key: ossConfig.dir + name,
-              policy: ossConfig.policy,
-              OSSAccessKeyId: ossConfig.ossAccessKeyId,
-              success_action_status: '200',
-              signature: ossConfig.signature
-            },
-            success: (res) => {
-              if (res.statusCode === 200) {
-                const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
-                resolve(fileUrl);
-              } else {
-                reject(new Error('上传失败'));
-              }
-            },
-            fail: reject
-          });
-        });
-      } catch (error) {
-        console.error('直接上传失败:', error);
-        throw error;
-      }
-    },
-    
-    // 打开时间选择器
-    openTimePicker() {
-      this.showTimePicker = true;
-    },
-    
-    // 隐藏时间选择器
-    hideTimePopup() {
-      this.showTimePicker = false;
-    },
-    
-    // 切换时间类型
-    switchTimeType(type) {
-      this.timeType = type;
-    },
-    
-    // 处理时间变化
-    handleTimeChange(e) {
-      const values = e.detail.value;
-      this.pickerValue = values;
-    },
-    
-    // 格式化时间显示
-    formatTime(time) {
-      return `${time.hour}:${time.minute}`;
-    },
-    
-    // 确认时间选择
-    confirmTime() {
-      this.formData.business_time = `${this.formatTime(this.startTime)}-${this.formatTime(this.endTime)}`;
-      this.saveFormDataToLocal();
-      this.hideTimePopup();
-    },
-    
-    // 显示服务技能弹出框
-    showServicePopup() {
-      this.showServicePopupFlag = true;
-    },
-    
-    // 隐藏服务技能弹出框
-    hideServicePopup() {
-      this.showServicePopupFlag = false;
-    },
-    
-    // 切换服务技能选择状态
-    toggleServiceSelect(index) {
-      this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
-    },
-    
-    // 确认服务技能选择
-    confirmServiceSelect() {
-      const selectedServices = this.serviceList
-        .filter(item => item.checked)
-        .map(item => item.title);
-      const selectedServicesId = this.serviceList
-        .filter(item => item.checked)
-        .map(item => item.id);
-        
-      if (selectedServices.length === 0) {
-        uni.showToast({ title: '请至少选择一个服务技能', icon: 'none' });
-        return;
-      }
-      
-      this.formData.servers_kill = selectedServicesId;
-      this.selectedServicesText = selectedServices.join('、');
-      this.saveFormDataToLocal();
-      this.hideServicePopup();
-    },
-    
-    // 显示所在地选择弹出框
-    showLocationPopup() {
-      this.showLocationPopupFlag = true;
-    },
-    
-    // 隐藏所在地选择弹出框
-    hideLocationPopup() {
-      this.showLocationPopupFlag = false;
-    },
-    
-    // 所在地选择变化
-    bindChangeLocation(e) {
-      this.locationValue = e.detail.value;
-      let index1 = e.detail.value[0] || 0;
-      let index2 = e.detail.value[1] || 0;
-      this.locatinCitys = this.ChinaCitys[index1].citys;
-      this.locationAreas = this.locatinCitys[index2].areas;
-    },
-    
-    // 确认所在地选择
-    confirmLocationSelect() {
-      let valueArr = this.locationValue;
-      let index1 = valueArr[0] || 0;
-      let index2 = valueArr[1] || 0;
-      let index3 = valueArr[2] || 0;
-      let province = this.ChinaCitys[index1].province;
-      let city = this.locatinCitys[index2].city;
-      let area = this.locationAreas[index3].area;
-      this.formData.dependency = province + '-' + city + '-' + area;
-
-      // 清空详细地址，因为所在地已经改变
-      this.formData.address = '';
-      this.formData.longitude = '';
-      this.formData.latitude = '';
-      
-      if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
-        let provinceCode = this.ChinaCitys[index1].code.toString();
-        this.formData.dependency_province = provinceCode.substring(0, 6);
-      }
-      if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
-        let cityCode = this.locatinCitys[index2].code.toString();
-        this.formData.dependency_city = cityCode.substring(0, 6);
-      }
-      if (this.locationAreas[index3] && this.locationAreas[index3].code) {
-        let areaCode = this.locationAreas[index3].code.toString();
-        this.formData.dependency_code = areaCode.substring(0, 6);
-      }
-      
-      this.saveFormDataToLocal();
-      this.hideLocationPopup();
-    },
-
-    buildRegionTextForSearch() {
-      const dependency = String(this.formData.dependency || '').trim()
-      if (!dependency) return ''
-
-      const parts = dependency.split('-')
-      const province = parts[0] || ''
-      const city = parts[1] || ''
-      const district = parts[2] || ''
-
-      let regionText = ''
-      if (province) regionText += province
-      if (city && city !== province) regionText += city
-      if (district) regionText += district
-
-      return regionText
-    },
-
-    getAddressValueForSearch() {
-      const rawAddress = String(this.formData.address || '').trim()
-      if (!rawAddress) return ''
-
-      const dependencyText = String(this.formData.dependency || '').trim()
-      const regionText = this.buildRegionTextForSearch()
-
-      let detail = rawAddress
-
-      // 兼容老数据里 address 被存成完整地址的情况
-      if (regionText && detail.indexOf(regionText) === 0) {
-        detail = detail.slice(regionText.length).trim()
-      } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
-        detail = detail.slice(dependencyText.length).trim()
-      }
-
-      detail = detail.replace(/^[\s,-]+/, '').trim()
-
-      return detail || rawAddress
-    },
-    
-    // 获取详细地址
-    getAddressInfo() {
-      this.saveFormDataToLocal()
-
-      const dependency = String(this.formData.dependency || '').trim()
-      const dependencyCode = String(this.formData.dependency_code || '').trim()
-      const address = this.getAddressValueForSearch()
-      const longitude = String(this.formData.longitude || '').trim()
-      const latitude = String(this.formData.latitude || '').trim()
-
-      const hasDependency = !!dependency
-      const hasAddress = !!address
-      const hasLocation = !!(longitude && latitude)
-
-      let params = 'source=sj_info'
-
-      // 已选所在地时，继续把地区传过去
-      if (hasDependency) {
-        params += `&dependency=${encodeURIComponent(dependency)}`
-        if (dependencyCode) {
-          params += `&dependency_code=${dependencyCode}`
-        }
-      }
-
-      // 已有详细地址时，把纯详细地址传过去，不带省市区
-      if (hasAddress) {
-        params += `&address=${encodeURIComponent(address)}`
-      }
-
-      // 已有坐标时，继续用已有坐标定位
-      if (hasLocation) {
-        params += `&longitude=${longitude}&latitude=${latitude}`
-      }
-
-      // 完全空白进入时：
-      // 已授权 -> 搜索页按当前定位初始化
-      // 未授权/拒绝 -> 搜索页静默失败后保持所在地、详细地址都为空
-      if (!hasDependency && !hasAddress && !hasLocation) {
-        params += '&init_current_location=1&silent_locate=1'
-      }
-
-      console.log('跳转URL参数:', params)
-
-      uni.navigateTo({
-        url: `/pages/address/search?${params}`
-      })
-    },
-    
-    // 打开获取消息方式选择器
-    openMessageMethodPicker() {
-      uni.showActionSheet({
-        itemList: ['朋友圈', '抖音', '地推', '朋友介绍', '微博'],
-        success: (res) => {
-          const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-          this.formData.apply_state = res.tapIndex + 1;
-          this.messageMethodText = methods[res.tapIndex];
-          this.saveFormDataToLocal();
-        }
-      });
-    },
-    
-    // 打开专业经验选择器
-    openExperiencePicker() {
-      uni.showActionSheet({
-        itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
-        success: (res) => {
-          const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-          this.formData.major = res.tapIndex + 1;
-          this.experienceText = experiences[res.tapIndex];
-          this.saveFormDataToLocal();
-        }
-      });
-    },
-    
-    // 保存表单数据（用于提交前验证）
-    saveFormData() {
-      // 验证必填字段
-      if (!this.formData.head_photo) {
-        uni.showToast({
-          title: '请上传店铺logo',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.name) {
-        uni.showToast({
-          title: '请输入店铺名称',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.business_time) {
-        uni.showToast({
-          title: '请选择营业时间',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (this.formData.servers_kill.length === 0) {
-        uni.showToast({
-          title: '请选择服务技能',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.dependency) {
-        uni.showToast({
-          title: '请选择门店所在地',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.address) {
-        uni.showToast({
-          title: '请选择门店详细地址',
-          icon: 'none'
-        });
-        return false;
-      }
-      // if (!this.formData.apply_state) {
-      //   uni.showToast({
-      //     title: '请选择获取消息方式',
-      //     icon: 'none'
-      //   });
-      //   return false;
-      // }
-      if (!this.formData.invite_code_other) {
-        uni.showToast({
-          title: '请输入邀请码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      // 邀请码有效性验证
-      if (this.inviteCodeValidating) {
-        uni.showToast({ title: '邀请码验证中，请稍候', icon: 'none' });
-        return false;
-      }
-      
-      // 特殊邀请码13131313直接通过
-      if (this.formData.invite_code_other === '13131313') {
-        // 直接通过
-      } else if (this.inviteCodeError || !this.inviterInfo) {
-        // 邀请码无效，触发抖动效果
-        this.triggerInviteErrorShake();
-        return false;
-      }
-      
-      if (!this.formData.major) {
-        uni.showToast({
-          title: '请选择专业经验',
-          icon: 'none'
-        });
-        return false;
-      }
-
-      // 将数据保存到全局，以便在下一步使用
-      getApp().globalData.storeInfoData = this.formData;
-      return true;
-    }
-  }
-}
-</script>
-
-
-<style scoped>
-.store-info-page {
-  /* padding: 28rpx 0; */
-}
-
-.section-title {
-  display: flex;
-  align-items: center;
-  margin-bottom: 30rpx;
-}
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 7rpx;
-  border-radius: 5rpx;
-}
-
-.section-title text {
-  font-size: 32rpx;
-  color: #1D2129;
-  font-weight: 500;
-}
-
-.box-cont {
-  background: #ffffff;
-  border-radius: 20rpx;
-  margin-bottom: 24rpx;
-  margin-left: 8rpx;
-  margin-right: 8rpx;
-  box-shadow: none;
-}
-
-.form-item {
-  padding: 24rpx;
-}
-
-.label {
-  display: block;
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
-
-.upload-box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 160rpx;
-  border-radius: 20rpx;
-}
-
-.upload-placeholder {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.upload-icon {
-  width: 120rpx;
-  height: 120rpx;
-}
-
-.upload-text {
-  font-size: 24rpx;
-  color: #999999;
-}
-
-.logo-image {
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 20rpx;
-}
-
-.form-item-one {
-  display: flex;
-  align-items: center;
-  padding: 24rpx;
-}
-
-.form-item-one-yqr {
-  flex-direction: column;
-  align-items: stretch;
-  padding: 0;
-}
-
-/* 创建内部的上半部分 */
-.invite-code-top {
-  display: flex;
-  align-items: center;
-  padding: 24rpx;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-/* 分割线 */
-.divider {
-  height: 1rpx;
-  background-color: #00000013;
-  width: 100%;
-}
-
-/* 邀请信息容器 */
-.invite-info-container {
-  padding: 20rpx 24rpx;
-  width: 100%;
-  box-sizing: border-box;
-  min-height: 60rpx;
-}
-
-.label-wrapper {
-  display: inline-flex;
-  align-items: center;
-}
-
-.label {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-  line-height: 1;
-}
-
-.label-icon {
-  width: 26rpx;
-  height: 26rpx;
-  margin-left: 8rpx;
-  align-items: center;
-}
-
-.form-item-two {
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
-		padding: 24rpx;
-	}
-
-	/* 左侧标签：固定宽度，不换行 */
-	.form-item-two > text.label {
-		flex-shrink: 0;
-		font-size: 28rpx;
-		color: #333333;
-		font-weight: 500;
-	}
-
-.input {
-  flex: 1;
-  font-size: 28rpx;
-  color: #333333;
-  text-align: right;
-}
-
-.placeholder {
-  color: #999999;
-}
-
-.picker-content {
-  display: flex;
-  align-items: center;
-}
-
-.picker-value,
-	.placeholder {
-		flex: 1;               /* 占据剩余宽度 */
-		text-align: right;     /* 文字右对齐 */
-		font-size: 28rpx;
-		word-break: break-all;
-		white-space: normal;
-		line-height: 1.4;
-	}
-
-.arrow-right {
-  width: 14rpx;
-  height: 26rpx;
-  margin-left: 16rpx;
-  flex-shrink: 0;
-}
-
-/* 邀请码相关样式 */
-.invite-tip {
-  font-size: 24rpx;
-  color: #666666;
-}
-
-.invite-validating {
-  font-size: 20rpx;
-  color: #999999;
-}
-
-.invite-error {
-  font-size: 24rpx;
-  color: #E8101E;
-}
-
-.inviter-info {
-  display: flex;
-  align-items: center;
-  font-size: 20rpx;
-}
-
-.inviter-label {
-  color: #666666;
-}
-
-.inviter-name {
-  color: #333333;
-  font-weight: 500;
-}
-
-.inviter-divider {
-  color: #666666;
-  margin: 0 5rpx;
-}
-
-.inviter-phone {
-  color: #666666;
-}
-
-/* 添加抖动动画样式 */
-@keyframes shake {
-  0%, 100% { transform: translateX(0); }
-  10%, 30%, 50%, 70%, 90% { transform: translateX(-7rpx); }
-  20%, 40%, 60%, 80% { transform: translateX(7rpx); }
-}
-
-.shake-animation {
-  animation: shake 0.5s ease-in-out;
-  color: #E8101E; /* 保持红色 */
-}
-
-/* 弹窗样式 */
-.popup {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 999;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.popup-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.popup-content {
-  position: relative;
-  background-color: #FFFFFF;
-  border-radius: 24rpx 24rpx 0 0;
-  padding: 32rpx;
-  transform: translateY(100%);
-  transition: transform 0.3s ease;
-}
-
-.popup.show .popup-content {
-  transform: translateY(0);
-}
-
-.popup-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 20rpx;
-}
-
-.popup-title {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.popup-close {
-  font-size: 40rpx;
-  color: #999999;
-  padding: 16rpx;
-}
-
-.popup-body {
-  max-height: 600rpx;
-  overflow-y: auto;
-}
-
-.checkbox-list {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.checkbox-item {
-  width: 50%;
-  padding: 14rpx;
-  display: flex;
-  align-items: center;
-}
-
-.checkbox {
-  width: 40rpx;
-  height: 40rpx;
-  border: 2rpx solid #DDDDDD;
-  border-radius: 8rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 16rpx;
-}
-
-.checkbox.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
-}
-
-.check-icon {
-  width: 42rpx;
-  height: 42rpx;
-}
-
-.checkbox-label {
-  font-size: 28rpx;
-  color: #333333;
-}
-
-.popup-footer {
-  display: flex;
-  margin-top: 32rpx;
-}
-
-.popup-btn {
-  flex: 1;
-  height: 88rpx;
-  border-radius: 44rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin: 0 16rpx;
-}
-
-.popup-btn.cancel {
-  background-color: #F5F5F5;
-}
-
-.popup-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-}
-
-.popup-btn .btn-text {
-  font-size: 32rpx;
-  font-weight: 500;
-}
-
-.popup-btn.cancel .btn-text {
-  color: #666666;
-}
-
-.popup-btn.confirm .btn-text {
-  color: #FFFFFF;
-}
-
-.region-body {
-  height: 400rpx;
-}
-
-.picker-scroll {
-  height: 400rpx;
-}
-
-.picker-item {
-  height: 68rpx;
-  line-height: 68rpx;
-  text-align: center;
-}
-
-/* 时间选择器样式 */
-.cancel-text {
-  font-size: 32rpx;
-  color: #666666;
-}
-
-.confirm-text {
-  font-size: 32rpx;
-  color: #E8101E;
-  font-weight: 500;
-}
-
-.time-range {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 32rpx;
-  background: #F8F9FC;
-}
-
-.time-block {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  background: #FFFFFF;
-  border-radius: 12rpx;
-  padding: 24rpx 0;
-  transition: all 0.3s ease;
-}
-
-.time-block.active {
-  background: #ECF2FF;
-}
-
-.time-label {
-  font-size: 26rpx;
-  color: #999999;
-  margin-top: 8rpx;
-}
-
-.time-value {
-  font-size: 40rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.time-block.active .time-value {
-  color: #E8101E;
-}
-
-.time-separator {
-  font-size: 28rpx;
-  color: #999999;
-  margin: 0 24rpx;
-}
-
-/* 提示弹窗样式 */
-.tip-popup {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 1000;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.tip-popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.tip-popup-mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.tip-popup-content {
-  position: relative;
-  width: 620rpx;
-  height: 810rpx;
-}
-
-.tip-popup-bg {
-  width: 620rpx;
-  height: 810rpx;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.tip-popup-body {
-  position: relative;
-  flex-direction: column;
-  padding: 80rpx 20rpx 40rpx 20rpx;
-  box-sizing: border-box;
-}
-
-.tip-title {
-  font-size: 36rpx;
-  font-weight: bold;
-  color: #333;
-  text-align: center;
-  margin-top: 107rpx;
-  margin-bottom: 37rpx;
-}
-
-.tip-image-container {
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 50rpx;
-}
-
-.tip-image {
-  width: 627rpx;
-  height: 327rpx;
-  margin-left: 13rpx; 
-}
-
-/* 店铺logo图片的特殊样式 */
-.tip-image.head_photo {
-  width: 582rpx;
-  height: 327rpx;
-  margin-right: 0;
-  margin-left: -15rpx;
-}
-
-/* 店铺名称图片的特殊样式 */
-.tip-image.store_name {
-  width: 627rpx;
-  height: 327rpx;
-  margin-left: 13rpx;
-}
-
-.tip-buttons {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 28rpx;
-}
-
-.tip-btn {
-  width: 250rpx;
-  height: 80rpx;
-  border-radius: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 32rpx;
-  font-weight: 500;
-}
-
-.tip-btn.cancel {
-  border: #E8101E 2rpx solid;
-  background-color: transparent;
-  color: #e8101e;
-}
-
-.tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-  color: #FFFFFF;
-}
-
-.tip-btn .btn-text {
-  color: inherit;
-}
-
-/* 邀请码确认弹窗样式 */
-.invite-popup-content {
-  width: 571rpx;
-  height: 535rpx;
-  background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6f130301-f3df-467c-8a1c-dc49f85e5295.png');
-  background-size: cover;
-  background-position: center;
-  border-radius: 30rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 40rpx;
-  box-sizing: border-box;
-}
-
-.invite-popup-header {
-  width: 100%;
-  text-align: center;
-  margin-bottom: 40rpx;
-}
-
-.invite-popup-title {
-  font-size: 36rpx;
-  font-weight: 500;
-  color: #333333;
-}
-
-.invite-popup-body {
-  flex: 1;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  gap: 24rpx;
-  margin-top: 20rpx;
-}
-
-.invite-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 20rpx;
-  background-color: rgba(255, 255, 255, 0.9);
-  border-radius: 16rpx;
-}
-
-.invite-label {
-  font-size: 28rpx;
-  color: #666666;
-}
-
-.invite-value {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.invite-popup-footer {
-  width: 100%;
-  display: flex;
-  gap: 20rpx;
-  margin-top: 40rpx;
-}
-
-.invite-btn {
-  flex: 1;
-  height: 88rpx;
-  border-radius: 44rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 32rpx;
-  font-weight: 500;
-  margin: 0 5rpx;
-}
-
-.invite-btn.cancel {
-  background-color: #FFFFFF;
-  color: #FC437C;
-  border: 2rpx solid #FC437C;
-}
-
-.invite-btn.confirm {
-  background: linear-gradient(90deg, #FC437C 0%, #FF618F 100%);
-  color: #FFFFFF;
-}
-
-/* 输入框禁用样式 */
-.input:disabled {
-  color: #999999;
-  background-color: #F5F5F5;
-}
+		<text class="label" style="margin-top: 30rpx;">其他资质</text>
+		  <view class="image-list">
+		    <view class="image-item" v-for="(img, index) in formData.other_qualifications" :key="'other-' + index">
+		      <image :src="img" mode="aspectFill" class="qualification-image"></image>
+		      <view class="image-delete" @click="removeImage('other_qualifications', index)">×</view>
+		    </view>
+		    <view class="image-add" @click="chooseMultiImage('other_qualifications')"
+		      v-if="formData.other_qualifications.length < 9">
+		      <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png" mode="aspectFit" class="upload-icon-small"></image>
+		      <text class="add-text">添加照片</text>
+		    </view>
+		  </view>
+		</view>
+      </view>
+
+    <view class="popup" :class="{ show: showRegionPopupFlag }">
+      <view class="popup-mask" @click="hideRegionPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择注册地区</text>
+          <text class="popup-close" @click="hideRegionPopup">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view @change="bindChangeRegion" class="picker-scroll" :indicator-style="indicatorStyle"
+            :value="regionValue">
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
+                {{ item.province }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in regionCitys" :key="index">
+                {{ item.city }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in regionAreas" :key="index">
+                {{ item.area }}
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideRegionPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmRegionSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="popup" :class="{ show: showDatePickerFlag }">
+      <view class="popup-mask" @click="hideDatePicker"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">{{ currentPickerType === 'start' ? '选择开始日期' : '选择结束日期' }}</text>
+          <text class="popup-close" @click="hideDatePicker">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view :value="datePickerValue" @change="bindDateChange" class="picker-scroll"
+            :indicator-style="indicatorStyle">
+            <picker-view-column>
+              <view class="picker-item" v-for="(year, index) in years" :key="index">
+                {{ year }}年
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(month, index) in months" :key="index">
+                {{ month }}月
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(day, index) in days" :key="index">
+                {{ day }}日
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideDatePicker">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmDateSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import ChinaCitys from '../../static/data/ChinaCitys.json';
+import {
+  debounce
+} from '@/utils/debounce.js';
+
+export default {
+  data() {
+    const loadedData = this.loadFormDataFromLocal();
+
+    return {
+      formData: loadedData || {
+        business_license: '',
+        household_type: '',
+        license_number: '',
+        business_name: '',
+        register_region: '',
+        register_address: '',
+        register_province: '',
+        register_city: '',
+        register_area: '',
+        id_card_front: '',
+        id_card_back: '',
+        legal_person: '',
+        legal_phone: '',
+        legal_id_number: '',
+        legal_idcard_expiry_type: 'permanent',
+        idcard_start_date: '',
+        idcard_end_date: '',
+        industry_qualifications: [],
+        other_qualifications: []
+      },
+      ChinaCitys: ChinaCitys,
+      regionCitys: [],
+      regionAreas: [],
+      regionValue: [0, 0, 0],
+      showRegionPopupFlag: false,
+      showDatePickerFlag: false,
+      currentPickerType: 'start',
+      datePickerValue: [0, 0, 0],
+      indicatorStyle: 'height: 68rpx;',
+      userId: null,
+      identity: 3
+    }
+  },
+
+  computed: {
+    years() {
+      return Array.from({
+        length: 50
+      }, (_, i) => 2020 + i);
+    },
+    months() {
+      return Array.from({
+        length: 12
+      }, (_, i) => i + 1);
+    },
+    days() {
+      return Array.from({
+        length: 31
+      }, (_, i) => i + 1);
+    }
+  },
+
+  async mounted() {
+    await this.getUserInfo();
+    this.regionCitys = this.ChinaCitys[0].citys;
+    this.regionAreas = this.regionCitys[0].areas;
+  },
+
+  methods: {
+    getUserInfo() {
+      return request.post('/sj/User/getUser').then(result => {
+        this.userId = result.data.id;
+      }).catch(err => {
+        console.error('获取用户信息失败:', err);
+      });
+    },
+
+    loadFormDataFromLocal() {
+      try {
+        const stored = uni.getStorageSync('sj_info_form_data');
+        if (stored) return stored;
+      } catch (e) { }
+      return null;
+    },
+
+    saveFormDataToLocal() {
+      try {
+        uni.setStorageSync('sj_info_form_data', this.formData);
+      } catch (e) { }
+    },
+
+    saveFormDataToLocalDebounce() {
+      if (!this._saveDebounce) {
+        this._saveDebounce = debounce(() => {
+          this.saveFormDataToLocal();
+        }, 500);
+      }
+      this._saveDebounce();
+    },
+
+    chooseImage(type) {
+      uni.chooseImage({
+        count: 1,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: async (res) => {
+          if (!res.tempFilePaths || res.tempFilePaths.length === 0) return;
+          const tempFilePath = res.tempFilePaths[0];
+          const file = {
+            path: tempFilePath,
+            size: 0
+          };
+          const url = await this.directUpload(file, this.userId, 3);
+          if (url) {
+            this.$set(this.formData, type, url);
+            this.saveFormDataToLocal();
+          }
+        }
+      });
+    },
+
+    chooseMultiImage(type) {
+      const current = this.formData[type] || [];
+      const remaining = 9 - current.length;
+      if (remaining <= 0) {
+        uni.showToast({
+          title: '最多上传9张图片',
+          icon: 'none'
+        });
+        return;
+      }
+      uni.chooseImage({
+        count: remaining,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: async (res) => {
+          if (!res.tempFilePaths || res.tempFilePaths.length === 0) return;
+          uni.showLoading({
+            title: '上传中...'
+          });
+          for (const tempFilePath of res.tempFilePaths) {
+            const file = {
+              path: tempFilePath,
+              size: 0
+            };
+            try {
+              const url = await this.directUpload(file, this.userId, 3);
+              if (url) {
+                current.push(url);
+              }
+            } catch (e) {
+              console.error('上传失败:', e);
+            }
+          }
+          this.$set(this.formData, type, current);
+          this.saveFormDataToLocal();
+          uni.hideLoading();
+        }
+      });
+    },
+
+    removeImage(type, index) {
+      const list = [...this.formData[type]];
+      list.splice(index, 1);
+      this.$set(this.formData, type, list);
+      this.saveFormDataToLocal();
+    },
+
+    async directUpload(file, userId, type) {
+      try {
+        let date = new Date().getTime();
+        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
+        let fileExtension = 'jpg';
+        if (file.path.includes('.')) {
+          let parts = file.path.split('.');
+          let ext = parts[parts.length - 1].toLowerCase();
+          if (ext && ext.length <= 4) fileExtension = ext;
+        }
+        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
+        const ossConfig = await request.post('/user/getalioss', {
+          type: type,
+          kind: 1
+        });
+        return await new Promise((resolve, reject) => {
+          uni.uploadFile({
+            url: ossConfig.host,
+            filePath: file.path,
+            name: 'file',
+            formData: {
+              key: ossConfig.dir + name,
+              policy: ossConfig.policy,
+              OSSAccessKeyId: ossConfig.ossAccessKeyId,
+              success_action_status: '200',
+              signature: ossConfig.signature
+            },
+            success: (res) => {
+              if (res.statusCode === 200) {
+                resolve(`${ossConfig.host}/${ossConfig.dir}${name}`);
+              } else {
+                reject(new Error('上传失败'));
+              }
+            },
+            fail: reject
+          });
+        });
+      } catch (error) {
+        console.error('上传失败:', error);
+        throw error;
+      }
+    },
+
+    showRegionPicker() {
+      this.showRegionPopupFlag = true;
+    },
+
+    hideRegionPopup() {
+      this.showRegionPopupFlag = false;
+    },
+
+    bindChangeRegion(e) {
+      this.regionValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.regionCitys = this.ChinaCitys[index1].citys;
+      this.regionAreas = this.regionCitys[index2].areas;
+    },
+
+    confirmRegionSelect() {
+      let valueArr = this.regionValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+      let province = this.ChinaCitys[index1].province;
+      let city = this.regionCitys[index2].city;
+      let area = this.regionAreas[index3].area;
+      this.formData.register_region = province + '-' + city + '-' + area;
+      this.formData.register_province = this.ChinaCitys[index1].code ? this.ChinaCitys[index1].code.toString()
+        .substring(0, 6) : '';
+      this.formData.register_city = this.regionCitys[index2].code ? this.regionCitys[index2].code.toString()
+        .substring(0, 6) : '';
+      this.formData.register_area = this.regionAreas[index3].code ? this.regionAreas[index3].code.toString()
+        .substring(0, 6) : '';
+      this.saveFormDataToLocal();
+      this.hideRegionPopup();
+    },
+
+    showHouseholdTypePicker() {
+      this.showRegionPopupFlag = true;
+    },
+
+    hideRegionPopup() {
+      this.showRegionPopupFlag = false;
+    },
+
+    setIdcardExpiryType(type) {
+      this.$set(this.formData, 'legal_idcard_expiry_type', type);
+      if (type === 'permanent') {
+        this.formData.idcard_end_date = '长久有效';
+      } else {
+        if (this.formData.idcard_end_date === '长久有效') {
+          this.formData.idcard_end_date = '';
+        }
+      }
+      this.saveFormDataToLocal();
+    },
+
+    showDatePicker(type) {
+      this.currentPickerType = type;
+      this.showDatePickerFlag = true;
+    },
+
+    hideDatePicker() {
+      this.showDatePickerFlag = false;
+    },
+
+    bindDateChange(e) {
+      this.datePickerValue = e.detail.value;
+    },
+
+    confirmDateSelect() {
+      const year = this.years[this.datePickerValue[0]];
+      const month = this.months[this.datePickerValue[1]];
+      const day = this.days[this.datePickerValue[2]];
+      const dateStr = `${year}年${month < 10 ? '0' + month : month}月${day < 10 ? '0' + day : day}日`;
+      if (this.currentPickerType === 'start') {
+        this.formData.idcard_start_date = dateStr;
+      } else {
+        this.formData.idcard_end_date = dateStr;
+      }
+      this.saveFormDataToLocal();
+      this.hideDatePicker();
+    },
+
+    showTipPopup(field) { },
+
+    getFormData() {
+      return this.formData;
+    },
+
+    saveFormData() {
+      if (!this.formData.business_license) {
+        uni.showToast({
+          title: '请上传营业执照',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.household_type) {
+        uni.showToast({
+          title: '请选择户主类型',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.license_number) {
+        uni.showToast({
+          title: '请输入证件号码',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.business_name) {
+        uni.showToast({
+          title: '请输入营业名称',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.register_region) {
+        uni.showToast({
+          title: '请选择注册地区',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.register_address) {
+        uni.showToast({
+          title: '请输入注册详细地址',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.id_card_front) {
+        uni.showToast({
+          title: '请上传法人身份证正面',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.id_card_back) {
+        uni.showToast({
+          title: '请上传法人身份证反面',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_person) {
+        uni.showToast({
+          title: '请输入法人代表',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_phone) {
+        uni.showToast({
+          title: '请输入法人联系方式',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!/^1[3-9]\d{9}$/.test(this.formData.legal_phone)) {
+        uni.showToast({
+          title: '请输入正确的手机号码',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_id_number) {
+        uni.showToast({
+          title: '请输入法人身份证号',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.idcard_start_date) {
+        uni.showToast({
+          title: '请选择开始日期',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.idcard_end_date) {
+        uni.showToast({
+          title: '请选择结束日期',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.industry_qualifications || this.formData.industry_qualifications.length === 0) {
+        uni.showToast({
+          title: '请上传行业资质',
+          icon: 'none'
+        });
+        return false;
+      }
+      this.saveFormDataToLocal();
+      return true;
+    }
+  }
+}
+</script>
+
+<style scoped>
+.sj-info-page {}
+
+.section {
+  margin-bottom: 30rpx;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  padding-bottom: 20rpx;
+  padding-top: 16rpx;
+}
+
+.title-bar {
+  width: 8rpx;
+  height: 32rpx;
+  background-color: #E8101E;
+  border-radius: 4rpx;
+  margin-right: 12rpx;
+}
+
+.title-text {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #1D2129;
+}
+
+.box-cont {
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  margin-bottom: 24rpx;
+  margin-left: 8rpx;
+  margin-right: 8rpx;
+  box-shadow: none;
+}
+
+.form-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+}
+
+.form-item-one {
+  display: flex;
+  flex-direction: column;
+  padding: 24rpx;
+}
+
+.form-item-two {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+}
+
+.form-item-column {
+  display: flex;
+  flex-direction: column;
+  padding: 24rpx;
+}
+
+.form-item-column .label {
+  margin-bottom: 24rpx;
+}
+
+.date-row {
+  display: flex;
+  padding: 24rpx;
+}
+
+.date-col {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.date-col:first-child {
+  margin-right: 24rpx;
+}
+
+.date-label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  margin-bottom: 16rpx;
+}
+
+.date-input-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border: 2rpx solid #E8E8E8;
+  border-radius: 12rpx;
+  padding: 0 20rpx;
+  height: 76rpx;
+}
+
+.date-value {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.date-placeholder {
+  font-size: 28rpx;
+  color: #CCCCCC;
+}
+
+.date-icon {
+  width: 36rpx;
+  height: 36rpx;
+  flex-shrink: 0;
+}
+
+.label-wrapper {
+  display: inline-flex;
+  align-items: center;
+}
+
+.label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  line-height: 1;
+}
+
+.label-icon {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 8rpx;
+}
+
+.label.required::before {
+  content: '*';
+  color: #E8101E;
+  margin-right: 4rpx;
+}
+
+.input {
+  font-size: 28rpx;
+  color: #333333;
+  text-align: right;
+  flex: 1;
+}
+
+.placeholder {
+  font-size: 28rpx;
+  color: #CCCCCC;
+  margin-left: -20rpx;
+}
+
+.placeholder1 {
+  text-align: center;
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.placeholder1.required::before {
+  content: '*';
+  color: #E8101E;
+  margin-right: 4rpx;
+}
+
+.picker-content {
+  display: flex;
+  align-items: center;
+  flex: 1;
+  justify-content: flex-end;
+}
+
+.picker-value {
+  font-size: 28rpx;
+  color: #333333;
+  margin-right: 8rpx;
+}
+
+.arrow-right {
+  width: 24rpx;
+  height: 24rpx;
+  flex-shrink: 0;
+}
+
+.radio-group {
+  display: flex;
+  align-items: center;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 130rpx;
+}
+
+.radio {
+  width: 30rpx;
+  height: 30rpx;
+  border: 2rpx solid #DDDDDD;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16rpx;
+}
+
+.radio.checked {
+  background-color: #E8101E;
+  border-color: #E8101E;
+}
+
+.radio-icon-image {
+  width: 32rpx;
+  height: 32rpx;
+}
+
+.radio-label {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.upload-area {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.upload-preview {
+  width: 100%;
+  height: 300rpx;
+  border-radius: 12rpx;
+  margin-bottom: 16rpx;
+}
+
+.upload-placeholder {
+  width: 100%;
+  height: 300rpx;
+  background: #F7F8FA;
+  border-radius: 12rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 16rpx;
+  border: 2rpx dashed #DDDDDD;
+}
+
+.upload-icon {
+  width: 80rpx;
+  height: 80rpx;
+}
+
+.upload-hint {
+  font-size: 24rpx;
+  /* color: #E8101E; */
+  text-align: center;
+}
+
+.upload-desc {
+  font-size: 24rpx;
+  color: #999999;
+  margin-bottom: 20rpx;
+  margin-top: 12rpx;
+}
+
+.upload-dashed {
+  width: 100%;
+  border: 2rpx dashed #DDDDDD;
+  border-radius: 16rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 30rpx;
+  margin-bottom: 16rpx;
+  background: #FAFBFC;
+}
+
+.upload-camera-img {
+  width: 446rpx;
+  height: 298rpx;
+  margin-left: 100rpx;
+}
+
+.image-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+  margin-top: 16rpx;
+}
+
+.image-item {
+  position: relative;
+  width: 200rpx;
+  height: 200rpx;
+}
+
+.qualification-image {
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 12rpx;
+}
+
+.image-delete {
+  position: absolute;
+  top: -10rpx;
+  right: -10rpx;
+  width: 36rpx;
+  height: 36rpx;
+  background: #E8101E;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #FFFFFF;
+  font-size: 28rpx;
+}
+
+.image-add {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border: 2rpx dashed #DDDDDD;
+  width: 214rpx;
+  height: 214rpx;
+  background: #F5F5F5;
+  border-radius: 20rpx;
+}
+
+.upload-icon-small {
+  width: 48rpx;
+  height: 48rpx;
+  margin-bottom: 8rpx;
+}
+
+.add-text {
+  font-size: 22rpx;
+  color: #999999;
+}
+
+.popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  visibility: hidden;
+  transition: visibility 0.3s;
+}
+
+.popup.show {
+  visibility: visible;
+}
+
+.popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx 30rpx;
+  border-bottom: 1rpx solid #F0F0F0;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333333;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999999;
+}
+
+.region-body {
+  height: 500rpx;
+}
+
+.picker-scroll {
+  width: 100%;
+  height: 100%;
+}
+
+.picker-item {
+  line-height: 68rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.popup-footer {
+  display: flex;
+  padding: 20rpx 30rpx;
+  gap: 20rpx;
+}
+
+.popup-btn {
+  flex: 1;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 12rpx;
+}
+
+.popup-btn.cancel {
+  background: #F5F5F5;
+}
+
+.popup-btn.confirm {
+  background: #E8101E;
+}
+
+.popup-btn .btn-text {
+  font-size: 28rpx;
+}
+
+.popup-btn.cancel .btn-text {
+  color: #666666;
+}
+
+.popup-btn.confirm .btn-text {
+  color: #FFFFFF;
+}
+
+.picker-list {
+  padding: 20rpx 0;
+}
+
+.picker-item-row {
+  padding: 24rpx 30rpx;
+  font-size: 28rpx;
+  color: #333333;
+  text-align: center;
+}
+
+.picker-item-row text.active {
+  color: #E8101E;
+}
 </style>
\ No newline at end of file

From c4c134417aa7412d656e1cf07a4657a0a0f8f691 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 28 May 2026 11:39:58 +0800
Subject: [PATCH 049/118] 1

---
 pages/search_common/search.vue | 95 ++++++++++++++++++++++++++++++++--
 1 file changed, 91 insertions(+), 4 deletions(-)

diff --git a/pages/search_common/search.vue b/pages/search_common/search.vue
index f91b2a3..667430b 100644
--- a/pages/search_common/search.vue
+++ b/pages/search_common/search.vue
@@ -14,7 +14,6 @@
             confirm-type="search" 
             @confirm="handleSearch"
           />
-          <!-- <view v-if="keyword" class="clear-icon" @tap="clearSearch">✕</view> -->
           <text class="search-btn" @tap="handleSearch">搜索</text>
         </view>
       </view>
@@ -24,6 +23,24 @@
 
     <view class="result-container">
       
+      <view class="sort-bar" v-if="['brand', 'skill', 'collection_brand', 'collection_course'].includes(searchType)">
+        <view class="sort-item" @tap="toggleSort('time')">
+          <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
+          <view class="arrows">
+            <image class="arrow-icon" :src="orderType === 1 ? iconPinkUp : iconGreyUp"></image>
+            <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
+          </view>
+        </view>
+        
+        <view class="sort-item" @tap="toggleSort('view')">
+          <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
+          <view class="arrows">
+            <image class="arrow-icon" :src="orderType === 3 ? iconPinkUp : iconGreyUp"></image>
+            <image class="arrow-icon" :src="orderType === 4 ? iconPinkDown : iconGreyDown"></image>
+          </view>
+        </view>
+      </view>
+
       <view v-if="loading && page === 1" class="loading-tips">加载中...</view>
       
       <view v-else-if="searchType === 'notice' && resultList.length > 0">
@@ -95,7 +112,16 @@ export default {
       // 分页相关
       page: 1,
       limit: 10,
-      hasMore: true
+      hasMore: true,
+
+      // 排序参数 1/2发布时间 3/4浏览量
+      orderType: 1, 
+      
+      // 排序图标资源
+      iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
+      iconGreyDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfffb601-6877-4608-a3eb-88695b05c6c2.png',
+      iconPinkUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bc84dff-e120-4d4b-a33e-25d68e065654.png',
+      iconPinkDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ff2c2c9d-694a-4adf-b737-66b07f4a63ae.png',
     };
   },
   computed: {
@@ -138,6 +164,22 @@ export default {
       this.hasMore = true;
     },
 
+    // 切换排序
+    toggleSort(type) {
+      if (type === 'time') {
+        this.orderType = this.orderType === 1 ? 2 : 1;
+      } else if (type === 'view') {
+        this.orderType = this.orderType === 3 ? 4 : 3;
+      }
+      
+      // 如果已经输入了关键词并搜索过，切换排序直接重新加载当前结果
+      if (this.hasSearched) {
+        this.page = 1;
+        this.hasMore = true;
+        this.loadData(true);
+      }
+    },
+
     handleSearch() {
       if (!this.keyword.trim()) {
         return uni.showToast({ title: '请输入搜索内容', icon: 'none' });
@@ -155,6 +197,11 @@ export default {
         let apiUrl = '';
         let params = { page: this.page, limit: this.limit };
 
+        // 给支持排序的接口加上排序参数
+        if (['brand', 'skill', 'collection_brand', 'collection_course'].includes(this.searchType)) {
+          params.order_type = this.orderType;
+        }
+
         switch (this.searchType) {
           case 'notice':
             apiUrl = '/sj/notice/list';
@@ -261,7 +308,7 @@ export default {
   top: 0;
   left: 0;
   right: 0;
-  background-color: #F5F5F5;
+  background-color: #Fff;
   z-index: 999;
   
   .header-content {
@@ -279,7 +326,7 @@ export default {
     .search-box {
       flex: 1;
       height: 74rpx;
-      background: #fff;
+      background: #f5f5f5;
       border-radius: 37rpx;
       display: flex;
       align-items: center;
@@ -317,6 +364,46 @@ export default {
   padding: 24rpx;
 }
 
+/* ================= 排序栏新增样式 ================= */
+.sort-bar {
+  display: flex;
+  align-items: center;
+  padding: 10rpx 0 24rpx; /* 根据结果页面适当微调顶部间距 */
+  gap: 60rpx;
+  
+  .sort-item {
+    display: flex;
+    align-items: center;
+    
+    .sort-text {
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #666666;
+      line-height: 37rpx;
+      margin-right: 6rpx;
+      
+      &.active {
+        color: #FF4767;
+        font-weight: 500;
+      }
+    }
+    
+    .arrows {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      
+      .arrow-icon {
+        width: 14rpx;
+        height: 8rpx;
+        margin: 2rpx 0;
+      }
+    }
+  }
+}
+/* ============================================== */
+
 .loading-tips {
   text-align: center;
   padding: 100rpx 0;

From ab99d37f9936a9ca9a2ee353b3712922b61954b8 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 28 May 2026 11:46:15 +0800
Subject: [PATCH 050/118] =?UTF-8?q?Merge=20branch=20'mrr=5Fsj=5Fdevelop=5F?=
 =?UTF-8?q?hjy=5F20260520=5F=E5=95=86=E5=AE=B6=E6=94=B9=E7=89=88'=20of=20h?=
 =?UTF-8?q?ttps://gitee.com/qtvbidt/mrr.sj.front=20into=20mrr=5Fsj=5Fdevel?=
 =?UTF-8?q?op=5Fhjy=5F20260520=5F=E5=95=86=E5=AE=B6=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/step-tab/step-tab.vue      |  109 +-
 pages.json                            |    6 +
 pages/artisan/profile.vue             | 1587 +++++------
 pages/ruzhu/qualification_sj copy.vue | 1963 ++++++++++++++
 pages/ruzhu/qualification_sj.vue      | 2965 +++++++-------------
 pages/ruzhu/ruzhu.vue                 |  575 ++--
 pages/ruzhu/sj-info.vue               | 3618 ++++++++-----------------
 pages/ruzhu/successruzhu.vue          |   94 +
 8 files changed, 5276 insertions(+), 5641 deletions(-)
 create mode 100644 pages/ruzhu/qualification_sj copy.vue
 create mode 100644 pages/ruzhu/successruzhu.vue

diff --git a/components/step-tab/step-tab.vue b/components/step-tab/step-tab.vue
index 1615bfe..228ad96 100644
--- a/components/step-tab/step-tab.vue
+++ b/components/step-tab/step-tab.vue
@@ -1,63 +1,54 @@
 <template>
   <view class="step-tab">
     <view class="step-container">
-      <!-- 步骤1: 入驻协议 -->
       <view class="step-item" :class="getStepClass(0)">
         <view class="step-icon">
-          <image 
-            v-if="currentStep === 0" 
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d" 
+          <image
+            v-if="mappedStep === 0"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d"
             class="step-img active-circle"
             mode="aspectFit"
           />
-          <view v-else-if="currentStep > 0" class="step-done">1</view>
+          <view v-else-if="mappedStep > 0" class="step-done">1</view>
           <view v-else class="step-number">1</view>
         </view>
-        <text class="step-text" :class="{ active: currentStep === 0 }">入驻协议</text>
+        <text class="step-text" :class="{ active: mappedStep === 0 }">入驻协议</text>
       </view>
-      
-      <!-- 第一个连接线 -->
+
       <view class="line-segment line-1">
         <view class="line-progress" :class="{ active: line1Active, deactivating: line1Deactivating }"></view>
       </view>
-      
-      <!-- 步骤2: 根据身份显示不同信息 -->
+
       <view class="step-item" :class="getStepClass(1)">
         <view class="step-icon">
-          <image 
-            v-if="currentStep === 1" 
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d" 
+          <image
+            v-if="mappedStep === 1"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d"
             class="step-img active-circle"
             mode="aspectFit"
           />
-          <view v-else-if="currentStep > 1" class="step-done">2</view>
+          <view v-else-if="mappedStep > 1" class="step-done">2</view>
           <view v-else class="step-number">2</view>
         </view>
-        <text class="step-text" :class="{ active: currentStep === 1 }">
-          {{ identity === 1 ? '个人信息' : '资质信息' }}
-        </text>
+        <text class="step-text" :class="{ active: mappedStep === 1 }">基本信息</text>
       </view>
-      
-      <!-- 第二个连接线 -->
+
       <view class="line-segment line-2">
         <view class="line-progress" :class="{ active: line2Active, deactivating: line2Deactivating }"></view>
       </view>
-      
-      <!-- 步骤3: 根据身份显示不同信息 -->
+
       <view class="step-item" :class="getStepClass(2)">
         <view class="step-icon">
-          <image 
-            v-if="currentStep === 2" 
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d" 
+          <image
+            v-if="mappedStep === 2"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d"
             class="step-img active-circle"
             mode="aspectFit"
           />
-          <view v-else-if="currentStep > 2" class="step-done">3</view>
+          <view v-else-if="mappedStep > 2" class="step-done">3</view>
           <view v-else class="step-number">3</view>
         </view>
-        <text class="step-text" :class="{ active: currentStep === 2 }">
-          {{ identity === 1 ? '资质信息' : '门店信息' }}
-        </text>
+        <text class="step-text" :class="{ active: mappedStep === 2 }">资质认证</text>
       </view>
     </view>
   </view>
@@ -67,32 +58,23 @@
 export default {
   name: "StepTab",
   props: {
-    // 当前步骤索引 (0, 1, 2)
-    currentStep: {
+    mappedStep: {
       type: Number,
       default: 0
-    },
-    // 身份类型：1-手艺人，2-商家
-    identity: {
-      type: Number,
-      default: 2
     }
   },
   data() {
     return {
-      prevStep: 0, // 记录上一步骤
-      line1Active: false, // 第一条线激活状态
-      line2Active: false, // 第二条线激活状态
-      line1Deactivating: false, // 第一条线正在取消激活
-      line2Deactivating: false // 第二条线正在取消激活
+      prevStep: 0,
+      line1Active: false,
+      line2Active: false,
+      line1Deactivating: false,
+      line2Deactivating: false
     };
   },
   watch: {
-    // 监听currentStep变化，处理线条动画
-    currentStep(newVal, oldVal) {
+    mappedStep(newVal, oldVal) {
       this.prevStep = oldVal;
-      
-      // 处理前进动画
       if (newVal > oldVal) {
         if (newVal >= 1) {
           this.line1Active = true;
@@ -102,38 +84,34 @@ export default {
           this.line2Active = true;
           this.line2Deactivating = false;
         }
-      } 
-      // 处理返回动画
-      else if (newVal < oldVal) {
+      } else if (newVal < oldVal) {
         if (newVal < 2) {
           this.line2Deactivating = true;
           setTimeout(() => {
             this.line2Active = false;
             this.line2Deactivating = false;
-          }, 300); // 与动画持续时间匹配
+          }, 300);
         }
         if (newVal < 1) {
           this.line1Deactivating = true;
           setTimeout(() => {
             this.line1Active = false;
             this.line1Deactivating = false;
-          }, 300); // 与动画持续时间匹配
+          }, 300);
         }
       }
     }
   },
   mounted() {
-    // 初始化线条状态
-    this.line1Active = this.currentStep >= 1;
-    this.line2Active = this.currentStep >= 2;
+    this.line1Active = this.mappedStep >= 1;
+    this.line2Active = this.mappedStep >= 2;
   },
   methods: {
-    // 获取步骤的CSS类名
     getStepClass(stepIndex) {
-      if (stepIndex === this.currentStep) {
+      if (stepIndex === this.mappedStep) {
         return 'active';
       }
-      else if (stepIndex < this.currentStep) {
+      else if (stepIndex < this.mappedStep) {
         return 'completed';
       }
       return '';
@@ -259,35 +237,16 @@ export default {
   transform-origin: left center;
 }
 
-/* 激活状态的线条 - 前进动画 */
 .line-progress.active {
   width: 100%;
   background-color: #E8101E;
   transition: width 0.3s ease;
 }
 
-/* 取消激活状态的线条 - 返回动画 */
 .line-progress.deactivating {
   width: 0%;
   background-color: #E8101E;
   transition: width 0.3s ease;
   transform-origin: right center;
 }
-
-/* 响应式调整 */
-@media (max-width: 750rpx) {
-  .step-container {
-    /* padding: 5rpx 40rpx; */
-  }
-  
-  .line-segment {
-    /* width: 100rpx; */
-  }
-  
-  /* .line-1,
-  .line-2 {
-    margin-left: 15rpx;
-    margin-right: 15rpx;
-  } */
-}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages.json b/pages.json
index 029437b..26b1390 100644
--- a/pages.json
+++ b/pages.json
@@ -1006,6 +1006,12 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/ruzhu/successruzhu",
+			"style": {
+				"navigationBarTitleText": "入驻成功"
+			}
 		}
 
 
diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index e73858c..a85a145 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -1,768 +1,821 @@
-<template>
-  <view class="profile-page">
-    <!-- 自定义顶部导航栏 -->
-    <view class="custom-navbar">
-      <!-- 左侧返回按钮和标题 -->
-      <view class="navbar-left">
-        <image class="back-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/456f4e6c-e86a-42c9-a272-484db9af6c7c" mode="aspectFit" @click="handleBack"></image>
-        <text class="navbar-title">我的资料</text>
-      </view>
-      
-      <!-- 右侧状态栏 -->
-      <view class="navbar-right">
-        <!-- <view class="nav-status-item" @click="handleShareWechat">
-          <image class="nav-status-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8a412688-b794-4407-bba6-a6dc65d75f08" mode="aspectFit"></image>
-          <text class="nav-status-text">分享到微信</text>
-        </view>
-        <view class="nav-status-item" @click="handleViewShop">
-          <image class="nav-status-icon" :src="identity == '2' ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2b5de852-2d35-4786-a643-d20cabb3eaee' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/85638da9-804e-4811-8378-d1bb6007f99d'" mode="aspectFit"></image>
-          <text class="nav-status-text">{{ identity == '2' ? '查看店铺' : '查看手艺人' }}</text>
-        </view> -->
-      </view>
-    </view>
-    
-    <!-- 内容区域 -->
-    <view class="content">
-      <!-- 基础资料部分 -->
-      <view class="section-card">
-        <view class="section-header">
-          <view class="title-bar"></view>
-          <text class="section-title">基础资料</text>
-        </view>
-        <text class="section-desc">店铺信息将影响顾客到店消费体验，请确保信息准确。</text>
-        
-        <view class="subsection">
-          <view class="subsection-content">
-            <!-- 营业时间（商家） / 服务时间（手艺人） -->
-            <view class="info-item" @click="navigateToTimeSetting">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21f1efaf-0c17-49b0-a2b2-e0fd573b92b3" mode="aspectFit"></image>
-                <text class="item-label">{{ identity == '2' ? '营业时间' : '服务时间' }}</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-            <!-- 服务技能 -->
-            <view class="info-item" @click="navigateToServiceSkill">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b90e2322-a261-4c17-a581-85010c3bc112" mode="aspectFit"></image>
-                <text class="item-label">服务技能</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-            
-            <!-- 门店信息 -->
-            <view class="info-item" v-if="identity == '2'" @click="navigateToShopInfo">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e9618006-db69-446e-92e1-ba9dd81e79f9" mode="aspectFit"></image>
-                <text class="item-label">门店信息</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-
-            <!-- 服务区域（手艺人显示） -->
-            <view class="info-item" v-if="identity == '1'" @click="navigateToServiceArea">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a35603b1-50fb-4248-9f2e-2dd4d5e249c0" mode="aspectFit"></image>
-                <text class="item-label">服务区域</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-
-            <!-- 个人信息（手艺人显示） -->
-            <view class="info-item" v-if="identity == '1'" @click="navigateToPersonalInfo">
-              <view class="info-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/77dc7a16-3b86-44e5-8acc-5f3b85ffc137" mode="aspectFit"></image>
-                <text class="item-label">个人信息</text>
-              </view>
-              <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-            </view>
-			
-			<!-- 个人信息（手艺人显示） -->
-			<view class="info-item"  @click="navigateToimg">
-			  <view class="info-left">
-			    <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/53a9d1e1-e2d2-4001-b599-82e0c0747f1a.png" mode="aspectFit"></image>
-			    <text class="item-label">相册管理</text>
-			  </view>
-			  <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-			</view>
-			
-			<!-- 个人信息（手艺人显示） -->
-			<view class="info-item"  @click="navigateTovideo">
-			  <view class="info-left">
-			    <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6fc821cd-8dd1-41f1-8854-889fb5f76b78.png" mode="aspectFit"></image>
-			    <text class="item-label">视频管理</text>
-			  </view>
-			  <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-			</view>
-			
-          </view>
-        </view>
-      </view>
-
-      <!-- 经营资质部分 -->
-      <view class="section-card">
-        <view class="section-header">
-          <view class="title-bar"></view>
-          <text class="section-title">经营资质</text>
-        </view>
-        
-        <view class="subsection-content">
-          <!-- 资质信息 -->
-          <view class="info-item" @click="navigateToQualification">
-            <view class="info-left">
-              <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2677692c-5931-4ac7-846e-b6d321184789" mode="aspectFit"></image>
-              <text class="item-label">资质信息</text>
-            </view>
-            <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-          </view>
-          
-          <!-- 所属门店（手艺人显示） -->
-          <view class="info-item" v-if="identity == '1'" @click="navigateToBelongShop">
-            <view class="info-left">
-              <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b5541cb5-58c1-4e72-b88f-5cf6450338a8" mode="aspectFit"></image>
-              <text class="item-label">所属门店</text>
-            </view>
-            <image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import { handleImgSizeUni } from '@/utils/service.js'
-import request from "../../utils/request";
-
-export default {
-  data() {
-    return {
-      identity: '',
-      currentUserId: '', // 当前用户ID
-      userInfo: {}, // 用户信息
-      sharing: false // 添加分享状态标记
-    }
-  },
-  onLoad() {
-    // 页面显示时重新加载身份信息，确保数据最新
-    this.loadIdentity()
-    console.log('当前身份:', this.identity)
-    // 加载用户信息
-    this.loadUserInfo()
-  },
-  onShow() {
-    // 页面显示时也重新加载，确保数据最新
-    this.loadIdentity()
-    this.loadUserInfo()
-  },
-  methods: {
-    // 返回按钮处理
-    handleBack() {
-      uni.navigateBack()
-    },
-    
-    // 分享到微信
-    handleShareWechat() {
-      console.log('分享到微信')
-      
-      this.handleShareProcess()
-    },
-
-    async handleShareProcess() {
-      // 如果正在分享中，防止重复点击
-      if (this.sharing) {
-        return;
-      }
-      
-      // 设置分享状态
-      this.sharing = true;
-
-      try {
-        // 显示加载提示
-        uni.showLoading({
-          title: '正在准备分享...',
-          mask: true
-        });
-
-        // 确保用户信息已加载
-        if (!this.currentUserId) {
-          await this.loadUserInfo()
-        }
-        
-        // 检查是否已加载用户信息
-        if (!this.currentUserId) {
-          uni.showToast({
-            title: '无法获取用户信息',
-            icon: 'none'
-          })
-          return
-        }
-        
-        // 根据环境处理
-        // #ifdef APP-PLUS
-        this.handleAppAutoShare()
-        // #endif
-        
-        // #ifdef MP-WEIXIN
-        this.handleMpAutoShare()
-        // #endif
-        
-        // #ifdef H5
-        this.handleH5Share()
-        // #endif
-        } catch (error) {
-        console.error('分享过程出错:', error);
-        uni.hideLoading();
-        this.sharing = false;
-        uni.showToast({
-          title: '分享失败，请重试',
-          icon: 'none'
-        });
-      }
-    },
-    
-    // H5环境分享
-    handleH5Share() {
-      // 在H5环境，通常使用浏览器的分享功能或复制链接
-      const shareUrl = window.location.href
-      uni.showModal({
-        title: '分享提示',
-        // content: `请复制链接分享给好友：${shareUrl}`,
-        content: `请在美融融Plus APP 环境下使用此功能`,
-
-        showCancel: false,
-        confirmText: '好的',
-        success: (res) => {
-          if (res.confirm) {
-            // // 复制链接到剪贴板
-            // uni.setClipboardData({
-            //   data: shareUrl,
-            //   success: () => {
-            //     uni.showToast({
-            //       title: '链接已复制',
-            //       icon: 'success'
-            //     })
-            //   }
-            // })
-          }
-        }
-      })
-    },
-    
-    // 小程序环境处理
-    handleMpAutoShare() {
-      // 小程序无法自动触发分享，跳转后提示用户手动操作
-      const url = this.identity == '2' 
-        ? `/pages/user/store-detail?id=${this.currentUserId}` 
-        : `/pages/user/syr-detail?id=${this.currentUserId}`;
-      
-      uni.navigateTo({
-        url: url,
-        success: () => {
-          setTimeout(() => {
-            uni.showToast({
-              title: '请点击右上角分享',
-              icon: 'none',
-              duration: 2000
-            });
-          }, 500);
-        }
-      });
-    },
-    
-    // APP环境自动分享
-    handleAppAutoShare() {
-      if (!this.currentUserId) {
-        uni.showToast({
-          title: '无法获取用户信息',
-          icon: 'none'
-        });
-        return;
-      }
-
-      // 清除旧的分享标记
-      uni.removeStorage({
-        key: 'share_success'
-      });
-      
-      // 跳转到店铺主页并自动触发分享
-      const url = this.identity == '2' 
-        ? `/pages/user/store-detail?id=${this.currentUserId}&autoShare=1` 
-        : `/pages/user/syr-detail?id=${this.currentUserId}&autoShare=1`;
-      
-      uni.navigateTo({
-        url: url,
-        success: () => {
-          console.log('跳转成功，将自动触发分享');
-          // 跳转成功后立即隐藏loading，避免页面闪烁
-          setTimeout(() => {
-            uni.hideLoading();
-            this.sharing = false;
-          }, 200);
-        },
-        fail: () => {
-          console.log('跳转失败:', err);
-          uni.hideLoading();
-          this.sharing = false;
-          this.showManualShareOption();
-        }
-      });
-    },
-    
-    // 执行APP分享
-    executeAppShare(imageUrl) {
-      // 备用图片地址
-      const backupImageUrl = "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/yh/1756713709528-717.png?x-oss-process=image/resize,p_40"
-      
-      // 根据身份设置不同的分享标题
-      const shareTitle = this.identity == '2' 
-        ? "好友刚推了个超赞商家！点开认识TA ~" 
-        : "好友刚推了个超赞手艺人！点开认识TA ~"
-      
-      // 生成分享配置
-      const shareConfig = {
-        provider: "weixin",
-        scene: "WXSceneSession",
-        type: 5,
-        title: shareTitle,
-        miniProgram: {
-          id: "gh_89c92e18b70b", // 小程序原始ID
-          path: this.getSharePath(), // 动态分享路径
-          type: 0, // 正式版
-          webUrl: "https://www.baidu.com/", // 降级网页地址
-        },
-        imageUrl: imageUrl,
-        success: (res) => {
-          console.log("分享成功:", JSON.stringify(res))
-          uni.showToast({
-            title: '分享成功',
-            icon: 'success'
-          })
-        },
-        fail: (err) => {
-          console.log("分享失败:", JSON.stringify(err))
-          // 尝试使用备用图片
-          if (imageUrl !== backupImageUrl) {
-            console.log("尝试使用备用图片分享...")
-            this.executeAppShare(backupImageUrl)
-          } else {
-            uni.showToast({
-              title: '分享失败',
-              icon: 'none'
-            })
-          }
-        }
-      }
-
-      // 检查是否支持分享API
-      if (uni.share) {
-        uni.share(shareConfig)
-      } else {
-        uni.showToast({
-          title: '当前环境不支持分享',
-          icon: 'none'
-        })
-      }
-    },
-    
-    // 获取分享路径
-    getSharePath() {
-      // 根据身份生成不同的分享路径
-      if (this.identity == '2') {
-        // 商家分享店铺详情页
-        return `/pages/user/store-detail?id=${this.currentUserId || ''}`
-      } else {
-        // 手艺人分享个人主页
-        return `/pages/user/syr-detail?id=${this.currentUserId || ''}`
-      }
-    },
-    
-    // 查看店铺
-    async handleViewShop() {
-      console.log('查看店铺')
-      
-      // 确保用户信息已加载
-      if (!this.currentUserId) {
-        await this.loadUserInfo()
-      }
-      
-      // 如果仍然没有用户ID，提示用户手动输入或联系客服
-      if (!this.currentUserId) {
-        uni.showModal({
-          title: '提示',
-          content: '无法获取用户信息，请联系客服或稍后重试',
-          showCancel: false,
-          confirmText: '确定'
-        })
-        return
-      }
-      
-      // 根据身份跳转到不同的页面
-      if (this.identity == '2') {
-        // 商家跳转到店铺主页
-        uni.navigateTo({
-          url: '/pages/user/store-detail?id=' + this.currentUserId
-        })
-      } else {
-        // 手艺人跳转到个人主页
-        uni.navigateTo({
-          url: '/pages/user/syr-detail?id=' + this.currentUserId
-        })
-      }
-    },
-    
-    // 加载用户信息 - 主要使用接口获取
-    async loadUserInfo() {
-      try {
-        // 根据身份设置type参数（参考个人中心页面的逻辑）
-        let type = 1 // 默认值
-        if (this.identity == '1') {
-          type = 2 // 手艺人
-        } else if (this.identity == '2') {
-          type = 3 // 商家
-        }
-        
-        console.log('调用接口获取用户信息，type:', type)
-        
-        // 调用接口获取用户信息
-        const result = await request.post('/user/getuser', { type })
-        
-        if (result.data && result.data.id) {
-          this.userInfo = result.data
-          this.currentUserId = result.data.id
-          
-          // 存储到本地，避免重复调用
-          uni.setStorageSync('userInfo', result.data)
-          console.log('从接口获取用户信息成功:', this.userInfo)
-        } else {
-          console.log('接口返回数据异常:', result)
-        }
-      } catch (error) {
-        console.log('获取用户信息失败:', error)
-        
-        // 降级方案：尝试从其他可能的位置获取用户ID
-        this.tryAlternativeUserInfo()
-      }
-    },
-    
-    // 备用方案：从其他位置获取用户信息
-    tryAlternativeUserInfo() {
-      try {
-        const app = getApp()
-        
-        // 方法1: 从全局数据获取用户ID
-        if (app.globalData.userInfo && app.globalData.userInfo.id) {
-          this.currentUserId = app.globalData.userInfo.id
-          this.userInfo = app.globalData.userInfo
-          console.log('从全局数据获取用户ID:', this.currentUserId)
-          return
-        }
-        
-        // 方法2: 从本地存储获取完整的用户信息
-        const userInfo = uni.getStorageSync('userInfo')
-        if (userInfo && userInfo.id) {
-          this.currentUserId = userInfo.id
-          this.userInfo = userInfo
-          console.log('从存储获取用户ID:', this.currentUserId)
-          return
-        }
-        
-        // 方法3: 直接获取用户ID
-        const userId = uni.getStorageSync('userId')
-        if (userId) {
-          this.currentUserId = userId
-          console.log('从存储获取用户ID:', userId)
-          return
-        }
-        
-        console.log('所有获取用户信息的方法都失败了')
-      } catch (e) {
-        console.log('备用方案获取用户信息失败:', e)
-      }
-    },
-
-    loadIdentity() {
-      // 从全局数据获取身份
-      const app = getApp()
-      const globalIdentity = app.globalData.artisanType
-      console.log('从全局数据获取身份:', globalIdentity)
-      
-      if (globalIdentity) {
-        this.identity = globalIdentity
-        uni.setStorageSync('user_identity', globalIdentity)
-      } else {
-        // 如果全局数据没有，尝试从本地存储获取
-        const localIdentity = uni.getStorageSync('user_identity')
-        if (localIdentity) {
-          this.identity = localIdentity
-          console.log('从本地存储获取身份:', localIdentity)
-        } else {
-          console.log('未获取到身份信息')
-          // 默认设为手艺人
-          this.identity = '1'
-        }
-      }
-      
-      console.log('当前身份:', this.identity)
-    },
-    
-    navigateToTimeSetting() {
-      if (this.identity == '2') {
-        // 商家跳转到营业时间页面
-        uni.navigateTo({
-          url: '/pages/shop/business-time'
-        })
-      } else {
-        // 手艺人跳转到服务时间页面
-        uni.navigateTo({
-          url: '/pages/artisan/service-time'
-        })
-      }
-    },
-    
-    navigateToServiceSkill() {
-      if (this.identity == '2') {
-        // 商家跳转到商家服务技能页面
-        uni.navigateTo({
-          url: '/pages/shop/service-skills'
-        })
-      } else {
-        // 手艺人跳转到手艺人服务技能页面
-        uni.navigateTo({
-          url: '/pages/artisan/service-skills'
-        })
-      }
-    },
-    
-    navigateToShopInfo() {  // 商家：门店信息 
-      uni.navigateTo({
-        url: '/pages/shop/sj-info-change'
-      })
-    },
-    
-    navigateToServiceArea() {  // 手艺人：服务区域
-      uni.navigateTo({
-        url: '/pages/artisan/service-area'
-      })
-    },
-    
-    navigateToPersonalInfo() {  // 手艺人：个人信息
-      uni.navigateTo({
-        url: '/pages/artisan/syr-info-change'
-      })
-    },
-	
-	navigateToimg() {  // 图片管理
-	  uni.navigateTo({
-	    url: '/pages/shop/photoAlbum/photoManage?type=1'
-	  })
-	},
-	
-	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;
-}
-
-/* 自定义导航栏样式 */
-.custom-navbar {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 108rpx; /* 使用标准导航栏高度 */
-  background: white;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 32rpx;
-  z-index: 999;
-  box-sizing: border-box;
-  /* 适配不同机型的顶部安全区域 */
-  padding-top: var(--status-bar-height);
-  height: calc(128rpx + var(--status-bar-height));
-}
-
-/* 导航栏左侧 */
-.navbar-left {
-  display: flex;
-  align-items: center;
-}
-
-.back-icon {
-  width: 16rpx;
-  height: 32rpx;
-  margin-right: 23rpx;
-}
-
-.navbar-title {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 500;
-	font-size: 32rpx;
-	color: #333333;
-	line-height: 45rpx;
-	text-align: left;
-	font-style: normal;
-}
-
-/* 导航栏右侧状态栏 */
-.navbar-right {
-  display: flex;
-  align-items: center;
-}
-
-.nav-status-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-left: 11rpx;
-  padding: 16rpx;
-}
-
-.nav-status-icon {
-  width: 44rpx;
-  height: 44rpx;
-  margin-bottom: 7rpx;
-}
-
-.nav-status-text {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 400;
-	font-size: 20rpx;
-	color: #333333;
-	line-height: 28rpx;
-	text-align: left;
-	font-style: normal;
-}
-
-.content {
-  padding: 20rpx;
-  /* 动态计算内容区域的上边距 */
-  padding-top: calc(128rpx + var(--status-bar-height) + 20rpx);
-}
-
-/* 部分卡片 */
-.section-card {
-  background: white;
-  border-radius: 20rpx;
-  padding: 20rpx 20rpx 0 20rpx;
-  margin-bottom: 20rpx;
-}
-
-.section-header {
-  display: flex;
-  align-items: center;
-  margin-bottom: 8rpx;
-}
-
-.section-title {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 500;
-	font-size: 32rpx;
-	color: #1D2129;
-	line-height: 48rpx;
-	text-align: left;
-	font-style: normal;
-}
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 10rpx;
-  border-radius: 5rpx;
-}
-
-.section-desc {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 400;
-	font-size: 24rpx;
-	color: #666666;
-	line-height: 33rpx;
-	text-align: left;
-	font-style: normal;
-	margin-left: 20rpx;
-	letter-spacing: 0.5rpx; 
-}
-
-/* 子部分 */
-.subsection {
-  /* margin-top: 10rpx; */
-  /* margin-left: 17rpx; */
-}
-
-.subsection-content {
-  border-radius: 12rpx;
-  overflow: hidden;
-  margin-left: 17rpx;
-}
-
-/* 信息项 */
-.info-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 32rpx 0 ;
-  border-bottom: 1rpx solid #f0f0f0;
-}
-
-.info-item:last-child {
-  border-bottom: none;
-}
-
-.info-left {
-  display: flex;
-  align-items: center;
-}
-
-.item-icon {
-  width: 48rpx;
-  height: 48rpx;
-  margin-right: 24rpx;
-}
-
-.item-label {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #333333;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.arrow-right {
-  margin-right: 19rpx;
-  width: 11rpx;
-  height: 22rpx;
-}
+<template>
+	<view class="profile-page">
+		<!-- 自定义顶部导航栏 -->
+		<view class="custom-navbar">
+			<!-- 左侧返回按钮和标题 -->
+			<view class="navbar-left">
+				<image class="back-icon"
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/456f4e6c-e86a-42c9-a272-484db9af6c7c"
+					mode="aspectFit" @click="handleBack"></image>
+				<text class="navbar-title">我的资料</text>
+			</view>
+
+			<!-- 右侧状态栏 -->
+			<view class="navbar-right">
+				<!-- <view class="nav-status-item" @click="handleShareWechat">
+          <image class="nav-status-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8a412688-b794-4407-bba6-a6dc65d75f08" mode="aspectFit"></image>
+          <text class="nav-status-text">分享到微信</text>
+        </view>
+        <view class="nav-status-item" @click="handleViewShop">
+          <image class="nav-status-icon" :src="identity == '2' ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2b5de852-2d35-4786-a643-d20cabb3eaee' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/85638da9-804e-4811-8378-d1bb6007f99d'" mode="aspectFit"></image>
+          <text class="nav-status-text">{{ identity == '2' ? '查看店铺' : '查看手艺人' }}</text>
+        </view> -->
+			</view>
+		</view>
+
+		<!-- 内容区域 -->
+		<view class="content">
+			<!-- 基础资料部分 -->
+			<view class="section-card">
+				<view class="section-header">
+					<view class="title-bar"></view>
+					<text class="section-title">基础资料</text>
+				</view>
+				<text class="section-desc">店铺信息将影响顾客到店消费体验，请确保信息准确。</text>
+
+				<view class="subsection">
+					<view class="subsection-content">
+						<!-- 营业时间（商家） / 服务时间（手艺人） -->
+						<view class="info-item" @click="navigateToTimeSetting">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21f1efaf-0c17-49b0-a2b2-e0fd573b92b3"
+									mode="aspectFit"></image>
+								<text class="item-label">{{ identity == '2' ? '营业时间' : '服务时间' }}</text>
+							</view>
+							<view>
+								<image
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+									mode="widthFix"
+									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;">
+								</image>
+								<text style="margin-right: 16rpx; color: #ec5d57;">待完善</text>
+								<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
+								</image>
+							</view>
+						</view>
+						<!-- 服务技能 -->
+						<view class="info-item" @click="navigateToServiceSkill">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b90e2322-a261-4c17-a581-85010c3bc112"
+									mode="aspectFit"></image>
+								<text class="item-label">服务技能</text>
+							</view>
+							<view>
+								<image
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+									mode="widthFix"
+									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;">
+								</image>
+								<text style="margin-right: 16rpx; color: #389930;">已认证</text>
+								<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
+								</image>
+							</view>
+						</view>
+
+						<!-- 门店信息 -->
+						<view class="info-item" v-if="identity == '2'" @click="navigateToShopInfo">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e9618006-db69-446e-92e1-ba9dd81e79f9"
+									mode="aspectFit"></image>
+								<text class="item-label">门店信息</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 服务区域（手艺人显示） -->
+						<view class="info-item" v-if="identity == '1'" @click="navigateToServiceArea">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a35603b1-50fb-4248-9f2e-2dd4d5e249c0"
+									mode="aspectFit"></image>
+								<text class="item-label">服务区域</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 个人信息（手艺人显示） -->
+						<view class="info-item" v-if="identity == '1'" @click="navigateToPersonalInfo">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/77dc7a16-3b86-44e5-8acc-5f3b85ffc137"
+									mode="aspectFit"></image>
+								<text class="item-label">个人信息</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 个人信息（手艺人显示） -->
+						<view class="info-item" @click="navigateToimg">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/53a9d1e1-e2d2-4001-b599-82e0c0747f1a.png"
+									mode="aspectFit"></image>
+								<text class="item-label">相册管理</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+						<!-- 个人信息（手艺人显示） -->
+						<view class="info-item" @click="navigateTovideo">
+							<view class="info-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6fc821cd-8dd1-41f1-8854-889fb5f76b78.png"
+									mode="aspectFit"></image>
+								<text class="item-label">视频管理</text>
+							</view>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+						</view>
+
+					</view>
+				</view>
+			</view>
+
+			<!-- 经营资质部分 -->
+			<view class="section-card">
+				<view class="section-header">
+					<view class="title-bar"></view>
+					<text class="section-title">经营资质</text>
+				</view>
+
+				<view class="subsection-content">
+					<!-- 资质信息 -->
+					<view class="info-item" @click="navigateToQualification">
+						<view class="info-left">
+							<image class="item-icon"
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2677692c-5931-4ac7-846e-b6d321184789"
+								mode="aspectFit"></image>
+							<text class="item-label">资质信息</text>
+						</view>
+						<view>
+							<image
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+								mode="widthFix"
+								style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;">
+							</image>
+							<text style="margin-right: 16rpx; color: #e59e45;">审核中</text>
+							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
+							</image>
+						</view>
+					</view>
+
+					<!-- 所属门店（手艺人显示） -->
+					<view class="info-item" v-if="identity == '1'" @click="navigateToBelongShop">
+						<view class="info-left">
+							<image class="item-icon"
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b5541cb5-58c1-4e72-b88f-5cf6450338a8"
+								mode="aspectFit"></image>
+							<text class="item-label">所属门店</text>
+						</view>
+						<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		handleImgSizeUni
+	} from '@/utils/service.js'
+	import request from "../../utils/request";
+
+	export default {
+		data() {
+			return {
+				identity: '',
+				currentUserId: '', // 当前用户ID
+				userInfo: {}, // 用户信息
+				sharing: false // 添加分享状态标记
+			}
+		},
+		onLoad() {
+			// 页面显示时重新加载身份信息，确保数据最新
+			this.loadIdentity()
+			console.log('当前身份:', this.identity)
+			// 加载用户信息
+			this.loadUserInfo()
+		},
+		onShow() {
+			// 页面显示时也重新加载，确保数据最新
+			this.loadIdentity()
+			this.loadUserInfo()
+		},
+		methods: {
+			// 返回按钮处理
+			handleBack() {
+				uni.navigateBack()
+			},
+
+			// 分享到微信
+			handleShareWechat() {
+				console.log('分享到微信')
+
+				this.handleShareProcess()
+			},
+
+			async handleShareProcess() {
+				// 如果正在分享中，防止重复点击
+				if (this.sharing) {
+					return;
+				}
+
+				// 设置分享状态
+				this.sharing = true;
+
+				try {
+					// 显示加载提示
+					uni.showLoading({
+						title: '正在准备分享...',
+						mask: true
+					});
+
+					// 确保用户信息已加载
+					if (!this.currentUserId) {
+						await this.loadUserInfo()
+					}
+
+					// 检查是否已加载用户信息
+					if (!this.currentUserId) {
+						uni.showToast({
+							title: '无法获取用户信息',
+							icon: 'none'
+						})
+						return
+					}
+
+					// 根据环境处理
+					// #ifdef APP-PLUS
+					this.handleAppAutoShare()
+					// #endif
+
+					// #ifdef MP-WEIXIN
+					this.handleMpAutoShare()
+					// #endif
+
+					// #ifdef H5
+					this.handleH5Share()
+					// #endif
+				} catch (error) {
+					console.error('分享过程出错:', error);
+					uni.hideLoading();
+					this.sharing = false;
+					uni.showToast({
+						title: '分享失败，请重试',
+						icon: 'none'
+					});
+				}
+			},
+
+			// H5环境分享
+			handleH5Share() {
+				// 在H5环境，通常使用浏览器的分享功能或复制链接
+				const shareUrl = window.location.href
+				uni.showModal({
+					title: '分享提示',
+					// content: `请复制链接分享给好友：${shareUrl}`,
+					content: `请在美融融Plus APP 环境下使用此功能`,
+
+					showCancel: false,
+					confirmText: '好的',
+					success: (res) => {
+						if (res.confirm) {
+							// // 复制链接到剪贴板
+							// uni.setClipboardData({
+							//   data: shareUrl,
+							//   success: () => {
+							//     uni.showToast({
+							//       title: '链接已复制',
+							//       icon: 'success'
+							//     })
+							//   }
+							// })
+						}
+					}
+				})
+			},
+
+			// 小程序环境处理
+			handleMpAutoShare() {
+				// 小程序无法自动触发分享，跳转后提示用户手动操作
+				const url = this.identity == '2' ?
+					`/pages/user/store-detail?id=${this.currentUserId}` :
+					`/pages/user/syr-detail?id=${this.currentUserId}`;
+
+				uni.navigateTo({
+					url: url,
+					success: () => {
+						setTimeout(() => {
+							uni.showToast({
+								title: '请点击右上角分享',
+								icon: 'none',
+								duration: 2000
+							});
+						}, 500);
+					}
+				});
+			},
+
+			// APP环境自动分享
+			handleAppAutoShare() {
+				if (!this.currentUserId) {
+					uni.showToast({
+						title: '无法获取用户信息',
+						icon: 'none'
+					});
+					return;
+				}
+
+				// 清除旧的分享标记
+				uni.removeStorage({
+					key: 'share_success'
+				});
+
+				// 跳转到店铺主页并自动触发分享
+				const url = this.identity == '2' ?
+					`/pages/user/store-detail?id=${this.currentUserId}&autoShare=1` :
+					`/pages/user/syr-detail?id=${this.currentUserId}&autoShare=1`;
+
+				uni.navigateTo({
+					url: url,
+					success: () => {
+						console.log('跳转成功，将自动触发分享');
+						// 跳转成功后立即隐藏loading，避免页面闪烁
+						setTimeout(() => {
+							uni.hideLoading();
+							this.sharing = false;
+						}, 200);
+					},
+					fail: () => {
+						console.log('跳转失败:', err);
+						uni.hideLoading();
+						this.sharing = false;
+						this.showManualShareOption();
+					}
+				});
+			},
+
+			// 执行APP分享
+			executeAppShare(imageUrl) {
+				// 备用图片地址
+				const backupImageUrl =
+					"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/yh/1756713709528-717.png?x-oss-process=image/resize,p_40"
+
+				// 根据身份设置不同的分享标题
+				const shareTitle = this.identity == '2' ?
+					"好友刚推了个超赞商家！点开认识TA ~" :
+					"好友刚推了个超赞手艺人！点开认识TA ~"
+
+				// 生成分享配置
+				const shareConfig = {
+					provider: "weixin",
+					scene: "WXSceneSession",
+					type: 5,
+					title: shareTitle,
+					miniProgram: {
+						id: "gh_89c92e18b70b", // 小程序原始ID
+						path: this.getSharePath(), // 动态分享路径
+						type: 0, // 正式版
+						webUrl: "https://www.baidu.com/", // 降级网页地址
+					},
+					imageUrl: imageUrl,
+					success: (res) => {
+						console.log("分享成功:", JSON.stringify(res))
+						uni.showToast({
+							title: '分享成功',
+							icon: 'success'
+						})
+					},
+					fail: (err) => {
+						console.log("分享失败:", JSON.stringify(err))
+						// 尝试使用备用图片
+						if (imageUrl !== backupImageUrl) {
+							console.log("尝试使用备用图片分享...")
+							this.executeAppShare(backupImageUrl)
+						} else {
+							uni.showToast({
+								title: '分享失败',
+								icon: 'none'
+							})
+						}
+					}
+				}
+
+				// 检查是否支持分享API
+				if (uni.share) {
+					uni.share(shareConfig)
+				} else {
+					uni.showToast({
+						title: '当前环境不支持分享',
+						icon: 'none'
+					})
+				}
+			},
+
+			// 获取分享路径
+			getSharePath() {
+				// 根据身份生成不同的分享路径
+				if (this.identity == '2') {
+					// 商家分享店铺详情页
+					return `/pages/user/store-detail?id=${this.currentUserId || ''}`
+				} else {
+					// 手艺人分享个人主页
+					return `/pages/user/syr-detail?id=${this.currentUserId || ''}`
+				}
+			},
+
+			// 查看店铺
+			async handleViewShop() {
+				console.log('查看店铺')
+
+				// 确保用户信息已加载
+				if (!this.currentUserId) {
+					await this.loadUserInfo()
+				}
+
+				// 如果仍然没有用户ID，提示用户手动输入或联系客服
+				if (!this.currentUserId) {
+					uni.showModal({
+						title: '提示',
+						content: '无法获取用户信息，请联系客服或稍后重试',
+						showCancel: false,
+						confirmText: '确定'
+					})
+					return
+				}
+
+				// 根据身份跳转到不同的页面
+				if (this.identity == '2') {
+					// 商家跳转到店铺主页
+					uni.navigateTo({
+						url: '/pages/user/store-detail?id=' + this.currentUserId
+					})
+				} else {
+					// 手艺人跳转到个人主页
+					uni.navigateTo({
+						url: '/pages/user/syr-detail?id=' + this.currentUserId
+					})
+				}
+			},
+
+			// 加载用户信息 - 主要使用接口获取
+			async loadUserInfo() {
+				try {
+					// 根据身份设置type参数（参考个人中心页面的逻辑）
+					let type = 1 // 默认值
+					if (this.identity == '1') {
+						type = 2 // 手艺人
+					} else if (this.identity == '2') {
+						type = 3 // 商家
+					}
+
+					console.log('调用接口获取用户信息，type:', type)
+
+					// 调用接口获取用户信息
+					const result = await request.post('/user/getuser', {
+						type
+					})
+
+					if (result.data && result.data.id) {
+						this.userInfo = result.data
+						this.currentUserId = result.data.id
+
+						// 存储到本地，避免重复调用
+						uni.setStorageSync('userInfo', result.data)
+						console.log('从接口获取用户信息成功:', this.userInfo)
+					} else {
+						console.log('接口返回数据异常:', result)
+					}
+				} catch (error) {
+					console.log('获取用户信息失败:', error)
+
+					// 降级方案：尝试从其他可能的位置获取用户ID
+					this.tryAlternativeUserInfo()
+				}
+			},
+
+			// 备用方案：从其他位置获取用户信息
+			tryAlternativeUserInfo() {
+				try {
+					const app = getApp()
+
+					// 方法1: 从全局数据获取用户ID
+					if (app.globalData.userInfo && app.globalData.userInfo.id) {
+						this.currentUserId = app.globalData.userInfo.id
+						this.userInfo = app.globalData.userInfo
+						console.log('从全局数据获取用户ID:', this.currentUserId)
+						return
+					}
+
+					// 方法2: 从本地存储获取完整的用户信息
+					const userInfo = uni.getStorageSync('userInfo')
+					if (userInfo && userInfo.id) {
+						this.currentUserId = userInfo.id
+						this.userInfo = userInfo
+						console.log('从存储获取用户ID:', this.currentUserId)
+						return
+					}
+
+					// 方法3: 直接获取用户ID
+					const userId = uni.getStorageSync('userId')
+					if (userId) {
+						this.currentUserId = userId
+						console.log('从存储获取用户ID:', userId)
+						return
+					}
+
+					console.log('所有获取用户信息的方法都失败了')
+				} catch (e) {
+					console.log('备用方案获取用户信息失败:', e)
+				}
+			},
+
+			loadIdentity() {
+				// 从全局数据获取身份
+				const app = getApp()
+				const globalIdentity = app.globalData.artisanType
+				console.log('从全局数据获取身份:', globalIdentity)
+
+				if (globalIdentity) {
+					this.identity = globalIdentity
+					uni.setStorageSync('user_identity', globalIdentity)
+				} else {
+					// 如果全局数据没有，尝试从本地存储获取
+					const localIdentity = uni.getStorageSync('user_identity')
+					if (localIdentity) {
+						this.identity = localIdentity
+						console.log('从本地存储获取身份:', localIdentity)
+					} else {
+						console.log('未获取到身份信息')
+						// 默认设为手艺人
+						this.identity = '1'
+					}
+				}
+
+				console.log('当前身份:', this.identity)
+			},
+
+			navigateToTimeSetting() {
+				if (this.identity == '2') {
+					// 商家跳转到营业时间页面
+					uni.navigateTo({
+						url: '/pages/shop/business-time'
+					})
+				} else {
+					// 手艺人跳转到服务时间页面
+					uni.navigateTo({
+						url: '/pages/artisan/service-time'
+					})
+				}
+			},
+
+			navigateToServiceSkill() {
+				if (this.identity == '2') {
+					// 商家跳转到商家服务技能页面
+					uni.navigateTo({
+						url: '/pages/shop/service-skills'
+					})
+				} else {
+					// 手艺人跳转到手艺人服务技能页面
+					uni.navigateTo({
+						url: '/pages/artisan/service-skills'
+					})
+				}
+			},
+
+			navigateToShopInfo() { // 商家：门店信息 
+				uni.navigateTo({
+					url: '/pages/shop/sj-info-change'
+				})
+			},
+
+			navigateToServiceArea() { // 手艺人：服务区域
+				uni.navigateTo({
+					url: '/pages/artisan/service-area'
+				})
+			},
+
+			navigateToPersonalInfo() { // 手艺人：个人信息
+				uni.navigateTo({
+					url: '/pages/artisan/syr-info-change'
+				})
+			},
+
+			navigateToimg() { // 图片管理
+				uni.navigateTo({
+					url: '/pages/shop/photoAlbum/photoManage?type=1'
+				})
+			},
+
+			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;
+	}
+
+	/* 自定义导航栏样式 */
+	.custom-navbar {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 108rpx;
+		/* 使用标准导航栏高度 */
+		background: white;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 32rpx;
+		z-index: 999;
+		box-sizing: border-box;
+		/* 适配不同机型的顶部安全区域 */
+		padding-top: var(--status-bar-height);
+		height: calc(128rpx + var(--status-bar-height));
+	}
+
+	/* 导航栏左侧 */
+	.navbar-left {
+		display: flex;
+		align-items: center;
+	}
+
+	.back-icon {
+		width: 16rpx;
+		height: 32rpx;
+		margin-right: 23rpx;
+	}
+
+	.navbar-title {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #333333;
+		line-height: 45rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	/* 导航栏右侧状态栏 */
+	.navbar-right {
+		display: flex;
+		align-items: center;
+	}
+
+	.nav-status-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-left: 11rpx;
+		padding: 16rpx;
+	}
+
+	.nav-status-icon {
+		width: 44rpx;
+		height: 44rpx;
+		margin-bottom: 7rpx;
+	}
+
+	.nav-status-text {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #333333;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.content {
+		padding: 20rpx;
+		/* 动态计算内容区域的上边距 */
+		padding-top: calc(128rpx + var(--status-bar-height) + 20rpx);
+	}
+
+	/* 部分卡片 */
+	.section-card {
+		background: white;
+		border-radius: 20rpx;
+		padding: 20rpx 20rpx 0 20rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.section-header {
+		display: flex;
+		align-items: center;
+		margin-bottom: 8rpx;
+	}
+
+	.section-title {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #1D2129;
+		line-height: 48rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.title-bar {
+		width: 6rpx;
+		height: 30rpx;
+		background-color: #E8101E;
+		margin-right: 10rpx;
+		border-radius: 5rpx;
+	}
+
+	.section-desc {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #666666;
+		line-height: 33rpx;
+		text-align: left;
+		font-style: normal;
+		margin-left: 20rpx;
+		letter-spacing: 0.5rpx;
+	}
+
+	/* 子部分 */
+	.subsection {
+		/* margin-top: 10rpx; */
+		/* margin-left: 17rpx; */
+	}
+
+	.subsection-content {
+		border-radius: 12rpx;
+		overflow: hidden;
+		margin-left: 17rpx;
+	}
+
+	/* 信息项 */
+	.info-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 32rpx 0;
+		border-bottom: 1rpx solid #f0f0f0;
+	}
+
+	.info-item:last-child {
+		border-bottom: none;
+	}
+
+	.info-left {
+		display: flex;
+		align-items: center;
+	}
+
+	.item-icon {
+		width: 48rpx;
+		height: 48rpx;
+		margin-right: 24rpx;
+	}
+
+	.item-label {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.arrow-right {
+		margin-right: 19rpx;
+		width: 11rpx;
+		height: 22rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/qualification_sj copy.vue b/pages/ruzhu/qualification_sj copy.vue
new file mode 100644
index 0000000..921f2f0
--- /dev/null
+++ b/pages/ruzhu/qualification_sj copy.vue	
@@ -0,0 +1,1963 @@
+<template>
+  <view class="qualification-page">
+    <!-- 营业执照部分 -->
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">营业执照</text>
+      </view>
+
+      <!-- 资质照片 -->
+      <view class="form-item box-cont">
+        <text class="label required">资质照片</text>
+        <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
+        <view class="upload-container">
+          <view class="upload-box" @click="chooseImage('uscc_photo')">
+            <view class="upload-camera license-upload">
+              <image v-if="formData.uscc_photo" :src="formData.uscc_photo" mode="aspectFill" class="preview-image"></image>
+              <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/92bd4268-b4d7-4725-8664-9e44f828c7d9" mode="aspectFit" class="camera-icon"></image>
+              <!-- 识别状态遮罩 -->
+              <!-- <view v-if="isRecognizing && recognizeType === 'uscc_photo'" class="recognize-overlay">
+                <view class="recognize-loading"></view>
+                <text class="recognize-text">识别中...</text>
+              </view> -->
+            </view>
+          </view>
+          <text class="upload-label required">请上传营业执照原件</text>
+        </view>
+      </view>
+
+      <!-- 商户类型 -->
+      <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+          <text class="label required">商户类型</text>
+        </view>
+        <input type="text" v-model="formData.uscc_type" placeholder="请输入商户类型" 
+               placeholder-class="placeholder" class="input" 
+               @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <!-- 营业执照信息 -->
+      <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+          <text class="label required">证件号码</text>
+          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_num')"></image>
+        </view>
+        <input type="text" v-model="formData.uscc_num" placeholder="请输入营业执照的证件号码" 
+               placeholder-class="placeholder" class="input" 
+               @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+          <text class="label required">企业名称</text>
+          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_name')"></image>
+        </view>
+        <input type="text" v-model="formData.uscc_name" placeholder="请输入营业执照的企业名称" 
+               placeholder-class="placeholder" class="input" 
+               @input="saveFormDataToLocalDebounce" />
+      </view>
+    </view>
+
+    <!-- 法人信息部分 -->
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text>法人信息</text>
+      </view>
+
+    <!-- 身份证照片部分 -->
+    <view class="section">
+      <view class="box-cont">
+        <view class="form-item">
+          <text class="label required">身份证照片</text>
+          <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
+          
+          <view class="idcard-upload-vertical-container">
+            <!-- 身份证正面 -->
+            <view class="idcard-upload-vertical-item">
+              <view class="upload-box" @click="chooseImage('legal_idcard_positive')">
+                <view class="upload-camera idcard-front">
+                  <image v-if="formData.legal_idcard_positive" :src="formData.legal_idcard_positive" mode="aspectFill" class="preview-image"></image>
+                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/043b0c97-79c1-4f95-810f-c33e3d5269a3" mode="aspectFit" class="camera-icon"></image>
+                  <!-- 识别状态遮罩 -->
+                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_positive'" class="recognize-overlay">
+                    <view class="recognize-loading"></view>
+                    <text class="recognize-text">识别中...</text>
+                  </view> -->
+                </view>
+              </view>
+              <text class="upload-label required">请上传身份证正面（人像面）</text>
+            </view>
+            
+            <!-- 身份证反面 -->
+            <view class="idcard-upload-vertical-item">
+              <view class="upload-box" @click="chooseImage('legal_idcard_negative')">
+                <view class="upload-camera idcard-back">
+                  <image v-if="formData.legal_idcard_negative" :src="formData.legal_idcard_negative" mode="aspectFill" class="preview-image"></image>
+                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/203cfdf4-2501-44e6-8565-ad251c6bf0fa" mode="aspectFit" class="camera-icon"></image>
+                  <!-- 识别状态遮罩 -->
+                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_negative'" class="recognize-overlay">
+                    <view class="recognize-loading"></view>
+                    <text class="recognize-text">识别中...</text>
+                  </view> -->
+                </view>
+              </view>
+              <text class="upload-label required">请上传身份证反面（国徽面）</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+      <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+          <text class="label required">法人代表</text>
+          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('legal_name')"></image>
+        </view>
+        <input type="text" v-model="formData.legal_name" placeholder="请输入营业执照的法人代表" 
+               placeholder-class="placeholder" class="input" 
+               @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">法人联系方式</text>
+        <input type="number" v-model="formData.legal_phone" placeholder="请输入法人的联系方式" 
+              placeholder-class="placeholder" class="input" 
+              @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">法人身份证号</text>
+        <input type="idcard" v-model="formData.legal_idcard_num" placeholder="请输入法人身份证号" 
+               placeholder-class="placeholder" class="input" 
+               @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <!-- 身份证有效期 -->
+      <view class="form-item box-cont">
+        <text class="label required">身份证有效期至</text>
+        <view class="radio-group">
+          <view class="radio-item" @click="setIdcardValidType('permanent')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
+              <image v-if="formData.legal_idcard_expiry_type === 'permanent'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+            </view>
+            <text class="radio-label">长久有效</text>
+          </view>
+          <view class="radio-item" @click="setIdcardValidType('date')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
+              <image v-if="formData.legal_idcard_expiry_type === 'date'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+            </view>
+            <text class="radio-label">指定日期有效</text>
+          </view>
+        </view>
+      </view>
+
+      <!-- 身份证有效期日期选择 -->
+      <view class="box-cont">
+        <view class="date-range-container">
+          <view class="date-item">
+            <text class="date-label">开始日期</text>
+            <view class="date-picker-box" @click="openDatePicker('idcard_start_date')">
+              <text :class="formData.idcard_start_date ? 'date-value' : 'placeholder'">
+                {{formatDateForDisplay(formData.idcard_start_date) || '请选择日期'}}
+              </text>
+              <view class="date-divider"></view>
+              <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649" class="date-arrow" mode="aspectFit"></image>
+            </view>
+          </view>
+          <view class="date-item">
+            <text class="date-label">结束日期</text>
+            <view class="date-picker-box" :class="{ disabled: formData.legal_idcard_expiry_type === 'permanent' }" 
+                  @click="formData.legal_idcard_expiry_type !== 'permanent' && openDatePicker('idcard_end_date')">
+              <text :class="formData.idcard_end_date ? 'date-value' : 'placeholder'">
+                {{formatDateForDisplay(formData.idcard_end_date) || '请选择日期'}}
+              </text>
+              <view class="date-divider"></view>
+              <image :src="formData.legal_idcard_expiry_type === 'permanent' ? 
+                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9a757f-a36c-46bb-a59f-2caddac5365b' : 
+                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649'" 
+                class="date-arrow" mode="aspectFit"></image>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+
+    <!-- 日期选择器 -->
+    <view class="popup" :class="{ show: showDatePickerFlag }">
+      <view class="popup-mask" @click="hideDatePicker"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="cancel-text" @click="hideDatePicker">取消</text>
+          <text class="title">选择日期</text>
+          <text class="confirm-text" @click="confirmDate">确定</text>
+        </view>
+        <view class="region-body">
+          <picker-view :value="dateValue" @change="bindDateChange" class="picker-scroll" 
+                      :indicator-style="indicatorStyle" mode="date" fields="day">
+            <picker-view-column>
+              <view class="picker-item" v-for="(year, index) in years" :key="index">{{year}}年</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(month, index) in months" :key="index">{{month}}月</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(day, index) in days" :key="index">{{day}}日</view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 提示信息弹窗 -->
+    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+      <view class="tip-popup-mask" @click="hideTipPopup"></view>
+      <view class="tip-popup-content">
+        <!-- 弹窗背景图片 -->
+        <image class="tip-popup-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770" mode="aspectFit"></image>
+        
+        <!-- 弹窗内容 -->
+        <view class="tip-popup-body">
+          <view class="tip-title">{{ tipTitle }}</view>
+          <view class="tip-image-container">
+            <image class="tip-image" :src="tipImage" mode="widthFix"></image>
+          </view>
+          <view class="tip-buttons">
+            <view class="tip-btn cancel" @click="hideTipPopup">
+              <text class="btn-text">取消</text>
+            </view>
+            <view class="tip-btn confirm" @click="hideTipPopup">
+              <text class="btn-text">我已了解</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+
+  </view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import { debounce } from '@/utils/debounce.js';
+import uploadImage from '../../utils/uploadImage';
+import permissionUtils from '../../utils/per';
+import locationService from '../../utils/locationService';
+import { recognizeIdCard, recognizeBusinessLicense, formatDateFromNumber, parseValidPeriod } from '../../utils/orc';
+
+export default {
+  data() {
+    const currentDate = new Date();
+    const currentYear = new Date().getFullYear();
+    const years = Array.from({length: 130}, (_, i) => 1970 + i);
+    const months = Array.from({length: 12}, (_, i) => i + 1);
+    const days = Array.from({length: 31}, (_, i) => i + 1);
+    
+    // 从本地存储加载数据
+    const loadedData = this.loadFormDataFromLocal();
+    
+    return {
+      userId: null,
+      // 使用本地存储初始化数据
+      formData: loadedData || {
+        uscc_type: '',
+        uscc_photo: '',
+        uscc_num: '',
+        uscc_name: '',
+        license_valid_type: '',
+        license_start_date: '',
+        license_end_date: '',
+        legal_name: '',
+        legal_phone: '',
+        legal_idcard_num: '',
+        legal_idcard_expiry_type: '',
+        idcard_start_date: '',
+        idcard_end_date: '',
+        legal_idcard_positive: '',
+        legal_idcard_negative: ''
+      },
+      showDatePickerFlag: false,
+      showTipPopupFlag: false, // 提示弹窗显示状态
+      currentDateField: '',
+      years,
+      months,
+      days,
+      dateValue: [currentYear - 1970, currentDate.getMonth(), currentDate.getDate() - 1], // 默认选中今天
+      indicatorStyle: 'height: 68rpx;',
+      tipTitle: '', // 提示弹窗标题
+      tipImage: '', // 提示弹窗图片
+      isSubmit: false, // 防止重复提交
+
+      // 识别状态
+      isRecognizing: false,
+      recognizeType: '', // 'legal_idcard_positive', 'legal_idcard_negative', 'uscc_photo'
+      identity: 2
+    }
+  },
+  computed: {
+    
+  },
+  
+  // 添加 watch 监听表单数据变化
+  watch: {
+    'formData.uscc_num'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.uscc_name'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.legal_name'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.legal_phone'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.legal_idcard_num'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.uscc_photo'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.legal_idcard_positive'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.legal_idcard_negative'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    }
+  },
+  
+  // 页面生命周期
+  onLoad(options) {
+	  console.log(1111112222)
+
+    // 获取用户信息，用于图片上传
+    this.getUserInfo();
+    
+    // 检查全局状态中是否有数据（从前一页面带过来的）
+    this.checkGlobalData();
+  },
+  
+  onShow() {
+    // 页面显示时重新从本地存储加载数据
+    const localData = this.loadFormDataFromLocal();
+    if (localData) {
+      // 合并数据，避免覆盖已有数据
+      this.formData = { ...this.formData, ...localData };
+    }
+    
+    // 检查全局状态
+    this.checkGlobalData();
+  },
+  
+  onHide() {
+    // 页面隐藏时保存数据
+    this.saveFormDataToLocal();
+  },
+  
+  onUnload() {
+    // 页面卸载时保存数据
+    this.saveFormDataToLocal();
+  },
+  
+  methods: {
+    // 检查全局数据
+    checkGlobalData() {
+      if (getApp().globalData.qualificationData) {
+        // 如果全局有数据，合并到当前表单
+        this.formData = { ...this.formData, ...getApp().globalData.qualificationData };
+        // 保存到本地存储
+        this.saveFormDataToLocal();
+        // 清空全局数据，避免重复使用
+        // delete getApp().globalData.qualificationData;
+        getApp().globalData.qualificationData = null;
+      }
+    },
+    
+    // 从本地存储加载数据
+    loadFormDataFromLocal() {
+      try {
+        const stored = uni.getStorageSync('qualification_form_data');
+        if (stored) {
+          console.log('从本地存储加载数据:', stored);
+          return stored;
+        }
+      } catch (e) {
+        console.log('读取本地存储失败:', e);
+      }
+      return null;
+    },
+    
+    // 保存数据到本地存储（带防抖）
+    saveFormDataToLocalDebounce: debounce(function() {
+      this.saveFormDataToLocal();
+    }, 500),
+    
+    // 保存数据到本地存储
+    saveFormDataToLocal() {
+      try {
+        uni.setStorageSync('qualification_form_data', this.formData);
+        console.log('数据已保存到本地存储');
+      } catch (e) {
+        console.log('保存数据失败:', e);
+      }
+    },
+    
+    // 清空本地存储（在表单提交成功后调用）
+    clearFormDataLocal() {
+      try {
+        uni.removeStorageSync('qualification_form_data');
+        console.log('已清空本地存储数据');
+      } catch (e) {
+        console.log('清空数据失败:', e);
+      }
+    },
+
+    // 获取用户信息
+    getUserInfo() {
+      return new Promise((resolve, reject) => {
+        request.post('/sj/user/getuser').then(result => {
+          if (result.state === 1) {
+            this.userId = result.data.id;
+            console.log('用户ID获取成功:', this.userId);
+            resolve(this.userId);
+          } else {
+            console.error('获取用户信息失败:', result.msg);
+            reject(result.msg);
+          }
+        }).catch(error => {
+          console.error('获取用户信息接口错误:', error);
+          reject(error);
+        });
+      });
+    },
+
+    getFormData() {
+        return {
+          ...this.formData,
+          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
+          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
+          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
+          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
+        };
+    },
+
+    // 添加日期格式化方法
+    formatDateForDisplay(dateStr) {
+      if (!dateStr) return '';
+      if (dateStr === '长久有效') return '长久有效';
+      
+      // 如果是 YYYY-MM-DD 格式，转换为 年月日 格式显示
+      if (dateStr.includes('-')) {
+        const [year, month, day] = dateStr.split('-');
+        return `${year}年${parseInt(month)}月${parseInt(day)}日`;
+      }
+      
+      return dateStr; // 如果已经是年月日格式，直接返回
+    },
+
+    // 将日期转换为后端需要的格式
+    formatDateForBackend(dateStr) {
+      if (!dateStr) return '';
+      if (dateStr === '长久有效') return 'permanent'; // 根据后端需求返回
+      
+      // 将 年月日 格式转换为 YYYY-MM-DD
+      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
+      if (match) {
+        const year = match[1];
+        const month = match[2].padStart(2, '0');
+        const day = match[3].padStart(2, '0');
+        return `${year}-${month}-${day}`;
+      }
+      
+      return dateStr; // 如果已经是 YYYY-MM-DD 格式，直接返回
+    },
+
+    // 显示提示弹窗
+    showTipPopup(field) {
+      // 根据字段设置对应的标题和图片
+      const tipConfig = {
+        'uscc_num': {
+          title: '如何找到证件号码',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/72856aac-f0ac-49a1-a7f1-be3220ecb314'
+        },
+        'uscc_name': {
+          title: '如何找到企业名称',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
+        },
+        'legal_name': {
+          title: '如何找到法人代表',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/24859872-da37-4beb-8e33-7743813bb5a1'
+        }
+      };
+      
+      if (tipConfig[field]) {
+        this.tipTitle = tipConfig[field].title;
+        this.tipImage = tipConfig[field].image;
+        // 确保图片已加载再显示弹窗
+        this.ensureImageLoaded(this.tipImage).then(() => {
+          this.showTipPopupFlag = true;
+        }).catch(() => {
+          // 即使加载失败也显示弹窗，避免用户无法操作
+          this.showTipPopupFlag = true;
+        });
+      }
+    },
+
+    // 确保图片加载完成
+    ensureImageLoaded(src) {
+      return new Promise((resolve, reject) => {
+        const img = new Image();
+        img.onload = () => resolve();
+        img.onerror = () => reject();
+        img.src = src;
+        
+        // 设置超时，避免长时间等待
+        setTimeout(() => resolve(), 500);
+      });
+    },
+    
+    // 隐藏提示弹窗
+    hideTipPopup() {
+      this.showTipPopupFlag = false;
+    },
+
+
+    // 设置营业执照有效期类型
+    setLicenseValidType(type) {
+      this.formData.license_valid_type = type;
+      if (type === 'permanent') {
+        // 选择长久有效时，设置结束日期为"长久有效"
+        this.formData.license_end_date = '长久有效';
+      } else {
+        // 选择指定日期时，如果之前是长久有效，清空结束日期
+        if (this.formData.license_end_date === '长久有效') {
+          this.formData.license_end_date = '';
+        }
+      }
+      // 保存到本地存储
+      this.saveFormDataToLocal();
+    },
+    
+    // 设置身份证有效期类型
+    setIdcardValidType(type) {
+      this.formData.legal_idcard_expiry_type = type;
+      if (type === 'permanent') {
+        // 选择长久有效时，设置结束日期为"长久有效"
+        this.formData.idcard_end_date = '长久有效';
+      } else {
+        // 选择指定日期时，如果之前是长久有效，清空结束日期
+        if (this.formData.idcard_end_date === '长久有效') {
+          this.formData.idcard_end_date = '';
+        }
+        // 如果已有开始日期，自动计算20年后的结束日期
+        if (this.formData.idcard_start_date && !this.formData.idcard_end_date) {
+          const match = this.formData.idcard_start_date.match(/(\d+)年(\d+)月(\d+)日/);
+          if (match) {
+            const year = parseInt(match[1]) + 20;
+            const month = match[2];
+            const day = match[3];
+            this.formData.idcard_end_date = `${year}年${month}月${day}日`;
+          }
+        }
+      }
+      // 保存到本地存储
+      this.saveFormDataToLocal();
+    },
+    
+    
+    // 选择商户类型
+    selectMerchantType(item) {
+      this.formData.uscc_type = item.value;
+      // 保存到本地存储
+      this.saveFormDataToLocal();
+    },
+    
+    // 确认商户类型选择
+    confirmMerchantType() {
+      this.hideMerchantTypePicker();
+    },
+    
+    // 打开日期选择器
+    openDatePicker(field) {
+      this.currentDateField = field;
+      
+      // 设置日期选择器的初始值
+      const currentDate = new Date();
+      let initialDate = currentDate;
+      
+      // 如果该字段已经有值，解析该值作为初始值
+      if (this.formData[field]) {
+        const dateStr = this.formData[field];
+        const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
+        if (match) {
+          initialDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
+        }
+      }
+      
+      // 计算picker-view的value
+      const yearIndex = this.years.indexOf(initialDate.getFullYear());
+      const monthIndex = initialDate.getMonth();
+      const dayIndex = initialDate.getDate() - 1;
+      
+      this.dateValue = [
+        yearIndex >= 0 ? yearIndex : 0,
+        monthIndex,
+        dayIndex
+      ];
+      
+      this.showDatePickerFlag = true;
+    },
+    
+    // 隐藏日期选择器
+    hideDatePicker() {
+      this.showDatePickerFlag = false;
+    },
+    
+    // 日期选择变化
+    bindDateChange(e) {
+      this.dateValue = e.detail.value;
+    },
+
+    // 确认日期选择
+    confirmDate() {
+      const [yearIndex, monthIndex, dayIndex] = this.dateValue;
+      const year = this.years[yearIndex];
+      const month = this.months[monthIndex];
+      const day = this.days[dayIndex];
+      const dateStr = `${year}年${month}月${day}日`;
+      const selectedDate = new Date(year, month - 1, day);
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+      
+      // 验证日期逻辑
+      if (this.currentDateField.endsWith('_start_date')) {
+        // 开始日期验证：不能选择今天之后的日期
+        if (selectedDate > today) {
+          uni.showToast({
+            title: '开始日期不能晚于今天',
+            icon: 'none'
+          });
+          return;
+        }
+        
+        // 如果对应的结束日期已经设置，检查开始日期是否晚于结束日期
+        const relatedEndField = this.currentDateField.replace('_start_date', '_end_date');
+        if (this.formData[relatedEndField] && this.formData[relatedEndField] !== '长久有效') {
+          const endDateStr = this.formData[relatedEndField];
+          const match = endDateStr.match(/(\d+)年(\d+)月(\d+)日/);
+          if (match) {
+            const endDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
+            if (selectedDate > endDate) {
+              uni.showToast({
+                title: '开始日期不能晚于结束日期',
+                icon: 'none'
+              });
+              return;
+            }
+          }
+        }
+        // 如果是身份证开始日期，自动计算结束日期
+        if (this.currentDateField === 'idcard_start_date') {
+          // 如果是"长久有效"类型，不自动设置结束日期
+          if (this.formData.legal_idcard_expiry_type === 'date') {
+            const endYear = year + 20;
+            const endDateStr = `${endYear}年${month}月${day}日`;
+            this.formData.idcard_end_date = endDateStr;
+          } else if (this.formData.legal_idcard_expiry_type === 'permanent') {
+            // 如果是"长久有效"类型，保持结束日期为"长久有效"
+            this.formData.idcard_end_date = '长久有效';
+          }
+        }
+
+      } else if (this.currentDateField.endsWith('_end_date')) {
+        const relatedStartField = this.currentDateField.replace('_end_date', '_start_date');
+        if (this.formData[relatedStartField]) {
+          const startDateStr = this.formData[relatedStartField];
+          const match = startDateStr.match(/(\d+)年(\d+)月(\d+)日/);
+          if (match) {
+            const startDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
+            if (selectedDate <= startDate) {
+              uni.showToast({
+                title: '结束日期必须晚于开始日期',
+                icon: 'none'
+              });
+              return;
+            }
+          }
+        } else {
+          // 如果没有设置开始日期，结束日期不能早于今天
+          if (selectedDate < today) {
+            uni.showToast({
+              title: '结束日期不能早于今天',
+              icon: 'none'
+            });
+            return;
+          }
+        }
+      }
+      
+      this.formData[this.currentDateField] = dateStr;
+      // 保存到本地存储
+      this.saveFormDataToLocal();
+      this.hideDatePicker();
+    },
+    
+    // 选择图片
+    async chooseImage(type) {
+      try {
+        const systemInfo = uni.getSystemInfoSync()
+        
+        if (systemInfo.platform === 'ios') {
+          this.openCamera(type);
+        } else {
+          let xcpermission = '';
+          let xjpermission = '';
+          if (systemInfo.platform === 'ios') {
+            xcpermission = 'photo_library',
+            xjpermission = 'camera'
+          } else {
+            xcpermission = `android.permission.READ_EXTERNAL_STORAGE,android.permission.WRITE_EXTERNAL_STORAGE`
+            xjpermission = 'android.permission.CAMERA'
+          }
+          const xjfirstRequest = !plus.storage.getItem(`perm_${xjpermission}`)
+          const xcfirstRequest = !plus.storage.getItem(`perm_${xcpermission}`)
+          if (xcfirstRequest || xjfirstRequest) {
+            this.isShowPer = true;
+          }
+
+          // 检查权限
+          const xc = await permissionUtils.checkPermission('photo_library', '需要相册权限用于上传照片');
+          const xj = await permissionUtils.checkPermission('camera', '需要相机权限用于拍摄照片');
+          if (xc.granted && xj.granted) {
+            this.openCamera(type);
+            return;
+          }
+
+          // 请求权限
+          const result1 = await permissionUtils.requestPermission('photo_library', '我们需要访问您的相册以上传图片/视频');
+          const result2 = await permissionUtils.requestPermission('camera', '我们需要访问您的相机以上传图片/视频');
+          if (result1 && result2) {
+            this.openCamera(type);
+          } else {
+            locationService.openAppSettings();
+          }
+        }
+      } catch (err) {
+        console.log('选择图片出错:', err);
+        // 出错时也直接调用图片选择
+        this.openCamera(type);
+      }
+    },
+
+    async openCamera(type) {
+      try {
+        // 确保用户信息正确
+        if (!this.userId) {
+          console.log('重新获取用户信息...');
+          await this.getUserInfo();
+        }
+        
+        if (!this.identity) {
+          this.identity = getApp().globalData.artisanType;
+        }
+
+        // 直接使用 uni.chooseImage
+        const chooseResult = await new Promise((resolve, reject) => {
+          uni.chooseImage({
+            count: 1,
+            sizeType: ['compressed'],
+            sourceType: ['album', 'camera'],
+            success: resolve,
+            fail: reject
+          });
+        });
+
+        if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) {
+          uni.hideLoading();
+          return;
+        }
+
+        const tempFilePath = chooseResult.tempFilePaths[0];
+        
+        // 直接构造文件对象
+        const file = {
+          path: tempFilePath,
+          size: 0
+        };
+
+        // 显示上传loading
+        uni.showLoading({
+          title: '上传中...',
+          mask: true
+        });
+
+        // 手动调用上传
+        const result = await this.directUpload(file, this.userId, this.identity + 1);
+        
+        // 上传成功，更新loading显示为识别中
+        uni.hideLoading();
+        
+        if (result) {
+          this.formData[type] = result;
+          
+          // 上传成功后自动识别
+          if (type === 'uscc_photo') {
+            await this.recognizeBusinessLicense(result);
+          } else if (type === 'legal_idcard_positive') {
+            await this.recognizeIdCardFront(result);
+          } else if (type === 'legal_idcard_negative') {
+            await this.recognizeIdCardBack(result);
+          }
+          
+          // 保存到本地存储
+          this.saveFormDataToLocal();
+        }
+      } catch (err) {
+        uni.hideLoading();
+        console.log('上传图片错误:', err);
+        
+        if (!err.errMsg || !err.errMsg.includes('cancel')) {
+          uni.showToast({
+            title: '上传失败，请重试',
+            icon: 'none'
+          });
+        }
+      }
+    },
+
+    // 直接上传方法
+    async directUpload(file, userId, type) {
+      try {
+        let date = new Date().getTime();
+        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
+        
+        // 生成安全的文件名
+        let fileExtension = 'jpg';
+        if (file.path.includes('.')) {
+          let parts = file.path.split('.');
+          let ext = parts[parts.length - 1].toLowerCase();
+          if (ext && ext.length <= 4) {
+            fileExtension = ext;
+          }
+        }
+        
+        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
+        console.log('安全文件名:', name);
+
+        // 获取OSS配置
+        const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
+        
+        // 直接上传到OSS
+        return await new Promise((resolve, reject) => {
+          uni.uploadFile({
+            url: ossConfig.host,
+            filePath: file.path,
+            name: 'file',
+            formData: {
+              key: ossConfig.dir + name,
+              policy: ossConfig.policy,
+              OSSAccessKeyId: ossConfig.ossAccessKeyId,
+              success_action_status: '200',
+              signature: ossConfig.signature
+            },
+            success: (res) => {
+              if (res.statusCode === 200) {
+                const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
+                resolve(fileUrl);
+              } else {
+                reject(new Error('上传失败'));
+              }
+            },
+            fail: reject
+          });
+        });
+        
+      } catch (error) {
+        console.error('直接上传失败:', error);
+        throw error;
+      }
+    },
+
+    /**
+     * 识别营业执照
+     */
+    async recognizeBusinessLicense(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'uscc_photo';
+        // uni.showLoading({
+        //   title: '正在识别营业执照...',
+        //   mask: true
+        // });
+        
+        // 调用OCR接口
+        const result = await recognizeBusinessLicense(imageUrl);
+        console.log('营业执照识别结果:', result);
+
+        const hasRecognizedData = this.checkBusinessLicenseRecognition(result);
+        if (!hasRecognizedData) {
+          uni.showToast({
+            title: '未识别到营业执照信息，请手动填写或重新拍摄',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isRecognizing = false;
+          return;
+        }
+        
+        // 填充营业执照信息
+        let recognizedFields = 0;
+
+        // 企业名称：如果识别结果为"无"，就设置为空字符串
+        if (result.uscc_name && result.uscc_name.trim() && result.uscc_name !== '无') {
+          this.formData.uscc_name = result.uscc_name;
+          recognizedFields++;
+        } else {
+          // 如果是"无"或空值，设置为空字符串
+          this.formData.uscc_name = '';
+        }
+        
+        if (result.uscc_num && result.uscc_num.trim()) {
+          this.formData.uscc_num = result.uscc_num;
+          recognizedFields++;
+        }
+        
+        // 如果需要营业执照法人与法人代表关联则取消注释
+        // if (result.legal_name && result.legal_name.trim()) {
+        //   this.formData.legal_name = result.legal_name;
+        //   recognizedFields++;
+        // }
+
+        if (result.uscc_type && result.uscc_type.trim()) {
+          this.formData.uscc_type = result.uscc_type;
+          recognizedFields++;
+        }
+
+        // 根据识别的字段数量给出不同的提示
+        if (recognizedFields > 0) {
+        } else {
+          uni.showToast({
+            title: '识别完成，但未获取到有效信息',
+            icon: 'none',
+            duration: 3000
+          });
+        }
+        
+      } catch (error) {
+        uni.showToast({
+          title: error.message || '识别失败，请手动填写',
+          icon: 'none',
+          // duration: 3000
+        });
+        console.error('营业执照识别失败:', error);
+        
+      } finally {
+        this.isRecognizing = false;
+        uni.hideLoading();
+      }
+    },
+
+    // 检查营业执照识别结果是否有效
+    checkBusinessLicenseRecognition(result) {
+      const requiredFields = ['uscc_num', 'uscc_name', 'legal_name', 'uscc_type'];
+      
+      for (const field of requiredFields) {
+        if (result[field] && result[field].trim()) {
+          return true;
+        }
+      }
+      
+      return false;
+    },
+    
+    /**
+     * 识别身份证正面
+     */
+    async recognizeIdCardFront(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'legal_idcard_positive';
+        
+        uni.showLoading({
+          title: '正在识别身份证正面...',
+          mask: true
+        });
+        
+        // 调用OCR接口
+        const result = await recognizeIdCard(imageUrl, 1);
+
+        // 验证是否真的识别到了数据
+        const hasRecognizedData = this.checkIdCardFrontRecognition(result);
+        
+        if (!hasRecognizedData) {
+          uni.hideLoading();
+          uni.showToast({
+            title: '未识别到身份证信息，请手动填写或重新拍摄',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isRecognizing = false;
+          return;
+        }
+        
+        // 填充身份证正面信息
+        if (result.name) {
+          this.formData.legal_name = result.name;
+        }
+        
+        if (result.id_number) {
+          this.formData.legal_idcard_num = result.id_number;
+        }
+        
+        uni.showToast({
+          title: '身份证正面识别成功',
+          icon: 'none'
+        });
+        
+      } catch (error) {
+        console.error('身份证正面识别失败:', error);
+        uni.showToast({
+          title: error.message || '识别失败，请手动填写',
+          icon: 'none',
+          duration: 3000
+        });
+      } finally {
+        this.isRecognizing = false;
+        uni.hideLoading();
+      }
+    },
+
+    // 检查身份证正面识别结果是否有效
+    checkIdCardFrontRecognition(result) {
+      return (result.name && result.name.trim()) || (result.id_number && result.id_number.trim());
+    },
+    
+    /**
+     * 识别身份证反面
+     */
+    async recognizeIdCardBack(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'legal_idcard_negative';
+        
+        uni.showLoading({
+          title: '正在识别身份证反面...',
+          mask: true
+        });
+        
+        // 调用OCR接口
+        const result = await recognizeIdCard(imageUrl, 2);
+
+        // 验证是否真的识别到了数据
+        const hasRecognizedData = this.checkIdCardBackRecognition(result);
+        
+        if (!hasRecognizedData) {
+          uni.hideLoading();
+          uni.showToast({
+            title: '未识别到身份证有效期信息，请手动填写或重新拍摄',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isRecognizing = false;
+          return;
+        }
+        
+        // 解析有效期
+        const validPeriod = parseValidPeriod(result.start_date, result.end_date);
+        
+        // 填充有效期数据
+        if (validPeriod.startDate) {
+          this.formData.idcard_start_date = validPeriod.startDate;
+        }
+        
+        if (validPeriod.isPermanent) {
+          this.formData.legal_idcard_expiry_type = 'permanent';
+          this.formData.idcard_end_date = '长久有效';
+        } else if (validPeriod.endDate) {
+          this.formData.legal_idcard_expiry_type = 'date';
+          this.formData.idcard_end_date = validPeriod.endDate;
+        }
+        
+        // 如果是长期有效，自动选择对应的选项
+        if (validPeriod.isPermanent) {
+          this.setIdcardValidType('permanent');
+        } else {
+          this.setIdcardValidType('date');
+        }
+        
+        uni.showToast({
+          title: '身份证反面识别成功',
+          icon: 'none'
+        });
+        
+      } catch (error) {
+        console.error('身份证反面识别失败:', error);
+        uni.showToast({
+          title: error.message || '识别失败，请手动填写',
+          icon: 'none',
+          duration: 3000
+        });
+      } finally {
+        this.isRecognizing = false;
+        uni.hideLoading();
+      }
+    },
+
+    // 检查身份证反面识别结果是否有效
+    checkIdCardBackRecognition(result) {
+      return (result.start_date && result.start_date.trim()) || 
+            (result.end_date && result.end_date.trim());
+    },
+
+    // 验证表单数据
+    validateForm() {
+      // 按照表单从上到下的顺序定义验证规则
+      const validationRules = [
+        { field: 'uscc_photo', message: '请上传营业执照照片' },
+        { field: 'uscc_type', message: '请输入商户类型' },
+        { field: 'uscc_num', message: '请输入营业执照号码' },
+        { field: 'uscc_name', message: '请输入企业名称' },
+                { field: 'legal_idcard_positive', message: '请上传身份证正面照片' },
+        { field: 'legal_idcard_negative', message: '请上传身份证反面照片' },
+        { field: 'legal_name', message: '请输入法人代表' },
+        { field: 'legal_phone', message: '请输入法人联系方式' },
+        { field: 'legal_idcard_num', message: '请输入法人身份证号' },
+        { 
+          condition: () => !this.formData.legal_idcard_expiry_type, 
+          message: '请选择身份证有效期类型' 
+        },
+        { 
+          condition: () => !this.formData.idcard_start_date, 
+          message: '请选择身份证开始日期' 
+        },
+        {
+          condition: () => {
+            if (this.formData.legal_idcard_expiry_type === 'data' && !this.formData.idcard_end_date) {
+              return true;
+            }
+            // 如果选择长久有效，则不需要结束日期
+            return false;
+          },
+          message: '请选择身份证结束日期' 
+        },
+      ];
+
+      // 按顺序验证
+      for (let rule of validationRules) {
+        let isValid = true;
+        
+        if (rule.field) {
+          // 简单字段验证
+          if (!this.formData[rule.field]) {
+            isValid = false;
+          }
+        } else if (rule.condition) {
+          // 条件验证
+          if (rule.condition()) {
+            isValid = false;
+          }
+        }
+        
+        if (!isValid) {
+          uni.showToast({
+            title: rule.message,
+            icon: 'none'
+          });
+          return false;
+        }
+      }
+      
+      // 验证手机号格式
+      if (!/^1[3-9]\d{9}$/.test(this.formData.legal_phone)) {
+        uni.showToast({
+          title: '请输入正确的手机号码',
+          icon: 'none'
+        });
+        return false;
+      }
+      
+      // 验证身份证格式
+      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.formData.legal_idcard_num)) {
+        uni.showToast({
+          title: '请输入正确的身份证号码',
+          icon: 'none'
+        });
+        return false;
+      }
+      
+      return true;
+    },
+
+    // 将日期字符串转换为Date对象
+    parseDateString(dateStr) {
+      if (!dateStr) return null;
+      
+      // 处理年月日格式
+      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
+      if (match) {
+        return new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
+      }
+      
+      // 处理 YYYY-MM-DD 格式
+      if (dateStr.includes('-')) {
+        const dateParts = dateStr.split('-');
+        if (dateParts.length === 3) {
+          return new Date(parseInt(dateParts[0]), parseInt(dateParts[1]) - 1, parseInt(dateParts[2]));
+        }
+      }
+      
+      return null;
+    },
+
+    // 保存表单数据（在进入下一步时调用）
+    // 修改后的 saveFormData 方法
+    saveFormData() {
+      console.log('开始验证表单数据');
+      console.log('表单数据:', this.formData);
+      console.log('法人姓名:', this.formData.legal_name);
+      console.log('法人身份证号:', this.formData.legal_idcard_num);
+      
+      if (this.validateForm()) {
+        console.log('表单验证通过，开始验证法人信息');
+        
+        // 验证法人姓名与身份证号是否匹配
+        return this.checkIdCardAndName();
+      }
+      
+      console.log('表单验证失败');
+      return false;
+    },
+
+    // 修改后的 checkIdCardAndName 方法，添加详细调试
+    async checkIdCardAndName() {
+      if (this.isSubmit) {
+        console.log(' 重复提交被阻止 ');
+        return false;
+      }
+
+      this.isSubmit = true;
+
+      try {
+        console.log('开始调用身份验证接口');
+        console.log('请求参数:', {
+          name: this.formData.legal_name,
+          idcard: this.formData.legal_idcard_num
+        });
+        
+        uni.showLoading({
+          title: '验证身份信息...'
+        });
+
+        // 调用身份验证接口
+        const checkRes = await request.post('/user/check', {
+          name: this.formData.legal_name,
+          idcard: this.formData.legal_idcard_num
+        });
+
+        uni.hideLoading();
+        
+        console.log('身份验证接口返回结果 ');
+        console.log('完整响应:', checkRes);
+        console.log('响应Code:', checkRes.Code);
+        console.log('响应state:', checkRes.state);
+        console.log('响应msg:', checkRes.msg);
+        console.log('响应data:', checkRes.data);
+        console.log('响应ResultObject:', checkRes.ResultObject);
+        
+        if (checkRes.ResultObject) {
+          console.log('ResultObject.BizCode:', checkRes.ResultObject.BizCode);
+          console.log('ResultObject其他属性:', Object.keys(checkRes.ResultObject));
+        }
+
+        // 根据参考代码的验证逻辑，但需要先检查响应结构
+        if (checkRes.Code === '401') {
+          console.log(' Code 401 验证失败 ');
+          uni.showToast({
+            title: '您的身份证号与姓名不匹配',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isSubmit = false;
+          return false;
+        }
+        
+        // 检查多种可能的响应结构
+        if (checkRes.ResultObject) {
+          // 如果 ResultObject 有 BizCode 属性
+          if (checkRes.ResultObject.BizCode && checkRes.ResultObject.BizCode != '1') {
+            console.log(' BizCode 验证失败 ');
+            uni.showToast({
+              title: '您的身份证号与姓名不匹配',
+              icon: 'none',
+              duration: 3000
+            });
+            this.isSubmit = false;
+            return false;
+          }
+          
+          // 如果有其他表示失败的字段
+          if (checkRes.ResultObject.success === false || checkRes.ResultObject.result === false) {
+            console.log('success/result 验证失败');
+            uni.showToast({
+              title: '您的身份证号与姓名不匹配',
+              icon: 'none',
+              duration: 3000
+            });
+            this.isSubmit = false;
+            return false;
+          }
+        }
+        
+        // 检查直接返回的状态字段
+        if (checkRes.state && checkRes.state !== 1) {
+          console.log('state 验证失败');
+          uni.showToast({
+            title: checkRes.msg || '您的身份证号与姓名不匹配',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isSubmit = false;
+          return false;
+        }
+        
+        // 如果直接返回 success: false
+        if (checkRes.success === false) {
+          console.log('success 验证失败');
+          uni.showToast({
+            title: checkRes.message || '您的身份证号与姓名不匹配',
+            icon: 'none',
+            duration: 3000
+          });
+          this.isSubmit = false;
+          return false;
+        }
+
+        console.log('身份验证通过 ');
+        
+        // 验证通过，创建提交给后端的数据副本，将日期转换为 YYYY-MM-DD 格式
+        const submitData = {
+          ...this.formData,
+          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
+          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
+          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
+          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
+        };
+
+        console.log('submitData:', submitData);
+
+        // 将表单数据保存到全局或本地存储，以便在下一步使用
+        getApp().globalData.qualificationData = submitData;
+        
+        this.isSubmit = false;
+        return true;
+
+      } catch (error) {
+        uni.hideLoading();
+        console.error('身份验证接口调用失败');
+        console.error('错误信息:', error);
+        console.error('错误详情:', error.response || error.message || error);
+        
+        // 根据错误类型显示不同的提示
+        let errorMessage = '身份验证失败';
+        
+        if (error.response) {
+          console.error('响应状态:', error.response.status);
+          console.error('响应数据:', error.response.data);
+          errorMessage = `服务器错误: ${error.response.status}`;
+        } else if (error.message) {
+          errorMessage = error.message;
+        } else if (error.errMsg) {
+          errorMessage = error.errMsg;
+        }
+        
+        uni.showToast({
+          title: errorMessage,
+          icon: 'none',
+          duration: 3000
+        });
+        
+        this.isSubmit = false;
+        return false;
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.qualification-page {
+  /* padding: 0rpx 0; */
+}
+
+.section {
+  margin-bottom: 30rpx;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30rpx;
+}
+
+.title-bar {
+  width: 6rpx;
+  height: 30rpx;
+  background-color: #E8101E;
+  margin-right: 7rpx;
+  border-radius: 5rpx;
+}
+
+.title-text {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #1D2129;
+  line-height: 48rpx;
+  text-align: left;
+  font-style: normal;
+}
+
+.section-title text {
+  font-size: 36rpx;
+  color: #1D2129;
+  font-weight: 500;
+}
+
+.box-cont {
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  margin-bottom: 24rpx;
+  margin-left: 8rpx;
+  margin-right: 8rpx;
+  box-shadow: none;
+}
+
+.form-item {
+  padding: 24rpx 22rpx;
+}
+
+.form-item-one {
+  display: flex;
+  align-items: center;
+  padding: 24rpx;
+}
+
+.label-wrapper {
+  display: inline-flex;
+  align-items: center;
+}
+
+.label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  line-height: 1;
+}
+
+.label-icon {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 8rpx;
+  align-items: center;
+}
+
+.required::before {
+  content: '*';
+  color: #FF0000;
+  margin-right: 4rpx;
+}
+
+.upload-tip {
+  font-size: 26rpx;
+  color: #999;
+  margin: 16rpx 0 24rpx 0;
+  font-weight: 400;
+  font-family: PingFangSC, PingFang SC;
+  text-align: left;
+  font-style: normal;
+}
+
+.upload-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.upload-box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.upload-camera {
+  width: 446rpx;
+  height: 298rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 48rpx;
+  overflow: hidden;
+  background-color: #F8F9FD;
+  position: relative;
+}
+
+.idcard-upload-vertical-container {
+  display: flex;
+  flex-direction: column;
+  padding: 24rpx;
+}
+
+.idcard-upload-vertical-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 40rpx;
+}
+
+.idcard-upload-vertical-item:last-child {
+  margin-bottom: 0;
+}
+
+.upload-label.required::before {
+  content: '*';
+  color: #FF0000;
+  margin-right: 4rpx;
+}
+
+.license-upload {
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+
+.idcard-front {
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+
+.idcard-back {
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+
+.camera-icon {
+  width: 446rpx;
+  height: 298rpx;
+  border-radius: 48rpx;
+}
+
+.preview-image {
+  border-radius: 48rpx;
+  width: 100%;
+  height: 100%;
+}
+
+/* 识别状态样式 */
+.recognize-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.6);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border-radius: 48rpx;
+}
+
+.recognize-loading {
+  width: 60rpx;
+  height: 60rpx;
+  border: 4rpx solid #fff;
+  border-top: 4rpx solid #E8101E;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  margin-bottom: 16rpx;
+}
+
+.recognize-text {
+  color: #fff;
+  font-size: 24rpx;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+.picker-content {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  flex: 1;
+}
+
+.picker-content text {
+  margin-right: 19rpx;
+}
+
+/* 日期选择框竖线分隔符 */
+.date-divider {
+  width: 2rpx;
+  height: 30rpx;
+  background-color: #E9E9E9;
+  margin: 0 15rpx 0 0;
+}
+
+/* 置灰状态下的竖线 */
+.date-picker-box.disabled .date-divider {
+  background-color: #F3F3F3;
+}
+
+/* 确保日期文字区域可以自动扩展 */
+.date-picker-box text {
+  flex: 1;
+}
+
+.arrow-right {
+  width: 14rpx;
+  height: 26rpx;
+}
+
+
+.placeholder {
+  color: #999999;
+  font-size: 28rpx;
+}
+
+.picker-value {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.input {
+  flex: 1;
+  font-size: 28rpx;
+  color: #333333;
+  text-align: right;
+  margin-left: 20rpx;
+}
+
+.radio-group {
+  display: flex;
+  margin-top: 24rpx;
+  width: 100%;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 130rpx;
+}
+
+.radio {
+  width: 30rpx;
+  height: 30rpx;
+  border: 2rpx solid #DDDDDD;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16rpx;
+}
+
+.radio.checked {
+  background-color: #E8101E;
+  border-color: #E8101E;
+}
+
+.radio-icon-image {
+  width: 32rpx;
+  height: 32rpx;
+}
+
+.radio-label {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+/* 日期范围容器样式 */
+.date-range-container {
+  padding: 24rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.date-item {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.date-item:first-child {
+  margin-right: 24rpx;
+}
+
+.date-label {
+  font-size: 28rpx;
+  color: #333333;
+  margin-bottom: 16rpx;
+  font-weight: 500;
+  margin-left: 8rpx;
+}
+
+.date-picker-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border: 2rpx solid #E9E9E9;
+  border-radius: 10rpx;
+  padding: 12rpx 19rpx;
+  background-color: transparent;
+}
+
+.date-picker-box.disabled {
+  border: 2rpx solid #F3F3F3;
+}
+
+.date-picker-box.disabled .date-value,
+.date-picker-box.disabled .placeholder {
+  color: #CCCCCC;
+}
+
+.date-value {
+  font-size: 28rpx;
+  color: #333;
+}
+
+.date-arrow {
+  width: 35rpx;
+  height: 33rpx;
+}
+
+.upload-label {
+  font-family: Helvetica;
+  font-size: 28rpx;
+  color: #999;
+  line-height: 40rpx;
+  text-align: left;
+  font-style: normal;
+  margin-top: 24rpx;
+}
+
+/* 弹出框样式 */
+.popup {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.popup-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+  position: relative;
+  background-color: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+  padding: 32rpx;
+  transform: translateY(100%);
+  transition: transform 0.3s ease;
+  max-height: 70vh;
+}
+
+.popup.show .popup-content {
+  transform: translateY(0);
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 32rpx;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999999;
+  padding: 16rpx;
+}
+
+.popup-body {
+  max-height: 400rpx;
+  overflow-y: auto;
+}
+
+.radio-list .radio-item {
+  margin-bottom: 32rpx;
+}
+
+.popup-footer {
+  margin-top: 32rpx;
+}
+
+.popup-btn {
+  height: 88rpx;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+}
+
+.popup-btn .btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #FFFFFF;
+}
+
+.cancel-text, .confirm-text {
+  font-size: 32rpx;
+  padding: 16rpx;
+}
+
+.cancel-text {
+  color: #666666;
+}
+
+.confirm-text {
+  color: #E8101E;
+  font-weight: 500;
+}
+
+.picker-scroll {
+  height: 400rpx;
+}
+
+.picker-item {
+  height: 68rpx;
+  line-height: 68rpx;
+  text-align: center;
+  font-size: 28rpx;
+}
+
+/* 提示弹窗样式 */
+.tip-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.tip-popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.tip-popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.tip-popup-content {
+  position: relative;
+  width: 620rpx;
+  height: 810rpx;
+}
+
+.tip-popup-bg {
+  width: 620rpx;
+  height: 810rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.tip-popup-body {
+  position: relative;
+  flex-direction: column;
+  padding: 80rpx 20rpx 40rpx 20rpx;
+  box-sizing: border-box;
+}
+
+.tip-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  text-align: center;
+  margin-top: 107rpx;
+  margin-bottom: 37rpx;
+}
+
+.tip-image-container {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 50rpx;
+}
+
+.tip-image {
+  width: 90%;
+  max-height: 400rpx;
+}
+
+.tip-buttons {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 28rpx;
+}
+
+.tip-btn {
+  width: 250rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.tip-btn.cancel {
+  border: #E8101E 2rpx solid;
+  background-color: transparent;
+  color: #e8101e;
+}
+
+.tip-btn.confirm {
+  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  color: #FFFFFF;
+}
+
+.tip-btn .btn-text {
+  color: inherit;
+}
+</style>
\ No newline at end of file
diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue
index 921f2f0..dcc1be6 100644
--- a/pages/ruzhu/qualification_sj.vue
+++ b/pages/ruzhu/qualification_sj.vue
@@ -1,1963 +1,1002 @@
-<template>
-  <view class="qualification-page">
-    <!-- 营业执照部分 -->
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text class="title-text">营业执照</text>
-      </view>
-
-      <!-- 资质照片 -->
-      <view class="form-item box-cont">
-        <text class="label required">资质照片</text>
-        <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
-        <view class="upload-container">
-          <view class="upload-box" @click="chooseImage('uscc_photo')">
-            <view class="upload-camera license-upload">
-              <image v-if="formData.uscc_photo" :src="formData.uscc_photo" mode="aspectFill" class="preview-image"></image>
-              <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/92bd4268-b4d7-4725-8664-9e44f828c7d9" mode="aspectFit" class="camera-icon"></image>
-              <!-- 识别状态遮罩 -->
-              <!-- <view v-if="isRecognizing && recognizeType === 'uscc_photo'" class="recognize-overlay">
-                <view class="recognize-loading"></view>
-                <text class="recognize-text">识别中...</text>
-              </view> -->
-            </view>
-          </view>
-          <text class="upload-label required">请上传营业执照原件</text>
-        </view>
-      </view>
-
-      <!-- 商户类型 -->
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">商户类型</text>
-        </view>
-        <input type="text" v-model="formData.uscc_type" placeholder="请输入商户类型" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <!-- 营业执照信息 -->
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">证件号码</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_num')"></image>
-        </view>
-        <input type="text" v-model="formData.uscc_num" placeholder="请输入营业执照的证件号码" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">企业名称</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_name')"></image>
-        </view>
-        <input type="text" v-model="formData.uscc_name" placeholder="请输入营业执照的企业名称" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-    </view>
-
-    <!-- 法人信息部分 -->
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text>法人信息</text>
-      </view>
-
-    <!-- 身份证照片部分 -->
-    <view class="section">
-      <view class="box-cont">
-        <view class="form-item">
-          <text class="label required">身份证照片</text>
-          <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
-          
-          <view class="idcard-upload-vertical-container">
-            <!-- 身份证正面 -->
-            <view class="idcard-upload-vertical-item">
-              <view class="upload-box" @click="chooseImage('legal_idcard_positive')">
-                <view class="upload-camera idcard-front">
-                  <image v-if="formData.legal_idcard_positive" :src="formData.legal_idcard_positive" mode="aspectFill" class="preview-image"></image>
-                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/043b0c97-79c1-4f95-810f-c33e3d5269a3" mode="aspectFit" class="camera-icon"></image>
-                  <!-- 识别状态遮罩 -->
-                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_positive'" class="recognize-overlay">
-                    <view class="recognize-loading"></view>
-                    <text class="recognize-text">识别中...</text>
-                  </view> -->
-                </view>
-              </view>
-              <text class="upload-label required">请上传身份证正面（人像面）</text>
-            </view>
-            
-            <!-- 身份证反面 -->
-            <view class="idcard-upload-vertical-item">
-              <view class="upload-box" @click="chooseImage('legal_idcard_negative')">
-                <view class="upload-camera idcard-back">
-                  <image v-if="formData.legal_idcard_negative" :src="formData.legal_idcard_negative" mode="aspectFill" class="preview-image"></image>
-                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/203cfdf4-2501-44e6-8565-ad251c6bf0fa" mode="aspectFit" class="camera-icon"></image>
-                  <!-- 识别状态遮罩 -->
-                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_negative'" class="recognize-overlay">
-                    <view class="recognize-loading"></view>
-                    <text class="recognize-text">识别中...</text>
-                  </view> -->
-                </view>
-              </view>
-              <text class="upload-label required">请上传身份证反面（国徽面）</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">法人代表</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('legal_name')"></image>
-        </view>
-        <input type="text" v-model="formData.legal_name" placeholder="请输入营业执照的法人代表" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <text class="label required">法人联系方式</text>
-        <input type="number" v-model="formData.legal_phone" placeholder="请输入法人的联系方式" 
-              placeholder-class="placeholder" class="input" 
-              @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <text class="label required">法人身份证号</text>
-        <input type="idcard" v-model="formData.legal_idcard_num" placeholder="请输入法人身份证号" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <!-- 身份证有效期 -->
-      <view class="form-item box-cont">
-        <text class="label required">身份证有效期至</text>
-        <view class="radio-group">
-          <view class="radio-item" @click="setIdcardValidType('permanent')">
-            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
-              <image v-if="formData.legal_idcard_expiry_type === 'permanent'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
-            </view>
-            <text class="radio-label">长久有效</text>
-          </view>
-          <view class="radio-item" @click="setIdcardValidType('date')">
-            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
-              <image v-if="formData.legal_idcard_expiry_type === 'date'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
-            </view>
-            <text class="radio-label">指定日期有效</text>
-          </view>
-        </view>
-      </view>
-
-      <!-- 身份证有效期日期选择 -->
-      <view class="box-cont">
-        <view class="date-range-container">
-          <view class="date-item">
-            <text class="date-label">开始日期</text>
-            <view class="date-picker-box" @click="openDatePicker('idcard_start_date')">
-              <text :class="formData.idcard_start_date ? 'date-value' : 'placeholder'">
-                {{formatDateForDisplay(formData.idcard_start_date) || '请选择日期'}}
-              </text>
-              <view class="date-divider"></view>
-              <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649" class="date-arrow" mode="aspectFit"></image>
-            </view>
-          </view>
-          <view class="date-item">
-            <text class="date-label">结束日期</text>
-            <view class="date-picker-box" :class="{ disabled: formData.legal_idcard_expiry_type === 'permanent' }" 
-                  @click="formData.legal_idcard_expiry_type !== 'permanent' && openDatePicker('idcard_end_date')">
-              <text :class="formData.idcard_end_date ? 'date-value' : 'placeholder'">
-                {{formatDateForDisplay(formData.idcard_end_date) || '请选择日期'}}
-              </text>
-              <view class="date-divider"></view>
-              <image :src="formData.legal_idcard_expiry_type === 'permanent' ? 
-                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9a757f-a36c-46bb-a59f-2caddac5365b' : 
-                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649'" 
-                class="date-arrow" mode="aspectFit"></image>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-
-    <!-- 日期选择器 -->
-    <view class="popup" :class="{ show: showDatePickerFlag }">
-      <view class="popup-mask" @click="hideDatePicker"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="cancel-text" @click="hideDatePicker">取消</text>
-          <text class="title">选择日期</text>
-          <text class="confirm-text" @click="confirmDate">确定</text>
-        </view>
-        <view class="region-body">
-          <picker-view :value="dateValue" @change="bindDateChange" class="picker-scroll" 
-                      :indicator-style="indicatorStyle" mode="date" fields="day">
-            <picker-view-column>
-              <view class="picker-item" v-for="(year, index) in years" :key="index">{{year}}年</view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(month, index) in months" :key="index">{{month}}月</view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(day, index) in days" :key="index">{{day}}日</view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 提示信息弹窗 -->
-    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
-      <view class="tip-popup-mask" @click="hideTipPopup"></view>
-      <view class="tip-popup-content">
-        <!-- 弹窗背景图片 -->
-        <image class="tip-popup-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770" mode="aspectFit"></image>
-        
-        <!-- 弹窗内容 -->
-        <view class="tip-popup-body">
-          <view class="tip-title">{{ tipTitle }}</view>
-          <view class="tip-image-container">
-            <image class="tip-image" :src="tipImage" mode="widthFix"></image>
-          </view>
-          <view class="tip-buttons">
-            <view class="tip-btn cancel" @click="hideTipPopup">
-              <text class="btn-text">取消</text>
-            </view>
-            <view class="tip-btn confirm" @click="hideTipPopup">
-              <text class="btn-text">我已了解</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-
-  </view>
-</template>
-
-<script>
-import request from '../../utils/request';
-import { debounce } from '@/utils/debounce.js';
-import uploadImage from '../../utils/uploadImage';
-import permissionUtils from '../../utils/per';
-import locationService from '../../utils/locationService';
-import { recognizeIdCard, recognizeBusinessLicense, formatDateFromNumber, parseValidPeriod } from '../../utils/orc';
-
-export default {
-  data() {
-    const currentDate = new Date();
-    const currentYear = new Date().getFullYear();
-    const years = Array.from({length: 130}, (_, i) => 1970 + i);
-    const months = Array.from({length: 12}, (_, i) => i + 1);
-    const days = Array.from({length: 31}, (_, i) => i + 1);
-    
-    // 从本地存储加载数据
-    const loadedData = this.loadFormDataFromLocal();
-    
-    return {
-      userId: null,
-      // 使用本地存储初始化数据
-      formData: loadedData || {
-        uscc_type: '',
-        uscc_photo: '',
-        uscc_num: '',
-        uscc_name: '',
-        license_valid_type: '',
-        license_start_date: '',
-        license_end_date: '',
-        legal_name: '',
-        legal_phone: '',
-        legal_idcard_num: '',
-        legal_idcard_expiry_type: '',
-        idcard_start_date: '',
-        idcard_end_date: '',
-        legal_idcard_positive: '',
-        legal_idcard_negative: ''
-      },
-      showDatePickerFlag: false,
-      showTipPopupFlag: false, // 提示弹窗显示状态
-      currentDateField: '',
-      years,
-      months,
-      days,
-      dateValue: [currentYear - 1970, currentDate.getMonth(), currentDate.getDate() - 1], // 默认选中今天
-      indicatorStyle: 'height: 68rpx;',
-      tipTitle: '', // 提示弹窗标题
-      tipImage: '', // 提示弹窗图片
-      isSubmit: false, // 防止重复提交
-
-      // 识别状态
-      isRecognizing: false,
-      recognizeType: '', // 'legal_idcard_positive', 'legal_idcard_negative', 'uscc_photo'
-      identity: 2
-    }
-  },
-  computed: {
-    
-  },
-  
-  // 添加 watch 监听表单数据变化
-  watch: {
-    'formData.uscc_num'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.uscc_name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_phone'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_num'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.uscc_photo'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_positive'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_negative'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    }
-  },
-  
-  // 页面生命周期
-  onLoad(options) {
-	  console.log(1111112222)
-
-    // 获取用户信息，用于图片上传
-    this.getUserInfo();
-    
-    // 检查全局状态中是否有数据（从前一页面带过来的）
-    this.checkGlobalData();
-  },
-  
-  onShow() {
-    // 页面显示时重新从本地存储加载数据
-    const localData = this.loadFormDataFromLocal();
-    if (localData) {
-      // 合并数据，避免覆盖已有数据
-      this.formData = { ...this.formData, ...localData };
-    }
-    
-    // 检查全局状态
-    this.checkGlobalData();
-  },
-  
-  onHide() {
-    // 页面隐藏时保存数据
-    this.saveFormDataToLocal();
-  },
-  
-  onUnload() {
-    // 页面卸载时保存数据
-    this.saveFormDataToLocal();
-  },
-  
-  methods: {
-    // 检查全局数据
-    checkGlobalData() {
-      if (getApp().globalData.qualificationData) {
-        // 如果全局有数据，合并到当前表单
-        this.formData = { ...this.formData, ...getApp().globalData.qualificationData };
-        // 保存到本地存储
-        this.saveFormDataToLocal();
-        // 清空全局数据，避免重复使用
-        // delete getApp().globalData.qualificationData;
-        getApp().globalData.qualificationData = null;
-      }
-    },
-    
-    // 从本地存储加载数据
-    loadFormDataFromLocal() {
-      try {
-        const stored = uni.getStorageSync('qualification_form_data');
-        if (stored) {
-          console.log('从本地存储加载数据:', stored);
-          return stored;
-        }
-      } catch (e) {
-        console.log('读取本地存储失败:', e);
-      }
-      return null;
-    },
-    
-    // 保存数据到本地存储（带防抖）
-    saveFormDataToLocalDebounce: debounce(function() {
-      this.saveFormDataToLocal();
-    }, 500),
-    
-    // 保存数据到本地存储
-    saveFormDataToLocal() {
-      try {
-        uni.setStorageSync('qualification_form_data', this.formData);
-        console.log('数据已保存到本地存储');
-      } catch (e) {
-        console.log('保存数据失败:', e);
-      }
-    },
-    
-    // 清空本地存储（在表单提交成功后调用）
-    clearFormDataLocal() {
-      try {
-        uni.removeStorageSync('qualification_form_data');
-        console.log('已清空本地存储数据');
-      } catch (e) {
-        console.log('清空数据失败:', e);
-      }
-    },
-
-    // 获取用户信息
-    getUserInfo() {
-      return new Promise((resolve, reject) => {
-        request.post('/sj/user/getuser').then(result => {
-          if (result.state === 1) {
-            this.userId = result.data.id;
-            console.log('用户ID获取成功:', this.userId);
-            resolve(this.userId);
-          } else {
-            console.error('获取用户信息失败:', result.msg);
-            reject(result.msg);
-          }
-        }).catch(error => {
-          console.error('获取用户信息接口错误:', error);
-          reject(error);
-        });
-      });
-    },
-
-    getFormData() {
-        return {
-          ...this.formData,
-          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
-          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
-          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
-          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
-        };
-    },
-
-    // 添加日期格式化方法
-    formatDateForDisplay(dateStr) {
-      if (!dateStr) return '';
-      if (dateStr === '长久有效') return '长久有效';
-      
-      // 如果是 YYYY-MM-DD 格式，转换为 年月日 格式显示
-      if (dateStr.includes('-')) {
-        const [year, month, day] = dateStr.split('-');
-        return `${year}年${parseInt(month)}月${parseInt(day)}日`;
-      }
-      
-      return dateStr; // 如果已经是年月日格式，直接返回
-    },
-
-    // 将日期转换为后端需要的格式
-    formatDateForBackend(dateStr) {
-      if (!dateStr) return '';
-      if (dateStr === '长久有效') return 'permanent'; // 根据后端需求返回
-      
-      // 将 年月日 格式转换为 YYYY-MM-DD
-      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-      if (match) {
-        const year = match[1];
-        const month = match[2].padStart(2, '0');
-        const day = match[3].padStart(2, '0');
-        return `${year}-${month}-${day}`;
-      }
-      
-      return dateStr; // 如果已经是 YYYY-MM-DD 格式，直接返回
-    },
-
-    // 显示提示弹窗
-    showTipPopup(field) {
-      // 根据字段设置对应的标题和图片
-      const tipConfig = {
-        'uscc_num': {
-          title: '如何找到证件号码',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/72856aac-f0ac-49a1-a7f1-be3220ecb314'
-        },
-        'uscc_name': {
-          title: '如何找到企业名称',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
-        },
-        'legal_name': {
-          title: '如何找到法人代表',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/24859872-da37-4beb-8e33-7743813bb5a1'
-        }
-      };
-      
-      if (tipConfig[field]) {
-        this.tipTitle = tipConfig[field].title;
-        this.tipImage = tipConfig[field].image;
-        // 确保图片已加载再显示弹窗
-        this.ensureImageLoaded(this.tipImage).then(() => {
-          this.showTipPopupFlag = true;
-        }).catch(() => {
-          // 即使加载失败也显示弹窗，避免用户无法操作
-          this.showTipPopupFlag = true;
-        });
-      }
-    },
-
-    // 确保图片加载完成
-    ensureImageLoaded(src) {
-      return new Promise((resolve, reject) => {
-        const img = new Image();
-        img.onload = () => resolve();
-        img.onerror = () => reject();
-        img.src = src;
-        
-        // 设置超时，避免长时间等待
-        setTimeout(() => resolve(), 500);
-      });
-    },
-    
-    // 隐藏提示弹窗
-    hideTipPopup() {
-      this.showTipPopupFlag = false;
-    },
-
-
-    // 设置营业执照有效期类型
-    setLicenseValidType(type) {
-      this.formData.license_valid_type = type;
-      if (type === 'permanent') {
-        // 选择长久有效时，设置结束日期为"长久有效"
-        this.formData.license_end_date = '长久有效';
-      } else {
-        // 选择指定日期时，如果之前是长久有效，清空结束日期
-        if (this.formData.license_end_date === '长久有效') {
-          this.formData.license_end_date = '';
-        }
-      }
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    // 设置身份证有效期类型
-    setIdcardValidType(type) {
-      this.formData.legal_idcard_expiry_type = type;
-      if (type === 'permanent') {
-        // 选择长久有效时，设置结束日期为"长久有效"
-        this.formData.idcard_end_date = '长久有效';
-      } else {
-        // 选择指定日期时，如果之前是长久有效，清空结束日期
-        if (this.formData.idcard_end_date === '长久有效') {
-          this.formData.idcard_end_date = '';
-        }
-        // 如果已有开始日期，自动计算20年后的结束日期
-        if (this.formData.idcard_start_date && !this.formData.idcard_end_date) {
-          const match = this.formData.idcard_start_date.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const year = parseInt(match[1]) + 20;
-            const month = match[2];
-            const day = match[3];
-            this.formData.idcard_end_date = `${year}年${month}月${day}日`;
-          }
-        }
-      }
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    
-    // 选择商户类型
-    selectMerchantType(item) {
-      this.formData.uscc_type = item.value;
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    // 确认商户类型选择
-    confirmMerchantType() {
-      this.hideMerchantTypePicker();
-    },
-    
-    // 打开日期选择器
-    openDatePicker(field) {
-      this.currentDateField = field;
-      
-      // 设置日期选择器的初始值
-      const currentDate = new Date();
-      let initialDate = currentDate;
-      
-      // 如果该字段已经有值，解析该值作为初始值
-      if (this.formData[field]) {
-        const dateStr = this.formData[field];
-        const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-        if (match) {
-          initialDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-        }
-      }
-      
-      // 计算picker-view的value
-      const yearIndex = this.years.indexOf(initialDate.getFullYear());
-      const monthIndex = initialDate.getMonth();
-      const dayIndex = initialDate.getDate() - 1;
-      
-      this.dateValue = [
-        yearIndex >= 0 ? yearIndex : 0,
-        monthIndex,
-        dayIndex
-      ];
-      
-      this.showDatePickerFlag = true;
-    },
-    
-    // 隐藏日期选择器
-    hideDatePicker() {
-      this.showDatePickerFlag = false;
-    },
-    
-    // 日期选择变化
-    bindDateChange(e) {
-      this.dateValue = e.detail.value;
-    },
-
-    // 确认日期选择
-    confirmDate() {
-      const [yearIndex, monthIndex, dayIndex] = this.dateValue;
-      const year = this.years[yearIndex];
-      const month = this.months[monthIndex];
-      const day = this.days[dayIndex];
-      const dateStr = `${year}年${month}月${day}日`;
-      const selectedDate = new Date(year, month - 1, day);
-      const today = new Date();
-      today.setHours(0, 0, 0, 0);
-      
-      // 验证日期逻辑
-      if (this.currentDateField.endsWith('_start_date')) {
-        // 开始日期验证：不能选择今天之后的日期
-        if (selectedDate > today) {
-          uni.showToast({
-            title: '开始日期不能晚于今天',
-            icon: 'none'
-          });
-          return;
-        }
-        
-        // 如果对应的结束日期已经设置，检查开始日期是否晚于结束日期
-        const relatedEndField = this.currentDateField.replace('_start_date', '_end_date');
-        if (this.formData[relatedEndField] && this.formData[relatedEndField] !== '长久有效') {
-          const endDateStr = this.formData[relatedEndField];
-          const match = endDateStr.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const endDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-            if (selectedDate > endDate) {
-              uni.showToast({
-                title: '开始日期不能晚于结束日期',
-                icon: 'none'
-              });
-              return;
-            }
-          }
-        }
-        // 如果是身份证开始日期，自动计算结束日期
-        if (this.currentDateField === 'idcard_start_date') {
-          // 如果是"长久有效"类型，不自动设置结束日期
-          if (this.formData.legal_idcard_expiry_type === 'date') {
-            const endYear = year + 20;
-            const endDateStr = `${endYear}年${month}月${day}日`;
-            this.formData.idcard_end_date = endDateStr;
-          } else if (this.formData.legal_idcard_expiry_type === 'permanent') {
-            // 如果是"长久有效"类型，保持结束日期为"长久有效"
-            this.formData.idcard_end_date = '长久有效';
-          }
-        }
-
-      } else if (this.currentDateField.endsWith('_end_date')) {
-        const relatedStartField = this.currentDateField.replace('_end_date', '_start_date');
-        if (this.formData[relatedStartField]) {
-          const startDateStr = this.formData[relatedStartField];
-          const match = startDateStr.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const startDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-            if (selectedDate <= startDate) {
-              uni.showToast({
-                title: '结束日期必须晚于开始日期',
-                icon: 'none'
-              });
-              return;
-            }
-          }
-        } else {
-          // 如果没有设置开始日期，结束日期不能早于今天
-          if (selectedDate < today) {
-            uni.showToast({
-              title: '结束日期不能早于今天',
-              icon: 'none'
-            });
-            return;
-          }
-        }
-      }
-      
-      this.formData[this.currentDateField] = dateStr;
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-      this.hideDatePicker();
-    },
-    
-    // 选择图片
-    async chooseImage(type) {
-      try {
-        const systemInfo = uni.getSystemInfoSync()
-        
-        if (systemInfo.platform === 'ios') {
-          this.openCamera(type);
-        } else {
-          let xcpermission = '';
-          let xjpermission = '';
-          if (systemInfo.platform === 'ios') {
-            xcpermission = 'photo_library',
-            xjpermission = 'camera'
-          } else {
-            xcpermission = `android.permission.READ_EXTERNAL_STORAGE,android.permission.WRITE_EXTERNAL_STORAGE`
-            xjpermission = 'android.permission.CAMERA'
-          }
-          const xjfirstRequest = !plus.storage.getItem(`perm_${xjpermission}`)
-          const xcfirstRequest = !plus.storage.getItem(`perm_${xcpermission}`)
-          if (xcfirstRequest || xjfirstRequest) {
-            this.isShowPer = true;
-          }
-
-          // 检查权限
-          const xc = await permissionUtils.checkPermission('photo_library', '需要相册权限用于上传照片');
-          const xj = await permissionUtils.checkPermission('camera', '需要相机权限用于拍摄照片');
-          if (xc.granted && xj.granted) {
-            this.openCamera(type);
-            return;
-          }
-
-          // 请求权限
-          const result1 = await permissionUtils.requestPermission('photo_library', '我们需要访问您的相册以上传图片/视频');
-          const result2 = await permissionUtils.requestPermission('camera', '我们需要访问您的相机以上传图片/视频');
-          if (result1 && result2) {
-            this.openCamera(type);
-          } else {
-            locationService.openAppSettings();
-          }
-        }
-      } catch (err) {
-        console.log('选择图片出错:', err);
-        // 出错时也直接调用图片选择
-        this.openCamera(type);
-      }
-    },
-
-    async openCamera(type) {
-      try {
-        // 确保用户信息正确
-        if (!this.userId) {
-          console.log('重新获取用户信息...');
-          await this.getUserInfo();
-        }
-        
-        if (!this.identity) {
-          this.identity = getApp().globalData.artisanType;
-        }
-
-        // 直接使用 uni.chooseImage
-        const chooseResult = await new Promise((resolve, reject) => {
-          uni.chooseImage({
-            count: 1,
-            sizeType: ['compressed'],
-            sourceType: ['album', 'camera'],
-            success: resolve,
-            fail: reject
-          });
-        });
-
-        if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) {
-          uni.hideLoading();
-          return;
-        }
-
-        const tempFilePath = chooseResult.tempFilePaths[0];
-        
-        // 直接构造文件对象
-        const file = {
-          path: tempFilePath,
-          size: 0
-        };
-
-        // 显示上传loading
-        uni.showLoading({
-          title: '上传中...',
-          mask: true
-        });
-
-        // 手动调用上传
-        const result = await this.directUpload(file, this.userId, this.identity + 1);
-        
-        // 上传成功，更新loading显示为识别中
-        uni.hideLoading();
-        
-        if (result) {
-          this.formData[type] = result;
-          
-          // 上传成功后自动识别
-          if (type === 'uscc_photo') {
-            await this.recognizeBusinessLicense(result);
-          } else if (type === 'legal_idcard_positive') {
-            await this.recognizeIdCardFront(result);
-          } else if (type === 'legal_idcard_negative') {
-            await this.recognizeIdCardBack(result);
-          }
-          
-          // 保存到本地存储
-          this.saveFormDataToLocal();
-        }
-      } catch (err) {
-        uni.hideLoading();
-        console.log('上传图片错误:', err);
-        
-        if (!err.errMsg || !err.errMsg.includes('cancel')) {
-          uni.showToast({
-            title: '上传失败，请重试',
-            icon: 'none'
-          });
-        }
-      }
-    },
-
-    // 直接上传方法
-    async directUpload(file, userId, type) {
-      try {
-        let date = new Date().getTime();
-        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
-        
-        // 生成安全的文件名
-        let fileExtension = 'jpg';
-        if (file.path.includes('.')) {
-          let parts = file.path.split('.');
-          let ext = parts[parts.length - 1].toLowerCase();
-          if (ext && ext.length <= 4) {
-            fileExtension = ext;
-          }
-        }
-        
-        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
-        console.log('安全文件名:', name);
-
-        // 获取OSS配置
-        const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
-        
-        // 直接上传到OSS
-        return await new Promise((resolve, reject) => {
-          uni.uploadFile({
-            url: ossConfig.host,
-            filePath: file.path,
-            name: 'file',
-            formData: {
-              key: ossConfig.dir + name,
-              policy: ossConfig.policy,
-              OSSAccessKeyId: ossConfig.ossAccessKeyId,
-              success_action_status: '200',
-              signature: ossConfig.signature
-            },
-            success: (res) => {
-              if (res.statusCode === 200) {
-                const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
-                resolve(fileUrl);
-              } else {
-                reject(new Error('上传失败'));
-              }
-            },
-            fail: reject
-          });
-        });
-        
-      } catch (error) {
-        console.error('直接上传失败:', error);
-        throw error;
-      }
-    },
-
-    /**
-     * 识别营业执照
-     */
-    async recognizeBusinessLicense(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'uscc_photo';
-        // uni.showLoading({
-        //   title: '正在识别营业执照...',
-        //   mask: true
-        // });
-        
-        // 调用OCR接口
-        const result = await recognizeBusinessLicense(imageUrl);
-        console.log('营业执照识别结果:', result);
-
-        const hasRecognizedData = this.checkBusinessLicenseRecognition(result);
-        if (!hasRecognizedData) {
-          uni.showToast({
-            title: '未识别到营业执照信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 填充营业执照信息
-        let recognizedFields = 0;
-
-        // 企业名称：如果识别结果为"无"，就设置为空字符串
-        if (result.uscc_name && result.uscc_name.trim() && result.uscc_name !== '无') {
-          this.formData.uscc_name = result.uscc_name;
-          recognizedFields++;
-        } else {
-          // 如果是"无"或空值，设置为空字符串
-          this.formData.uscc_name = '';
-        }
-        
-        if (result.uscc_num && result.uscc_num.trim()) {
-          this.formData.uscc_num = result.uscc_num;
-          recognizedFields++;
-        }
-        
-        // 如果需要营业执照法人与法人代表关联则取消注释
-        // if (result.legal_name && result.legal_name.trim()) {
-        //   this.formData.legal_name = result.legal_name;
-        //   recognizedFields++;
-        // }
-
-        if (result.uscc_type && result.uscc_type.trim()) {
-          this.formData.uscc_type = result.uscc_type;
-          recognizedFields++;
-        }
-
-        // 根据识别的字段数量给出不同的提示
-        if (recognizedFields > 0) {
-        } else {
-          uni.showToast({
-            title: '识别完成，但未获取到有效信息',
-            icon: 'none',
-            duration: 3000
-          });
-        }
-        
-      } catch (error) {
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          // duration: 3000
-        });
-        console.error('营业执照识别失败:', error);
-        
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查营业执照识别结果是否有效
-    checkBusinessLicenseRecognition(result) {
-      const requiredFields = ['uscc_num', 'uscc_name', 'legal_name', 'uscc_type'];
-      
-      for (const field of requiredFields) {
-        if (result[field] && result[field].trim()) {
-          return true;
-        }
-      }
-      
-      return false;
-    },
-    
-    /**
-     * 识别身份证正面
-     */
-    async recognizeIdCardFront(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'legal_idcard_positive';
-        
-        uni.showLoading({
-          title: '正在识别身份证正面...',
-          mask: true
-        });
-        
-        // 调用OCR接口
-        const result = await recognizeIdCard(imageUrl, 1);
-
-        // 验证是否真的识别到了数据
-        const hasRecognizedData = this.checkIdCardFrontRecognition(result);
-        
-        if (!hasRecognizedData) {
-          uni.hideLoading();
-          uni.showToast({
-            title: '未识别到身份证信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 填充身份证正面信息
-        if (result.name) {
-          this.formData.legal_name = result.name;
-        }
-        
-        if (result.id_number) {
-          this.formData.legal_idcard_num = result.id_number;
-        }
-        
-        uni.showToast({
-          title: '身份证正面识别成功',
-          icon: 'none'
-        });
-        
-      } catch (error) {
-        console.error('身份证正面识别失败:', error);
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          duration: 3000
-        });
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查身份证正面识别结果是否有效
-    checkIdCardFrontRecognition(result) {
-      return (result.name && result.name.trim()) || (result.id_number && result.id_number.trim());
-    },
-    
-    /**
-     * 识别身份证反面
-     */
-    async recognizeIdCardBack(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'legal_idcard_negative';
-        
-        uni.showLoading({
-          title: '正在识别身份证反面...',
-          mask: true
-        });
-        
-        // 调用OCR接口
-        const result = await recognizeIdCard(imageUrl, 2);
-
-        // 验证是否真的识别到了数据
-        const hasRecognizedData = this.checkIdCardBackRecognition(result);
-        
-        if (!hasRecognizedData) {
-          uni.hideLoading();
-          uni.showToast({
-            title: '未识别到身份证有效期信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 解析有效期
-        const validPeriod = parseValidPeriod(result.start_date, result.end_date);
-        
-        // 填充有效期数据
-        if (validPeriod.startDate) {
-          this.formData.idcard_start_date = validPeriod.startDate;
-        }
-        
-        if (validPeriod.isPermanent) {
-          this.formData.legal_idcard_expiry_type = 'permanent';
-          this.formData.idcard_end_date = '长久有效';
-        } else if (validPeriod.endDate) {
-          this.formData.legal_idcard_expiry_type = 'date';
-          this.formData.idcard_end_date = validPeriod.endDate;
-        }
-        
-        // 如果是长期有效，自动选择对应的选项
-        if (validPeriod.isPermanent) {
-          this.setIdcardValidType('permanent');
-        } else {
-          this.setIdcardValidType('date');
-        }
-        
-        uni.showToast({
-          title: '身份证反面识别成功',
-          icon: 'none'
-        });
-        
-      } catch (error) {
-        console.error('身份证反面识别失败:', error);
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          duration: 3000
-        });
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查身份证反面识别结果是否有效
-    checkIdCardBackRecognition(result) {
-      return (result.start_date && result.start_date.trim()) || 
-            (result.end_date && result.end_date.trim());
-    },
-
-    // 验证表单数据
-    validateForm() {
-      // 按照表单从上到下的顺序定义验证规则
-      const validationRules = [
-        { field: 'uscc_photo', message: '请上传营业执照照片' },
-        { field: 'uscc_type', message: '请输入商户类型' },
-        { field: 'uscc_num', message: '请输入营业执照号码' },
-        { field: 'uscc_name', message: '请输入企业名称' },
-                { field: 'legal_idcard_positive', message: '请上传身份证正面照片' },
-        { field: 'legal_idcard_negative', message: '请上传身份证反面照片' },
-        { field: 'legal_name', message: '请输入法人代表' },
-        { field: 'legal_phone', message: '请输入法人联系方式' },
-        { field: 'legal_idcard_num', message: '请输入法人身份证号' },
-        { 
-          condition: () => !this.formData.legal_idcard_expiry_type, 
-          message: '请选择身份证有效期类型' 
-        },
-        { 
-          condition: () => !this.formData.idcard_start_date, 
-          message: '请选择身份证开始日期' 
-        },
-        {
-          condition: () => {
-            if (this.formData.legal_idcard_expiry_type === 'data' && !this.formData.idcard_end_date) {
-              return true;
-            }
-            // 如果选择长久有效，则不需要结束日期
-            return false;
-          },
-          message: '请选择身份证结束日期' 
-        },
-      ];
-
-      // 按顺序验证
-      for (let rule of validationRules) {
-        let isValid = true;
-        
-        if (rule.field) {
-          // 简单字段验证
-          if (!this.formData[rule.field]) {
-            isValid = false;
-          }
-        } else if (rule.condition) {
-          // 条件验证
-          if (rule.condition()) {
-            isValid = false;
-          }
-        }
-        
-        if (!isValid) {
-          uni.showToast({
-            title: rule.message,
-            icon: 'none'
-          });
-          return false;
-        }
-      }
-      
-      // 验证手机号格式
-      if (!/^1[3-9]\d{9}$/.test(this.formData.legal_phone)) {
-        uni.showToast({
-          title: '请输入正确的手机号码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      // 验证身份证格式
-      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.formData.legal_idcard_num)) {
-        uni.showToast({
-          title: '请输入正确的身份证号码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      return true;
-    },
-
-    // 将日期字符串转换为Date对象
-    parseDateString(dateStr) {
-      if (!dateStr) return null;
-      
-      // 处理年月日格式
-      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-      if (match) {
-        return new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-      }
-      
-      // 处理 YYYY-MM-DD 格式
-      if (dateStr.includes('-')) {
-        const dateParts = dateStr.split('-');
-        if (dateParts.length === 3) {
-          return new Date(parseInt(dateParts[0]), parseInt(dateParts[1]) - 1, parseInt(dateParts[2]));
-        }
-      }
-      
-      return null;
-    },
-
-    // 保存表单数据（在进入下一步时调用）
-    // 修改后的 saveFormData 方法
-    saveFormData() {
-      console.log('开始验证表单数据');
-      console.log('表单数据:', this.formData);
-      console.log('法人姓名:', this.formData.legal_name);
-      console.log('法人身份证号:', this.formData.legal_idcard_num);
-      
-      if (this.validateForm()) {
-        console.log('表单验证通过，开始验证法人信息');
-        
-        // 验证法人姓名与身份证号是否匹配
-        return this.checkIdCardAndName();
-      }
-      
-      console.log('表单验证失败');
-      return false;
-    },
-
-    // 修改后的 checkIdCardAndName 方法，添加详细调试
-    async checkIdCardAndName() {
-      if (this.isSubmit) {
-        console.log(' 重复提交被阻止 ');
-        return false;
-      }
-
-      this.isSubmit = true;
-
-      try {
-        console.log('开始调用身份验证接口');
-        console.log('请求参数:', {
-          name: this.formData.legal_name,
-          idcard: this.formData.legal_idcard_num
-        });
-        
-        uni.showLoading({
-          title: '验证身份信息...'
-        });
-
-        // 调用身份验证接口
-        const checkRes = await request.post('/user/check', {
-          name: this.formData.legal_name,
-          idcard: this.formData.legal_idcard_num
-        });
-
-        uni.hideLoading();
-        
-        console.log('身份验证接口返回结果 ');
-        console.log('完整响应:', checkRes);
-        console.log('响应Code:', checkRes.Code);
-        console.log('响应state:', checkRes.state);
-        console.log('响应msg:', checkRes.msg);
-        console.log('响应data:', checkRes.data);
-        console.log('响应ResultObject:', checkRes.ResultObject);
-        
-        if (checkRes.ResultObject) {
-          console.log('ResultObject.BizCode:', checkRes.ResultObject.BizCode);
-          console.log('ResultObject其他属性:', Object.keys(checkRes.ResultObject));
-        }
-
-        // 根据参考代码的验证逻辑，但需要先检查响应结构
-        if (checkRes.Code === '401') {
-          console.log(' Code 401 验证失败 ');
-          uni.showToast({
-            title: '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-        
-        // 检查多种可能的响应结构
-        if (checkRes.ResultObject) {
-          // 如果 ResultObject 有 BizCode 属性
-          if (checkRes.ResultObject.BizCode && checkRes.ResultObject.BizCode != '1') {
-            console.log(' BizCode 验证失败 ');
-            uni.showToast({
-              title: '您的身份证号与姓名不匹配',
-              icon: 'none',
-              duration: 3000
-            });
-            this.isSubmit = false;
-            return false;
-          }
-          
-          // 如果有其他表示失败的字段
-          if (checkRes.ResultObject.success === false || checkRes.ResultObject.result === false) {
-            console.log('success/result 验证失败');
-            uni.showToast({
-              title: '您的身份证号与姓名不匹配',
-              icon: 'none',
-              duration: 3000
-            });
-            this.isSubmit = false;
-            return false;
-          }
-        }
-        
-        // 检查直接返回的状态字段
-        if (checkRes.state && checkRes.state !== 1) {
-          console.log('state 验证失败');
-          uni.showToast({
-            title: checkRes.msg || '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-        
-        // 如果直接返回 success: false
-        if (checkRes.success === false) {
-          console.log('success 验证失败');
-          uni.showToast({
-            title: checkRes.message || '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-
-        console.log('身份验证通过 ');
-        
-        // 验证通过，创建提交给后端的数据副本，将日期转换为 YYYY-MM-DD 格式
-        const submitData = {
-          ...this.formData,
-          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
-          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
-          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
-          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
-        };
-
-        console.log('submitData:', submitData);
-
-        // 将表单数据保存到全局或本地存储，以便在下一步使用
-        getApp().globalData.qualificationData = submitData;
-        
-        this.isSubmit = false;
-        return true;
-
-      } catch (error) {
-        uni.hideLoading();
-        console.error('身份验证接口调用失败');
-        console.error('错误信息:', error);
-        console.error('错误详情:', error.response || error.message || error);
-        
-        // 根据错误类型显示不同的提示
-        let errorMessage = '身份验证失败';
-        
-        if (error.response) {
-          console.error('响应状态:', error.response.status);
-          console.error('响应数据:', error.response.data);
-          errorMessage = `服务器错误: ${error.response.status}`;
-        } else if (error.message) {
-          errorMessage = error.message;
-        } else if (error.errMsg) {
-          errorMessage = error.errMsg;
-        }
-        
-        uni.showToast({
-          title: errorMessage,
-          icon: 'none',
-          duration: 3000
-        });
-        
-        this.isSubmit = false;
-        return false;
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.qualification-page {
-  /* padding: 0rpx 0; */
-}
-
-.section {
-  margin-bottom: 30rpx;
-}
-
-.section-title {
-  display: flex;
-  align-items: center;
-  margin-bottom: 30rpx;
-}
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 7rpx;
-  border-radius: 5rpx;
-}
-
-.title-text {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #1D2129;
-  line-height: 48rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.section-title text {
-  font-size: 36rpx;
-  color: #1D2129;
-  font-weight: 500;
-}
-
-.box-cont {
-  background: #FFFFFF;
-  border-radius: 20rpx;
-  margin-bottom: 24rpx;
-  margin-left: 8rpx;
-  margin-right: 8rpx;
-  box-shadow: none;
-}
-
-.form-item {
-  padding: 24rpx 22rpx;
-}
-
-.form-item-one {
-  display: flex;
-  align-items: center;
-  padding: 24rpx;
-}
-
-.label-wrapper {
-  display: inline-flex;
-  align-items: center;
-}
-
-.label {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-  line-height: 1;
-}
-
-.label-icon {
-  width: 26rpx;
-  height: 26rpx;
-  margin-left: 8rpx;
-  align-items: center;
-}
-
-.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
-
-.upload-tip {
-  font-size: 26rpx;
-  color: #999;
-  margin: 16rpx 0 24rpx 0;
-  font-weight: 400;
-  font-family: PingFangSC, PingFang SC;
-  text-align: left;
-  font-style: normal;
-}
-
-.upload-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.upload-box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.upload-camera {
-  width: 446rpx;
-  height: 298rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 48rpx;
-  overflow: hidden;
-  background-color: #F8F9FD;
-  position: relative;
-}
-
-.idcard-upload-vertical-container {
-  display: flex;
-  flex-direction: column;
-  padding: 24rpx;
-}
-
-.idcard-upload-vertical-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-bottom: 40rpx;
-}
-
-.idcard-upload-vertical-item:last-child {
-  margin-bottom: 0;
-}
-
-.upload-label.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
-
-.license-upload {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.idcard-front {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.idcard-back {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.camera-icon {
-  width: 446rpx;
-  height: 298rpx;
-  border-radius: 48rpx;
-}
-
-.preview-image {
-  border-radius: 48rpx;
-  width: 100%;
-  height: 100%;
-}
-
-/* 识别状态样式 */
-.recognize-overlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.6);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  border-radius: 48rpx;
-}
-
-.recognize-loading {
-  width: 60rpx;
-  height: 60rpx;
-  border: 4rpx solid #fff;
-  border-top: 4rpx solid #E8101E;
-  border-radius: 50%;
-  animation: spin 1s linear infinite;
-  margin-bottom: 16rpx;
-}
-
-.recognize-text {
-  color: #fff;
-  font-size: 24rpx;
-}
-
-@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
-.picker-content {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  flex: 1;
-}
-
-.picker-content text {
-  margin-right: 19rpx;
-}
-
-/* 日期选择框竖线分隔符 */
-.date-divider {
-  width: 2rpx;
-  height: 30rpx;
-  background-color: #E9E9E9;
-  margin: 0 15rpx 0 0;
-}
-
-/* 置灰状态下的竖线 */
-.date-picker-box.disabled .date-divider {
-  background-color: #F3F3F3;
-}
-
-/* 确保日期文字区域可以自动扩展 */
-.date-picker-box text {
-  flex: 1;
-}
-
-.arrow-right {
-  width: 14rpx;
-  height: 26rpx;
-}
-
-
-.placeholder {
-  color: #999999;
-  font-size: 28rpx;
-}
-
-.picker-value {
-  font-size: 28rpx;
-  color: #333333;
-}
-
-.input {
-  flex: 1;
-  font-size: 28rpx;
-  color: #333333;
-  text-align: right;
-  margin-left: 20rpx;
-}
-
-.radio-group {
-  display: flex;
-  margin-top: 24rpx;
-  width: 100%;
-}
-
-.radio-item {
-  display: flex;
-  align-items: center;
-  margin-right: 130rpx;
-}
-
-.radio {
-  width: 30rpx;
-  height: 30rpx;
-  border: 2rpx solid #DDDDDD;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 16rpx;
-}
-
-.radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
-}
-
-.radio-icon-image {
-  width: 32rpx;
-  height: 32rpx;
-}
-
-.radio-label {
-  font-size: 28rpx;
-  color: #333333;
-}
-
-/* 日期范围容器样式 */
-.date-range-container {
-  padding: 24rpx;
-  display: flex;
-  justify-content: space-between;
-}
-
-.date-item {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-.date-item:first-child {
-  margin-right: 24rpx;
-}
-
-.date-label {
-  font-size: 28rpx;
-  color: #333333;
-  margin-bottom: 16rpx;
-  font-weight: 500;
-  margin-left: 8rpx;
-}
-
-.date-picker-box {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border: 2rpx solid #E9E9E9;
-  border-radius: 10rpx;
-  padding: 12rpx 19rpx;
-  background-color: transparent;
-}
-
-.date-picker-box.disabled {
-  border: 2rpx solid #F3F3F3;
-}
-
-.date-picker-box.disabled .date-value,
-.date-picker-box.disabled .placeholder {
-  color: #CCCCCC;
-}
-
-.date-value {
-  font-size: 28rpx;
-  color: #333;
-}
-
-.date-arrow {
-  width: 35rpx;
-  height: 33rpx;
-}
-
-.upload-label {
-  font-family: Helvetica;
-  font-size: 28rpx;
-  color: #999;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-  margin-top: 24rpx;
-}
-
-/* 弹出框样式 */
-.popup {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 999;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.popup-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.popup-content {
-  position: relative;
-  background-color: #FFFFFF;
-  border-radius: 24rpx 24rpx 0 0;
-  padding: 32rpx;
-  transform: translateY(100%);
-  transition: transform 0.3s ease;
-  max-height: 70vh;
-}
-
-.popup.show .popup-content {
-  transform: translateY(0);
-}
-
-.popup-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 32rpx;
-}
-
-.popup-title {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.popup-close {
-  font-size: 40rpx;
-  color: #999999;
-  padding: 16rpx;
-}
-
-.popup-body {
-  max-height: 400rpx;
-  overflow-y: auto;
-}
-
-.radio-list .radio-item {
-  margin-bottom: 32rpx;
-}
-
-.popup-footer {
-  margin-top: 32rpx;
-}
-
-.popup-btn {
-  height: 88rpx;
-  border-radius: 44rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-}
-
-.popup-btn .btn-text {
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #FFFFFF;
-}
-
-.cancel-text, .confirm-text {
-  font-size: 32rpx;
-  padding: 16rpx;
-}
-
-.cancel-text {
-  color: #666666;
-}
-
-.confirm-text {
-  color: #E8101E;
-  font-weight: 500;
-}
-
-.picker-scroll {
-  height: 400rpx;
-}
-
-.picker-item {
-  height: 68rpx;
-  line-height: 68rpx;
-  text-align: center;
-  font-size: 28rpx;
-}
-
-/* 提示弹窗样式 */
-.tip-popup {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 1000;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.tip-popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.tip-popup-mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.tip-popup-content {
-  position: relative;
-  width: 620rpx;
-  height: 810rpx;
-}
-
-.tip-popup-bg {
-  width: 620rpx;
-  height: 810rpx;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.tip-popup-body {
-  position: relative;
-  flex-direction: column;
-  padding: 80rpx 20rpx 40rpx 20rpx;
-  box-sizing: border-box;
-}
-
-.tip-title {
-  font-size: 36rpx;
-  font-weight: bold;
-  color: #333;
-  text-align: center;
-  margin-top: 107rpx;
-  margin-bottom: 37rpx;
-}
-
-.tip-image-container {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 50rpx;
-}
-
-.tip-image {
-  width: 90%;
-  max-height: 400rpx;
-}
-
-.tip-buttons {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 28rpx;
-}
-
-.tip-btn {
-  width: 250rpx;
-  height: 80rpx;
-  border-radius: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 32rpx;
-  font-weight: 500;
-}
-
-.tip-btn.cancel {
-  border: #E8101E 2rpx solid;
-  background-color: transparent;
-  color: #e8101e;
-}
-
-.tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-  color: #FFFFFF;
-}
-
-.tip-btn .btn-text {
-  color: inherit;
-}
-</style>
\ No newline at end of file
+<template>
+  <view class="qualification-page">
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">门店信息</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+          <text class="label required">店铺名称</text>
+        </view>
+        <input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+      <view class="form-item-two box-cont" @click="showLocationPopup">
+        <text class="label required">门店所在地</text>
+        <view class="picker-content">
+          <text :class="formData.dependency ? 'picker-value' : 'placeholder'">
+            {{ formData.dependency || '请选择' }}
+          </text>
+          <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+            class="arrow-right" mode="aspectFit"></image>
+        </view>
+      </view>
+      <view class="form-item-two box-cont" @click="getAddressInfo">
+        <text class="label required">门店详细地址</text>
+        <view class="picker-content">
+          <text :class="formData.address ? 'picker-value' : 'placeholder'">
+            {{ formData.address || '请选择' }}
+          </text>
+          <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+            class="arrow-right" mode="aspectFit"></image>
+        </view>
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">联系人信息</text>
+      </view>
+
+      <view class="form-item box-cont">
+        <text class="label required">您的身份</text>
+        <view class="radio-group">
+          <view class="radio-item" @click="setContactType('1')">
+            <view class="radio" :class="{ checked: formData.contact_type === '1' }">
+              <image v-if="formData.contact_type === '1'"
+                src="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="setContactType('2')">
+            <view class="radio" :class="{ checked: formData.contact_type === '2' }">
+              <image v-if="formData.contact_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>
+        </view>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">联系人</text>
+        <input type="text" v-model="formData.contact_name" placeholder="请输入" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">联系人电话</text>
+        <input type="number" v-model="formData.contact_phone" placeholder="请输入联系电话" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label">备用联系人电话</text>
+        <input type="number" v-model="formData.backup_phone" placeholder="请输入备用联系电话" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">其他信息</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">邀请码</text>
+        <input type="text" v-model="formData.invite_code" placeholder="请输入邀请码" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+      <view class="invite-tip box-cont">
+        <text class="invite-tip-text">请填写邀请人的邀请码，若没有邀请人请填写13131313</text>
+      </view>
+    </view>
+
+    <view class="popup" :class="{ show: showLocationPopupFlag }">
+      <view class="popup-mask" @click="hideLocationPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择所在地</text>
+          <text class="popup-close" @click="hideLocationPopup">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
+            :value="locationValue">
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
+                {{ item.province }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in locatinCitys" :key="index">
+                {{ item.city }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in locationAreas" :key="index">
+                {{ item.area }}
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideLocationPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmLocationSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+      <view class="tip-popup-mask" @click="hideTipPopup"></view>
+      <view class="tip-popup-content">
+        <image class="tip-popup-bg"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
+          mode="aspectFit"></image>
+
+        <view class="tip-popup-body">
+          <view class="tip-title">{{ tipTitle }}</view>
+          <view class="tip-image-container">
+            <image class="tip-image" :src="tipImage" mode="widthFix"></image>
+          </view>
+          <view class="tip-buttons">
+            <view class="tip-btn cancel" @click="hideTipPopup">
+              <text class="btn-text">取消</text>
+            </view>
+            <view class="tip-btn confirm" @click="hideTipPopup">
+              <text class="btn-text">我已了解</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import { debounce } from '@/utils/debounce.js';
+import ChinaCitys from '../../static/data/ChinaCitys.json';
+
+export default {
+  data() {
+    const loadedData = this.loadFormDataFromLocal();
+
+    return {
+      userId: null,
+      formData: loadedData || {
+        name: '',
+        contact_type: '1',
+        contact_name: '',
+        contact_phone: '',
+        backup_phone: '',
+        invite_code: '',
+        dependency: '',
+        address: '',
+        dependency_code: '',
+        dependency_province: '',
+        dependency_city: '',
+        longitude: '',
+        latitude: ''
+      },
+      showTipPopupFlag: false,
+      indicatorStyle: 'height: 68rpx;',
+      tipTitle: '',
+      tipImage: '',
+      isSubmit: false,
+      identity: 2,
+
+      ChinaCitys: ChinaCitys,
+      locatinCitys: [],
+      locationAreas: [],
+      locationValue: [0, 0, 0],
+      showLocationPopupFlag: false
+    }
+  },
+  computed: {
+
+  },
+
+  watch: {
+    'formData.name'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.contact_name'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.contact_phone'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.backup_phone'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.invite_code'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.dependency'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    },
+    'formData.address'(newVal) {
+      this.saveFormDataToLocalDebounce();
+    }
+  },
+
+  created() {
+    this.getUserInfo();
+    this.checkGlobalData();
+    this.setupAddressListener();
+  },
+
+  onShow() {
+    const localData = this.loadFormDataFromLocal();
+    if (localData) {
+      this.formData = {
+        ...this.formData,
+        ...localData
+      };
+    }
+
+    this.checkGlobalData();
+    this.checkAddressData();
+  },
+
+  onUnload() {
+    this.saveFormDataToLocal();
+  },
+
+  beforeDestroy() {
+    if (this.addressListener) {
+      uni.$off('address-selected', this.addressListener);
+    }
+    if (this.sjAddressListener) {
+      uni.$off('address-selected-for-sj', this.sjAddressListener);
+    }
+  },
+
+  mounted() {
+    this.locatinCitys = this.ChinaCitys[0].citys;
+    this.locationAreas = this.locatinCitys[0].areas;
+  },
+
+  onHide() {
+    this.saveFormDataToLocal();
+  },
+
+  methods: {
+    checkGlobalData() {
+      if (getApp().globalData.qualificationData) {
+        this.formData = {
+          ...this.formData,
+          ...getApp().globalData.qualificationData
+        };
+        this.saveFormDataToLocal();
+        getApp().globalData.qualificationData = null;
+      }
+    },
+
+    loadFormDataFromLocal() {
+      try {
+        const stored = uni.getStorageSync('qualification_form_data');
+        if (stored) {
+          console.log('从本地存储加载数据:', stored);
+          return stored;
+        }
+      } catch (e) {
+        console.log('读取本地存储失败:', e);
+      }
+      return null;
+    },
+
+    saveFormDataToLocalDebounce: debounce(function () {
+      this.saveFormDataToLocal();
+    }, 500),
+
+    saveFormDataToLocal() {
+      try {
+        uni.setStorageSync('qualification_form_data', this.formData);
+        console.log('数据已保存到本地存储');
+      } catch (e) {
+        console.log('保存数据失败:', e);
+      }
+    },
+
+    clearFormDataLocal() {
+      try {
+        uni.removeStorageSync('qualification_form_data');
+        console.log('已清空本地存储数据');
+      } catch (e) {
+        console.log('清空数据失败:', e);
+      }
+    },
+
+    getUserInfo() {
+      return new Promise((resolve, reject) => {
+        request.post('/sj/user/getuser').then(result => {
+          if (result.state === 1) {
+            this.userId = result.data.id;
+            console.log('用户ID获取成功:', this.userId);
+            resolve(this.userId);
+          } else {
+            console.error('获取用户信息失败:', result.msg);
+            reject(result.msg);
+          }
+        }).catch(error => {
+          console.error('获取用户信息接口错误:', error);
+          reject(error);
+        });
+      });
+    },
+
+    getFormData() {
+      return { ...this.formData };
+    },
+
+    saveFormData() {
+      if (!this.formData.name) {
+        uni.showToast({ title: '请输入店铺名称', icon: 'none' });
+        return false;
+      }
+      if (!this.formData.dependency) {
+        uni.showToast({ title: '请选择门店所在地', icon: 'none' });
+        return false;
+      }
+      if (!this.formData.address) {
+        uni.showToast({ title: '请选择门店详细地址', icon: 'none' });
+        return false;
+      }
+      if (!this.formData.contact_name) {
+        uni.showToast({ title: '请输入联系人', icon: 'none' });
+        return false;
+      }
+      if (!this.formData.contact_phone) {
+        uni.showToast({ title: '请输入联系人电话', icon: 'none' });
+        return false;
+      }
+      if (!/^1[3-9]\d{9}$/.test(this.formData.contact_phone)) {
+        uni.showToast({ title: '请输入正确的手机号码', icon: 'none' });
+        return false;
+      }
+      if (!this.formData.invite_code) {
+        uni.showToast({ title: '请输入邀请码', icon: 'none' });
+        return false;
+      }
+      this.saveFormDataToLocal();
+      return true;
+    },
+
+    setContactType(type) {
+      this.$set(this.formData, 'contact_type', type);
+      this.saveFormDataToLocal();
+    },
+
+    showTipPopup(field) {
+      const tipConfig = {
+        'name': {
+          title: '如何找到店铺名称',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
+        }
+      };
+
+      if (tipConfig[field]) {
+        this.tipTitle = tipConfig[field].title;
+        this.tipImage = tipConfig[field].image;
+        this.showTipPopupFlag = true;
+      }
+    },
+
+    hideTipPopup() {
+      this.showTipPopupFlag = false;
+    },
+
+    showLocationPopup() {
+      this.showLocationPopupFlag = true;
+    },
+
+    hideLocationPopup() {
+      this.showLocationPopupFlag = false;
+    },
+
+    bindChangeLocation(e) {
+      this.locationValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.locatinCitys = this.ChinaCitys[index1].citys;
+      this.locationAreas = this.locatinCitys[index2].areas;
+    },
+
+    confirmLocationSelect() {
+      let valueArr = this.locationValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+      let province = this.ChinaCitys[index1].province;
+      let city = this.locatinCitys[index2].city;
+      let area = this.locationAreas[index3].area;
+      this.formData.dependency = province + '-' + city + '-' + area;
+
+      this.formData.address = '';
+      this.formData.longitude = '';
+      this.formData.latitude = '';
+
+      if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+        let provinceCode = this.ChinaCitys[index1].code.toString();
+        this.formData.dependency_province = provinceCode.substring(0, 6);
+      }
+      if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
+        let cityCode = this.locatinCitys[index2].code.toString();
+        this.formData.dependency_city = cityCode.substring(0, 6);
+      }
+      if (this.locationAreas[index3] && this.locationAreas[index3].code) {
+        let areaCode = this.locationAreas[index3].code.toString();
+        this.formData.dependency_code = areaCode.substring(0, 6);
+      }
+
+      this.saveFormDataToLocal();
+      this.hideLocationPopup();
+    },
+
+    buildRegionTextForSearch() {
+      const dependency = String(this.formData.dependency || '').trim();
+      if (!dependency) return '';
+
+      const parts = dependency.split('-');
+      const province = parts[0] || '';
+      const city = parts[1] || '';
+      const district = parts[2] || '';
+
+      let regionText = '';
+      if (province) regionText += province;
+      if (city && city !== province) regionText += city;
+      if (district) regionText += district;
+
+      return regionText;
+    },
+
+    getAddressValueForSearch() {
+      const rawAddress = String(this.formData.address || '').trim();
+      if (!rawAddress) return '';
+
+      const dependencyText = String(this.formData.dependency || '').trim();
+      const regionText = this.buildRegionTextForSearch();
+
+      let detail = rawAddress;
+
+      if (regionText && detail.indexOf(regionText) === 0) {
+        detail = detail.slice(regionText.length).trim();
+      } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+        detail = detail.slice(dependencyText.length).trim();
+      }
+
+      detail = detail.replace(/^[\s,-]+/, '').trim();
+
+      return detail || rawAddress;
+    },
+
+    getAddressInfo() {
+      this.saveFormDataToLocal();
+
+      const dependency = String(this.formData.dependency || '').trim();
+      const dependencyCode = String(this.formData.dependency_code || '').trim();
+      const address = this.getAddressValueForSearch();
+      const longitude = String(this.formData.longitude || '').trim();
+      const latitude = String(this.formData.latitude || '').trim();
+
+      const hasDependency = !!dependency;
+      const hasAddress = !!address;
+      const hasLocation = !!(longitude && latitude);
+
+      let params = 'source=sj_info';
+
+      if (hasDependency) {
+        params += `&dependency=${encodeURIComponent(dependency)}`;
+        if (dependencyCode) {
+          params += `&dependency_code=${dependencyCode}`;
+        }
+      }
+
+      if (hasAddress) {
+        params += `&address=${encodeURIComponent(address)}`;
+      }
+
+      if (hasLocation) {
+        params += `&longitude=${longitude}&latitude=${latitude}`;
+      }
+
+      if (!hasDependency && !hasAddress && !hasLocation) {
+        params += '&init_current_location=1&silent_locate=1';
+      }
+
+      uni.navigateTo({
+        url: `/pages/address/search?${params}`
+      });
+    },
+
+    setupAddressListener() {
+      this.addressListener = (addressData) => {
+        this.handleAddressSelected(addressData);
+      };
+      this.sjAddressListener = (addressData) => {
+        this.handleAddressSelected(addressData);
+      };
+      uni.$on('address-selected', this.addressListener);
+      uni.$on('address-selected-for-sj', this.sjAddressListener);
+    },
+
+    checkAddressData() {
+      try {
+        const storedAddress = uni.getStorageSync('sj_selected_address');
+        if (storedAddress) {
+          this.handleAddressSelected(storedAddress);
+          uni.removeStorageSync('sj_selected_address');
+          return;
+        }
+      } catch (e) { }
+
+      if (getApp().globalData && getApp().globalData.selectedAddress) {
+        this.handleAddressSelected(getApp().globalData.selectedAddress);
+        delete getApp().globalData.selectedAddress;
+      }
+
+      try {
+        const selectedAddress = uni.getStorageSync('selectedAddress');
+        if (selectedAddress) {
+          this.handleAddressSelected(selectedAddress);
+          uni.removeStorageSync('selectedAddress');
+        }
+      } catch (e) { }
+    },
+
+    handleAddressSelected(addressData) {
+      if (!addressData) return;
+
+      let detailAddress = '';
+      if (addressData.address) {
+        detailAddress = String(addressData.address).trim();
+      } else if (addressData.name) {
+        detailAddress = String(addressData.name).trim();
+
+        const regionParts = [];
+        if (addressData.pname) regionParts.push(addressData.pname);
+        if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData.cityname);
+        if (addressData.adname) regionParts.push(addressData.adname);
+
+        const regionText = regionParts.join('');
+
+        if (regionText && detailAddress.indexOf(regionText) === 0) {
+          detailAddress = detailAddress.slice(regionText.length).trim();
+        }
+
+        detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
+      }
+
+      this.formData.address = detailAddress;
+
+      if (addressData.location) {
+        const [longitude, latitude] = String(addressData.location).split(',');
+        this.formData.longitude = longitude || '';
+        this.formData.latitude = latitude || '';
+      }
+
+      if (addressData.pname || addressData.cityname || addressData.adname) {
+        const locationParts = [];
+        if (addressData.pname) locationParts.push(addressData.pname);
+        if (addressData.cityname) locationParts.push(addressData.cityname);
+        if (addressData.adname) locationParts.push(addressData.adname);
+        this.formData.dependency = locationParts.join('-');
+      }
+
+      this.formData.dependency_province = addressData.provinceCode || '';
+      this.formData.dependency_city = addressData.cityCode || '';
+      this.formData.dependency_code = addressData.districtCode || '';
+
+      this.saveFormDataToLocal();
+      this.$forceUpdate();
+    }
+  }
+}
+</script>
+
+<style scoped>
+.qualification-page {}
+
+.section {
+  margin-bottom: 30rpx;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30rpx;
+}
+
+.title-bar {
+  width: 6rpx;
+  height: 30rpx;
+  background-color: #E8101E;
+  margin-right: 7rpx;
+  border-radius: 5rpx;
+}
+
+.title-text {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #1D2129;
+  line-height: 48rpx;
+  text-align: left;
+  font-style: normal;
+}
+
+.section-title text {
+  font-size: 36rpx;
+  color: #1D2129;
+  font-weight: 500;
+}
+
+.box-cont {
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  margin-bottom: 24rpx;
+  margin-left: 8rpx;
+  margin-right: 8rpx;
+  box-shadow: none;
+}
+
+.form-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+}
+
+.form-item-one {
+  display: flex;
+  align-items: center;
+  padding: 24rpx;
+}
+
+.form-item-two {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+}
+
+.form-item-two>text.label {
+  flex-shrink: 0;
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.label-wrapper {
+  display: inline-flex;
+  align-items: center;
+}
+
+.label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  line-height: 1;
+}
+
+.label-icon {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 8rpx;
+  align-items: center;
+}
+
+.required::before {
+  content: '*';
+  color: #FF0000;
+  margin-right: 4rpx;
+}
+
+.picker-content {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  flex: 1;
+}
+
+.picker-content text {
+  margin-right: 19rpx;
+}
+
+.arrow-right {
+  width: 14rpx;
+  height: 26rpx;
+}
+
+.placeholder {
+  color: #999999;
+  font-size: 28rpx;
+}
+
+.picker-value {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.input {
+  flex: 1;
+  font-size: 28rpx;
+  color: #333333;
+  text-align: right;
+  margin-left: 20rpx;
+}
+
+.radio-group {
+  display: flex;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 130rpx;
+}
+
+.radio {
+  width: 30rpx;
+  height: 30rpx;
+  border: 2rpx solid #DDDDDD;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16rpx;
+}
+
+.radio.checked {
+  background-color: #E8101E;
+  border-color: #E8101E;
+}
+
+.radio-icon-image {
+  width: 32rpx;
+  height: 32rpx;
+}
+
+.radio-label {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.invite-tip {
+  padding: 24rpx;
+}
+
+.invite-tip-text {
+  font-size: 26rpx;
+  color: #999999;
+  line-height: 40rpx;
+}
+
+.popup {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.popup-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+  position: relative;
+  background-color: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+  padding: 32rpx;
+  transform: translateY(100%);
+  transition: transform 0.3s ease;
+  max-height: 70vh;
+}
+
+.popup.show .popup-content {
+  transform: translateY(0);
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 32rpx;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999999;
+  padding: 16rpx;
+}
+
+.popup-footer {
+  margin-top: 32rpx;
+  display: flex;
+  justify-content: space-between;
+  gap: 20rpx;
+  padding: 0 24rpx 24rpx;
+}
+
+.popup-btn {
+  flex: 1;
+  height: 88rpx;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+}
+
+.popup-btn.cancel {
+  background-color: #F5F5F5;
+}
+
+.popup-btn.confirm {
+  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+}
+
+.popup-btn .btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #FFFFFF;
+}
+
+.popup-btn.cancel .btn-text {
+  color: #666666;
+}
+
+.popup-btn.confirm .btn-text {
+  color: #FFFFFF;
+}
+
+.region-body {
+  height: 400rpx;
+}
+
+.picker-scroll {
+  height: 400rpx;
+}
+
+.picker-item {
+  height: 68rpx;
+  line-height: 68rpx;
+  text-align: center;
+  font-size: 28rpx;
+}
+
+.tip-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.tip-popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.tip-popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.tip-popup-content {
+  position: relative;
+  width: 620rpx;
+  height: 810rpx;
+}
+
+.tip-popup-bg {
+  width: 620rpx;
+  height: 810rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.tip-popup-body {
+  position: relative;
+  flex-direction: column;
+  padding: 80rpx 20rpx 40rpx 20rpx;
+  box-sizing: border-box;
+}
+
+.tip-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  text-align: center;
+  margin-top: 107rpx;
+  margin-bottom: 37rpx;
+}
+
+.tip-image-container {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 50rpx;
+}
+
+.tip-image {
+  width: 90%;
+  max-height: 400rpx;
+}
+
+.tip-buttons {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 28rpx;
+}
+
+.tip-btn {
+  width: 250rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.tip-btn.cancel {
+  border: #E8101E 2rpx solid;
+  background-color: transparent;
+  color: #e8101e;
+}
+
+.tip-btn.confirm {
+  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  color: #FFFFFF;
+}
+
+.tip-btn .btn-text {
+  color: inherit;
+}
+</style>
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 86104a5..92ee357 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -4,23 +4,23 @@
 		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
 
 		<!-- 步骤切换 -->
-		<step-tab :currentStep="currentStep" :identity="identity"></step-tab>
+		<step-tab v-if="currentStep !== 2" :mappedStep="mappedStep"></step-tab>
 
 		<!-- 内容区域根据身份和步骤显示不同内容 -->
 		<view class="content">
-			<!-- 入驻协议内容 -->
 			<view class="xieyi_content" v-if="currentStep === 0">
 				<rich-text :nodes="textData.text"></rich-text>
 			</view>
 
-			<!-- 步骤1: 根据身份显示不同内容 -->
 			<view v-else-if="currentStep === 1">
-				<!-- 手艺人显示个人信息，商家显示资质信息 -->
 				<qualification-info ref="qualificationInfo"></qualification-info>
 			</view>
-			<!-- 步骤2: 根据身份显示不同内容 -->
+
 			<view v-else-if="currentStep === 2">
-				<!-- 手艺人显示资质信息，商家显示门店信息 -->
+				<successruzhu :data="successData"></successruzhu>
+			</view>
+
+			<view v-else-if="currentStep === 3">
 				<store-info ref="storeInfo"></store-info>
 			</view>
 		</view>
@@ -28,7 +28,7 @@
 
 		<!-- 底部按钮区域 -->
 		<view class="bottom-fixed">
-			<!-- 步骤0: 入驻协议 - 只显示下一步 -->
+			<!-- 步骤0: 入驻协议 -->
 			<view v-if="currentStep === 0" class="step-0-buttons">
 				<view class="agree">
 					<image v-if="!isAgree" src="/static/images/agree_n.png" class="agree-btn" mode="aspectFit"
@@ -38,24 +38,36 @@
 					<text class="agree-tip">我已阅读并同意以上协议</text>
 				</view>
 				<view class="next-btn" @click="goNext">
-					<text class="next-text">下一步，填写资质信息</text>
+					<text class="next-text">下一步，填写基本信息</text>
 				</view>
 			</view>
 
-			<!-- 步骤1: 资质信息 - 显示上一步和下一步 -->
+			<!-- 步骤1: 资质信息 -->
 			<view v-else-if="currentStep === 1" class="step-1-buttons">
 				<view class="button-row">
 					<view class="prev-btn" @click="goPrev">
 						<text class="prev-text">上一步</text>
 					</view>
 					<view class="next-btn" @click="goNext">
-						<text class="next-text">下一步，填写门店信息</text>
+						<text class="next-text">提交入驻</text>
 					</view>
 				</view>
 			</view>
 
-			<!-- 步骤2: 门店信息 - 显示上一步和提交申请 -->
+			<!-- 步骤2: 提交成功 -->
 			<view v-else-if="currentStep === 2" class="step-2-buttons">
+				<view class="button-row">
+					<view class="prev-btn" @click="topt">
+						<text class="prev-text">进入平台</text>
+					</view>
+					<view class="submit-btn" @click="goNext">
+						<text class="submit-text">去完成资质认证</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 步骤3: 门店信息 -->
+			<view v-else-if="currentStep === 3" class="step-2-buttons">
 				<view class="button-row">
 					<view class="prev-btn" @click="goPrev">
 						<text class="prev-text">上一步</text>
@@ -74,16 +86,18 @@
 	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, // 当前步骤索引
+				currentStep:3, // 当前步骤索引
 				isAgree: false,
 				identity: null,
 				textData: {},
@@ -92,6 +106,7 @@
 				navTitle: '商家入驻', // 默认标题
 				qualificationData: null, // 新增：保存资质信息
 				storeInfoData: null, // 新增：保存门店信息
+				successData:{},//入驻提示
 				// 新增：缓存手艺人数据
 				artisanDataCache: {
 					personalInfo: null,
@@ -99,6 +114,14 @@
 				}
 			}
 		},
+		computed: {
+			mappedStep() {
+				if (this.currentStep === 0) return 0;
+				if (this.currentStep === 1) return 1;
+				if (this.currentStep === 3) return 2;
+				return 0;
+			}
+		},
 		async onLoad(options) {
 			this.identity = 2;
 			await this.getUserInfoSync()
@@ -113,6 +136,11 @@
 		},
 
 		methods: {
+			topt(){
+				uni.switchTab({
+					url:'/pages/home/home'
+				})
+			},
 			// 获取用户信息（复用不可服务时间页面的方法）
 			async getUserInfoSync() {
 				await request.post('/sj/userSjAuth/details', {
@@ -122,59 +150,36 @@
 						let data = result.data
 						if (getApp().globalData.artisanType == 2) {
 
-							//储存已有的商家入驻信息
 							let qualification_form_data = {
-								"uscc_num": data.uscc_num,
-								"uscc_name": data.uscc_name,
-								"legal_name": data.legal_name,
-								"legal_phone": data.legal_phone,
-								"legal_idcard_num": data.legal_idcard_num,
-								"uscc_photo": data.uscc_photo,
-								"legal_idcard_positive": data.legal_idcard_positive,
-								"legal_idcard_negative": data.legal_idcard_negative,
-								"uscc_type": data.uscc_type,
-								"license_valid_type": data.uscc_expiry_type,
-							}
-							if (data.uscc_expiry) {
-								let expirys = data.uscc_expiry.split(' —— ')
-								qualification_form_data.license_start_date = expirys[0]
-								qualification_form_data.license_end_date = expirys[1]
-							}
-							if (data.legal_idcard_expiry) {
-								let expirys = data.legal_idcard_expiry.split(' —— ')
-								qualification_form_data.idcard_start_date = expirys[0]
-								if (expirys[1]) {
-									qualification_form_data.legal_idcard_expiry_type = "date"
-									qualification_form_data.idcard_end_date = expirys[1]
-								} else {
-									qualification_form_data.legal_idcard_expiry_type = "permanent"
-									qualification_form_data.idcard_end_date = ""
-								}
-
-							}
-							uni.setStorageSync('qualification_form_data', qualification_form_data);
-							let store_invite_state = {
-								"currentValidatingCode": data.invite_code_other
-							}
-							uni.setStorageSync('store_invite_state', store_invite_state);
-							let store_info_form_data = {
-								"head_photo": data.head_photo,
-								"name": data.name,
-								"business_time": data.business_time,
-								"servers_kill": data.servers_kill,
-								"dependency": data.dependency,
-								"address": data.address,
-								"apply_state": data.apply_state,
-								"invite_code_other": data.invite_code_other,
-								"major": data.major,
-								"dependency_code": data.dependency_code,
-								"dependency_province": data.dependency_province,
-								"dependency_city": data.dependency_city,
-								"longitude": data.longitude,
-								"latitude": data.latitude
-							}
-							console.log(111111111, store_info_form_data)
-							uni.setStorageSync('store_info_form_data', store_info_form_data);
+							"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);
 						}
 
 					}
@@ -182,65 +187,6 @@
 					console.error('获取用户信息接口错误:', error);
 				});
 			},
-			/**
-			 * 解析身份证有效期字符串，转换为中文日期格式（兼容低版本iOS，支持结束日期为空/长期）
-			 * @param {string} expiryStr 原有效期字符串，格式如："2016-01-29 —— 2026-01-29" | "2016-01-29 —— " | "2016-01-29 —— 长期"
-			 * @returns {Object} 包含开始和结束日期的对象
-			 */
-			parseIdCardExpiry(expiryStr) {
-				// 初始化默认值
-				let id_card_start_date = '';
-				let id_card_end_date = '';
-
-				try {
-					// 1. 分割字符串：兼容多种分隔符（——、--、—、-），并去除前后空格
-					const dateParts = expiryStr.split(/\s*[-—]{1,2}\s*/).map(str => str.trim());
-					// 提取开始和结束日期部分（处理分割后长度不足的情况）
-					const startStr = dateParts[0] || '';
-					const endStr = dateParts[1] || '';
-
-					// 2. 日期解析函数（核心：兼容低版本iOS）
-					const formatDateToChinese = (dateStr) => {
-						// 若为空，直接返回空
-						if (!dateStr) return '';
-						// 若为“长期”，直接返回“长期”
-						if (dateStr === '长期') return '长期';
-
-						// 关键：低版本iOS不支持“yyyy-mm-dd”，替换为“yyyy/mm/dd”
-						const compatibleStr = dateStr.replace(/-/g, '/');
-						const date = new Date(compatibleStr);
-
-						// 检查日期是否有效
-						if (isNaN(date.getTime())) {
-							return ''; // 解析失败则返回空
-						}
-
-						// 获取年、月、日（去掉前导零）
-						const year = date.getFullYear();
-						const month = date.getMonth() + 1;
-						const day = date.getDate();
-
-						return `${year}年${month}月${day}日`;
-					};
-
-					// 3. 解析开始日期（必须有值，否则置空）
-					if (startStr) {
-						id_card_start_date = formatDateToChinese(startStr);
-					}
-
-					// 4. 解析结束日期（支持空、长期、正常日期）
-					id_card_end_date = formatDateToChinese(endStr);
-
-				} catch (err) {
-					console.error('解析身份证有效期失败：', err);
-				}
-
-				// 5. 返回结果
-				return {
-					id_card_start_date,
-					id_card_end_date
-				};
-			},
 			// 检查并传递地址给商家组件
 			checkAndPassAddressToSj() {
 				try {
@@ -248,38 +194,15 @@
 					if (sjAddress) {
 						console.log('找到商家地址数据，准备传递:', sjAddress);
 
-						// 延迟执行，确保组件已渲染
 						setTimeout(() => {
-							if (this.identity === 2 && this.$refs.storeInfo) {
-								console.log('传递地址给商家组件');
-
-								// 传递给商家组件
-								if (typeof this.$refs.storeInfo.handleAddressSelected === 'function') {
-									this.$refs.storeInfo.handleAddressSelected(sjAddress);
-								} else if (this.$refs.storeInfo.formData) {
-									// 直接设置数据
-									this.$refs.storeInfo.formData.address = sjAddress.address || sjAddress
-										.name;
-									this.$refs.storeInfo.formData.longitude = sjAddress.longitude;
-									this.$refs.storeInfo.formData.latitude = sjAddress.latitude;
-
-									// 设置省市区信息
-									if (sjAddress.pname || sjAddress.cityname || sjAddress.adname) {
-										const locationParts = [];
-										if (sjAddress.pname) locationParts.push(sjAddress.pname);
-										if (sjAddress.cityname) locationParts.push(sjAddress.cityname);
-										if (sjAddress.adname) locationParts.push(sjAddress.adname);
-										this.$refs.storeInfo.formData.dependency = locationParts.join('-');
-									}
-
-									this.$refs.storeInfo.saveFormDataToLocal();
-									this.$refs.storeInfo.$forceUpdate();
-								}
-
-								// 清理存储
-								uni.removeStorageSync('sj_selected_address');
+						if (this.identity === 2 && this.$refs.qualificationInfo) {
+							console.log('传递地址给资质组件');
+							if (typeof this.$refs.qualificationInfo.handleAddressSelected === 'function') {
+								this.$refs.qualificationInfo.handleAddressSelected(sjAddress);
 							}
-						}, 300);
+						}
+						uni.removeStorageSync('sj_selected_address');
+					}, 300);
 					}
 				} catch (e) {
 					console.error('处理商家地址失败:', e);
@@ -400,82 +323,32 @@
 
 			// 审核提交方法
 			async submitForReview() {
-				// 提交前确保有用户信息
 				const userInfo = await this.checkAndGetUserInfo();
 				if (!userInfo) {
 					return;
 				}
 
-				uni.showLoading({
-					title: '提交中...'
-				});
+				uni.showLoading({ title: '提交中...' });
 
 				try {
-					console.log('=== 提交审核调试信息 ===');
-					console.log('身份类型:', this.identity);
-					console.log('门店信息数据:', this.storeInfoData);
-					console.log('资质信息数据:', this.qualificationData);
-					console.log('个人信息数据:', this.personalInfoData);
-
-
-					let apiUrl = '';
-					let formData = {};
-
-
-
-					if (this.identity === 2) {
-						// 商家入驻
-						apiUrl = '/sj/userSjAuth/apply';
-
-						// 确保重新获取最新数据
-						if (this.$refs.storeInfo) {
-							if (!this.$refs.storeInfo.saveFormData()) {
-								uni.hideLoading();
-								return;
-							}
-							this.storeInfoData = this.$refs.storeInfo.getFormData();
-							console.log('重新获取的门店信息:', this.storeInfoData);
-						}
-
-						// 验证服务技能是否存在
-						if (!this.storeInfoData || !this.storeInfoData.servers_kill || this.storeInfoData
-							.servers_kill.length === 0) {
-							uni.hideLoading();
-							uni.showToast({
-								title: '请选择服务技能',
-								icon: 'none'
-							});
-							return;
-						}
-
-						formData = this.buildBusinessData(this.qualificationData, this.storeInfoData);
-					}
-
-					console.log('提交的数据:', formData);
-					console.log('API URL:', apiUrl);
-
-					formData.type = 1
-					formData.id_type = 1
-
-					const res = await request.post(apiUrl, formData);
+					let formData = this.buildBusinessData(this.qualificationData, {});
+					formData.type = 1;
+					formData.id_type = 1;
 
+					const res = await request.post('/sj/userSjAuth/applyOne', formData);
 					uni.hideLoading();
 
-					if (res.state == 1  || res.code == 200) {
-						// 提交成功后清除缓存数据
-
+					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,
-							success: () => {
-								setTimeout(() => {
-									uni.redirectTo({
-										url: `./submitres?identity=${this.identity}&applyState=1`
-									});
-								}, 1500);
-							}
+							duration: 1500
 						});
+						setTimeout(() => {
+							this.currentStep = 2;
+						}, 1500);
 					} else {
 						uni.showToast({
 							title: res.msg || '提交失败',
@@ -484,7 +357,6 @@
 					}
 				} catch (error) {
 					uni.hideLoading();
-					console.error('提交审核失败:', error);
 					uni.showToast({
 						title: '提交失败，请重试',
 						icon: 'none'
@@ -492,106 +364,63 @@
 				}
 			},
 
-			// 优化日期格式化方法
-			formatDateForBackend(dateStr) {
-				if (!dateStr) return '';
-				if (dateStr === '长久有效' || dateStr === '长久有效') return '';
-
-				// 将 年月日 格式转换为 YYYY-MM-DD
-				const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-				if (match) {
-					const year = match[1];
-					const month = match[2].padStart(2, '0');
-					const day = match[3].padStart(2, '0');
-					return `${year}-${month}-${day}`;
-				}
-
-				// 如果已经是 YYYY-MM-DD 格式，直接返回
-				return dateStr;
-			},
-
 			// 构建商家数据
 			buildBusinessData(qualificationData, storeData) {
-				// 根据接口文档构建数据
+				console.log(qualificationData,'storeDatastoreDatastoreData');
 				const formData = {};
 
-				// 服务技能处理 - 添加更严格的验证
-				if (storeData && storeData.servers_kill && storeData.servers_kill.length > 0) {
-					// 确保 servers_kill 是数组
-					formData.servers_kill = Array.isArray(storeData.servers_kill) ?
-						storeData.servers_kill : [storeData.servers_kill];
-
-					console.log('服务技能数组:', formData.servers_kill);
-				} else {
-					console.warn('警告：没有服务技能数据');
-					formData.servers_kill = [];
-				}
-
-				// 营业执照信息
 				if (qualificationData.uscc_type) {
-					formData.uscc_type = qualificationData.uscc_type === 'individual' ? 1 : 2;
+					formData.uscc_type = qualificationData.uscc_type;
 				}
-				if (qualificationData.uscc_photo) {
-					formData.uscc_photo = qualificationData.uscc_photo;
+				// 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.uscc_num) {
-					formData.uscc_num = qualificationData.uscc_num;
+				if (qualificationData.backup_phone) {
+					formData.backup_phone = qualificationData.backup_phone;
 				}
-				if (qualificationData.uscc_name) {
-					formData.uscc_name = qualificationData.uscc_name;
+				if (qualificationData.contact_type) {
+					formData.contact_type = qualificationData.contact_type;
 				}
-				if (qualificationData.license_valid_type) {
-					formData.uscc_expiry_type = qualificationData.license_valid_type === 'permanent' ? 1 : 2;
+				if (qualificationData.invite_code) {
+					formData.invite_code_other = qualificationData.invite_code;
+				}
+				if (qualificationData.contact_name) {
+					formData.contact_name = qualificationData.contact_name;
 				}
 
-				// 格式化有效期
-				if (qualificationData.license_start_date) {
-					const startDate = this.formatDateForBackend(qualificationData.license_start_date);
+				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 (qualificationData.license_valid_type === 'permanent') {
-						// 长久有效格式：开始日期 + " ——        "
-						formData.uscc_expiry = `${startDate} ——        `;
-					} else if (qualificationData.license_end_date) {
-						// 指定日期格式：开始日期 + " —— " + 结束日期
-						const endDate = this.formatDateForBackend(qualificationData.license_end_date);
-						formData.uscc_expiry = `${startDate} —— ${endDate}`;
-					}
-				}
-
-				// 法人信息
-				if (qualificationData.legal_name) {
-					formData.legal_name = qualificationData.legal_name;
-				}
-				if (qualificationData.legal_phone) {
-					formData.legal_phone = qualificationData.legal_phone;
-				}
-				if (qualificationData.legal_idcard_num) {
-					formData.legal_idcard_num = qualificationData.legal_idcard_num;
-				}
-				if (qualificationData.legal_idcard_expiry_type) {
-					formData.legal_idcard_expiry_type = qualificationData.legal_idcard_expiry_type === 'permanent' ? 1 : 2;
-				}
-
-				// 格式化有效期
-				if (qualificationData.idcard_start_date) {
-					const idcardStartDate = this.formatDateForBackend(qualificationData.idcard_start_date);
-
-					if (qualificationData.legal_idcard_expiry_type === 'permanent') {
-						formData.legal_idcard_expiry = `${idcardStartDate} ——        `;
-					} else if (qualificationData.idcard_end_date) {
-						const idcardEndDate = this.formatDateForBackend(qualificationData.idcard_end_date);
-						formData.legal_idcard_expiry = `${idcardStartDate} —— ${idcardEndDate}`;
-					}
-				}
-
-				if (qualificationData.legal_idcard_positive) {
-					formData.legal_idcard_positive = qualificationData.legal_idcard_positive;
-				}
-				if (qualificationData.legal_idcard_negative) {
-					formData.legal_idcard_negative = qualificationData.legal_idcard_negative;
-				}
-
-				// 门店信息
+				// if (storeData && 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;
 				}
@@ -601,86 +430,38 @@
 				if (storeData.business_time) {
 					formData.business_time = storeData.business_time;
 				}
-				if (storeData.servers_kill && storeData.servers_kill.length > 0) {
-					// 直接传递数组
-					formData.servers_kill = storeData.servers_kill;
-					console.log('服务技能数组:', formData.servers_kill);
-				} else {
-					formData.servers_kill = [];
-					console.warn('警告：没有服务技能数据');
-				}
-
-				console.log('最终 formData 中的 servers_kill:', formData.servers_kill);
-				console.log('=== 调试结束 ===');
-
-				if (storeData.dependency) {
-					formData.dependency = storeData.dependency;
-
-					// 地址编码
-					if (storeData.dependency_code) {
-						formData.dependency_code = storeData.dependency_code;
-					}
-					if (storeData.dependency_province) {
-						formData.dependency_province = storeData.dependency_province;
-					}
-					if (storeData.dependency_city) {
-						formData.dependency_city = storeData.dependency_city;
-					}
-				}
-				if (storeData.address) {
-					formData.address = storeData.address;
-				}
-				// 经纬度
-				if (storeData.longitude) formData.longitude = storeData.longitude;
-				if (storeData.latitude) formData.latitude = storeData.latitude;
-
-				// 其他信息
 				if (storeData.apply_state) {
 					formData.get_msg_method = storeData.apply_state;
 				}
-				if (storeData.invite_code_other) {
-					formData.invite_code_other = storeData.invite_code_other;
-				}
 				if (storeData.major) {
 					formData.major = storeData.major;
 				}
+				
 
-				// 账号信息 - 直接从登录时输入的手机号获取
-				// 注意：这里使用 qualificationData 或 storeData 中的手机号，或者从全局获取
 				const userInfo = uni.getStorageSync('userInfo');
-
 				if (userInfo && userInfo.account) {
 					formData.account = userInfo.account;
 				} else {
-					// 如果全局没有，尝试从本地存储的登录信息获取
 					const loginAccount = uni.getStorageSync('loginAccount');
 					if (loginAccount) {
 						formData.account = loginAccount;
+					} else if (qualificationData.contact_phone) {
+						formData.contact_name = qualificationData.contact_name;
 					} else {
-						// 最后尝试：从资质信息或门店信息中获取手机号
-						if (qualificationData.legal_phone) {
-							formData.account = qualificationData.legal_phone;
-						} else {
-							console.error('无法获取账号信息');
-							uni.showToast({
-								title: '无法获取用户账号',
-								icon: 'none'
-							});
-							return null;
-						}
+						console.error('无法获取账号信息');
+						uni.showToast({
+							title: '无法获取用户账号',
+							icon: 'none'
+						});
+						return null;
 					}
 				}
 
-				console.log('使用的账号:', formData.account);
 				return formData;
 
 			},
 
 			async goNext() {
-				console.log('当前步骤:', this.currentStep);
-				console.log('身份类型:', this.identity);
-
-				// 步骤0需要同意协议
 				if (this.currentStep === 0 && !this.isAgree) {
 					uni.showToast({
 						title: '请阅读并同意以上协议',
@@ -689,68 +470,55 @@
 					return;
 				}
 
-				// 步骤1需要验证信息
 				if (this.currentStep === 1) {
-					console.log('商家验证资质信息');
-					// 商家验证资质信息
 					if (this.$refs.qualificationInfo) {
 						const isValid = await this.$refs.qualificationInfo.saveFormData();
 						if (!isValid) {
-							console.log('商家资质信息验证失败');
 							return;
 						}
 						this.qualificationData = this.$refs.qualificationInfo.getFormData();
-						console.log(' 商家资质信息验证通过 ');
 					}
+					await this.submitForReview();
+					return;
 				}
 
-				// 步骤2需要验证信息
-				if (this.currentStep === 2) {
-					// 商家验证门店信息
-					if (this.$refs.storeInfo) {
-						const isValid = await this.$refs.storeInfo.saveFormData();
-						if (!isValid) {
-							console.log('商家门店信息验证失败');
-							return;
-						}
-						this.storeInfoData = this.$refs.storeInfo.getFormData();
-						console.log('商家门店信息验证通过');
-					}
-				}
-
-				if (this.currentStep < 2) {
+				if (this.currentStep < 3) {
 					this.currentStep++;
-					console.log('切换到步骤:', this.currentStep);
-
-					// 步骤切换后滚动到顶部
 					setTimeout(() => {
 						this.scrollToTop();
 					}, 100);
-
-				} else {
-					this.completeRegistration();
 				}
 			},
 
-			submitApplication() {
-				// 商家验证门店信息
+			async submitApplication() {
 				if (this.$refs.storeInfo) {
 					if (!this.$refs.storeInfo.saveFormData()) {
 						return;
 					}
 					this.storeInfoData = this.$refs.storeInfo.getFormData();
-					console.log('商家门店信息数据:', this.storeInfoData);
 				}
 
-				// 提交前确认邀请码
-				if (this.$refs.storeInfo && this.$refs.storeInfo.confirmInviteCodeBeforeSubmit) {
-					this.$refs.storeInfo.confirmInviteCodeBeforeSubmit(() => {
-						// 确认后执行提交逻辑
-						this.completeRegistration();
-					});
-				} else {
-					// 不支持邀请码确认，直接提交
-					this.completeRegistration();
+				uni.showLoading({ title: '提交中...' });
+				try {
+					let formData = {};
+					if (this.qualificationData) {
+						Object.assign(formData, this.qualificationData);
+					}
+					if (this.storeInfoData) {
+						Object.assign(formData, this.storeInfoData);
+					}
+					formData.type = 1;
+					formData.id_type = 1;
+					const res = await request.post('/sj/userSjAuth/apply', formData);
+					uni.hideLoading();
+					if (res.state == 1 || res.code == 200) {
+						uni.showToast({ title: '提交成功', icon: 'none' });
+					} else {
+						uni.showToast({ title: res.msg || '提交失败', icon: 'none' });
+					}
+				} catch (error) {
+					uni.hideLoading();
+					uni.showToast({ title: '提交失败，请重试', icon: 'none' });
 				}
 			},
 
@@ -759,11 +527,6 @@
 					this.currentStep--;
 				}
 			},
-			completeRegistration() {
-				// 提交审核的逻辑
-				this.submitForReview();
-			},
-			// 添加滚动到顶部的方法
 			scrollToTop() {
 				uni.pageScrollTo({
 					scrollTop: 0,
@@ -850,7 +613,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+		background: #FF4767;
 		border-radius: 49rpx;
 	}
 
@@ -875,7 +638,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+		background: #FF4767;
 		border-radius: 49rpx;
 	}
 
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 6e4a47a..ae76b31 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -1,2433 +1,1191 @@
-<template>
-  <view class="store-info-page">
-    <!-- 门店信息标题 -->
-    <view class="section-title">
-      <view class="title-bar"></view>
-      <text>门店信息</text>
-    </view>
-
-    <!-- 店铺logo -->
-    <view class="form-item box-cont">
-        <view class="label-wrapper">
-            <text class="label required">店铺logo</text>
-            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('head_photo')"></image>
-        </view>
-      <view class="upload-box" @click="chooseImage('head_photo')">
-        <image v-if="formData.head_photo" :src="formData.head_photo" mode="aspectFill" class="logo-image"></image>
-        <view class="upload-placeholder" v-else>
-          <image src="/static/images/upload-img.png" mode="aspectFit" class="upload-icon"></image>
-        </view>
+<template>
+  <view class="sj-info-page">
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">营业执照</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">资质照片</text>
+        <text class="upload-desc">请保证照片上的文字清晰、无遮挡、证件边角可见</text>
+        <view class="" @click="chooseImage('business_license')">
+          <image v-if="formData.business_license" :src="formData.business_license" mode="aspectFill"
+            class="upload-preview"></image>
+          <view class="" v-else>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa75ea1c-8f9d-4b2a-8d0c-b94de516afd0.png"
+              mode="widthFix" class="upload-camera-img"></image>
+          </view>
+        </view>
+        <text class="required placeholder1">请上传营业执照原件</text>
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">商户类型</text>
+        <input type="text" v-model="formData.household_type" placeholder="请输入商户类型" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">证件号码</text>
+        <view class="picker-content">
+          <input type="text" v-model="formData.license_number" placeholder="请输入营业执照的证件号码"
+            placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
+          <image class="label-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+            mode="aspectFit" @click.stop="showTipPopup('license_number')"></image>
+        </view>
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">营业名称</text>
+        <input type="text" v-model="formData.business_name" placeholder="请输入营业执照的企业名称" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-two box-cont" @click="showRegionPicker">
+        <text class="label required">注册地区</text>
+        <view class="picker-content">
+          <text :class="formData.register_region ? 'picker-value' : 'placeholder1'">
+            {{ formData.register_region || '请选择' }}
+          </text>
+          <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+            class="arrow-right" mode="aspectFit"></image>
+        </view>
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">注册详细地址</text>
+        <view class="picker-content">
+          <input type="text" v-model="formData.register_address" placeholder="请输入注册地址" placeholder-class="placeholder"
+            class="input" @input="saveFormDataToLocalDebounce" />
+        </view>
       </view>
-    </view>
-
-    <!-- 店铺名称 -->
-    <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-            <text class="label required">店铺名称</text>
-            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('name')"></image>
+	  <view class="form-item-column box-cont">
+	    <text class="label required">营业执照有效期至：</text>
+	    <view class="radio-group">
+	      <view class="radio-item" @click="setIdcardExpiryType('permanent')">
+	        <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
+	          <image v-if="formData.legal_idcard_expiry_type === 'permanent'"
+	            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+	            class="radio-icon-image" mode="aspectFit"></image>
+	        </view>
+	        <text class="radio-label">永久有效</text>
+	      </view>
+	      <view class="radio-item" @click="setIdcardExpiryType('date')">
+	        <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
+	          <image v-if="formData.legal_idcard_expiry_type === 'date'"
+	            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+	            class="radio-icon-image" mode="aspectFit"></image>
+	        </view>
+	        <text class="radio-label">指定日期有效</text>
+	      </view>
+	    </view>
+	  </view>
+	  <view class="date-row box-cont">
+	    <view class="date-col" @click="showDatePicker('start')">
+	      <text class="date-label">开始日期</text>
+	      <view class="date-input-box">
+	        <text :class="formData.idcard_start_date ? 'date-value' : 'date-placeholder'">
+	          {{ formData.idcard_start_date || '选择日期' }}
+	        </text>
+	        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+	          class="date-icon" mode="aspectFit"></image>
+	      </view>
+	    </view>
+	    <view class="date-col" @click="showDatePicker('end')">
+	      <text class="date-label">结束日期</text>
+	      <view class="date-input-box">
+	        <text :class="formData.idcard_end_date ? 'date-value' : 'date-placeholder'">
+	          {{ formData.idcard_end_date || '选择日期' }}
+	        </text>
+	        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+	          class="date-icon" mode="aspectFit"></image>
+	      </view>
+	    </view>
+	  </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">法人信息</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">身份证照片</text>
+        <text class="upload-desc">请保证照片上的文字清晰、无遮挡、证件边角可见</text>
+        <view class="upload-area" @click="chooseImage('id_card_front')">
+          <image v-if="formData.id_card_front" :src="formData.id_card_front" mode="aspectFill" class="upload-preview">
+          </image>
+          <view class="" v-else>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa75ea1c-8f9d-4b2a-8d0c-b94de516afd0.png"
+              mode="widthFix" class="upload-camera-img" style="margin-left: -30rpx;"></image>
+          </view>
+          <text class="placeholder1 required">请上传身份证正面(人像面)</text>
+        </view>
+        <view class="upload-area" @click="chooseImage('id_card_back')" style="margin-top: 48rpx;">
+          <image v-if="formData.id_card_back" :src="formData.id_card_back" mode="aspectFill" class="upload-preview">
+          </image>
+          <view class="" v-else>
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa75ea1c-8f9d-4b2a-8d0c-b94de516afd0.png"
+              mode="widthFix" class="upload-camera-img" style="margin-left: -30rpx;"></image>
+          </view>
+          <text class="placeholder1 required">请上传身份证反面(国徽面)</text>
+        </view>
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">法人代表</text>
+        <input type="text" v-model="formData.legal_person" placeholder="请输入营业执照的法人代表" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">法人联系方式</text>
+        <input type="number" v-model="formData.legal_phone" placeholder="请输入法人的联系方式" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-two box-cont">
+        <text class="label required">法人身份证号</text>
+        <input type="text" v-model="formData.legal_id_number" placeholder="请输入法人的身份证号码" placeholder-class="placeholder"
+          class="input" @input="saveFormDataToLocalDebounce" />
+      </view>
+
+      <view class="form-item-column box-cont">
+        <text class="label required">营业执照有效期至：</text>
+        <view class="radio-group">
+          <view class="radio-item" @click="setIdcardExpiryType('permanent')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
+              <image v-if="formData.legal_idcard_expiry_type === 'permanent'"
+                src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+                class="radio-icon-image" mode="aspectFit"></image>
+            </view>
+            <text class="radio-label">永久有效</text>
+          </view>
+          <view class="radio-item" @click="setIdcardExpiryType('date')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
+              <image v-if="formData.legal_idcard_expiry_type === 'date'"
+                src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+                class="radio-icon-image" mode="aspectFit"></image>
+            </view>
+            <text class="radio-label">指定日期有效</text>
+          </view>
+        </view>
+      </view>
+      <view class="date-row box-cont">
+        <view class="date-col" @click="showDatePicker('start')">
+          <text class="date-label">开始日期</text>
+          <view class="date-input-box">
+            <text :class="formData.idcard_start_date ? 'date-value' : 'date-placeholder'">
+              {{ formData.idcard_start_date || '选择日期' }}
+            </text>
+            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+              class="date-icon" mode="aspectFit"></image>
+          </view>
+        </view>
+        <view class="date-col" @click="showDatePicker('end')">
+          <text class="date-label">结束日期</text>
+          <view class="date-input-box">
+            <text :class="formData.idcard_end_date ? 'date-value' : 'date-placeholder'">
+              {{ formData.idcard_end_date || '选择日期' }}
+            </text>
+            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+              class="date-icon" mode="aspectFit"></image>
+          </view>
+        </view>
+      </view>
+
+    </view>
+
+    <view class="section">
+      <view class="section-title">
+        <view class="title-bar"></view>
+        <text class="title-text">其他信息</text>
+      </view>
+
+      <view class="form-item-one box-cont">
+        <text class="label required">行业资质</text>
+        <view class="image-list">
+          <view class="image-item" v-for="(img, index) in formData.industry_qualifications" :key="'industry-' + index">
+            <image :src="img" mode="aspectFill" class="qualification-image"></image>
+            <view class="image-delete" @click="removeImage('industry_qualifications', index)">×</view>
+          </view>
+          <view class="image-add" @click="chooseMultiImage('industry_qualifications')"
+            v-if="formData.industry_qualifications.length < 9">
+            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png" mode="aspectFit" class="upload-icon-small"></image>
+            <text class="add-text">添加照片</text>
+          </view>
         </view>
-      <input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" 
-             placeholder-class="placeholder" class="input" 
-             @input="saveFormDataToLocalDebounce" />
-    </view>
-
-    <!-- 营业时间 -->
-    <view class="form-item-two box-cont" @click="openTimePicker">
-      <text class="label required">营业时间</text>
-      <view class="picker-content">
-        <text :class="formData.business_time ? 'picker-value' : 'placeholder'">
-          {{formData.business_time || '请输入营业时间'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 服务技能 -->
-    <view class="form-item-two box-cont" @click="showServicePopup">
-      <text class="label required">服务技能（多选）</text>
-      <view class="picker-content">
-        <text :class="formData.servers_kill.length > 0 ? 'picker-value' : 'placeholder'" v-if="formData.servers_kill">
-          {{selectedServicesText || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 门店所在地 -->
-    <view class="form-item-two box-cont" @click="showLocationPopup">
-      <text class="label required">门店所在地：</text>
-      <view class="picker-content">
-        <text :class="formData.dependency ? 'picker-value' : 'placeholder'">
-          {{formData.dependency || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 门店详细地址 -->
-    <view class="form-item-two box-cont" @click="getAddressInfo">
-      <text class="label required">门店详细地址：</text>
-      <view class="picker-content">
-        <text :class="formData.address ? 'picker-value' : 'placeholder'">
-          {{formData.address || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 其他信息标题 -->
-    <view class="section-title">
-      <view class="title-bar"></view>
-      <text>其他信息</text>
-    </view>
-
-    <!-- 获取消息方式 -->
-    <!-- <view class="form-item-two box-cont" @click="openMessageMethodPicker">
-      <text class="label required">获取消息方式：</text>
-      <view class="picker-content">
-        <text :class="formData.apply_state ? 'picker-value' : 'placeholder'">
-          {{messageMethodText || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view> -->
-
-    <!-- 邀请码 -->
-    <view class="form-item-one-yqr box-cont invite-code-container">
-        <view class="invite-code-top">
-            <view class="label-wrapper">
-              <text class="label required">邀请码</text>
-            </view>
-            <input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码" 
-                  placeholder-class="placeholder" class="input" 
-                  :disabled="hasExistingInviter"
-                  @input="handleInviteCodeInput" />
-        </view>
-        
-        <!-- 分割线 -->
-        <view class="divider"></view>
-        
-        <!-- 邀请人信息 -->
-        <view class="invite-info-container">
-          <!-- 默认提示 -->
-          <text v-if="!formData.invite_code_other" class="invite-tip">
-            请填写邀请人的邀请码，若没有邀请人请填写13131313
-          </text>
-          
-          <!-- 验证中 -->
-          <view v-else-if="inviteCodeValidating" class="invite-validating">
-            <text>验证中...</text>
-          </view>
-          
-          <!-- 验证失败 -->
-          <view v-else-if="inviteCodeError" class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
-            <text>邀请码无效</text>
-          </view>
-          
-          <!-- 特殊邀请码13131313 -->
-          <view v-else-if="formData.invite_code_other === '13131313' && !inviterInfo" class="invite-tip">
-            请填写邀请人的邀请码，若没有邀请人请填写13131313
-          </view>
-          
-          <!-- 显示邀请人信息 -->
-          <view v-else-if="inviterInfo" class="inviter-info">
-            <text class="inviter-label">邀请人：</text>
-            <text class="inviter-name">{{ inviterInfo.name || inviterInfo.nick_name }}</text>
-            <text class="inviter-divider">/</text>
-            <text class="inviter-phone">{{ inviterInfo.account }}</text>
-          </view>
-          
-          <!-- 其他情况（接口返回成功但没有认证铁军的邀请码） -->
-          <view v-else class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
-              <text>邀请码无效</text>
-          </view>
-        </view>
-    </view>
-
-    <!-- 专业经验 -->
-    <view class="form-item-two box-cont" @click="openExperiencePicker">
-      <text class="label required">专业经验：</text>
-      <view class="picker-content">
-        <text :class="formData.major ? 'picker-value' : 'placeholder'">
-          {{experienceText || '请选择'}}
-        </text>
-        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
-      </view>
-    </view>
-
-    <!-- 服务技能弹出框 -->
-    <view class="popup" :class="{ show: showServicePopupFlag }">
-      <view class="popup-mask" @click="hideServicePopup"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="popup-title">选择服务技能</text>
-          <text class="popup-close" @click="hideServicePopup">×</text>
-        </view>
-        <view class="popup-body">
-          <view class="checkbox-list">
-            <view class="checkbox-item" v-for="(item, index) in serviceList" :key="index"
-                  @click="toggleServiceSelect(index)">
-              <view class="checkbox" :class="{ checked: item.checked }">
-                <image v-if="item.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" mode="aspectFit"></image>
-              </view>
-              <text class="checkbox-label">{{item.title}}</text>
-            </view>
-          </view>
-        </view>
-        <view class="popup-footer">
-          <view class="popup-btn cancel" @click="hideServicePopup">
-            <text class="btn-text">取消</text>
-          </view>
-          <view class="popup-btn confirm" @click="confirmServiceSelect">
-            <text class="btn-text">确定</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 所在地选择弹出框 -->
-    <view class="popup" :class="{ show: showLocationPopupFlag }">
-      <view class="popup-mask" @click="hideLocationPopup"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="popup-title">选择所在地</text>
-          <text class="popup-close" @click="hideLocationPopup">×</text>
-        </view>
-        <view class="region-body">
-          <picker-view @change="bindChangeLocation" class="picker-scroll"
-                      :indicator-style="indicatorStyle" :value="locationValue">
-            <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">
-                {{item.province}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">
-                {{item.city}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in locationAreas" :key="index">
-                {{item.area}}
-              </view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-        <view class="popup-footer">
-          <view class="popup-btn cancel" @click="hideLocationPopup">
-            <text class="btn-text">取消</text>
-          </view>
-          <view class="popup-btn confirm" @click="confirmLocationSelect">
-            <text class="btn-text">确定</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 营业时间选择器 -->
-    <view class="popup" :class="{ show: showTimePicker }">
-      <view class="popup-mask" @click="hideTimePopup"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="cancel-text" @click="hideTimePopup">取消</text>
-          <text class="title">选择营业时间</text>
-          <text class="confirm-text" @click="confirmTime">确定</text>
-        </view>
-        <view class="time-range">
-          <view class="time-block" :class="{ active: timeType === 'start' }"
-                @click="switchTimeType('start')">
-            <text class="time-value">{{formatTime(startTime)}}</text>
-            <text class="time-label">开始时间</text>
-          </view>
-          <text class="time-separator">至</text>
-          <view class="time-block" :class="{ active: timeType === 'end' }"
-                @click="switchTimeType('end')">
-            <text class="time-value">{{formatTime(endTime)}}</text>
-            <text class="time-label">结束时间</text>
-          </view>
-        </view>
-        <view class="region-body">
-          <picker-view :value="pickerValue" @change="handleTimeChange" class="picker-scroll"
-                      :indicator-style="indicatorStyle">
-            <picker-view-column>
-              <view class="picker-item" v-for="(hour, index) in hours" :key="index">
-                {{hour}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
-                {{minute}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item">-</view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(hour, index) in hours" :key="index">
-                {{hour}}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
-                {{minute}}
-              </view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 提示信息弹窗 -->
-    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
-      <view class="tip-popup-mask" @click="hideTipPopup"></view>
-      <view class="tip-popup-content">
-        <!-- 弹窗背景图片 -->
-        <image class="tip-popup-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770" mode="aspectFit"></image>
-        
-        <!-- 弹窗内容 -->
-        <view class="tip-popup-body">
-          <view class="tip-title">{{ tipTitle }}</view>
-          <view class="tip-image-container">
-            <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
-          </view>
-          <view class="tip-buttons">
-            <view class="tip-btn cancel" @click="hideTipPopup">
-              <text class="btn-text">取消</text>
-            </view>
-            <view class="tip-btn confirm" @click="hideTipPopup">
-              <text class="btn-text">我已了解</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 邀请码确认弹窗 -->
-    <uni-popup ref="existingInvitePopup" type="center" :mask-click="false">
-      <view class="invite-popup-content">
-        <view class="invite-popup-header">
-          <text class="invite-popup-title">请确认邀请信息</text>
-        </view>
-        <view class="invite-popup-body">
-          <view class="invite-item">
-            <text class="invite-label">邀请码</text>
-            <text class="invite-value">{{ existingInviterInfo && existingInviterInfo.invite_code }}</text>
-          </view>
-          <view class="invite-item">
-            <text class="invite-label">邀请人</text>
-            <text class="invite-value">{{ (existingInviterInfo && (existingInviterInfo.name || existingInviterInfo.nick_name)) || '' }}</text>
-          </view>
-        </view>
-        <view class="invite-popup-footer">
-          <view class="invite-btn cancel" @click="cancelInviteConfirm">关闭</view>
-          <view class="invite-btn confirm" @click="useExistingInviteCode">确认</view>
-        </view>
-      </view>
-    </uni-popup>
-
-  </view>
-</template>
-
-<script>
-import request from '../../utils/request';
-import ChinaCitys from '../../static/data/ChinaCitys.json';
-import { debounce } from '@/utils/debounce.js';
-
-export default {
-  data() {
-    const loadedData = this.loadFormDataFromLocal();
-    
-    return {
-      formData: loadedData || {
-        head_photo: '',
-        name: '',
-        business_time: '',
-        servers_kill: [],
-        dependency: '',
-        address: '',
-        apply_state: '',
-        invite_code_other: '',
-        major: '',
-        dependency_code: '',        // 区code
-        dependency_province: '',    // 省code  
-        dependency_city: '',        // 市code
-        longitude: '',              // 经度
-        latitude: '',               // 纬度
-      },
-      ChinaCitys: ChinaCitys,
-      locatinCitys: [],
-      locationAreas: [],
-      locationValue: [0, 0, 0],
-      showServicePopupFlag: false,
-      serviceList: [],
-      selectedServicesText: '',
-      showLocationPopupFlag: false,
-      showTimePicker: false,
-      pickerValue: [8, 0, 0, 18, 0],
-      hours: Array.from({ length: 24 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
-      minutes: Array.from({ length: 60 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
-      timeType: 'start',
-      indicatorStyle: 'height: 68rpx;',
-      messageMethodText: '',
-      experienceText: '',
-      showTipPopupFlag: false,
-      tipTitle: '',
-      tipImage: '',
-      currentTipType: '',
-      userId: null,
-      userMobile: null,           // 新增：当前用户手机号
-      identity: 2,
-      tipImagesPreloaded: false,
-      tipPopupBg: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770',
-      
-      // 邀请码相关字段
-      inviteCodeValidating: false,
-      inviteCodeError: false,
-      inviterInfo: null,
-      currentValidatingCode: '',
-      
-      // 已有邀请人信息（用户之前作为手艺人被邀请）
-      existingInviterInfo: null,
-      hasExistingInviter: false,      // 控制输入框禁用
-      hasAutoReplacedInvite: false,   // 是否已自动替换（防止被覆盖）
-      
-      fromAddressPage: false,
-      addressListener: null,
-
-      // 抖动效果控制
-      shakeInviteError: false,
-
-      inviteValidationTimer: null, // 邀请码验证定时器
-    }
-  },
-  
-  computed: {
-    startTime() {
-      return {
-        hour: this.hours[this.pickerValue[0]],
-        minute: this.minutes[this.pickerValue[1]]
-      }
-    },
-    endTime() {
-      return {
-        hour: this.hours[this.pickerValue[3]],
-        minute: this.minutes[this.pickerValue[4]]
-      }
-    }
-  },
-  
-  watch: {
-    'name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.head_photo'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.invite_code_other'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.address'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    }
-  },
-  
-  onLoad() {
-    uni.$on('address-selected-for-sj', (addressData) => {
-      this.handleAddressSelected(addressData);
-    });
-  },
-
-  onUnload() {
-    uni.$off('address-selected-for-sj');
-  },
-  
-  async mounted() {
-    // 先获取用户信息（含手机号）
-    await this.getUserInfo();
-    this.preloadTipImages();
-
-    this.locatinCitys = this.ChinaCitys[0].citys;
-    this.locationAreas = this.locatinCitys[0].areas;
-    this.loadServiceSkills();
-    this.updateSelectedServicesText();
-
-    // 初始化消息方式和专业经验显示文本
-    if (this.formData.apply_state) {
-      const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-      this.messageMethodText = methods[this.formData.apply_state - 1] || '';
-    }
-    
-    if (this.formData.major) {
-      const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-      this.experienceText = experiences[this.formData.major - 1] || '';
-    }
-    
-    this.setupAddressListener();
-    
-    // 【关键】检查并强制使用已绑定的邀请人（手艺人原邀请码）
-    await this.forceUseExistingInviter();
-    
-    // 如果没有自动替换，再处理普通邀请码输入
-    if (!this.hasAutoReplacedInvite && this.formData.invite_code_other) {
-      this.validateInviteCode(this.formData.invite_code_other);
-    }
-  },
-
-  beforeDestroy() {
-    if (this.addressListener) {
-      uni.$off('address-selected', this.addressListener);
-    }
-  },
-
-  onShow() {
-    this.checkAddressData();
-    
-    // 如果已自动替换，避免被本地存储覆盖（只恢复非邀请码字段）
-    if (this.hasAutoReplacedInvite) {
-      const localData = this.loadFormDataFromLocal();
-      if (localData) {
-        const { invite_code_other, ...otherData } = localData;
-        Object.keys(otherData).forEach(key => {
-          if (this.formData[key] !== undefined && key !== 'invite_code_other') {
-            this.formData[key] = otherData[key];
-          }
-        });
-        this.restoreServiceSkillsSelection();
-        this.updateSelectedServicesTextImmediately();
-      }
-    } else {
-      // 原有恢复逻辑
-      const localData = this.loadFormDataFromLocal();
-      if (localData) {
-        Object.assign(this.formData, localData);
-
-        // 立即更新显示文本（即使在 serviceList 加载完成前）
-        this.updateSelectedServicesTextImmediately();
-
-        // 恢复服务技能的选中状态
-        if (this.serviceList.length > 0) {
-          this.restoreServiceSkillsSelection();
-        }
-        
-        // 恢复获取消息方式的显示文本
-        if (this.formData.apply_state) {
-          const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-          this.messageMethodText = methods[this.formData.apply_state - 1] || '';
-        }
-        
-        // 恢复专业经验的显示文本
-        if (this.formData.major) {
-          const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-          this.experienceText = experiences[this.formData.major - 1] || '';
-        }
-      }
-
-      // 重新从本地存储加载邀请码验证状态
-      this.loadInviteStateFromLocal();
-      
-      this.checkGlobalData();
-
-      // 邀请码验证
-      if (this.formData.invite_code_other) {
-        this.validateInviteCode(this.formData.invite_code_other);
-      }
-    }
-  },
-
-  onHide() {
-    this.saveFormDataToLocal();
-  },
-  
-  onUnload() {
-    this.saveFormDataToLocal();
-  },
-  
-  methods: {
-    // ========== 新增：强制使用已绑定的邀请人（商家端） ==========
-    async forceUseExistingInviter() {
-      if (this.hasAutoReplacedInvite) return false;
-      
-      // 需要用户手机号
-      if (!this.userMobile) {
-        console.log('用户手机号未获取，跳过强制替换');
-        return false;
-      }
-      
-      try {
-        // 1. 调用商家端接口查询已绑定的邀请码
-        const res = await request.post('/sj/User/getBInviteCode', {
-          account: this.userMobile,
-          type: 2   // 2=商家入驻
-        });
-        
-        console.log('查询已有邀请码结果:', res);
-        
-        if (res && res.code === 200 && res.data) {
-          // 兼容字段：可能是 invite_code 或 invite_code_other
-          const oldInviteCode = res.data.invite_code || res.data.invite_code_other;
-          
-          if (oldInviteCode) {
-            console.log('检测到已绑定邀请码:', oldInviteCode);
-            
-            // 2. 用邀请码获取完整的邀请人信息
-            const inviteRes = await request.post('/user/user/getInvite', {
-              invite_code: oldInviteCode
-            });
-            
-            console.log('获取邀请人信息结果:', inviteRes);
-            
-            if (inviteRes && inviteRes.code === 200 && inviteRes.data && inviteRes.data.account) {
-              const fullInviterInfo = inviteRes.data;
-              
-              // 强制填充
-              this.formData.invite_code_other = oldInviteCode;
-              this.hasExistingInviter = true;       // 控制输入框禁用
-              this.hasAutoReplacedInvite = true;
-              this.inviteCodeError = false;
-              this.inviterInfo = fullInviterInfo;
-              this.currentValidatingCode = oldInviteCode;
-              this.existingInviterInfo = fullInviterInfo;
-              
-              // 保存状态
-              this.saveInviteStateToLocal();
-              this.saveFormDataToLocal();
-              
-              // 不在页面加载时弹窗，改为在提交申请时弹窗
-              return true;
-            } else {
-              console.error('获取邀请人信息失败，邀请码可能无效');
-            }
-          } else {
-            console.log('接口返回成功但无邀请码数据');
-          }
-        } else {
-          console.log('查询已有邀请码接口异常:', res?.msg);
-        }
-      } catch (error) {
-        console.error('强制替换邀请人失败:', error);
-      }
-      return false;
-    },
-    
-    // 显示已有邀请人确认弹窗（复用原有方法，但内容更准确）
-    showExistingInviteTipPopup() {
-      this.$nextTick(() => {
-        if (this.$refs.existingInvitePopup) {
-          this.$refs.existingInvitePopup.open();
-        } else {
-          uni.showModal({
-            title: '请确认邀请信息',
-            content: `邀请码：${this.existingInviterInfo?.invite_code}\n邀请人：${this.existingInviterInfo?.name || this.existingInviterInfo?.nick_name}`,
-            confirmText: '确认',
-            cancelText: '关闭',
-            success: (res) => {
-              if (res.confirm) {
-                this.useExistingInviteCode();
-              } else {
-                // 用户关闭弹窗：清空邀请码，允许手动输入（与铁军端行为一致）
-                this.formData.invite_code_other = '';
-                this.hasExistingInviter = false;
-                this.hasAutoReplacedInvite = false;
-                this.inviterInfo = null;
-                this.existingInviterInfo = null;
-                this.saveFormDataToLocal();
-              }
-            }
-          });
-        }
-      });
-    },
-    
-    // 确认使用已有邀请码（用户点击确认）
-    useExistingInviteCode() {
-      if (this.existingInviterInfo) {
-        // 保存邀请码状态
-        const inviteState = {
-          inviterInfo: this.existingInviterInfo,
-          inviteCodeError: false,
-          currentValidatingCode: this.existingInviterInfo.invite_code
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        this.saveFormDataToLocal();
-      }
-      this.hideExistingInviteTipPopup();
-      
-      // 执行提交回调
-      if (this.submitCallback) {
-        this.submitCallback();
-        this.submitCallback = null;
-      }
-    },
-    
-    // 隐藏已有邀请人确认弹窗
-    hideExistingInviteTipPopup() {
-      if (this.$refs.existingInvitePopup) {
-        this.$refs.existingInvitePopup.close();
-      }
-    },
-    
-    // 取消邀请码确认
-    cancelInviteConfirm() {
-      // 关闭弹窗
-      this.hideExistingInviteTipPopup();
-    },
-    
-    // 显示邀请码确认弹窗
-    showInviteConfirmPopup(inviterData) {
-      this.$nextTick(() => {
-        // 使用 existingInvitePopup 组件显示确认弹窗
-        if (this.$refs.existingInvitePopup) {
-          // 将邀请人信息存入 existingInviterInfo 以便弹窗显示
-          this.existingInviterInfo = inviterData;
-          this.$refs.existingInvitePopup.open();
-        } else {
-          // 降级方案
-          uni.showModal({
-            title: '请确认邀请信息',
-            content: `邀请码：${inviterData?.invite_code}\n邀请人：${inviterData?.name || inviterData?.nick_name}`,
-            confirmText: '确认',
-            cancelText: '取消',
-            success: (res) => {
-              if (res.confirm) {
-                // 确认使用该邀请码
-                this.saveInviteStateToLocal();
-              } else {
-                // 取消，清空邀请码
-                this.formData.invite_code_other = '';
-                this.inviterInfo = null;
-                this.inviteCodeError = false;
-                this.saveInviteStateToLocal();
-              }
-            }
-          });
-        }
-      });
-    },
-    
-    // 提交申请前确认邀请码（供父组件调用）
-    confirmInviteCodeBeforeSubmit(callback) {
-      this.submitCallback = callback;
-      
-      // 如果邀请码是13131313，显示确认弹窗，邀请人显示为"暂无邀请人"
-      if (this.formData.invite_code_other === '13131313') {
-        this.showInviteConfirmPopup({ invite_code: '13131313', name: '暂无邀请人' });
-      } else if (this.inviterInfo && this.formData.invite_code_other) {
-        // 如果有已验证的邀请人信息，显示确认弹窗
-        this.showInviteConfirmPopup(this.inviterInfo);
-      } else {
-        // 没有邀请码或未验证，直接提交
-        if (this.submitCallback) {
-          this.submitCallback();
-        }
-      }
-    },
-    
-    // 获取用户信息（含手机号）
-    getUserInfo() {
-      return request.post('/sj/User/getUser').then(result => {
-        this.userId = result.data.id;
-        // 获取手机号（根据实际接口字段调整）
-        this.userMobile = result.data.mobile || result.data.account;
-        if (this.userMobile) {
-          getApp().globalData.userMobile = this.userMobile;
-        }
-        console.log('用户ID获取成功:', this.userId, '手机号:', this.userMobile);
-      }).catch(err => {
-        console.error('获取用户信息失败:', err);
-      });
-    },
-    
-    // 从本地存储加载邀请码验证状态
-    loadInviteStateFromLocal() {
-      try {
-        const inviteState = uni.getStorageSync('store_invite_state');
-        if (inviteState) {
-          console.log('加载邀请码验证状态:', inviteState);
-          
-          // 恢复邀请码验证状态
-          this.inviterInfo = inviteState.inviterInfo || null;
-          this.inviteCodeError = inviteState.inviteCodeError || false;
-          this.currentValidatingCode = inviteState.currentValidatingCode || '';
-          
-          // 特殊处理：如果当前邀请码是13131313，确保状态正确
-          if (this.formData.invite_code_other === '13131313') {
-            console.log('检测到特殊邀请码13131313，重置验证状态');
-            this.inviteCodeError = false;
-            this.inviterInfo = null;
-            this.currentValidatingCode = '13131313';
-          }
-          
-          // 如果正在验证的邀请码与当前表单中的一致，保持验证状态
-          if (this.currentValidatingCode === this.formData.invite_code_other) {
-            // 状态已恢复，无需额外操作
-          } else {
-            // 如果不一致，重新验证
-            if (this.formData.invite_code_other && this.formData.invite_code_other.trim() !== '') {
-              console.log('邀请码不一致，重新验证:', this.formData.invite_code_other);
-              this.handleInviteCodeInput({ detail: { value: this.formData.invite_code_other } });
-            }
-          }
-        } else {
-          // 如果没有保存的状态，重置为初始状态
-          this.resetInviteCodeState();
-        }
-      } catch (e) {
-        console.log('加载邀请码验证状态失败:', e);
-        this.resetInviteCodeState();
-      }
-    },
-
-    // 新增方法：重置邀请码状态
-    resetInviteCodeState() {
-      this.inviteCodeValidating = false;
-      this.inviteCodeError = false;
-      this.inviterInfo = null;
-      this.currentValidatingCode = '';
-      this.shakeInviteError = false;
-    },
-
-    // 新增方法：专门保存邀请码验证状态
-    saveInviteStateToLocal() {
-      try {
-        const inviteState = {
-          inviterInfo: this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode || this.formData.invite_code_other || ''
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        
-        console.log('邀请码验证状态已保存:', {
-          hasInviterInfo: !!this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode
-        });
-      } catch (e) {
-        console.log('保存邀请码验证状态失败:', e);
-      }
-    },
-    
-    // 触发邀请码错误抖动效果
-    triggerInviteErrorShake() {
-      // 触发抖动效果
-      this.shakeInviteError = true;
-      
-      // 滚动到邀请码容器位置
-      this.$nextTick(() => {
-        // 使用uni.createSelectorQuery获取邀请码容器的位置
-        const query = uni.createSelectorQuery().in(this);
-        query.select('.invite-code-container').boundingClientRect((rect) => {
-          if (rect) {
-            // 获取当前窗口高度
-            const windowHeight = uni.getSystemInfoSync().windowHeight;
-            
-            // 判断邀请码容器是否已经在可视区域内
-            // 计算容器在屏幕中的位置比例（0-1之间）
-            const containerTopRatio = rect.top / windowHeight;
-            const containerBottomRatio = (rect.top + rect.height) / windowHeight;
-            
-            // 如果容器已经在屏幕中上部（顶部在屏幕中间以上），就不需要滚动
-            // 或者容器整体都在屏幕内，也不需要滚动
-            if (containerTopRatio >= 0 && containerTopRatio < 0.7 && 
-                containerBottomRatio <= 1) {
-              console.log('邀请码容器已在可视区域内，不需要滚动');
-              return;
-            }
-            
-            // 滚动到邀请码容器位置，减去一些偏移量让用户体验更好
-            uni.pageScrollTo({
-              scrollTop: rect.top - 50,
-              duration: 300
-            });
-          }
-        }).exec();
-      });
-
-      // 0.5秒后重置抖动状态
-      setTimeout(() => {
-        this.shakeInviteError = false;
-      }, 500);
-    },
-    
-    // 处理邀请码输入
-    handleInviteCodeInput(e) {
-      // 如果已经被强制替换为已有邀请人，禁止任何手动修改
-      if (this.hasAutoReplacedInvite) {
-        console.log('已强制使用原邀请人，禁止修改邀请码');
-        this.formData.invite_code_other = this.inviterInfo ? this.inviterInfo.invite_code : '';
-        return;
-      }
-      
-      const code = e.detail ? e.detail.value : this.formData.invite_code_other;
-      
-      console.log('邀请码输入:', code);
-      
-      // 立即重置状态
-      this.inviteCodeValidating = false;
-      this.inviteCodeError = false;
-      this.inviterInfo = null;
-      
-      // 如果邀请码为空，不进行验证
-      if (!code || code.trim() === '') {
-        this.formData.invite_code_other = '';
-        this.saveFormDataToLocalDebounce();
-        // 保存空状态
-        this.saveInviteStateToLocal();
-        return;
-      }
-      
-      this.formData.invite_code_other = code;
-      this.saveFormDataToLocalDebounce();
-      
-      // 【关键修复】如果是13131313，立即通过验证并取消任何正在进行的验证
-      if (code === '13131313') {
-        console.log('检测到特殊邀请码13131313，立即通过');
-        
-        // 清除任何可能的定时器
-        if (this.inviteValidationTimer) {
-          clearTimeout(this.inviteValidationTimer);
-          this.inviteValidationTimer = null;
-        }
-        
-        // 立即更新状态
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = false;
-        this.inviterInfo = null;
-        this.currentValidatingCode = code;
-        
-        // 特殊邀请码也需要保存状态
-        const inviteState = {
-          inviterInfo: null,
-          inviteCodeError: false,
-          currentValidatingCode: code
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        
-        // 强制更新视图
-        this.$forceUpdate();
-        return;
-      }
-      
-      // 记录当前正在验证的邀请码
-      this.currentValidatingCode = code;
-      
-      // 立即保存状态（验证中）
-      this.saveInviteStateToLocal();
-      
-      // 清除之前的定时器
-      if (this.inviteValidationTimer) {
-        clearTimeout(this.inviteValidationTimer);
-        this.inviteValidationTimer = null;
-      }
-      
-      // 设置新的定时器
-      this.inviteValidationTimer = setTimeout(() => {
-        // 检查邀请码是否变化
-        if (this.formData.invite_code_other !== this.currentValidatingCode) {
-          console.log('邀请码已变化，取消验证');
-          return;
-        }
-        
-        // 再次检查是否是13131313（双重检查）
-        if (this.formData.invite_code_other === '13131313') {
-          console.log('双重检查：检测到特殊邀请码13131313');
-          this.inviteCodeValidating = false;
-          this.inviteCodeError = false;
-          this.inviterInfo = null;
-          this.currentValidatingCode = '13131313';
-          
-          const inviteState = {
-            inviterInfo: null,
-            inviteCodeError: false,
-            currentValidatingCode: '13131313'
-          };
-          uni.setStorageSync('store_invite_state', inviteState);
-          return;
-        }
-        
-        console.log('开始验证邀请码:', this.formData.invite_code_other);
-        this.validateInviteCode(this.formData.invite_code_other);
-        
-        // 清理定时器
-        this.inviteValidationTimer = null;
-      }, 600); // 适当增加延迟时间
-    },
-    
-    // 验证邀请码
-    async validateInviteCode(code) {
-      console.log('开始验证邀请码:', code);
-
-      // 特殊邀请码13131313直接通过
-      if (code === '13131313') {
-        console.log('特殊邀请码13131313，直接通过');
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = false;
-        this.inviterInfo = null;
-        this.currentValidatingCode = code;
-        // 特殊邀请码也需要保存状态
-        const inviteState = {
-          inviterInfo: null,
-          inviteCodeError: false,
-          currentValidatingCode: code
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-
-        // 强制更新视图
-        this.$forceUpdate();
-        return;
-      }
-      
-      // 如果邀请码为空
-      if (!code || code.trim() === '') {
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = false;
-        this.inviterInfo = null;
-        this.currentValidatingCode = '';
-        const inviteState = {
-          inviterInfo: null,
-          inviteCodeError: false,
-          currentValidatingCode: ''
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        return;
-      }
-      
-      // 设置验证中状态
-      this.inviteCodeValidating = true;
-      this.inviteCodeError = false;
-      this.inviterInfo = null;
-      this.currentValidatingCode = code;
-      
-      try {
-        // 调用接口验证邀请码
-        const response = await request.post('/user/user/getInvite', {
-          invite_code: code
-        });
-        
-        console.log('邀请码验证响应:', response);
-        
-        // 验证完成
-        this.inviteCodeValidating = false;
-        
-        if (response && response.code === 200 && response.data) {
-          const userData = response.data;
-
-          //检查返回的数据是否有效
-          if (userData.account) {
-              // 邀请码有效，保存邀请人信息
-              this.inviterInfo = userData;
-              this.inviteCodeError = false;
-              console.log('邀请码验证通过，邀请人:', userData);
-              
-              // 不在输入时弹窗，改为在提交申请时弹窗
-          } else {
-              // 接口返回数据但没有account字段，说明不是有效邀请人
-              console.log('接口返回数据无效，没有account字段:', userData);
-              this.inviterInfo = null;
-              this.inviteCodeError = true;
-          }
-        } else {
-          // 接口返回错误或数据为空
-          console.log('接口返回错误:', response?.msg || '未知错误');
-          this.inviterInfo = null;
-          this.inviteCodeError = true;
-        }
-      } catch (error) {
-        console.error('验证邀请码失败:', error);
-        this.inviteCodeValidating = false;
-        this.inviteCodeError = true;
-        this.inviterInfo = null;
-      } finally {
-        // 无论成功失败都保存状态
-        const inviteState = {
-          inviterInfo: this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-      }
-    },
-    
-    // 从本地存储加载数据
-    loadFormDataFromLocal() {
-      try {
-        const stored = uni.getStorageSync('store_info_form_data');
-        if (stored) {
-          console.log('从本地存储加载门店数据:', stored);
-          
-          // 同时加载邀请码验证状态
-          const inviteState = uni.getStorageSync('store_invite_state');
-          if (inviteState) {
-            this.inviterInfo = inviteState.inviterInfo;
-            this.inviteCodeError = inviteState.inviteCodeError || false;
-            this.currentValidatingCode = inviteState.currentValidatingCode || '';
-            console.log('加载邀请码验证状态:', inviteState);
-          }
-          
-          return stored;
-        }
-      } catch (e) {
-        console.log('读取门店数据失败:', e);
-      }
-      return null;
-    },
-    
-    // 保存数据到本地存储
-    saveFormDataToLocal() {
-      try {
-        uni.setStorageSync('store_info_form_data', this.formData);
-
-        // 同时保存邀请码验证状态
-        const inviteState = {
-          inviterInfo: this.inviterInfo,
-          inviteCodeError: this.inviteCodeError,
-          currentValidatingCode: this.currentValidatingCode
-        };
-        uni.setStorageSync('store_invite_state', inviteState);
-        console.log('门店数据已保存到本地存储');
-      } catch (e) {
-        console.log('保存门店数据失败:', e);
-      }
-    },
-    
-    // 防抖保存
-    saveFormDataToLocalDebounce() {
-      // 使用debounce函数
-      if (!this._saveDebounce) {
-        this._saveDebounce = debounce(() => {
-          this.saveFormDataToLocal();
-        }, 500);
-      }
-      this._saveDebounce();
-    },
-    
-    // 清空本地存储
-    clearFormDataLocal() {
-      try {
-        uni.removeStorageSync('store_info_form_data');
-        console.log('已清空门店数据');
-      } catch (e) {
-        console.log('清空门店数据失败:', e);
-      }
-    },
-
-    // 立即更新已选择服务技能的显示文本（不依赖 serviceList）
-    updateSelectedServicesText() {
-      if (this.formData.servers_kill && this.formData.servers_kill.length > 0) {
-        if (this.serviceList.length > 0) {
-          const selectedServices = this.serviceList
-            .filter(item => this.formData.servers_kill.includes(item.id))
-            .map(item => {
-              item.checked = true;
-              return item.title;
-            });
-          this.selectedServicesText = selectedServices.join('、');
-        } else {
-          // serviceList 还未加载，显示数量
-          this.selectedServicesText = `已选择${this.formData.servers_kill.length}项`;
-        }
-      } else {
-        this.selectedServicesText = '';
-      }
-    },
-    
-    // 立即更新所有显示文本（用于 onShow 恢复）
-    updateSelectedServicesTextImmediately() {
-      // 恢复服务技能显示文本
-      this.updateSelectedServicesText();
-      
-      // 恢复获取消息方式的显示文本
-      if (this.formData.apply_state) {
-        const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-        this.messageMethodText = methods[this.formData.apply_state - 1] || '';
-      }
-      
-      // 恢复专业经验的显示文本
-      if (this.formData.major) {
-        const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-        this.experienceText = experiences[this.formData.major - 1] || '';
-      }
-    },
-
-    // 地址相关方法 
-
-    setupAddressListener() {
-      this.addressListener = (addressData) => {
-        this.handleAddressSelected(addressData);
-      };
-      uni.$on('address-selected', this.addressListener);
-    },
-    
-    // 检查地址数据
-    checkAddressData() {
-      try {
-        const sjAddress = uni.getStorageSync('sj_selected_address');
-        if (sjAddress) {
-          this.handleAddressSelected(sjAddress);
-          uni.removeStorageSync('sj_selected_address');
-          return;
-        }
-      } catch (e) {}
-      
-      if (getApp().globalData && getApp().globalData.selectedAddress) {
-        this.handleAddressSelected(getApp().globalData.selectedAddress);
-        delete getApp().globalData.selectedAddress;
-      }
-      
-      try {
-        const storedAddress = uni.getStorageSync('selectedAddress');
-        if (storedAddress) {
-          this.handleAddressSelected(storedAddress);
-          uni.removeStorageSync('selectedAddress');
-        }
-      } catch (e) {}
-    },
-    
-    // 处理地址选择结果
-    handleAddressSelected(addressData) {
-      if (!addressData) return
-
-      // 详细地址优先取 address，不再优先取完整地址 name
-      let detailAddress = ''
-      if (addressData.address) {
-        detailAddress = String(addressData.address).trim()
-      } else if (addressData.name) {
-        detailAddress = String(addressData.name).trim()
-
-        const regionParts = []
-        if (addressData.pname) regionParts.push(addressData.pname)
-        if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData.cityname)
-        if (addressData.adname) regionParts.push(addressData.adname)
-
-        const regionText = regionParts.join('')
-        const regionTextWithDash = regionParts.join('-')
-
-        if (regionText && detailAddress.indexOf(regionText) === 0) {
-          detailAddress = detailAddress.slice(regionText.length).trim()
-        } else if (regionTextWithDash && detailAddress.indexOf(regionTextWithDash) === 0) {
-          detailAddress = detailAddress.slice(regionTextWithDash.length).trim()
-        }
-
-        detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim()
-      }
-
-      this.formData.address = detailAddress
-
-      if (addressData.location) {
-        const [longitude, latitude] = String(addressData.location).split(',')
-        this.formData.longitude = longitude || ''
-        this.formData.latitude = latitude || ''
-      }
-
-      if (addressData.pname || addressData.cityname || addressData.adname) {
-        const locationParts = []
-        if (addressData.pname) locationParts.push(addressData.pname)
-        if (addressData.cityname) locationParts.push(addressData.cityname)
-        if (addressData.adname) locationParts.push(addressData.adname)
-        this.formData.dependency = locationParts.join('-')
-      }
-
-      this.formData.dependency_province = addressData.provinceCode || ''
-      this.formData.dependency_city = addressData.cityCode || ''
-      this.formData.dependency_code = addressData.districtCode || ''
-
-      this.saveFormDataToLocal()
-      this.$forceUpdate()
-    },
-    
-    // 检查全局数据
-    checkGlobalData() {
-      if (getApp().globalData.storeInfoData) {
-        Object.assign(this.formData, getApp().globalData.storeInfoData);
-        this.saveFormDataToLocal();
-        // delete getApp().globalData.storeInfoData;
-        getApp().globalData.qualificationData = null;
-      }
-    },
-    
-    // 更新已选择服务技能的显示文本（兼容 serviceList 加载后）
-    updateSelectedServicesText() {
-      if (this.formData.servers_kill && this.formData.servers_kill.length > 0 && this.serviceList.length > 0) {
-        const selectedServices = this.serviceList
-          .filter(item => this.formData.servers_kill.includes(item.id))
-          .map(item => {
-            item.checked = true;
-            return item.title;
-          });
-        this.selectedServicesText = selectedServices.join('、');
-      }
-    },
-    
-    // 获取用户信息（原始版本，已在上方扩展）
-    // getUserInfo() 已在上方重写
-    
-    getFormData() {
-      return this.formData;
-    },
-    
-    // 预加载提示弹窗图片
-    preloadTipImages() {
-      const images = [
-        this.tipPopupBg, // 弹窗背景图片
-        'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9', // 店铺logo提示图片
-        'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'  // 店铺名称提示图片
-      ];
-      
-      console.log('开始预加载提示弹窗图片...');
-      
-      // 使用 Promise.all 确保所有图片都加载完成
-      const loadPromises = images.map(src => this.loadImage(src));
-      
-      Promise.all(loadPromises)
-        .then(() => {
-          console.log('所有提示弹窗图片预加载完成');
-          this.tipImagesPreloaded = true;
-        })
-        .catch(error => {
-          console.warn('部分图片预加载失败:', error);
-          // 即使部分图片加载失败，也设置为预加载完成，避免影响用户操作
-          this.tipImagesPreloaded = true;
-        });
-    },
-    
-    // 加载单个图片
-    loadImage(src) {
-      return new Promise((resolve, reject) => {
-        const img = new Image();
-        img.onload = () => {
-          console.log('图片加载成功:', src);
-          resolve();
-        };
-        img.onerror = () => {
-          console.warn('图片加载失败:', src);
-          reject(new Error(`图片加载失败: ${src}`));
-        };
-        img.src = src;
-      });
-    },
-    
-    // 显示提示弹窗
-    showTipPopup(field) {
-      const tipConfig = {
-        'head_photo': {
-          title: '如何查看店铺logo',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9'
-        },
-        'name': {
-          title: '如何查看店铺名称',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
-        }
-      };
-      
-      if (tipConfig[field]) {
-        this.currentTipType = field; // 设置当前类型
-        this.tipTitle = tipConfig[field].title;
-        this.tipImage = tipConfig[field].image;
-        // 等待图片预加载完成后再显示弹窗
-        if (this.tipImagesPreloaded) {
-          this.showTipPopupFlag = true;
-        } else {
-          // 如果图片还没预加载完成，立即加载当前图片
-          console.log('图片还未预加载完成，立即加载当前图片');
-          this.loadImage(this.tipImage).then(() => {
-            this.showTipPopupFlag = true;
-          }).catch(() => {
-            // 即使加载失败也显示弹窗，避免用户无法操作
-            this.showTipPopupFlag = true;
-          });
-        }
-      }
-    }, 
-    
-    // 隐藏提示弹窗
-    hideTipPopup() {
-      this.showTipPopupFlag = false;
-    },
-    
-    // 加载服务技能列表
-    async loadServiceSkills() {
-      try {
-        const res = await request.post('/sj/firstclass');
-        this.serviceList = res.data.map(item => ({
-          ...item,
-          checked: false
-        }));
-        // 加载完成后立即恢复选中状态
-        this.restoreServiceSkillsSelection();
-        // 再次更新显示文本，确保显示具体的技能名称
-        this.updateSelectedServicesText();
-      } catch (error) {
-        console.error('加载服务技能失败:', error);
-      }
-    },
-    
-    // 恢复服务技能选择状态
-    restoreServiceSkillsSelection() {
-      if (this.formData.servers_kill && this.formData.servers_kill.length > 0) {
-        this.serviceList.forEach(item => {
-          item.checked = this.formData.servers_kill.includes(item.id);
-        });
-        this.updateSelectedServicesText();
-      }
-    },
-    
-    // 选择图片
-    chooseImage(type) {
-      this.openCamera(type);
-    },
-    
-    async openCamera(type) {
-      try {
-        const chooseResult = await new Promise((resolve, reject) => {
-          uni.chooseImage({
-            count: 1,
-            sizeType: ['compressed'],
-            sourceType: ['album', 'camera'],
-            success: resolve,
-            fail: reject
-          });
-        });
-        
-        if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) {
-          return;
-        }
-        
-        const tempFilePath = chooseResult.tempFilePaths[0];
-        const file = { path: tempFilePath, size: 0 };
-        const result = await this.directUpload(file, this.userId, this.identity + 1);
-        
-        if (result) {
-          this.formData[type] = result;
-          this.saveFormDataToLocal();
-        }
-      } catch (err) {
-        console.log('上传图片错误:', err);
-      }
-    },
-    
-    // 直接上传方法
-    async directUpload(file, userId, type) {
-      try {
-        let date = new Date().getTime();
-        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
-        
-        let fileExtension = 'jpg';
-        if (file.path.includes('.')) {
-          let parts = file.path.split('.');
-          let ext = parts[parts.length - 1].toLowerCase();
-          if (ext && ext.length <= 4) {
-            fileExtension = ext;
-          }
-        }
-        
-        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
-        const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
-        
-        return await new Promise((resolve, reject) => {
-          uni.uploadFile({
-            url: ossConfig.host,
-            filePath: file.path,
-            name: 'file',
-            formData: {
-              key: ossConfig.dir + name,
-              policy: ossConfig.policy,
-              OSSAccessKeyId: ossConfig.ossAccessKeyId,
-              success_action_status: '200',
-              signature: ossConfig.signature
-            },
-            success: (res) => {
-              if (res.statusCode === 200) {
-                const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
-                resolve(fileUrl);
-              } else {
-                reject(new Error('上传失败'));
-              }
-            },
-            fail: reject
-          });
-        });
-      } catch (error) {
-        console.error('直接上传失败:', error);
-        throw error;
-      }
-    },
-    
-    // 打开时间选择器
-    openTimePicker() {
-      this.showTimePicker = true;
-    },
-    
-    // 隐藏时间选择器
-    hideTimePopup() {
-      this.showTimePicker = false;
-    },
-    
-    // 切换时间类型
-    switchTimeType(type) {
-      this.timeType = type;
-    },
-    
-    // 处理时间变化
-    handleTimeChange(e) {
-      const values = e.detail.value;
-      this.pickerValue = values;
-    },
-    
-    // 格式化时间显示
-    formatTime(time) {
-      return `${time.hour}:${time.minute}`;
-    },
-    
-    // 确认时间选择
-    confirmTime() {
-      this.formData.business_time = `${this.formatTime(this.startTime)}-${this.formatTime(this.endTime)}`;
-      this.saveFormDataToLocal();
-      this.hideTimePopup();
-    },
-    
-    // 显示服务技能弹出框
-    showServicePopup() {
-      this.showServicePopupFlag = true;
-    },
-    
-    // 隐藏服务技能弹出框
-    hideServicePopup() {
-      this.showServicePopupFlag = false;
-    },
-    
-    // 切换服务技能选择状态
-    toggleServiceSelect(index) {
-      this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
-    },
-    
-    // 确认服务技能选择
-    confirmServiceSelect() {
-      const selectedServices = this.serviceList
-        .filter(item => item.checked)
-        .map(item => item.title);
-      const selectedServicesId = this.serviceList
-        .filter(item => item.checked)
-        .map(item => item.id);
-        
-      if (selectedServices.length === 0) {
-        uni.showToast({ title: '请至少选择一个服务技能', icon: 'none' });
-        return;
-      }
-      
-      this.formData.servers_kill = selectedServicesId;
-      this.selectedServicesText = selectedServices.join('、');
-      this.saveFormDataToLocal();
-      this.hideServicePopup();
-    },
-    
-    // 显示所在地选择弹出框
-    showLocationPopup() {
-      this.showLocationPopupFlag = true;
-    },
-    
-    // 隐藏所在地选择弹出框
-    hideLocationPopup() {
-      this.showLocationPopupFlag = false;
-    },
-    
-    // 所在地选择变化
-    bindChangeLocation(e) {
-      this.locationValue = e.detail.value;
-      let index1 = e.detail.value[0] || 0;
-      let index2 = e.detail.value[1] || 0;
-      this.locatinCitys = this.ChinaCitys[index1].citys;
-      this.locationAreas = this.locatinCitys[index2].areas;
-    },
-    
-    // 确认所在地选择
-    confirmLocationSelect() {
-      let valueArr = this.locationValue;
-      let index1 = valueArr[0] || 0;
-      let index2 = valueArr[1] || 0;
-      let index3 = valueArr[2] || 0;
-      let province = this.ChinaCitys[index1].province;
-      let city = this.locatinCitys[index2].city;
-      let area = this.locationAreas[index3].area;
-      this.formData.dependency = province + '-' + city + '-' + area;
-
-      // 清空详细地址，因为所在地已经改变
-      this.formData.address = '';
-      this.formData.longitude = '';
-      this.formData.latitude = '';
-      
-      if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
-        let provinceCode = this.ChinaCitys[index1].code.toString();
-        this.formData.dependency_province = provinceCode.substring(0, 6);
-      }
-      if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
-        let cityCode = this.locatinCitys[index2].code.toString();
-        this.formData.dependency_city = cityCode.substring(0, 6);
-      }
-      if (this.locationAreas[index3] && this.locationAreas[index3].code) {
-        let areaCode = this.locationAreas[index3].code.toString();
-        this.formData.dependency_code = areaCode.substring(0, 6);
-      }
-      
-      this.saveFormDataToLocal();
-      this.hideLocationPopup();
-    },
-
-    buildRegionTextForSearch() {
-      const dependency = String(this.formData.dependency || '').trim()
-      if (!dependency) return ''
-
-      const parts = dependency.split('-')
-      const province = parts[0] || ''
-      const city = parts[1] || ''
-      const district = parts[2] || ''
-
-      let regionText = ''
-      if (province) regionText += province
-      if (city && city !== province) regionText += city
-      if (district) regionText += district
-
-      return regionText
-    },
-
-    getAddressValueForSearch() {
-      const rawAddress = String(this.formData.address || '').trim()
-      if (!rawAddress) return ''
-
-      const dependencyText = String(this.formData.dependency || '').trim()
-      const regionText = this.buildRegionTextForSearch()
-
-      let detail = rawAddress
-
-      // 兼容老数据里 address 被存成完整地址的情况
-      if (regionText && detail.indexOf(regionText) === 0) {
-        detail = detail.slice(regionText.length).trim()
-      } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
-        detail = detail.slice(dependencyText.length).trim()
-      }
-
-      detail = detail.replace(/^[\s,-]+/, '').trim()
-
-      return detail || rawAddress
-    },
-    
-    // 获取详细地址
-    getAddressInfo() {
-      this.saveFormDataToLocal()
-
-      const dependency = String(this.formData.dependency || '').trim()
-      const dependencyCode = String(this.formData.dependency_code || '').trim()
-      const address = this.getAddressValueForSearch()
-      const longitude = String(this.formData.longitude || '').trim()
-      const latitude = String(this.formData.latitude || '').trim()
-
-      const hasDependency = !!dependency
-      const hasAddress = !!address
-      const hasLocation = !!(longitude && latitude)
-
-      let params = 'source=sj_info'
-
-      // 已选所在地时，继续把地区传过去
-      if (hasDependency) {
-        params += `&dependency=${encodeURIComponent(dependency)}`
-        if (dependencyCode) {
-          params += `&dependency_code=${dependencyCode}`
-        }
-      }
-
-      // 已有详细地址时，把纯详细地址传过去，不带省市区
-      if (hasAddress) {
-        params += `&address=${encodeURIComponent(address)}`
-      }
-
-      // 已有坐标时，继续用已有坐标定位
-      if (hasLocation) {
-        params += `&longitude=${longitude}&latitude=${latitude}`
-      }
-
-      // 完全空白进入时：
-      // 已授权 -> 搜索页按当前定位初始化
-      // 未授权/拒绝 -> 搜索页静默失败后保持所在地、详细地址都为空
-      if (!hasDependency && !hasAddress && !hasLocation) {
-        params += '&init_current_location=1&silent_locate=1'
-      }
-
-      console.log('跳转URL参数:', params)
-
-      uni.navigateTo({
-        url: `/pages/address/search?${params}`
-      })
-    },
-    
-    // 打开获取消息方式选择器
-    openMessageMethodPicker() {
-      uni.showActionSheet({
-        itemList: ['朋友圈', '抖音', '地推', '朋友介绍', '微博'],
-        success: (res) => {
-          const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
-          this.formData.apply_state = res.tapIndex + 1;
-          this.messageMethodText = methods[res.tapIndex];
-          this.saveFormDataToLocal();
-        }
-      });
-    },
-    
-    // 打开专业经验选择器
-    openExperiencePicker() {
-      uni.showActionSheet({
-        itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
-        success: (res) => {
-          const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-          this.formData.major = res.tapIndex + 1;
-          this.experienceText = experiences[res.tapIndex];
-          this.saveFormDataToLocal();
-        }
-      });
-    },
-    
-    // 保存表单数据（用于提交前验证）
-    saveFormData() {
-      // 验证必填字段
-      if (!this.formData.head_photo) {
-        uni.showToast({
-          title: '请上传店铺logo',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.name) {
-        uni.showToast({
-          title: '请输入店铺名称',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.business_time) {
-        uni.showToast({
-          title: '请选择营业时间',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (this.formData.servers_kill.length === 0) {
-        uni.showToast({
-          title: '请选择服务技能',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.dependency) {
-        uni.showToast({
-          title: '请选择门店所在地',
-          icon: 'none'
-        });
-        return false;
-      }
-      if (!this.formData.address) {
-        uni.showToast({
-          title: '请选择门店详细地址',
-          icon: 'none'
-        });
-        return false;
-      }
-      // if (!this.formData.apply_state) {
-      //   uni.showToast({
-      //     title: '请选择获取消息方式',
-      //     icon: 'none'
-      //   });
-      //   return false;
-      // }
-      if (!this.formData.invite_code_other) {
-        uni.showToast({
-          title: '请输入邀请码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      // 邀请码有效性验证
-      if (this.inviteCodeValidating) {
-        uni.showToast({ title: '邀请码验证中，请稍候', icon: 'none' });
-        return false;
-      }
-      
-      // 特殊邀请码13131313直接通过
-      if (this.formData.invite_code_other === '13131313') {
-        // 直接通过
-      } else if (this.inviteCodeError || !this.inviterInfo) {
-        // 邀请码无效，触发抖动效果
-        this.triggerInviteErrorShake();
-        return false;
-      }
-      
-      if (!this.formData.major) {
-        uni.showToast({
-          title: '请选择专业经验',
-          icon: 'none'
-        });
-        return false;
-      }
-
-      // 将数据保存到全局，以便在下一步使用
-      getApp().globalData.storeInfoData = this.formData;
-      return true;
-    }
-  }
-}
-</script>
-
-
-<style scoped>
-.store-info-page {
-  /* padding: 28rpx 0; */
-}
-
-.section-title {
-  display: flex;
-  align-items: center;
-  margin-bottom: 30rpx;
-}
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 7rpx;
-  border-radius: 5rpx;
-}
-
-.section-title text {
-  font-size: 32rpx;
-  color: #1D2129;
-  font-weight: 500;
-}
-
-.box-cont {
-  background: #ffffff;
-  border-radius: 20rpx;
-  margin-bottom: 24rpx;
-  margin-left: 8rpx;
-  margin-right: 8rpx;
-  box-shadow: none;
-}
-
-.form-item {
-  padding: 24rpx;
-}
-
-.label {
-  display: block;
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
-
-.upload-box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 160rpx;
-  border-radius: 20rpx;
-}
-
-.upload-placeholder {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.upload-icon {
-  width: 120rpx;
-  height: 120rpx;
-}
-
-.upload-text {
-  font-size: 24rpx;
-  color: #999999;
-}
-
-.logo-image {
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 20rpx;
-}
-
-.form-item-one {
-  display: flex;
-  align-items: center;
-  padding: 24rpx;
-}
-
-.form-item-one-yqr {
-  flex-direction: column;
-  align-items: stretch;
-  padding: 0;
-}
-
-/* 创建内部的上半部分 */
-.invite-code-top {
-  display: flex;
-  align-items: center;
-  padding: 24rpx;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-/* 分割线 */
-.divider {
-  height: 1rpx;
-  background-color: #00000013;
-  width: 100%;
-}
-
-/* 邀请信息容器 */
-.invite-info-container {
-  padding: 20rpx 24rpx;
-  width: 100%;
-  box-sizing: border-box;
-  min-height: 60rpx;
-}
-
-.label-wrapper {
-  display: inline-flex;
-  align-items: center;
-}
-
-.label {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-  line-height: 1;
-}
-
-.label-icon {
-  width: 26rpx;
-  height: 26rpx;
-  margin-left: 8rpx;
-  align-items: center;
-}
-
-.form-item-two {
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
-		padding: 24rpx;
-	}
-
-	/* 左侧标签：固定宽度，不换行 */
-	.form-item-two > text.label {
-		flex-shrink: 0;
-		font-size: 28rpx;
-		color: #333333;
-		font-weight: 500;
-	}
-
-.input {
-  flex: 1;
-  font-size: 28rpx;
-  color: #333333;
-  text-align: right;
-}
-
-.placeholder {
-  color: #999999;
-}
-
-.picker-content {
-  display: flex;
-  align-items: center;
-}
-
-.picker-value,
-	.placeholder {
-		flex: 1;               /* 占据剩余宽度 */
-		text-align: right;     /* 文字右对齐 */
-		font-size: 28rpx;
-		word-break: break-all;
-		white-space: normal;
-		line-height: 1.4;
-	}
-
-.arrow-right {
-  width: 14rpx;
-  height: 26rpx;
-  margin-left: 16rpx;
-  flex-shrink: 0;
-}
-
-/* 邀请码相关样式 */
-.invite-tip {
-  font-size: 24rpx;
-  color: #666666;
-}
-
-.invite-validating {
-  font-size: 20rpx;
-  color: #999999;
-}
-
-.invite-error {
-  font-size: 24rpx;
-  color: #E8101E;
-}
-
-.inviter-info {
-  display: flex;
-  align-items: center;
-  font-size: 20rpx;
-}
-
-.inviter-label {
-  color: #666666;
-}
-
-.inviter-name {
-  color: #333333;
-  font-weight: 500;
-}
-
-.inviter-divider {
-  color: #666666;
-  margin: 0 5rpx;
-}
-
-.inviter-phone {
-  color: #666666;
-}
-
-/* 添加抖动动画样式 */
-@keyframes shake {
-  0%, 100% { transform: translateX(0); }
-  10%, 30%, 50%, 70%, 90% { transform: translateX(-7rpx); }
-  20%, 40%, 60%, 80% { transform: translateX(7rpx); }
-}
-
-.shake-animation {
-  animation: shake 0.5s ease-in-out;
-  color: #E8101E; /* 保持红色 */
-}
-
-/* 弹窗样式 */
-.popup {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 999;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.popup-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.popup-content {
-  position: relative;
-  background-color: #FFFFFF;
-  border-radius: 24rpx 24rpx 0 0;
-  padding: 32rpx;
-  transform: translateY(100%);
-  transition: transform 0.3s ease;
-}
-
-.popup.show .popup-content {
-  transform: translateY(0);
-}
-
-.popup-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 20rpx;
-}
-
-.popup-title {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.popup-close {
-  font-size: 40rpx;
-  color: #999999;
-  padding: 16rpx;
-}
-
-.popup-body {
-  max-height: 600rpx;
-  overflow-y: auto;
-}
-
-.checkbox-list {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.checkbox-item {
-  width: 50%;
-  padding: 14rpx;
-  display: flex;
-  align-items: center;
-}
-
-.checkbox {
-  width: 40rpx;
-  height: 40rpx;
-  border: 2rpx solid #DDDDDD;
-  border-radius: 8rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 16rpx;
-}
-
-.checkbox.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
-}
-
-.check-icon {
-  width: 42rpx;
-  height: 42rpx;
-}
-
-.checkbox-label {
-  font-size: 28rpx;
-  color: #333333;
-}
-
-.popup-footer {
-  display: flex;
-  margin-top: 32rpx;
-}
-
-.popup-btn {
-  flex: 1;
-  height: 88rpx;
-  border-radius: 44rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin: 0 16rpx;
-}
-
-.popup-btn.cancel {
-  background-color: #F5F5F5;
-}
-
-.popup-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-}
-
-.popup-btn .btn-text {
-  font-size: 32rpx;
-  font-weight: 500;
-}
-
-.popup-btn.cancel .btn-text {
-  color: #666666;
-}
-
-.popup-btn.confirm .btn-text {
-  color: #FFFFFF;
-}
-
-.region-body {
-  height: 400rpx;
-}
-
-.picker-scroll {
-  height: 400rpx;
-}
-
-.picker-item {
-  height: 68rpx;
-  line-height: 68rpx;
-  text-align: center;
-}
-
-/* 时间选择器样式 */
-.cancel-text {
-  font-size: 32rpx;
-  color: #666666;
-}
-
-.confirm-text {
-  font-size: 32rpx;
-  color: #E8101E;
-  font-weight: 500;
-}
-
-.time-range {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 32rpx;
-  background: #F8F9FC;
-}
-
-.time-block {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  background: #FFFFFF;
-  border-radius: 12rpx;
-  padding: 24rpx 0;
-  transition: all 0.3s ease;
-}
-
-.time-block.active {
-  background: #ECF2FF;
-}
-
-.time-label {
-  font-size: 26rpx;
-  color: #999999;
-  margin-top: 8rpx;
-}
-
-.time-value {
-  font-size: 40rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.time-block.active .time-value {
-  color: #E8101E;
-}
-
-.time-separator {
-  font-size: 28rpx;
-  color: #999999;
-  margin: 0 24rpx;
-}
-
-/* 提示弹窗样式 */
-.tip-popup {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 1000;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
-}
-
-.tip-popup.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.tip-popup-mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.tip-popup-content {
-  position: relative;
-  width: 620rpx;
-  height: 810rpx;
-}
-
-.tip-popup-bg {
-  width: 620rpx;
-  height: 810rpx;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.tip-popup-body {
-  position: relative;
-  flex-direction: column;
-  padding: 80rpx 20rpx 40rpx 20rpx;
-  box-sizing: border-box;
-}
-
-.tip-title {
-  font-size: 36rpx;
-  font-weight: bold;
-  color: #333;
-  text-align: center;
-  margin-top: 107rpx;
-  margin-bottom: 37rpx;
-}
-
-.tip-image-container {
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 50rpx;
-}
-
-.tip-image {
-  width: 627rpx;
-  height: 327rpx;
-  margin-left: 13rpx; 
-}
-
-/* 店铺logo图片的特殊样式 */
-.tip-image.head_photo {
-  width: 582rpx;
-  height: 327rpx;
-  margin-right: 0;
-  margin-left: -15rpx;
-}
-
-/* 店铺名称图片的特殊样式 */
-.tip-image.store_name {
-  width: 627rpx;
-  height: 327rpx;
-  margin-left: 13rpx;
-}
-
-.tip-buttons {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 28rpx;
-}
-
-.tip-btn {
-  width: 250rpx;
-  height: 80rpx;
-  border-radius: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 32rpx;
-  font-weight: 500;
-}
-
-.tip-btn.cancel {
-  border: #E8101E 2rpx solid;
-  background-color: transparent;
-  color: #e8101e;
-}
-
-.tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-  color: #FFFFFF;
-}
-
-.tip-btn .btn-text {
-  color: inherit;
-}
-
-/* 邀请码确认弹窗样式 */
-.invite-popup-content {
-  width: 571rpx;
-  height: 535rpx;
-  background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6f130301-f3df-467c-8a1c-dc49f85e5295.png');
-  background-size: cover;
-  background-position: center;
-  border-radius: 30rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 40rpx;
-  box-sizing: border-box;
-}
-
-.invite-popup-header {
-  width: 100%;
-  text-align: center;
-  margin-bottom: 40rpx;
-}
-
-.invite-popup-title {
-  font-size: 36rpx;
-  font-weight: 500;
-  color: #333333;
-}
-
-.invite-popup-body {
-  flex: 1;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  gap: 24rpx;
-  margin-top: 20rpx;
-}
-
-.invite-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 20rpx;
-  background-color: rgba(255, 255, 255, 0.9);
-  border-radius: 16rpx;
-}
-
-.invite-label {
-  font-size: 28rpx;
-  color: #666666;
-}
-
-.invite-value {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.invite-popup-footer {
-  width: 100%;
-  display: flex;
-  gap: 20rpx;
-  margin-top: 40rpx;
-}
-
-.invite-btn {
-  flex: 1;
-  height: 88rpx;
-  border-radius: 44rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 32rpx;
-  font-weight: 500;
-  margin: 0 5rpx;
-}
-
-.invite-btn.cancel {
-  background-color: #FFFFFF;
-  color: #FC437C;
-  border: 2rpx solid #FC437C;
-}
-
-.invite-btn.confirm {
-  background: linear-gradient(90deg, #FC437C 0%, #FF618F 100%);
-  color: #FFFFFF;
-}
-
-/* 输入框禁用样式 */
-.input:disabled {
-  color: #999999;
-  background-color: #F5F5F5;
-}
+		<text class="label" style="margin-top: 30rpx;">其他资质</text>
+		  <view class="image-list">
+		    <view class="image-item" v-for="(img, index) in formData.other_qualifications" :key="'other-' + index">
+		      <image :src="img" mode="aspectFill" class="qualification-image"></image>
+		      <view class="image-delete" @click="removeImage('other_qualifications', index)">×</view>
+		    </view>
+		    <view class="image-add" @click="chooseMultiImage('other_qualifications')"
+		      v-if="formData.other_qualifications.length < 9">
+		      <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png" mode="aspectFit" class="upload-icon-small"></image>
+		      <text class="add-text">添加照片</text>
+		    </view>
+		  </view>
+		</view>
+      </view>
+
+    <view class="popup" :class="{ show: showRegionPopupFlag }">
+      <view class="popup-mask" @click="hideRegionPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择注册地区</text>
+          <text class="popup-close" @click="hideRegionPopup">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view @change="bindChangeRegion" class="picker-scroll" :indicator-style="indicatorStyle"
+            :value="regionValue">
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
+                {{ item.province }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in regionCitys" :key="index">
+                {{ item.city }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in regionAreas" :key="index">
+                {{ item.area }}
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideRegionPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmRegionSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="popup" :class="{ show: showDatePickerFlag }">
+      <view class="popup-mask" @click="hideDatePicker"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">{{ currentPickerType === 'start' ? '选择开始日期' : '选择结束日期' }}</text>
+          <text class="popup-close" @click="hideDatePicker">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view :value="datePickerValue" @change="bindDateChange" class="picker-scroll"
+            :indicator-style="indicatorStyle">
+            <picker-view-column>
+              <view class="picker-item" v-for="(year, index) in years" :key="index">
+                {{ year }}年
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(month, index) in months" :key="index">
+                {{ month }}月
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(day, index) in days" :key="index">
+                {{ day }}日
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideDatePicker">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmDateSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import ChinaCitys from '../../static/data/ChinaCitys.json';
+import {
+  debounce
+} from '@/utils/debounce.js';
+
+export default {
+  data() {
+    const loadedData = this.loadFormDataFromLocal();
+
+    return {
+      formData: loadedData || {
+        business_license: '',
+        household_type: '',
+        license_number: '',
+        business_name: '',
+        register_region: '',
+        register_address: '',
+        register_province: '',
+        register_city: '',
+        register_area: '',
+        id_card_front: '',
+        id_card_back: '',
+        legal_person: '',
+        legal_phone: '',
+        legal_id_number: '',
+        legal_idcard_expiry_type: 'permanent',
+        idcard_start_date: '',
+        idcard_end_date: '',
+        industry_qualifications: [],
+        other_qualifications: []
+      },
+      ChinaCitys: ChinaCitys,
+      regionCitys: [],
+      regionAreas: [],
+      regionValue: [0, 0, 0],
+      showRegionPopupFlag: false,
+      showDatePickerFlag: false,
+      currentPickerType: 'start',
+      datePickerValue: [0, 0, 0],
+      indicatorStyle: 'height: 68rpx;',
+      userId: null,
+      identity: 3
+    }
+  },
+
+  computed: {
+    years() {
+      return Array.from({
+        length: 50
+      }, (_, i) => 2020 + i);
+    },
+    months() {
+      return Array.from({
+        length: 12
+      }, (_, i) => i + 1);
+    },
+    days() {
+      return Array.from({
+        length: 31
+      }, (_, i) => i + 1);
+    }
+  },
+
+  async mounted() {
+    await this.getUserInfo();
+    this.regionCitys = this.ChinaCitys[0].citys;
+    this.regionAreas = this.regionCitys[0].areas;
+  },
+
+  methods: {
+    getUserInfo() {
+      return request.post('/sj/User/getUser').then(result => {
+        this.userId = result.data.id;
+      }).catch(err => {
+        console.error('获取用户信息失败:', err);
+      });
+    },
+
+    loadFormDataFromLocal() {
+      try {
+        const stored = uni.getStorageSync('sj_info_form_data');
+        if (stored) return stored;
+      } catch (e) { }
+      return null;
+    },
+
+    saveFormDataToLocal() {
+      try {
+        uni.setStorageSync('sj_info_form_data', this.formData);
+      } catch (e) { }
+    },
+
+    saveFormDataToLocalDebounce() {
+      if (!this._saveDebounce) {
+        this._saveDebounce = debounce(() => {
+          this.saveFormDataToLocal();
+        }, 500);
+      }
+      this._saveDebounce();
+    },
+
+    chooseImage(type) {
+      uni.chooseImage({
+        count: 1,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: async (res) => {
+          if (!res.tempFilePaths || res.tempFilePaths.length === 0) return;
+          const tempFilePath = res.tempFilePaths[0];
+          const file = {
+            path: tempFilePath,
+            size: 0
+          };
+          const url = await this.directUpload(file, this.userId, 3);
+          if (url) {
+            this.$set(this.formData, type, url);
+            this.saveFormDataToLocal();
+          }
+        }
+      });
+    },
+
+    chooseMultiImage(type) {
+      const current = this.formData[type] || [];
+      const remaining = 9 - current.length;
+      if (remaining <= 0) {
+        uni.showToast({
+          title: '最多上传9张图片',
+          icon: 'none'
+        });
+        return;
+      }
+      uni.chooseImage({
+        count: remaining,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: async (res) => {
+          if (!res.tempFilePaths || res.tempFilePaths.length === 0) return;
+          uni.showLoading({
+            title: '上传中...'
+          });
+          for (const tempFilePath of res.tempFilePaths) {
+            const file = {
+              path: tempFilePath,
+              size: 0
+            };
+            try {
+              const url = await this.directUpload(file, this.userId, 3);
+              if (url) {
+                current.push(url);
+              }
+            } catch (e) {
+              console.error('上传失败:', e);
+            }
+          }
+          this.$set(this.formData, type, current);
+          this.saveFormDataToLocal();
+          uni.hideLoading();
+        }
+      });
+    },
+
+    removeImage(type, index) {
+      const list = [...this.formData[type]];
+      list.splice(index, 1);
+      this.$set(this.formData, type, list);
+      this.saveFormDataToLocal();
+    },
+
+    async directUpload(file, userId, type) {
+      try {
+        let date = new Date().getTime();
+        let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
+        let fileExtension = 'jpg';
+        if (file.path.includes('.')) {
+          let parts = file.path.split('.');
+          let ext = parts[parts.length - 1].toLowerCase();
+          if (ext && ext.length <= 4) fileExtension = ext;
+        }
+        let name = `${userId}_${artisan}_${date}.${fileExtension}`;
+        const ossConfig = await request.post('/user/getalioss', {
+          type: type,
+          kind: 1
+        });
+        return await new Promise((resolve, reject) => {
+          uni.uploadFile({
+            url: ossConfig.host,
+            filePath: file.path,
+            name: 'file',
+            formData: {
+              key: ossConfig.dir + name,
+              policy: ossConfig.policy,
+              OSSAccessKeyId: ossConfig.ossAccessKeyId,
+              success_action_status: '200',
+              signature: ossConfig.signature
+            },
+            success: (res) => {
+              if (res.statusCode === 200) {
+                resolve(`${ossConfig.host}/${ossConfig.dir}${name}`);
+              } else {
+                reject(new Error('上传失败'));
+              }
+            },
+            fail: reject
+          });
+        });
+      } catch (error) {
+        console.error('上传失败:', error);
+        throw error;
+      }
+    },
+
+    showRegionPicker() {
+      this.showRegionPopupFlag = true;
+    },
+
+    hideRegionPopup() {
+      this.showRegionPopupFlag = false;
+    },
+
+    bindChangeRegion(e) {
+      this.regionValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.regionCitys = this.ChinaCitys[index1].citys;
+      this.regionAreas = this.regionCitys[index2].areas;
+    },
+
+    confirmRegionSelect() {
+      let valueArr = this.regionValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+      let province = this.ChinaCitys[index1].province;
+      let city = this.regionCitys[index2].city;
+      let area = this.regionAreas[index3].area;
+      this.formData.register_region = province + '-' + city + '-' + area;
+      this.formData.register_province = this.ChinaCitys[index1].code ? this.ChinaCitys[index1].code.toString()
+        .substring(0, 6) : '';
+      this.formData.register_city = this.regionCitys[index2].code ? this.regionCitys[index2].code.toString()
+        .substring(0, 6) : '';
+      this.formData.register_area = this.regionAreas[index3].code ? this.regionAreas[index3].code.toString()
+        .substring(0, 6) : '';
+      this.saveFormDataToLocal();
+      this.hideRegionPopup();
+    },
+
+    showHouseholdTypePicker() {
+      this.showRegionPopupFlag = true;
+    },
+
+    hideRegionPopup() {
+      this.showRegionPopupFlag = false;
+    },
+
+    setIdcardExpiryType(type) {
+      this.$set(this.formData, 'legal_idcard_expiry_type', type);
+      if (type === 'permanent') {
+        this.formData.idcard_end_date = '长久有效';
+      } else {
+        if (this.formData.idcard_end_date === '长久有效') {
+          this.formData.idcard_end_date = '';
+        }
+      }
+      this.saveFormDataToLocal();
+    },
+
+    showDatePicker(type) {
+      this.currentPickerType = type;
+      this.showDatePickerFlag = true;
+    },
+
+    hideDatePicker() {
+      this.showDatePickerFlag = false;
+    },
+
+    bindDateChange(e) {
+      this.datePickerValue = e.detail.value;
+    },
+
+    confirmDateSelect() {
+      const year = this.years[this.datePickerValue[0]];
+      const month = this.months[this.datePickerValue[1]];
+      const day = this.days[this.datePickerValue[2]];
+      const dateStr = `${year}年${month < 10 ? '0' + month : month}月${day < 10 ? '0' + day : day}日`;
+      if (this.currentPickerType === 'start') {
+        this.formData.idcard_start_date = dateStr;
+      } else {
+        this.formData.idcard_end_date = dateStr;
+      }
+      this.saveFormDataToLocal();
+      this.hideDatePicker();
+    },
+
+    showTipPopup(field) { },
+
+    getFormData() {
+      return this.formData;
+    },
+
+    saveFormData() {
+      if (!this.formData.business_license) {
+        uni.showToast({
+          title: '请上传营业执照',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.household_type) {
+        uni.showToast({
+          title: '请选择户主类型',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.license_number) {
+        uni.showToast({
+          title: '请输入证件号码',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.business_name) {
+        uni.showToast({
+          title: '请输入营业名称',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.register_region) {
+        uni.showToast({
+          title: '请选择注册地区',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.register_address) {
+        uni.showToast({
+          title: '请输入注册详细地址',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.id_card_front) {
+        uni.showToast({
+          title: '请上传法人身份证正面',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.id_card_back) {
+        uni.showToast({
+          title: '请上传法人身份证反面',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_person) {
+        uni.showToast({
+          title: '请输入法人代表',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_phone) {
+        uni.showToast({
+          title: '请输入法人联系方式',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!/^1[3-9]\d{9}$/.test(this.formData.legal_phone)) {
+        uni.showToast({
+          title: '请输入正确的手机号码',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.legal_id_number) {
+        uni.showToast({
+          title: '请输入法人身份证号',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.idcard_start_date) {
+        uni.showToast({
+          title: '请选择开始日期',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.idcard_end_date) {
+        uni.showToast({
+          title: '请选择结束日期',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.industry_qualifications || this.formData.industry_qualifications.length === 0) {
+        uni.showToast({
+          title: '请上传行业资质',
+          icon: 'none'
+        });
+        return false;
+      }
+      this.saveFormDataToLocal();
+      return true;
+    }
+  }
+}
+</script>
+
+<style scoped>
+.sj-info-page {}
+
+.section {
+  margin-bottom: 30rpx;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  padding-bottom: 20rpx;
+  padding-top: 16rpx;
+}
+
+.title-bar {
+  width: 8rpx;
+  height: 32rpx;
+  background-color: #E8101E;
+  border-radius: 4rpx;
+  margin-right: 12rpx;
+}
+
+.title-text {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #1D2129;
+}
+
+.box-cont {
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  margin-bottom: 24rpx;
+  margin-left: 8rpx;
+  margin-right: 8rpx;
+  box-shadow: none;
+}
+
+.form-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+}
+
+.form-item-one {
+  display: flex;
+  flex-direction: column;
+  padding: 24rpx;
+}
+
+.form-item-two {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+}
+
+.form-item-column {
+  display: flex;
+  flex-direction: column;
+  padding: 24rpx;
+}
+
+.form-item-column .label {
+  margin-bottom: 24rpx;
+}
+
+.date-row {
+  display: flex;
+  padding: 24rpx;
+}
+
+.date-col {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.date-col:first-child {
+  margin-right: 24rpx;
+}
+
+.date-label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  margin-bottom: 16rpx;
+}
+
+.date-input-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border: 2rpx solid #E8E8E8;
+  border-radius: 12rpx;
+  padding: 0 20rpx;
+  height: 76rpx;
+}
+
+.date-value {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.date-placeholder {
+  font-size: 28rpx;
+  color: #CCCCCC;
+}
+
+.date-icon {
+  width: 36rpx;
+  height: 36rpx;
+  flex-shrink: 0;
+}
+
+.label-wrapper {
+  display: inline-flex;
+  align-items: center;
+}
+
+.label {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+  line-height: 1;
+}
+
+.label-icon {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 8rpx;
+}
+
+.label.required::before {
+  content: '*';
+  color: #E8101E;
+  margin-right: 4rpx;
+}
+
+.input {
+  font-size: 28rpx;
+  color: #333333;
+  text-align: right;
+  flex: 1;
+}
+
+.placeholder {
+  font-size: 28rpx;
+  color: #CCCCCC;
+  margin-left: -20rpx;
+}
+
+.placeholder1 {
+  text-align: center;
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.placeholder1.required::before {
+  content: '*';
+  color: #E8101E;
+  margin-right: 4rpx;
+}
+
+.picker-content {
+  display: flex;
+  align-items: center;
+  flex: 1;
+  justify-content: flex-end;
+}
+
+.picker-value {
+  font-size: 28rpx;
+  color: #333333;
+  margin-right: 8rpx;
+}
+
+.arrow-right {
+  width: 24rpx;
+  height: 24rpx;
+  flex-shrink: 0;
+}
+
+.radio-group {
+  display: flex;
+  align-items: center;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 130rpx;
+}
+
+.radio {
+  width: 30rpx;
+  height: 30rpx;
+  border: 2rpx solid #DDDDDD;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16rpx;
+}
+
+.radio.checked {
+  background-color: #E8101E;
+  border-color: #E8101E;
+}
+
+.radio-icon-image {
+  width: 32rpx;
+  height: 32rpx;
+}
+
+.radio-label {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.upload-area {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.upload-preview {
+  width: 100%;
+  height: 300rpx;
+  border-radius: 12rpx;
+  margin-bottom: 16rpx;
+}
+
+.upload-placeholder {
+  width: 100%;
+  height: 300rpx;
+  background: #F7F8FA;
+  border-radius: 12rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 16rpx;
+  border: 2rpx dashed #DDDDDD;
+}
+
+.upload-icon {
+  width: 80rpx;
+  height: 80rpx;
+}
+
+.upload-hint {
+  font-size: 24rpx;
+  /* color: #E8101E; */
+  text-align: center;
+}
+
+.upload-desc {
+  font-size: 24rpx;
+  color: #999999;
+  margin-bottom: 20rpx;
+  margin-top: 12rpx;
+}
+
+.upload-dashed {
+  width: 100%;
+  border: 2rpx dashed #DDDDDD;
+  border-radius: 16rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 30rpx;
+  margin-bottom: 16rpx;
+  background: #FAFBFC;
+}
+
+.upload-camera-img {
+  width: 446rpx;
+  height: 298rpx;
+  margin-left: 100rpx;
+}
+
+.image-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+  margin-top: 16rpx;
+}
+
+.image-item {
+  position: relative;
+  width: 200rpx;
+  height: 200rpx;
+}
+
+.qualification-image {
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 12rpx;
+}
+
+.image-delete {
+  position: absolute;
+  top: -10rpx;
+  right: -10rpx;
+  width: 36rpx;
+  height: 36rpx;
+  background: #E8101E;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #FFFFFF;
+  font-size: 28rpx;
+}
+
+.image-add {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border: 2rpx dashed #DDDDDD;
+  width: 214rpx;
+  height: 214rpx;
+  background: #F5F5F5;
+  border-radius: 20rpx;
+}
+
+.upload-icon-small {
+  width: 48rpx;
+  height: 48rpx;
+  margin-bottom: 8rpx;
+}
+
+.add-text {
+  font-size: 22rpx;
+  color: #999999;
+}
+
+.popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  visibility: hidden;
+  transition: visibility 0.3s;
+}
+
+.popup.show {
+  visibility: visible;
+}
+
+.popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx 30rpx;
+  border-bottom: 1rpx solid #F0F0F0;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333333;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999999;
+}
+
+.region-body {
+  height: 500rpx;
+}
+
+.picker-scroll {
+  width: 100%;
+  height: 100%;
+}
+
+.picker-item {
+  line-height: 68rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.popup-footer {
+  display: flex;
+  padding: 20rpx 30rpx;
+  gap: 20rpx;
+}
+
+.popup-btn {
+  flex: 1;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 12rpx;
+}
+
+.popup-btn.cancel {
+  background: #F5F5F5;
+}
+
+.popup-btn.confirm {
+  background: #E8101E;
+}
+
+.popup-btn .btn-text {
+  font-size: 28rpx;
+}
+
+.popup-btn.cancel .btn-text {
+  color: #666666;
+}
+
+.popup-btn.confirm .btn-text {
+  color: #FFFFFF;
+}
+
+.picker-list {
+  padding: 20rpx 0;
+}
+
+.picker-item-row {
+  padding: 24rpx 30rpx;
+  font-size: 28rpx;
+  color: #333333;
+  text-align: center;
+}
+
+.picker-item-row text.active {
+  color: #E8101E;
+}
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/successruzhu.vue b/pages/ruzhu/successruzhu.vue
new file mode 100644
index 0000000..f817e70
--- /dev/null
+++ b/pages/ruzhu/successruzhu.vue
@@ -0,0 +1,94 @@
+<template>
+	<view class="pages">
+		<custom-navbar title="入驻成功" :showBack="true"></custom-navbar>
+		<view class="title-icon">恭喜您！</view>
+		<!-- <view class="title-icon">{{data.residency_notice}}</view> -->
+		<view class="title-content">成功入驻成为美融融门店</view>
+		<!-- <view class="title-content">{{data.approve_notice}}</view> -->
+		<view class="erweimabox">
+			<view class="erweimab">
+				<!-- <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/26bd4004-c7aa-4997-9f31-8562060e7659.jpeg" mode="" style="width: 404rpx;height: 404rpx;"></image> -->
+				<image :src="data.photo" mode="widthFix" style="width: 404rpx;border-radius:25rpx ;margin: 37rpx 0 0 36rpx;"></image>
+			</view>
+			<view class="kefubtn">扫码联系专属客服</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+  // 核心：用 props 接收
+  props: {
+    data: {
+      type: Object, // 类型：对象
+      default: () => ({}) // 默认空对象
+    }
+  },
+  
+  onLoad() {
+    // 在 JS 里使用
+    console.log(this.data,'--------------------')
+  }
+}
+</script>
+
+<style>
+	.kefubtn{
+		height: 42rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 30rpx;
+		color: #5A5A5A;
+		line-height: 42rpx;
+		text-align: center;
+		font-style: normal;
+		margin-top: 23rpx;
+	}
+	.pages {
+		background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/467f6b5f-32dc-4ba3-847a-22be4569c45e.png');
+		background-size: 100%;
+		background-repeat: no-repeat;
+	}
+
+	.erweimab {
+		margin: 70rpx 0 0 103rpx;
+		width: 477rpx;
+		height: 477rpx;
+		background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e5461570-10e3-4e11-a6ca-8543f106639a.png');
+		background-size: 100%;
+		background-repeat: no-repeat;
+	}
+
+	.erweimabox {
+		margin: 71rpx 0 0 6rpx;
+		width: 690rpx;
+		height: 690rpx;
+		background: #FFFFFF;
+		border-radius: 62rpx;
+		border: 1rpx solid #F2F4F6;
+	}
+
+	.title-icon {
+		margin-left: 283rpx;
+		height: 67rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 48rpx;
+		color: #333333;
+		line-height: 67rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.title-content {
+		margin: 14rpx 0 0 195rpx;
+		height: 42rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 30rpx;
+		color: #666666;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+	}
+</style>
\ No newline at end of file

From 1184d73a753101a577ceb67c532c2e249e5d2c15 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 28 May 2026 13:13:45 +0800
Subject: [PATCH 051/118] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/selected-brands.vue |  2 +-
 pages/jingxuan/selected-skills.vue |  2 +-
 pages/search_common/search.vue     | 28 +++++++++++++++-------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pages/jingxuan/selected-brands.vue b/pages/jingxuan/selected-brands.vue
index 61d6d79..da57cfa 100644
--- a/pages/jingxuan/selected-brands.vue
+++ b/pages/jingxuan/selected-brands.vue
@@ -109,7 +109,7 @@ export default {
       selectedSecondIds: [],  // 抽屉里选中的分类ID
       
       // 额外筛选参数
-      orderType: 1,           
+      orderType: 0,           
       
       // 排序图标资源
       iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index 681bf30..ade02e6 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -91,7 +91,7 @@ export default {
       navHeight: 0,
       
       // 排序与筛选参数
-      orderType: 1, // 1:时间降序, 2:时间升序, 3:浏览量降序, 4:浏览量升序 (默认1)
+      orderType: 0, // 1:时间降序, 2:时间升序, 3:浏览量降序, 4:浏览量升序 (默认0)
       linkType: '', // '':全部, 1:平台课程, 2:品牌课程
       
       filterVisible: false,
diff --git a/pages/search_common/search.vue b/pages/search_common/search.vue
index 667430b..633c3d6 100644
--- a/pages/search_common/search.vue
+++ b/pages/search_common/search.vue
@@ -23,7 +23,7 @@
 
     <view class="result-container">
       
-      <view class="sort-bar" v-if="['brand', 'skill', 'collection_brand', 'collection_course'].includes(searchType)">
+      <view class="sort-bar" v-if="hasSearched && ['brand', 'skill', 'collection_brand', 'collection_course'].includes(searchType)">
         <view class="sort-item" @tap="toggleSort('time')">
           <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
           <view class="arrows">
@@ -114,8 +114,8 @@ export default {
       limit: 10,
       hasMore: true,
 
-      // 排序参数 1/2发布时间 3/4浏览量
-      orderType: 1, 
+      // 排序参数：0代表无排序(全灰)，1/2发布时间，3/4浏览量
+      orderType: 0, 
       
       // 排序图标资源
       iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
@@ -162,6 +162,7 @@ export default {
       this.hasSearched = false;
       this.page = 1;
       this.hasMore = true;
+      this.orderType = 0; // 清除搜索时重置排序
     },
 
     // 切换排序
@@ -172,7 +173,7 @@ export default {
         this.orderType = this.orderType === 3 ? 4 : 3;
       }
       
-      // 如果已经输入了关键词并搜索过，切换排序直接重新加载当前结果
+      // 切换排序直接重新加载当前结果
       if (this.hasSearched) {
         this.page = 1;
         this.hasMore = true;
@@ -184,6 +185,9 @@ export default {
       if (!this.keyword.trim()) {
         return uni.showToast({ title: '请输入搜索内容', icon: 'none' });
       }
+      
+      // 每次发起新的关键字搜索时，重置为全灰无排序状态
+      this.orderType = 0; 
       this.hasSearched = true;
       this.page = 1;
       this.hasMore = true;
@@ -197,9 +201,11 @@ export default {
         let apiUrl = '';
         let params = { page: this.page, limit: this.limit };
 
-        // 给支持排序的接口加上排序参数
+        // 仅在有排序选择时（orderType !== 0）才传入 order_type 参数
         if (['brand', 'skill', 'collection_brand', 'collection_course'].includes(this.searchType)) {
-          params.order_type = this.orderType;
+          if (this.orderType !== 0) {
+            params.order_type = this.orderType;
+          }
         }
 
         switch (this.searchType) {
@@ -231,7 +237,6 @@ export default {
         
         if (res.code === 200 && res.data) {
           const list = res.data.list || [];
-          // 文档里总数叫 count，不是 total
           const totalCount = res.data.count || 0; 
           
           let formattedList = list;
@@ -267,7 +272,6 @@ export default {
             this.resultList = [...this.resultList, ...formattedList];
           }
           
-          // 根据接口文档返回的 count 来判断是否还有更多
           this.hasMore = this.resultList.length < totalCount;
           
         } else {
@@ -300,7 +304,7 @@ export default {
 <style lang="scss" scoped>
 .search-page {
   min-height: 100vh;
-  background: #F5F5F5;
+  background: #fff;
 }
 
 .search-header {
@@ -308,7 +312,7 @@ export default {
   top: 0;
   left: 0;
   right: 0;
-  background-color: #Fff;
+  background-color: #fff;
   z-index: 999;
   
   .header-content {
@@ -364,11 +368,10 @@ export default {
   padding: 24rpx;
 }
 
-/* ================= 排序栏新增样式 ================= */
 .sort-bar {
   display: flex;
   align-items: center;
-  padding: 10rpx 0 24rpx; /* 根据结果页面适当微调顶部间距 */
+  padding: 10rpx 0 24rpx; 
   gap: 60rpx;
   
   .sort-item {
@@ -402,7 +405,6 @@ export default {
     }
   }
 }
-/* ============================================== */
 
 .loading-tips {
   text-align: center;

From 95f097f8c9787f1036d62a96a73d51733024c030 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 28 May 2026 13:32:28 +0800
Subject: [PATCH 052/118] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/selected-brands.vue | 4 ++--
 pages/jingxuan/selected-skills.vue | 2 +-
 pages/search_common/search.vue     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/jingxuan/selected-brands.vue b/pages/jingxuan/selected-brands.vue
index da57cfa..64d7d58 100644
--- a/pages/jingxuan/selected-brands.vue
+++ b/pages/jingxuan/selected-brands.vue
@@ -442,7 +442,7 @@ export default {
   align-items: center;
   padding: 0 30rpx;
   margin-bottom: 24rpx;
-  gap: 60rpx;
+  gap: 100rpx;
   
   .sort-item {
     display: flex;
@@ -468,7 +468,7 @@ export default {
       align-items: center;
       
       .arrow-icon {
-        width: 14rpx;
+        width: 13rpx;
         height: 8rpx;
         margin: 2rpx 0;
       }
diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index ade02e6..6597289 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -341,7 +341,7 @@ export default {
   .left-sorts {
     display: flex;
     align-items: center;
-    gap: 80rpx;
+    gap: 100rpx;
     
     .sort-item {
       display: flex;
diff --git a/pages/search_common/search.vue b/pages/search_common/search.vue
index 633c3d6..5499326 100644
--- a/pages/search_common/search.vue
+++ b/pages/search_common/search.vue
@@ -372,7 +372,7 @@ export default {
   display: flex;
   align-items: center;
   padding: 10rpx 0 24rpx; 
-  gap: 60rpx;
+  gap: 100rpx;
   
   .sort-item {
     display: flex;
@@ -398,7 +398,7 @@ export default {
       align-items: center;
       
       .arrow-icon {
-        width: 14rpx;
+        width: 13rpx;
         height: 8rpx;
         margin: 2rpx 0;
       }
@@ -433,8 +433,8 @@ export default {
   padding: 200rpx 0;
   
   .empty-icon {
-    width: 200rpx;
-    height: 200rpx;
+    width: 300rpx;
+    height: 300rpx;
     margin-bottom: 20rpx;
   }
   text {

From b67b581775ab490a9b7f8559380d7d76b3e8f7f6 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 28 May 2026 16:09:50 +0800
Subject: [PATCH 053/118] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/selected-skills.vue | 44 ++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index 6597289..45bb187 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -68,24 +68,26 @@
         ></skill-card>
       </view>
       
-      <view class="empty-state" v-else>
-        <image class="empty-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png"></image>
+      <view v-else>
+        <noData></noData>
       </view>
     </view>
     
     <view style="height: 60rpx;"></view>
+    
   </view>
 </template>
 
 <script>
 import request from "@/utils/request"
 import SkillCard from "@/pages/home/components/skill-card.vue" 
+import noData from "@/components/noData/noData.vue";
 
 // 数据模式开关：true=调用真实接口，false=使用模拟数据
 const USE_REAL_API = true
 
 export default {
-  components: { SkillCard },
+  components: { SkillCard, noData },
   data() {
     return {
       navHeight: 0,
@@ -170,6 +172,7 @@ export default {
       this.fetchData(true);
     },
     
+    // 获取列表数据 (统一入口)
     // 获取列表数据 (统一入口)
     async fetchData(isReset = false) {
       if (isReset) {
@@ -181,12 +184,21 @@ export default {
       if (USE_REAL_API) {
         uni.showLoading({ title: '加载中...' })
         try {
+          // 1. 初始化基础参数
           const params = {
             page: this.page,
-            limit: this.limit,
-            order_type: this.orderType
+            limit: this.limit
+          }
+          
+          // 2. 仅当 orderType 不为 0 时，才将 order_type 传给后端，避免 500 报错
+          if (this.orderType !== 0) {
+            params.order_type = this.orderType
+          }
+          
+          // 3. 课程类型筛选
+          if (this.linkType !== '') {
+            params.link_type = this.linkType
           }
-          if (this.linkType) params.link_type = this.linkType
           
           const res = await request.post('/sj/skill/list', params)
           if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
@@ -210,18 +222,20 @@ export default {
           let list = [...this.mockDatabase]
           
           // 1. 模拟筛选
-          if (this.linkType) {
+          if (this.linkType !== '') {
             list = list.filter(item => item.link_type === this.linkType)
           }
           
-          // 2. 模拟排序
-          list.sort((a, b) => {
-            if (this.orderType === 1) return b.timestamp - a.timestamp // 时间降序
-            if (this.orderType === 2) return a.timestamp - b.timestamp // 时间升序
-            if (this.orderType === 3) return b.views - a.views         // 浏览量降序
-            if (this.orderType === 4) return a.views - b.views         // 浏览量升序
-            return 0
-          })
+          // 2. 模拟排序 (仅当 orderType 不为 0 时才进行排序操作)
+          if (this.orderType !== 0) {
+            list.sort((a, b) => {
+              if (this.orderType === 1) return b.timestamp - a.timestamp // 时间降序
+              if (this.orderType === 2) return a.timestamp - b.timestamp // 时间升序
+              if (this.orderType === 3) return b.views - a.views         // 浏览量降序
+              if (this.orderType === 4) return a.views - b.views         // 浏览量升序
+              return 0
+            })
+          }
           
           // 3. 模拟分页
           const start = (this.page - 1) * this.limit

From d3ae42b664ac7df709427d09f9a2f806c2d8fbe4 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 28 May 2026 16:15:59 +0800
Subject: [PATCH 054/118] 1

---
 pages/jingxuan/selected-skills.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index 45bb187..cb9b163 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -172,7 +172,6 @@ export default {
       this.fetchData(true);
     },
     
-    // 获取列表数据 (统一入口)
     // 获取列表数据 (统一入口)
     async fetchData(isReset = false) {
       if (isReset) {

From 87fae84240cf878855f3f3b9ac9076c26b0a579f Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Fri, 29 May 2026 13:50:58 +0800
Subject: [PATCH 055/118] =?UTF-8?q?=E6=8D=A2=E5=9F=9F=E5=90=8D+=E5=93=81?=
 =?UTF-8?q?=E7=89=8C=E5=8D=A1=E7=89=87=E3=80=81=E6=8A=80=E8=83=BD=E9=9B=86?=
 =?UTF-8?q?=E5=B8=82=E7=BB=84=E4=BB=B6=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91+=E5=93=81=E7=89=8C=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                           |   12 +
 pages/home/components/brand-card.vue |   11 +-
 pages/home/components/skill-card.vue |   14 +-
 pages/jingxuan/brand-detail.vue      | 1104 ++++++++++++++++++++++++++
 utils/request.js                     |    4 +-
 5 files changed, 1136 insertions(+), 9 deletions(-)
 create mode 100644 pages/jingxuan/brand-detail.vue

diff --git a/pages.json b/pages.json
index 26b1390..08037e4 100644
--- a/pages.json
+++ b/pages.json
@@ -1007,6 +1007,18 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/jingxuan/brand-detail",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/jingxuan/skill-detail",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/ruzhu/successruzhu",
 			"style": {
diff --git a/pages/home/components/brand-card.vue b/pages/home/components/brand-card.vue
index 308ad03..894311d 100644
--- a/pages/home/components/brand-card.vue
+++ b/pages/home/components/brand-card.vue
@@ -79,8 +79,17 @@ export default {
     }
   },
   methods: {
+    // 点击品牌卡片跳转详情页
     onClick() {
-      this.$emit('click', this.item)
+      // 1. 保留 emit，方便外层如果有特殊需求可以监听到
+      this.$emit('click', this.item);
+      
+      // 2. 直接在此处处理跳转逻辑
+      if (this.item && this.item.id) {
+        uni.navigateTo({
+          url: `/pages/jingxuan/brand-detail?id=${this.item.id}`
+        });
+      }
     },
     getTagStyle(tag) {
       const len = this.tagsLength
diff --git a/pages/home/components/skill-card.vue b/pages/home/components/skill-card.vue
index 0b0ee2c..825377f 100644
--- a/pages/home/components/skill-card.vue
+++ b/pages/home/components/skill-card.vue
@@ -66,14 +66,16 @@ export default {
       return views.toString()
     },
     handleClick() {
-      // 跳转到技能/课程详情页
-      if (this.item.id) {
+      // 1. 保留 emit，方便外层如果有特殊需求可以监听到
+      this.$emit('click', this.item);
+      
+      // 2. 直接在此处处理跳转逻辑
+      if (this.item && this.item.id) {
         uni.navigateTo({
-          url: `/pages/skill/detail?id=${this.item.id}`
-        })
-      } else {
-        uni.showToast({ title: '详情页开发中', icon: 'none' })
+          url: `/pages/jingxuan/skill-detail?id=${this.item.id}`
+        });
       }
+      // 跳转到技能/课程详情页
     }
   }
 }
diff --git a/pages/jingxuan/brand-detail.vue b/pages/jingxuan/brand-detail.vue
new file mode 100644
index 0000000..e972eac
--- /dev/null
+++ b/pages/jingxuan/brand-detail.vue
@@ -0,0 +1,1104 @@
+<template>
+  <view class="brand-detail-page">
+    
+    <custom-navbar 
+      :title="info.name || '品牌详情'" 
+      :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60ae3383-6ff6-4f42-818b-d9b09a9bd0e0.png'" 
+      :showUser="true"
+      backgroundColor="#ffffff" 
+      titleColor="#333" 
+      borderBottom="none"
+      :show-headle="true"
+      :headleSrc="isCollected ? iconCollectOn : iconCollectOff" 
+      @onHeadleClick="toggleCollectStatus"
+      >
+    </custom-navbar>
+
+    <!-- 顶部导航栏扩展：动态计算位置的拨号图标 -->
+    <view class="nav-phone-wrap" :style="{ top: phoneIconTop + 'px', right: phoneIconRight + 'px' }" @click="makeCall">
+      <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c164280f-1ab9-41b4-9d60-846368364e9c.png" class="nav-phone-icon"></image>
+    </view>
+                  
+    <view class="mock-switch" @click="toggleMockData">
+      <text>{{ useMockData ? '关闭模拟数据' : '开启模拟数据' }}</text>
+    </view>
+                  
+    <view class="banner-section" v-if="bannerList && bannerList.length || info.video">
+      
+      <!-- 原生视频组件 (就地播放) -->
+      <video 
+        v-if="info.video && isVideoPlaying" 
+        id="myVideo"
+        class="banner-video" 
+        :src="info.video" 
+        autoplay 
+        controls 
+        object-fit="cover"
+      ></video>
+
+      <!-- 轮播图区域 (当视频播放时隐藏) -->
+      <swiper v-else class="banner-swiper" circular @change="onSwiperChange" :autoplay="!info.video">
+        <swiper-item v-for="(item, index) in bannerList" :key="index">
+          <image class="banner-img" :src="item" mode="aspectFill"></image>
+        </swiper-item>
+      </swiper>
+      
+      <!-- 居中的视频播放大图标 (当视频播放时隐藏) -->
+      <image 
+        v-if="info.video && !isVideoPlaying" 
+        class="center-play-icon" 
+        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb720bb0-4ada-49f6-9ce5-38abfd613d5d.png" 
+        @click="playVideoInPlace"
+      ></image>
+      
+      <!-- 视频/图片 相册切换组件 (当视频播放时隐藏) -->
+      <view class="album" v-if="(info.video || bannerList.length > 0) && !isVideoPlaying">
+        <view class="album-left" @click="info.video ? playVideoInPlace() : goAlbum()">
+          {{ info.video ? "视频" : "图片" }}
+        </view>
+        <view class="album-line"></view>
+        <view class="album-right" @click="goAlbum">
+          <view class="album-right-text">相册</view>
+          <image src="/static/images/icons/right7_13.png" class="album-right-img"></image>
+        </view>
+      </view>
+      
+      <!-- 指示器 (当视频播放时隐藏) -->
+      <view class="indicator" v-if="!isVideoPlaying && bannerList.length > 0">
+        <text>{{ currentBannerIndex + 1 }} / {{ bannerList.length }}</text>
+      </view>
+    </view>
+
+    <view class="intro-section" v-if="info.name">
+      <view class="section-title">品牌介绍</view>
+      <view class="intro-content" :class="{ 'is-expanded': isExpanded }">
+        <text class="intro-text">{{ info.detail || '暂无品牌介绍' }}</text>
+      </view>
+      <view class="expand-btn" @click="toggleExpand" v-if="info.detail && info.detail.length > 100">
+        <text class="expand-text">{{ isExpanded ? '收起查看' : '展开查看' }}</text>
+        <view class="arrow" :class="{ 'up': isExpanded }"></view>
+      </view>
+    </view>
+
+    <block v-if="showTabSection">
+      <view class="divider-bg"></view>
+      <view class="tab-section">
+        <view class="tab-header">
+          <view 
+            class="tab-item" 
+            v-for="(tab, index) in availableTabs" 
+            :key="tab.key"
+            :class="{ active: activeTab === index }"
+            @click="switchTab(index)"
+          >
+            <!-- 加上 class="tab-text" 以便控制层级 -->
+            <text class="tab-text">{{ tab.name }}</text>
+            <view v-if="activeTab === index" class="active-line"></view>
+          </view>
+        </view>
+        
+        <view class="tab-content" v-if="availableTabs[activeTab]">
+          <rich-text :nodes="availableTabs[activeTab].content"></rich-text>
+        </view>
+      </view>
+    </block>
+
+    <view class="divider-bg"></view>
+
+    <view class="form-section">
+      <!-- 动态标题：当选中学员招募时显示"立即咨询"，否则显示"在线留言" -->
+      <view class="section-title">{{ activeTabKey === 'student' ? '立即咨询' : '在线留言' }}</view>
+      
+      <view class="form-list">
+        <view class="form-item">
+          <view class="label"><text class="required">*</text>姓名</view>
+          <input class="input-el" v-model="formData.contact_name" placeholder="请输入您的姓名" placeholder-class="ph-style" />
+        </view>
+        
+        <view class="form-item">
+          <view class="label"><text class="required">*</text>手机号码</view>
+          <input class="input-el" type="number" maxlength="11" v-model="formData.contact_phone" placeholder="请输入您的手机号码" placeholder-class="ph-style" />
+        </view>
+        
+        <view class="form-item">
+          <view class="label"><text class="required">*</text>所在城市</view>
+          <!-- 替换为复用的弹窗选择器 -->
+          <view class="picker-el" @click="chooseLocation">
+            <view class="picker-value" :class="{ 'has-val': cityNameText }">
+              {{ cityNameText || '请选择省、市/区' }}
+              <view class="arrow-right"></view>
+            </view>
+          </view>
+        </view>
+        
+        <view class="form-item">
+          <view class="label"><text class="required">*</text>意向</view>
+          <picker class="picker-el" :range="intentionOptions" range-key="label" @change="onIntentionChange">
+            <view class="picker-value" :class="{ 'has-val': intentionText }">
+              {{ intentionText || '请选择您的意向' }}
+              <view class="arrow-right"></view>
+            </view>
+          </picker>
+        </view>
+        
+        <view class="form-item border-none" v-if="formData.intention === 1">
+          <view class="label"><text class="required">*</text>其他意向</view>
+          <input class="input-el" v-model="formData.intention_other" placeholder="请填写您的其他意向" placeholder-class="ph-style" />
+        </view>
+      </view>
+
+      <button class="submit-btn" :class="{ 'is-active': canSubmit }" @click="submitForm">提交</button>
+    </view>
+
+    <!-- 所在地省市区选择复用弹窗 -->
+    <view class="popup" :class="{ show: showLocationPopupFlag }">
+      <view class="popup-mask" @click="hideLocationPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择所在地</text>
+          <text class="popup-close" @click="hideLocationPopup">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view @change="bindChangeLocation"
+            class="picker-scroll"
+            :indicator-style="indicatorStyle"
+            :value="locationValue">
+            <picker-view-column>
+              <view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">{{item.province}}</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">{{item.city}}</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item,index) in locationAreas" :key="index">{{item.area}}</view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideLocationPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmLocationSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <tipsPopup2 :show="tipShow" @closePopup="closePopup" sureText="确认" @okBtn="okBtn">
+      {{ tipsText }}
+    </tipsPopup2>
+
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request";
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+import tipsPopup2 from "@/components/tips-popup/tips-popup2";
+import ChinaCitys from "@/static/data/ChinaCitys.json"; 
+
+export default {
+  components: {
+    CustomNavbar,
+    tipsPopup2 // 注册弹窗组件
+  },
+  data() {
+    return {
+      // 模拟数据开关
+      useMockData: false, 
+      
+      brandId: null, 
+      info: {},      
+      bannerList: [], 
+
+      // ====== 收藏和登录相关的状态 ======
+      isLogin: false, // 登录状态
+      tipShow: false, // 弹窗控制
+      tipsText: "",   // 弹窗提示文本
+      tipType: "",    // 弹窗类型判断
+
+      isCollected: false, // 是否已收藏
+      // 未收藏时的灰色星星
+      iconCollectOff: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/561715a5-3de0-49f3-80e4-2662febec500.png', 
+      // 已收藏时的粉色星星
+      iconCollectOn: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fe2011b0-a34d-46ee-911a-0ea6f099ad77.png',
+      // ==================================
+      
+      isVideoPlaying: false, // 是否正在就地播放视频
+      phoneIconTop: 20,      // 顶部电话图标初始Top
+      phoneIconRight: 50,    // 顶部电话图标初始Right
+      
+      currentBannerIndex: 0,
+      isExpanded: false,
+      activeTab: 0,
+      
+      // 省市区选择器相关数据
+      showLocationPopupFlag: false,
+      indicatorStyle: 'height: 68rpx;',
+      ChinaCitys: [],
+      locatinCitys: [],
+      locationAreas: [],
+      locationValue: [0, 0, 0],
+
+      formData: {
+        id: null,
+        intention: '',        
+        intention_other: '',  
+        contact_name: '',     
+        contact_phone: '',    
+        province_code: '',    
+        city_code: '',        
+        area_code: ''         
+      },
+      
+      cityNameText: '',  
+      intentionText: '', 
+      
+      intentionOptions: [
+        { value: 2, label: '品牌加盟' },
+        { value: 3, label: '购买产品' },
+        { value: 4, label: '技能学习' },
+        { value: 1, label: '其它意向' }
+      ]
+    };
+  },
+  computed: {
+    // 获取当前选中的 tab 的 key，用于判断标题
+    activeTabKey() {
+      return this.availableTabs[this.activeTab]?.key || '';
+    },
+    availableTabs() {
+      const tabs = [];
+      
+      // 处理富文本图片和小程序样式丢失的绝佳方法
+      const formatRichText = (html) => {
+        if (!html) return '<div style="color:#999;font-size:13px;text-align:center;">暂无详细说明</div>';
+        
+        let newHtml = html.replace(/<img[^>]*>/gi, function(match) {
+          match = match.replace(/style\s*=\s*["'][^"']*["']/gi, ''); 
+          return match.replace(/<img/gi, '<img style="max-width:100%; height:auto; display:block; border-radius:20rpx; margin:8px 0;"');
+        });
+        
+        newHtml = newHtml.replace(/<p[^>]*>/gi, '<p style="margin-bottom: 0px; line-height: 1.6; word-break: break-all;">');
+        return newHtml;
+      };
+
+      if (this.info.franchise_state === 1) {
+        tabs.push({
+          key: 'franchise',
+          name: '加盟商招募',
+          content: formatRichText(this.info.franchise_recruit)
+        });
+      }
+      if (this.info.student_state === 1) {
+        tabs.push({
+          key: 'student',
+          name: '学员招募',
+          content: formatRichText(this.info.student_recruit)
+        });
+      }
+      return tabs;
+    },
+    showTabSection() {
+      return this.availableTabs.length > 0;
+    },
+    canSubmit() {
+      const d = this.formData;
+      const baseValid = d.contact_name && d.contact_phone && d.province_code && d.city_code && d.area_code && d.intention;
+      if (d.intention === 1) {
+        return baseValid && d.intention_other;
+      }
+      return baseValid;
+    }
+  },
+  onLoad(options) {
+    if (options && options.id) {
+      this.brandId = parseInt(options.id, 10);
+      this.formData.id = this.brandId;
+    }
+
+    // 初始化省市区数据
+    this.ChinaCitys = ChinaCitys;
+    if (this.ChinaCitys && this.ChinaCitys.length > 0) {
+      this.locatinCitys = this.ChinaCitys[0].citys;
+      this.locationAreas = this.locatinCitys[0].areas;
+    }
+
+    this.initNavLayout();
+    this.getBrandDetails();
+  },
+  onShow() {
+    // 每次进入页面时，根据 accessToken 刷新登录状态，就像 my-page 里面写的一样
+    this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+  },
+  methods: {
+    //  弹窗组件相关方法 
+    closePopup() {
+      this.tipShow = false;
+    },
+    okBtn() {
+      if (this.tipType == "login") {
+        uni.navigateTo({
+          url: "/pages/blogPopup/blogPopup", // 你们项目真实的登录页
+        });
+      }
+      this.tipShow = false; // 点击确认后关闭弹窗
+    },
+
+    // 点击右上角星星触发收藏/取消收藏
+    toggleCollectStatus() {
+      // 1. 调用你们自己的未登录弹窗逻辑
+      if (!this.isLogin) {
+        this.tipsText = "您现在还未登录，是否确定登录？";
+        this.tipShow = true;
+        this.tipType = "login";
+        return; // 拦截请求，不再往下执行
+      }
+
+      // 2. 逻辑判断
+      if (!this.brandId) return;
+      const targetState = this.isCollected ? 2 : 1; 
+      
+      // 3. 模拟环境 (Mock)
+      if (this.useMockData) {
+        this.isCollected = !this.isCollected;
+        uni.showToast({ title: this.isCollected ? '收藏成功(Mock)' : '已取消收藏(Mock)', icon: 'none' });
+        return;
+      }
+
+      // 4. 发送真实请求
+      uni.showLoading({ title: '处理中...', mask: true });
+      request.post("/sj/brand/collect", {
+        id: this.brandId,
+        state: targetState
+      }).then((res) => {
+        if (res.code == 200) {
+          this.isCollected = !this.isCollected;
+          uni.showToast({ 
+            title: this.isCollected ? '收藏成功' : '已取消收藏', 
+            icon: 'none' 
+          });
+        } else {
+          uni.showToast({ title: res.msg || '操作失败', icon: 'none' });
+        }
+      }).catch((err) => {
+        console.error('收藏接口异常', err);
+        // 既然拦截成功了，如果这里还是报错，那才是真正的网络不顺畅
+        uni.showToast({ title: '网络不太顺畅，请稍后再试', icon: 'none' });
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+
+    // 地区选择器相关方法
+    chooseLocation() {
+      this.showLocationPopupFlag = true;
+    },
+    hideLocationPopup() {
+      this.showLocationPopupFlag = false;
+    },
+    bindChangeLocation(e) {
+      this.locationValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.locatinCitys = this.ChinaCitys[index1].citys;
+      this.locationAreas = this.locatinCitys[index2].areas;
+    },
+    confirmLocationSelect() {
+      let valueArr = this.locationValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+      
+      let province = this.ChinaCitys[index1].province;
+      let city = this.locatinCitys[index2].city;
+      let area = this.locationAreas[index3].area;
+      
+      // 更新展示文本及表单数据
+      this.cityNameText = `${province} / ${city} / ${area}`;
+      this.formData.province_code = province;
+      this.formData.city_code = city;
+      this.formData.area_code = area;
+      
+      this.showLocationPopupFlag = false;
+    },
+
+    initNavLayout() {
+      let sysInfo = uni.getSystemInfoSync();
+      // NavBar 通常高度是 44px，悬浮容器设置为 40px 高，居中 Y 为 +2px
+      let top = (sysInfo.statusBarHeight || 0) + 2; 
+      // 默认距离右侧边距
+      let right = 50; 
+      
+      // #ifdef MP-WEIXIN
+      let menuBtn = uni.getMenuButtonBoundingClientRect();
+      if (menuBtn) {
+        top = menuBtn.top + (menuBtn.height / 2) - 20; 
+        // 算出胶囊左侧的可用空间，再留出右侧搜索图标的距离(通常再向左偏移 45px 左右)
+        right = sysInfo.windowWidth - menuBtn.left + 45; 
+      }
+      // #endif
+      
+      this.phoneIconTop = top;
+      this.phoneIconRight = right;
+    },
+
+    // 拨打电话面板
+    makeCall() {
+      // 兼容可能存在的多种手机号字段
+      const phone = this.info.contact_phone || ''; 
+      if (phone) {
+        uni.makePhoneCall({
+          phoneNumber: String(phone),
+          fail: (err) => {
+            console.log('取消拨打或拨打失败', err);
+          }
+        });
+      } else {
+        uni.showToast({ title: '暂无联系电话', icon: 'none' });
+      }
+    },
+
+    goAlbum() {
+      uni.navigateTo({
+        url: `/pages/album/index?id=${this.brandId}&user_type=2`
+      });
+    },
+
+    // 就地播放视频
+    playVideoInPlace() {
+      this.isVideoPlaying = true;
+    },
+
+    // 悬浮按钮切换 Mock 数据
+    toggleMockData() {
+      this.useMockData = !this.useMockData;
+      uni.showToast({ title: this.useMockData ? 'Mock已开启' : 'Mock已关闭', icon: 'none' });
+      this.getBrandDetails();
+    },
+
+    getBrandDetails() {
+      this.isVideoPlaying = false; // 每次刷新数据重置播放状态
+      if (this.useMockData) {
+        this.injectMockData();
+        return;
+      }
+
+      uni.showLoading({ title: '加载中...' });
+      request.post("/sj/brand/details", { 
+        id: this.brandId 
+      }).then((res) => {
+        if (res.code == 200 && res.data) {
+          this.info = res.data;
+          // 初始化收藏状态 (假设后端返回 1 为已收藏)
+          this.isCollected = res.data.collect_state === 1;
+          this.parseBanners();
+        } else {
+          uni.showToast({ title: res.msg || '获取详情失败', icon: 'none' });
+        }
+      }).catch((err) => {
+        console.error('获取品牌详情异常', err);
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+
+    injectMockData() {
+      this.info = {
+        name: '蜜丝卡伦美甲美睫',
+        contact_phone: '400-888-8888', 
+        video: 'https://vjs.zencdn.net/v/oceans.mp4', 
+        banner_imgs: [
+          'https://images.unsplash.com/photo-1610992015732-2449b76344bc?ixlib=rb-4.0.3&auto=format&fit=crop&w=750&q=80',
+          'https://images.unsplash.com/photo-1522337660859-02fbefca4702?ixlib=rb-4.0.3&auto=format&fit=crop&w=750&q=80'
+        ],
+        detail: '内容支持文本/图片上传(后台动态配置)——右侧支持图文/上传图片后转轮播。品牌优势、产品详情、常见问题、发展历程、品牌案例展示区等位。\n\n本品牌深耕行业多年，秉持匠心初心，不断为行业核心发展赋能，专注打造高品质、高性价比、契合大众需求的优质产品。\n品牌经验和可复制性开店闭环模型，从培训、选址、开店扶持到后期运营，展现老牌一站式辅导，并提供职业赋能，成就门店长效盈利、持久发展的秘诀。\n强大的自有生产供应链与专业团队，研发高端前沿技术，保证出新频率与前沿审美，满足各年龄段、覆盖不同场景下的多元使用诉求。\n自创立以来，品牌以真诚口碑立足市场，坚守诚信经营初心。积极致力于打造消费者、加盟商和社会大众三方信任的美业服务管家，获得广大用户信赖与认可。\n未来我们将持续坚守初心，优质服务升级，以更高标准打造全线产品，致力成为行业内极具竞争力与用户信赖的国民品牌，为广大用户传递更自信、更优质的变美体验。\n自创立以来，品牌以真诚口碑立足市场，坚守诚信经营初心，用心服务每一位消费者，凭借稳定出众的产品实力与贴心完善的售后保障，收获万千用户信赖与认可。自创立以来，品牌以真诚口碑立足市场，坚守诚信经营初心，用心服务每一位消费者，凭借稳定出众的产品实力与贴心完善的销售后保障，收获万千用户信赖与认可。',
+        franchise_state: 1,
+        franchise_recruit: `
+          <p>内容支持文本/图片上传(由后台动态化配置)——支持右侧上传视频/上传图片转轮播。品牌优势、产品详情、常见问题、发展历程、品牌案例/展示区等位。</p>
+          <img src="https://images.unsplash.com/photo-1604654894610-df63bc536371?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80" />
+        `,
+        student_state: 1,
+        student_recruit: `<p>学员招募介绍区域...</p>`
+      };
+      this.parseBanners();
+    },
+
+    parseBanners() {
+      if (!this.info.banner_imgs) {
+        this.bannerList = this.info.cover_img ? [this.info.cover_img] : ['https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6744da30-1cef-40ec-8274-f6395b530fe8.png'];
+        return;
+      }
+      try {
+        if (typeof this.info.banner_imgs === 'string') {
+          if (this.info.banner_imgs.includes(',')) {
+            this.bannerList = this.info.banner_imgs.split(',');
+          } else {
+            this.bannerList = JSON.parse(this.info.banner_imgs);
+          }
+        } else if (Array.isArray(this.info.banner_imgs)) {
+          this.bannerList = this.info.banner_imgs;
+        }
+      } catch (e) {
+        this.bannerList = [this.info.cover_img];
+      }
+    },
+
+    onSwiperChange(e) {
+      this.currentBannerIndex = e.detail.current;
+    },
+    toggleExpand() {
+      this.isExpanded = !this.isExpanded;
+    },
+    switchTab(index) {
+      this.activeTab = index;
+    },
+    
+    onIntentionChange(e) {
+      const selectItem = this.intentionOptions[e.detail.value];
+      this.intentionText = selectItem.label;
+      this.formData.intention = selectItem.value;
+    },
+
+    submitForm() {
+      if (!this.canSubmit) {
+        uni.showToast({ title: '请填写完整必填信息', icon: 'none' });
+        return;
+      }
+      
+      if (!/^1[3-9]\d{9}$/.test(this.formData.contact_phone)) {
+        uni.showToast({ title: '请输入合法的手机号码', icon: 'none' });
+        return;
+      }
+
+      if (this.useMockData) {
+        uni.showToast({ title: '模拟环境下留言提交成功！', icon: 'success' });
+        this.resetForm();
+        return;
+      }
+
+      uni.showLoading({ title: '正在提交...', mask: true });
+      request.post("/sj/brand/consult", this.formData).then((res) => {
+        if (res.code == 200) {
+          uni.showToast({ title: '留言提交成功！', icon: 'success', duration: 2000 });
+          this.resetForm();
+        } else {
+          uni.showToast({ title: res.msg || '提交失败', icon: 'none' });
+        }
+      }).catch((err) => {
+        uni.showToast({ title: '网络不太顺畅，请稍后再试', icon: 'none' });
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+    
+    resetForm() {
+      this.formData = {
+        id: this.brandId,
+        intention: '',
+        intention_other: '',
+        contact_name: '',
+        contact_phone: '',
+        province_code: '',
+        city_code: '',
+        area_code: ''
+      };
+      this.cityNameText = '';
+      this.intentionText = '';
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.brand-detail-page {
+  background-color: #ffffff;
+  min-height: 100vh;
+  padding-bottom: 80rpx;
+  box-sizing: border-box;
+  position: relative;
+}
+
+/* 导航栏左侧新增动态拨号图标 */
+.nav-phone-wrap {
+  position: fixed;
+  z-index: 9999;
+  width: 40px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: opacity 0.2s;
+  
+  &:active {
+    opacity: 0.7;
+  }
+  
+  .nav-phone-icon {
+    width: 44rpx;
+    height: 44rpx;
+  }
+}
+
+/* 模拟数据悬浮按钮 */
+.mock-switch {
+  position: fixed;
+  right: 20rpx;
+  top: 200rpx;
+  background: #E5505F;
+  color: #fff;
+  font-size: 24rpx;
+  padding: 10rpx 20rpx;
+  border-radius: 30rpx;
+  z-index: 999;
+  box-shadow: 0 4rpx 10rpx rgba(229, 80, 95, 0.4);
+}
+
+/* 1. 轮播图 / 视频 */
+.banner-section {
+  position: relative;
+  width: 100%;
+  height: 421rpx;
+  background-color: #f5f5f5;
+  
+  .banner-video {
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+  
+  .banner-swiper {
+    width: 100%;
+    height: 100%;
+  }
+  
+  .banner-img {
+    width: 100%;
+    height: 100%;
+  }
+  
+  .center-play-icon {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 120rpx;
+    height: 120rpx;
+    z-index: 20;
+    transition: opacity 0.3s;
+    
+    &:active {
+      opacity: 0.8;
+    }
+  }
+  
+  .album {
+    position: absolute;
+    bottom: 10rpx;
+    left: 20rpx;
+    height: 44rpx;
+    width: 184rpx;
+    background: rgba(0, 0, 0, 0.4);
+    border-radius: 23rpx;
+    display: flex;
+    align-items: center;
+    z-index: 10;
+    
+    .album-left {
+      width: 73rpx;
+      height: 44rpx;
+      background: #FFFFFF;
+      border-radius: 23rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-weight: 400;
+      font-size: 22rpx;
+      color: #333333;
+    }
+
+    .album-line {
+      width: 2rpx;
+      height: 20rpx;
+      background: #A09C9E;
+      border-radius: 1rpx;
+      margin: 0 18rpx;
+    }
+
+    .album-right {
+      display: flex;
+      align-items: center;
+      height: 44rpx;
+
+      .album-right-text {
+        font-weight: 400;
+        font-size: 22rpx;
+        color: #FFFFFF;
+      }
+
+      .album-right-img {
+        width: 8rpx;
+        height: 16rpx;
+        margin-left: 8rpx;
+      }
+    }
+  }
+  
+  .indicator {
+    position: absolute;
+    right: 20rpx;
+    bottom: 10rpx;
+    background: #0000003b;
+    color: #ffffff;
+    font-size: 22rpx;
+    font-weight: 500;
+    padding: 8rpx 24rpx;
+    border-radius: 26rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+
+/* 2. 品牌介绍 */
+.intro-section {
+  padding: 40rpx 30rpx;
+  
+  .section-title {
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+    line-height: 42rpx;
+    margin-bottom: 24rpx;
+  }
+  
+  .intro-content {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #333333;
+    line-height: 37rpx;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 19;
+    overflow: hidden;
+    white-space: pre-line; 
+    
+    &.is-expanded {
+      -webkit-line-clamp: 9999;
+    }
+  }
+  
+  .expand-btn {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 30rpx;
+    padding: 10rpx 40rpx;
+    border-radius: 27rpx;
+    border: 1rpx solid #C4C4C4;
+    width: fit-content;
+    margin-left: auto;
+    margin-right: auto;
+    
+    .expand-text {
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #333333;
+      line-height: 33rpx;
+      margin-right: 8rpx;
+    }
+    
+    .arrow {
+      margin-bottom: -2rpx;
+      width: 10rpx;
+      height: 10rpx;
+      border-right: 2rpx solid #999999;
+      border-bottom: 2rpx solid #999999;
+      transform: rotate(45deg) translateY(-2rpx);
+      transition: transform 0.2s ease;
+      
+      &.up {
+        transform: rotate(-135deg) translateY(2rpx);
+      }
+    }
+  }
+}
+
+.divider-bg {
+  width: 100%;
+  height: 16rpx;
+  background-color: #F8F8F8;
+}
+
+/* 3. 招募详情 Tab */
+.tab-section {
+  padding: 0 30rpx 40rpx;
+  
+  .tab-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 30rpx 0 0 0;
+    gap: 120rpx;
+    margin-bottom: 10rpx;
+    
+    .tab-item {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #666666;
+      line-height: 40rpx;
+      position: relative;
+      padding-bottom: 16rpx;
+      transition: all 0.2s;
+      
+      &.active {
+        font-weight: 500;
+        font-size: 30rpx;
+        color: #000000;
+      }
+
+      .tab-text {
+        position: relative;
+        z-index: 2;
+      }
+      
+      .active-line {
+        position: absolute;
+        bottom: 20rpx;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 100%;
+        height: 14rpx;
+        background: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6ea51769-911f-44e7-ae22-55f62e8bfdb9.png') no-repeat center center;
+        background-size: 100% 100%;
+        border-radius: 4rpx;
+        z-index: 1;
+      }
+    }
+  }
+  
+  .tab-content {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #333333;
+    line-height: 37rpx;
+    
+    ::v-deep img {
+      max-width: 100% !important;
+      height: auto !important;
+      display: block;
+      border-radius: 12rpx;
+      margin: 20rpx 0;
+    }
+    
+    ::v-deep p, ::v-deep div {
+      margin-bottom: 24rpx;
+      line-height: 1.6;
+    }
+  }
+}
+
+/* 4. 在线留言表单 */
+.form-section {
+  padding: 40rpx 30rpx;
+  
+  .section-title {
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+    line-height: 42rpx;
+    margin-bottom: 20rpx;
+  }
+  
+  .form-list {
+    .form-item {
+      display: flex;
+      align-items: center;
+      min-height: 104rpx;
+      border-bottom: 1rpx solid #F5F5F5;
+      
+      &.border-none {
+        border-bottom: none;
+      }
+      
+      .label {
+        width: 190rpx;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 40rpx;
+        
+        .required {
+          color: #E5505F;
+          margin-right: 3rpx;
+        }
+      }
+      
+      .input-el, .picker-el {
+        flex: 1;
+        font-size: 28rpx;
+        color: #333333;
+      }
+      
+      .ph-style {
+        color: #C4C4C4;
+      }
+      
+      .picker-value {
+        color: #CCCCCC;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 100%;
+        
+        &.has-val {
+          color: #333333;
+        }
+        
+        .arrow-right {
+          width: 12rpx;
+          height: 12rpx;
+          border-top: 2rpx solid #CCCCCC;
+          border-right: 2rpx solid #CCCCCC;
+          transform: rotate(45deg);
+        }
+      }
+    }
+  }
+  
+  .submit-btn {
+    margin-top: 60rpx;
+    width: 100%;
+    height: 88rpx;
+    line-height: 88rpx;
+    background-color: #DBDBDB;
+    color: #fff;
+    font-size: 30rpx;
+    border-radius: 44rpx;
+    text-align: center;
+    border: none;
+    transition: all 0.2s ease;
+    
+    &::after {
+      border: none;
+    }
+    
+    &.is-active {
+      background-color: #FF4767; 
+      color: #FFFFFF;
+      box-shadow: 0 8rpx 16rpx rgba(229, 80, 95, 0.15);
+    }
+  }
+}
+
+/* ================= 地区选择弹窗复用样式 ================= */
+.popup {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999; /* 层级调高，防止被挡住 */
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.popup-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+  position: relative;
+  background-color: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+  padding: 32rpx;
+  transform: translateY(100%);
+  transition: transform 0.3s ease;
+}
+
+.popup.show .popup-content {
+  transform: translateY(0);
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20rpx;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999999;
+  padding: 16rpx;
+}
+
+.region-body {
+  flex: 1;
+  overflow: hidden;
+}
+
+.picker-scroll {
+  height: 400rpx;
+}
+
+.picker-item {
+  height: 68rpx;
+  line-height: 68rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #333;
+}
+
+.popup-footer {
+  display: flex;
+  margin-top: 32rpx;
+}
+
+.popup-btn {
+  flex: 1;
+  height: 88rpx;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 16rpx;
+}
+
+.popup-btn.cancel {
+  background-color: #F5F5F5;
+}
+
+.popup-btn.confirm {
+  background: linear-gradient(90deg, #ff6d77 0%, #FF618F 100%);
+}
+
+.popup-btn .btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.popup-btn.cancel .btn-text {
+  color: #666666;
+}
+
+.popup-btn.confirm .btn-text {
+  color: #FFFFFF;
+}
+</style>
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index ff89727..5f05fbc 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -135,8 +135,8 @@ const request = async (options, isUpdate) => {
 
 	if (process.env.NODE_ENV === 'development') {
 		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。	
-		baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
-		//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
+		baseURL = 'http://116.63.163.121:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
+		//baseURL = 'http://116.63.163.121:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'https://app.mrrweb.com.cn';
 	} else {
 		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。

From d723a5f2db61a51bf49c4480c42e167ecc5478f3 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Fri, 29 May 2026 13:51:41 +0800
Subject: [PATCH 056/118] 1

---
 pages/album/components/videoSlide.nvue | 844 ++-----------------------
 pages/album/components/videoplayer.vue | 106 ++++
 pages/album/index.nvue                 | 213 +++++--
 pages/jingxuan/skill-detail.vue        | 416 ++++++++++++
 4 files changed, 734 insertions(+), 845 deletions(-)
 create mode 100644 pages/album/components/videoplayer.vue
 create mode 100644 pages/jingxuan/skill-detail.vue

diff --git a/pages/album/components/videoSlide.nvue b/pages/album/components/videoSlide.nvue
index 6e195c4..ea43006 100644
--- a/pages/album/components/videoSlide.nvue
+++ b/pages/album/components/videoSlide.nvue
@@ -1,822 +1,88 @@
 <template>
-	<view style="z-index: 100;">
-		<!-- 视频滑动主容器 -->
-		<view class="view-box" :style="viewTopLength">
-			<!-- 复用的5个视频容器 - 核心复用节点，不可删减 -->
-			<view class="video-box" :style="itemViewTopLength0">
-				<video :src="videoInfo_0.src" :style="fillScreen" :autoplay="videoInfo_0.autoplay"
-					:loop="videoInfo_0.loop" :controls="videoInfo_0.controls"
-					:enable-play-gesture="videoInfo_0.enablePlayGesture" :objectFit="videoInfo_0.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_0.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_0.enableProgressGesture" @timeupdate="timeupdate(0,$event)"
-					@ended='ended' :show-play-btn="videoInfo_0.showPlayBtn" :show-progress="videoInfo_0.showProgress"
-					initial-time="0" id='video_id_0' @play="playing(0)" :muted="videoInfo_0.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_0.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_0.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_0.mode || mode" :src="videoInfo_0.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart.stop='videotouchstart' @touchmove.stop="videotochmove"
-					@touchend.stop='videotouchend' @click.stop="videoClick"></view>
-				<!-- 视频文本区域 - 每个视频都有 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">{{ videoInfo_0.src }}</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_0.name}}</text>
-						<!-- 声音图标 - 绑定0号视频的状态，点击切换静音 -->
-						<image class="video-sound"
-							:src="videoInfo_0.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(0)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength1">
-				<video :src="videoInfo_1.src" :style="fillScreen" :autoplay="videoInfo_1.autoplay"
-					:loop="videoInfo_1.loop" :controls="videoInfo_1.controls"
-					:enable-play-gesture="videoInfo_1.enablePlayGesture" :objectFit="videoInfo_1.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_1.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_1.enableProgressGesture" @timeupdate="timeupdate(1,$event)"
-					@ended='ended' :show-play-btn="videoInfo_1.showPlayBtn" :show-progress="videoInfo_1.showProgress"
-					initial-time="0" id='video_id_1' @play="playing(1)" :muted="videoInfo_1.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_1.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_1.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_1.mode || mode" :src="videoInfo_1.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 1号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_1.name}}</text>
-						<!-- 声音图标 - 绑定1号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_1.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(1)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength2">
-				<video :src="videoInfo_2.src" :style="fillScreen" :autoplay="videoInfo_2.autoplay"
-					:loop="videoInfo_2.loop" :controls="videoInfo_2.controls"
-					:enable-play-gesture="videoInfo_2.enablePlayGesture" :objectFit="videoInfo_2.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_2.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_2.enableProgressGesture" @timeupdate="timeupdate(2,$event)"
-					@ended='ended' :show-play-btn="videoInfo_2.showPlayBtn" :show-progress="videoInfo_2.showProgress"
-					initial-time="0" id='video_id_2' @play="playing(2)" :muted="videoInfo_2.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_2.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_2.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_2.mode || mode" :src="videoInfo_2.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 2号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_2.name}}</text>
-						<!-- 声音图标 - 绑定2号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_2.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(2)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength3">
-				<video :src="videoInfo_3.src" :style="fillScreen" :autoplay="videoInfo_3.autoplay"
-					:loop="videoInfo_3.loop" :controls="videoInfo_3.controls"
-					:enable-play-gesture="videoInfo_3.enablePlayGesture" :objectFit="videoInfo_3.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_3.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_3.enableProgressGesture" @timeupdate="timeupdate(3,$event)"
-					@ended='ended' :show-play-btn="videoInfo_3.showPlayBtn" :show-progress="videoInfo_3.showProgress"
-					initial-time="0" id='video_id_3' @play="playing(3)" :muted="videoInfo_3.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_3.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_3.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_3.mode || mode" :src="videoInfo_3.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 3号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_3.name}}</text>
-						<!-- 声音图标 - 绑定3号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_3.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(3)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength4">
-				<video :src="videoInfo_4.src" :style="fillScreen" :autoplay="videoInfo_4.autoplay"
-					:loop="videoInfo_4.loop" :controls="videoInfo_4.controls"
-					:enable-play-gesture="videoInfo_4.enablePlayGesture" :objectFit="videoInfo_4.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_4.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_4.enableProgressGesture" @timeupdate="timeupdate(4,$event)"
-					@ended='ended' :show-play-btn="videoInfo_4.showPlayBtn" :show-progress="videoInfo_4.showProgress"
-					initial-time="0" id='video_id_4' @play="playing(4)" :muted="videoInfo_4.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_4.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_4.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_4.mode || mode" :src="videoInfo_4.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 4号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_4.name}}</text>
-						<!-- 声音图标 - 绑定4号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_4.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(4)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view @touchend='progressTouchend' class="progress-view">
-				<uv-slider v-if="showSlider" v-model="progressValue" activeColor="#D8D8D8" block-size="6"
-					backgroundColor="#494949;" class="progress-slider"></uv-slider>
-			</view>
-
-			<!-- 修改：Dot指示器 - 最多显示5个 -->
-			<view class="dots" :style="{top:`${0.5*winHeight}px`}" v-if="videoListLength > 1">
-				<view class="dots-container">
-					<view class="dot-item" v-for="(dotIndex, idx) in visibleDots" :key="idx"
-						:class="{ active: dotIndex === videoIndex }" @click="jumpToVideo(dotIndex)"></view>
-				</view>
-				<text class="pageNumber">
-					{{ videoIndex+1 }}/{{ videoListLength }}
-				</text>
-			</view>
+	<view class="video-page">
+		<!-- 原生视频组件：全端兼容 -->
+		<video id="fullVideo" class="video-box" :src="videoUrl" controls show-fullscreen-btn enable-progress-gesture
+			:autoplay="false" :loop="false" :muted="false" @play="onPlay" @pause="onPause"
+			@fullscreenchange="handleFullScreenChange" @ended="onVideoEnd"></video>
 
+		<!-- 自定义操作按钮 -->
+		<view class="btn-wrap">
+			<button type="primary" size="default" @click="openFullScreen">
+				手动横屏全屏播放
+			</button>
+			<button type="warn" size="default" @click="closeFullScreen">
+				退出全屏
+			</button>
 		</view>
 	</view>
 </template>
 
 <script>
-	let VIDEO_LIST = []
-	let initVideoInfo = {
-		src: "",
-		coverStatus: true,
-		coverUrl: "",
-		flag: false,
-		objectFit: "",
-		mode: "",
-		isMuted: false, // 默认不静音
-		autoplay: false,
-		loop: true,
-		controls: false,
-		enablePlayGesture: true,
-		showFullscreenBtn: false,
-		enableProgressGesture: false,
-		showPlayBtn: false,
-		showProgress: false
-	}
 	export default {
-		props: {
-			popVideoList: {
-				type: Array,
-				default: [] // 默认值设为空数组JSON，避免parse报错
-			},
-			marginTop: {
-				type: String,
-				default: "88" // 默认值设为空数组JSON，避免parse报错
-			}
-		},
 		data() {
 			return {
-				playSetTime:null,
-				showSlider: true,
-				progressTime: 0,
-				progressValue: 0,
-				boxHeight: 0,
-				objectFit: "fill",
-				mode: "scaleToFill",
-				winWidth: 1,
-				winHeight: 1,
-				videoIndex: 0,
-				viewTop: 0,
-				viewTopPostion: 0,
-				videoList: [],
-				videoListLength: 0,
-				itemViewTop0: 0,
-				itemViewTop1: 0,
-				itemViewTop2: 0,
-				itemViewTop3: 0,
-				itemViewTop4: 0,
-				videoInfo_0: initVideoInfo,
-				videoInfo_1: initVideoInfo,
-				videoInfo_2: initVideoInfo,
-				videoInfo_3: initVideoInfo,
-				videoInfo_4: initVideoInfo,
-				stopIcon: '',
-				videotouchstartTimestamp: 0,
-				videotouchendTimestamp: 0,
-				moveView: true,
-				cover: true,
-				slidingStatus: false,
-				videoPlayingStatus: false,
-				preloadedIndex: [],
-				startPageY: 0,
-				endPageY: 0,
-				// 新增：控制可视dot的数组
-				visibleDots: [],
+				// 测试视频地址，替换自己的
+				videoUrl: "https://www.w3school.com.cn/i/movie.mp4",
+				videoContext: null
 			};
 		},
-		watch: {
-			// videoList: {
-			// 	handler(newVal, oldVal) {
-
-
-			// 	},
-			// 	immediate: true, // 可选：组件初始化时立即执行一次（即使值未变化）
-			// 	deep: false // 普通类型无需深度监听，默认false
-			// }
-		},
-		created(options) {
-			//#ifdef APP-PLUS
-			plus.screen.lockOrientation("portrait-primary")
-			//#endif
-			if (this.popVideoList.length) {
-				try {
-					VIDEO_LIST = []
-					this.popVideoList.forEach((item, index) => {
-						let obj = {
-							"src": "",
-							"coverStatus": true,
-							"coverUrl": "",
-							"flag": false,
-							"objectFit": "contain",
-							"mode": "aspectFit",
-							"isMuted": false, // 默认不静音
-							"autoplay": false,
-							"loop": true,
-							"controls": false,
-							"enablePlayGesture": true,
-							"showFullscreenBtn": false,
-							"enableProgressGesture": false,
-							"showPlayBtn": false,
-							"showProgress": false,
-							"name": ""
-						}
-						obj.name = item.name
-						obj.src = item.url
-						obj.coverUrl = item.url +
-							`?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`
-						VIDEO_LIST.push(obj)
-						if (index == 0) {
-							initVideoInfo = obj
-						}
-					})
-				} catch (e) {}
-				this.getSystemInfo();
-				this.videoList = VIDEO_LIST;
-				this.videoListLength = this.videoList.length;
-				this.boxHeight = this.videoListLength * this.winHeight;
-				for (let i = 0; i < 5; i++) {
-					if (this.videoList[i]) {
-						this['videoInfo_' + i] = this.videoList[i]
-					}
-				}
-				// 初始化可视dot范围
-				this.updateVisibleDots();
-				// setTimeout(() => {
-				// 	this.playVideo(0)
-				// }, 500)
-			}
-		},
-		onUnload() {
-			for (let i = 0; i < 5; i++) {
-				this.unloadVideo(i)
-			}
-		},
-		computed: {
-			getVideoTop() {
-				return uni.upx2px(this.marginTop)
-			},
-			viewTopLength() {
-				return `height:${this.boxHeight}px;top:${this.viewTop}px;`
-			},
-			fillScreen() {
-				let style = `height:${this.winHeight}px;width:${this.winWidth}px;`
-				return style
-			},
-			fillScreen2() {
-				let style = `height:auto;width:${this.winWidth}px;`
-				return style
-			},
-			itemViewTopLength0() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop0}px;`
-			},
-			itemViewTopLength1() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop1}px;`
-			},
-			itemViewTopLength2() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop2}px;`
-			},
-			itemViewTopLength3() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop3}px;`
-			},
-			itemViewTopLength4() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop4}px;`
-			}
+		onReady() {
+			// 初始化视频实例
+			this.videoContext = uni.createVideoContext("fullVideo", this);
 		},
 		methods: {
-			// 新增：切换视频静音状态
-			toggleMute(videoNum) {
-				// 1. 切换数据层状态
-				this['videoInfo_' + videoNum].isMuted = !this['videoInfo_' + videoNum].isMuted;
-				// 2. 同步视频实例静音状态（恢复并完善原有注释代码，加容错）
-				const videoCtx = uni.createVideoContext("video_id_" + videoNum, this);
-				if (videoCtx) {
-					videoCtx.mute(this['videoInfo_' + videoNum].isMuted);
-				}
+			// 进入横屏全屏
+			openFullScreen() {
+				// direction 90：横屏；-90反向横屏；0自适应
+				this.videoContext.requestFullScreen({
+					direction: 90
+				});
 			},
-			// 修改：点击dot跳转 - 传真实的视频索引
-			jumpToVideo(targetIndex) {
-				if (targetIndex === this.videoIndex || this.slidingStatus) return;
-				this.stopVideo(this.videoIndex % 5, true);
-				const diff = targetIndex - this.videoIndex;
-				this.videoIndex = targetIndex;
-				this.viewTopPostion = -this.videoIndex * this.winHeight;
-				this.viewTop = this.viewTopPostion;
-				if (this.videoListLength > 5) {
-					this.sortItemView(diff > 0 ? -1 : 1);
-				}
-				// 更新可视dot范围
-				this.updateVisibleDots();
-				setTimeout(() => {
-					this.playVideo(this.videoIndex % 5);
-				}, 400);
+			// 退出全屏
+			closeFullScreen() {
+				this.videoContext.exitFullScreen();
 			},
-			// 核心：更新可视dot范围 - 最多显示5个
-			updateVisibleDots() {
-				const maxShow = 5;
-				const total = this.videoListLength;
-				// 视频总数 ≤ 5，显示全部
-				if (total <= maxShow) {
-					this.visibleDots = Array.from({
-						length: total
-					}, (_, i) => i);
-					return;
-				}
-				// 视频总数 > 5，显示包含当前索引的5个dot
-				// 计算起始索引，避免越界
-				let start = Math.max(0, Math.min(this.videoIndex - 2, total - maxShow));
-				// 生成5个连续的索引
-				this.visibleDots = Array.from({
-					length: maxShow
-				}, (_, i) => start + i);
+			// 播放监听
+			onPlay() {
+				console.log("视频开始播放");
 			},
-			progressTouchend() {
-				let s = Math.round(this.progressValue / 100 * this.time)
-				let i = this.videoIndex % 5
-				uni.createVideoContext("video_id_" + i, this).seek(s)
-				uni.createVideoContext("video_id_" + i, this).play()
+			// 暂停监听
+			onPause() {
+				console.log("视频暂停");
 			},
-			sliderchanging(e) {
-				console.log(3333, e)
-			},
-			getSystemInfo() {
-				var _this = this;
-				uni.getSystemInfo({
-					success: function(res) {
-						_this.winWidth = res.windowWidth;
-						_this.winHeight = res.windowHeight;
-						let p = uni.upx2px(150)
-						_this.stopIcon = `left:${(res.windowWidth - p)/2}px;top:${(res.windowHeight - p)/2}px;`
-						_this.itemViewTop1 = res.windowHeight
-						_this.itemViewTop2 = res.windowHeight * 2
-						_this.itemViewTop3 = res.windowHeight * 3
-						_this.itemViewTop4 = res.windowHeight * 4
-					},
-				})
-			},
-			unloadVideo(index) {
-				if (index < 0 || index >= this.videoListLength) return;
-				const nodeNum = index % 5;
-				const videoCtx = uni.createVideoContext("video_id_" + nodeNum, this);
-				videoCtx.stop();
-				this.preloadedIndex = this.preloadedIndex.filter(item => item !== index);
-			},
-			playVideo(num) {
-				clearTimeout(this.playSetTime)
-				uni.$uv.debounce(() => {
-					this.videoPlayingStatus = true
-					this["videoInfo_" + num].flag = true
-					let VideoContext = uni.createVideoContext("video_id_" + num, this)
-					this.playSetTime = setTimeout(() => {
-						VideoContext.play()
-					}, 400)
-				}, 30)
-			},
-			stopVideo(num, control = false) {
-				const videoCtx = uni.createVideoContext("video_id_" + num, this);
-				if (!control) {
-					this['videoInfo_' + num].coverStatus = true;
-					videoCtx.stop()
+			// 全屏状态切换监听
+			handleFullScreenChange(e) {
+				if (e.detail.fullScreen) {
+					uni.setNavigationBarHidden(true); // 全屏隐藏顶部导航
 				} else {
-					videoCtx.pause()
+					uni.setNavigationBarHidden(false); // 退出恢复导航
 				}
-				this["videoInfo_" + num].flag = false
+				console.log("当前全屏状态：", e.detail.fullScreen);
 			},
-			nowPlayVideo() {
-				clearTimeout(this.playSetTime)
-				uni.$uv.debounce(() => {
-					this.videoPlayingStatus = true
-					this["videoInfo_" + this.videoIndex].flag = true
-					let VideoContext = uni.createVideoContext("video_id_" + this.videoIndex, this)
-					this.playSetTime = setTimeout(() => {
-						VideoContext.play()
-					}, 400)
-				}, 30)
-			},
-			nowStopVideo() {
-				const videoCtx = uni.createVideoContext("video_id_" + this.videoIndex, this);
-				videoCtx.pause()
-				this["videoInfo_" + this.videoIndex].flag = false
-			},
-			videoClick() {
-				let num = this.videoIndex % 5
-				if (this["videoInfo_" + num].flag) {
-					this.stopVideo(num, true)
-				} else {
-					this.playVideo(num, true)
-				}
-			},
-			videotouchstart(e) {
-				this.videotouchendTimestamp = this.videotouchstartTimestamp
-				this.videotouchstartTimestamp = e.timestamp
-				if ((this.videotouchstartTimestamp - this.videotouchendTimestamp) < 500) return
-				if (this.slidingStatus) return
-				this.startPageY = e.changedTouches[0].screenY;
-			},
-			videotochmove(e) {
-				if ((this.videotouchstartTimestamp - this.videotouchendTimestamp) < 500) return
-				if (this.slidingStatus) return
-				this.endPageY = e.changedTouches[0].screenY;
-				let sliding = this.endPageY - this.startPageY
-				if (sliding > 20 || sliding < -20) {
-					this.moveView = false
-				} else {
-					this.moveView = true
-				}
-				if (this.videoIndex == 0 && sliding > 50) {
-					this.viewTop = 50
-				} else if (this.videoIndex == this.videoListLength - 1 && sliding < 0) {
-					this.viewTop = this.viewTopPostion
-				} else {
-					this.viewTop = this.viewTopPostion + sliding
-				}
-			},
-			videotouchend(e) {
-				if ((this.videotouchstartTimestamp - this.videotouchendTimestamp) < 500) return
-				if (this.slidingStatus) return
-				this.moveView = true
-				this.endPageY = e.changedTouches[0].screenY;
-				let sliding = this.endPageY - this.startPageY
-				if ((sliding >= -40 && sliding < 0) || (sliding <= 40 && sliding > 0)) {
-					this.slidingStatus = true
-					this.videoSlidingReset(sliding)
-					return
-				}
-				if (sliding < -30) {
-					this.slidingStatus = true
-					if (this.videoIndex == this.videoListLength - 1) {
-						this.videoSlidingReset(sliding)
-						uni.showToast({
-							title: "已经到底了",
-							icon: "none"
-						})
-						return
-					}
-					this.moveView = false
-					this.videoSlidingToTop(sliding)
-					return
-				}
-				if (sliding > 30) {
-					this.slidingStatus = true
-					if (this.videoIndex == 0) {
-						this.videoSlidingReset(sliding)
-						return
-					}
-					this.moveView = false
-					this.videoSlidingToBottom(sliding)
-				}
-			},
-			videoSlidingReset(sliding) {
-				this.viewTop = this.viewTopPostion
-				this.slidingStatus = false
-			},
-			videoSlidingToTop(sliding) {
-				this.stopVideo(this.videoIndex % 5, true)
-				this.videoIndex++
-				if (this.videoListLength > 5) {
-					this.sortItemView(sliding)
-				}
-				this.viewTopPostion = this.viewTopPostion - this.winHeight
-				setTimeout(() => {
-					this.playVideo(this.videoIndex % 5)
-				}, 5)
-				let timer = setInterval(() => {
-					this.viewTop = this.viewTop - 35
-					if (this.viewTop < (this.viewTopPostion + 10)) {
-						this.viewTop = this.viewTopPostion
-						clearInterval(timer)
-						this.slidingStatus = false
-						this.slidingCallback()
-					}
-				}, 3)
-			},
-			videoSlidingToBottom(sliding) {
-				this.stopVideo(this.videoIndex % 5, true)
-				this.videoIndex--
-				if (this.videoListLength > 5) {
-					this.sortItemView(sliding)
-				}
-				this.viewTopPostion = this.viewTopPostion + this.winHeight
-				setTimeout(() => {
-					this.playVideo(this.videoIndex % 5)
-				}, 5)
-				let timer = setInterval(() => {
-					this.viewTop = this.viewTop + 35
-					if (this.viewTop > (this.viewTopPostion - 10)) {
-						this.viewTop = this.viewTopPostion
-						clearInterval(timer)
-						this.slidingStatus = false
-						this.slidingCallback()
-					}
-				}, 3)
-			},
-			// 修改：滑动结束后更新可视dot
-			slidingCallback() {
-				this.progressValue = 0
-				this.updateVisibleDots();
-			},
-			//滑动组件排序
-			sortItemView(silding) {
-				// 向上滑动
-				if (silding < 0) {
-					if (this.videoIndex > 2 && this.videoIndex < this.videoListLength - 2) {
-						let i = (this.videoIndex - 3) % 5
-						this["itemViewTop" + i] = this["itemViewTop" + i] + this.winHeight * 5
-						this['videoInfo_' + i] = this.videoList[this.videoIndex + 2]
-					}
-					return
-				}
-				// 向下滑动
-				if (silding > 0) {
-					if (this.videoIndex > 1 && this.videoIndex < this.videoListLength - 3) {
-						let i = (this.videoIndex + 3) % 5
-						this["itemViewTop" + i] = this["itemViewTop" + i] - this.winHeight * 5
-						this['videoInfo_' + i] = this.videoList[this.videoIndex - 2]
-					}
-				}
-			},
-			playing(i) {
-				setTimeout(() => {
-					this['videoInfo_' + i].coverStatus = false
-					this.moveView = true
-					this.slidingStatus = false
-				}, 600)
-			},
-			timeupdate(i, e) {
-				if (this.videoPlayingStatus) {
-					this.slidingStatus = false
-					this.videoPlayingStatus = false
-					setTimeout(() => {
-						this['videoInfo_' + i].coverStatus = false
-						this.moveView = true
-					}, 200)
-				}
-				this["videoInfo_" + i].flag = true
-				if (e.detail.duration >= this.progressTime) {
-					if (this.videoIndex%5 == i) {
-						this.time = e.detail.duration
-						this.progress = e.detail.currentTime
-						this.progressValue = (e.detail.currentTime / e.detail.duration) * 100
-					}
-
-					this.showProgress = true
-				} else {
-					this.showProgress = false
-				}
-			},
-			ended() {
-				let num = this.videoIndex % 5
-				this["videoInfo_" + num].flag = false
-				this.progressValue = 0
+			// 视频播放结束
+			onVideoEnd() {
+				// 播放完毕自动退出全屏
+				this.videoContext.exitFullScreen();
 			}
 		}
-	}
+	};
 </script>
 
-<style scoped lang="less">
-	.view-box {
-		// position: fixed;
-		// left: 0;
-		// right: 0;
-		background-color: #000;
-		// z-index: 900;
+<style scoped>
+	.video-page {
+		padding: 15rpx;
 	}
 
 	.video-box {
-		position: absolute;
-		left: 0;
-		right: 0;
-		z-index: 2000;
+		width: 100%;
+		height: 420rpx;
+		border-radius: 12rpx;
+		overflow: hidden;
 	}
 
-	.video-image {
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 2001;
-	}
-
-	.video-action {
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 2008;
-	}
-
-	.video-texts {
-		position: absolute;
-		left: 30rpx;
-		right: 30rpx;
-		bottom: 120rpx;
-		z-index: 2009; // 确保在视频上方显示
-
-		.video-title {
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			text-align: left;
-			font-style: normal;
-			lines: 1;
-			max-width: 240rpx;
-		}
-
-		.video-score {
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			text-align: left;
-			font-style: normal;
-			margin-left: 20rpx;
-		}
-
-		.video-text {
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #FFFFFF;
-			text-align: left;
-			font-style: normal;
-		}
-
-		.video-sound {
-			width: 44rpx;
-			height: 42rpx;
-			cursor: pointer; // 点击指针，提示可点击
-		}
-	}
-
-	.cover-view-stop {
-		position: absolute;
-		z-index: 9999;
-		width: 150rpx;
-		height: 200rpx;
-		background-color: rgba(0, 0, 0, 0.3);
-		border-radius: 50%;
-	}
-
-	.progress-view {
-		z-index: 9999;
-		position: fixed;
-		left: 30rpx;
-		right: 30rpx;
-		bottom: 80rpx;
-
-		.progress-slider {}
-	}
-
-	// 修改：Dot指示器样式 - 最多显示5个 + 过渡动画
-	.dots {
-		position: fixed;
-		left: 20rpx;
-		top: 0;
-		transform: translateY(-50%);
-		z-index: 9999;
-		flex-direction: row;
-
-		.dots-container {
-			// 限制最多显示5个，超出隐藏
-			width: fit-content;
-			overflow: hidden;
-			margin: auto 0;
-
-			.dot-item {
-				width: 10rpx;
-				height: 10rpx;
-				background: #FFFFFF;
-				border-radius: 50%;
-				// 核心：过渡动画，切换更丝滑
-				transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-				cursor: pointer;
-				margin-bottom: 10rpx;
-
-				&.active {
-					width: 10rpx;
-					height: 30rpx;
-					background: #FFFFFF;
-					border-radius: 5rpx;
-				}
-			}
-		}
-
-		.pageNumber {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #FFFFFF;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-left: 6rpx;
-		}
-	}
-
-	.flex-row-center-between {
+	.btn-wrap {
+		margin-top: 30rpx;
 		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.flex-row-start-between {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-start;
-		justify-content: space-between;
-	}
-
-	.flex-row-center-center {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.flex-row-center {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.flex-row-start {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-start;
-	}
-
-	.flex-row-end-between {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-end;
-		justify-content: space-between;
+		gap: 20rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/album/components/videoplayer.vue b/pages/album/components/videoplayer.vue
new file mode 100644
index 0000000..9ae18ef
--- /dev/null
+++ b/pages/album/components/videoplayer.vue
@@ -0,0 +1,106 @@
+<template>
+	<view class="video-page">
+		<!-- 原生视频组件：全端兼容 -->
+		<video id="fullVideo" class="video-box" :src="videoUrl" controls show-fullscreen-btn enable-progress-gesture
+			:autoplay="true" :loop="false" :muted="false" @play="onPlay" @pause="onPause" object-fit="cover" :direction="90"
+			@fullscreenchange="handleFullScreenChange" @ended="onVideoEnd" @fullscreenclick="tapback"></video>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				videoUrl: "",
+				videoContext: null
+			};
+		},
+		onLoad(options) {
+			console.log(options, '页面参数');
+			// 接收视频地址
+			if (options.url) {
+				this.videoUrl = options.url;
+			}
+		},
+		onReady() {
+			// #ifdef APP-PLUS
+			//plus.screen.unlockOrientation(); //解除屏幕方向的锁定，但是不一定是竖屏；
+			
+			// #endif
+			// 初始化视频实例（唯一正确位置）
+			this.videoContext = uni.createVideoContext("fullVideo", this);
+			// 页面渲染完成后 安全触发自动全屏
+			//this.autoFullScreen();
+		},
+		methods: {
+			tapback(e) {
+				console.log('点击全屏按钮');
+				// if (e.target.fullScreen) {
+				// 	plus.screen.lockOrientation('landscape'); //锁死屏幕方向为竖屏
+				// }else{
+				// 	plus.screen.lockOrientation('portrait'); //锁死屏幕方向为竖屏
+				// }
+			},
+			// 自动全屏（核心：修复iOS方向错乱）
+			autoFullScreen() {
+				if (!this.videoContext) return;
+
+				// 区分平台设置方向：iOS用0自适应，安卓用90横屏
+				const direction = uni.getSystemInfoSync().platform === 'ios' ? 0 : 90;
+
+				// 延迟执行，避免视频未加载完成导致全屏失败
+				setTimeout(() => {
+					this.videoContext.requestFullScreen({
+						direction: direction
+					});
+				}, 300)
+			},
+			// 手动横屏全屏
+			openFullScreen() {
+				if (!this.videoContext) return;
+				const direction = uni.getSystemInfoSync().platform === 'ios' ? 0 : 90;
+				this.videoContext.requestFullScreen({
+					direction
+				});
+			},
+			// 退出全屏
+			closeFullScreen() {
+				if (!this.videoContext) return;
+				this.videoContext.exitFullScreen();
+			},
+			// 播放监听
+			onPlay() {
+				console.log("视频开始播放");
+			},
+			// 暂停监听
+			onPause() {
+				console.log("视频暂停");
+			},
+			// 全屏状态切换
+			handleFullScreenChange(e) {
+				// 全屏隐藏导航栏，退出显示
+				// uni.setNavigationBarHidden(!!e.detail.fullScreen);
+				console.log("全屏状态：", e.detail.fullScreen);
+			},
+			// 视频播放完毕
+			onVideoEnd() {
+				this.closeFullScreen();
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.video-page {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+	}
+
+	.video-box {
+		width: 100%;
+		/* 自适应高度，避免拉伸 */
+		height: 100%;
+		object-fit: cover;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/album/index.nvue b/pages/album/index.nvue
index 0dda008..97b70ad 100644
--- a/pages/album/index.nvue
+++ b/pages/album/index.nvue
@@ -1,52 +1,59 @@
 <template>
 	<view class="container">
 		<view class="positonFixed">
-			<view class="header-top flex-row-center" :class="{videoTop:current==0}"
-				:style="{ height: `${88+statusBarHeight}rpx`,paddingTop: `${statusBarHeight}rpx`}">
+			<view class="header-top flex-row-center" :style="{ height: `${100}rpx`,paddingTop:`${statusBarHeight}rpx`}">
 				<view class="left-area" @click="goBack">
-					<image src="/static/images/whiteBack.png" mode="aspectFit" class="back-icon"></image>
+					<image src="/static/images/back.png" mode="aspectFit" class="back-icon"></image>
 				</view>
-				<view class="flex-row-center-center" style="flex: 1;margin-right: 18rpx;height:66rpx;">					
+				<view class="flex-row-center-center" style="flex: 1;margin-right: 18rpx;height:66rpx;">
 					<uv-tabs :list="list" @click="tabsClick" itemStyle="height:66rpx;" :activeStyle="activeStyle"
 						:inactiveStyle="inactiveStyle" :current="current" :lineColor="`rgba(232, 16, 30, 1)`"></uv-tabs>
 				</view>
-
 			</view>
-			<scroll-view scroll-x style="height: 100rpx;" v-if="current==1">
+			<scroll-view scroll-x style="height: 100rpx;background-color: #fff;" v-if="current==1">
 				<view class="container-tabs flex-row-center">
 					<view class="container-tab flex-row-center-center" @click="clickTab(item)"
-						:class="{active:cardListIndex==item.id}" v-for="(item,index) in cardList[1]" :key="index">
+						:class="{active:cardListIndex==item.id}" v-for="(item,index) in cardList[user_type]"
+						:key="index">
 						<text class="container-tab-text">{{ item.title }}</text>
 					</view>
 				</view>
 			</scroll-view>
-
 		</view>
-
+		<view :style="swiperStyle3"></view>
 		<view class="container-content" :style="swiperStyle2">
-			<swiper class="swiper" circular :style="swiperStyle" :current="current" @change="swiperChange" :disable-touch="current==0">
+			<swiper class="swiper" circular :style="swiperStyle" :current="current" @change="swiperChange"
+				:disable-touch="current==0">
 				<swiper-item>
-					<videoSlide ref="ideoSlideRrf" :popVideoList="videoList" :marginTop="`${88 + this.statusBarHeight}`" v-show="current==0" v-if="videoList.length"></videoSlide>
+					<scroll-view scroll-y :style="{height:`${viewportHeight-100-this.statusBarHeight}rpx`}">
+						<view class="swiper-items3">
+							<view class="swiper-item3" :class="{item2Left:index%2 == 0}"
+								v-for="(item,index) in videoList" :key="index" @click="tovideo(item)">
+								<image class="swiper-item3-video" mode="aspectFill" :src="item.img"></image>
+								<image
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c6c039fc-99fd-492e-ae9a-ed43260c94ef.png"
+									mode="widthFix"
+									style="width: 80rpx;position: absolute;top: 50%;left: 50%;transform: translate3d(-50%, -50%, 0);">
+								</image>
+							</view>
+						</view>
+					</scroll-view>
 				</swiper-item>
 				<swiper-item>
-					<scroll-view scroll-y :style="{height:`${viewportHeight-88-this.statusBarHeight-100}rpx`}">
+					<scroll-view scroll-y :style="{height:`${viewportHeight-100-this.statusBarHeight-100}rpx`}">
 						<view class="swiper-items2">
 							<view class="swiper-item2" :class="{item2Left:index%2 == 0}"
-								v-for="(item,index) in imagObj[cardListIndex]" :key="index">
+								v-for="(item,index) in imagObj[cardListIndex]" :key="index" @click="toimg(item)">
 								<image class="swiper-item2-img" mode="aspectFill" :src="item.url"></image>
 								<view class="swiper-item2-title">
 									<text class="swiper-item2-title-text">{{ item.name }}</text>
 								</view>
 							</view>
-
 						</view>
-
-
 					</scroll-view>
 				</swiper-item>
 			</swiper>
 		</view>
-
 	</view>
 </template>
 
@@ -68,6 +75,23 @@
 							title: "主图",
 							id: 1
 						},
+						{
+							title: "作品",
+							id: 3
+						},
+						{
+							title: "其他",
+							id: 4
+						}
+					],
+					2: [{
+							title: "全部",
+							id: 0
+						},
+						{
+							title: "主图",
+							id: 1
+						},
 						{
 							title: "环境",
 							id: 2
@@ -94,7 +118,7 @@
 				inactiveStyle: {
 					fontWeight: 500,
 					fontSize: "32rpx",
-					color: "#666666",
+					color: "#333333",
 				},
 				current: 1,
 				statusBarHeight: 0,
@@ -108,6 +132,7 @@
 			};
 		},
 		async onLoad(options) {
+
 			// 获取状态栏高度
 			const systemInfo = await uni.getSystemInfoSync()
 			this.systemInfo = systemInfo
@@ -120,6 +145,12 @@
 				this.getVideoList()
 			}
 		},
+		onShow() {
+			// // #ifdef APP-PLUS
+			// plus.screen.unlockOrientation(); //解除屏幕方向的锁定，但是不一定是竖屏；
+			// plus.screen.lockOrientation('portrait'); //锁死屏幕方向为竖屏
+			// // #endif
+		},
 		computed: {
 			// 计算swiper的样式
 			swiperStyle() {
@@ -128,8 +159,8 @@
 					// 注意：100vh 是视口高度，需要先转数值计算，再拼接单位
 
 					let viewportHeight = this.pxToRpx(this.systemInfo.windowHeight || window?.innerHeight || document
-						?.documentElement?.clientHeight|| 0, screenWidth ) ;
-					let height = viewportHeight - 88 - this.statusBarHeight;
+						?.documentElement?.clientHeight || 0, screenWidth);
+					let height = viewportHeight - 100 - this.statusBarHeight;
 					return {
 						height: `${height}rpx`
 					};
@@ -141,55 +172,69 @@
 			swiperStyle2() {
 				if (this.current == 1) {
 					return {
-						marginTop: `${88 + this.statusBarHeight + 100}rpx`,
-						height: `${this.viewportHeight-88-this.statusBarHeight-100}rpx`
+						height: `${this.viewportHeight-100-this.statusBarHeight-100}rpx`
 					};
 				}
 				return {
 					height: `${this.viewportHeight}rpx`
 				};
 			},
+			swiperStyle3() {
+				if (this.current == 1) {
+					return {
+						width: `750rpx`,
+						height: `${200 + this.statusBarHeight}rpx`,
+					};
+				}
+				return {
+					width: `750rpx`,
+					height: `${100 + this.statusBarHeight}rpx`,
+				};
+			},
 			viewportHeight() {
 				let screenWidth = this.systemInfo.screenWidth;
 				// 注意：100vh 是视口高度，需要先转数值计算，再拼接单位
 				let viewportHeight = this.pxToRpx(this.systemInfo.windowHeight || window?.innerHeight || document
-					?.documentElement?.clientHeight|| 0, screenWidth) ;
+					?.documentElement?.clientHeight || 0, screenWidth);
 				return viewportHeight
 			},
 		},
 		methods: {
+			goBack() {
+				uni.navigateBack(-1)
+			},
+			toimg(item) {
+				console.log(item, 'item');
+				uni.previewImage({
+					urls: [item.url], // 外面加 [] 变成数组
+					current: 0 // 可选，默认第一张
+				})
+			},
+			tovideo(item) {
+				uni.navigateTo({
+					url: '/pages/album/components/videoplayer?url=' + item.url
+				})
+			},
 			clickTab(item) {
 				this.cardListIndex = item.id
 			},
 			tabsClick(e) {
-				this.$nextTick(() => {
-					
-					this.current = e.index
-					if(this.current==1){
-						this.activeStyle.color = "#333333"
-						this.inactiveStyle.color = "#666666"
-						this.$refs.ideoSlideRrf.nowStopVideo()
-					}
-					if(this.current==0){
-						this.activeStyle.color = "#fff"
-						this.inactiveStyle.color = "#ccc"
-						this.$refs.ideoSlideRrf.nowPlayVideo()
-					}
-				})
+				console.log('12312312312');
 
+				this.current = e.index
+				this.activeStyle.color = "#333333"
+				this.inactiveStyle.color = "#666666"
 			},
 			swiperChange(e) {
 				this.$nextTick(() => {
 					this.current = e.detail.current
-					if(this.current==1){
+					if (this.current == 1) {
 						this.activeStyle.color = "#333333"
 						this.inactiveStyle.color = "#666666"
-						this.$refs.ideoSlideRrf.nowStopVideo()
 					}
-					if(this.current==0){
-						this.activeStyle.color = "#fff"
-						this.inactiveStyle.color = "#ccc"
-						this.$refs.ideoSlideRrf.nowPlayVideo()
+					if (this.current == 0) {
+						this.activeStyle.color = "#333333"
+						this.inactiveStyle.color = "#666666"
 					}
 				})
 
@@ -208,12 +253,17 @@
 					type: 1
 				}).then(res => {
 					if (res.code == 200) {
-						this.imagObj = res.data.list[1]
-						let all = []
-						for (let key in res.data.list[1]) {
-							all = [...all, ...res.data.list[1][key]]
+						if (res.data.list.length != 0) {
+							this.imagObj = res.data.list[1]
+							let all = []
+							for (let key in res.data.list[1]) {
+								all = [...all, ...res.data.list[1][key]]
+							}
+							this.imagObj[0] = all
+						} else {
+							this.imagObj[0] = []
 						}
-						this.imagObj[0] = all
+
 					}
 				})
 			},
@@ -224,8 +274,17 @@
 					type: 2
 				}).then(res => {
 					if (res.code == 200) {
-						for (let key in res.data.list[2]) {
-							this.videoList = [...this.videoList, ...res.data.list[2][key]]
+						if (res.data.list.length != 0) {
+							console.log(res.data, 'res.data');
+							for (let key in res.data.list[2]) {
+								this.videoList = [...this.videoList, ...res.data.list[2][key]]
+								this.videoList.forEach((item) => {
+									item.img = item.url +
+										'?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto'
+								})
+							}
+						} else {
+							this.videoList = []
 						}
 					}
 				})
@@ -249,7 +308,7 @@
 			z-index: 9999;
 			background: #f5f5f5;
 			padding: 0 24rpx;
-			
+
 			.left-area {
 				display: flex;
 				align-items: center;
@@ -266,10 +325,12 @@
 				}
 			}
 		}
-		.videoTop{
+
+		.videoTop {
 			background: transparent;
-			::v-deep .uv-tabs__wrapper__nav__line{
-				background: #fff!important;
+
+			::v-deep .uv-tabs__wrapper__nav__line {
+				background: #fff !important;
 			}
 		}
 
@@ -306,6 +367,7 @@
 
 		.container-content {
 			z-index: 1000;
+
 			.swiper {
 				background: #fff;
 
@@ -349,6 +411,47 @@
 					}
 				}
 
+				.swiper-items3 {
+					flex-wrap: wrap;
+					flex-direction: row;
+					display: flex;
+					padding-bottom: 20rpx;
+
+					.swiper-item3 {
+						width: 370rpx;
+						height: 370rpx;
+						margin-top: 10rpx;
+						overflow: hidden;
+						position: relative;
+						box-sizing: border-box;
+						border-radius: 20rpx;
+
+						.swiper-item3-video {
+							width: 370rpx;
+							height: 370rpx;
+						}
+
+						.swiper-item3-title {
+							position: absolute;
+							left: 0;
+							top: 0;
+							height: 33rpx;
+							padding: 0 8rpx;
+							background: rgba(0, 0, 0, 0.5);
+							border-radius: 0rpx 0rpx 10rpx 0rpx;
+							width: fit-content;
+
+							.swiper-item3-title-text {
+								font-weight: 400;
+								font-size: 18rpx;
+								color: #FFFFFF;
+								line-height: 33rpx;
+
+							}
+						}
+					}
+				}
+
 				.item2Left {
 					margin-right: 9rpx;
 				}
@@ -398,6 +501,4 @@
 		align-items: flex-end;
 		justify-content: space-between;
 	}
-	
-	
 </style>
\ No newline at end of file
diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
new file mode 100644
index 0000000..d53c949
--- /dev/null
+++ b/pages/jingxuan/skill-detail.vue
@@ -0,0 +1,416 @@
+<template>
+  <view class="skill-detail-page">
+    
+    <custom-navbar 
+      title="技能集市" 
+      backgroundColor="#ffffff" 
+      titleColor="#333" 
+      borderBottom="none">
+    </custom-navbar>
+
+    <view class="mock-switch" @click="toggleMockData">
+      <text>{{ useMockData ? '关闭模拟数据' : '开启模拟数据' }}</text>
+    </view>
+
+    <view class="video-section" v-if="article.videoSrc">
+      <video 
+        class="main-video"
+        :src="article.videoSrc"
+        :poster="article.poster"
+        controls
+        object-fit="cover"
+      ></video>
+    </view>
+
+    <view class="article-header" v-if="article.title">
+      <view class="title">{{ article.title }}</view>
+      <view class="meta-row">
+        <view class="author-info">
+          <image class="avatar" :src="article.authorAvatar" mode="aspectFill"></image>
+          <text class="author-name">{{ article.authorName }}</text>
+          <text class="date">{{ article.date }}</text>
+        </view>
+        <view class="favorite-btn" @click="toggleFavorite">
+          <image class="star-icon" :src="isFavorite ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fc947d4f-7372-4a49-978e-8c40d780d7a1.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/53378402-5456-4a80-b2ec-7c18d43d970e.png'"></image>
+          <text :class="{'active-fav': isFavorite}">收藏</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="article-content" v-if="article.htmlContent">
+      <rich-text :nodes="formattedHtmlContent"></rich-text>
+    </view>
+
+    <view class="recommend-section" v-if="recommendList.length > 0">
+      <view class="section-header">
+        <text class="section-title">相关推荐</text>
+        <view class="refresh-btn" @click="refreshList">
+          <image class="refresh-icon" :class="{'is-rotating': isRefreshing}" src="https://img.icons8.com/ios/50/999999/refresh--v1.png"></image>
+          <text>换一批</text>
+        </view>
+      </view>
+      
+      <view class="list-container">
+        <skill-card 
+          v-for="(item, index) in recommendList" 
+          :key="index" 
+          :item="item"
+        ></skill-card>
+      </view>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request";
+import SkillCard from "@/pages/home/components/skill-card.vue";
+
+export default {
+  components: {
+    SkillCard
+  },
+  data() {
+    return {
+      // 📌 核心：模拟数据开关
+      useMockData: true,
+      
+      articleId: null,
+      isFavorite: false,
+      isRefreshing: false,
+      
+      // 页面数据初始化为空，等待接口或Mock注入
+      article: {},
+      recommendList: []
+    }
+  },
+  computed: {
+    // 处理富文本图片样式，防止撑破页面，并增加圆角以匹配设计图
+    formattedHtmlContent() {
+      if (!this.article.htmlContent) return '';
+      return this.article.htmlContent.replace(
+        /<img/gi, 
+        '<img style="max-width:100%; height:auto; display:block; border-radius:12px; margin: 10px 0;"'
+      );
+    }
+  },
+  onLoad(options) {
+    if (options && options.id) {
+      this.articleId = parseInt(options.id, 10);
+    } else {
+      // 兜底一个测试 ID，方便你直接预览
+      this.articleId = 1; 
+    }
+    this.getPageData();
+  },
+  methods: {
+    // 悬浮按钮切换 Mock 数据
+    toggleMockData() {
+      this.useMockData = !this.useMockData;
+      uni.showToast({ title: this.useMockData ? 'Mock已开启' : 'Mock已关闭', icon: 'none' });
+      this.getPageData();
+    },
+
+    // 🚀 获取页面数据（真实接口接入）
+    getPageData() {
+      if (this.useMockData) {
+        this.injectMockData();
+        return;
+      }
+
+      // 真实的接口逻辑
+      uni.showLoading({ title: '加载中...' });
+      
+      request.post("/sj/skill/details", { 
+        id: this.articleId 
+      }).then((res) => {
+        if (res.code == 200 && res.data) {
+          const data = res.data;
+          
+          // 字段映射匹配
+          this.article = {
+            title: data.name || '暂无标题',
+            // 接口缺失作者信息，在此做默认兜底
+            authorName: '平台发布', 
+            authorAvatar: 'https://dummyimage.com/100x100/e6505f/fff.png&text=平',
+            // 截取时间字符串前10位 (2026-05-15) 或者根据需求替换为 . 格式
+            date: data.create_time ? data.create_time.substring(0, 10).replace(/-/g, '.') : '', 
+            videoSrc: data.video || '',
+            poster: data.cover_img || '',
+            htmlContent: data.detail || '<div style="text-align:center; color:#999; padding: 20px 0;">暂无图文详情</div>'
+          };
+          
+          // 根据文档：collect_state 1收藏 2未收藏
+          this.isFavorite = data.collect_state === 1;
+
+          // 由于接口没给 recommendList，先调用本地 mock 占位补齐 UI
+          this.loadMockRecommend(); 
+
+        } else {
+          uni.showToast({ title: res.msg || '获取数据失败', icon: 'none' });
+        }
+      }).catch((err) => {
+        console.error('获取技能集市详情异常', err);
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+
+    // 🚀 收藏 / 取消收藏（真实接口接入）
+    toggleFavorite() {
+      if (this.useMockData) {
+        this.isFavorite = !this.isFavorite;
+        uni.showToast({
+          title: this.isFavorite ? '收藏成功' : '已取消收藏',
+          icon: 'none'
+        });
+        return;
+      }
+      
+      uni.showLoading({ title: '处理中' });
+      
+      // 目标状态：当前如果是收藏(1)，则传取消(2)；反之传收藏(1)
+      const targetState = this.isFavorite ? 2 : 1;
+      
+      request.post("/sj/skill/collect", { 
+        id: this.articleId, 
+        state: targetState 
+      }).then(res => {
+        if(res.code == 200) {
+          this.isFavorite = !this.isFavorite;
+          uni.showToast({ title: this.isFavorite ? '收藏成功' : '已取消收藏', icon: 'none' });
+        } else {
+          uni.showToast({ title: res.msg || '操作失败', icon: 'none' });
+        }
+      }).catch(err => {
+        uni.showToast({ title: '网络异常', icon: 'none' });
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+    
+    // 换一批 (真实环境目前没有对应接口，暂时用 Mock 动画顶替)
+    refreshList() {
+      if(this.isRefreshing) return;
+      this.isRefreshing = true;
+      
+      uni.showLoading({ title: '加载中' });
+      setTimeout(() => {
+        // 打乱数组模拟换一批
+        this.recommendList = this.recommendList.sort(() => Math.random() - 0.5);
+        this.isRefreshing = false;
+        uni.hideLoading();
+      }, 600);
+    },
+
+    // 以下为 Mock 数据注入区域
+    injectMockData() {
+      this.isFavorite = false;
+      this.article = {
+        title: '穿戴甲的操作视频扫码验券操作',
+        authorName: '美融融平台',
+        authorAvatar: 'https://dummyimage.com/100x100/e6505f/fff.png&text=融',
+        date: '2026.03.03',
+        videoSrc: 'https://vjs.zencdn.net/v/oceans.mp4',
+        poster: 'https://images.unsplash.com/photo-1610992015732-2449b76344bc?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80',
+        htmlContent: `
+          <p style="margin-bottom: 15px;">最近，一向以平价、良心、宠粉著称的胖东来，突然因为一条毛巾被推上风口浪尖。</p>
+          <p style="margin-bottom: 15px;">4月下旬，抖音博主“惊梦人-”连续发布多条探店视频，称自己跑遍许昌5家胖东来门店，发现一边是几块钱的玻璃水、洗衣液等亲民好物，另一边却摆着标价249元的高端毛巾，价格形成反差。</p>
+          <img src="https://dummyimage.com/800x400/ff6b81/ffffff.png&text=仅0.34元/天畅享全站会员权益" alt="会员权益"/>
+          <p style="margin-top: 15px; margin-bottom: 15px;">最近，一向以平价、良心、宠粉著称的胖东来，突然因为一条毛巾被推上风口浪尖。</p>
+          <p>4月下旬，抖音博主“惊梦人-”连续发布多条探店视频，称自己跑遍许昌5家胖东来门店，发现一边是几块钱的玻璃水、洗衣液等亲民好物，另一边却摆着标价249元的高端毛巾，价格形成反差。</p>
+        `
+      };
+      this.loadMockRecommend();
+    },
+
+    loadMockRecommend() {
+      this.recommendList = [
+        {
+          id: 1,
+          title: '穿戴甲的操作视频扫码验券操作教程...',
+          coverSrc: 'https://images.unsplash.com/photo-1604654894610-df63bc536371?ixlib=rb-4.0.3&auto=format&fit=crop&w=400&q=80',
+          type: '平台课程',
+          typeIcon: 'https://img.icons8.com/ios-filled/50/1890ff/play--v1.png',
+          views: 836000,
+          time: '7小时前'
+        },
+        {
+          id: 2,
+          title: '脸部按摩操作步骤详情',
+          coverSrc: 'https://images.unsplash.com/photo-1512290923902-8a9f81dc236c?ixlib=rb-4.0.3&auto=format&fit=crop&w=400&q=80',
+          type: '脸缘品牌',
+          typeIcon: 'https://img.icons8.com/ios-filled/50/E55463/like--v1.png',
+          views: 8334,
+          time: '1天前'
+        },
+        {
+          id: 3,
+          title: '全身SPA的操作视频操作教程',
+          coverSrc: 'https://images.unsplash.com/photo-1544161515-4ab6ce6db874?ixlib=rb-4.0.3&auto=format&fit=crop&w=400&q=80',
+          type: '平台课程',
+          typeIcon: 'https://img.icons8.com/ios-filled/50/1890ff/play--v1.png',
+          views: 2344,
+          time: '3天前'
+        },
+        {
+          id: 4,
+          title: '穿戴甲的操作视频扫码验券操作',
+          coverSrc: 'https://images.unsplash.com/photo-1604654894610-df63bc536371?ixlib=rb-4.0.3&auto=format&fit=crop&w=400&q=80',
+          type: '平台课程',
+          typeIcon: 'https://img.icons8.com/ios-filled/50/1890ff/play--v1.png',
+          views: 836,
+          time: '4月26日'
+        }
+      ];
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.skill-detail-page {
+  background-color: #ffffff;
+  min-height: 100vh;
+  padding-bottom: 60rpx;
+  position: relative;
+}
+
+/* 模拟数据悬浮按钮 */
+.mock-switch {
+  position: fixed;
+  right: 20rpx;
+  top: 200rpx;
+  background: #E5505F;
+  color: #fff;
+  font-size: 24rpx;
+  padding: 10rpx 20rpx;
+  border-radius: 30rpx;
+  z-index: 999;
+  box-shadow: 0 4rpx 10rpx rgba(229, 80, 95, 0.4);
+}
+
+/* 1. 视频区域 */
+.video-section {
+  width: 100%;
+  height: 420rpx;
+  
+  .main-video {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+/* 2. 标题及作者信息 */
+.article-header {
+  padding: 30rpx 30rpx 20rpx;
+  
+  .title {
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #333333;
+    line-height: 45rpx;
+    margin-bottom: 24rpx;
+  }
+  
+  .meta-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    
+    .author-info {
+      display: flex;
+      align-items: center;
+      
+      .avatar {
+        width: 28rpx;
+        height: 28rpx;
+        border-radius: 50%;
+        margin-right: 12rpx;
+      }
+      
+      .author-name {
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #666666;
+        line-height: 33rpx;
+        margin-right: 16rpx;
+      }
+      
+      .date {
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+        line-height: 33rpx;
+      }
+    }
+    
+    .favorite-btn {
+      display: flex;
+      align-items: center;
+      font-size: 24rpx;
+      color: #999999;
+      
+      .star-icon {
+        width: 28rpx;
+        height: 28rpx;
+        margin-right: 6rpx;
+        margin-top: -2rpx;
+      }
+      
+      .active-fav {
+        color: #E55463;
+      }
+    }
+  }
+}
+
+/* 3. 富文本内容 */
+.article-content {
+  padding: 0 30rpx 40rpx;
+  font-size: 28rpx;
+  color: #444444;
+  line-height: 52rpx;
+  letter-spacing: 1rpx;
+}
+
+/* 4. 相关推荐列表 */
+.recommend-section {
+  padding: 0 30rpx;
+  
+  .section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 30rpx;
+    
+    .section-title {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #222222;
+    }
+    
+    .refresh-btn {
+      display: flex;
+      align-items: center;
+      font-size: 26rpx;
+      color: #999999;
+      
+      .refresh-icon {
+        width: 26rpx;
+        height: 26rpx;
+        margin-right: 8rpx;
+        transition: transform 0.5s ease;
+        
+        &.is-rotating {
+          transform: rotate(360deg);
+        }
+      }
+    }
+  }
+  
+  .list-container {
+    /* 列表间距由组件内部的 margin-bottom 控制 */
+  }
+}
+</style>
\ No newline at end of file

From 2e13ec14aa09aeb2ae99d2c16ac0ab6bdab96fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Fri, 29 May 2026 14:01:12 +0800
Subject: [PATCH 057/118] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E6=94=B9=E7=89=88=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8E=E8=AF=B7=E6=B1=82=E5=B7=A5=E5=85=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artisan/profile.vue              |    2 +-
 pages/my/my.vue                        |    4 +-
 pages/ruzhu/ruzhu.vue                  | 1505 ++++++++++++------------
 pages/ruzhu/sj-info.vue                |  421 ++++---
 pages/ruzhu/successruzhu.vue           |  176 +--
 pages/shop/business-time.vue           |    2 +-
 pages/shop/qualification_sj_change.vue |  333 +++++-
 utils/request.js                       |   24 +-
 8 files changed, 1451 insertions(+), 1016 deletions(-)

diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index a85a145..b7af875 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -475,7 +475,7 @@
 					console.log('调用接口获取用户信息，type:', type)
 
 					// 调用接口获取用户信息
-					const result = await request.post('/user/getuser', {
+					const result = await request.post('sj/user/getUser', {
 						type
 					})
 
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 51468d0..67f1fac 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -177,13 +177,13 @@ export default {
 					title: "店铺装修",
 					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png",
 					// https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png
-					path: "/pages/shop/staff/distribution-service",
+					path: "/pages/shop/qualification_sj_change",
 					go_id_type: 1,
 				},
 				{
 					title: "财务管理",
 					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/edafae37-8258-4e1c-9dcc-019484117047.png",
-					path: "/pages/shop/staff/distribution-service",
+					path: "/pages/wallet/wallet",
 					go_id_type: 1,
 				},
 				],
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 92ee357..a557eec 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -1,731 +1,774 @@
-<template>
-	<view class="ruzhu-page">
-		<!-- 顶部导航栏 - 根据身份动态显示标题 -->
-		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
-
-		<!-- 步骤切换 -->
-		<step-tab v-if="currentStep !== 2" :mappedStep="mappedStep"></step-tab>
-
-		<!-- 内容区域根据身份和步骤显示不同内容 -->
-		<view class="content">
-			<view class="xieyi_content" v-if="currentStep === 0">
-				<rich-text :nodes="textData.text"></rich-text>
-			</view>
-
-			<view v-else-if="currentStep === 1">
-				<qualification-info ref="qualificationInfo"></qualification-info>
-			</view>
-
-			<view v-else-if="currentStep === 2">
-				<successruzhu :data="successData"></successruzhu>
-			</view>
-
-			<view v-else-if="currentStep === 3">
-				<store-info ref="storeInfo"></store-info>
-			</view>
-		</view>
-		<view class="kong"></view>
-
-		<!-- 底部按钮区域 -->
-		<view class="bottom-fixed">
-			<!-- 步骤0: 入驻协议 -->
-			<view v-if="currentStep === 0" class="step-0-buttons">
-				<view class="agree">
-					<image v-if="!isAgree" src="/static/images/agree_n.png" class="agree-btn" mode="aspectFit"
-						@click="isAgree = true"></image>
-					<image v-else src="/static/images/agree_y.png" class="agree-btn" mode="aspectFit"
-						@click="isAgree = false"></image>
-					<text class="agree-tip">我已阅读并同意以上协议</text>
-				</view>
-				<view class="next-btn" @click="goNext">
-					<text class="next-text">下一步，填写基本信息</text>
-				</view>
-			</view>
-
-			<!-- 步骤1: 资质信息 -->
-			<view v-else-if="currentStep === 1" class="step-1-buttons">
-				<view class="button-row">
-					<view class="prev-btn" @click="goPrev">
-						<text class="prev-text">上一步</text>
-					</view>
-					<view class="next-btn" @click="goNext">
-						<text class="next-text">提交入驻</text>
-					</view>
-				</view>
-			</view>
-
-			<!-- 步骤2: 提交成功 -->
-			<view v-else-if="currentStep === 2" class="step-2-buttons">
-				<view class="button-row">
-					<view class="prev-btn" @click="topt">
-						<text class="prev-text">进入平台</text>
-					</view>
-					<view class="submit-btn" @click="goNext">
-						<text class="submit-text">去完成资质认证</text>
-					</view>
-				</view>
-			</view>
-
-			<!-- 步骤3: 门店信息 -->
-			<view v-else-if="currentStep === 3" class="step-2-buttons">
-				<view class="button-row">
-					<view class="prev-btn" @click="goPrev">
-						<text class="prev-text">上一步</text>
-					</view>
-					<view class="submit-btn" @click="submitApplication">
-						<text class="submit-text">提交申请</text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import request from '../../utils/request';
-	import StepTab from '@/components/step-tab/step-tab.vue';
-	import QualificationInfo from './qualification_sj.vue';
-	import StoreInfo from './sj-info.vue';
-	import successruzhu from './successruzhu.vue';
-
-	export default {
-		components: {
-			StepTab,
-			QualificationInfo,
-			StoreInfo,
-			successruzhu
-		},
-		data() {
-			return {
-				currentStep:3, // 当前步骤索引
-				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;
-				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'
-				})
-			},
-			// 获取用户信息（复用不可服务时间页面的方法）
-			async getUserInfoSync() {
-				await request.post('/sj/userSjAuth/details', {
-					type: 1
-				}).then(result => {
-					if (result.code == 200 && result.data) {
-						let data = result.data
-						if (getApp().globalData.artisanType == 2) {
-
-							let qualification_form_data = {
-							"uscc_type": data.uscc_type || '',
-							// "contact_identity": 'legal',
-							// "contact_name": data.legal_name || data.contact_name || '',
-							"contact_phone": data.legal_phone || data.contact_phone || '',
-							"backup_phone": data.backup_phone || '',
-							"invite_code": data.invite_code_other || '',
-							"dependency": data.dependency || '',
-							"address": data.address || '',
-							"dependency_code": data.dependency_code || '',
-							"dependency_province": data.dependency_province || '',
-							"dependency_city": data.dependency_city || '',
-							"longitude": data.longitude || '',
-							"latitude": data.latitude || '',
-							"name": data.name || '',
-							"contact_type": data.contact_type || ''
-							
-						}
-						uni.setStorageSync('qualification_form_data', qualification_form_data);
-						let store_info_form_data = {
-							"head_photo": data.head_photo,
-							"name": data.name,
-							"business_time": data.business_time,
-							// "servers_kill": data.servers_kill,
-							"apply_state": data.apply_state,
-							"invite_code_other": data.invite_code_other,
-							"major": data.major
-						}
-						console.log(111111111, store_info_form_data)
-						uni.setStorageSync('store_info_form_data', store_info_form_data);
-						}
-
-					}
-				}).catch(error => {
-					console.error('获取用户信息接口错误:', error);
-				});
-			},
-			// 检查并传递地址给商家组件
-			checkAndPassAddressToSj() {
-				try {
-					const sjAddress = uni.getStorageSync('sj_selected_address');
-					if (sjAddress) {
-						console.log('找到商家地址数据，准备传递:', sjAddress);
-
-						setTimeout(() => {
-						if (this.identity === 2 && this.$refs.qualificationInfo) {
-							console.log('传递地址给资质组件');
-							if (typeof this.$refs.qualificationInfo.handleAddressSelected === 'function') {
-								this.$refs.qualificationInfo.handleAddressSelected(sjAddress);
-							}
-						}
-						uni.removeStorageSync('sj_selected_address');
-					}, 300);
-					}
-				} catch (e) {
-					console.error('处理商家地址失败:', e);
-				}
-			},
-
-			// 新增方法：检查并传递地址数据
-			checkAndPassAddressData() {
-				try {
-					const syrAddress = uni.getStorageSync('syr_selected_address');
-					if (syrAddress && this.$refs.personalInfo) {
-						console.log('步骤切换时发现地址数据，传递给组件');
-
-						// 传递给组件
-						if (typeof this.$refs.personalInfo.handleAddressSelected === 'function') {
-							this.$refs.personalInfo.handleAddressSelected(syrAddress);
-						} else {
-							// 直接设置
-							this.$refs.personalInfo.formData.detail_address = syrAddress.address;
-							this.$refs.personalInfo.formData.longitude = syrAddress.longitude;
-							this.$refs.personalInfo.formData.latitude = syrAddress.latitude;
-							this.$refs.personalInfo.saveFormDataToLocal();
-							this.$refs.personalInfo.$forceUpdate();
-						}
-
-						// 清理
-						uni.removeStorageSync('syr_selected_address');
-					}
-				} catch (e) {
-					console.error('检查地址数据失败:', e);
-				}
-			},
-
-			// 检查用户信息
-			checkUserInfo() {
-				console.log('检查用户信息...');
-
-				// 从多种可能的存储位置检查用户信息
-				const sources = [{
-						name: '本地存储-userInfo',
-						data: uni.getStorageSync('userInfo')
-					},
-					{
-						name: '本地存储-loginInfo',
-						data: uni.getStorageSync('loginInfo')
-					},
-					{
-						name: '本地存储-token',
-						data: uni.getStorageSync('token')
-					}
-				];
-
-				sources.forEach(source => {
-					console.log(`${source.name}:`, source.data);
-				});
-
-				// 检查是否有token（确认登录状态）
-				const token = uni.getStorageSync('token');
-				if (!token) {
-					console.warn('未检测到登录token');
-					uni.showToast({
-						title: '请先登录',
-						icon: 'none'
-					});
-				}
-			},
-
-			// 获取用户信息（复用不可服务时间页面的方法）
-			getUserInfo() {
-				return new Promise((resolve, reject) => {
-					request.post('/sj/User/getUser', {
-						type: 1
-					}).then(result => {
-						if (result.state == 1) {
-							// 保存用户信息到全局数据和本地存储
-							uni.setStorageSync('userInfo', result.data);
-							console.log('用户信息获取成功:', result.data);
-							resolve(result.data);
-						} else {
-							console.error('获取用户信息失败:', result.msg);
-							reject(result.msg);
-						}
-					}).catch(error => {
-						console.error('获取用户信息接口错误:', error);
-						reject(error);
-					});
-				});
-			},
-
-			// 检查并获取用户信息
-			async checkAndGetUserInfo() {
-				// 先检查是否已有用户信息
-				const existingUserInfo = uni.getStorageSync('userInfo');
-				if (existingUserInfo && existingUserInfo.account) {
-					console.log('已有用户信息:', existingUserInfo);
-					return existingUserInfo;
-				}
-
-				// 如果没有，则调用接口获取
-				try {
-					const userInfo = await this.getUserInfo();
-					return userInfo;
-				} catch (error) {
-					console.error('获取用户信息失败:', error);
-					uni.showModal({
-						title: '提示',
-						content: '获取用户信息失败，请重新登录',
-						showCancel: false,
-						success: () => {
-							uni.navigateTo({
-								url: '/pages/login/login'
-							});
-						}
-					});
-					return null;
-				}
-			},
-
-			// 审核提交方法
-			async submitForReview() {
-				const userInfo = await this.checkAndGetUserInfo();
-				if (!userInfo) {
-					return;
-				}
-
-				uni.showLoading({ title: '提交中...' });
-
-				try {
-					let formData = this.buildBusinessData(this.qualificationData, {});
-					formData.type = 1;
-					formData.id_type = 1;
-
-					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) {
-				console.log(qualificationData,'storeDatastoreDatastoreData');
-				const formData = {};
-
-				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.storeInfoData = this.$refs.storeInfo.getFormData();
-				}
-
-				uni.showLoading({ title: '提交中...' });
-				try {
-					let formData = {};
-					if (this.qualificationData) {
-						Object.assign(formData, this.qualificationData);
-					}
-					if (this.storeInfoData) {
-						Object.assign(formData, this.storeInfoData);
-					}
-					formData.type = 1;
-					formData.id_type = 1;
-					const res = await request.post('/sj/userSjAuth/apply', formData);
-					uni.hideLoading();
-					if (res.state == 1 || res.code == 200) {
-						uni.showToast({ title: '提交成功', icon: 'none' });
-					} else {
-						uni.showToast({ title: res.msg || '提交失败', icon: 'none' });
-					}
-				} catch (error) {
-					uni.hideLoading();
-					uni.showToast({ title: '提交失败，请重试', icon: 'none' });
-				}
-			},
-
-			goPrev() {
-				if (this.currentStep > 0) {
-					this.currentStep--;
-				}
-			},
-			scrollToTop() {
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 0
-				});
-			},
-			async getXieyi(type) {
-				this.loading = true;
-				this.error = null;
-				try {
-					const res = await request.post('/user/getsystemtext', {
-						type
-					});
-					this.textData = res.data;
-				} catch (err) {
-					console.error('获取协议失败:', err);
-					this.error = '获取协议内容失败，请重试';
-					uni.showToast({
-						title: '获取协议内容失败',
-						icon: 'none'
-					});
-				} finally {
-					this.loading = false;
-				}
-			},
-		}
-	}
-</script>
-
-<style>
-	.ruzhu-page {
-		background: #f5f5f5;
-	}
-
-	.content {
-		padding: 20rpx 20rpx 50rpx 20rpx;
-		box-sizing: border-box;
-	}
-
-	.xieyi_content {
-		padding: 20rpx;
-		background: #ffffff;
-		border-radius: 20rpx;
-	}
-
-	.ruzhu-cont {
-		padding: 24rpx;
-		background-color: #fff;
-	}
-
-	.ruzhu-text {
-		font-size: 28rpx;
-		color: #3D3D3D;
-		font-weight: 400;
-	}
-
-	.kong {
-		width: 100vw;
-		height: 180rpx;
-	}
-
-	/* 底部按钮区域样式 */
-	.bottom-fixed {
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		background-color: #ffffff;
-		padding: 24rpx 0;
-	}
-
-	/* 步骤0按钮布局 */
-	.step-0-buttons {
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	/* 步骤0中的下一步按钮*/
-	.step-0-buttons .next-btn {
-		width: 702rpx;
-		height: 98rpx !important;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: #FF4767;
-		border-radius: 49rpx;
-	}
-
-	.step-0-buttons .next-text {
-		color: #ffffff;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	/* 步骤1和步骤2按钮布局 */
-	.step-1-buttons,
-	.step-2-buttons {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	/* 步骤1中的按钮 */
-	.step-1-buttons .next-btn {
-		flex: 1;
-		height: 98rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: #FF4767;
-		border-radius: 49rpx;
-	}
-
-	.step-1-buttons .next-text {
-		color: #ffffff;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	/* 步骤2中的提交按钮 */
-	.step-2-buttons .submit-btn {
-		flex: 1;
-		height: 98rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-		border-radius: 49rpx;
-	}
-
-	.step-2-buttons .submit-text {
-		color: #ffffff;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	/* 上一步按钮 - 统一所有步骤中的样式 */
-	.prev-btn {
-		width: 249rpx;
-		height: 98rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background-color: #f8f8f8;
-		border-radius: 60rpx;
-	}
-
-	.prev-text {
-		color: #E8101E;
-		font-size: 36rpx;
-		font-weight: 500;
-	}
-
-	.button-row {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		width: 702rpx;
-		height: 147rpx;
-		gap: 20rpx;
-	}
-
-	.agree {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-		margin-bottom: 24rpx;
-	}
-
-	.agree-btn {
-		width: 32rpx;
-		height: 32rpx;
-		margin-right: 13rpx;
-	}
-
-	.agree-tip {
-		font-size: 26rpx;
-		font-weight: 400;
-		color: #666666;
-	}
-
-	.next-text {
-		color: #ffffff;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	.prev-text {
-		color: #333;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	.submit-text {
-		color: #ffffff;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-</style>
\ No newline at end of file
+<template>
+	<view class="ruzhu-page">
+		<!-- 顶部导航栏 - 根据身份动态显示标题 -->
+		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
+
+		<!-- 步骤切换 -->
+		<step-tab v-if="currentStep !== 2" :mappedStep="mappedStep"></step-tab>
+
+		<!-- 内容区域根据身份和步骤显示不同内容 -->
+		<view class="content">
+			<view class="xieyi_content" v-if="currentStep === 0">
+				<rich-text :nodes="textData.text"></rich-text>
+			</view>
+
+			<view v-else-if="currentStep === 1">
+				<qualification-info ref="qualificationInfo"></qualification-info>
+			</view>
+
+			<view v-else-if="currentStep === 2">
+				<successruzhu :data="successData"></successruzhu>
+			</view>
+
+			<view v-else-if="currentStep === 3">
+				<store-info ref="storeInfo"></store-info>
+			</view>
+		</view>
+		<view class="kong"></view>
+
+		<!-- 底部按钮区域 -->
+		<view class="bottom-fixed">
+			<!-- 步骤0: 入驻协议 -->
+			<view v-if="currentStep === 0" class="step-0-buttons">
+				<view class="agree">
+					<image v-if="!isAgree" src="/static/images/agree_n.png" class="agree-btn" mode="aspectFit"
+						@click="isAgree = true"></image>
+					<image v-else src="/static/images/agree_y.png" class="agree-btn" mode="aspectFit"
+						@click="isAgree = false"></image>
+					<text class="agree-tip">我已阅读并同意以上协议</text>
+				</view>
+				<view class="next-btn" @click="goNext">
+					<text class="next-text">下一步，填写基本信息</text>
+				</view>
+			</view>
+
+			<!-- 步骤1: 资质信息 -->
+			<view v-else-if="currentStep === 1" class="step-1-buttons">
+				<view class="button-row">
+					<view class="prev-btn" @click="goPrev">
+						<text class="prev-text">上一步</text>
+					</view>
+					<view class="next-btn" @click="goNext">
+						<text class="next-text">提交入驻</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 步骤2: 提交成功 -->
+			<view v-else-if="currentStep === 2" class="step-2-buttons">
+				<view class="button-row">
+					<view class="prev-btn" @click="topt">
+						<text class="prev-text">进入平台</text>
+					</view>
+					<view class="submit-btn" @click="goNext">
+						<text class="submit-text">去完成资质认证</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 步骤3: 门店信息 -->
+			<view v-else-if="currentStep === 3" class="step-2-buttons">
+				<view class="button-row">
+					<view class="prev-btn" @click="goPrev">
+						<text class="prev-text">上一步</text>
+					</view>
+					<view class="submit-btn" @click="submitApplication">
+						<text class="submit-text">提交申请</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import request from '../../utils/request';
+import StepTab from '@/components/step-tab/step-tab.vue';
+import QualificationInfo from './qualification_sj.vue';
+import StoreInfo from './sj-info.vue';
+import successruzhu from './successruzhu.vue';
+
+export default {
+	components: {
+		StepTab,
+		QualificationInfo,
+		StoreInfo,
+		successruzhu
+	},
+	data() {
+		return {
+			currentStep: 3, // 当前步骤索引
+			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;
+			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'
+			})
+		},
+		// 获取用户信息（复用不可服务时间页面的方法）
+		async getUserInfoSync() {
+			await request.post('/sj/userSjAuth/details', {
+				type: 1
+			}).then(result => {
+				if (result.code == 200 && result.data) {
+					let data = result.data
+					if (getApp().globalData.artisanType == 2) {
+
+						let qualification_form_data = {
+							"uscc_type": data.uscc_type || '',
+							// "contact_identity": 'legal',
+							// "contact_name": data.legal_name || data.contact_name || '',
+							"contact_phone": data.legal_phone || data.contact_phone || '',
+							"backup_phone": data.backup_phone || '',
+							"invite_code": data.invite_code_other || '',
+							"dependency": data.dependency || '',
+							"address": data.address || '',
+							"dependency_code": data.dependency_code || '',
+							"dependency_province": data.dependency_province || '',
+							"dependency_city": data.dependency_city || '',
+							"longitude": data.longitude || '',
+							"latitude": data.latitude || '',
+							"name": data.name || '',
+							"contact_type": data.contact_type || ''
+
+						}
+						uni.setStorageSync('qualification_form_data', qualification_form_data);
+						let store_info_form_data = {
+							"head_photo": data.head_photo,
+							"name": data.name,
+							"business_time": data.business_time,
+							// "servers_kill": data.servers_kill,
+							"apply_state": data.apply_state,
+							"invite_code_other": data.invite_code_other,
+							"major": data.major
+						}
+						console.log(111111111, store_info_form_data)
+						uni.setStorageSync('store_info_form_data', store_info_form_data);
+					}
+
+				}
+			}).catch(error => {
+				console.error('获取用户信息接口错误:', error);
+			});
+		},
+		// 检查并传递地址给商家组件
+		checkAndPassAddressToSj() {
+			try {
+				const sjAddress = uni.getStorageSync('sj_selected_address');
+				if (sjAddress) {
+					console.log('找到商家地址数据，准备传递:', sjAddress);
+
+					setTimeout(() => {
+						if (this.identity === 2 && this.$refs.qualificationInfo) {
+							console.log('传递地址给资质组件');
+							if (typeof this.$refs.qualificationInfo.handleAddressSelected === 'function') {
+								this.$refs.qualificationInfo.handleAddressSelected(sjAddress);
+							}
+						}
+						uni.removeStorageSync('sj_selected_address');
+					}, 300);
+				}
+			} catch (e) {
+				console.error('处理商家地址失败:', e);
+			}
+		},
+
+		// 新增方法：检查并传递地址数据
+		checkAndPassAddressData() {
+			try {
+				const syrAddress = uni.getStorageSync('syr_selected_address');
+				if (syrAddress && this.$refs.personalInfo) {
+					console.log('步骤切换时发现地址数据，传递给组件');
+
+					// 传递给组件
+					if (typeof this.$refs.personalInfo.handleAddressSelected === 'function') {
+						this.$refs.personalInfo.handleAddressSelected(syrAddress);
+					} else {
+						// 直接设置
+						this.$refs.personalInfo.formData.detail_address = syrAddress.address;
+						this.$refs.personalInfo.formData.longitude = syrAddress.longitude;
+						this.$refs.personalInfo.formData.latitude = syrAddress.latitude;
+						this.$refs.personalInfo.saveFormDataToLocal();
+						this.$refs.personalInfo.$forceUpdate();
+					}
+
+					// 清理
+					uni.removeStorageSync('syr_selected_address');
+				}
+			} catch (e) {
+				console.error('检查地址数据失败:', e);
+			}
+		},
+
+		// 检查用户信息
+		checkUserInfo() {
+			console.log('检查用户信息...');
+
+			// 从多种可能的存储位置检查用户信息
+			const sources = [{
+				name: '本地存储-userInfo',
+				data: uni.getStorageSync('userInfo')
+			},
+			{
+				name: '本地存储-loginInfo',
+				data: uni.getStorageSync('loginInfo')
+			},
+			{
+				name: '本地存储-token',
+				data: uni.getStorageSync('token')
+			}
+			];
+
+			sources.forEach(source => {
+				console.log(`${source.name}:`, source.data);
+			});
+
+			// 检查是否有token（确认登录状态）
+			const token = uni.getStorageSync('token');
+			if (!token) {
+				console.warn('未检测到登录token');
+				uni.showToast({
+					title: '请先登录',
+					icon: 'none'
+				});
+			}
+		},
+
+		// 获取用户信息（复用不可服务时间页面的方法）
+		getUserInfo() {
+			return new Promise((resolve, reject) => {
+				request.post('/sj/User/getUser', {
+					type: 1
+				}).then(result => {
+					if (result.state == 1) {
+						// 保存用户信息到全局数据和本地存储
+						uni.setStorageSync('userInfo', result.data);
+						console.log('用户信息获取成功:', result.data);
+						resolve(result.data);
+					} else {
+						console.error('获取用户信息失败:', result.msg);
+						reject(result.msg);
+					}
+				}).catch(error => {
+					console.error('获取用户信息接口错误:', error);
+					reject(error);
+				});
+			});
+		},
+
+		// 检查并获取用户信息
+		async checkAndGetUserInfo() {
+			// 先检查是否已有用户信息
+			const existingUserInfo = uni.getStorageSync('userInfo');
+			if (existingUserInfo && existingUserInfo.account) {
+				console.log('已有用户信息:', existingUserInfo);
+				return existingUserInfo;
+			}
+
+			// 如果没有，则调用接口获取
+			try {
+				const userInfo = await this.getUserInfo();
+				return userInfo;
+			} catch (error) {
+				console.error('获取用户信息失败:', error);
+				uni.showModal({
+					title: '提示',
+					content: '获取用户信息失败，请重新登录',
+					showCancel: false,
+					success: () => {
+						uni.navigateTo({
+							url: '/pages/login/login'
+						});
+					}
+				});
+				return null;
+			}
+		},
+
+		// 审核提交方法
+		async submitForReview() {
+			const userInfo = await this.checkAndGetUserInfo();
+			if (!userInfo) {
+				return;
+			}
+
+			uni.showLoading({
+				title: '提交中...'
+			});
+
+			try {
+				let formData = this.buildBusinessData(this.qualificationData, {});
+				formData.type = 1;
+				formData.id_type = 1;
+				if (Array.isArray(formData.qualifications_sector)) {
+					formData.qualifications_sector = JSON.stringify(formData.qualifications_sector);
+				}
+				if (Array.isArray(formData.qualifications_other)) {
+					formData.qualifications_other = JSON.stringify(formData.qualifications_other);
+				}
+				const res = await request.post('/sj/userSjAuth/applyOne', formData);
+				uni.hideLoading();
+
+				if (res.state == 1 || res.code == 200) {
+					this.successData = res.data.customer_service
+					console.log(this.successData,
+						'this.successDatathis.successDatathis.successDatathis.successData=======');
+					uni.showToast({
+						title: '提交成功',
+						icon: 'none',
+						duration: 1500
+					});
+					setTimeout(() => {
+						this.currentStep = 2;
+					}, 1500);
+				} else {
+					uni.showToast({
+						title: res.msg || '提交失败',
+						icon: 'none'
+					});
+				}
+			} catch (error) {
+				uni.hideLoading();
+				uni.showToast({
+					title: '提交失败，请重试',
+					icon: 'none'
+				});
+			}
+		},
+
+		// 构建商家数据
+		buildBusinessData(qualificationData, storeData) {
+			qualificationData = qualificationData || {};
+			storeData = storeData || {};
+			console.log(qualificationData, 'storeDatastoreDatastoreData');
+			const formData = {};
+			Object.assign(formData, storeData);
+
+			if (qualificationData.uscc_type) {
+				formData.uscc_type = qualificationData.uscc_type;
+			}
+			// if (qualificationData.contact_identity) {
+			// 	formData.contact_identity = qualificationData.contact_identity;
+			// }
+			// if (qualificationData.contact_name) {
+			// 	formData.contact_name = qualificationData.contact_name;
+			// }
+			if (qualificationData.contact_phone) {
+				formData.contact_phone = qualificationData.contact_phone;
+			}
+			if (qualificationData.backup_phone) {
+				formData.backup_phone = qualificationData.backup_phone;
+			}
+			if (qualificationData.contact_type) {
+				formData.contact_type = qualificationData.contact_type;
+			}
+			if (qualificationData.invite_code) {
+				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.storeInfoData = this.$refs.storeInfo.getFormData();
+			}
+
+			uni.showLoading({
+				title: '提交中...'
+			});
+			try {
+				const formData = this.buildBusinessData(this.qualificationData, this.storeInfoData);
+				if (!formData) {
+					uni.hideLoading();
+					return;
+				}
+				formData.type = 1;
+				formData.id_type = 1;
+				console.log(formData, '-----------');
+				if (formData.legal_idcard_expiry_start && formData.legal_idcard_expiry_end) {
+					formData.legal_idcard_expiry =
+						formData.legal_idcard_expiry_end === '长久有效' ?
+							`${formData.legal_idcard_expiry_start} —— 长久` :
+							`${formData.legal_idcard_expiry_start} —— ${formData.legal_idcard_expiry_end}`;
+				}
+				delete formData.legal_idcard_expiry_start
+				delete formData.legal_idcard_expiry_end
+				delete formData.contact_phone
+				delete formData.contact_type
+				delete formData.contact_name
+				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) {
+					uni.showToast({
+						title: '提交成功',
+						icon: 'none'
+					});
+					uni.navigateTo({
+						url: '/pages/shop/qualification_sj_change'
+					})
+				} else {
+					uni.showToast({
+						title: res.msg || '提交失败了',
+						icon: 'none'
+					});
+				}
+			} catch (error) {
+				console.error('提交失败：', error);
+				uni.hideLoading();
+				uni.showToast({
+					title: '提交失败，请重试',
+					icon: 'none'
+				});
+			}
+		},
+
+		goPrev() {
+			if (this.currentStep > 0) {
+				this.currentStep--;
+			}
+		},
+		scrollToTop() {
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+			});
+		},
+		async getXieyi(type) {
+			this.loading = true;
+			this.error = null;
+			try {
+				const res = await request.post('/user/getsystemtext', {
+					type
+				});
+				this.textData = res.data;
+			} catch (err) {
+				console.error('获取协议失败:', err);
+				this.error = '获取协议内容失败，请重试';
+				uni.showToast({
+					title: '获取协议内容失败',
+					icon: 'none'
+				});
+			} finally {
+				this.loading = false;
+			}
+		},
+	}
+}
+</script>
+
+<style>
+.ruzhu-page {
+	background: #f5f5f5;
+}
+
+.content {
+	padding: 20rpx 20rpx 50rpx 20rpx;
+	box-sizing: border-box;
+}
+
+.xieyi_content {
+	padding: 20rpx;
+	background: #ffffff;
+	border-radius: 20rpx;
+}
+
+.ruzhu-cont {
+	padding: 24rpx;
+	background-color: #fff;
+}
+
+.ruzhu-text {
+	font-size: 28rpx;
+	color: #3D3D3D;
+	font-weight: 400;
+}
+
+.kong {
+	width: 100vw;
+	height: 180rpx;
+}
+
+/* 底部按钮区域样式 */
+.bottom-fixed {
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	background-color: #ffffff;
+	padding: 24rpx 0;
+}
+
+/* 步骤0按钮布局 */
+.step-0-buttons {
+	display: flex;
+	flex-flow: column nowrap;
+	justify-content: center;
+	align-items: center;
+}
+
+/* 步骤0中的下一步按钮*/
+.step-0-buttons .next-btn {
+	width: 702rpx;
+	height: 98rpx !important;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background: #FF4767;
+	border-radius: 49rpx;
+}
+
+.step-0-buttons .next-text {
+	color: #ffffff;
+	font-size: 32rpx;
+	font-weight: 500;
+}
+
+/* 步骤1和步骤2按钮布局 */
+.step-1-buttons,
+.step-2-buttons {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+/* 步骤1中的按钮 */
+.step-1-buttons .next-btn {
+	flex: 1;
+	height: 98rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background: #FF4767;
+	border-radius: 49rpx;
+}
+
+.step-1-buttons .next-text {
+	color: #ffffff;
+	font-size: 32rpx;
+	font-weight: 500;
+}
+
+/* 步骤2中的提交按钮 */
+.step-2-buttons .submit-btn {
+	flex: 1;
+	height: 98rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+	border-radius: 49rpx;
+}
+
+.step-2-buttons .submit-text {
+	color: #ffffff;
+	font-size: 32rpx;
+	font-weight: 500;
+}
+
+/* 上一步按钮 - 统一所有步骤中的样式 */
+.prev-btn {
+	width: 249rpx;
+	height: 98rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: #f8f8f8;
+	border-radius: 60rpx;
+}
+
+.prev-text {
+	color: #E8101E;
+	font-size: 36rpx;
+	font-weight: 500;
+}
+
+.button-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 702rpx;
+	height: 147rpx;
+	gap: 20rpx;
+}
+
+.agree {
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: center;
+	align-items: center;
+	margin-bottom: 24rpx;
+}
+
+.agree-btn {
+	width: 32rpx;
+	height: 32rpx;
+	margin-right: 13rpx;
+}
+
+.agree-tip {
+	font-size: 26rpx;
+	font-weight: 400;
+	color: #666666;
+}
+
+.next-text {
+	color: #ffffff;
+	font-size: 32rpx;
+	font-weight: 500;
+}
+
+.prev-text {
+	color: #333;
+	font-size: 32rpx;
+	font-weight: 500;
+}
+
+.submit-text {
+	color: #ffffff;
+	font-size: 32rpx;
+	font-weight: 500;
+}
+</style>
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index ae76b31..b0cdc2d 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -10,9 +10,8 @@
       <view class="form-item-one box-cont">
         <text class="label required">资质照片</text>
         <text class="upload-desc">请保证照片上的文字清晰、无遮挡、证件边角可见</text>
-        <view class="" @click="chooseImage('business_license')">
-          <image v-if="formData.business_license" :src="formData.business_license" mode="aspectFill"
-            class="upload-preview"></image>
+        <view class="" @click="chooseImage('uscc_photo')">
+          <image v-if="formData.uscc_photo" :src="formData.uscc_photo" mode="aspectFill" class="upload-preview"></image>
           <view class="" v-else>
             <image
               src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa75ea1c-8f9d-4b2a-8d0c-b94de516afd0.png"
@@ -24,32 +23,32 @@
 
       <view class="form-item-two box-cont">
         <text class="label required">商户类型</text>
-        <input type="text" v-model="formData.household_type" placeholder="请输入商户类型" placeholder-class="placeholder"
-          class="input" @input="saveFormDataToLocalDebounce" />
+        <input type="text" v-model="formData.uscc_type" placeholder="请输入商户类型" placeholder-class="placeholder"
+          class="input" />
       </view>
 
       <view class="form-item-two box-cont">
         <text class="label required">证件号码</text>
         <view class="picker-content">
-          <input type="text" v-model="formData.license_number" placeholder="请输入营业执照的证件号码"
-            placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
+          <input type="text" v-model="formData.uscc_num" placeholder="请输入营业执照的证件号码" placeholder-class="placeholder"
+            class="input" />
           <image class="label-icon"
             src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
-            mode="aspectFit" @click.stop="showTipPopup('license_number')"></image>
+            mode="aspectFit" @click.stop="showTipPopup('uscc_num')"></image>
         </view>
       </view>
 
       <view class="form-item-two box-cont">
         <text class="label required">营业名称</text>
-        <input type="text" v-model="formData.business_name" placeholder="请输入营业执照的企业名称" placeholder-class="placeholder"
-          class="input" @input="saveFormDataToLocalDebounce" />
+        <input type="text" v-model="formData.uscc_name" placeholder="请输入营业执照的企业名称" placeholder-class="placeholder"
+          class="input" />
       </view>
 
       <view class="form-item-two box-cont" @click="showRegionPicker">
         <text class="label required">注册地区</text>
         <view class="picker-content">
-          <text :class="formData.register_region ? 'picker-value' : 'placeholder1'">
-            {{ formData.register_region || '请选择' }}
+          <text :class="formData.uscc_dependency ? 'picker-value' : 'placeholder1'">
+            {{ formData.uscc_dependency || '请选择' }}
           </text>
           <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
             class="arrow-right" mode="aspectFit"></image>
@@ -59,53 +58,10 @@
       <view class="form-item-two box-cont">
         <text class="label required">注册详细地址</text>
         <view class="picker-content">
-          <input type="text" v-model="formData.register_address" placeholder="请输入注册地址" placeholder-class="placeholder"
-            class="input" @input="saveFormDataToLocalDebounce" />
+          <input type="text" v-model="formData.uscc_address" placeholder="请输入注册地址" placeholder-class="placeholder"
+            class="input" />
         </view>
-      </view>
-	  <view class="form-item-column box-cont">
-	    <text class="label required">营业执照有效期至：</text>
-	    <view class="radio-group">
-	      <view class="radio-item" @click="setIdcardExpiryType('permanent')">
-	        <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
-	          <image v-if="formData.legal_idcard_expiry_type === 'permanent'"
-	            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
-	            class="radio-icon-image" mode="aspectFit"></image>
-	        </view>
-	        <text class="radio-label">永久有效</text>
-	      </view>
-	      <view class="radio-item" @click="setIdcardExpiryType('date')">
-	        <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
-	          <image v-if="formData.legal_idcard_expiry_type === 'date'"
-	            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
-	            class="radio-icon-image" mode="aspectFit"></image>
-	        </view>
-	        <text class="radio-label">指定日期有效</text>
-	      </view>
-	    </view>
-	  </view>
-	  <view class="date-row box-cont">
-	    <view class="date-col" @click="showDatePicker('start')">
-	      <text class="date-label">开始日期</text>
-	      <view class="date-input-box">
-	        <text :class="formData.idcard_start_date ? 'date-value' : 'date-placeholder'">
-	          {{ formData.idcard_start_date || '选择日期' }}
-	        </text>
-	        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
-	          class="date-icon" mode="aspectFit"></image>
-	      </view>
-	    </view>
-	    <view class="date-col" @click="showDatePicker('end')">
-	      <text class="date-label">结束日期</text>
-	      <view class="date-input-box">
-	        <text :class="formData.idcard_end_date ? 'date-value' : 'date-placeholder'">
-	          {{ formData.idcard_end_date || '选择日期' }}
-	        </text>
-	        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
-	          class="date-icon" mode="aspectFit"></image>
-	      </view>
-	    </view>
-	  </view>
+      </view>
     </view>
 
     <view class="section">
@@ -117,8 +73,9 @@
       <view class="form-item-one box-cont">
         <text class="label required">身份证照片</text>
         <text class="upload-desc">请保证照片上的文字清晰、无遮挡、证件边角可见</text>
-        <view class="upload-area" @click="chooseImage('id_card_front')">
-          <image v-if="formData.id_card_front" :src="formData.id_card_front" mode="aspectFill" class="upload-preview">
+        <view class="upload-area" @click="chooseImage('legal_idcard_positive')">
+          <image v-if="formData.legal_idcard_positive" :src="formData.legal_idcard_positive" mode="aspectFill"
+            class="upload-preview">
           </image>
           <view class="" v-else>
             <image
@@ -127,8 +84,9 @@
           </view>
           <text class="placeholder1 required">请上传身份证正面(人像面)</text>
         </view>
-        <view class="upload-area" @click="chooseImage('id_card_back')" style="margin-top: 48rpx;">
-          <image v-if="formData.id_card_back" :src="formData.id_card_back" mode="aspectFill" class="upload-preview">
+        <view class="upload-area" @click="chooseImage('legal_idcard_negative')" style="margin-top: 48rpx;">
+          <image v-if="formData.legal_idcard_negative" :src="formData.legal_idcard_negative" mode="aspectFill"
+            class="upload-preview">
           </image>
           <view class="" v-else>
             <image
@@ -141,36 +99,36 @@
 
       <view class="form-item-two box-cont">
         <text class="label required">法人代表</text>
-        <input type="text" v-model="formData.legal_person" placeholder="请输入营业执照的法人代表" placeholder-class="placeholder"
-          class="input" @input="saveFormDataToLocalDebounce" />
+        <input type="text" v-model="formData.legal_name" placeholder="请输入营业执照的法人代表" placeholder-class="placeholder"
+          class="input" />
       </view>
 
       <view class="form-item-two box-cont">
         <text class="label required">法人联系方式</text>
         <input type="number" v-model="formData.legal_phone" placeholder="请输入法人的联系方式" placeholder-class="placeholder"
-          class="input" @input="saveFormDataToLocalDebounce" />
+          class="input" />
       </view>
 
       <view class="form-item-two box-cont">
         <text class="label required">法人身份证号</text>
-        <input type="text" v-model="formData.legal_id_number" placeholder="请输入法人的身份证号码" placeholder-class="placeholder"
-          class="input" @input="saveFormDataToLocalDebounce" />
+        <input type="text" v-model="formData.legal_idcard_num" placeholder="请输入法人的身份证号码" placeholder-class="placeholder"
+          class="input" />
       </view>
 
       <view class="form-item-column box-cont">
-        <text class="label required">营业执照有效期至：</text>
+        <text class="label required">身份证有效期：</text>
         <view class="radio-group">
-          <view class="radio-item" @click="setIdcardExpiryType('permanent')">
-            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
-              <image v-if="formData.legal_idcard_expiry_type === 'permanent'"
+          <view class="radio-item" @click="setIdcardExpiryType('1')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === '1' }">
+              <image v-if="formData.legal_idcard_expiry_type === '1'"
                 src="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="setIdcardExpiryType('date')">
-            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
-              <image v-if="formData.legal_idcard_expiry_type === 'date'"
+          <view class="radio-item" @click="setIdcardExpiryType('2')">
+            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === '2' }">
+              <image v-if="formData.legal_idcard_expiry_type === '2'"
                 src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
                 class="radio-icon-image" mode="aspectFit"></image>
             </view>
@@ -182,20 +140,22 @@
         <view class="date-col" @click="showDatePicker('start')">
           <text class="date-label">开始日期</text>
           <view class="date-input-box">
-            <text :class="formData.idcard_start_date ? 'date-value' : 'date-placeholder'">
-              {{ formData.idcard_start_date || '选择日期' }}
+            <text :class="formData.legal_idcard_expiry_start ? 'date-value' : 'date-placeholder'">
+              {{ formData.legal_idcard_expiry_start || '选择日期' }}
             </text>
-            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
               class="date-icon" mode="aspectFit"></image>
           </view>
         </view>
         <view class="date-col" @click="showDatePicker('end')">
           <text class="date-label">结束日期</text>
           <view class="date-input-box">
-            <text :class="formData.idcard_end_date ? 'date-value' : 'date-placeholder'">
-              {{ formData.idcard_end_date || '选择日期' }}
+            <text :class="formData.legal_idcard_expiry_end ? 'date-value' : 'date-placeholder'">
+              {{ formData.legal_idcard_expiry_end || '选择日期' }}
             </text>
-            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5b01823b-7672-4e60-b6cc-a4de52294605.png"
               class="date-icon" mode="aspectFit"></image>
           </view>
         </view>
@@ -212,30 +172,34 @@
       <view class="form-item-one box-cont">
         <text class="label required">行业资质</text>
         <view class="image-list">
-          <view class="image-item" v-for="(img, index) in formData.industry_qualifications" :key="'industry-' + index">
+          <view class="image-item" v-for="(img, index) in formData.qualifications_sector" :key="'industry-' + index">
             <image :src="img" mode="aspectFill" class="qualification-image"></image>
-            <view class="image-delete" @click="removeImage('industry_qualifications', index)">×</view>
+            <view class="image-delete" @click="removeImage('qualifications_sector', index)">×</view>
           </view>
-          <view class="image-add" @click="chooseMultiImage('industry_qualifications')"
-            v-if="formData.industry_qualifications.length < 9">
-            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png" mode="aspectFit" class="upload-icon-small"></image>
+          <view class="image-add" @click="chooseMultiImage('qualifications_sector')"
+            v-if="(formData.qualifications_sector || []).length < 9">
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png"
+              mode="aspectFit" class="upload-icon-small"></image>
             <text class="add-text">添加照片</text>
           </view>
-        </view>
-		<text class="label" style="margin-top: 30rpx;">其他资质</text>
-		  <view class="image-list">
-		    <view class="image-item" v-for="(img, index) in formData.other_qualifications" :key="'other-' + index">
-		      <image :src="img" mode="aspectFill" class="qualification-image"></image>
-		      <view class="image-delete" @click="removeImage('other_qualifications', index)">×</view>
-		    </view>
-		    <view class="image-add" @click="chooseMultiImage('other_qualifications')"
-		      v-if="formData.other_qualifications.length < 9">
-		      <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png" mode="aspectFit" class="upload-icon-small"></image>
-		      <text class="add-text">添加照片</text>
-		    </view>
-		  </view>
-		</view>
+        </view>
+        <text class="label" style="margin-top: 30rpx;">其他资质</text>
+        <view class="image-list">
+          <view class="image-item" v-for="(img, index) in formData.qualifications_other" :key="'other-' + index">
+            <image :src="img" mode="aspectFill" class="qualification-image"></image>
+            <view class="image-delete" @click="removeImage('qualifications_other', index)">×</view>
+          </view>
+          <view class="image-add" @click="chooseMultiImage('qualifications_other')"
+            v-if="(formData.qualifications_other || []).length < 9">
+            <image
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png"
+              mode="aspectFit" class="upload-icon-small"></image>
+            <text class="add-text">添加照片</text>
+          </view>
+        </view>
       </view>
+    </view>
 
     <view class="popup" :class="{ show: showRegionPopupFlag }">
       <view class="popup-mask" @click="hideRegionPopup"></view>
@@ -319,35 +283,28 @@
 <script>
 import request from '../../utils/request';
 import ChinaCitys from '../../static/data/ChinaCitys.json';
-import {
-  debounce
-} from '@/utils/debounce.js';
+import { recognizeIdCard, recognizeBusinessLicense, parseValidPeriod } from '../../utils/orc';
 
 export default {
   data() {
-    const loadedData = this.loadFormDataFromLocal();
-
     return {
-      formData: loadedData || {
-        business_license: '',
-        household_type: '',
-        license_number: '',
-        business_name: '',
-        register_region: '',
-        register_address: '',
-        register_province: '',
-        register_city: '',
-        register_area: '',
-        id_card_front: '',
-        id_card_back: '',
-        legal_person: '',
+      formData: {
+        uscc_photo: '',
+        uscc_type: '',
+        uscc_num: '',
+        uscc_name: '',
+        uscc_dependency: '',
+        uscc_address: '',
+        legal_idcard_positive: '',
+        legal_idcard_negative: '',
+        legal_name: '',
         legal_phone: '',
-        legal_id_number: '',
-        legal_idcard_expiry_type: 'permanent',
-        idcard_start_date: '',
-        idcard_end_date: '',
-        industry_qualifications: [],
-        other_qualifications: []
+        legal_idcard_num: '',
+        legal_idcard_expiry_type: '1',
+        legal_idcard_expiry_start: '',
+        legal_idcard_expiry_end: '',
+        qualifications_sector: [],
+        qualifications_other: []
       },
       ChinaCitys: ChinaCitys,
       regionCitys: [],
@@ -358,6 +315,8 @@ export default {
       currentPickerType: 'start',
       datePickerValue: [0, 0, 0],
       indicatorStyle: 'height: 68rpx;',
+      isRecognizing: false,
+      recognizeType: '',
       userId: null,
       identity: 3
     }
@@ -396,29 +355,6 @@ export default {
       });
     },
 
-    loadFormDataFromLocal() {
-      try {
-        const stored = uni.getStorageSync('sj_info_form_data');
-        if (stored) return stored;
-      } catch (e) { }
-      return null;
-    },
-
-    saveFormDataToLocal() {
-      try {
-        uni.setStorageSync('sj_info_form_data', this.formData);
-      } catch (e) { }
-    },
-
-    saveFormDataToLocalDebounce() {
-      if (!this._saveDebounce) {
-        this._saveDebounce = debounce(() => {
-          this.saveFormDataToLocal();
-        }, 500);
-      }
-      this._saveDebounce();
-    },
-
     chooseImage(type) {
       uni.chooseImage({
         count: 1,
@@ -434,7 +370,13 @@ export default {
           const url = await this.directUpload(file, this.userId, 3);
           if (url) {
             this.$set(this.formData, type, url);
-            this.saveFormDataToLocal();
+            if (type === 'uscc_photo') {
+              await this.recognizeBusinessLicense(url);
+            } else if (type === 'legal_idcard_positive') {
+              await this.recognizeIdCardFront(url);
+            } else if (type === 'legal_idcard_negative') {
+              await this.recognizeIdCardBack(url);
+            }
           }
         }
       });
@@ -474,7 +416,6 @@ export default {
             }
           }
           this.$set(this.formData, type, current);
-          this.saveFormDataToLocal();
           uni.hideLoading();
         }
       });
@@ -484,7 +425,6 @@ export default {
       const list = [...this.formData[type]];
       list.splice(index, 1);
       this.$set(this.formData, type, list);
-      this.saveFormDataToLocal();
     },
 
     async directUpload(file, userId, type) {
@@ -554,14 +494,7 @@ export default {
       let province = this.ChinaCitys[index1].province;
       let city = this.regionCitys[index2].city;
       let area = this.regionAreas[index3].area;
-      this.formData.register_region = province + '-' + city + '-' + area;
-      this.formData.register_province = this.ChinaCitys[index1].code ? this.ChinaCitys[index1].code.toString()
-        .substring(0, 6) : '';
-      this.formData.register_city = this.regionCitys[index2].code ? this.regionCitys[index2].code.toString()
-        .substring(0, 6) : '';
-      this.formData.register_area = this.regionAreas[index3].code ? this.regionAreas[index3].code.toString()
-        .substring(0, 6) : '';
-      this.saveFormDataToLocal();
+      this.formData.uscc_dependency = province + '-' + city + '-' + area;
       this.hideRegionPopup();
     },
 
@@ -575,14 +508,13 @@ export default {
 
     setIdcardExpiryType(type) {
       this.$set(this.formData, 'legal_idcard_expiry_type', type);
-      if (type === 'permanent') {
-        this.formData.idcard_end_date = '长久有效';
+      if (type === '1') {
+        this.formData.legal_idcard_expiry_end = '长久有效';
       } else {
-        if (this.formData.idcard_end_date === '长久有效') {
-          this.formData.idcard_end_date = '';
+        if (this.formData.legal_idcard_expiry_end === '长久有效') {
+          this.formData.legal_idcard_expiry_end = '';
         }
       }
-      this.saveFormDataToLocal();
     },
 
     showDatePicker(type) {
@@ -604,78 +536,202 @@ export default {
       const day = this.days[this.datePickerValue[2]];
       const dateStr = `${year}年${month < 10 ? '0' + month : month}月${day < 10 ? '0' + day : day}日`;
       if (this.currentPickerType === 'start') {
-        this.formData.idcard_start_date = dateStr;
+        this.formData.legal_idcard_expiry_start = dateStr;
       } else {
-        this.formData.idcard_end_date = dateStr;
+        this.formData.legal_idcard_expiry_end = dateStr;
       }
-      this.saveFormDataToLocal();
       this.hideDatePicker();
     },
 
+    async recognizeBusinessLicense(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'uscc_photo';
+        uni.showLoading({ title: '正在识别营业执照...', mask: true });
+        const result = await recognizeBusinessLicense(imageUrl);
+        console.log('营业执照识别结果:', result);
+        const hasRecognizedData = this.checkBusinessLicenseRecognition(result);
+        if (!hasRecognizedData) {
+          uni.hideLoading();
+          uni.showToast({ title: '未识别到营业执照信息，请手动填写或重新拍摄', icon: 'none', duration: 3000 });
+          this.isRecognizing = false;
+          return;
+        }
+        let recognizedFields = 0;
+        if (result.uscc_name && result.uscc_name.trim() && result.uscc_name !== '无') {
+          this.$set(this.formData, 'uscc_name', result.uscc_name);
+          recognizedFields++;
+        }
+        if (result.uscc_num && result.uscc_num.trim()) {
+          this.$set(this.formData, 'uscc_num', result.uscc_num);
+          recognizedFields++;
+        }
+        if (result.uscc_type && result.uscc_type.trim()) {
+          this.$set(this.formData, 'uscc_type', result.uscc_type);
+          recognizedFields++;
+        }
+        uni.hideLoading();
+        if (recognizedFields > 0) {
+          uni.showToast({ title: '营业执照识别成功', icon: 'none', duration: 2000 });
+        } else {
+          uni.showToast({ title: '识别完成，但未获取到有效信息', icon: 'none', duration: 3000 });
+        }
+      } catch (error) {
+        console.error('营业执照识别失败:', error);
+        uni.hideLoading();
+        uni.showToast({ title: error.message || '识别失败，请手动填写', icon: 'none', duration: 3000 });
+      } finally {
+        this.isRecognizing = false;
+      }
+    },
+
+    checkBusinessLicenseRecognition(result) {
+      const requiredFields = ['uscc_num', 'uscc_name', 'uscc_type'];
+      for (const field of requiredFields) {
+        if (result[field] && result[field].trim()) return true;
+      }
+      return false;
+    },
+
+    async recognizeIdCardFront(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'legal_idcard_positive';
+        uni.showLoading({ title: '正在识别身份证正面...', mask: true });
+        const result = await recognizeIdCard(imageUrl, 1);
+        const hasRecognizedData = (result.name && result.name.trim()) || (result.id_number && result.id_number.trim());
+        if (!hasRecognizedData) {
+          uni.hideLoading();
+          uni.showToast({ title: '未识别到身份证信息，请手动填写或重新拍摄', icon: 'none', duration: 3000 });
+          this.isRecognizing = false;
+          return;
+        }
+        if (result.name) {
+          this.$set(this.formData, 'legal_name', result.name);
+        }
+        if (result.id_number) {
+          this.$set(this.formData, 'legal_idcard_num', result.id_number);
+        }
+        uni.hideLoading();
+        uni.showToast({ title: '身份证正面识别成功', icon: 'none' });
+      } catch (error) {
+        console.error('身份证正面识别失败:', error);
+        uni.hideLoading();
+        uni.showToast({ title: error.message || '识别失败，请手动填写', icon: 'none', duration: 3000 });
+      } finally {
+        this.isRecognizing = false;
+      }
+    },
+
+    async recognizeIdCardBack(imageUrl) {
+      try {
+        this.isRecognizing = true;
+        this.recognizeType = 'legal_idcard_negative';
+        uni.showLoading({ title: '正在识别身份证反面...', mask: true });
+        const result = await recognizeIdCard(imageUrl, 2);
+        const hasRecognizedData = (result.start_date && result.start_date.trim()) || (result.end_date && result.end_date.trim());
+        if (!hasRecognizedData) {
+          uni.hideLoading();
+          uni.showToast({ title: '未识别到身份证有效期信息，请手动填写或重新拍摄', icon: 'none', duration: 3000 });
+          this.isRecognizing = false;
+          return;
+        }
+        const validPeriod = parseValidPeriod(result.start_date, result.end_date);
+        if (validPeriod.startDate) {
+          this.$set(this.formData, 'legal_idcard_expiry_start', validPeriod.startDate);
+        }
+        if (validPeriod.isPermanent) {
+          this.$set(this.formData, 'legal_idcard_expiry_type', '1');
+          this.$set(this.formData, 'legal_idcard_expiry_end', '长久有效');
+        } else if (validPeriod.endDate) {
+          this.$set(this.formData, 'legal_idcard_expiry_type', '2');
+          this.$set(this.formData, 'legal_idcard_expiry_end', validPeriod.endDate);
+        }
+        uni.hideLoading();
+        uni.showToast({ title: '身份证反面识别成功', icon: 'none' });
+      } catch (error) {
+        console.error('身份证反面识别失败:', error);
+        uni.hideLoading();
+        uni.showToast({ title: error.message || '识别失败，请手动填写', icon: 'none', duration: 3000 });
+      } finally {
+        this.isRecognizing = false;
+      }
+    },
+
     showTipPopup(field) { },
 
     getFormData() {
       return this.formData;
     },
 
+    setData(data) {
+      if (!data) return;
+      const keys = Object.keys(this.formData);
+      keys.forEach(key => {
+        if (data[key] !== undefined && data[key] !== null) {
+          this.$set(this.formData, key, data[key]);
+        }
+      });
+    },
+
     saveFormData() {
-      if (!this.formData.business_license) {
+      if (!this.formData.uscc_photo) {
         uni.showToast({
           title: '请上传营业执照',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.household_type) {
+      if (!this.formData.uscc_type) {
         uni.showToast({
           title: '请选择户主类型',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.license_number) {
+      if (!this.formData.uscc_num) {
         uni.showToast({
           title: '请输入证件号码',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.business_name) {
+      if (!this.formData.uscc_name) {
         uni.showToast({
           title: '请输入营业名称',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.register_region) {
+      if (!this.formData.uscc_dependency) {
         uni.showToast({
           title: '请选择注册地区',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.register_address) {
+      if (!this.formData.uscc_address) {
         uni.showToast({
           title: '请输入注册详细地址',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.id_card_front) {
+      if (!this.formData.legal_idcard_positive) {
         uni.showToast({
           title: '请上传法人身份证正面',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.id_card_back) {
+      if (!this.formData.legal_idcard_negative) {
         uni.showToast({
           title: '请上传法人身份证反面',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.legal_person) {
+      if (!this.formData.legal_name) {
         uni.showToast({
           title: '请输入法人代表',
           icon: 'none'
@@ -696,35 +752,34 @@ export default {
         });
         return false;
       }
-      if (!this.formData.legal_id_number) {
+      if (!this.formData.legal_idcard_num) {
         uni.showToast({
           title: '请输入法人身份证号',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.idcard_start_date) {
+      if (!this.formData.legal_idcard_expiry_start) {
         uni.showToast({
           title: '请选择开始日期',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.idcard_end_date) {
+      if (!this.formData.legal_idcard_expiry_end) {
         uni.showToast({
           title: '请选择结束日期',
           icon: 'none'
         });
         return false;
       }
-      if (!this.formData.industry_qualifications || this.formData.industry_qualifications.length === 0) {
+      if (!this.formData.qualifications_sector || this.formData.qualifications_sector.length === 0) {
         uni.showToast({
           title: '请上传行业资质',
           icon: 'none'
         });
         return false;
       }
-      this.saveFormDataToLocal();
       return true;
     }
   }
@@ -1052,10 +1107,10 @@ export default {
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  border: 2rpx dashed #DDDDDD;
-  width: 214rpx;
-  height: 214rpx;
-  background: #F5F5F5;
+  border: 2rpx dashed #DDDDDD;
+  width: 214rpx;
+  height: 214rpx;
+  background: #F5F5F5;
   border-radius: 20rpx;
 }
 
diff --git a/pages/ruzhu/successruzhu.vue b/pages/ruzhu/successruzhu.vue
index f817e70..3aa4b2e 100644
--- a/pages/ruzhu/successruzhu.vue
+++ b/pages/ruzhu/successruzhu.vue
@@ -1,94 +1,110 @@
 <template>
 	<view class="pages">
-		<custom-navbar title="入驻成功" :showBack="true"></custom-navbar>
-		<view class="title-icon">恭喜您！</view>
-		<!-- <view class="title-icon">{{data.residency_notice}}</view> -->
-		<view class="title-content">成功入驻成为美融融门店</view>
-		<!-- <view class="title-content">{{data.approve_notice}}</view> -->
+		<custom-navbar :title="infoData.notice" :showBack="true"></custom-navbar>
+		<view class="title-icon">{{infoData.top}}</view>
+		<view class="title-content">{{infoData.title}}</view>
 		<view class="erweimabox">
-			<view class="erweimab">
-				<!-- <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/26bd4004-c7aa-4997-9f31-8562060e7659.jpeg" mode="" style="width: 404rpx;height: 404rpx;"></image> -->
-				<image :src="data.photo" mode="widthFix" style="width: 404rpx;border-radius:25rpx ;margin: 37rpx 0 0 36rpx;"></image>
-			</view>
+			<view class="erweimab">
+				<image :src="infoData.photo" mode="widthFix"
+					style="width: 404rpx;border-radius:25rpx ;margin: 37rpx 0 0 36rpx;"></image>
+			</view>
 			<view class="kefubtn">扫码联系专属客服</view>
-		</view>
+		</view>
 	</view>
 </template>
 
-<script>
-export default {
-  // 核心：用 props 接收
-  props: {
-    data: {
-      type: Object, // 类型：对象
-      default: () => ({}) // 默认空对象
-    }
-  },
-  
-  onLoad() {
-    // 在 JS 里使用
-    console.log(this.data,'--------------------')
-  }
-}
+<script>
+import request from '../../utils/request';
+
+export default {
+	props: {
+		data: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	data() {
+		return {
+			infoData: {}
+		}
+	},
+	mounted() {
+		this.getCustomerService();
+	},
+	methods: {
+		async getCustomerService() {
+			try {
+				const res = await request.post('/sj/userSjAuth/getCustomerService');
+				console.log('客服接口返回：', JSON.stringify(res));
+				if (res && (res.state == 1 || res.code == 200)) {
+					this.infoData = res.data || {};
+				}
+			} catch (e) {
+				console.error('获取客服信息失败：', e);
+			}
+		}
+	}
+}
 </script>
 
-<style>
-	.kefubtn{
-		height: 42rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 30rpx;
-		color: #5A5A5A;
-		line-height: 42rpx;
-		text-align: center;
-		font-style: normal;
-		margin-top: 23rpx;
-	}
-	.pages {
-		background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/467f6b5f-32dc-4ba3-847a-22be4569c45e.png');
-		background-size: 100%;
-		background-repeat: no-repeat;
-	}
+<style>
+.kefubtn {
+	height: 42rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	font-size: 30rpx;
+	color: #5A5A5A;
+	line-height: 42rpx;
+	text-align: center;
+	font-style: normal;
+	margin-top: 23rpx;
+}
 
-	.erweimab {
-		margin: 70rpx 0 0 103rpx;
-		width: 477rpx;
-		height: 477rpx;
-		background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e5461570-10e3-4e11-a6ca-8543f106639a.png');
-		background-size: 100%;
-		background-repeat: no-repeat;
-	}
+.pages {
+	background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/467f6b5f-32dc-4ba3-847a-22be4569c45e.png');
+	background-size: 100%;
+	background-repeat: no-repeat;
+}
 
-	.erweimabox {
-		margin: 71rpx 0 0 6rpx;
-		width: 690rpx;
-		height: 690rpx;
-		background: #FFFFFF;
-		border-radius: 62rpx;
-		border: 1rpx solid #F2F4F6;
-	}
+.erweimab {
+	margin: 70rpx 0 0 103rpx;
+	width: 477rpx;
+	height: 477rpx;
+	background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e5461570-10e3-4e11-a6ca-8543f106639a.png');
+	background-size: 100%;
+	background-repeat: no-repeat;
+}
 
-	.title-icon {
-		margin-left: 283rpx;
-		height: 67rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 48rpx;
-		color: #333333;
-		line-height: 67rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.erweimabox {
+	margin: 71rpx 0 0 6rpx;
+	width: 690rpx;
+	height: 690rpx;
+	background: #FFFFFF;
+	border-radius: 62rpx;
+	border: 1rpx solid #F2F4F6;
+}
 
-	.title-content {
-		margin: 14rpx 0 0 195rpx;
-		height: 42rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 30rpx;
-		color: #666666;
-		line-height: 42rpx;
-		text-align: left;
-		font-style: normal;
-	}
+.title-icon {
+	/* margin-left: 283rpx; */
+	height: 67rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 500;
+	font-size: 48rpx;
+	color: #333333;
+	line-height: 67rpx;
+	text-align: center;
+	font-style: normal;
+}
+
+.title-content {
+	margin: 14rpx 0 0 0rpx;
+	height: 42rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	font-size: 30rpx;
+	color: #666666;
+	line-height: 42rpx;
+	text-align: center;
+	font-style: normal;
+}
 </style>
\ No newline at end of file
diff --git a/pages/shop/business-time.vue b/pages/shop/business-time.vue
index fdc0739..ed88f68 100644
--- a/pages/shop/business-time.vue
+++ b/pages/shop/business-time.vue
@@ -125,7 +125,7 @@ export default {
     // 加载当前营业时间
     async loadCurrentTime() {
       try {
-        const res = await request.post('/user/getuser', {
+        const res = await request.post('/sj/user/getuser', {
           type: 3 // 商家类型
         })
         console.log('获取用户信息响应:', res)
diff --git a/pages/shop/qualification_sj_change.vue b/pages/shop/qualification_sj_change.vue
index 96630ee..9bc58e9 100644
--- a/pages/shop/qualification_sj_change.vue
+++ b/pages/shop/qualification_sj_change.vue
@@ -58,6 +58,27 @@
           <input type="text" v-model="displayData.uscc_name" placeholder="请输入营业执照的企业名称" 
                  :disabled="!editable" placeholder-class="placeholder" class="input" />
         </view>
+
+        <view class="form-item-one box-cont" @click="editable && showRegionPicker()">
+          <view class="label-wrapper">
+            <text class="label required">注册地区</text>
+          </view>
+          <view class="picker-content">
+            <text :class="displayData.uscc_dependency ? 'picker-value' : 'placeholder'">
+              {{ displayData.uscc_dependency || '请选择' }}
+            </text>
+            <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+              class="arrow-right" mode="aspectFit"></image>
+          </view>
+        </view>
+
+        <view class="form-item-one box-cont">
+          <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>
       </view>
 
       <!-- 法人信息部分 -->
@@ -171,6 +192,45 @@
           </view>
         </view>
       </view>
+
+      <!-- 其他信息部分 -->
+      <view class="section">
+        <view class="section-title">
+          <view class="title-bar"></view>
+          <text class="title-text">其他信息</text>
+        </view>
+
+        <view class="form-item-image-box box-cont" >
+          <text class="label required">行业资质</text>
+          <view class="image-list">
+            <view class="image-item" v-for="(img, index) in displayData.qualifications_sector" :key="'industry-' + index">
+              <image :src="img" mode="aspectFill" class="qualification-image"></image>
+              <view class="image-delete" v-if="editable" @click="removeImage('qualifications_sector', index)">×</view>
+            </view>
+            <view class="image-add" @click="editable && chooseMultiImage('qualifications_sector')"
+              v-if="(displayData.qualifications_sector || []).length < 9">
+              <image
+                src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png"
+                mode="aspectFit" class="upload-icon-small"></image>
+              <text class="add-text">添加照片</text>
+            </view>
+          </view>
+          <text class="label" style="margin-top: 30rpx;">其他资质</text>
+          <view class="image-list">
+            <view class="image-item" v-for="(img, index) in displayData.qualifications_other" :key="'other-' + index">
+              <image :src="img" mode="aspectFill" class="qualification-image"></image>
+              <view class="image-delete" v-if="editable" @click="removeImage('qualifications_other', index)">×</view>
+            </view>
+            <view class="image-add" @click="editable && chooseMultiImage('qualifications_other')"
+              v-if="(displayData.qualifications_other || []).length < 9">
+              <image
+                src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d4af728-c7bf-447d-85b2-e7c682471b86.png"
+                mode="aspectFit" class="upload-icon-small"></image>
+              <text class="add-text">添加照片</text>
+            </view>
+          </view>
+        </view>
+      </view>
       
       <!-- 底部安全间距 -->
       <view class="safe-bottom"></view>
@@ -290,6 +350,46 @@
         </view>
       </view>
     </view>
+
+    <!-- 注册地区选择器 -->
+    <view class="popup" :class="{ show: showRegionPopupFlag }">
+      <view class="popup-mask" @click="hideRegionPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择注册地区</text>
+          <text class="popup-close" @click="hideRegionPopup">×</text>
+        </view>
+        <view class="region-body">
+          <picker-view @change="bindChangeRegion" class="picker-scroll" :indicator-style="indicatorStyle"
+            :value="regionValue">
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
+                {{ item.province }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in regionCitys" :key="index">
+                {{ item.city }}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(item, index) in regionAreas" :key="index">
+                {{ item.area }}
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideRegionPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmRegionSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
     <!-- 存储权限提示 -->
     <view class="permission" :class="{ transform: isShowStoragePer }">
         <view class="per-tit">美融融plus 对储存空间/照片权限申请说明</view>
@@ -310,6 +410,7 @@ import uploadImage from '../../utils/uploadImage';
 import permissionUtils from '../../utils/per';
 import locationService from '../../utils/locationService';
 import { recognizeIdCard, recognizeBusinessLicense, formatDateFromNumber, parseValidPeriod } from '../../utils/orc';
+import ChinaCitys from '../../static/data/ChinaCitys.json';
 
 export default {
   data() {
@@ -364,6 +465,12 @@ export default {
 
       isShowStoragePer: false,
       isShowCameraPer: false,
+
+      showRegionPopupFlag: false,
+      ChinaCitys: ChinaCitys,
+      regionCitys: [],
+      regionAreas: [],
+      regionValue: [0, 0, 0],
     }
   },
   computed: {
@@ -378,6 +485,9 @@ export default {
     this.hasResubmitted = false;
     this.backText = '';
     
+    this.regionCitys = this.ChinaCitys[0].citys;
+    this.regionAreas = this.regionCitys[0].areas;
+    
     this.getUserInfo().then(() => {
       this.loadApplyDetails();
     });
@@ -637,7 +747,7 @@ export default {
     getUserInfo() {
       return new Promise((resolve, reject) => {
         const userType = 3;
-        request.post('/user/getuser', { type: userType }).then(result => {
+        request.post('/sj/user/getUser', { type: userType }).then(result => {
           if (result.state === 1) {
             this.userId = result.data.id;
             console.log('用户ID获取成功:', this.userId);
@@ -661,10 +771,12 @@ export default {
       
       // 初始化老数据
       this.originalData = {
-        uscc_type: userData.uscc_type ? String(userData.uscc_type) : null, // 转换为字符串
+        uscc_type: userData.uscc_type ? String(userData.uscc_type) : null,
         uscc_photo: userData.uscc_photo || '',
         uscc_num: userData.uscc_num || '',
         uscc_name: userData.uscc_name || '',
+        uscc_dependency: userData.uscc_dependency || '',
+        uscc_address: userData.uscc_address || '',
         uscc_expiry_type: userData.uscc_expiry_type || null,
         uscc_expiry: userData.uscc_expiry || '',
         license_start_date: '',
@@ -677,15 +789,30 @@ export default {
         idcard_start_date: '',
         idcard_end_date: '',
         legal_idcard_positive: userData.legal_idcard_positive || '',
-        legal_idcard_negative: userData.legal_idcard_negative || ''
+        legal_idcard_negative: userData.legal_idcard_negative || '',
+        qualifications_sector: [],
+        qualifications_other: []
       };
 
-      // 处理营业执照有效期显示
+      if (userData.qualifications_sector) {
+        try {
+          this.originalData.qualifications_sector = typeof userData.qualifications_sector === 'string' ? JSON.parse(userData.qualifications_sector) : userData.qualifications_sector;
+        } catch (e) {
+          this.originalData.qualifications_sector = [];
+        }
+      }
+      if (userData.qualifications_other) {
+        try {
+          this.originalData.qualifications_other = typeof userData.qualifications_other === 'string' ? JSON.parse(userData.qualifications_other) : userData.qualifications_other;
+        } catch (e) {
+          this.originalData.qualifications_other = [];
+        }
+      }
+
       if (this.originalData.uscc_expiry) {
         this.processLicenseExpiry(this.originalData.uscc_expiry, this.originalData);
       }
 
-      // 处理身份证有效期显示
       if (this.originalData.legal_idcard_expiry) {
         this.processIdcardExpiry(this.originalData.legal_idcard_expiry, this.originalData);
       }
@@ -853,6 +980,8 @@ export default {
         uscc_photo: detail.uscc_photo || this.originalData.uscc_photo,
         uscc_num: detail.uscc_num || this.originalData.uscc_num,
         uscc_name: detail.uscc_name || this.originalData.uscc_name,
+        uscc_dependency: detail.uscc_dependency || this.originalData.uscc_dependency,
+        uscc_address: detail.uscc_address || this.originalData.uscc_address,
         uscc_expiry_type: detail.uscc_expiry_type || this.originalData.uscc_expiry_type,
         uscc_expiry: detail.uscc_expiry || this.originalData.uscc_expiry,
         license_start_date: '',
@@ -865,9 +994,26 @@ export default {
         idcard_start_date: '',
         idcard_end_date: '',
         legal_idcard_positive: detail.legal_idcard_positive || this.originalData.legal_idcard_positive,
-        legal_idcard_negative: detail.legal_idcard_negative || this.originalData.legal_idcard_negative
+        legal_idcard_negative: detail.legal_idcard_negative || this.originalData.legal_idcard_negative,
+        qualifications_sector: this.originalData.qualifications_sector || [],
+        qualifications_other: this.originalData.qualifications_other || []
       };
 
+      if (detail.qualifications_sector) {
+        try {
+          this.pendingData.qualifications_sector = typeof detail.qualifications_sector === 'string' ? JSON.parse(detail.qualifications_sector) : detail.qualifications_sector;
+        } catch (e) {
+          this.pendingData.qualifications_sector = this.originalData.qualifications_sector || [];
+        }
+      }
+      if (detail.qualifications_other) {
+        try {
+          this.pendingData.qualifications_other = typeof detail.qualifications_other === 'string' ? JSON.parse(detail.qualifications_other) : detail.qualifications_other;
+        } catch (e) {
+          this.pendingData.qualifications_other = this.originalData.qualifications_other || [];
+        }
+      }
+
       console.log('处理前的pendingData日期字段:', {
         uscc_expiry: this.pendingData.uscc_expiry,
         legal_idcard_expiry: this.pendingData.legal_idcard_expiry
@@ -891,7 +1037,7 @@ export default {
       try {
         console.log('刷新商家最新数据...');
         const userType = 3;
-        const result = await request.post('/user/getuser', { type: userType });
+        const result = await request.post('/sj/user/getUser', { type: userType });
 
         if (result.state === 1 && result.data) {
           const userData = result.data;
@@ -936,6 +1082,8 @@ export default {
         uscc_photo: userData.uscc_photo || '',
         uscc_num: userData.uscc_num || '',
         uscc_name: userData.uscc_name || '',
+        uscc_dependency: userData.uscc_dependency || '',
+        uscc_address: userData.uscc_address || '',
         uscc_expiry_type: userData.uscc_expiry_type || null,
         uscc_expiry: userData.uscc_expiry || '',
         license_start_date: '',
@@ -948,15 +1096,30 @@ export default {
         idcard_start_date: '',
         idcard_end_date: '',
         legal_idcard_positive: userData.legal_idcard_positive || '',
-        legal_idcard_negative: userData.legal_idcard_negative || ''
+        legal_idcard_negative: userData.legal_idcard_negative || '',
+        qualifications_sector: [],
+        qualifications_other: []
       };
 
-      // 处理营业执照有效期显示
+      if (userData.qualifications_sector) {
+        try {
+          this.originalData.qualifications_sector = typeof userData.qualifications_sector === 'string' ? JSON.parse(userData.qualifications_sector) : userData.qualifications_sector;
+        } catch (e) {
+          this.originalData.qualifications_sector = [];
+        }
+      }
+      if (userData.qualifications_other) {
+        try {
+          this.originalData.qualifications_other = typeof userData.qualifications_other === 'string' ? JSON.parse(userData.qualifications_other) : userData.qualifications_other;
+        } catch (e) {
+          this.originalData.qualifications_other = [];
+        }
+      }
+
       if (this.originalData.uscc_expiry) {
         this.processLicenseExpiry(this.originalData.uscc_expiry, this.originalData);
       }
 
-      // 处理身份证有效期显示
       if (this.originalData.legal_idcard_expiry) {
         this.processIdcardExpiry(this.originalData.legal_idcard_expiry, this.originalData);
       }
@@ -1139,6 +1302,8 @@ export default {
           uscc_photo: this.displayData.uscc_photo,
           uscc_num: this.displayData.uscc_num,
           uscc_name: this.displayData.uscc_name,
+          uscc_dependency: this.displayData.uscc_dependency,
+          uscc_address: this.displayData.uscc_address,
           uscc_expiry_type: this.displayData.uscc_expiry_type,
           uscc_expiry: this.displayData.uscc_expiry,
           legal_name: this.displayData.legal_name,
@@ -1147,7 +1312,9 @@ export default {
           legal_idcard_expiry_type: this.displayData.legal_idcard_expiry_type,
           legal_idcard_expiry: this.displayData.legal_idcard_expiry,
           legal_idcard_positive: this.displayData.legal_idcard_positive,
-          legal_idcard_negative: this.displayData.legal_idcard_negative
+          legal_idcard_negative: this.displayData.legal_idcard_negative,
+          qualifications_sector: JSON.stringify(this.displayData.qualifications_sector || []),
+          qualifications_other: JSON.stringify(this.displayData.qualifications_other || [])
         };
 
         // 处理营业执照有效期
@@ -1232,6 +1399,73 @@ export default {
         });
     },
 
+    showRegionPicker() {
+      this.regionCitys = this.ChinaCitys[0].citys;
+      this.regionAreas = this.regionCitys[0].areas;
+      this.showRegionPopupFlag = true;
+    },
+
+    hideRegionPopup() {
+      this.showRegionPopupFlag = false;
+    },
+
+    bindChangeRegion(e) {
+      this.regionValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.regionCitys = this.ChinaCitys[index1].citys;
+      this.regionAreas = this.regionCitys[index2].areas;
+    },
+
+    confirmRegionSelect() {
+      let valueArr = this.regionValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+      let province = this.ChinaCitys[index1].province;
+      let city = this.regionCitys[index2].city;
+      let area = this.regionAreas[index3].area;
+      this.$set(this.displayData, 'uscc_dependency', province + '-' + city + '-' + area);
+      this.hideRegionPopup();
+    },
+
+    chooseMultiImage(type) {
+      const current = this.displayData[type] || [];
+      const remaining = 9 - current.length;
+      if (remaining <= 0) {
+        uni.showToast({ title: '最多上传9张图片', icon: 'none' });
+        return;
+      }
+      uni.chooseImage({
+        count: remaining,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: async (res) => {
+          if (!res.tempFilePaths || res.tempFilePaths.length === 0) return;
+          uni.showLoading({ title: '上传中...' });
+          for (const tempFilePath of res.tempFilePaths) {
+            const file = { path: tempFilePath, size: 0 };
+            try {
+              const url = await this.directUpload(file, this.userId, 3, type);
+              if (url) {
+                current.push(url);
+              }
+            } catch (e) {
+              console.error('上传失败:', e);
+            }
+          }
+          this.$set(this.displayData, type, [...current]);
+          uni.hideLoading();
+        }
+      });
+    },
+
+    removeImage(type, index) {
+      const list = [...(this.displayData[type] || [])];
+      list.splice(index, 1);
+      this.$set(this.displayData, type, list);
+    },
+
     // 表单验证
     validateForm() {
       const validationRules = [
@@ -1239,6 +1473,8 @@ export default {
         { field: 'uscc_type', message: '请输入商户类型' },
         { field: 'uscc_num', message: '请输入营业执照号码' },
         { field: 'uscc_name', message: '请输入企业名称' },
+        { field: 'uscc_dependency', message: '请选择注册地区' },
+        { field: 'uscc_address', message: '请输入注册详细地址' },
         { field: 'legal_idcard_positive', message: '请上传身份证正面照片' },
         { field: 'legal_idcard_negative', message: '请上传身份证反面照片' },
         { field: 'legal_name', message: '请输入法人代表' },
@@ -2411,4 +2647,79 @@ export default {
 		opacity: 1;
 		visibility: visible;
 }
+
+.image-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+  margin-top: 16rpx;
+}
+
+.image-item {
+  position: relative;
+  width: 200rpx;
+  height: 200rpx;
+}
+
+.qualification-image {
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 12rpx;
+}
+
+.image-delete {
+  position: absolute;
+  top: -10rpx;
+  right: -10rpx;
+  width: 36rpx;
+  height: 36rpx;
+  background: #E8101E;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #FFFFFF;
+  font-size: 28rpx;
+}
+
+.image-add {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border: 2rpx dashed #DDDDDD;
+  width: 214rpx;
+  height: 214rpx;
+  background: #F5F5F5;
+  border-radius: 20rpx;
+}
+
+.upload-icon-small {
+  width: 48rpx;
+  height: 48rpx;
+  margin-bottom: 8rpx;
+}
+
+.add-text {
+  font-size: 22rpx;
+  color: #999999;
+}
+
+.region-body {
+  margin-top: 20rpx;
+}
+
+.region-body .picker-scroll {
+  height: 400rpx;
+}
+
+.form-item-image-box {
+  display: flex;
+  flex-direction: column;
+  padding: 24rpx;
+}
+
+.form-item-image-box .label {
+  margin-bottom: 16rpx;
+}
 </style>
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index 5f05fbc..50b9276 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -187,13 +187,22 @@ const request = async (options, isUpdate) => {
 		uni.request({
 			...options,
 			success: (res) => {
-				// #ifdef H5
-				if (!options.hideLoading) {
-					uni.hideLoading()
+			// #ifdef H5
+			if (!options.hideLoading) {
+				uni.hideLoading()
+			}
+			// #endif
+			try {
+				const result = responseInterceptor(options, res, resolve, reject)
+				if (result && typeof result.then === 'function') {
+					result.then(data => resolve(data)).catch(err => reject(err))
+				} else {
+					resolve(result)
 				}
-				// #endif
-				resolve(responseInterceptor(options, res, resolve, reject))
-			},
+			} catch (err) {
+				reject(err)
+			}
+		},
 			fail: (err) => {
 				// #ifdef H5
 				if (!options.hideLoading) {
@@ -221,6 +230,7 @@ const request = async (options, isUpdate) => {
 // 处理 401 未授权
 async function handleUnauthorized(originalRequest, resolve, reject) {
 	if (!getToken()) {
+		reject(new Error('未登录'))
 		return redirectToLogin()
 	}
 	// 如果正在刷新 Token，将请求加入队列
@@ -246,7 +256,7 @@ async function handleUnauthorized(originalRequest, resolve, reject) {
 	} catch (error) {
 		removeToken()
 		redirectToLogin()
-		// reject(error)
+		reject(error)
 		return error
 	} finally {
 		isRefreshing = false

From ce03c0de2b2a11c7052b479704e951b5983ac573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Fri, 29 May 2026 15:54:23 +0800
Subject: [PATCH 058/118] =?UTF-8?q?=E6=9A=82=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/ruzhu.vue        | 42 +++++++++++++++++++++++++++++++-----
 pages/ruzhu/successruzhu.vue |  6 +++---
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index a557eec..b128e40 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -4,7 +4,7 @@
 		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
 
 		<!-- 步骤切换 -->
-		<step-tab v-if="currentStep !== 2" :mappedStep="mappedStep"></step-tab>
+		<step-tab v-if="currentStep !== 2 && currentStep !== 4" :mappedStep="mappedStep"></step-tab>
 
 		<!-- 内容区域根据身份和步骤显示不同内容 -->
 		<view class="content">
@@ -23,6 +23,10 @@
 			<view v-else-if="currentStep === 3">
 				<store-info ref="storeInfo"></store-info>
 			</view>
+
+			<view v-else-if="currentStep === 4">
+				<successruzhu :data="successData"></successruzhu>
+			</view>
 		</view>
 		<view class="kong"></view>
 
@@ -77,6 +81,15 @@
 					</view>
 				</view>
 			</view>
+
+			<!-- 步骤4: 资质认证成功 -->
+			<view v-else-if="currentStep === 4" class="step-2-buttons">
+				<view class="button-row">
+					<view class="showziliao" @click="topt">
+						<text class="showziliaotext">进入平台</text>
+					</view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -97,7 +110,7 @@ export default {
 	},
 	data() {
 		return {
-			currentStep: 3, // 当前步骤索引
+			currentStep: 4, // 当前步骤索引
 			isAgree: false,
 			identity: null,
 			textData: {},
@@ -119,6 +132,7 @@ export default {
 			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;
 		}
 	},
@@ -542,13 +556,14 @@ export default {
 				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'
 					});
-					uni.navigateTo({
-						url: '/pages/shop/qualification_sj_change'
-					})
+					setTimeout(() => {
+						this.currentStep = 4;
+					}, 1500);
 				} else {
 					uni.showToast({
 						title: res.msg || '提交失败了',
@@ -770,5 +785,22 @@ export default {
 	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>
diff --git a/pages/ruzhu/successruzhu.vue b/pages/ruzhu/successruzhu.vue
index 3aa4b2e..b7a04db 100644
--- a/pages/ruzhu/successruzhu.vue
+++ b/pages/ruzhu/successruzhu.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="pages">
-		<custom-navbar :title="infoData.notice" :showBack="true"></custom-navbar>
-		<view class="title-icon">{{infoData.top}}</view>
-		<view class="title-content">{{infoData.title}}</view>
+		<custom-navbar :title="infoData.top" :showBack="true"></custom-navbar>
+		<view class="title-icon">{{infoData.title}}</view>
+		<view class="title-content">{{infoData.notice}}</view>
 		<view class="erweimabox">
 			<view class="erweimab">
 				<image :src="infoData.photo" mode="widthFix"

From 21425c030629ea1bcedf48f667b960b8760fe649 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 11:16:19 +0800
Subject: [PATCH 059/118] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artisan/profile.vue | 1200 +++++++++++++++++++------------------
 pages/ruzhu/ruzhu.vue     |    2 +-
 2 files changed, 608 insertions(+), 594 deletions(-)

diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index b7af875..629d01d 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -47,14 +47,17 @@
 								<image
 									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
 									mode="widthFix"
-									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;">
+									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
+									v-if="!userInfo.business_time">
 								</image>
-								<text style="margin-right: 16rpx; color: #ec5d57;">待完善</text>
+								<text style="margin-right: 16rpx;"
+									:style="{ color: userInfo.business_time ? '#c9c9c9' : '#ec5d57' }">
+									{{ userInfo.business_time ? '已设置' : '待完善' }}
+								</text>
 								<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
 								</image>
 							</view>
 						</view>
-						<!-- 服务技能 -->
 						<view class="info-item" @click="navigateToServiceSkill">
 							<view class="info-left">
 								<image class="item-icon"
@@ -66,9 +69,14 @@
 								<image
 									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
 									mode="widthFix"
-									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;">
+									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
+									v-if="!userInfo.servers_kill_arr || userInfo.servers_kill_arr.length === 0">
 								</image>
-								<text style="margin-right: 16rpx; color: #389930;">已认证</text>
+								<text style="margin-right: 16rpx;"
+									:style="{ color: (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '#333333' : '#ec5d57' }">
+									{{ (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '已设置' :
+										'待完善' }}
+								</text>
 								<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
 								</image>
 							</view>
@@ -153,9 +161,14 @@
 							<image
 								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
 								mode="widthFix"
-								style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;">
+								style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
+								v-if="userInfo.credentials_state === 0">
 							</image>
-							<text style="margin-right: 16rpx; color: #e59e45;">审核中</text>
+							<text style="margin-right: 16rpx;"
+								:style="{ color: userInfo.credentials_state === 0 ? '#ec5d57' : userInfo.credentials_state === 1 ? '#e59e45' : '#c9c9c9' }">
+								{{ userInfo.credentials_state === 0 ? '待完善' : userInfo.credentials_state === 1 ? '审核中' :
+								'已认证' }}
+							</text>
 							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
 							</image>
 						</view>
@@ -178,644 +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 // 添加分享状态标记
+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;
 			}
-		},
-		onLoad() {
-			// 页面显示时重新加载身份信息，确保数据最新
-			this.loadIdentity()
-			console.log('当前身份:', this.identity)
-			// 加载用户信息
-			this.loadUserInfo()
-		},
-		onShow() {
-			// 页面显示时也重新加载，确保数据最新
-			this.loadIdentity()
-			this.loadUserInfo()
-		},
-		methods: {
-			// 返回按钮处理
-			handleBack() {
-				uni.navigateBack()
-			},
 
-			// 分享到微信
-			handleShareWechat() {
-				console.log('分享到微信')
+			// 设置分享状态
+			this.sharing = 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);
-					}
+			try {
+				// 显示加载提示
+				uni.showLoading({
+					title: '正在准备分享...',
+					mask: true
 				});
-			},
-
-			// APP环境自动分享
-			handleAppAutoShare() {
-				if (!this.currentUserId) {
-					uni.showToast({
-						title: '无法获取用户信息',
-						icon: 'none'
-					});
-					return;
-				}
-
-				// 清除旧的分享标记
-				uni.removeStorage({
-					key: 'share_success'
-				});
-
-				// 跳转到店铺主页并自动触发分享
-				const url = this.identity == '2' ?
-					`/pages/user/store-detail?id=${this.currentUserId}&autoShare=1` :
-					`/pages/user/syr-detail?id=${this.currentUserId}&autoShare=1`;
-
-				uni.navigateTo({
-					url: url,
-					success: () => {
-						console.log('跳转成功，将自动触发分享');
-						// 跳转成功后立即隐藏loading，避免页面闪烁
-						setTimeout(() => {
-							uni.hideLoading();
-							this.sharing = false;
-						}, 200);
-					},
-					fail: () => {
-						console.log('跳转失败:', err);
-						uni.hideLoading();
-						this.sharing = false;
-						this.showManualShareOption();
-					}
-				});
-			},
-
-			// 执行APP分享
-			executeAppShare(imageUrl) {
-				// 备用图片地址
-				const backupImageUrl =
-					"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/yh/1756713709528-717.png?x-oss-process=image/resize,p_40"
-
-				// 根据身份设置不同的分享标题
-				const shareTitle = this.identity == '2' ?
-					"好友刚推了个超赞商家！点开认识TA ~" :
-					"好友刚推了个超赞手艺人！点开认识TA ~"
-
-				// 生成分享配置
-				const shareConfig = {
-					provider: "weixin",
-					scene: "WXSceneSession",
-					type: 5,
-					title: shareTitle,
-					miniProgram: {
-						id: "gh_89c92e18b70b", // 小程序原始ID
-						path: this.getSharePath(), // 动态分享路径
-						type: 0, // 正式版
-						webUrl: "https://www.baidu.com/", // 降级网页地址
-					},
-					imageUrl: imageUrl,
-					success: (res) => {
-						console.log("分享成功:", JSON.stringify(res))
-						uni.showToast({
-							title: '分享成功',
-							icon: 'success'
-						})
-					},
-					fail: (err) => {
-						console.log("分享失败:", JSON.stringify(err))
-						// 尝试使用备用图片
-						if (imageUrl !== backupImageUrl) {
-							console.log("尝试使用备用图片分享...")
-							this.executeAppShare(backupImageUrl)
-						} else {
-							uni.showToast({
-								title: '分享失败',
-								icon: 'none'
-							})
-						}
-					}
-				}
-
-				// 检查是否支持分享API
-				if (uni.share) {
-					uni.share(shareConfig)
-				} else {
-					uni.showToast({
-						title: '当前环境不支持分享',
-						icon: 'none'
-					})
-				}
-			},
-
-			// 获取分享路径
-			getSharePath() {
-				// 根据身份生成不同的分享路径
-				if (this.identity == '2') {
-					// 商家分享店铺详情页
-					return `/pages/user/store-detail?id=${this.currentUserId || ''}`
-				} else {
-					// 手艺人分享个人主页
-					return `/pages/user/syr-detail?id=${this.currentUserId || ''}`
-				}
-			},
-
-			// 查看店铺
-			async handleViewShop() {
-				console.log('查看店铺')
 
 				// 确保用户信息已加载
 				if (!this.currentUserId) {
 					await this.loadUserInfo()
 				}
 
-				// 如果仍然没有用户ID，提示用户手动输入或联系客服
+				// 检查是否已加载用户信息
 				if (!this.currentUserId) {
-					uni.showModal({
-						title: '提示',
-						content: '无法获取用户信息，请联系客服或稍后重试',
-						showCancel: false,
-						confirmText: '确定'
+					uni.showToast({
+						title: '无法获取用户信息',
+						icon: 'none'
 					})
 					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
-					})
-				}
-			},
+				// 根据环境处理
+				// #ifdef APP-PLUS
+				this.handleAppAutoShare()
+				// #endif
 
-			// 加载用户信息 - 主要使用接口获取
-			async loadUserInfo() {
-				try {
-					// 根据身份设置type参数（参考个人中心页面的逻辑）
-					let type = 1 // 默认值
-					if (this.identity == '1') {
-						type = 2 // 手艺人
-					} else if (this.identity == '2') {
-						type = 3 // 商家
+				// #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'
+						//     })
+						//   }
+						// })
 					}
+				}
+			})
+		},
 
-					console.log('调用接口获取用户信息，type:', type)
+		// 小程序环境处理
+		handleMpAutoShare() {
+			// 小程序无法自动触发分享，跳转后提示用户手动操作
+			const url = this.identity == '2' ?
+				`/pages/user/store-detail?id=${this.currentUserId}` :
+				`/pages/user/syr-detail?id=${this.currentUserId}`;
 
-					// 调用接口获取用户信息
-					const result = await request.post('sj/user/getUser', {
-						type
+			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 (result.data && result.data.id) {
-						this.userInfo = result.data
-						this.currentUserId = result.data.id
-
-						// 存储到本地，避免重复调用
-						uni.setStorageSync('userInfo', result.data)
-						console.log('从接口获取用户信息成功:', this.userInfo)
+				},
+				fail: (err) => {
+					console.log("分享失败:", JSON.stringify(err))
+					// 尝试使用备用图片
+					if (imageUrl !== backupImageUrl) {
+						console.log("尝试使用备用图片分享...")
+						this.executeAppShare(backupImageUrl)
 					} else {
-						console.log('接口返回数据异常:', result)
-					}
-				} catch (error) {
-					console.log('获取用户信息失败:', error)
-
-					// 降级方案：尝试从其他可能的位置获取用户ID
-					this.tryAlternativeUserInfo()
-				}
-			},
-
-			// 备用方案：从其他位置获取用户信息
-			tryAlternativeUserInfo() {
-				try {
-					const app = getApp()
-
-					// 方法1: 从全局数据获取用户ID
-					if (app.globalData.userInfo && app.globalData.userInfo.id) {
-						this.currentUserId = app.globalData.userInfo.id
-						this.userInfo = app.globalData.userInfo
-						console.log('从全局数据获取用户ID:', this.currentUserId)
-						return
-					}
-
-					// 方法2: 从本地存储获取完整的用户信息
-					const userInfo = uni.getStorageSync('userInfo')
-					if (userInfo && userInfo.id) {
-						this.currentUserId = userInfo.id
-						this.userInfo = userInfo
-						console.log('从存储获取用户ID:', this.currentUserId)
-						return
-					}
-
-					// 方法3: 直接获取用户ID
-					const userId = uni.getStorageSync('userId')
-					if (userId) {
-						this.currentUserId = userId
-						console.log('从存储获取用户ID:', userId)
-						return
-					}
-
-					console.log('所有获取用户信息的方法都失败了')
-				} catch (e) {
-					console.log('备用方案获取用户信息失败:', e)
-				}
-			},
-
-			loadIdentity() {
-				// 从全局数据获取身份
-				const app = getApp()
-				const globalIdentity = app.globalData.artisanType
-				console.log('从全局数据获取身份:', globalIdentity)
-
-				if (globalIdentity) {
-					this.identity = globalIdentity
-					uni.setStorageSync('user_identity', globalIdentity)
-				} else {
-					// 如果全局数据没有，尝试从本地存储获取
-					const localIdentity = uni.getStorageSync('user_identity')
-					if (localIdentity) {
-						this.identity = localIdentity
-						console.log('从本地存储获取身份:', localIdentity)
-					} else {
-						console.log('未获取到身份信息')
-						// 默认设为手艺人
-						this.identity = '1'
+						uni.showToast({
+							title: '分享失败',
+							icon: 'none'
+						})
 					}
 				}
+			}
 
-				console.log('当前身份:', this.identity)
-			},
-
-			navigateToTimeSetting() {
-				if (this.identity == '2') {
-					// 商家跳转到营业时间页面
-					uni.navigateTo({
-						url: '/pages/shop/business-time'
-					})
-				} else {
-					// 手艺人跳转到服务时间页面
-					uni.navigateTo({
-						url: '/pages/artisan/service-time'
-					})
-				}
-			},
-
-			navigateToServiceSkill() {
-				if (this.identity == '2') {
-					// 商家跳转到商家服务技能页面
-					uni.navigateTo({
-						url: '/pages/shop/service-skills'
-					})
-				} else {
-					// 手艺人跳转到手艺人服务技能页面
-					uni.navigateTo({
-						url: '/pages/artisan/service-skills'
-					})
-				}
-			},
-
-			navigateToShopInfo() { // 商家：门店信息 
-				uni.navigateTo({
-					url: '/pages/shop/sj-info-change'
-				})
-			},
-
-			navigateToServiceArea() { // 手艺人：服务区域
-				uni.navigateTo({
-					url: '/pages/artisan/service-area'
-				})
-			},
-
-			navigateToPersonalInfo() { // 手艺人：个人信息
-				uni.navigateTo({
-					url: '/pages/artisan/syr-info-change'
-				})
-			},
-
-			navigateToimg() { // 图片管理
-				uni.navigateTo({
-					url: '/pages/shop/photoAlbum/photoManage?type=1'
-				})
-			},
-
-			navigateTovideo() { // 视频管理
-				uni.navigateTo({
-					url: '/pages/shop/photoAlbum/photoManage?type=2'
-				})
-			},
-
-			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'
+			// 检查是否支持分享API
+			if (uni.share) {
+				uni.share(shareConfig)
+			} else {
+				uni.showToast({
+					title: '当前环境不支持分享',
+					icon: 'none'
 				})
 			}
+		},
+
+		// 获取分享路径
+		getSharePath() {
+			// 根据身份生成不同的分享路径
+			if (this.identity == '2') {
+				// 商家分享店铺详情页
+				return `/pages/user/store-detail?id=${this.currentUserId || ''}`
+			} else {
+				// 手艺人分享个人主页
+				return `/pages/user/syr-detail?id=${this.currentUserId || ''}`
+			}
+		},
+
+		// 查看店铺
+		async handleViewShop() {
+			console.log('查看店铺')
+
+			// 确保用户信息已加载
+			if (!this.currentUserId) {
+				await this.loadUserInfo()
+			}
+
+			// 如果仍然没有用户ID，提示用户手动输入或联系客服
+			if (!this.currentUserId) {
+				uni.showModal({
+					title: '提示',
+					content: '无法获取用户信息，请联系客服或稍后重试',
+					showCancel: false,
+					confirmText: '确定'
+				})
+				return
+			}
+
+			// 根据身份跳转到不同的页面
+			if (this.identity == '2') {
+				// 商家跳转到店铺主页
+				uni.navigateTo({
+					url: '/pages/user/store-detail?id=' + this.currentUserId
+				})
+			} else {
+				// 手艺人跳转到个人主页
+				uni.navigateTo({
+					url: '/pages/user/syr-detail?id=' + this.currentUserId
+				})
+			}
+		},
+
+		// 加载用户信息 - 主要使用接口获取
+		async loadUserInfo() {
+			try {
+				// 根据身份设置type参数（参考个人中心页面的逻辑）
+				let type = 1 // 默认值
+				if (this.identity == '1') {
+					type = 2 // 手艺人
+				} else if (this.identity == '2') {
+					type = 3 // 商家
+				}
+
+				console.log('调用接口获取用户信息，type:', type)
+
+				// 调用接口获取用户信息
+				const result = await request.post('/sj/user/getUser', {
+					type
+				})
+
+				if (result.data && result.data.id) {
+					this.userInfo = result.data
+					this.currentUserId = result.data.id
+
+					// 存储到本地，避免重复调用
+					uni.setStorageSync('userInfo', result.data)
+					console.log('从接口获取用户信息成功:', this.userInfo)
+				} else {
+					console.log('接口返回数据异常:', result)
+				}
+			} catch (error) {
+				console.log('获取用户信息失败:', error)
+
+				// 降级方案：尝试从其他可能的位置获取用户ID
+				this.tryAlternativeUserInfo()
+				uni.hideLoading();
+			}
+		},
+
+		// 备用方案：从其他位置获取用户信息
+		tryAlternativeUserInfo() {
+			try {
+				const app = getApp()
+
+				// 方法1: 从全局数据获取用户ID
+				if (app.globalData.userInfo && app.globalData.userInfo.id) {
+					this.currentUserId = app.globalData.userInfo.id
+					this.userInfo = app.globalData.userInfo
+					console.log('从全局数据获取用户ID:', this.currentUserId)
+					return
+				}
+
+				// 方法2: 从本地存储获取完整的用户信息
+				const userInfo = uni.getStorageSync('userInfo')
+				if (userInfo && userInfo.id) {
+					this.currentUserId = userInfo.id
+					this.userInfo = userInfo
+					console.log('从存储获取用户ID:', this.currentUserId)
+					return
+				}
+
+				// 方法3: 直接获取用户ID
+				const userId = uni.getStorageSync('userId')
+				if (userId) {
+					this.currentUserId = userId
+					console.log('从存储获取用户ID:', userId)
+					return
+				}
+
+				console.log('所有获取用户信息的方法都失败了')
+			} catch (e) {
+				console.log('备用方案获取用户信息失败:', e)
+			}
+		},
+
+		loadIdentity() {
+			// 从全局数据获取身份
+			const app = getApp()
+			const globalIdentity = app.globalData.artisanType
+			console.log('从全局数据获取身份:', globalIdentity)
+
+			if (globalIdentity) {
+				this.identity = globalIdentity
+				uni.setStorageSync('user_identity', globalIdentity)
+			} else {
+				// 如果全局数据没有，尝试从本地存储获取
+				const localIdentity = uni.getStorageSync('user_identity')
+				if (localIdentity) {
+					this.identity = localIdentity
+					console.log('从本地存储获取身份:', localIdentity)
+				} else {
+					console.log('未获取到身份信息')
+					// 默认设为手艺人
+					this.identity = '1'
+				}
+			}
+
+			console.log('当前身份:', this.identity)
+		},
+
+		navigateToTimeSetting() {
+			if (this.identity == '2') {
+				// 商家跳转到营业时间页面
+				uni.navigateTo({
+					url: '/pages/shop/business-time'
+				})
+			} else {
+				// 手艺人跳转到服务时间页面
+				uni.navigateTo({
+					url: '/pages/artisan/service-time'
+				})
+			}
+		},
+
+		navigateToServiceSkill() {
+			if (this.identity == '2') {
+				// 商家跳转到商家服务技能页面
+				uni.navigateTo({
+					url: '/pages/shop/service-skills'
+				})
+			} else {
+				// 手艺人跳转到手艺人服务技能页面
+				uni.navigateTo({
+					url: '/pages/artisan/service-skills'
+				})
+			}
+		},
+
+		navigateToShopInfo() { // 商家：门店信息 
+			uni.navigateTo({
+				url: '/pages/shop/sj-info-change'
+			})
+		},
+
+		navigateToServiceArea() { // 手艺人：服务区域
+			uni.navigateTo({
+				url: '/pages/artisan/service-area'
+			})
+		},
+
+		navigateToPersonalInfo() { // 手艺人：个人信息
+			uni.navigateTo({
+				url: '/pages/artisan/syr-info-change'
+			})
+		},
+
+		navigateToimg() { // 图片管理
+			uni.navigateTo({
+				url: '/pages/shop/photoAlbum/photoManage?type=1'
+			})
+		},
+
+		navigateTovideo() { // 视频管理
+			uni.navigateTo({
+				url: '/pages/shop/photoAlbum/photoManage?type=2'
+			})
+		},
+
+		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 b128e40..46efb3b 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -110,7 +110,7 @@ export default {
 	},
 	data() {
 		return {
-			currentStep: 4, // 当前步骤索引
+			currentStep: 0, // 当前步骤索引
 			isAgree: false,
 			identity: null,
 			textData: {},

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 060/118] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BC=98=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 {

From e94a376395506d69cd585f009130c62865ef80b1 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Mon, 1 Jun 2026 13:54:01 +0800
Subject: [PATCH 061/118] =?UTF-8?q?=E6=8A=80=E8=83=BD=E9=9B=86=E5=B8=82?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/skill-card.vue |   4 +-
 pages/jingxuan/selected-skills.vue   | 273 ++++++----
 pages/jingxuan/skill-detail.vue      | 722 +++++++++++++++++++++++++++
 3 files changed, 889 insertions(+), 110 deletions(-)
 create mode 100644 pages/jingxuan/skill-detail.vue

diff --git a/pages/home/components/skill-card.vue b/pages/home/components/skill-card.vue
index 825377f..e5c3e01 100644
--- a/pages/home/components/skill-card.vue
+++ b/pages/home/components/skill-card.vue
@@ -160,8 +160,8 @@ export default {
       }
       
       &.brand-course .type-text {
-        background: #e6f7ff;
-        color: #1890ff;
+        background: #f9d3d760;
+        color: #E55463;
       }
     }
     
diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index cb9b163..26cfbc3 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -13,51 +13,61 @@
     
     <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view>
 
-    <view class="official-author-block" v-if="linkType === 1">
-      <image class="author-avatar" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bbe832bf-aae6-4579-b3cc-246d252488c3" mode="aspectFill"></image>
-      <view class="author-info">
-        <text class="author-name">美融融官方</text>
-        <text class="author-desc">发布了658视频</text>
+    <view class="sticky-header-container" :style="{ top: navHeight + 'px' }">
+      
+      <view class="official-author-block" v-if="authorInfo.show">
+        <view class="author-left">
+          <image class="author-avatar" :src="authorInfo.avatar" mode="aspectFill"></image>
+          <view class="author-info">
+            <text class="author-name">{{ authorInfo.name }}</text>
+            <text class="author-desc">发布了{{ authorInfo.videoCount }}条技能</text>
+          </view>
+        </view>
+        
+        <view class="view-more-btn" v-if="!authorInfo.isOfficial" @click="goToBrandDetail">
+          <text>查看更多</text>
+          <view class="arrow-right"></view>
+        </view>
       </view>
-    </view>
 
-    <view class="sort-bar-wrap" :style="{ top: navHeight + 'px' }">
-      <view class="sort-bar">
-        <view class="left-sorts">
-          <view class="sort-item" @tap="toggleSort('time')">
-            <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
-            <view class="arrows">
-              <image class="arrow-icon" :src="orderType === 1 ? iconPinkUp : iconGreyUp"></image>
-              <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
+      <view class="sort-bar-wrap">
+        <view class="sort-bar">
+          <view class="left-sorts">
+            <view class="sort-item" @tap="toggleSort('time')">
+              <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
+              <view class="arrows">
+                <image class="arrow-icon" :src="orderType === 1 ? iconPinkUp : iconGreyUp"></image>
+                <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
+              </view>
+            </view>
+            
+            <view class="sort-item" @tap="toggleSort('view')">
+              <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
+              <view class="arrows">
+                <image class="arrow-icon" :src="orderType === 3 ? iconPinkUp : iconGreyUp"></image>
+                <image class="arrow-icon" :src="orderType === 4 ? iconPinkDown : iconGreyDown"></image>
+              </view>
             </view>
           </view>
-          
-          <view class="sort-item" @tap="toggleSort('view')">
-            <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
-            <view class="arrows">
-              <image class="arrow-icon" :src="orderType === 3 ? iconPinkUp : iconGreyUp"></image>
-              <image class="arrow-icon" :src="orderType === 4 ? iconPinkDown : iconGreyDown"></image>
+
+          <view class="right-filter" @tap="toggleFilterPanel">
+            <text class="filter-text">筛选</text>
+            <image class="filter-icon" :src="filterIcon" :class="{ 'rotate': filterVisible }"></image>
+          </view>
+        </view>
+
+        <view class="filter-panel" :class="{ 'show': filterVisible }" catchtouchmove="true">
+          <view class="filter-mask" @tap="closeFilterPanel"></view>
+          <view class="filter-container">
+            <text class="group-title">课程类型</text>
+            <view class="course-filter">
+              <view class="course-type-item" :class="{ active: linkType === '' }" @tap="selectAndApply('')">全部</view>
+              <view class="course-type-item" :class="{ active: linkType === 1 }" @tap="selectAndApply(1)">平台课程</view>
+              <view class="course-type-item" :class="{ active: linkType === 2 }" @tap="selectAndApply(2)">品牌课程</view>
             </view>
           </view>
         </view>
-
-        <view class="right-filter" @tap="toggleFilterPanel">
-          <text class="filter-text">筛选</text>
-          <image class="filter-icon" :src="filterIcon" :class="{ 'rotate': filterVisible }"></image>
-        </view>
-      </view>
-
-      <view class="filter-panel" :class="{ 'show': filterVisible }" catchtouchmove="true">
-        <view class="filter-mask" @tap="closeFilterPanel"></view>
-        <view class="filter-container">
-          <text class="group-title">课程类型</text>
-          <view class="course-filter">
-            <view class="course-type-item" :class="{ active: linkType === '' }" @tap="selectAndApply('')">全部</view>
-            <view class="course-type-item" :class="{ active: linkType === 1 }" @tap="selectAndApply(1)">平台课程</view>
-            <view class="course-type-item" :class="{ active: linkType === 2 }" @tap="selectAndApply(2)">品牌课程</view>
-          </view>
-        </view>
-      </view>
+      </view> 
     </view> <view class="list-container">
       <view v-if="skillList.length > 0">
         <skill-card 
@@ -83,7 +93,6 @@ import request from "@/utils/request"
 import SkillCard from "@/pages/home/components/skill-card.vue" 
 import noData from "@/components/noData/noData.vue";
 
-// 数据模式开关：true=调用真实接口，false=使用模拟数据
 const USE_REAL_API = true
 
 export default {
@@ -92,46 +101,64 @@ export default {
     return {
       navHeight: 0,
       
-      // 排序与筛选参数
-      orderType: 0, // 1:时间降序, 2:时间升序, 3:浏览量降序, 4:浏览量升序 (默认0)
-      linkType: '', // '':全部, 1:平台课程, 2:品牌课程
+      orderType: 0, 
+      linkType: '', 
+      
+      // 【新增】：统一管理作者/官方/品牌信息
+      authorInfo: {
+        show: false,       // 控制是否显示作者头部
+        isOfficial: false, // 区分是官方还是普通品牌
+        brandId: null,     // 品牌ID
+        name: '',          // 作者/品牌名称
+        avatar: '',        // 头像
+        videoCount: 0      // 视频数量
+      },
       
       filterVisible: false,
       
-      // 列表数据与分页
       skillList: [],
       page: 1,
       limit: 10,
       isFinished: false,
       
-      // 排序图标资源
       iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
       iconGreyDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfffb601-6877-4608-a3eb-88695b05c6c2.png',
       iconPinkUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bc84dff-e120-4d4b-a33e-25d68e065654.png',
       iconPinkDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ff2c2c9d-694a-4adf-b737-66b07f4a63ae.png',
       
-      // 模拟的本地全量数据（仅在 USE_REAL_API=false 时使用）
       mockDatabase: []
     }
   },
   computed: {
     filterIcon() {
-      // 漏斗图标，默认灰色
       return 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png'
     }
   },
-  onLoad() {
-    // 动态计算导航栏与下拉起点
+  // 接收页面跳转传过来的作者参数
+  onLoad(options) {
+    if (options && options.showAuthor === '1') {
+      this.authorInfo.show = true;
+      this.authorInfo.isOfficial = options.isOfficial === '1';
+      this.authorInfo.brandId = options.linkId || null; 
+      
+      // 用 decodeURIComponent 把转义的字符解析回正常的中文和链接
+      this.authorInfo.name = options.authorName ? decodeURIComponent(options.authorName) : '未知作者';
+      this.authorInfo.avatar = options.authorAvatar ? decodeURIComponent(options.authorAvatar) : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bbe832bf-aae6-4579-b3cc-246d252488c3';
+      this.authorInfo.videoCount = options.videoCount || 0;
+
+      // 强制设置筛选类型
+      this.linkType = this.authorInfo.isOfficial ? 1 : 2; 
+    } else if (options && options.linkType !== undefined) {
+      this.linkType = Number(options.linkType);
+    }
+
     const sysInfo = uni.getSystemInfoSync()
     const sbh = sysInfo.statusBarHeight || 0
     this.navHeight = sbh 
-    // Navbar(44px) + SortBar(大概88rpx -> 44px) = 88px 左右
-    this.filterTop = this.navHeight + uni.upx2px(106)
     
     this.initMockData()
     this.fetchData(true)
   },
-  // 触底加载更多
   onReachBottom() {
     if (!this.isFinished) {
       this.fetchData(false)
@@ -140,11 +167,22 @@ export default {
   methods: {
     goToSearch() {
       uni.navigateTo({
-            url: '/pages/search_common/search?type=skill' // 告诉搜索页，我要搜技能
+        url: '/pages/search_common/search?type=skill'
+      });
+    },
+
+    // 【新增】：跳转到品牌详情页面
+    goToBrandDetail() {
+      if (this.authorInfo.brandId) {
+        // 注：请核对这里的路径是否与你项目中的品牌详情页路径一致
+        uni.navigateTo({
+          url: `/pages/brand/detail?id=${this.authorInfo.brandId}`
         });
+      } else {
+        uni.showToast({ title: '缺少品牌信息', icon: 'none' });
+      }
     },
     
-    // 点击排序
     toggleSort(type) {
       if (type === 'time') {
         if (this.orderType === 1) this.orderType = 2
@@ -153,11 +191,9 @@ export default {
         if (this.orderType === 3) this.orderType = 4
         else this.orderType = 3
       }
-      
       this.fetchData(true)
     },
     
-    // 筛选面板控制
     toggleFilterPanel() {
       this.filterVisible = !this.filterVisible
     },
@@ -165,14 +201,14 @@ export default {
       this.filterVisible = false
     },
     
-    // 💡 匹配设计图交互：选择选项后立刻应用并收起下拉框
     selectAndApply(typeVal) {
       this.linkType = typeVal;
+      // 当通过本地筛选器切换时，关闭“专属展示区”，确保纯净筛选
+      this.authorInfo.show = false; 
       this.closeFilterPanel();
       this.fetchData(true);
     },
     
-    // 获取列表数据 (统一入口)
     async fetchData(isReset = false) {
       if (isReset) {
         this.page = 1
@@ -183,26 +219,21 @@ export default {
       if (USE_REAL_API) {
         uni.showLoading({ title: '加载中...' })
         try {
-          // 1. 初始化基础参数
           const params = {
             page: this.page,
             limit: this.limit
           }
+          if (this.orderType !== 0) params.order_type = this.orderType;
+          if (this.linkType !== '') params.link_type = this.linkType;
           
-          // 2. 仅当 orderType 不为 0 时，才将 order_type 传给后端，避免 500 报错
-          if (this.orderType !== 0) {
-            params.order_type = this.orderType
-          }
-          
-          // 3. 课程类型筛选
-          if (this.linkType !== '') {
-            params.link_type = this.linkType
+          // 【核心接口预留】：如果当前在看某个品牌的专属页，需要传link_id给后端过滤
+          if (this.authorInfo.show && !this.authorInfo.isOfficial && this.authorInfo.brandId) {
+            params.link_id = this.authorInfo.brandId;
           }
           
           const res = await request.post('/sj/skill/list', params)
           if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
             const list = res.data.list.map(item => this.formatApiData(item))
-            
             if (list.length < this.limit) this.isFinished = true
             this.skillList = isReset ? list : this.skillList.concat(list)
             this.page++
@@ -215,28 +246,29 @@ export default {
           uni.hideLoading()
         }
       } else {
-        // ========== 模拟数据请求环境 ==========
         uni.showLoading({ title: '模拟加载中...' })
         setTimeout(() => {
           let list = [...this.mockDatabase]
           
-          // 1. 模拟筛选
           if (this.linkType !== '') {
             list = list.filter(item => item.link_type === this.linkType)
           }
+
+          // 模拟品牌过滤
+          if (this.authorInfo.show && !this.authorInfo.isOfficial && this.authorInfo.brandId) {
+             list = list.filter(item => item.brand_id == this.authorInfo.brandId)
+          }
           
-          // 2. 模拟排序 (仅当 orderType 不为 0 时才进行排序操作)
           if (this.orderType !== 0) {
             list.sort((a, b) => {
-              if (this.orderType === 1) return b.timestamp - a.timestamp // 时间降序
-              if (this.orderType === 2) return a.timestamp - b.timestamp // 时间升序
-              if (this.orderType === 3) return b.views - a.views         // 浏览量降序
-              if (this.orderType === 4) return a.views - b.views         // 浏览量升序
+              if (this.orderType === 1) return b.timestamp - a.timestamp 
+              if (this.orderType === 2) return a.timestamp - b.timestamp 
+              if (this.orderType === 3) return b.views - a.views         
+              if (this.orderType === 4) return a.views - b.views         
               return 0
             })
           }
           
-          // 3. 模拟分页
           const start = (this.page - 1) * this.limit
           const end = start + this.limit
           const pageData = list.slice(start, end)
@@ -249,7 +281,6 @@ export default {
       }
     },
     
-    // 格式化接口数据
     formatApiData(item) {
       return {
         id: item.id,
@@ -281,14 +312,13 @@ export default {
       }
     },
 
-    //  初始化模拟数据
     initMockData() {
       this.mockDatabase = [
         { id: 1, title: '穿戴甲的操作视频扫码验券操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 836000, time: '7小时前', timestamp: Date.now() - 7*3600000 },
-        { id: 2, title: '脸部按摩操作步骤详情', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, views: 8334, time: '1天前', timestamp: Date.now() - 24*3600000 },
+        { id: 2, title: '脸部按摩操作步骤详情', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, brand_id: 101, views: 8334, time: '1天前', timestamp: Date.now() - 24*3600000 },
         { id: 3, title: '全身SPA的操作视频操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 2344, time: '3天前', timestamp: Date.now() - 3*24*3600000 },
         { id: 4, title: '高级面部护理手法详解最新版', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 836, time: '4月26日', timestamp: Date.now() - 30*24*3600000 },
-        { id: 5, title: '光疗美甲进阶全方位解析', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, views: 12000, time: '2小时前', timestamp: Date.now() - 2*3600000 }
+        { id: 5, title: '光疗美甲进阶全方位解析', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, brand_id: 101, views: 12000, time: '2小时前', timestamp: Date.now() - 2*3600000 }
       ]
     }
   }
@@ -301,48 +331,77 @@ export default {
   background: #fff;
 }
 
-/* 官方作者展示块 */
+/* 统一吸顶容器 */
+.sticky-header-container {
+  position: sticky;
+  background: #fff;
+  z-index: 101;
+  /* 确保整体吸顶时下方有稍微一点阴影或边框分割更好看，可根据 UI 需求开启 */
+  // border-bottom: 1rpx solid #F5F5F5; 
+}
+
+/* 官方/品牌 作者展示块样式 */
 .official-author-block {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   padding: 24rpx 30rpx;
   background: #fff;
   border-bottom: 10rpx solid #F5F5F5;
 
-  .author-avatar {
-    width: 70rpx;
-    height: 70rpx;
-    border-radius: 50%;
-    margin-right: 20rpx;
-    // border: 2rpx solid #F5F5F5;
-  }
-
-  .author-info {
+  .author-left {
     display: flex;
-    flex-direction: column;
-
-    .author-name {
-      font-weight: 500;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      margin-bottom: 4rpx;
+    align-items: center;
+    
+    .author-avatar {
+      width: 70rpx;
+      height: 70rpx;
+      border-radius: 50%;
+      margin-right: 20rpx;
     }
 
-    .author-desc {
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #999999;
-      line-height: 28rpx;
+    .author-info {
+      display: flex;
+      flex-direction: column;
+
+      .author-name {
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 40rpx;
+        margin-bottom: 4rpx;
+      }
+
+      .author-desc {
+        font-weight: 400;
+        font-size: 20rpx;
+        color: #999999;
+        line-height: 28rpx;
+      }
+    }
+  }
+
+  .view-more-btn {
+    display: flex;
+    align-items: center;
+    font-size: 24rpx;
+    color: #666666;
+    
+    .arrow-right {
+      width: 10rpx;
+      height: 10rpx;
+      border-top: 2rpx solid #666666;
+      border-right: 2rpx solid #666666;
+      transform: rotate(45deg);
+      margin-left: 6rpx;
     }
   }
 }
 
 .sort-bar-wrap {
-  position: sticky;
+  /* 移除单独的 sticky，由外层 container 统一控制 */
   background: #fff;
-  z-index: 101;
-//   border-bottom: 1rpx solid #F5F5F5;
+  position: relative; 
 }
 
 .sort-bar {
@@ -412,10 +471,9 @@ export default {
   padding: 30rpx 24rpx;
 }
 
-/* 抽屉筛选面板：使用 absolute 脱离计算 */
 .filter-panel {
   position: absolute;
-  top: 100%; /* 从 sort-bar-wrap 底部开始向下延伸 */
+  top: 100%; 
   left: 0; right: 0;
   height: 100vh;
   z-index: 100;
@@ -444,7 +502,6 @@ export default {
     padding: 30rpx 30rpx 40rpx;
     display: flex;
     flex-direction: column;
-    // box-shadow: 0 10rpx 20rpx rgba(0,0,0,0.05);
     transform: translateY(-100%);
     transition: transform 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
   }
diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
new file mode 100644
index 0000000..0830755
--- /dev/null
+++ b/pages/jingxuan/skill-detail.vue
@@ -0,0 +1,722 @@
+<template>
+  <view class="skill-detail-page">
+    
+    <custom-navbar 
+      title="技能集市" 
+      backgroundColor="#ffffff" 
+      titleColor="#333" 
+      borderBottom="none">
+    </custom-navbar>
+
+    <view class="mock-switch" @click="toggleMockData">
+      <text>{{ useMockData ? '关闭模拟数据' : '开启模拟数据' }}</text>
+    </view>
+
+    <view class="video-section" v-if="article.videoSrc">
+      <view class="video-wrapper">
+        
+        <video 
+          v-if="!tipShow"
+          id="customVideo"
+          class="main-video"
+          :src="article.videoSrc"
+          :poster="article.poster"
+          :controls="showNativeControls"
+          :show-center-play-btn="false"
+          :muted="isMuted"
+          object-fit="cover"
+          @timeupdate="onTimeUpdate"
+          @loadedmetadata="onLoadedMetaData"
+          @ended="onEnded"
+          @play="onPlay"
+          @pause="onPause"
+          @fullscreenchange="onFullScreenChange"
+        >
+          <cover-image 
+            v-if="!isPlaying && !showNativeControls" 
+            class="center-play-icon" 
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb720bb0-4ada-49f6-9ce5-38abfd613d5d.png" 
+            @click.stop="togglePlay"
+          ></cover-image>
+
+          <cover-view class="custom-control-bar" v-if="!showNativeControls">
+            <cover-image class="bar-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce7f28f8-470d-4f5b-9c7e-ff2bf8635226.png"></cover-image>
+            
+            <cover-view class="bar-content">
+              <cover-image v-if="isPlaying" class="ctrl-icon" :src="iconPause" @click.stop="togglePlay"></cover-image>
+              <cover-image v-if="!isPlaying" class="ctrl-icon" :src="iconPlay" @click.stop="togglePlay"></cover-image>
+              
+              <cover-view class="time-text">{{ formatTime(currentTime) }}</cover-view>
+              
+              <cover-view class="slider-track">
+                <cover-view class="slider-bg"></cover-view>
+                <cover-view class="slider-active" :style="activeStyle"></cover-view>
+                <cover-view class="slider-thumb" :style="thumbStyle"></cover-view>
+              </cover-view>
+              
+              <cover-view class="time-text">{{ formatTime(duration) }}</cover-view>
+              
+              <cover-image v-if="!isMuted" class="ctrl-icon mute-icon" :src="iconSoundOn" @click.stop="toggleMute"></cover-image>
+              <cover-image v-if="isMuted" class="ctrl-icon mute-icon" :src="iconMute" @click.stop="toggleMute"></cover-image>
+              
+              <cover-image class="ctrl-icon fullscreen-icon" :src="iconFullscreen" @click.stop="toggleFullScreen"></cover-image>
+            </cover-view>
+          </cover-view>
+        </video>
+        
+        <image 
+          v-else 
+          class="main-video fallback-poster" 
+          :src="article.poster || article.videoSrc" 
+          mode="aspectFill"
+        ></image>
+      </view>
+    </view>
+
+    <view class="article-header" v-if="article.title">
+      <view class="title">{{ article.title }}</view>
+      <view class="meta-row">
+        <view class="author-info" @click="goToAuthorMarket">
+          <image class="avatar" :src="article.authorAvatar" mode="aspectFill"></image>
+          <text class="author-name">{{ article.authorName }}</text>
+          <text class="date">{{ article.date }}</text>
+        </view>
+        
+        <view class="favorite-btn" @click="toggleFavorite">
+          <image 
+            class="star-icon" 
+            :src="isFavorite ? filledStarUrl : emptyStarUrl"
+            />
+          <text :class="{ 'active-fav': isFavorite }">{{ isFavorite ? '已收藏' : '收藏' }}</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="article-content-wrapper">
+      <view class="article-content" v-if="article.htmlContent">
+        <rich-text :nodes="formattedHtmlContent"></rich-text>
+      </view>
+      <view class="empty-content" v-else>
+        <text class="empty-text">暂无图文介绍</text>
+      </view>
+    </view>
+
+    <view class="recommend-section" v-if="recommendList.length > 0">
+      <view class="section-header">
+        <text class="section-title">相关推荐</text>
+        <view class="refresh-btn" @click="refreshList">
+          <image class="refresh-icon" :class="{'is-rotating': isRefreshing}" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/f2152145-df2a-49ab-87f5-f66b3207d0b0.png"></image>
+          <text>换一批</text>
+        </view>
+      </view>
+      
+      <view class="list-container">
+        <skill-card 
+          v-for="(item, index) in recommendList" 
+          :key="index" 
+          :item="item"
+        ></skill-card>
+      </view>
+    </view>
+
+    <tipsPopup2 :show="tipShow" @closePopup="closePopup" sureText="确认" @okBtn="okBtn">
+      {{ tipsText }}
+    </tipsPopup2>
+
+  </view>
+</template>
+
+<script>
+import request from "@/utils/request";
+import SkillCard from "@/pages/home/components/skill-card.vue";
+import tipsPopup2 from "@/components/tips-popup/tips-popup2"; 
+
+export default {
+  components: {
+    SkillCard,
+    tipsPopup2
+  },
+  data() {
+    return {
+      useMockData: false,
+      
+      articleId: null,
+      isFavorite: false,
+      emptyStarUrl: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/53378402-5456-4a80-b2ec-7c18d43d970e.png',
+      filledStarUrl: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/10461305-6bf8-4016-ae76-3415e055ec63.png',
+      isRefreshing: false,
+
+      isLogin: false,
+      tipShow: false,
+      tipsText: "",
+      tipType: "",
+
+      videoContext: null,
+      isPlaying: false,
+      isMuted: false,
+      
+      showNativeControls: false, 
+      
+      currentTime: 0,
+      duration: 0,
+      sliderValue: 0,
+      
+      iconPlay: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/88ca4fe3-645c-48a9-abda-1f9b45714970.png', 
+      iconPause: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cf9d6dd6-e9df-4c46-bafa-e1a72f7ddbcd.png', 
+      iconSoundOn: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9f13a630-7efd-4c61-b6fe-b6b282e28e42.png',
+      iconMute: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/80f856c1-3d66-4b11-b21a-8eb6a3272a3c.png',
+      iconFullscreen: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4286ef33-6849-4851-8866-4230d2523a33.png',
+      
+      article: {},
+      recommendList: []
+    }
+  },
+  computed: {
+    formattedHtmlContent() {
+      if (!this.article.htmlContent) return '';
+      let html = this.article.htmlContent;
+      html = html.replace(/<img/gi, '<img style="max-width:100%; height:auto; display:block; border-radius:10px; margin: 20rpx 0;"');
+      html = html.replace(/<p/gi, '<p style="margin-bottom: 24rpx; line-height: 40rpx;"');
+      return html;
+    },
+    activeStyle() {
+      return `width: ${this.sliderValue}%;`;
+    },
+    thumbStyle() {
+      return `left: ${this.sliderValue}%;`;
+    }
+  },
+  onLoad(options) {
+    if (options && options.id) {
+      this.articleId = parseInt(options.id, 10);
+    } else {
+      this.articleId = 1; 
+    }
+    this.getPageData();
+  },
+  onShow() {
+    this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+  },
+  methods: {
+    // 点击跳回集市专属页面（兼容官方和品牌方）
+    goToAuthorMarket() {
+      const isOfficial = this.article.linkType === 1 ? '1' : '0';
+      const linkId = this.article.linkId || '';
+      const name = encodeURIComponent(this.article.authorName || '');
+      const avatar = encodeURIComponent(this.article.authorAvatar || '');
+      const count = this.article.authorVideoCount || 0;
+
+      uni.navigateTo({
+        url: `/pages/jingxuan/selected-skills?showAuthor=1&isOfficial=${isOfficial}&linkId=${linkId}&authorName=${name}&authorAvatar=${avatar}&videoCount=${count}` 
+      });
+    },
+
+    getVideoContext() {
+      if (!this.videoContext) {
+        this.videoContext = uni.createVideoContext('customVideo', this);
+      }
+      return this.videoContext;
+    },
+
+    closePopup() {
+      this.tipShow = false;
+    },
+    okBtn() {
+      if (this.tipType == "login") {
+        uni.navigateTo({
+          url: "/pages/blogPopup/blogPopup", 
+        });
+      }
+      this.tipShow = false; 
+    },
+
+    formatTime(sec) {
+      if (!sec) return '00:00';
+      sec = Math.round(sec);
+      let m = Math.floor(sec / 60);
+      let s = sec % 60;
+      return (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
+    },
+    onLoadedMetaData(e) {
+      this.duration = e.detail.duration;
+    },
+    onTimeUpdate(e) {
+      if (e.detail.duration && this.duration === 0) {
+        this.duration = e.detail.duration;
+      }
+      this.currentTime = e.detail.currentTime;
+      if (this.duration > 0) {
+        this.sliderValue = Number(((this.currentTime / this.duration) * 100).toFixed(2));
+      }
+    },
+    onEnded() {
+      this.isPlaying = false;
+      this.currentTime = 0;
+      this.sliderValue = 0;
+      if (this.showNativeControls) {
+        const ctx = this.getVideoContext();
+        if (ctx) ctx.exitFullScreen();
+      }
+    },
+    onPlay() { this.isPlaying = true; },
+    onPause() { this.isPlaying = false; },
+    
+    onFullScreenChange(e) {
+      const isFull = e.detail.fullScreen;
+      if (!isFull) {
+        this.showNativeControls = false;
+      } else {
+        this.showNativeControls = true;
+      }
+    },
+    
+    togglePlay() {
+      const ctx = this.getVideoContext();
+      if (!ctx) return;
+      if (this.isPlaying) {
+        ctx.pause();
+      } else {
+        ctx.play();
+      }
+    },
+    toggleMute() {
+      this.isMuted = !this.isMuted;
+    },
+    
+    toggleFullScreen() {
+      const ctx = this.getVideoContext();
+      if (!ctx) return;
+      this.showNativeControls = true;
+      this.$nextTick(() => {
+        ctx.requestFullScreen({ direction: 90 });
+      });
+    },
+
+    toggleMockData() {
+      this.useMockData = !this.useMockData;
+      uni.showToast({ title: this.useMockData ? 'Mock已开启' : 'Mock已关闭', icon: 'none' });
+      this.getPageData();
+    },
+
+    getPageData() {
+      if (this.useMockData) {
+        this.injectMockData();
+        return;
+      }
+      uni.showLoading({ title: '加载中...' });
+      request.post("/sj/skill/details", { 
+        id: this.articleId 
+      }).then((res) => {
+        if (res.code == 200 && res.data) {
+          const data = res.data;
+          this.article = {
+            title: data.name || '暂无标题', 
+            // 【预留接口字段解析】：这里需要后端配合返回以下字段，如果没有的话目前会使用默认值
+            linkType: data.link_type || 1,        // 1=官方 2=品牌
+            linkId: data.link_id || 0,
+            authorName: data.author_name || '美融融平台', 
+            authorAvatar: data.author_avatar || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bbe832bf-aae6-4579-b3cc-246d252488c3',
+            authorVideoCount: data.link_publish_num || 0, // 关联者发布数
+
+            date: data.create_time ? data.create_time.substring(0, 10).replace(/-/g, '.') : '', 
+            videoSrc: data.video || '',
+            poster: data.cover_img || '',
+            htmlContent: data.detail || ''
+          };
+          this.isFavorite = data.collect_state === 1;
+          this.loadMockRecommend(); 
+        } else {
+          uni.showToast({ title: res.msg || '获取数据失败', icon: 'none' });
+        }
+      }).catch((err) => {
+        console.error('获取技能集市详情异常', err);
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+
+    toggleFavorite() {
+      if (!this.isLogin) {
+        if(this.isPlaying) {
+          this.getVideoContext().pause();
+        }
+        this.tipsText = "您现在还未登录，是否确定前往登录？";
+        this.tipShow = true;
+        this.tipType = "login";
+        return; 
+      }
+
+      if (this.useMockData) {
+        this.isFavorite = !this.isFavorite;
+        uni.showToast({ title: this.isFavorite ? '收藏成功' : '已取消收藏', icon: 'none' });
+        return;
+      }
+      
+      uni.showLoading({ title: '处理中' });
+      const targetState = this.isFavorite ? 2 : 1;
+      
+      request.post("/sj/skill/collect", { 
+        id: this.articleId, 
+        state: targetState 
+      }).then(res => {
+        if(res.code == 200) {
+          this.isFavorite = !this.isFavorite;
+          uni.showToast({ title: this.isFavorite ? '收藏成功' : '已取消收藏', icon: 'none' });
+        } else {
+          uni.showToast({ title: res.msg || '操作失败', icon: 'none' });
+        }
+      }).catch(err => {
+        uni.showToast({ title: '网络异常', icon: 'none' });
+      }).finally(() => {
+        uni.hideLoading();
+      });
+    },
+    
+    refreshList() {
+      if(this.isRefreshing) return;
+      this.isRefreshing = true;
+      uni.showLoading({ title: '加载中' });
+      setTimeout(() => {
+        this.recommendList = this.recommendList.sort(() => Math.random() - 0.5);
+        this.isRefreshing = false;
+        uni.hideLoading();
+      }, 600);
+    },
+
+    injectMockData() {
+      this.isFavorite = false;
+      this.article = {
+        title: '穿戴甲的操作视频扫码验券操作',
+        
+        // Mock作者相关数据(测试品牌跳转，将linkType改为2)
+        linkType: 2,
+        linkId: 101, 
+        authorName: '蜜丝卡伦官方品牌',
+        authorAvatar: 'https://images.unsplash.com/photo-1512290923902-8a9f81dc236c?ixlib=rb-4.0.3&auto=format&fit=crop&w=100&q=80',
+        authorVideoCount: 658,
+
+        date: '2026.03.03',
+        videoSrc: 'https://vjs.zencdn.net/v/oceans.mp4',
+        poster: 'https://images.unsplash.com/photo-1610992015732-2449b76344bc?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80',
+        htmlContent: `
+          <p>最近，一向以平价、良心、宠粉著称的胖东来，突然因为一条毛巾被推上风口浪尖。</p>
+          <p>4月下旬，抖音博主“惊梦人-”连续发布多条探店视频，称自己跑遍许昌5家胖东来门店，发现一边是几块钱的玻璃水、洗衣液等亲民好物，另一边却摆着标价249元的高端毛巾，价格形成反差。</p>
+          <img src="https://dummyimage.com/800x400/ff6b81/ffffff.png&text=占位图" alt="会员权益"/>
+        `
+      };
+      this.loadMockRecommend();
+    },
+
+    loadMockRecommend() {
+      this.recommendList = [
+        {
+          id: 1,
+          title: '穿戴甲的操作视频扫码验券操作教程...',
+          coverSrc: 'https://images.unsplash.com/photo-1604654894610-df63bc536371?ixlib=rb-4.0.3&auto=format&fit=crop&w=400&q=80',
+          type: '平台课程',
+          typeIcon: 'https://dummyimage.com/100x100/e6505f/fff.png&text=融',
+          views: 836000,
+          time: '7小时前'
+        },
+        {
+          id: 2,
+          title: '脸部按摩操作步骤详情',
+          coverSrc: 'https://images.unsplash.com/photo-1512290923902-8a9f81dc236c?ixlib=rb-4.0.3&auto=format&fit=crop&w=400&q=80',
+          type: '脸缘品牌',
+          typeIcon: 'https://dummyimage.com/100x100/e6505f/fff.png&text=缘',
+          views: 8334,
+          time: '1天前'
+        }
+      ];
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.skill-detail-page {
+  background-color: #ffffff;
+  min-height: 100vh;
+  padding-bottom: 60rpx;
+  position: relative;
+}
+
+.mock-switch {
+  position: fixed;
+  right: 20rpx;
+  top: 200rpx;
+  background: #E5505F;
+  color: #fff;
+  font-size: 24rpx;
+  padding: 10rpx 20rpx;
+  border-radius: 30rpx;
+  z-index: 999;
+  box-shadow: 0 4rpx 10rpx rgba(229, 80, 95, 0.4);
+}
+
+.video-section {
+  width: 100%;
+  height: 420rpx;
+  
+  .video-wrapper {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    
+    .main-video {
+      width: 100%;
+      height: 100%;
+      position: relative;
+    }
+
+    .fallback-poster {
+      z-index: 1;
+    }
+
+    .center-play-icon {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      width: 80rpx;
+      height: 80rpx;
+      z-index: 99;
+    }
+
+    .custom-control-bar {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      height: 70rpx;
+      z-index: 99;
+      
+      .bar-bg {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 70rpx;
+        z-index: 100;
+      }
+      
+      .bar-content {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 70rpx;
+        z-index: 101; 
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        padding: 0 10rpx;
+        box-sizing: border-box;
+        
+        .ctrl-icon {
+          width: 25rpx;
+          height: 30rpx;
+          margin: 0 10rpx;
+          flex-shrink: 0;
+        }
+        .mute-icon {
+          width: 38rpx;
+          height: 30rpx;
+          flex-shrink: 0;
+        }
+        .fullscreen-icon {
+          width: 30rpx;
+          height: 30rpx;
+          flex-shrink: 0;
+        }
+        
+        .time-text {
+          font-size: 22rpx;
+          color: #ffffff;
+          line-height: 70rpx;
+        }
+        
+        .slider-track {
+          flex: 1;
+          height: 70rpx;
+          margin: 0 20rpx;
+          position: relative;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          
+          .slider-bg {
+            position: absolute;
+            top: 33rpx; 
+            left: 0;
+            width: 100%;
+            height: 4rpx;
+            background-color: rgba(255, 255, 255, 0.4);
+          }
+          
+          .slider-active {
+            position: absolute;
+            top: 33rpx;
+            left: 0;
+            height: 4rpx;
+            background-color: #FF4767;
+          }
+          
+          .slider-thumb {
+            position: absolute;
+            top: 25rpx; 
+            margin-left: -10rpx; 
+            width: 20rpx;
+            height: 20rpx;
+            border-radius: 50%;
+            background-color: #FF4767;
+          }
+        }
+      }
+    }
+  }
+}
+
+.article-header {
+  padding: 30rpx 30rpx 20rpx;
+  
+  .title {
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #333333;
+    line-height: 45rpx;
+    margin-bottom: 24rpx;
+  }
+  
+  .meta-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    
+    .author-info {
+      display: flex;
+      align-items: center;
+      
+      .avatar {
+        width: 28rpx;
+        height: 28rpx;
+        border-radius: 50%;
+        margin-right: 12rpx;
+      }
+      
+      .author-name {
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #666666;
+        line-height: 33rpx;
+        margin-right: 16rpx;
+      }
+      
+      .date {
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+        line-height: 33rpx;
+      }
+    }
+    
+    .favorite-btn {
+        display: flex;
+        align-items: center;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+        line-height: 33rpx;
+        
+        .star-icon {
+            width: 26rpx;
+            height: 26rpx;
+            margin-right: 6rpx;
+            margin-top: -2rpx;
+        }
+        
+        .active-fav {
+            color: #FD5A8C ; 
+        }
+    }
+  }
+}
+
+.article-content-wrapper {
+  .article-content {
+    padding: 0 30rpx 40rpx;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #2A2A2A;
+    line-height: 40rpx;
+    
+    ::v-deep p {
+      margin-bottom: 24rpx;
+      line-height: 40rpx;
+    }
+    ::v-deep img {
+      max-width: 100%;
+      height: auto;
+      display: block;
+      border-radius: 10rpx;
+      margin: 20rpx 0;
+    }
+  }
+
+  .empty-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 50rpx 0 80rpx;
+    
+    .empty-icon {
+      width: 140rpx;
+      height: 140rpx;
+      margin-bottom: 24rpx;
+      opacity: 0.8;
+    }
+    
+    .empty-text {
+      font-size: 26rpx;
+      color: #A9A9A9;
+    }
+  }
+}
+
+.recommend-section {
+  padding: 0 30rpx;
+  
+  .section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 30rpx;
+    
+    .section-title {
+      font-weight: 500;
+      font-size: 30rpx;
+      color: #333333;
+      line-height: 42rpx;
+    }
+    
+    .refresh-btn {
+      display: flex;
+      align-items: center;
+      font-size: 26rpx;
+      color: #999999;
+      
+      .refresh-icon {
+        width: 24rpx;
+        height: 28rpx;
+        margin-right: 8rpx;
+        transition: transform 0.5s ease;
+        
+        &.is-rotating {
+          transform: rotate(360deg);
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file

From 8d885c3ec529d816e48a7a8764d1ac23223f7ccc Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Mon, 1 Jun 2026 13:54:04 +0800
Subject: [PATCH 062/118] 1

---
 pages/album/components/videoSlide.nvue | 844 ++-----------------------
 pages/album/components/videoplayer.vue | 106 ++++
 pages/album/index.nvue                 | 213 +++++--
 3 files changed, 318 insertions(+), 845 deletions(-)
 create mode 100644 pages/album/components/videoplayer.vue

diff --git a/pages/album/components/videoSlide.nvue b/pages/album/components/videoSlide.nvue
index 6e195c4..ea43006 100644
--- a/pages/album/components/videoSlide.nvue
+++ b/pages/album/components/videoSlide.nvue
@@ -1,822 +1,88 @@
 <template>
-	<view style="z-index: 100;">
-		<!-- 视频滑动主容器 -->
-		<view class="view-box" :style="viewTopLength">
-			<!-- 复用的5个视频容器 - 核心复用节点，不可删减 -->
-			<view class="video-box" :style="itemViewTopLength0">
-				<video :src="videoInfo_0.src" :style="fillScreen" :autoplay="videoInfo_0.autoplay"
-					:loop="videoInfo_0.loop" :controls="videoInfo_0.controls"
-					:enable-play-gesture="videoInfo_0.enablePlayGesture" :objectFit="videoInfo_0.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_0.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_0.enableProgressGesture" @timeupdate="timeupdate(0,$event)"
-					@ended='ended' :show-play-btn="videoInfo_0.showPlayBtn" :show-progress="videoInfo_0.showProgress"
-					initial-time="0" id='video_id_0' @play="playing(0)" :muted="videoInfo_0.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_0.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_0.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_0.mode || mode" :src="videoInfo_0.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart.stop='videotouchstart' @touchmove.stop="videotochmove"
-					@touchend.stop='videotouchend' @click.stop="videoClick"></view>
-				<!-- 视频文本区域 - 每个视频都有 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">{{ videoInfo_0.src }}</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_0.name}}</text>
-						<!-- 声音图标 - 绑定0号视频的状态，点击切换静音 -->
-						<image class="video-sound"
-							:src="videoInfo_0.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(0)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength1">
-				<video :src="videoInfo_1.src" :style="fillScreen" :autoplay="videoInfo_1.autoplay"
-					:loop="videoInfo_1.loop" :controls="videoInfo_1.controls"
-					:enable-play-gesture="videoInfo_1.enablePlayGesture" :objectFit="videoInfo_1.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_1.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_1.enableProgressGesture" @timeupdate="timeupdate(1,$event)"
-					@ended='ended' :show-play-btn="videoInfo_1.showPlayBtn" :show-progress="videoInfo_1.showProgress"
-					initial-time="0" id='video_id_1' @play="playing(1)" :muted="videoInfo_1.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_1.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_1.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_1.mode || mode" :src="videoInfo_1.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 1号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_1.name}}</text>
-						<!-- 声音图标 - 绑定1号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_1.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(1)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength2">
-				<video :src="videoInfo_2.src" :style="fillScreen" :autoplay="videoInfo_2.autoplay"
-					:loop="videoInfo_2.loop" :controls="videoInfo_2.controls"
-					:enable-play-gesture="videoInfo_2.enablePlayGesture" :objectFit="videoInfo_2.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_2.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_2.enableProgressGesture" @timeupdate="timeupdate(2,$event)"
-					@ended='ended' :show-play-btn="videoInfo_2.showPlayBtn" :show-progress="videoInfo_2.showProgress"
-					initial-time="0" id='video_id_2' @play="playing(2)" :muted="videoInfo_2.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_2.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_2.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_2.mode || mode" :src="videoInfo_2.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 2号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_2.name}}</text>
-						<!-- 声音图标 - 绑定2号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_2.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(2)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength3">
-				<video :src="videoInfo_3.src" :style="fillScreen" :autoplay="videoInfo_3.autoplay"
-					:loop="videoInfo_3.loop" :controls="videoInfo_3.controls"
-					:enable-play-gesture="videoInfo_3.enablePlayGesture" :objectFit="videoInfo_3.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_3.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_3.enableProgressGesture" @timeupdate="timeupdate(3,$event)"
-					@ended='ended' :show-play-btn="videoInfo_3.showPlayBtn" :show-progress="videoInfo_3.showProgress"
-					initial-time="0" id='video_id_3' @play="playing(3)" :muted="videoInfo_3.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_3.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_3.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_3.mode || mode" :src="videoInfo_3.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 3号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_3.name}}</text>
-						<!-- 声音图标 - 绑定3号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_3.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(3)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view class="video-box" :style="itemViewTopLength4">
-				<video :src="videoInfo_4.src" :style="fillScreen" :autoplay="videoInfo_4.autoplay"
-					:loop="videoInfo_4.loop" :controls="videoInfo_4.controls"
-					:enable-play-gesture="videoInfo_4.enablePlayGesture" :objectFit="videoInfo_4.objectFit || objectFit"
-					:show-fullscreen-btn="videoInfo_4.showFullscreenBtn"
-					:enable-progress-gesture="videoInfo_4.enableProgressGesture" @timeupdate="timeupdate(4,$event)"
-					@ended='ended' :show-play-btn="videoInfo_4.showPlayBtn" :show-progress="videoInfo_4.showProgress"
-					initial-time="0" id='video_id_4' @play="playing(4)" :muted="videoInfo_4.isMuted"
-					webkit-playsinline="true" playsinline="true">
-				</video>
-				<cover-view v-if="!videoInfo_4.flag" :style="stopIcon" class="cover-view-stop" />
-				<cover-view v-if="cover && videoInfo_4.coverStatus" :style="fillScreen2" class="video-image">
-					<image :mode="videoInfo_4.mode || mode" :src="videoInfo_4.coverUrl" :style="fillScreen"></image>
-				</cover-view>
-				<view class="video-action" @touchstart='videotouchstart' @touchmove="videotochmove"
-					@touchend='videotouchend' @click="videoClick"></view>
-				<!-- 视频文本区域 - 4号视频 -->
-				<view class="video-texts">
-					<view class="flex-row-center" style="flex: 1;">
-						<text class="video-title">珍草品汇理疗馆珍馆服务流程11订单</text>
-						<text class="video-score">评分 4.8</text>
-					</view>
-					<view class="flex-row-center-between" style="flex: 1;">
-						<text class="video-text">{{videoInfo_4.name}}</text>
-						<!-- 声音图标 - 绑定4号视频的状态 -->
-						<image class="video-sound"
-							:src="videoInfo_4.isMuted ? '/static/images/icons/sound_no.png' : '/static/images/icons/sound_yes.png'"
-							@click.stop="toggleMute(4)"></image>
-					</view>
-				</view>
-			</view>
-
-			<view @touchend='progressTouchend' class="progress-view">
-				<uv-slider v-if="showSlider" v-model="progressValue" activeColor="#D8D8D8" block-size="6"
-					backgroundColor="#494949;" class="progress-slider"></uv-slider>
-			</view>
-
-			<!-- 修改：Dot指示器 - 最多显示5个 -->
-			<view class="dots" :style="{top:`${0.5*winHeight}px`}" v-if="videoListLength > 1">
-				<view class="dots-container">
-					<view class="dot-item" v-for="(dotIndex, idx) in visibleDots" :key="idx"
-						:class="{ active: dotIndex === videoIndex }" @click="jumpToVideo(dotIndex)"></view>
-				</view>
-				<text class="pageNumber">
-					{{ videoIndex+1 }}/{{ videoListLength }}
-				</text>
-			</view>
+	<view class="video-page">
+		<!-- 原生视频组件：全端兼容 -->
+		<video id="fullVideo" class="video-box" :src="videoUrl" controls show-fullscreen-btn enable-progress-gesture
+			:autoplay="false" :loop="false" :muted="false" @play="onPlay" @pause="onPause"
+			@fullscreenchange="handleFullScreenChange" @ended="onVideoEnd"></video>
 
+		<!-- 自定义操作按钮 -->
+		<view class="btn-wrap">
+			<button type="primary" size="default" @click="openFullScreen">
+				手动横屏全屏播放
+			</button>
+			<button type="warn" size="default" @click="closeFullScreen">
+				退出全屏
+			</button>
 		</view>
 	</view>
 </template>
 
 <script>
-	let VIDEO_LIST = []
-	let initVideoInfo = {
-		src: "",
-		coverStatus: true,
-		coverUrl: "",
-		flag: false,
-		objectFit: "",
-		mode: "",
-		isMuted: false, // 默认不静音
-		autoplay: false,
-		loop: true,
-		controls: false,
-		enablePlayGesture: true,
-		showFullscreenBtn: false,
-		enableProgressGesture: false,
-		showPlayBtn: false,
-		showProgress: false
-	}
 	export default {
-		props: {
-			popVideoList: {
-				type: Array,
-				default: [] // 默认值设为空数组JSON，避免parse报错
-			},
-			marginTop: {
-				type: String,
-				default: "88" // 默认值设为空数组JSON，避免parse报错
-			}
-		},
 		data() {
 			return {
-				playSetTime:null,
-				showSlider: true,
-				progressTime: 0,
-				progressValue: 0,
-				boxHeight: 0,
-				objectFit: "fill",
-				mode: "scaleToFill",
-				winWidth: 1,
-				winHeight: 1,
-				videoIndex: 0,
-				viewTop: 0,
-				viewTopPostion: 0,
-				videoList: [],
-				videoListLength: 0,
-				itemViewTop0: 0,
-				itemViewTop1: 0,
-				itemViewTop2: 0,
-				itemViewTop3: 0,
-				itemViewTop4: 0,
-				videoInfo_0: initVideoInfo,
-				videoInfo_1: initVideoInfo,
-				videoInfo_2: initVideoInfo,
-				videoInfo_3: initVideoInfo,
-				videoInfo_4: initVideoInfo,
-				stopIcon: '',
-				videotouchstartTimestamp: 0,
-				videotouchendTimestamp: 0,
-				moveView: true,
-				cover: true,
-				slidingStatus: false,
-				videoPlayingStatus: false,
-				preloadedIndex: [],
-				startPageY: 0,
-				endPageY: 0,
-				// 新增：控制可视dot的数组
-				visibleDots: [],
+				// 测试视频地址，替换自己的
+				videoUrl: "https://www.w3school.com.cn/i/movie.mp4",
+				videoContext: null
 			};
 		},
-		watch: {
-			// videoList: {
-			// 	handler(newVal, oldVal) {
-
-
-			// 	},
-			// 	immediate: true, // 可选：组件初始化时立即执行一次（即使值未变化）
-			// 	deep: false // 普通类型无需深度监听，默认false
-			// }
-		},
-		created(options) {
-			//#ifdef APP-PLUS
-			plus.screen.lockOrientation("portrait-primary")
-			//#endif
-			if (this.popVideoList.length) {
-				try {
-					VIDEO_LIST = []
-					this.popVideoList.forEach((item, index) => {
-						let obj = {
-							"src": "",
-							"coverStatus": true,
-							"coverUrl": "",
-							"flag": false,
-							"objectFit": "contain",
-							"mode": "aspectFit",
-							"isMuted": false, // 默认不静音
-							"autoplay": false,
-							"loop": true,
-							"controls": false,
-							"enablePlayGesture": true,
-							"showFullscreenBtn": false,
-							"enableProgressGesture": false,
-							"showPlayBtn": false,
-							"showProgress": false,
-							"name": ""
-						}
-						obj.name = item.name
-						obj.src = item.url
-						obj.coverUrl = item.url +
-							`?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`
-						VIDEO_LIST.push(obj)
-						if (index == 0) {
-							initVideoInfo = obj
-						}
-					})
-				} catch (e) {}
-				this.getSystemInfo();
-				this.videoList = VIDEO_LIST;
-				this.videoListLength = this.videoList.length;
-				this.boxHeight = this.videoListLength * this.winHeight;
-				for (let i = 0; i < 5; i++) {
-					if (this.videoList[i]) {
-						this['videoInfo_' + i] = this.videoList[i]
-					}
-				}
-				// 初始化可视dot范围
-				this.updateVisibleDots();
-				// setTimeout(() => {
-				// 	this.playVideo(0)
-				// }, 500)
-			}
-		},
-		onUnload() {
-			for (let i = 0; i < 5; i++) {
-				this.unloadVideo(i)
-			}
-		},
-		computed: {
-			getVideoTop() {
-				return uni.upx2px(this.marginTop)
-			},
-			viewTopLength() {
-				return `height:${this.boxHeight}px;top:${this.viewTop}px;`
-			},
-			fillScreen() {
-				let style = `height:${this.winHeight}px;width:${this.winWidth}px;`
-				return style
-			},
-			fillScreen2() {
-				let style = `height:auto;width:${this.winWidth}px;`
-				return style
-			},
-			itemViewTopLength0() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop0}px;`
-			},
-			itemViewTopLength1() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop1}px;`
-			},
-			itemViewTopLength2() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop2}px;`
-			},
-			itemViewTopLength3() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop3}px;`
-			},
-			itemViewTopLength4() {
-				return `height:${this.winHeight}px;top:${this.itemViewTop4}px;`
-			}
+		onReady() {
+			// 初始化视频实例
+			this.videoContext = uni.createVideoContext("fullVideo", this);
 		},
 		methods: {
-			// 新增：切换视频静音状态
-			toggleMute(videoNum) {
-				// 1. 切换数据层状态
-				this['videoInfo_' + videoNum].isMuted = !this['videoInfo_' + videoNum].isMuted;
-				// 2. 同步视频实例静音状态（恢复并完善原有注释代码，加容错）
-				const videoCtx = uni.createVideoContext("video_id_" + videoNum, this);
-				if (videoCtx) {
-					videoCtx.mute(this['videoInfo_' + videoNum].isMuted);
-				}
+			// 进入横屏全屏
+			openFullScreen() {
+				// direction 90：横屏；-90反向横屏；0自适应
+				this.videoContext.requestFullScreen({
+					direction: 90
+				});
 			},
-			// 修改：点击dot跳转 - 传真实的视频索引
-			jumpToVideo(targetIndex) {
-				if (targetIndex === this.videoIndex || this.slidingStatus) return;
-				this.stopVideo(this.videoIndex % 5, true);
-				const diff = targetIndex - this.videoIndex;
-				this.videoIndex = targetIndex;
-				this.viewTopPostion = -this.videoIndex * this.winHeight;
-				this.viewTop = this.viewTopPostion;
-				if (this.videoListLength > 5) {
-					this.sortItemView(diff > 0 ? -1 : 1);
-				}
-				// 更新可视dot范围
-				this.updateVisibleDots();
-				setTimeout(() => {
-					this.playVideo(this.videoIndex % 5);
-				}, 400);
+			// 退出全屏
+			closeFullScreen() {
+				this.videoContext.exitFullScreen();
 			},
-			// 核心：更新可视dot范围 - 最多显示5个
-			updateVisibleDots() {
-				const maxShow = 5;
-				const total = this.videoListLength;
-				// 视频总数 ≤ 5，显示全部
-				if (total <= maxShow) {
-					this.visibleDots = Array.from({
-						length: total
-					}, (_, i) => i);
-					return;
-				}
-				// 视频总数 > 5，显示包含当前索引的5个dot
-				// 计算起始索引，避免越界
-				let start = Math.max(0, Math.min(this.videoIndex - 2, total - maxShow));
-				// 生成5个连续的索引
-				this.visibleDots = Array.from({
-					length: maxShow
-				}, (_, i) => start + i);
+			// 播放监听
+			onPlay() {
+				console.log("视频开始播放");
 			},
-			progressTouchend() {
-				let s = Math.round(this.progressValue / 100 * this.time)
-				let i = this.videoIndex % 5
-				uni.createVideoContext("video_id_" + i, this).seek(s)
-				uni.createVideoContext("video_id_" + i, this).play()
+			// 暂停监听
+			onPause() {
+				console.log("视频暂停");
 			},
-			sliderchanging(e) {
-				console.log(3333, e)
-			},
-			getSystemInfo() {
-				var _this = this;
-				uni.getSystemInfo({
-					success: function(res) {
-						_this.winWidth = res.windowWidth;
-						_this.winHeight = res.windowHeight;
-						let p = uni.upx2px(150)
-						_this.stopIcon = `left:${(res.windowWidth - p)/2}px;top:${(res.windowHeight - p)/2}px;`
-						_this.itemViewTop1 = res.windowHeight
-						_this.itemViewTop2 = res.windowHeight * 2
-						_this.itemViewTop3 = res.windowHeight * 3
-						_this.itemViewTop4 = res.windowHeight * 4
-					},
-				})
-			},
-			unloadVideo(index) {
-				if (index < 0 || index >= this.videoListLength) return;
-				const nodeNum = index % 5;
-				const videoCtx = uni.createVideoContext("video_id_" + nodeNum, this);
-				videoCtx.stop();
-				this.preloadedIndex = this.preloadedIndex.filter(item => item !== index);
-			},
-			playVideo(num) {
-				clearTimeout(this.playSetTime)
-				uni.$uv.debounce(() => {
-					this.videoPlayingStatus = true
-					this["videoInfo_" + num].flag = true
-					let VideoContext = uni.createVideoContext("video_id_" + num, this)
-					this.playSetTime = setTimeout(() => {
-						VideoContext.play()
-					}, 400)
-				}, 30)
-			},
-			stopVideo(num, control = false) {
-				const videoCtx = uni.createVideoContext("video_id_" + num, this);
-				if (!control) {
-					this['videoInfo_' + num].coverStatus = true;
-					videoCtx.stop()
+			// 全屏状态切换监听
+			handleFullScreenChange(e) {
+				if (e.detail.fullScreen) {
+					uni.setNavigationBarHidden(true); // 全屏隐藏顶部导航
 				} else {
-					videoCtx.pause()
+					uni.setNavigationBarHidden(false); // 退出恢复导航
 				}
-				this["videoInfo_" + num].flag = false
+				console.log("当前全屏状态：", e.detail.fullScreen);
 			},
-			nowPlayVideo() {
-				clearTimeout(this.playSetTime)
-				uni.$uv.debounce(() => {
-					this.videoPlayingStatus = true
-					this["videoInfo_" + this.videoIndex].flag = true
-					let VideoContext = uni.createVideoContext("video_id_" + this.videoIndex, this)
-					this.playSetTime = setTimeout(() => {
-						VideoContext.play()
-					}, 400)
-				}, 30)
-			},
-			nowStopVideo() {
-				const videoCtx = uni.createVideoContext("video_id_" + this.videoIndex, this);
-				videoCtx.pause()
-				this["videoInfo_" + this.videoIndex].flag = false
-			},
-			videoClick() {
-				let num = this.videoIndex % 5
-				if (this["videoInfo_" + num].flag) {
-					this.stopVideo(num, true)
-				} else {
-					this.playVideo(num, true)
-				}
-			},
-			videotouchstart(e) {
-				this.videotouchendTimestamp = this.videotouchstartTimestamp
-				this.videotouchstartTimestamp = e.timestamp
-				if ((this.videotouchstartTimestamp - this.videotouchendTimestamp) < 500) return
-				if (this.slidingStatus) return
-				this.startPageY = e.changedTouches[0].screenY;
-			},
-			videotochmove(e) {
-				if ((this.videotouchstartTimestamp - this.videotouchendTimestamp) < 500) return
-				if (this.slidingStatus) return
-				this.endPageY = e.changedTouches[0].screenY;
-				let sliding = this.endPageY - this.startPageY
-				if (sliding > 20 || sliding < -20) {
-					this.moveView = false
-				} else {
-					this.moveView = true
-				}
-				if (this.videoIndex == 0 && sliding > 50) {
-					this.viewTop = 50
-				} else if (this.videoIndex == this.videoListLength - 1 && sliding < 0) {
-					this.viewTop = this.viewTopPostion
-				} else {
-					this.viewTop = this.viewTopPostion + sliding
-				}
-			},
-			videotouchend(e) {
-				if ((this.videotouchstartTimestamp - this.videotouchendTimestamp) < 500) return
-				if (this.slidingStatus) return
-				this.moveView = true
-				this.endPageY = e.changedTouches[0].screenY;
-				let sliding = this.endPageY - this.startPageY
-				if ((sliding >= -40 && sliding < 0) || (sliding <= 40 && sliding > 0)) {
-					this.slidingStatus = true
-					this.videoSlidingReset(sliding)
-					return
-				}
-				if (sliding < -30) {
-					this.slidingStatus = true
-					if (this.videoIndex == this.videoListLength - 1) {
-						this.videoSlidingReset(sliding)
-						uni.showToast({
-							title: "已经到底了",
-							icon: "none"
-						})
-						return
-					}
-					this.moveView = false
-					this.videoSlidingToTop(sliding)
-					return
-				}
-				if (sliding > 30) {
-					this.slidingStatus = true
-					if (this.videoIndex == 0) {
-						this.videoSlidingReset(sliding)
-						return
-					}
-					this.moveView = false
-					this.videoSlidingToBottom(sliding)
-				}
-			},
-			videoSlidingReset(sliding) {
-				this.viewTop = this.viewTopPostion
-				this.slidingStatus = false
-			},
-			videoSlidingToTop(sliding) {
-				this.stopVideo(this.videoIndex % 5, true)
-				this.videoIndex++
-				if (this.videoListLength > 5) {
-					this.sortItemView(sliding)
-				}
-				this.viewTopPostion = this.viewTopPostion - this.winHeight
-				setTimeout(() => {
-					this.playVideo(this.videoIndex % 5)
-				}, 5)
-				let timer = setInterval(() => {
-					this.viewTop = this.viewTop - 35
-					if (this.viewTop < (this.viewTopPostion + 10)) {
-						this.viewTop = this.viewTopPostion
-						clearInterval(timer)
-						this.slidingStatus = false
-						this.slidingCallback()
-					}
-				}, 3)
-			},
-			videoSlidingToBottom(sliding) {
-				this.stopVideo(this.videoIndex % 5, true)
-				this.videoIndex--
-				if (this.videoListLength > 5) {
-					this.sortItemView(sliding)
-				}
-				this.viewTopPostion = this.viewTopPostion + this.winHeight
-				setTimeout(() => {
-					this.playVideo(this.videoIndex % 5)
-				}, 5)
-				let timer = setInterval(() => {
-					this.viewTop = this.viewTop + 35
-					if (this.viewTop > (this.viewTopPostion - 10)) {
-						this.viewTop = this.viewTopPostion
-						clearInterval(timer)
-						this.slidingStatus = false
-						this.slidingCallback()
-					}
-				}, 3)
-			},
-			// 修改：滑动结束后更新可视dot
-			slidingCallback() {
-				this.progressValue = 0
-				this.updateVisibleDots();
-			},
-			//滑动组件排序
-			sortItemView(silding) {
-				// 向上滑动
-				if (silding < 0) {
-					if (this.videoIndex > 2 && this.videoIndex < this.videoListLength - 2) {
-						let i = (this.videoIndex - 3) % 5
-						this["itemViewTop" + i] = this["itemViewTop" + i] + this.winHeight * 5
-						this['videoInfo_' + i] = this.videoList[this.videoIndex + 2]
-					}
-					return
-				}
-				// 向下滑动
-				if (silding > 0) {
-					if (this.videoIndex > 1 && this.videoIndex < this.videoListLength - 3) {
-						let i = (this.videoIndex + 3) % 5
-						this["itemViewTop" + i] = this["itemViewTop" + i] - this.winHeight * 5
-						this['videoInfo_' + i] = this.videoList[this.videoIndex - 2]
-					}
-				}
-			},
-			playing(i) {
-				setTimeout(() => {
-					this['videoInfo_' + i].coverStatus = false
-					this.moveView = true
-					this.slidingStatus = false
-				}, 600)
-			},
-			timeupdate(i, e) {
-				if (this.videoPlayingStatus) {
-					this.slidingStatus = false
-					this.videoPlayingStatus = false
-					setTimeout(() => {
-						this['videoInfo_' + i].coverStatus = false
-						this.moveView = true
-					}, 200)
-				}
-				this["videoInfo_" + i].flag = true
-				if (e.detail.duration >= this.progressTime) {
-					if (this.videoIndex%5 == i) {
-						this.time = e.detail.duration
-						this.progress = e.detail.currentTime
-						this.progressValue = (e.detail.currentTime / e.detail.duration) * 100
-					}
-
-					this.showProgress = true
-				} else {
-					this.showProgress = false
-				}
-			},
-			ended() {
-				let num = this.videoIndex % 5
-				this["videoInfo_" + num].flag = false
-				this.progressValue = 0
+			// 视频播放结束
+			onVideoEnd() {
+				// 播放完毕自动退出全屏
+				this.videoContext.exitFullScreen();
 			}
 		}
-	}
+	};
 </script>
 
-<style scoped lang="less">
-	.view-box {
-		// position: fixed;
-		// left: 0;
-		// right: 0;
-		background-color: #000;
-		// z-index: 900;
+<style scoped>
+	.video-page {
+		padding: 15rpx;
 	}
 
 	.video-box {
-		position: absolute;
-		left: 0;
-		right: 0;
-		z-index: 2000;
+		width: 100%;
+		height: 420rpx;
+		border-radius: 12rpx;
+		overflow: hidden;
 	}
 
-	.video-image {
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 2001;
-	}
-
-	.video-action {
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 2008;
-	}
-
-	.video-texts {
-		position: absolute;
-		left: 30rpx;
-		right: 30rpx;
-		bottom: 120rpx;
-		z-index: 2009; // 确保在视频上方显示
-
-		.video-title {
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			text-align: left;
-			font-style: normal;
-			lines: 1;
-			max-width: 240rpx;
-		}
-
-		.video-score {
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			text-align: left;
-			font-style: normal;
-			margin-left: 20rpx;
-		}
-
-		.video-text {
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #FFFFFF;
-			text-align: left;
-			font-style: normal;
-		}
-
-		.video-sound {
-			width: 44rpx;
-			height: 42rpx;
-			cursor: pointer; // 点击指针，提示可点击
-		}
-	}
-
-	.cover-view-stop {
-		position: absolute;
-		z-index: 9999;
-		width: 150rpx;
-		height: 200rpx;
-		background-color: rgba(0, 0, 0, 0.3);
-		border-radius: 50%;
-	}
-
-	.progress-view {
-		z-index: 9999;
-		position: fixed;
-		left: 30rpx;
-		right: 30rpx;
-		bottom: 80rpx;
-
-		.progress-slider {}
-	}
-
-	// 修改：Dot指示器样式 - 最多显示5个 + 过渡动画
-	.dots {
-		position: fixed;
-		left: 20rpx;
-		top: 0;
-		transform: translateY(-50%);
-		z-index: 9999;
-		flex-direction: row;
-
-		.dots-container {
-			// 限制最多显示5个，超出隐藏
-			width: fit-content;
-			overflow: hidden;
-			margin: auto 0;
-
-			.dot-item {
-				width: 10rpx;
-				height: 10rpx;
-				background: #FFFFFF;
-				border-radius: 50%;
-				// 核心：过渡动画，切换更丝滑
-				transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-				cursor: pointer;
-				margin-bottom: 10rpx;
-
-				&.active {
-					width: 10rpx;
-					height: 30rpx;
-					background: #FFFFFF;
-					border-radius: 5rpx;
-				}
-			}
-		}
-
-		.pageNumber {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #FFFFFF;
-			line-height: 36rpx;
-			text-align: left;
-			font-style: normal;
-			margin-left: 6rpx;
-		}
-	}
-
-	.flex-row-center-between {
+	.btn-wrap {
+		margin-top: 30rpx;
 		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.flex-row-start-between {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-start;
-		justify-content: space-between;
-	}
-
-	.flex-row-center-center {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.flex-row-center {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.flex-row-start {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-start;
-	}
-
-	.flex-row-end-between {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-end;
-		justify-content: space-between;
+		gap: 20rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/album/components/videoplayer.vue b/pages/album/components/videoplayer.vue
new file mode 100644
index 0000000..9ae18ef
--- /dev/null
+++ b/pages/album/components/videoplayer.vue
@@ -0,0 +1,106 @@
+<template>
+	<view class="video-page">
+		<!-- 原生视频组件：全端兼容 -->
+		<video id="fullVideo" class="video-box" :src="videoUrl" controls show-fullscreen-btn enable-progress-gesture
+			:autoplay="true" :loop="false" :muted="false" @play="onPlay" @pause="onPause" object-fit="cover" :direction="90"
+			@fullscreenchange="handleFullScreenChange" @ended="onVideoEnd" @fullscreenclick="tapback"></video>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				videoUrl: "",
+				videoContext: null
+			};
+		},
+		onLoad(options) {
+			console.log(options, '页面参数');
+			// 接收视频地址
+			if (options.url) {
+				this.videoUrl = options.url;
+			}
+		},
+		onReady() {
+			// #ifdef APP-PLUS
+			//plus.screen.unlockOrientation(); //解除屏幕方向的锁定，但是不一定是竖屏；
+			
+			// #endif
+			// 初始化视频实例（唯一正确位置）
+			this.videoContext = uni.createVideoContext("fullVideo", this);
+			// 页面渲染完成后 安全触发自动全屏
+			//this.autoFullScreen();
+		},
+		methods: {
+			tapback(e) {
+				console.log('点击全屏按钮');
+				// if (e.target.fullScreen) {
+				// 	plus.screen.lockOrientation('landscape'); //锁死屏幕方向为竖屏
+				// }else{
+				// 	plus.screen.lockOrientation('portrait'); //锁死屏幕方向为竖屏
+				// }
+			},
+			// 自动全屏（核心：修复iOS方向错乱）
+			autoFullScreen() {
+				if (!this.videoContext) return;
+
+				// 区分平台设置方向：iOS用0自适应，安卓用90横屏
+				const direction = uni.getSystemInfoSync().platform === 'ios' ? 0 : 90;
+
+				// 延迟执行，避免视频未加载完成导致全屏失败
+				setTimeout(() => {
+					this.videoContext.requestFullScreen({
+						direction: direction
+					});
+				}, 300)
+			},
+			// 手动横屏全屏
+			openFullScreen() {
+				if (!this.videoContext) return;
+				const direction = uni.getSystemInfoSync().platform === 'ios' ? 0 : 90;
+				this.videoContext.requestFullScreen({
+					direction
+				});
+			},
+			// 退出全屏
+			closeFullScreen() {
+				if (!this.videoContext) return;
+				this.videoContext.exitFullScreen();
+			},
+			// 播放监听
+			onPlay() {
+				console.log("视频开始播放");
+			},
+			// 暂停监听
+			onPause() {
+				console.log("视频暂停");
+			},
+			// 全屏状态切换
+			handleFullScreenChange(e) {
+				// 全屏隐藏导航栏，退出显示
+				// uni.setNavigationBarHidden(!!e.detail.fullScreen);
+				console.log("全屏状态：", e.detail.fullScreen);
+			},
+			// 视频播放完毕
+			onVideoEnd() {
+				this.closeFullScreen();
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.video-page {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+	}
+
+	.video-box {
+		width: 100%;
+		/* 自适应高度，避免拉伸 */
+		height: 100%;
+		object-fit: cover;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/album/index.nvue b/pages/album/index.nvue
index 0dda008..97b70ad 100644
--- a/pages/album/index.nvue
+++ b/pages/album/index.nvue
@@ -1,52 +1,59 @@
 <template>
 	<view class="container">
 		<view class="positonFixed">
-			<view class="header-top flex-row-center" :class="{videoTop:current==0}"
-				:style="{ height: `${88+statusBarHeight}rpx`,paddingTop: `${statusBarHeight}rpx`}">
+			<view class="header-top flex-row-center" :style="{ height: `${100}rpx`,paddingTop:`${statusBarHeight}rpx`}">
 				<view class="left-area" @click="goBack">
-					<image src="/static/images/whiteBack.png" mode="aspectFit" class="back-icon"></image>
+					<image src="/static/images/back.png" mode="aspectFit" class="back-icon"></image>
 				</view>
-				<view class="flex-row-center-center" style="flex: 1;margin-right: 18rpx;height:66rpx;">					
+				<view class="flex-row-center-center" style="flex: 1;margin-right: 18rpx;height:66rpx;">
 					<uv-tabs :list="list" @click="tabsClick" itemStyle="height:66rpx;" :activeStyle="activeStyle"
 						:inactiveStyle="inactiveStyle" :current="current" :lineColor="`rgba(232, 16, 30, 1)`"></uv-tabs>
 				</view>
-
 			</view>
-			<scroll-view scroll-x style="height: 100rpx;" v-if="current==1">
+			<scroll-view scroll-x style="height: 100rpx;background-color: #fff;" v-if="current==1">
 				<view class="container-tabs flex-row-center">
 					<view class="container-tab flex-row-center-center" @click="clickTab(item)"
-						:class="{active:cardListIndex==item.id}" v-for="(item,index) in cardList[1]" :key="index">
+						:class="{active:cardListIndex==item.id}" v-for="(item,index) in cardList[user_type]"
+						:key="index">
 						<text class="container-tab-text">{{ item.title }}</text>
 					</view>
 				</view>
 			</scroll-view>
-
 		</view>
-
+		<view :style="swiperStyle3"></view>
 		<view class="container-content" :style="swiperStyle2">
-			<swiper class="swiper" circular :style="swiperStyle" :current="current" @change="swiperChange" :disable-touch="current==0">
+			<swiper class="swiper" circular :style="swiperStyle" :current="current" @change="swiperChange"
+				:disable-touch="current==0">
 				<swiper-item>
-					<videoSlide ref="ideoSlideRrf" :popVideoList="videoList" :marginTop="`${88 + this.statusBarHeight}`" v-show="current==0" v-if="videoList.length"></videoSlide>
+					<scroll-view scroll-y :style="{height:`${viewportHeight-100-this.statusBarHeight}rpx`}">
+						<view class="swiper-items3">
+							<view class="swiper-item3" :class="{item2Left:index%2 == 0}"
+								v-for="(item,index) in videoList" :key="index" @click="tovideo(item)">
+								<image class="swiper-item3-video" mode="aspectFill" :src="item.img"></image>
+								<image
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c6c039fc-99fd-492e-ae9a-ed43260c94ef.png"
+									mode="widthFix"
+									style="width: 80rpx;position: absolute;top: 50%;left: 50%;transform: translate3d(-50%, -50%, 0);">
+								</image>
+							</view>
+						</view>
+					</scroll-view>
 				</swiper-item>
 				<swiper-item>
-					<scroll-view scroll-y :style="{height:`${viewportHeight-88-this.statusBarHeight-100}rpx`}">
+					<scroll-view scroll-y :style="{height:`${viewportHeight-100-this.statusBarHeight-100}rpx`}">
 						<view class="swiper-items2">
 							<view class="swiper-item2" :class="{item2Left:index%2 == 0}"
-								v-for="(item,index) in imagObj[cardListIndex]" :key="index">
+								v-for="(item,index) in imagObj[cardListIndex]" :key="index" @click="toimg(item)">
 								<image class="swiper-item2-img" mode="aspectFill" :src="item.url"></image>
 								<view class="swiper-item2-title">
 									<text class="swiper-item2-title-text">{{ item.name }}</text>
 								</view>
 							</view>
-
 						</view>
-
-
 					</scroll-view>
 				</swiper-item>
 			</swiper>
 		</view>
-
 	</view>
 </template>
 
@@ -68,6 +75,23 @@
 							title: "主图",
 							id: 1
 						},
+						{
+							title: "作品",
+							id: 3
+						},
+						{
+							title: "其他",
+							id: 4
+						}
+					],
+					2: [{
+							title: "全部",
+							id: 0
+						},
+						{
+							title: "主图",
+							id: 1
+						},
 						{
 							title: "环境",
 							id: 2
@@ -94,7 +118,7 @@
 				inactiveStyle: {
 					fontWeight: 500,
 					fontSize: "32rpx",
-					color: "#666666",
+					color: "#333333",
 				},
 				current: 1,
 				statusBarHeight: 0,
@@ -108,6 +132,7 @@
 			};
 		},
 		async onLoad(options) {
+
 			// 获取状态栏高度
 			const systemInfo = await uni.getSystemInfoSync()
 			this.systemInfo = systemInfo
@@ -120,6 +145,12 @@
 				this.getVideoList()
 			}
 		},
+		onShow() {
+			// // #ifdef APP-PLUS
+			// plus.screen.unlockOrientation(); //解除屏幕方向的锁定，但是不一定是竖屏；
+			// plus.screen.lockOrientation('portrait'); //锁死屏幕方向为竖屏
+			// // #endif
+		},
 		computed: {
 			// 计算swiper的样式
 			swiperStyle() {
@@ -128,8 +159,8 @@
 					// 注意：100vh 是视口高度，需要先转数值计算，再拼接单位
 
 					let viewportHeight = this.pxToRpx(this.systemInfo.windowHeight || window?.innerHeight || document
-						?.documentElement?.clientHeight|| 0, screenWidth ) ;
-					let height = viewportHeight - 88 - this.statusBarHeight;
+						?.documentElement?.clientHeight || 0, screenWidth);
+					let height = viewportHeight - 100 - this.statusBarHeight;
 					return {
 						height: `${height}rpx`
 					};
@@ -141,55 +172,69 @@
 			swiperStyle2() {
 				if (this.current == 1) {
 					return {
-						marginTop: `${88 + this.statusBarHeight + 100}rpx`,
-						height: `${this.viewportHeight-88-this.statusBarHeight-100}rpx`
+						height: `${this.viewportHeight-100-this.statusBarHeight-100}rpx`
 					};
 				}
 				return {
 					height: `${this.viewportHeight}rpx`
 				};
 			},
+			swiperStyle3() {
+				if (this.current == 1) {
+					return {
+						width: `750rpx`,
+						height: `${200 + this.statusBarHeight}rpx`,
+					};
+				}
+				return {
+					width: `750rpx`,
+					height: `${100 + this.statusBarHeight}rpx`,
+				};
+			},
 			viewportHeight() {
 				let screenWidth = this.systemInfo.screenWidth;
 				// 注意：100vh 是视口高度，需要先转数值计算，再拼接单位
 				let viewportHeight = this.pxToRpx(this.systemInfo.windowHeight || window?.innerHeight || document
-					?.documentElement?.clientHeight|| 0, screenWidth) ;
+					?.documentElement?.clientHeight || 0, screenWidth);
 				return viewportHeight
 			},
 		},
 		methods: {
+			goBack() {
+				uni.navigateBack(-1)
+			},
+			toimg(item) {
+				console.log(item, 'item');
+				uni.previewImage({
+					urls: [item.url], // 外面加 [] 变成数组
+					current: 0 // 可选，默认第一张
+				})
+			},
+			tovideo(item) {
+				uni.navigateTo({
+					url: '/pages/album/components/videoplayer?url=' + item.url
+				})
+			},
 			clickTab(item) {
 				this.cardListIndex = item.id
 			},
 			tabsClick(e) {
-				this.$nextTick(() => {
-					
-					this.current = e.index
-					if(this.current==1){
-						this.activeStyle.color = "#333333"
-						this.inactiveStyle.color = "#666666"
-						this.$refs.ideoSlideRrf.nowStopVideo()
-					}
-					if(this.current==0){
-						this.activeStyle.color = "#fff"
-						this.inactiveStyle.color = "#ccc"
-						this.$refs.ideoSlideRrf.nowPlayVideo()
-					}
-				})
+				console.log('12312312312');
 
+				this.current = e.index
+				this.activeStyle.color = "#333333"
+				this.inactiveStyle.color = "#666666"
 			},
 			swiperChange(e) {
 				this.$nextTick(() => {
 					this.current = e.detail.current
-					if(this.current==1){
+					if (this.current == 1) {
 						this.activeStyle.color = "#333333"
 						this.inactiveStyle.color = "#666666"
-						this.$refs.ideoSlideRrf.nowStopVideo()
 					}
-					if(this.current==0){
-						this.activeStyle.color = "#fff"
-						this.inactiveStyle.color = "#ccc"
-						this.$refs.ideoSlideRrf.nowPlayVideo()
+					if (this.current == 0) {
+						this.activeStyle.color = "#333333"
+						this.inactiveStyle.color = "#666666"
 					}
 				})
 
@@ -208,12 +253,17 @@
 					type: 1
 				}).then(res => {
 					if (res.code == 200) {
-						this.imagObj = res.data.list[1]
-						let all = []
-						for (let key in res.data.list[1]) {
-							all = [...all, ...res.data.list[1][key]]
+						if (res.data.list.length != 0) {
+							this.imagObj = res.data.list[1]
+							let all = []
+							for (let key in res.data.list[1]) {
+								all = [...all, ...res.data.list[1][key]]
+							}
+							this.imagObj[0] = all
+						} else {
+							this.imagObj[0] = []
 						}
-						this.imagObj[0] = all
+
 					}
 				})
 			},
@@ -224,8 +274,17 @@
 					type: 2
 				}).then(res => {
 					if (res.code == 200) {
-						for (let key in res.data.list[2]) {
-							this.videoList = [...this.videoList, ...res.data.list[2][key]]
+						if (res.data.list.length != 0) {
+							console.log(res.data, 'res.data');
+							for (let key in res.data.list[2]) {
+								this.videoList = [...this.videoList, ...res.data.list[2][key]]
+								this.videoList.forEach((item) => {
+									item.img = item.url +
+										'?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto'
+								})
+							}
+						} else {
+							this.videoList = []
 						}
 					}
 				})
@@ -249,7 +308,7 @@
 			z-index: 9999;
 			background: #f5f5f5;
 			padding: 0 24rpx;
-			
+
 			.left-area {
 				display: flex;
 				align-items: center;
@@ -266,10 +325,12 @@
 				}
 			}
 		}
-		.videoTop{
+
+		.videoTop {
 			background: transparent;
-			::v-deep .uv-tabs__wrapper__nav__line{
-				background: #fff!important;
+
+			::v-deep .uv-tabs__wrapper__nav__line {
+				background: #fff !important;
 			}
 		}
 
@@ -306,6 +367,7 @@
 
 		.container-content {
 			z-index: 1000;
+
 			.swiper {
 				background: #fff;
 
@@ -349,6 +411,47 @@
 					}
 				}
 
+				.swiper-items3 {
+					flex-wrap: wrap;
+					flex-direction: row;
+					display: flex;
+					padding-bottom: 20rpx;
+
+					.swiper-item3 {
+						width: 370rpx;
+						height: 370rpx;
+						margin-top: 10rpx;
+						overflow: hidden;
+						position: relative;
+						box-sizing: border-box;
+						border-radius: 20rpx;
+
+						.swiper-item3-video {
+							width: 370rpx;
+							height: 370rpx;
+						}
+
+						.swiper-item3-title {
+							position: absolute;
+							left: 0;
+							top: 0;
+							height: 33rpx;
+							padding: 0 8rpx;
+							background: rgba(0, 0, 0, 0.5);
+							border-radius: 0rpx 0rpx 10rpx 0rpx;
+							width: fit-content;
+
+							.swiper-item3-title-text {
+								font-weight: 400;
+								font-size: 18rpx;
+								color: #FFFFFF;
+								line-height: 33rpx;
+
+							}
+						}
+					}
+				}
+
 				.item2Left {
 					margin-right: 9rpx;
 				}
@@ -398,6 +501,4 @@
 		align-items: flex-end;
 		justify-content: space-between;
 	}
-	
-	
 </style>
\ No newline at end of file

From 92637b114f70d1414b848dae2524c09c14e1fa8c Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Mon, 1 Jun 2026 16:02:17 +0800
Subject: [PATCH 063/118] =?UTF-8?q?=E6=96=B0=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/request.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/request.js b/utils/request.js
index 50b9276..f0bec35 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -140,8 +140,8 @@ const request = async (options, isUpdate) => {
 		//baseURL = 'https://app.mrrweb.com.cn';
 	} else {
 		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
-		baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。	
-			//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
+		baseURL = 'http://116.63.163.121:93'; // 发布到生产环境时，此处代码会被摇树移除掉。	
+			//baseURL = 'http://116.63.163.121:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'https://app.mrrweb.com.cn';
 
 		console.log('生产环境');

From 2ecd26d609c2b5c90f7163a9dbdfa5b7513f7675 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 16:36:47 +0800
Subject: [PATCH 064/118] =?UTF-8?q?=E5=85=A5=E4=BD=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artisan/profile.vue             |    6 +-
 pages/my/my.vue                       |   16 +-
 pages/ruzhu/qualification_sj copy.vue | 2935 +++++++++++++------------
 pages/ruzhu/qualification_sj.vue      | 1919 +++++++++-------
 4 files changed, 2725 insertions(+), 2151 deletions(-)

diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index 7c9d35d..5d62d4f 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -73,7 +73,7 @@
 									v-if="!userInfo.servers_kill_arr || userInfo.servers_kill_arr.length === 0">
 								</image>
 								<text style="margin-right: 16rpx;"
-									:style="{ color: (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '#333333' : '#ec5d57' }">
+									:style="{ color: (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '#c9c9c9' : '#ec5d57' }">
 									{{ (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '已设置' :
 										'待完善' }}
 								</text>
@@ -630,14 +630,12 @@
 				})
 			},
 
-			navigateToQualification() { // 商家手艺人：资质信息
+			navigateToQualification() { 
 				if (this.userInfo.credentials_state == '1') {
-					// 商家跳转到资质信息页面
 					uni.navigateTo({
 						url: '/pages/ruzhu/ruzhu?type=1'
 					})
 				} else {
-					// 手艺人跳转到资质信息页面
 					uni.navigateTo({
 						url: '/pages/shop/qualification_sj_change'
 					})
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 67f1fac..71cf155 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -176,8 +176,7 @@ export default {
 				{
 					title: "店铺装修",
 					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png",
-					// https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png
-					path: "/pages/shop/qualification_sj_change",
+					path: "/pages/artisan/profile",
 					go_id_type: 1,
 				},
 				{
@@ -654,6 +653,19 @@ export default {
 			request.post("/sj/user/getUser").then((result) => {
 				this.userInfo = result.data;
 				uni.setStorageSync("syrId", result.data.id);
+				const allReady = result.data.business_time
+					&& result.data.servers_kill_arr
+					&& result.data.servers_kill_arr.length > 0
+					&& result.data.credentials_state === 2;
+				const mgmtCard = this.cardList.find(c => c.title === "管理中心");
+				if (mgmtCard) {
+					const shopItem = mgmtCard.list.find(i => i.title === "店铺装修");
+					if (shopItem) {
+						shopItem.url = allReady
+							? "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png"
+							: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png";
+					}
+				}
 			});
 			this.getInviteList();
 		},
diff --git a/pages/ruzhu/qualification_sj copy.vue b/pages/ruzhu/qualification_sj copy.vue
index 921f2f0..39037df 100644
--- a/pages/ruzhu/qualification_sj copy.vue	
+++ b/pages/ruzhu/qualification_sj copy.vue	
@@ -1,210 +1,275 @@
 <template>
-  <view class="qualification-page">
-    <!-- 营业执照部分 -->
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text class="title-text">营业执照</text>
-      </view>
+  <view class="store-info-page">
+    <!-- 门店信息标题 -->
+    <view class="section-title">
+      <view class="title-bar"></view>
+      <text>门店信息</text>
+    </view>
 
-      <!-- 资质照片 -->
-      <view class="form-item box-cont">
-        <text class="label required">资质照片</text>
-        <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
-        <view class="upload-container">
-          <view class="upload-box" @click="chooseImage('uscc_photo')">
-            <view class="upload-camera license-upload">
-              <image v-if="formData.uscc_photo" :src="formData.uscc_photo" mode="aspectFill" class="preview-image"></image>
-              <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/92bd4268-b4d7-4725-8664-9e44f828c7d9" mode="aspectFit" class="camera-icon"></image>
-              <!-- 识别状态遮罩 -->
-              <!-- <view v-if="isRecognizing && recognizeType === 'uscc_photo'" class="recognize-overlay">
-                <view class="recognize-loading"></view>
-                <text class="recognize-text">识别中...</text>
-              </view> -->
-            </view>
-          </view>
-          <text class="upload-label required">请上传营业执照原件</text>
-        </view>
-      </view>
-
-      <!-- 商户类型 -->
-      <view class="form-item-one box-cont">
+    <!-- 店铺logo -->
+    <view class="form-item box-cont">
         <view class="label-wrapper">
-          <text class="label required">商户类型</text>
+            <text class="label required">店铺logo</text>
+            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('head_photo')"></image>
         </view>
-        <input type="text" v-model="formData.uscc_type" placeholder="请输入商户类型" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <!-- 营业执照信息 -->
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">证件号码</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_num')"></image>
+      <view class="upload-box" @click="chooseImage('head_photo')">
+        <image v-if="formData.head_photo" :src="formData.head_photo" mode="aspectFill" class="logo-image"></image>
+        <view class="upload-placeholder" v-else>
+          <image src="/static/images/upload-img.png" mode="aspectFit" class="upload-icon"></image>
         </view>
-        <input type="text" v-model="formData.uscc_num" placeholder="请输入营业执照的证件号码" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">企业名称</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('uscc_name')"></image>
-        </view>
-        <input type="text" v-model="formData.uscc_name" placeholder="请输入营业执照的企业名称" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
       </view>
     </view>
 
-    <!-- 法人信息部分 -->
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text>法人信息</text>
-      </view>
+    <!-- 店铺名称 -->
+    <view class="form-item-one box-cont">
+        <view class="label-wrapper">
+            <text class="label required">店铺名称</text>
+            <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('name')"></image>
+        </view>
+      <input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" 
+             placeholder-class="placeholder" class="input" 
+             @input="saveFormDataToLocalDebounce" />
+    </view>
 
-    <!-- 身份证照片部分 -->
-    <view class="section">
-      <view class="box-cont">
-        <view class="form-item">
-          <text class="label required">身份证照片</text>
-          <view class="upload-tip">请保证图片上的文字清晰、无遮挡、证件边角可见</view>
+    <!-- 营业时间 -->
+    <view class="form-item-two box-cont" @click="openTimePicker">
+      <text class="label required">营业时间</text>
+      <view class="picker-content">
+        <text :class="formData.business_time ? 'picker-value' : 'placeholder'">
+          {{formData.business_time || '请输入营业时间'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view>
+
+    <!-- 服务技能 -->
+    <view class="form-item-two box-cont" @click="showServicePopup">
+      <text class="label required">服务技能（多选）</text>
+      <view class="picker-content">
+        <text :class="formData.servers_kill.length > 0 ? 'picker-value' : 'placeholder'" v-if="formData.servers_kill">
+          {{selectedServicesText || '请选择'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view>
+
+    <!-- 门店所在地 -->
+    <view class="form-item-two box-cont" @click="showLocationPopup">
+      <text class="label required">门店所在地：</text>
+      <view class="picker-content">
+        <text :class="formData.dependency ? 'picker-value' : 'placeholder'">
+          {{formData.dependency || '请选择'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view>
+
+    <!-- 门店详细地址 -->
+    <view class="form-item-two box-cont" @click="getAddressInfo">
+      <text class="label required">门店详细地址：</text>
+      <view class="picker-content">
+        <text :class="formData.address ? 'picker-value' : 'placeholder'">
+          {{formData.address || '请选择'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view>
+
+    <!-- 其他信息标题 -->
+    <view class="section-title">
+      <view class="title-bar"></view>
+      <text>其他信息</text>
+    </view>
+
+    <!-- 获取消息方式 -->
+    <!-- <view class="form-item-two box-cont" @click="openMessageMethodPicker">
+      <text class="label required">获取消息方式：</text>
+      <view class="picker-content">
+        <text :class="formData.apply_state ? 'picker-value' : 'placeholder'">
+          {{messageMethodText || '请选择'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
+      </view>
+    </view> -->
+
+    <!-- 邀请码 -->
+    <view class="form-item-one-yqr box-cont invite-code-container">
+        <view class="invite-code-top">
+            <view class="label-wrapper">
+              <text class="label required">邀请码</text>
+            </view>
+            <input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码" 
+                  placeholder-class="placeholder" class="input" 
+                  @input="handleInviteCodeInput" />
+        </view>
+        
+        <!-- 分割线 -->
+        <view class="divider"></view>
+        
+        <!-- 邀请人信息 -->
+        <view class="invite-info-container">
+          <!-- 默认提示 -->
+          <text v-if="!formData.invite_code_other" class="invite-tip">
+            请填写邀请人的邀请码，若没有邀请人请填写13131313
+          </text>
           
-          <view class="idcard-upload-vertical-container">
-            <!-- 身份证正面 -->
-            <view class="idcard-upload-vertical-item">
-              <view class="upload-box" @click="chooseImage('legal_idcard_positive')">
-                <view class="upload-camera idcard-front">
-                  <image v-if="formData.legal_idcard_positive" :src="formData.legal_idcard_positive" mode="aspectFill" class="preview-image"></image>
-                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/043b0c97-79c1-4f95-810f-c33e3d5269a3" mode="aspectFit" class="camera-icon"></image>
-                  <!-- 识别状态遮罩 -->
-                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_positive'" class="recognize-overlay">
-                    <view class="recognize-loading"></view>
-                    <text class="recognize-text">识别中...</text>
-                  </view> -->
-                </view>
-              </view>
-              <text class="upload-label required">请上传身份证正面（人像面）</text>
-            </view>
-            
-            <!-- 身份证反面 -->
-            <view class="idcard-upload-vertical-item">
-              <view class="upload-box" @click="chooseImage('legal_idcard_negative')">
-                <view class="upload-camera idcard-back">
-                  <image v-if="formData.legal_idcard_negative" :src="formData.legal_idcard_negative" mode="aspectFill" class="preview-image"></image>
-                  <image v-else src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/203cfdf4-2501-44e6-8565-ad251c6bf0fa" mode="aspectFit" class="camera-icon"></image>
-                  <!-- 识别状态遮罩 -->
-                  <!-- <view v-if="isRecognizing && recognizeType === 'legal_idcard_negative'" class="recognize-overlay">
-                    <view class="recognize-loading"></view>
-                    <text class="recognize-text">识别中...</text>
-                  </view> -->
-                </view>
-              </view>
-              <text class="upload-label required">请上传身份证反面（国徽面）</text>
-            </view>
+          <!-- 验证中 -->
+          <view v-else-if="inviteCodeValidating" class="invite-validating">
+            <text>验证中...</text>
+          </view>
+          
+          <!-- 验证失败 -->
+          <view v-else-if="inviteCodeError" class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
+            <text>邀请码无效</text>
+          </view>
+          
+          <!-- 特殊邀请码13131313 -->
+          <view v-else-if="formData.invite_code_other === '13131313' && !inviterInfo" class="invite-tip">
+            请填写邀请人的邀请码，若没有邀请人请填写13131313
+          </view>
+          
+          <!-- 显示邀请人信息 -->
+          <view v-else-if="inviterInfo" class="inviter-info">
+            <text class="inviter-label">邀请人：</text>
+            <text class="inviter-name">{{ inviterInfo.name || inviterInfo.nick_name }}</text>
+            <text class="inviter-divider">/</text>
+            <text class="inviter-phone">{{ inviterInfo.account }}</text>
+          </view>
+          
+          <!-- 其他情况（接口返回成功但没有认证铁军的邀请码） -->
+          <view v-else class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
+              <text>邀请码无效</text>
           </view>
         </view>
+    </view>
+
+    <!-- 专业经验 -->
+    <view class="form-item-two box-cont" @click="openExperiencePicker">
+      <text class="label required">专业经验：</text>
+      <view class="picker-content">
+        <text :class="formData.major ? 'picker-value' : 'placeholder'">
+          {{experienceText || '请选择'}}
+        </text>
+        <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3" class="arrow-right" mode="aspectFit"></image>
       </view>
     </view>
 
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">法人代表</text>
-          <image class="label-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108" mode="aspectFit" @click="showTipPopup('legal_name')"></image>
-        </view>
-        <input type="text" v-model="formData.legal_name" placeholder="请输入营业执照的法人代表" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <text class="label required">法人联系方式</text>
-        <input type="number" v-model="formData.legal_phone" placeholder="请输入法人的联系方式" 
-              placeholder-class="placeholder" class="input" 
-              @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <view class="form-item-one box-cont">
-        <text class="label required">法人身份证号</text>
-        <input type="idcard" v-model="formData.legal_idcard_num" placeholder="请输入法人身份证号" 
-               placeholder-class="placeholder" class="input" 
-               @input="saveFormDataToLocalDebounce" />
-      </view>
-
-      <!-- 身份证有效期 -->
-      <view class="form-item box-cont">
-        <text class="label required">身份证有效期至</text>
-        <view class="radio-group">
-          <view class="radio-item" @click="setIdcardValidType('permanent')">
-            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'permanent' }">
-              <image v-if="formData.legal_idcard_expiry_type === 'permanent'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
-            </view>
-            <text class="radio-label">长久有效</text>
-          </view>
-          <view class="radio-item" @click="setIdcardValidType('date')">
-            <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === 'date' }">
-              <image v-if="formData.legal_idcard_expiry_type === 'date'" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
-            </view>
-            <text class="radio-label">指定日期有效</text>
-          </view>
-        </view>
-      </view>
-
-      <!-- 身份证有效期日期选择 -->
-      <view class="box-cont">
-        <view class="date-range-container">
-          <view class="date-item">
-            <text class="date-label">开始日期</text>
-            <view class="date-picker-box" @click="openDatePicker('idcard_start_date')">
-              <text :class="formData.idcard_start_date ? 'date-value' : 'placeholder'">
-                {{formatDateForDisplay(formData.idcard_start_date) || '请选择日期'}}
-              </text>
-              <view class="date-divider"></view>
-              <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649" class="date-arrow" mode="aspectFit"></image>
-            </view>
-          </view>
-          <view class="date-item">
-            <text class="date-label">结束日期</text>
-            <view class="date-picker-box" :class="{ disabled: formData.legal_idcard_expiry_type === 'permanent' }" 
-                  @click="formData.legal_idcard_expiry_type !== 'permanent' && openDatePicker('idcard_end_date')">
-              <text :class="formData.idcard_end_date ? 'date-value' : 'placeholder'">
-                {{formatDateForDisplay(formData.idcard_end_date) || '请选择日期'}}
-              </text>
-              <view class="date-divider"></view>
-              <image :src="formData.legal_idcard_expiry_type === 'permanent' ? 
-                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9a757f-a36c-46bb-a59f-2caddac5365b' : 
-                'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce52b49f-2261-49ca-96ed-e9ad47049649'" 
-                class="date-arrow" mode="aspectFit"></image>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-
-    <!-- 日期选择器 -->
-    <view class="popup" :class="{ show: showDatePickerFlag }">
-      <view class="popup-mask" @click="hideDatePicker"></view>
+    <!-- 服务技能弹出框 -->
+    <view class="popup" :class="{ show: showServicePopupFlag }">
+      <view class="popup-mask" @click="hideServicePopup"></view>
       <view class="popup-content">
         <view class="popup-header">
-          <text class="cancel-text" @click="hideDatePicker">取消</text>
-          <text class="title">选择日期</text>
-          <text class="confirm-text" @click="confirmDate">确定</text>
+          <text class="popup-title">选择服务技能</text>
+          <text class="popup-close" @click="hideServicePopup">×</text>
+        </view>
+        <view class="popup-body">
+          <view class="checkbox-list">
+            <view class="checkbox-item" v-for="(item, index) in serviceList" :key="index"
+                  @click="toggleServiceSelect(index)">
+              <view class="checkbox" :class="{ checked: item.checked }">
+                <image v-if="item.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" mode="aspectFit"></image>
+              </view>
+              <text class="checkbox-label">{{item.title}}</text>
+            </view>
+          </view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideServicePopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmServiceSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 所在地选择弹出框 -->
+    <view class="popup" :class="{ show: showLocationPopupFlag }">
+      <view class="popup-mask" @click="hideLocationPopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">选择所在地</text>
+          <text class="popup-close" @click="hideLocationPopup">×</text>
         </view>
         <view class="region-body">
-          <picker-view :value="dateValue" @change="bindDateChange" class="picker-scroll" 
-                      :indicator-style="indicatorStyle" mode="date" fields="day">
+          <picker-view @change="bindChangeLocation" class="picker-scroll"
+                      :indicator-style="indicatorStyle" :value="locationValue">
             <picker-view-column>
-              <view class="picker-item" v-for="(year, index) in years" :key="index">{{year}}年</view>
+              <view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">
+                {{item.province}}
+              </view>
             </picker-view-column>
             <picker-view-column>
-              <view class="picker-item" v-for="(month, index) in months" :key="index">{{month}}月</view>
+              <view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">
+                {{item.city}}
+              </view>
             </picker-view-column>
             <picker-view-column>
-              <view class="picker-item" v-for="(day, index) in days" :key="index">{{day}}日</view>
+              <view class="picker-item" v-for="(item,index) in locationAreas" :key="index">
+                {{item.area}}
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+        <view class="popup-footer">
+          <view class="popup-btn cancel" @click="hideLocationPopup">
+            <text class="btn-text">取消</text>
+          </view>
+          <view class="popup-btn confirm" @click="confirmLocationSelect">
+            <text class="btn-text">确定</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 营业时间选择器 -->
+    <view class="popup" :class="{ show: showTimePicker }">
+      <view class="popup-mask" @click="hideTimePopup"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="cancel-text" @click="hideTimePopup">取消</text>
+          <text class="title">选择营业时间</text>
+          <text class="confirm-text" @click="confirmTime">确定</text>
+        </view>
+        <view class="time-range">
+          <view class="time-block" :class="{ active: timeType === 'start' }"
+                @click="switchTimeType('start')">
+            <text class="time-value">{{formatTime(startTime)}}</text>
+            <text class="time-label">开始时间</text>
+          </view>
+          <text class="time-separator">至</text>
+          <view class="time-block" :class="{ active: timeType === 'end' }"
+                @click="switchTimeType('end')">
+            <text class="time-value">{{formatTime(endTime)}}</text>
+            <text class="time-label">结束时间</text>
+          </view>
+        </view>
+        <view class="region-body">
+          <picker-view :value="pickerValue" @change="handleTimeChange" class="picker-scroll"
+                      :indicator-style="indicatorStyle">
+            <picker-view-column>
+              <view class="picker-item" v-for="(hour, index) in hours" :key="index">
+                {{hour}}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
+                {{minute}}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item">-</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(hour, index) in hours" :key="index">
+                {{hour}}
+              </view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
+                {{minute}}
+              </view>
             </picker-view-column>
           </picker-view>
         </view>
@@ -222,7 +287,7 @@
         <view class="tip-popup-body">
           <view class="tip-title">{{ tipTitle }}</view>
           <view class="tip-image-container">
-            <image class="tip-image" :src="tipImage" mode="widthFix"></image>
+            <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
           </view>
           <view class="tip-buttons">
             <view class="tip-btn cancel" @click="hideTipPopup">
@@ -236,535 +301,818 @@
       </view>
     </view>
 
-
   </view>
 </template>
 
 <script>
 import request from '../../utils/request';
+import ChinaCitys from '../../static/data/ChinaCitys.json';
 import { debounce } from '@/utils/debounce.js';
-import uploadImage from '../../utils/uploadImage';
-import permissionUtils from '../../utils/per';
-import locationService from '../../utils/locationService';
-import { recognizeIdCard, recognizeBusinessLicense, formatDateFromNumber, parseValidPeriod } from '../../utils/orc';
 
 export default {
   data() {
-    const currentDate = new Date();
-    const currentYear = new Date().getFullYear();
-    const years = Array.from({length: 130}, (_, i) => 1970 + i);
-    const months = Array.from({length: 12}, (_, i) => i + 1);
-    const days = Array.from({length: 31}, (_, i) => i + 1);
-    
-    // 从本地存储加载数据
     const loadedData = this.loadFormDataFromLocal();
     
     return {
-      userId: null,
-      // 使用本地存储初始化数据
       formData: loadedData || {
-        uscc_type: '',
-        uscc_photo: '',
-        uscc_num: '',
-        uscc_name: '',
-        license_valid_type: '',
-        license_start_date: '',
-        license_end_date: '',
-        legal_name: '',
-        legal_phone: '',
-        legal_idcard_num: '',
-        legal_idcard_expiry_type: '',
-        idcard_start_date: '',
-        idcard_end_date: '',
-        legal_idcard_positive: '',
-        legal_idcard_negative: ''
+        head_photo: '',
+        name: '',
+        business_time: '',
+        servers_kill: [],
+        dependency: '',
+        address: '',
+        apply_state: '',
+        invite_code_other: '',
+        major: '',
+        dependency_code: '',        // 区code
+        dependency_province: '',    // 省code  
+        dependency_city: '',        // 市code
+        longitude: '',              // 经度
+        latitude: '',               // 纬度
       },
-      showDatePickerFlag: false,
-      showTipPopupFlag: false, // 提示弹窗显示状态
-      currentDateField: '',
-      years,
-      months,
-      days,
-      dateValue: [currentYear - 1970, currentDate.getMonth(), currentDate.getDate() - 1], // 默认选中今天
+      ChinaCitys: ChinaCitys,
+      locatinCitys: [],
+      locationAreas: [],
+      locationValue: [0, 0, 0],
+      showServicePopupFlag: false,
+      serviceList: [],
+      selectedServicesText: '',
+      showLocationPopupFlag: false,
+      showTimePicker: false,
+      pickerValue: [8, 0, 0, 18, 0],
+      hours: Array.from({ length: 24 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
+      minutes: Array.from({ length: 60 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
+      timeType: 'start',
       indicatorStyle: 'height: 68rpx;',
-      tipTitle: '', // 提示弹窗标题
-      tipImage: '', // 提示弹窗图片
-      isSubmit: false, // 防止重复提交
+      messageMethodText: '',
+      experienceText: '',
+      showTipPopupFlag: false,
+      tipTitle: '',
+      tipImage: '',
+      currentTipType: '',
+      userId: null,
+      identity: 2,
+      tipImagesPreloaded: false,
+      tipPopupBg: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770',
+      
+      // 邀请码相关字段
+      inviteCodeValidating: false,
+      inviteCodeError: false,
+      inviterInfo: null,
+      currentValidatingCode: '',
+      
+      fromAddressPage: false,
+      addressListener: null,
 
-      // 识别状态
-      isRecognizing: false,
-      recognizeType: '', // 'legal_idcard_positive', 'legal_idcard_negative', 'uscc_photo'
-      identity: 2
+      // 抖动效果控制
+      shakeInviteError: false,
+
+      inviteValidationTimer: null, // 邀请码验证定时器
     }
   },
+  
   computed: {
-    
+    startTime() {
+      return {
+        hour: this.hours[this.pickerValue[0]],
+        minute: this.minutes[this.pickerValue[1]]
+      }
+    },
+    endTime() {
+      return {
+        hour: this.hours[this.pickerValue[3]],
+        minute: this.minutes[this.pickerValue[4]]
+      }
+    }
   },
   
-  // 添加 watch 监听表单数据变化
   watch: {
-    'formData.uscc_num'(newVal) {
+    'name'(newVal) {
       this.saveFormDataToLocalDebounce();
     },
-    'formData.uscc_name'(newVal) {
+    'formData.head_photo'(newVal) {
       this.saveFormDataToLocalDebounce();
     },
-    'formData.legal_name'(newVal) {
+    'formData.invite_code_other'(newVal) {
       this.saveFormDataToLocalDebounce();
     },
-    'formData.legal_phone'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_num'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.uscc_photo'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_positive'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.legal_idcard_negative'(newVal) {
+    'formData.address'(newVal) {
       this.saveFormDataToLocalDebounce();
     }
   },
   
-  // 页面生命周期
-  onLoad(options) {
-	  console.log(1111112222)
+  onLoad() {
+    uni.$on('address-selected-for-sj', (addressData) => {
+      this.handleAddressSelected(addressData);
+    });
+  },
 
-    // 获取用户信息，用于图片上传
-    this.getUserInfo();
-    
-    // 检查全局状态中是否有数据（从前一页面带过来的）
-    this.checkGlobalData();
+  onUnload() {
+    uni.$off('address-selected-for-sj');
   },
   
+  mounted() {
+    this.getUserInfo();
+    this.preloadTipImages();
+
+    this.locatinCitys = this.ChinaCitys[0].citys;
+    this.locationAreas = this.locatinCitys[0].areas;
+    this.loadServiceSkills();
+    this.updateSelectedServicesText();
+
+    // 初始化消息方式和专业经验显示文本
+    if (this.formData.apply_state) {
+      const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
+      this.messageMethodText = methods[this.formData.apply_state - 1] || '';
+    }
+    
+    if (this.formData.major) {
+      const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+      this.experienceText = experiences[this.formData.major - 1] || '';
+    }
+    
+    this.setupAddressListener();
+    
+    if (this.formData.invite_code_other) {
+      this.validateInviteCode(this.formData.invite_code_other);
+    }
+  },
+
+  beforeDestroy() {
+    if (this.addressListener) {
+      uni.$off('address-selected', this.addressListener);
+    }
+  },
+
   onShow() {
-    // 页面显示时重新从本地存储加载数据
+    this.checkAddressData();
+    
     const localData = this.loadFormDataFromLocal();
     if (localData) {
-      // 合并数据，避免覆盖已有数据
-      this.formData = { ...this.formData, ...localData };
+      Object.assign(this.formData, localData);
+
+      // 立即更新显示文本（即使在 serviceList 加载完成前）
+      this.updateSelectedServicesTextImmediately();
+
+      // 恢复服务技能的选中状态
+      if (this.serviceList.length > 0) {
+        this.restoreServiceSkillsSelection();
+      }
+      
+      // 恢复获取消息方式的显示文本
+      if (this.formData.apply_state) {
+        const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
+        this.messageMethodText = methods[this.formData.apply_state - 1] || '';
+      }
+      
+      // 恢复专业经验的显示文本
+      if (this.formData.major) {
+        const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+        this.experienceText = experiences[this.formData.major - 1] || '';
+      }
+
     }
+
+    // 重新从本地存储加载邀请码验证状态
+    this.loadInviteStateFromLocal();
     
-    // 检查全局状态
     this.checkGlobalData();
+
+    // 邀请码验证
+    if (this.formData.invite_code_other) {
+      this.validateInviteCode(this.formData.invite_code_other);
+    }
   },
-  
+
   onHide() {
-    // 页面隐藏时保存数据
     this.saveFormDataToLocal();
   },
   
   onUnload() {
-    // 页面卸载时保存数据
     this.saveFormDataToLocal();
   },
   
   methods: {
-    // 检查全局数据
-    checkGlobalData() {
-      if (getApp().globalData.qualificationData) {
-        // 如果全局有数据，合并到当前表单
-        this.formData = { ...this.formData, ...getApp().globalData.qualificationData };
-        // 保存到本地存储
-        this.saveFormDataToLocal();
-        // 清空全局数据，避免重复使用
-        // delete getApp().globalData.qualificationData;
-        getApp().globalData.qualificationData = null;
+    // 邀请码相关方法
+    // 从本地存储加载邀请码验证状态
+    loadInviteStateFromLocal() {
+      try {
+        const inviteState = uni.getStorageSync('store_invite_state');
+        if (inviteState) {
+          console.log('加载邀请码验证状态:', inviteState);
+          
+          // 恢复邀请码验证状态
+          this.inviterInfo = inviteState.inviterInfo || null;
+          this.inviteCodeError = inviteState.inviteCodeError || false;
+          this.currentValidatingCode = inviteState.currentValidatingCode || '';
+          
+          // 特殊处理：如果当前邀请码是13131313，确保状态正确
+          if (this.formData.invite_code_other === '13131313') {
+            console.log('检测到特殊邀请码13131313，重置验证状态');
+            this.inviteCodeError = false;
+            this.inviterInfo = null;
+            this.currentValidatingCode = '13131313';
+          }
+          
+          // 如果正在验证的邀请码与当前表单中的一致，保持验证状态
+          if (this.currentValidatingCode === this.formData.invite_code_other) {
+            // 状态已恢复，无需额外操作
+          } else {
+            // 如果不一致，重新验证
+            if (this.formData.invite_code_other && this.formData.invite_code_other.trim() !== '') {
+              console.log('邀请码不一致，重新验证:', this.formData.invite_code_other);
+              this.handleInviteCodeInput({ detail: { value: this.formData.invite_code_other } });
+            }
+          }
+        } else {
+          // 如果没有保存的状态，重置为初始状态
+          this.resetInviteCodeState();
+        }
+      } catch (e) {
+        console.log('加载邀请码验证状态失败:', e);
+        this.resetInviteCodeState();
       }
     },
+
+    // 新增方法：重置邀请码状态
+    resetInviteCodeState() {
+      this.inviteCodeValidating = false;
+      this.inviteCodeError = false;
+      this.inviterInfo = null;
+      this.currentValidatingCode = '';
+      this.shakeInviteError = false;
+    },
+
+    // 新增方法：专门保存邀请码验证状态
+    saveInviteStateToLocal() {
+      try {
+        const inviteState = {
+          inviterInfo: this.inviterInfo,
+          inviteCodeError: this.inviteCodeError,
+          currentValidatingCode: this.currentValidatingCode || this.formData.invite_code_other || ''
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+        
+        console.log('邀请码验证状态已保存:', {
+          hasInviterInfo: !!this.inviterInfo,
+          inviteCodeError: this.inviteCodeError,
+          currentValidatingCode: this.currentValidatingCode
+        });
+      } catch (e) {
+        console.log('保存邀请码验证状态失败:', e);
+      }
+    },
+    // 触发邀请码错误抖动效果
+    triggerInviteErrorShake() {
+      // 触发抖动效果
+      this.shakeInviteError = true;
+      
+      // 滚动到邀请码容器位置
+      this.$nextTick(() => {
+        // 使用uni.createSelectorQuery获取邀请码容器的位置
+        const query = uni.createSelectorQuery().in(this);
+        query.select('.invite-code-container').boundingClientRect((rect) => {
+          if (rect) {
+            // 获取当前窗口高度
+            const windowHeight = uni.getSystemInfoSync().windowHeight;
+            
+            // 判断邀请码容器是否已经在可视区域内
+            // 计算容器在屏幕中的位置比例（0-1之间）
+            const containerTopRatio = rect.top / windowHeight;
+            const containerBottomRatio = (rect.top + rect.height) / windowHeight;
+            
+            // 如果容器已经在屏幕中上部（顶部在屏幕中间以上），就不需要滚动
+            // 或者容器整体都在屏幕内，也不需要滚动
+            if (containerTopRatio >= 0 && containerTopRatio < 0.7 && 
+                containerBottomRatio <= 1) {
+              console.log('邀请码容器已在可视区域内，不需要滚动');
+              return;
+            }
+            
+            // 滚动到邀请码容器位置，减去一些偏移量让用户体验更好
+            uni.pageScrollTo({
+              scrollTop: rect.top - 50,
+              duration: 300
+            });
+          }
+        }).exec();
+      });
+
+      // 0.5秒后重置抖动状态
+      setTimeout(() => {
+        this.shakeInviteError = false;
+      }, 500);
+    },
+    
+    // 处理邀请码输入
+    handleInviteCodeInput(e) {
+      const code = e.detail ? e.detail.value : this.formData.invite_code_other;
+      
+      console.log('邀请码输入:', code);
+      
+      // 立即重置状态
+      this.inviteCodeValidating = false;
+      this.inviteCodeError = false;
+      this.inviterInfo = null;
+      
+      // 如果邀请码为空，不进行验证
+      if (!code || code.trim() === '') {
+        this.formData.invite_code_other = '';
+        this.saveFormDataToLocalDebounce();
+        // 保存空状态
+        this.saveInviteStateToLocal();
+        return;
+      }
+      
+      this.formData.invite_code_other = code;
+      this.saveFormDataToLocalDebounce();
+      
+      // 【关键修复】如果是13131313，立即通过验证并取消任何正在进行的验证
+      if (code === '13131313') {
+        console.log('检测到特殊邀请码13131313，立即通过');
+        
+        // 清除任何可能的定时器
+        if (this.inviteValidationTimer) {
+          clearTimeout(this.inviteValidationTimer);
+          this.inviteValidationTimer = null;
+        }
+        
+        // 立即更新状态
+        this.inviteCodeValidating = false;
+        this.inviteCodeError = false;
+        this.inviterInfo = null;
+        this.currentValidatingCode = code;
+        
+        // 特殊邀请码也需要保存状态
+        const inviteState = {
+          inviterInfo: null,
+          inviteCodeError: false,
+          currentValidatingCode: code
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+        
+        // 强制更新视图
+        this.$forceUpdate();
+        return;
+      }
+      
+      // 记录当前正在验证的邀请码
+      this.currentValidatingCode = code;
+      
+      // 立即保存状态（验证中）
+      this.saveInviteStateToLocal();
+      
+      // 清除之前的定时器
+      if (this.inviteValidationTimer) {
+        clearTimeout(this.inviteValidationTimer);
+        this.inviteValidationTimer = null;
+      }
+      
+      // 设置新的定时器
+      this.inviteValidationTimer = setTimeout(() => {
+        // 检查邀请码是否变化
+        if (this.formData.invite_code_other !== this.currentValidatingCode) {
+          console.log('邀请码已变化，取消验证');
+          return;
+        }
+        
+        // 再次检查是否是13131313（双重检查）
+        if (this.formData.invite_code_other === '13131313') {
+          console.log('双重检查：检测到特殊邀请码13131313');
+          this.inviteCodeValidating = false;
+          this.inviteCodeError = false;
+          this.inviterInfo = null;
+          this.currentValidatingCode = '13131313';
+          
+          const inviteState = {
+            inviterInfo: null,
+            inviteCodeError: false,
+            currentValidatingCode: '13131313'
+          };
+          uni.setStorageSync('store_invite_state', inviteState);
+          return;
+        }
+        
+        console.log('开始验证邀请码:', this.formData.invite_code_other);
+        this.validateInviteCode(this.formData.invite_code_other);
+        
+        // 清理定时器
+        this.inviteValidationTimer = null;
+      }, 600); // 适当增加延迟时间
+    },
+    
+    // 验证邀请码
+     async validateInviteCode(code) {
+      console.log('开始验证邀请码:', code);
+
+      // 特殊邀请码13131313直接通过
+      if (code === '13131313') {
+        console.log('特殊邀请码13131313，直接通过');
+        this.inviteCodeValidating = false;
+        this.inviteCodeError = false;
+        this.inviterInfo = null;
+        this.currentValidatingCode = code;
+        // 特殊邀请码也需要保存状态
+        const inviteState = {
+          inviterInfo: null,
+          inviteCodeError: false,
+          currentValidatingCode: code
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+
+        // 强制更新视图
+        this.$forceUpdate();
+        return;
+      }
+      
+      // 如果邀请码为空
+      if (!code || code.trim() === '') {
+        this.inviteCodeValidating = false;
+        this.inviteCodeError = false;
+        this.inviterInfo = null;
+        this.currentValidatingCode = '';
+        const inviteState = {
+          inviterInfo: null,
+          inviteCodeError: false,
+          currentValidatingCode: ''
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+        return;
+      }
+      
+      // 设置验证中状态
+      this.inviteCodeValidating = true;
+      this.inviteCodeError = false;
+      this.inviterInfo = null;
+      this.currentValidatingCode = code;
+      
+      try {
+        // 调用接口验证邀请码
+        const response = await request.post('/user/user/getInvite', {
+          invite_code: code
+        });
+        
+        console.log('邀请码验证响应:', response);
+        
+        // 验证完成
+        this.inviteCodeValidating = false;
+        
+        if (response && response.code === 200 && response.data) {
+          const userData = response.data;
+
+          //检查返回的数据是否有效
+          if (userData.account) {
+              // 邀请码有效，保存邀请人信息
+              this.inviterInfo = userData;
+              this.inviteCodeError = false;
+              console.log('邀请码验证通过，邀请人:', userData);
+          } else {
+              // 接口返回数据但没有account字段，说明不是有效邀请人
+              console.log('接口返回数据无效，没有account字段:', userData);
+              this.inviterInfo = null;
+              this.inviteCodeError = true;
+          }
+        } else {
+          // 接口返回错误或数据为空
+          console.log('接口返回错误:', response?.msg || '未知错误');
+          this.inviterInfo = null;
+          this.inviteCodeError = true;
+        }
+      } catch (error) {
+        console.error('验证邀请码失败:', error);
+        this.inviteCodeValidating = false;
+        this.inviteCodeError = true;
+        this.inviterInfo = null;
+      } finally {
+        // 无论成功失败都保存状态
+        const inviteState = {
+          inviterInfo: this.inviterInfo,
+          inviteCodeError: this.inviteCodeError,
+          currentValidatingCode: this.currentValidatingCode
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+      }
+    },
+    
     
     // 从本地存储加载数据
     loadFormDataFromLocal() {
       try {
-        const stored = uni.getStorageSync('qualification_form_data');
+        const stored = uni.getStorageSync('store_info_form_data');
         if (stored) {
-          console.log('从本地存储加载数据:', stored);
+          console.log('从本地存储加载门店数据:', stored);
+          
+          // 同时加载邀请码验证状态
+          const inviteState = uni.getStorageSync('store_invite_state');
+          if (inviteState) {
+            this.inviterInfo = inviteState.inviterInfo;
+            this.inviteCodeError = inviteState.inviteCodeError || false;
+            this.currentValidatingCode = inviteState.currentValidatingCode || '';
+            console.log('加载邀请码验证状态:', inviteState);
+          }
+          
           return stored;
         }
       } catch (e) {
-        console.log('读取本地存储失败:', e);
+        console.log('读取门店数据失败:', e);
       }
       return null;
     },
     
-    // 保存数据到本地存储（带防抖）
-    saveFormDataToLocalDebounce: debounce(function() {
-      this.saveFormDataToLocal();
-    }, 500),
-    
     // 保存数据到本地存储
     saveFormDataToLocal() {
       try {
-        uni.setStorageSync('qualification_form_data', this.formData);
-        console.log('数据已保存到本地存储');
+        uni.setStorageSync('store_info_form_data', this.formData);
+
+        // 同时保存邀请码验证状态
+        const inviteState = {
+          inviterInfo: this.inviterInfo,
+          inviteCodeError: this.inviteCodeError,
+          currentValidatingCode: this.currentValidatingCode
+        };
+        uni.setStorageSync('store_invite_state', inviteState);
+        console.log('门店数据已保存到本地存储');
       } catch (e) {
-        console.log('保存数据失败:', e);
+        console.log('保存门店数据失败:', e);
       }
     },
     
-    // 清空本地存储（在表单提交成功后调用）
+    // 防抖保存
+    saveFormDataToLocalDebounce() {
+      // 使用debounce函数
+      if (!this._saveDebounce) {
+        this._saveDebounce = debounce(() => {
+          this.saveFormDataToLocal();
+        }, 500);
+      }
+      this._saveDebounce();
+    },
+    
+    // 清空本地存储
     clearFormDataLocal() {
       try {
-        uni.removeStorageSync('qualification_form_data');
-        console.log('已清空本地存储数据');
+        uni.removeStorageSync('store_info_form_data');
+        console.log('已清空门店数据');
       } catch (e) {
-        console.log('清空数据失败:', e);
+        console.log('清空门店数据失败:', e);
       }
     },
 
+    // 立即更新已选择服务技能的显示文本（不依赖 serviceList）
+    updateSelectedServicesText() {
+      if (this.formData.servers_kill && this.formData.servers_kill.length > 0) {
+        if (this.serviceList.length > 0) {
+          const selectedServices = this.serviceList
+            .filter(item => this.formData.servers_kill.includes(item.id))
+            .map(item => {
+              item.checked = true;
+              return item.title;
+            });
+          this.selectedServicesText = selectedServices.join('、');
+        } else {
+          // serviceList 还未加载，显示数量
+          this.selectedServicesText = `已选择${this.formData.servers_kill.length}项`;
+        }
+      } else {
+        this.selectedServicesText = '';
+      }
+    },
+    
+
+    // 地址相关方法 
+
+    setupAddressListener() {
+      this.addressListener = (addressData) => {
+        this.handleAddressSelected(addressData);
+      };
+      uni.$on('address-selected', this.addressListener);
+    },
+    
+    // 检查地址数据
+    checkAddressData() {
+      try {
+        const sjAddress = uni.getStorageSync('sj_selected_address');
+        if (sjAddress) {
+          this.handleAddressSelected(sjAddress);
+          uni.removeStorageSync('sj_selected_address');
+          return;
+        }
+      } catch (e) {}
+      
+      if (getApp().globalData && getApp().globalData.selectedAddress) {
+        this.handleAddressSelected(getApp().globalData.selectedAddress);
+        delete getApp().globalData.selectedAddress;
+      }
+      
+      try {
+        const storedAddress = uni.getStorageSync('selectedAddress');
+        if (storedAddress) {
+          this.handleAddressSelected(storedAddress);
+          uni.removeStorageSync('selectedAddress');
+        }
+      } catch (e) {}
+    },
+    
+    // 处理地址选择结果
+    handleAddressSelected(addressData) {
+      if (!addressData) return
+
+      // 详细地址优先取 address，不再优先取完整地址 name
+      let detailAddress = ''
+      if (addressData.address) {
+        detailAddress = String(addressData.address).trim()
+      } else if (addressData.name) {
+        detailAddress = String(addressData.name).trim()
+
+        const regionParts = []
+        if (addressData.pname) regionParts.push(addressData.pname)
+        if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData.cityname)
+        if (addressData.adname) regionParts.push(addressData.adname)
+
+        const regionText = regionParts.join('')
+        const regionTextWithDash = regionParts.join('-')
+
+        if (regionText && detailAddress.indexOf(regionText) === 0) {
+          detailAddress = detailAddress.slice(regionText.length).trim()
+        } else if (regionTextWithDash && detailAddress.indexOf(regionTextWithDash) === 0) {
+          detailAddress = detailAddress.slice(regionTextWithDash.length).trim()
+        }
+
+        detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim()
+      }
+
+      this.formData.address = detailAddress
+
+      if (addressData.location) {
+        const [longitude, latitude] = String(addressData.location).split(',')
+        this.formData.longitude = longitude || ''
+        this.formData.latitude = latitude || ''
+      }
+
+      if (addressData.pname || addressData.cityname || addressData.adname) {
+        const locationParts = []
+        if (addressData.pname) locationParts.push(addressData.pname)
+        if (addressData.cityname) locationParts.push(addressData.cityname)
+        if (addressData.adname) locationParts.push(addressData.adname)
+        this.formData.dependency = locationParts.join('-')
+      }
+
+      this.formData.dependency_province = addressData.provinceCode || ''
+      this.formData.dependency_city = addressData.cityCode || ''
+      this.formData.dependency_code = addressData.districtCode || ''
+
+      this.saveFormDataToLocal()
+      this.$forceUpdate()
+    },
+    
+    
+    // 检查全局数据
+    checkGlobalData() {
+      if (getApp().globalData.storeInfoData) {
+        Object.assign(this.formData, getApp().globalData.storeInfoData);
+        this.saveFormDataToLocal();
+        // delete getApp().globalData.storeInfoData;
+        getApp().globalData.qualificationData = null;
+      }
+    },
+    
+    // 更新已选择服务技能的显示文本
+    updateSelectedServicesText() {
+      if (this.formData.servers_kill && this.formData.servers_kill.length > 0 && this.serviceList.length > 0) {
+        const selectedServices = this.serviceList
+          .filter(item => this.formData.servers_kill.includes(item.id))
+          .map(item => {
+            item.checked = true;
+            return item.title;
+          });
+        this.selectedServicesText = selectedServices.join('、');
+      }
+    },
+    
     // 获取用户信息
     getUserInfo() {
-      return new Promise((resolve, reject) => {
-        request.post('/sj/user/getuser').then(result => {
-          if (result.state === 1) {
-            this.userId = result.data.id;
-            console.log('用户ID获取成功:', this.userId);
-            resolve(this.userId);
-          } else {
-            console.error('获取用户信息失败:', result.msg);
-            reject(result.msg);
-          }
-        }).catch(error => {
-          console.error('获取用户信息接口错误:', error);
-          reject(error);
+      request.post('/sj/User/getUser').then(result => {
+        this.userId = result.data.id;
+      })
+    },
+    
+    getFormData() {
+      return this.formData;
+    },
+    
+    // 预加载提示弹窗图片
+    preloadTipImages() {
+      const images = [
+        this.tipPopupBg, // 弹窗背景图片
+        'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9', // 店铺logo提示图片
+        'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'  // 店铺名称提示图片
+      ];
+      
+      console.log('开始预加载提示弹窗图片...');
+      
+      // 使用 Promise.all 确保所有图片都加载完成
+      const loadPromises = images.map(src => this.loadImage(src));
+      
+      Promise.all(loadPromises)
+        .then(() => {
+          console.log('所有提示弹窗图片预加载完成');
+          this.tipImagesPreloaded = true;
+        })
+        .catch(error => {
+          console.warn('部分图片预加载失败:', error);
+          // 即使部分图片加载失败，也设置为预加载完成，避免影响用户操作
+          this.tipImagesPreloaded = true;
         });
+    },
+    
+    // 加载单个图片
+    loadImage(src) {
+      return new Promise((resolve, reject) => {
+        const img = new Image();
+        img.onload = () => {
+          console.log('图片加载成功:', src);
+          resolve();
+        };
+        img.onerror = () => {
+          console.warn('图片加载失败:', src);
+          reject(new Error(`图片加载失败: ${src}`));
+        };
+        img.src = src;
       });
     },
-
-    getFormData() {
-        return {
-          ...this.formData,
-          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
-          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
-          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
-          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
-        };
-    },
-
-    // 添加日期格式化方法
-    formatDateForDisplay(dateStr) {
-      if (!dateStr) return '';
-      if (dateStr === '长久有效') return '长久有效';
-      
-      // 如果是 YYYY-MM-DD 格式，转换为 年月日 格式显示
-      if (dateStr.includes('-')) {
-        const [year, month, day] = dateStr.split('-');
-        return `${year}年${parseInt(month)}月${parseInt(day)}日`;
-      }
-      
-      return dateStr; // 如果已经是年月日格式，直接返回
-    },
-
-    // 将日期转换为后端需要的格式
-    formatDateForBackend(dateStr) {
-      if (!dateStr) return '';
-      if (dateStr === '长久有效') return 'permanent'; // 根据后端需求返回
-      
-      // 将 年月日 格式转换为 YYYY-MM-DD
-      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-      if (match) {
-        const year = match[1];
-        const month = match[2].padStart(2, '0');
-        const day = match[3].padStart(2, '0');
-        return `${year}-${month}-${day}`;
-      }
-      
-      return dateStr; // 如果已经是 YYYY-MM-DD 格式，直接返回
-    },
-
+    
     // 显示提示弹窗
     showTipPopup(field) {
-      // 根据字段设置对应的标题和图片
       const tipConfig = {
-        'uscc_num': {
-          title: '如何找到证件号码',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/72856aac-f0ac-49a1-a7f1-be3220ecb314'
+        'head_photo': {
+          title: '如何查看店铺logo',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9'
         },
-        'uscc_name': {
-          title: '如何找到企业名称',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
-        },
-        'legal_name': {
-          title: '如何找到法人代表',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/24859872-da37-4beb-8e33-7743813bb5a1'
+        'name': {
+          title: '如何查看店铺名称',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
         }
       };
       
       if (tipConfig[field]) {
+        this.currentTipType = field; // 设置当前类型
         this.tipTitle = tipConfig[field].title;
         this.tipImage = tipConfig[field].image;
-        // 确保图片已加载再显示弹窗
-        this.ensureImageLoaded(this.tipImage).then(() => {
+        // 等待图片预加载完成后再显示弹窗
+      if (this.tipImagesPreloaded) {
+        this.showTipPopupFlag = true;
+      } else {
+        // 如果图片还没预加载完成，立即加载当前图片
+        console.log('图片还未预加载完成，立即加载当前图片');
+        this.loadImage(this.tipImage).then(() => {
           this.showTipPopupFlag = true;
         }).catch(() => {
           // 即使加载失败也显示弹窗，避免用户无法操作
           this.showTipPopupFlag = true;
         });
       }
-    },
-
-    // 确保图片加载完成
-    ensureImageLoaded(src) {
-      return new Promise((resolve, reject) => {
-        const img = new Image();
-        img.onload = () => resolve();
-        img.onerror = () => reject();
-        img.src = src;
-        
-        // 设置超时，避免长时间等待
-        setTimeout(() => resolve(), 500);
-      });
-    },
+    }
+  }, 
     
     // 隐藏提示弹窗
     hideTipPopup() {
       this.showTipPopupFlag = false;
     },
-
-
-    // 设置营业执照有效期类型
-    setLicenseValidType(type) {
-      this.formData.license_valid_type = type;
-      if (type === 'permanent') {
-        // 选择长久有效时，设置结束日期为"长久有效"
-        this.formData.license_end_date = '长久有效';
-      } else {
-        // 选择指定日期时，如果之前是长久有效，清空结束日期
-        if (this.formData.license_end_date === '长久有效') {
-          this.formData.license_end_date = '';
-        }
+    
+    // 加载服务技能列表
+    async loadServiceSkills() {
+      try {
+        const res = await request.post('/sj/firstclass');
+        this.serviceList = res.data.map(item => ({
+          ...item,
+          checked: false
+        }));
+        // 加载完成后立即恢复选中状态
+        this.restoreServiceSkillsSelection();
+        // 再次更新显示文本，确保显示具体的技能名称
+        this.updateSelectedServicesText();
+      } catch (error) {
+        console.error('加载服务技能失败:', error);
       }
-      // 保存到本地存储
-      this.saveFormDataToLocal();
     },
     
-    // 设置身份证有效期类型
-    setIdcardValidType(type) {
-      this.formData.legal_idcard_expiry_type = type;
-      if (type === 'permanent') {
-        // 选择长久有效时，设置结束日期为"长久有效"
-        this.formData.idcard_end_date = '长久有效';
-      } else {
-        // 选择指定日期时，如果之前是长久有效，清空结束日期
-        if (this.formData.idcard_end_date === '长久有效') {
-          this.formData.idcard_end_date = '';
-        }
-        // 如果已有开始日期，自动计算20年后的结束日期
-        if (this.formData.idcard_start_date && !this.formData.idcard_end_date) {
-          const match = this.formData.idcard_start_date.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const year = parseInt(match[1]) + 20;
-            const month = match[2];
-            const day = match[3];
-            this.formData.idcard_end_date = `${year}年${month}月${day}日`;
-          }
-        }
+    // 恢复服务技能选择状态
+    restoreServiceSkillsSelection() {
+      if (this.formData.servers_kill && this.formData.servers_kill.length > 0) {
+        this.serviceList.forEach(item => {
+          item.checked = this.formData.servers_kill.includes(item.id);
+        });
+        this.updateSelectedServicesText();
       }
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    
-    // 选择商户类型
-    selectMerchantType(item) {
-      this.formData.uscc_type = item.value;
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-    },
-    
-    // 确认商户类型选择
-    confirmMerchantType() {
-      this.hideMerchantTypePicker();
-    },
-    
-    // 打开日期选择器
-    openDatePicker(field) {
-      this.currentDateField = field;
-      
-      // 设置日期选择器的初始值
-      const currentDate = new Date();
-      let initialDate = currentDate;
-      
-      // 如果该字段已经有值，解析该值作为初始值
-      if (this.formData[field]) {
-        const dateStr = this.formData[field];
-        const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-        if (match) {
-          initialDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-        }
-      }
-      
-      // 计算picker-view的value
-      const yearIndex = this.years.indexOf(initialDate.getFullYear());
-      const monthIndex = initialDate.getMonth();
-      const dayIndex = initialDate.getDate() - 1;
-      
-      this.dateValue = [
-        yearIndex >= 0 ? yearIndex : 0,
-        monthIndex,
-        dayIndex
-      ];
-      
-      this.showDatePickerFlag = true;
-    },
-    
-    // 隐藏日期选择器
-    hideDatePicker() {
-      this.showDatePickerFlag = false;
-    },
-    
-    // 日期选择变化
-    bindDateChange(e) {
-      this.dateValue = e.detail.value;
-    },
-
-    // 确认日期选择
-    confirmDate() {
-      const [yearIndex, monthIndex, dayIndex] = this.dateValue;
-      const year = this.years[yearIndex];
-      const month = this.months[monthIndex];
-      const day = this.days[dayIndex];
-      const dateStr = `${year}年${month}月${day}日`;
-      const selectedDate = new Date(year, month - 1, day);
-      const today = new Date();
-      today.setHours(0, 0, 0, 0);
-      
-      // 验证日期逻辑
-      if (this.currentDateField.endsWith('_start_date')) {
-        // 开始日期验证：不能选择今天之后的日期
-        if (selectedDate > today) {
-          uni.showToast({
-            title: '开始日期不能晚于今天',
-            icon: 'none'
-          });
-          return;
-        }
-        
-        // 如果对应的结束日期已经设置，检查开始日期是否晚于结束日期
-        const relatedEndField = this.currentDateField.replace('_start_date', '_end_date');
-        if (this.formData[relatedEndField] && this.formData[relatedEndField] !== '长久有效') {
-          const endDateStr = this.formData[relatedEndField];
-          const match = endDateStr.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const endDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-            if (selectedDate > endDate) {
-              uni.showToast({
-                title: '开始日期不能晚于结束日期',
-                icon: 'none'
-              });
-              return;
-            }
-          }
-        }
-        // 如果是身份证开始日期，自动计算结束日期
-        if (this.currentDateField === 'idcard_start_date') {
-          // 如果是"长久有效"类型，不自动设置结束日期
-          if (this.formData.legal_idcard_expiry_type === 'date') {
-            const endYear = year + 20;
-            const endDateStr = `${endYear}年${month}月${day}日`;
-            this.formData.idcard_end_date = endDateStr;
-          } else if (this.formData.legal_idcard_expiry_type === 'permanent') {
-            // 如果是"长久有效"类型，保持结束日期为"长久有效"
-            this.formData.idcard_end_date = '长久有效';
-          }
-        }
-
-      } else if (this.currentDateField.endsWith('_end_date')) {
-        const relatedStartField = this.currentDateField.replace('_end_date', '_start_date');
-        if (this.formData[relatedStartField]) {
-          const startDateStr = this.formData[relatedStartField];
-          const match = startDateStr.match(/(\d+)年(\d+)月(\d+)日/);
-          if (match) {
-            const startDate = new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-            if (selectedDate <= startDate) {
-              uni.showToast({
-                title: '结束日期必须晚于开始日期',
-                icon: 'none'
-              });
-              return;
-            }
-          }
-        } else {
-          // 如果没有设置开始日期，结束日期不能早于今天
-          if (selectedDate < today) {
-            uni.showToast({
-              title: '结束日期不能早于今天',
-              icon: 'none'
-            });
-            return;
-          }
-        }
-      }
-      
-      this.formData[this.currentDateField] = dateStr;
-      // 保存到本地存储
-      this.saveFormDataToLocal();
-      this.hideDatePicker();
     },
     
     // 选择图片
-    async chooseImage(type) {
-      try {
-        const systemInfo = uni.getSystemInfoSync()
-        
-        if (systemInfo.platform === 'ios') {
-          this.openCamera(type);
-        } else {
-          let xcpermission = '';
-          let xjpermission = '';
-          if (systemInfo.platform === 'ios') {
-            xcpermission = 'photo_library',
-            xjpermission = 'camera'
-          } else {
-            xcpermission = `android.permission.READ_EXTERNAL_STORAGE,android.permission.WRITE_EXTERNAL_STORAGE`
-            xjpermission = 'android.permission.CAMERA'
-          }
-          const xjfirstRequest = !plus.storage.getItem(`perm_${xjpermission}`)
-          const xcfirstRequest = !plus.storage.getItem(`perm_${xcpermission}`)
-          if (xcfirstRequest || xjfirstRequest) {
-            this.isShowPer = true;
-          }
-
-          // 检查权限
-          const xc = await permissionUtils.checkPermission('photo_library', '需要相册权限用于上传照片');
-          const xj = await permissionUtils.checkPermission('camera', '需要相机权限用于拍摄照片');
-          if (xc.granted && xj.granted) {
-            this.openCamera(type);
-            return;
-          }
-
-          // 请求权限
-          const result1 = await permissionUtils.requestPermission('photo_library', '我们需要访问您的相册以上传图片/视频');
-          const result2 = await permissionUtils.requestPermission('camera', '我们需要访问您的相机以上传图片/视频');
-          if (result1 && result2) {
-            this.openCamera(type);
-          } else {
-            locationService.openAppSettings();
-          }
-        }
-      } catch (err) {
-        console.log('选择图片出错:', err);
-        // 出错时也直接调用图片选择
-        this.openCamera(type);
-      }
+    chooseImage(type) {
+      this.openCamera(type);
     },
-
+    
     async openCamera(type) {
       try {
-        // 确保用户信息正确
-        if (!this.userId) {
-          console.log('重新获取用户信息...');
-          await this.getUserInfo();
-        }
-        
-        if (!this.identity) {
-          this.identity = getApp().globalData.artisanType;
-        }
-
-        // 直接使用 uni.chooseImage
         const chooseResult = await new Promise((resolve, reject) => {
           uni.chooseImage({
             count: 1,
@@ -774,67 +1122,30 @@ export default {
             fail: reject
           });
         });
-
+        
         if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) {
-          uni.hideLoading();
           return;
         }
-
+        
         const tempFilePath = chooseResult.tempFilePaths[0];
-        
-        // 直接构造文件对象
-        const file = {
-          path: tempFilePath,
-          size: 0
-        };
-
-        // 显示上传loading
-        uni.showLoading({
-          title: '上传中...',
-          mask: true
-        });
-
-        // 手动调用上传
+        const file = { path: tempFilePath, size: 0 };
         const result = await this.directUpload(file, this.userId, this.identity + 1);
         
-        // 上传成功，更新loading显示为识别中
-        uni.hideLoading();
-        
         if (result) {
           this.formData[type] = result;
-          
-          // 上传成功后自动识别
-          if (type === 'uscc_photo') {
-            await this.recognizeBusinessLicense(result);
-          } else if (type === 'legal_idcard_positive') {
-            await this.recognizeIdCardFront(result);
-          } else if (type === 'legal_idcard_negative') {
-            await this.recognizeIdCardBack(result);
-          }
-          
-          // 保存到本地存储
           this.saveFormDataToLocal();
         }
       } catch (err) {
-        uni.hideLoading();
         console.log('上传图片错误:', err);
-        
-        if (!err.errMsg || !err.errMsg.includes('cancel')) {
-          uni.showToast({
-            title: '上传失败，请重试',
-            icon: 'none'
-          });
-        }
       }
     },
-
+    
     // 直接上传方法
     async directUpload(file, userId, type) {
       try {
         let date = new Date().getTime();
         let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
         
-        // 生成安全的文件名
         let fileExtension = 'jpg';
         if (file.path.includes('.')) {
           let parts = file.path.split('.');
@@ -845,12 +1156,8 @@ export default {
         }
         
         let name = `${userId}_${artisan}_${date}.${fileExtension}`;
-        console.log('安全文件名:', name);
-
-        // 获取OSS配置
         const ossConfig = await request.post('/user/getalioss', {type: type, kind: 1});
         
-        // 直接上传到OSS
         return await new Promise((resolve, reject) => {
           uni.uploadFile({
             url: ossConfig.host,
@@ -874,526 +1181,338 @@ export default {
             fail: reject
           });
         });
-        
       } catch (error) {
         console.error('直接上传失败:', error);
         throw error;
       }
     },
-
-    /**
-     * 识别营业执照
-     */
-    async recognizeBusinessLicense(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'uscc_photo';
-        // uni.showLoading({
-        //   title: '正在识别营业执照...',
-        //   mask: true
-        // });
-        
-        // 调用OCR接口
-        const result = await recognizeBusinessLicense(imageUrl);
-        console.log('营业执照识别结果:', result);
-
-        const hasRecognizedData = this.checkBusinessLicenseRecognition(result);
-        if (!hasRecognizedData) {
-          uni.showToast({
-            title: '未识别到营业执照信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 填充营业执照信息
-        let recognizedFields = 0;
-
-        // 企业名称：如果识别结果为"无"，就设置为空字符串
-        if (result.uscc_name && result.uscc_name.trim() && result.uscc_name !== '无') {
-          this.formData.uscc_name = result.uscc_name;
-          recognizedFields++;
-        } else {
-          // 如果是"无"或空值，设置为空字符串
-          this.formData.uscc_name = '';
-        }
-        
-        if (result.uscc_num && result.uscc_num.trim()) {
-          this.formData.uscc_num = result.uscc_num;
-          recognizedFields++;
-        }
-        
-        // 如果需要营业执照法人与法人代表关联则取消注释
-        // if (result.legal_name && result.legal_name.trim()) {
-        //   this.formData.legal_name = result.legal_name;
-        //   recognizedFields++;
-        // }
-
-        if (result.uscc_type && result.uscc_type.trim()) {
-          this.formData.uscc_type = result.uscc_type;
-          recognizedFields++;
-        }
-
-        // 根据识别的字段数量给出不同的提示
-        if (recognizedFields > 0) {
-        } else {
-          uni.showToast({
-            title: '识别完成，但未获取到有效信息',
-            icon: 'none',
-            duration: 3000
-          });
-        }
-        
-      } catch (error) {
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          // duration: 3000
-        });
-        console.error('营业执照识别失败:', error);
-        
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查营业执照识别结果是否有效
-    checkBusinessLicenseRecognition(result) {
-      const requiredFields = ['uscc_num', 'uscc_name', 'legal_name', 'uscc_type'];
-      
-      for (const field of requiredFields) {
-        if (result[field] && result[field].trim()) {
-          return true;
-        }
-      }
-      
-      return false;
+    
+    // 打开时间选择器
+    openTimePicker() {
+      this.showTimePicker = true;
     },
     
-    /**
-     * 识别身份证正面
-     */
-    async recognizeIdCardFront(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'legal_idcard_positive';
-        
-        uni.showLoading({
-          title: '正在识别身份证正面...',
-          mask: true
-        });
-        
-        // 调用OCR接口
-        const result = await recognizeIdCard(imageUrl, 1);
-
-        // 验证是否真的识别到了数据
-        const hasRecognizedData = this.checkIdCardFrontRecognition(result);
-        
-        if (!hasRecognizedData) {
-          uni.hideLoading();
-          uni.showToast({
-            title: '未识别到身份证信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 填充身份证正面信息
-        if (result.name) {
-          this.formData.legal_name = result.name;
-        }
-        
-        if (result.id_number) {
-          this.formData.legal_idcard_num = result.id_number;
-        }
-        
-        uni.showToast({
-          title: '身份证正面识别成功',
-          icon: 'none'
-        });
-        
-      } catch (error) {
-        console.error('身份证正面识别失败:', error);
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          duration: 3000
-        });
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
-      }
-    },
-
-    // 检查身份证正面识别结果是否有效
-    checkIdCardFrontRecognition(result) {
-      return (result.name && result.name.trim()) || (result.id_number && result.id_number.trim());
+    // 隐藏时间选择器
+    hideTimePopup() {
+      this.showTimePicker = false;
     },
     
-    /**
-     * 识别身份证反面
-     */
-    async recognizeIdCardBack(imageUrl) {
-      try {
-        this.isRecognizing = true;
-        this.recognizeType = 'legal_idcard_negative';
+    // 切换时间类型
+    switchTimeType(type) {
+      this.timeType = type;
+    },
+    
+    // 处理时间变化
+    handleTimeChange(e) {
+      const values = e.detail.value;
+      this.pickerValue = values;
+    },
+    
+    // 格式化时间显示
+    formatTime(time) {
+      return `${time.hour}:${time.minute}`;
+    },
+    
+    // 确认时间选择
+    confirmTime() {
+      this.formData.business_time = `${this.formatTime(this.startTime)}-${this.formatTime(this.endTime)}`;
+      this.saveFormDataToLocal();
+      this.hideTimePopup();
+    },
+    
+    // 显示服务技能弹出框
+    showServicePopup() {
+      this.showServicePopupFlag = true;
+    },
+    
+    // 隐藏服务技能弹出框
+    hideServicePopup() {
+      this.showServicePopupFlag = false;
+    },
+    
+    // 切换服务技能选择状态
+    toggleServiceSelect(index) {
+      this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
+    },
+    
+    // 确认服务技能选择
+    confirmServiceSelect() {
+      const selectedServices = this.serviceList
+        .filter(item => item.checked)
+        .map(item => item.title);
+      const selectedServicesId = this.serviceList
+        .filter(item => item.checked)
+        .map(item => item.id);
         
-        uni.showLoading({
-          title: '正在识别身份证反面...',
-          mask: true
-        });
-        
-        // 调用OCR接口
-        const result = await recognizeIdCard(imageUrl, 2);
-
-        // 验证是否真的识别到了数据
-        const hasRecognizedData = this.checkIdCardBackRecognition(result);
-        
-        if (!hasRecognizedData) {
-          uni.hideLoading();
-          uni.showToast({
-            title: '未识别到身份证有效期信息，请手动填写或重新拍摄',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isRecognizing = false;
-          return;
-        }
-        
-        // 解析有效期
-        const validPeriod = parseValidPeriod(result.start_date, result.end_date);
-        
-        // 填充有效期数据
-        if (validPeriod.startDate) {
-          this.formData.idcard_start_date = validPeriod.startDate;
-        }
-        
-        if (validPeriod.isPermanent) {
-          this.formData.legal_idcard_expiry_type = 'permanent';
-          this.formData.idcard_end_date = '长久有效';
-        } else if (validPeriod.endDate) {
-          this.formData.legal_idcard_expiry_type = 'date';
-          this.formData.idcard_end_date = validPeriod.endDate;
-        }
-        
-        // 如果是长期有效，自动选择对应的选项
-        if (validPeriod.isPermanent) {
-          this.setIdcardValidType('permanent');
-        } else {
-          this.setIdcardValidType('date');
-        }
-        
-        uni.showToast({
-          title: '身份证反面识别成功',
-          icon: 'none'
-        });
-        
-      } catch (error) {
-        console.error('身份证反面识别失败:', error);
-        uni.showToast({
-          title: error.message || '识别失败，请手动填写',
-          icon: 'none',
-          duration: 3000
-        });
-      } finally {
-        this.isRecognizing = false;
-        uni.hideLoading();
+      if (selectedServices.length === 0) {
+        uni.showToast({ title: '请至少选择一个服务技能', icon: 'none' });
+        return;
       }
+      
+      this.formData.servers_kill = selectedServicesId;
+      this.selectedServicesText = selectedServices.join('、');
+      this.saveFormDataToLocal();
+      this.hideServicePopup();
+    },
+    
+    // 显示所在地选择弹出框
+    showLocationPopup() {
+      this.showLocationPopupFlag = true;
+    },
+    
+    // 隐藏所在地选择弹出框
+    hideLocationPopup() {
+      this.showLocationPopupFlag = false;
+    },
+    
+    // 所在地选择变化
+    bindChangeLocation(e) {
+      this.locationValue = e.detail.value;
+      let index1 = e.detail.value[0] || 0;
+      let index2 = e.detail.value[1] || 0;
+      this.locatinCitys = this.ChinaCitys[index1].citys;
+      this.locationAreas = this.locatinCitys[index2].areas;
+    },
+    
+    // 确认所在地选择
+    confirmLocationSelect() {
+      let valueArr = this.locationValue;
+      let index1 = valueArr[0] || 0;
+      let index2 = valueArr[1] || 0;
+      let index3 = valueArr[2] || 0;
+      let province = this.ChinaCitys[index1].province;
+      let city = this.locatinCitys[index2].city;
+      let area = this.locationAreas[index3].area;
+      this.formData.dependency = province + '-' + city + '-' + area;
+
+      // 清空详细地址，因为所在地已经改变
+      this.formData.address = '';
+      this.formData.longitude = '';
+      this.formData.latitude = '';
+      
+      if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+        let provinceCode = this.ChinaCitys[index1].code.toString();
+        this.formData.dependency_province = provinceCode.substring(0, 6);
+      }
+      if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
+        let cityCode = this.locatinCitys[index2].code.toString();
+        this.formData.dependency_city = cityCode.substring(0, 6);
+      }
+      if (this.locationAreas[index3] && this.locationAreas[index3].code) {
+        let areaCode = this.locationAreas[index3].code.toString();
+        this.formData.dependency_code = areaCode.substring(0, 6);
+      }
+      
+      this.saveFormDataToLocal();
+      this.hideLocationPopup();
     },
 
-    // 检查身份证反面识别结果是否有效
-    checkIdCardBackRecognition(result) {
-      return (result.start_date && result.start_date.trim()) || 
-            (result.end_date && result.end_date.trim());
+    buildRegionTextForSearch() {
+      const dependency = String(this.formData.dependency || '').trim()
+      if (!dependency) return ''
+
+      const parts = dependency.split('-')
+      const province = parts[0] || ''
+      const city = parts[1] || ''
+      const district = parts[2] || ''
+
+      let regionText = ''
+      if (province) regionText += province
+      if (city && city !== province) regionText += city
+      if (district) regionText += district
+
+      return regionText
     },
 
-    // 验证表单数据
-    validateForm() {
-      // 按照表单从上到下的顺序定义验证规则
-      const validationRules = [
-        { field: 'uscc_photo', message: '请上传营业执照照片' },
-        { field: 'uscc_type', message: '请输入商户类型' },
-        { field: 'uscc_num', message: '请输入营业执照号码' },
-        { field: 'uscc_name', message: '请输入企业名称' },
-                { field: 'legal_idcard_positive', message: '请上传身份证正面照片' },
-        { field: 'legal_idcard_negative', message: '请上传身份证反面照片' },
-        { field: 'legal_name', message: '请输入法人代表' },
-        { field: 'legal_phone', message: '请输入法人联系方式' },
-        { field: 'legal_idcard_num', message: '请输入法人身份证号' },
-        { 
-          condition: () => !this.formData.legal_idcard_expiry_type, 
-          message: '请选择身份证有效期类型' 
-        },
-        { 
-          condition: () => !this.formData.idcard_start_date, 
-          message: '请选择身份证开始日期' 
-        },
-        {
-          condition: () => {
-            if (this.formData.legal_idcard_expiry_type === 'data' && !this.formData.idcard_end_date) {
-              return true;
-            }
-            // 如果选择长久有效，则不需要结束日期
-            return false;
-          },
-          message: '请选择身份证结束日期' 
-        },
-      ];
+    getAddressValueForSearch() {
+      const rawAddress = String(this.formData.address || '').trim()
+      if (!rawAddress) return ''
 
-      // 按顺序验证
-      for (let rule of validationRules) {
-        let isValid = true;
-        
-        if (rule.field) {
-          // 简单字段验证
-          if (!this.formData[rule.field]) {
-            isValid = false;
-          }
-        } else if (rule.condition) {
-          // 条件验证
-          if (rule.condition()) {
-            isValid = false;
-          }
-        }
-        
-        if (!isValid) {
-          uni.showToast({
-            title: rule.message,
-            icon: 'none'
-          });
-          return false;
-        }
+      const dependencyText = String(this.formData.dependency || '').trim()
+      const regionText = this.buildRegionTextForSearch()
+
+      let detail = rawAddress
+
+      // 兼容老数据里 address 被存成完整地址的情况
+      if (regionText && detail.indexOf(regionText) === 0) {
+        detail = detail.slice(regionText.length).trim()
+      } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+        detail = detail.slice(dependencyText.length).trim()
       }
-      
-      // 验证手机号格式
-      if (!/^1[3-9]\d{9}$/.test(this.formData.legal_phone)) {
-        uni.showToast({
-          title: '请输入正确的手机号码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      // 验证身份证格式
-      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.formData.legal_idcard_num)) {
-        uni.showToast({
-          title: '请输入正确的身份证号码',
-          icon: 'none'
-        });
-        return false;
-      }
-      
-      return true;
+
+      detail = detail.replace(/^[\s,-]+/, '').trim()
+
+      return detail || rawAddress
     },
+    
+    // 获取详细地址
+    getAddressInfo() {
+      this.saveFormDataToLocal()
 
-    // 将日期字符串转换为Date对象
-    parseDateString(dateStr) {
-      if (!dateStr) return null;
-      
-      // 处理年月日格式
-      const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
-      if (match) {
-        return new Date(parseInt(match[1]), parseInt(match[2]) - 1, parseInt(match[3]));
-      }
-      
-      // 处理 YYYY-MM-DD 格式
-      if (dateStr.includes('-')) {
-        const dateParts = dateStr.split('-');
-        if (dateParts.length === 3) {
-          return new Date(parseInt(dateParts[0]), parseInt(dateParts[1]) - 1, parseInt(dateParts[2]));
+      const dependency = String(this.formData.dependency || '').trim()
+      const dependencyCode = String(this.formData.dependency_code || '').trim()
+      const address = this.getAddressValueForSearch()
+      const longitude = String(this.formData.longitude || '').trim()
+      const latitude = String(this.formData.latitude || '').trim()
+
+      const hasDependency = !!dependency
+      const hasAddress = !!address
+      const hasLocation = !!(longitude && latitude)
+
+      let params = 'source=sj_info'
+
+      // 已选所在地时，继续把地区传过去
+      if (hasDependency) {
+        params += `&dependency=${encodeURIComponent(dependency)}`
+        if (dependencyCode) {
+          params += `&dependency_code=${dependencyCode}`
         }
       }
-      
-      return null;
-    },
 
-    // 保存表单数据（在进入下一步时调用）
-    // 修改后的 saveFormData 方法
+      // 已有详细地址时，把纯详细地址传过去，不带省市区
+      if (hasAddress) {
+        params += `&address=${encodeURIComponent(address)}`
+      }
+
+      // 已有坐标时，继续用已有坐标定位
+      if (hasLocation) {
+        params += `&longitude=${longitude}&latitude=${latitude}`
+      }
+
+      // 完全空白进入时：
+      // 已授权 -> 搜索页按当前定位初始化
+      // 未授权/拒绝 -> 搜索页静默失败后保持所在地、详细地址都为空
+      if (!hasDependency && !hasAddress && !hasLocation) {
+        params += '&init_current_location=1&silent_locate=1'
+      }
+
+      console.log('跳转URL参数:', params)
+
+      uni.navigateTo({
+        url: `/pages/address/search?${params}`
+      })
+    },
+    
+    // 打开获取消息方式选择器
+    openMessageMethodPicker() {
+      uni.showActionSheet({
+        itemList: ['朋友圈', '抖音', '地推', '朋友介绍', '微博'],
+        success: (res) => {
+          const methods = ['朋友圈', '抖音', '地推', '朋友介绍', '微博'];
+          this.formData.apply_state = res.tapIndex + 1;
+          this.messageMethodText = methods[res.tapIndex];
+          this.saveFormDataToLocal();
+        }
+      });
+    },
+    
+    // 打开专业经验选择器
+    openExperiencePicker() {
+      uni.showActionSheet({
+        itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
+        success: (res) => {
+          const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+          this.formData.major = res.tapIndex + 1;
+          this.experienceText = experiences[res.tapIndex];
+          this.saveFormDataToLocal();
+        }
+      });
+    },
+    
+    // 保存表单数据（用于提交前验证）
     saveFormData() {
-      console.log('开始验证表单数据');
-      console.log('表单数据:', this.formData);
-      console.log('法人姓名:', this.formData.legal_name);
-      console.log('法人身份证号:', this.formData.legal_idcard_num);
-      
-      if (this.validateForm()) {
-        console.log('表单验证通过，开始验证法人信息');
-        
-        // 验证法人姓名与身份证号是否匹配
-        return this.checkIdCardAndName();
-      }
-      
-      console.log('表单验证失败');
-      return false;
-    },
-
-    // 修改后的 checkIdCardAndName 方法，添加详细调试
-    async checkIdCardAndName() {
-      if (this.isSubmit) {
-        console.log(' 重复提交被阻止 ');
-        return false;
-      }
-
-      this.isSubmit = true;
-
-      try {
-        console.log('开始调用身份验证接口');
-        console.log('请求参数:', {
-          name: this.formData.legal_name,
-          idcard: this.formData.legal_idcard_num
-        });
-        
-        uni.showLoading({
-          title: '验证身份信息...'
-        });
-
-        // 调用身份验证接口
-        const checkRes = await request.post('/user/check', {
-          name: this.formData.legal_name,
-          idcard: this.formData.legal_idcard_num
-        });
-
-        uni.hideLoading();
-        
-        console.log('身份验证接口返回结果 ');
-        console.log('完整响应:', checkRes);
-        console.log('响应Code:', checkRes.Code);
-        console.log('响应state:', checkRes.state);
-        console.log('响应msg:', checkRes.msg);
-        console.log('响应data:', checkRes.data);
-        console.log('响应ResultObject:', checkRes.ResultObject);
-        
-        if (checkRes.ResultObject) {
-          console.log('ResultObject.BizCode:', checkRes.ResultObject.BizCode);
-          console.log('ResultObject其他属性:', Object.keys(checkRes.ResultObject));
-        }
-
-        // 根据参考代码的验证逻辑，但需要先检查响应结构
-        if (checkRes.Code === '401') {
-          console.log(' Code 401 验证失败 ');
-          uni.showToast({
-            title: '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-        
-        // 检查多种可能的响应结构
-        if (checkRes.ResultObject) {
-          // 如果 ResultObject 有 BizCode 属性
-          if (checkRes.ResultObject.BizCode && checkRes.ResultObject.BizCode != '1') {
-            console.log(' BizCode 验证失败 ');
-            uni.showToast({
-              title: '您的身份证号与姓名不匹配',
-              icon: 'none',
-              duration: 3000
-            });
-            this.isSubmit = false;
-            return false;
-          }
-          
-          // 如果有其他表示失败的字段
-          if (checkRes.ResultObject.success === false || checkRes.ResultObject.result === false) {
-            console.log('success/result 验证失败');
-            uni.showToast({
-              title: '您的身份证号与姓名不匹配',
-              icon: 'none',
-              duration: 3000
-            });
-            this.isSubmit = false;
-            return false;
-          }
-        }
-        
-        // 检查直接返回的状态字段
-        if (checkRes.state && checkRes.state !== 1) {
-          console.log('state 验证失败');
-          uni.showToast({
-            title: checkRes.msg || '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-        
-        // 如果直接返回 success: false
-        if (checkRes.success === false) {
-          console.log('success 验证失败');
-          uni.showToast({
-            title: checkRes.message || '您的身份证号与姓名不匹配',
-            icon: 'none',
-            duration: 3000
-          });
-          this.isSubmit = false;
-          return false;
-        }
-
-        console.log('身份验证通过 ');
-        
-        // 验证通过，创建提交给后端的数据副本，将日期转换为 YYYY-MM-DD 格式
-        const submitData = {
-          ...this.formData,
-          license_start_date: this.formatDateForBackend(this.formData.license_start_date),
-          license_end_date: this.formData.license_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.license_end_date),
-          idcard_start_date: this.formatDateForBackend(this.formData.idcard_start_date),
-          idcard_end_date: this.formData.idcard_end_date === '长久有效' ? 'permanent' : this.formatDateForBackend(this.formData.idcard_end_date)
-        };
-
-        console.log('submitData:', submitData);
-
-        // 将表单数据保存到全局或本地存储，以便在下一步使用
-        getApp().globalData.qualificationData = submitData;
-        
-        this.isSubmit = false;
-        return true;
-
-      } catch (error) {
-        uni.hideLoading();
-        console.error('身份验证接口调用失败');
-        console.error('错误信息:', error);
-        console.error('错误详情:', error.response || error.message || error);
-        
-        // 根据错误类型显示不同的提示
-        let errorMessage = '身份验证失败';
-        
-        if (error.response) {
-          console.error('响应状态:', error.response.status);
-          console.error('响应数据:', error.response.data);
-          errorMessage = `服务器错误: ${error.response.status}`;
-        } else if (error.message) {
-          errorMessage = error.message;
-        } else if (error.errMsg) {
-          errorMessage = error.errMsg;
-        }
-        
+      // 验证必填字段
+      if (!this.formData.head_photo) {
         uni.showToast({
-          title: errorMessage,
-          icon: 'none',
-          duration: 3000
+          title: '请上传店铺logo',
+          icon: 'none'
         });
-        
-        this.isSubmit = false;
         return false;
       }
+      if (!this.formData.name) {
+        uni.showToast({
+          title: '请输入店铺名称',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.business_time) {
+        uni.showToast({
+          title: '请选择营业时间',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (this.formData.servers_kill.length === 0) {
+        uni.showToast({
+          title: '请选择服务技能',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.dependency) {
+        uni.showToast({
+          title: '请选择门店所在地',
+          icon: 'none'
+        });
+        return false;
+      }
+      if (!this.formData.address) {
+        uni.showToast({
+          title: '请选择门店详细地址',
+          icon: 'none'
+        });
+        return false;
+      }
+      // if (!this.formData.apply_state) {
+      //   uni.showToast({
+      //     title: '请选择获取消息方式',
+      //     icon: 'none'
+      //   });
+      //   return false;
+      // }
+      if (!this.formData.invite_code_other) {
+        uni.showToast({
+          title: '请输入邀请码',
+          icon: 'none'
+        });
+        return false;
+      }
+      
+      // 邀请码有效性验证
+      if (this.inviteCodeValidating) {
+        uni.showToast({ title: '邀请码验证中，请稍候', icon: 'none' });
+        return false;
+      }
+      
+      // 特殊邀请码13131313直接通过
+      if (this.formData.invite_code_other === '13131313') {
+        // 直接通过
+      } else if (this.inviteCodeError || !this.inviterInfo) {
+        // 邀请码无效，触发抖动效果
+        this.triggerInviteErrorShake();
+        return false;
+      }
+      
+      if (!this.formData.major) {
+        uni.showToast({
+          title: '请选择专业经验',
+          icon: 'none'
+        });
+        return false;
+      }
+
+      // 将数据保存到全局，以便在下一步使用
+      getApp().globalData.storeInfoData = this.formData;
+      return true;
     }
   }
 }
 </script>
 
 <style scoped>
-.qualification-page {
-  /* padding: 0rpx 0; */
-}
-
-.section {
-  margin-bottom: 30rpx;
+.store-info-page {
+  /* padding: 28rpx 0; */
 }
 
 .section-title {
@@ -1410,24 +1529,14 @@ export default {
   border-radius: 5rpx;
 }
 
-.title-text {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #1D2129;
-  line-height: 48rpx;
-  text-align: left;
-  font-style: normal;
-}
-
 .section-title text {
-  font-size: 36rpx;
+  font-size: 32rpx;
   color: #1D2129;
   font-weight: 500;
 }
 
 .box-cont {
-  background: #FFFFFF;
+  background: #ffffff;
   border-radius: 20rpx;
   margin-bottom: 24rpx;
   margin-left: 8rpx;
@@ -1436,7 +1545,51 @@ export default {
 }
 
 .form-item {
-  padding: 24rpx 22rpx;
+  padding: 24rpx;
+}
+
+.label {
+  display: block;
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.required::before {
+  content: '*';
+  color: #FF0000;
+  margin-right: 4rpx;
+}
+
+.upload-box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 160rpx;
+  border-radius: 20rpx;
+}
+
+.upload-placeholder {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.upload-icon {
+  width: 120rpx;
+  height: 120rpx;
+}
+
+.upload-text {
+  font-size: 24rpx;
+  color: #999999;
+}
+
+.logo-image {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 20rpx;
 }
 
 .form-item-one {
@@ -1445,6 +1598,36 @@ export default {
   padding: 24rpx;
 }
 
+.form-item-one-yqr {
+  flex-direction: column;
+  align-items: stretch;
+  padding: 0;
+}
+
+/* 创建内部的上半部分 */
+.invite-code-top {
+  display: flex;
+  align-items: center;
+  padding: 24rpx;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+/* 分割线 */
+.divider {
+  height: 1rpx;
+  background-color: #00000013;
+  width: 100%;
+}
+
+/* 邀请信息容器 */
+.invite-info-container {
+  padding: 20rpx 24rpx;
+  width: 100%;
+  box-sizing: border-box;
+  min-height: 60rpx;
+}
+
 .label-wrapper {
   display: inline-flex;
   align-items: center;
@@ -1464,287 +1647,107 @@ export default {
   align-items: center;
 }
 
-.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
+.form-item-two {
+		display: flex;
+		align-items: flex-start;
+		justify-content: space-between;
+		padding: 24rpx;
+	}
 
-.upload-tip {
-  font-size: 26rpx;
-  color: #999;
-  margin: 16rpx 0 24rpx 0;
-  font-weight: 400;
-  font-family: PingFangSC, PingFang SC;
-  text-align: left;
-  font-style: normal;
-}
-
-.upload-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.upload-box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.upload-camera {
-  width: 446rpx;
-  height: 298rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 48rpx;
-  overflow: hidden;
-  background-color: #F8F9FD;
-  position: relative;
-}
-
-.idcard-upload-vertical-container {
-  display: flex;
-  flex-direction: column;
-  padding: 24rpx;
-}
-
-.idcard-upload-vertical-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-bottom: 40rpx;
-}
-
-.idcard-upload-vertical-item:last-child {
-  margin-bottom: 0;
-}
-
-.upload-label.required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
-}
-
-.license-upload {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.idcard-front {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.idcard-back {
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-
-.camera-icon {
-  width: 446rpx;
-  height: 298rpx;
-  border-radius: 48rpx;
-}
-
-.preview-image {
-  border-radius: 48rpx;
-  width: 100%;
-  height: 100%;
-}
-
-/* 识别状态样式 */
-.recognize-overlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.6);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  border-radius: 48rpx;
-}
-
-.recognize-loading {
-  width: 60rpx;
-  height: 60rpx;
-  border: 4rpx solid #fff;
-  border-top: 4rpx solid #E8101E;
-  border-radius: 50%;
-  animation: spin 1s linear infinite;
-  margin-bottom: 16rpx;
-}
-
-.recognize-text {
-  color: #fff;
-  font-size: 24rpx;
-}
-
-@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
-.picker-content {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  flex: 1;
-}
-
-.picker-content text {
-  margin-right: 19rpx;
-}
-
-/* 日期选择框竖线分隔符 */
-.date-divider {
-  width: 2rpx;
-  height: 30rpx;
-  background-color: #E9E9E9;
-  margin: 0 15rpx 0 0;
-}
-
-/* 置灰状态下的竖线 */
-.date-picker-box.disabled .date-divider {
-  background-color: #F3F3F3;
-}
-
-/* 确保日期文字区域可以自动扩展 */
-.date-picker-box text {
-  flex: 1;
-}
-
-.arrow-right {
-  width: 14rpx;
-  height: 26rpx;
-}
-
-
-.placeholder {
-  color: #999999;
-  font-size: 28rpx;
-}
-
-.picker-value {
-  font-size: 28rpx;
-  color: #333333;
-}
+	/* 左侧标签：固定宽度，不换行 */
+	.form-item-two > text.label {
+		flex-shrink: 0;
+		font-size: 28rpx;
+		color: #333333;
+		font-weight: 500;
+	}
 
 .input {
   flex: 1;
   font-size: 28rpx;
   color: #333333;
   text-align: right;
-  margin-left: 20rpx;
 }
 
-.radio-group {
-  display: flex;
-  margin-top: 24rpx;
-  width: 100%;
+.placeholder {
+  color: #999999;
 }
 
-.radio-item {
+.picker-content {
   display: flex;
   align-items: center;
-  margin-right: 130rpx;
 }
 
-.radio {
-  width: 30rpx;
-  height: 30rpx;
-  border: 2rpx solid #DDDDDD;
-  border-radius: 50%;
+.picker-value,
+	.placeholder {
+		flex: 1;               /* 占据剩余宽度 */
+		text-align: right;     /* 文字右对齐 */
+		font-size: 28rpx;
+		word-break: break-all;
+		white-space: normal;
+		line-height: 1.4;
+	}
+
+.arrow-right {
+  width: 14rpx;
+  height: 26rpx;
+  margin-left: 16rpx;
+  flex-shrink: 0;
+}
+
+/* 邀请码相关样式 */
+.invite-tip {
+  font-size: 24rpx;
+  color: #666666;
+}
+
+.invite-validating {
+  font-size: 20rpx;
+  color: #999999;
+}
+
+.invite-error {
+  font-size: 24rpx;
+  color: #E8101E;
+}
+
+.inviter-info {
   display: flex;
   align-items: center;
-  justify-content: center;
-  margin-right: 16rpx;
+  font-size: 20rpx;
 }
 
-.radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+.inviter-label {
+  color: #666666;
 }
 
-.radio-icon-image {
-  width: 32rpx;
-  height: 32rpx;
-}
-
-.radio-label {
-  font-size: 28rpx;
+.inviter-name {
   color: #333333;
-}
-
-/* 日期范围容器样式 */
-.date-range-container {
-  padding: 24rpx;
-  display: flex;
-  justify-content: space-between;
-}
-
-.date-item {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-.date-item:first-child {
-  margin-right: 24rpx;
-}
-
-.date-label {
-  font-size: 28rpx;
-  color: #333333;
-  margin-bottom: 16rpx;
   font-weight: 500;
-  margin-left: 8rpx;
 }
 
-.date-picker-box {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border: 2rpx solid #E9E9E9;
-  border-radius: 10rpx;
-  padding: 12rpx 19rpx;
-  background-color: transparent;
+.inviter-divider {
+  color: #666666;
+  margin: 0 5rpx;
 }
 
-.date-picker-box.disabled {
-  border: 2rpx solid #F3F3F3;
+.inviter-phone {
+  color: #666666;
 }
 
-.date-picker-box.disabled .date-value,
-.date-picker-box.disabled .placeholder {
-  color: #CCCCCC;
+/* 添加抖动动画样式 */
+@keyframes shake {
+  0%, 100% { transform: translateX(0); }
+  10%, 30%, 50%, 70%, 90% { transform: translateX(-7rpx); }
+  20%, 40%, 60%, 80% { transform: translateX(7rpx); }
 }
 
-.date-value {
-  font-size: 28rpx;
-  color: #333;
+.shake-animation {
+  animation: shake 0.5s ease-in-out;
+  color: #E8101E; /* 保持红色 */
 }
 
-.date-arrow {
-  width: 35rpx;
-  height: 33rpx;
-}
-
-.upload-label {
-  font-family: Helvetica;
-  font-size: 28rpx;
-  color: #999;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-  margin-top: 24rpx;
-}
-
-/* 弹出框样式 */
+/* 弹窗样式 */
 .popup {
   position: fixed;
   left: 0;
@@ -1777,7 +1780,6 @@ export default {
   padding: 32rpx;
   transform: translateY(100%);
   transition: transform 0.3s ease;
-  max-height: 70vh;
 }
 
 .popup.show .popup-content {
@@ -1788,7 +1790,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: 32rpx;
+  margin-bottom: 20rpx;
 }
 
 .popup-title {
@@ -1804,45 +1806,86 @@ export default {
 }
 
 .popup-body {
-  max-height: 400rpx;
+  max-height: 600rpx;
   overflow-y: auto;
 }
 
-.radio-list .radio-item {
-  margin-bottom: 32rpx;
+.checkbox-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.checkbox-item {
+  width: 50%;
+  padding: 14rpx;
+  display: flex;
+  align-items: center;
+}
+
+.checkbox {
+  width: 40rpx;
+  height: 40rpx;
+  border: 2rpx solid #DDDDDD;
+  border-radius: 8rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16rpx;
+}
+
+.checkbox.checked {
+  background-color: #E8101E;
+  border-color: #E8101E;
+}
+
+.check-icon {
+  width: 42rpx;
+  height: 42rpx;
+}
+
+.checkbox-label {
+  font-size: 28rpx;
+  color: #333333;
 }
 
 .popup-footer {
+  display: flex;
   margin-top: 32rpx;
 }
 
 .popup-btn {
+  flex: 1;
   height: 88rpx;
   border-radius: 44rpx;
   display: flex;
   align-items: center;
   justify-content: center;
+  margin: 0 16rpx;
+}
+
+.popup-btn.cancel {
+  background-color: #F5F5F5;
+}
+
+.popup-btn.confirm {
   background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
 }
 
 .popup-btn .btn-text {
   font-size: 32rpx;
   font-weight: 500;
-  color: #FFFFFF;
 }
 
-.cancel-text, .confirm-text {
-  font-size: 32rpx;
-  padding: 16rpx;
-}
-
-.cancel-text {
+.popup-btn.cancel .btn-text {
   color: #666666;
 }
 
-.confirm-text {
-  color: #E8101E;
-  font-weight: 500;
+.popup-btn.confirm .btn-text {
+  color: #FFFFFF;
+}
+
+.region-body {
+  height: 400rpx;
 }
 
 .picker-scroll {
@@ -1853,7 +1896,63 @@ export default {
   height: 68rpx;
   line-height: 68rpx;
   text-align: center;
+}
+
+/* 时间选择器样式 */
+.cancel-text {
+  font-size: 32rpx;
+  color: #666666;
+}
+
+.confirm-text {
+  font-size: 32rpx;
+  color: #E8101E;
+  font-weight: 500;
+}
+
+.time-range {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 32rpx;
+  background: #F8F9FC;
+}
+
+.time-block {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background: #FFFFFF;
+  border-radius: 12rpx;
+  padding: 24rpx 0;
+  transition: all 0.3s ease;
+}
+
+.time-block.active {
+  background: #ECF2FF;
+}
+
+.time-label {
+  font-size: 26rpx;
+  color: #999999;
+  margin-top: 8rpx;
+}
+
+.time-value {
+  font-size: 40rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.time-block.active .time-value {
+  color: #E8101E;
+}
+
+.time-separator {
   font-size: 28rpx;
+  color: #999999;
+  margin: 0 24rpx;
 }
 
 /* 提示弹窗样式 */
@@ -1917,16 +2016,30 @@ export default {
 }
 
 .tip-image-container {
-  flex: 1;
-  display: flex;
   align-items: center;
   justify-content: center;
   margin-bottom: 50rpx;
 }
 
 .tip-image {
-  width: 90%;
-  max-height: 400rpx;
+  width: 627rpx;
+  height: 327rpx;
+  margin-left: 13rpx; 
+}
+
+/* 店铺logo图片的特殊样式 */
+.tip-image.head_photo {
+  width: 582rpx;
+  height: 327rpx;
+  margin-right: 0;
+  margin-left: -15rpx;
+}
+
+/* 店铺名称图片的特殊样式 */
+.tip-image.store_name {
+  width: 627rpx;
+  height: 327rpx;
+  margin-left: 13rpx;
 }
 
 .tip-buttons {
diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue
index dcc1be6..23a90f2 100644
--- a/pages/ruzhu/qualification_sj.vue
+++ b/pages/ruzhu/qualification_sj.vue
@@ -1,607 +1,1004 @@
 <template>
-  <view class="qualification-page">
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text class="title-text">门店信息</text>
-      </view>
+	<view class="qualification-page">
+		<view class="section">
+			<view class="section-title">
+				<view class="title-bar"></view>
+				<text class="title-text">门店信息</text>
+			</view>
 
-      <view class="form-item-one box-cont">
-        <view class="label-wrapper">
-          <text class="label required">店铺名称</text>
-        </view>
-        <input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" placeholder-class="placeholder"
-          class="input" @input="saveFormDataToLocalDebounce" />
-      </view>
-      <view class="form-item-two box-cont" @click="showLocationPopup">
-        <text class="label required">门店所在地</text>
-        <view class="picker-content">
-          <text :class="formData.dependency ? 'picker-value' : 'placeholder'">
-            {{ formData.dependency || '请选择' }}
-          </text>
-          <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
-            class="arrow-right" mode="aspectFit"></image>
-        </view>
-      </view>
-      <view class="form-item-two box-cont" @click="getAddressInfo">
-        <text class="label required">门店详细地址</text>
-        <view class="picker-content">
-          <text :class="formData.address ? 'picker-value' : 'placeholder'">
-            {{ formData.address || '请选择' }}
-          </text>
-          <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
-            class="arrow-right" mode="aspectFit"></image>
-        </view>
-      </view>
-    </view>
+			<view class="form-item-one box-cont">
+				<view class="label-wrapper">
+					<text class="label required">店铺名称</text>
+				</view>
+				<input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" placeholder-class="placeholder"
+					class="input" @input="saveFormDataToLocalDebounce" />
+			</view>
+			<view class="form-item-two box-cont" @click="showLocationPopup">
+				<text class="label required">门店所在地</text>
+				<view class="picker-content">
+					<text :class="formData.dependency ? 'picker-value' : 'placeholder'">
+						{{ formData.dependency || '请选择' }}
+					</text>
+					<image
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+						class="arrow-right" mode="aspectFit"></image>
+				</view>
+			</view>
+			<view class="form-item-two box-cont" @click="getAddressInfo">
+				<text class="label required">门店详细地址</text>
+				<view class="picker-content">
+					<text :class="formData.address ? 'picker-value' : 'placeholder'">
+						{{ formData.address || '请选择' }}
+					</text>
+					<image
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+						class="arrow-right" mode="aspectFit"></image>
+				</view>
+			</view>
+		</view>
 
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text class="title-text">联系人信息</text>
-      </view>
+		<view class="section">
+			<view class="section-title">
+				<view class="title-bar"></view>
+				<text class="title-text">联系人信息</text>
+			</view>
 
-      <view class="form-item box-cont">
-        <text class="label required">您的身份</text>
-        <view class="radio-group">
-          <view class="radio-item" @click="setContactType('1')">
-            <view class="radio" :class="{ checked: formData.contact_type === '1' }">
-              <image v-if="formData.contact_type === '1'"
-                src="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="setContactType('2')">
-            <view class="radio" :class="{ checked: formData.contact_type === '2' }">
-              <image v-if="formData.contact_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>
-        </view>
-      </view>
+			<view class="form-item box-cont">
+				<text class="label required">您的身份</text>
+				<view class="radio-group">
+					<view class="radio-item" @click="setContactType('1')">
+						<view class="radio" :class="{ checked: formData.contact_type === '1' }">
+							<image v-if="formData.contact_type === '1'"
+								src="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="setContactType('2')">
+						<view class="radio" :class="{ checked: formData.contact_type === '2' }">
+							<image v-if="formData.contact_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>
+				</view>
+			</view>
 
-      <view class="form-item-one box-cont">
-        <text class="label required">联系人</text>
-        <input type="text" v-model="formData.contact_name" placeholder="请输入" placeholder-class="placeholder"
-          class="input" @input="saveFormDataToLocalDebounce" />
-      </view>
+			<view class="form-item-one box-cont">
+				<text class="label required">联系人</text>
+				<input type="text" v-model="formData.contact_name" placeholder="请输入" placeholder-class="placeholder"
+					class="input" @input="saveFormDataToLocalDebounce" />
+			</view>
 
-      <view class="form-item-one box-cont">
-        <text class="label required">联系人电话</text>
-        <input type="number" v-model="formData.contact_phone" placeholder="请输入联系电话" placeholder-class="placeholder"
-          class="input" @input="saveFormDataToLocalDebounce" />
-      </view>
+			<view class="form-item-one box-cont">
+				<text class="label required">联系人电话</text>
+				<input type="number" v-model="formData.contact_phone" placeholder="请输入联系电话"
+					placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
+			</view>
 
-      <view class="form-item-one box-cont">
-        <text class="label">备用联系人电话</text>
-        <input type="number" v-model="formData.backup_phone" placeholder="请输入备用联系电话" placeholder-class="placeholder"
-          class="input" @input="saveFormDataToLocalDebounce" />
-      </view>
-    </view>
+			<view class="form-item-one box-cont">
+				<text class="label">备用联系人电话</text>
+				<input type="number" v-model="formData.backup_phone" placeholder="请输入备用联系电话"
+					placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
+			</view>
+		</view>
 
-    <view class="section">
-      <view class="section-title">
-        <view class="title-bar"></view>
-        <text class="title-text">其他信息</text>
-      </view>
+		<view class="form-item-one-yqr box-cont invite-code-container">
+			<view class="invite-code-top">
+				<view class="label-wrapper">
+					<text class="label required" >邀请码</text>
+				</view>
+				<input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码"
+					placeholder-class="placeholder" class="input" @input="handleInviteCodeInput" />
+			</view>
 
-      <view class="form-item-one box-cont">
-        <text class="label required">邀请码</text>
-        <input type="text" v-model="formData.invite_code" placeholder="请输入邀请码" placeholder-class="placeholder"
-          class="input" @input="saveFormDataToLocalDebounce" />
-      </view>
-      <view class="invite-tip box-cont">
-        <text class="invite-tip-text">请填写邀请人的邀请码，若没有邀请人请填写13131313</text>
-      </view>
-    </view>
+			<!-- 分割线 -->
+			<view class="divider"></view>
 
-    <view class="popup" :class="{ show: showLocationPopupFlag }">
-      <view class="popup-mask" @click="hideLocationPopup"></view>
-      <view class="popup-content">
-        <view class="popup-header">
-          <text class="popup-title">选择所在地</text>
-          <text class="popup-close" @click="hideLocationPopup">×</text>
-        </view>
-        <view class="region-body">
-          <picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
-            :value="locationValue">
-            <picker-view-column>
-              <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
-                {{ item.province }}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(item, index) in locatinCitys" :key="index">
-                {{ item.city }}
-              </view>
-            </picker-view-column>
-            <picker-view-column>
-              <view class="picker-item" v-for="(item, index) in locationAreas" :key="index">
-                {{ item.area }}
-              </view>
-            </picker-view-column>
-          </picker-view>
-        </view>
-        <view class="popup-footer">
-          <view class="popup-btn cancel" @click="hideLocationPopup">
-            <text class="btn-text">取消</text>
-          </view>
-          <view class="popup-btn confirm" @click="confirmLocationSelect">
-            <text class="btn-text">确定</text>
-          </view>
-        </view>
-      </view>
-    </view>
+			<!-- 邀请人信息 -->
+			<view class="invite-info-container">
+				<!-- 默认提示 -->
+				<text v-if="!formData.invite_code_other" class="invite-tip">
+					请填写邀请人的邀请码，若没有邀请人请填写13131313
+				</text>
 
-    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
-      <view class="tip-popup-mask" @click="hideTipPopup"></view>
-      <view class="tip-popup-content">
-        <image class="tip-popup-bg"
-          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
-          mode="aspectFit"></image>
+				<!-- 验证中 -->
+				<view v-else-if="inviteCodeValidating" class="invite-validating">
+					<text>验证中...</text>
+				</view>
 
-        <view class="tip-popup-body">
-          <view class="tip-title">{{ tipTitle }}</view>
-          <view class="tip-image-container">
-            <image class="tip-image" :src="tipImage" mode="widthFix"></image>
-          </view>
-          <view class="tip-buttons">
-            <view class="tip-btn cancel" @click="hideTipPopup">
-              <text class="btn-text">取消</text>
-            </view>
-            <view class="tip-btn confirm" @click="hideTipPopup">
-              <text class="btn-text">我已了解</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+				<!-- 验证失败 -->
+				<view v-else-if="inviteCodeError" class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
+					<text>邀请码无效</text>
+				</view>
+
+				<!-- 特殊邀请码13131313 -->
+				<view v-else-if="formData.invite_code_other === '13131313' && !inviterInfo" class="invite-tip">
+					请填写邀请人的邀请码，若没有邀请人请填写13131313
+				</view>
+
+				<!-- 显示邀请人信息 -->
+				<view v-else-if="inviterInfo" class="inviter-info">
+					<text class="inviter-label">邀请人：</text>
+					<text class="inviter-name">{{ inviterInfo.name || inviterInfo.nick_name }}</text>
+					<text class="inviter-divider">/</text>
+					<text class="inviter-phone">{{ inviterInfo.account }}</text>
+				</view>
+
+				<!-- 其他情况（接口返回成功但没有认证铁军的邀请码） -->
+				<view v-else class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
+					<text>邀请码无效</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="popup" :class="{ show: showLocationPopupFlag }">
+			<view class="popup-mask" @click="hideLocationPopup"></view>
+			<view class="popup-content">
+				<view class="popup-header">
+					<text class="popup-title">选择所在地</text>
+					<text class="popup-close" @click="hideLocationPopup">×</text>
+				</view>
+				<view class="region-body">
+					<picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
+						:value="locationValue">
+						<picker-view-column>
+							<view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
+								{{ item.province }}
+							</view>
+						</picker-view-column>
+						<picker-view-column>
+							<view class="picker-item" v-for="(item, index) in locatinCitys" :key="index">
+								{{ item.city }}
+							</view>
+						</picker-view-column>
+						<picker-view-column>
+							<view class="picker-item" v-for="(item, index) in locationAreas" :key="index">
+								{{ item.area }}
+							</view>
+						</picker-view-column>
+					</picker-view>
+				</view>
+				<view class="popup-footer">
+					<view class="popup-btn cancel" @click="hideLocationPopup">
+						<text class="btn-text">取消</text>
+					</view>
+					<view class="popup-btn confirm" @click="confirmLocationSelect">
+						<text class="btn-text">确定</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="tip-popup" :class="{ show: showTipPopupFlag }">
+			<view class="tip-popup-mask" @click="hideTipPopup"></view>
+			<view class="tip-popup-content">
+				<image class="tip-popup-bg"
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
+					mode="aspectFit"></image>
+
+				<view class="tip-popup-body">
+					<view class="tip-title">{{ tipTitle }}</view>
+					<view class="tip-image-container">
+						<image class="tip-image" :src="tipImage" mode="widthFix"></image>
+					</view>
+					<view class="tip-buttons">
+						<view class="tip-btn cancel" @click="hideTipPopup">
+							<text class="btn-text">取消</text>
+						</view>
+						<view class="tip-btn confirm" @click="hideTipPopup">
+							<text class="btn-text">我已了解</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
 import request from '../../utils/request';
-import { debounce } from '@/utils/debounce.js';
+import {
+	debounce
+} from '@/utils/debounce.js';
 import ChinaCitys from '../../static/data/ChinaCitys.json';
 
 export default {
-  data() {
-    const loadedData = this.loadFormDataFromLocal();
+	data() {
+		const loadedData = this.loadFormDataFromLocal();
 
-    return {
-      userId: null,
-      formData: loadedData || {
-        name: '',
-        contact_type: '1',
-        contact_name: '',
-        contact_phone: '',
-        backup_phone: '',
-        invite_code: '',
-        dependency: '',
-        address: '',
-        dependency_code: '',
-        dependency_province: '',
-        dependency_city: '',
-        longitude: '',
-        latitude: ''
-      },
-      showTipPopupFlag: false,
-      indicatorStyle: 'height: 68rpx;',
-      tipTitle: '',
-      tipImage: '',
-      isSubmit: false,
-      identity: 2,
+		return {
+			userId: null,
+			formData: loadedData || {
+				name: '',
+				contact_type: '1',
+				contact_name: '',
+				contact_phone: '',
+				backup_phone: '',
+				invite_code_other: '',
+				dependency: '',
+				address: '',
+				dependency_code: '',
+				dependency_province: '',
+				dependency_city: '',
+				longitude: '',
+				latitude: ''
+			},
+			showTipPopupFlag: false,
+			indicatorStyle: 'height: 68rpx;',
+			tipTitle: '',
+			tipImage: '',
+			isSubmit: false,
+			identity: 2,
 
-      ChinaCitys: ChinaCitys,
-      locatinCitys: [],
-      locationAreas: [],
-      locationValue: [0, 0, 0],
-      showLocationPopupFlag: false
-    }
-  },
-  computed: {
+			ChinaCitys: ChinaCitys,
+			locatinCitys: [],
+			locationAreas: [],
+			locationValue: [0, 0, 0],
+			showLocationPopupFlag: false,
+			// 抖动效果控制
+			shakeInviteError: false,
 
-  },
+			// 邀请码相关字段
+			inviteCodeValidating: false,
+			inviteCodeError: false,
+			inviterInfo: null,
+			currentValidatingCode: '',
+			inviteValidationTimer: null,
+		}
+	},
+	computed: {
 
-  watch: {
-    'formData.name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.contact_name'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.contact_phone'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.backup_phone'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.invite_code'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.dependency'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    },
-    'formData.address'(newVal) {
-      this.saveFormDataToLocalDebounce();
-    }
-  },
+	},
 
-  created() {
-    this.getUserInfo();
-    this.checkGlobalData();
-    this.setupAddressListener();
-  },
+	watch: {
+		'formData.name'(newVal) {
+			this.saveFormDataToLocalDebounce();
+		},
+		'formData.contact_name'(newVal) {
+			this.saveFormDataToLocalDebounce();
+		},
+		'formData.contact_phone'(newVal) {
+			this.saveFormDataToLocalDebounce();
+		},
+		'formData.backup_phone'(newVal) {
+			this.saveFormDataToLocalDebounce();
+		},
+		'formData.invite_code_other'(newVal) {
+			this.saveFormDataToLocalDebounce();
+		},
+		'formData.dependency'(newVal) {
+			this.saveFormDataToLocalDebounce();
+		},
+		'formData.address'(newVal) {
+			this.saveFormDataToLocalDebounce();
+		}
+	},
 
-  onShow() {
-    const localData = this.loadFormDataFromLocal();
-    if (localData) {
-      this.formData = {
-        ...this.formData,
-        ...localData
-      };
-    }
+	created() {
+		this.getUserInfo();
+		this.checkGlobalData();
+		this.setupAddressListener();
+	},
 
-    this.checkGlobalData();
-    this.checkAddressData();
-  },
+	onShow() {
+		const localData = this.loadFormDataFromLocal();
+		if (localData) {
+			this.formData = {
+				...this.formData,
+				...localData
+			};
+		}
 
-  onUnload() {
-    this.saveFormDataToLocal();
-  },
+		this.checkGlobalData();
+		this.checkAddressData();
 
-  beforeDestroy() {
-    if (this.addressListener) {
-      uni.$off('address-selected', this.addressListener);
-    }
-    if (this.sjAddressListener) {
-      uni.$off('address-selected-for-sj', this.sjAddressListener);
-    }
-  },
+		this.loadInviteStateFromLocal();
 
-  mounted() {
-    this.locatinCitys = this.ChinaCitys[0].citys;
-    this.locationAreas = this.locatinCitys[0].areas;
-  },
+		if (this.formData.invite_code_other) {
+			this.validateInviteCode(this.formData.invite_code_other);
+		}
+	},
 
-  onHide() {
-    this.saveFormDataToLocal();
-  },
+	onUnload() {
+		this.saveFormDataToLocal();
+	},
 
-  methods: {
-    checkGlobalData() {
-      if (getApp().globalData.qualificationData) {
-        this.formData = {
-          ...this.formData,
-          ...getApp().globalData.qualificationData
-        };
-        this.saveFormDataToLocal();
-        getApp().globalData.qualificationData = null;
-      }
-    },
+	beforeDestroy() {
+		if (this.addressListener) {
+			uni.$off('address-selected', this.addressListener);
+		}
+		if (this.sjAddressListener) {
+			uni.$off('address-selected-for-sj', this.sjAddressListener);
+		}
+	},
 
-    loadFormDataFromLocal() {
-      try {
-        const stored = uni.getStorageSync('qualification_form_data');
-        if (stored) {
-          console.log('从本地存储加载数据:', stored);
-          return stored;
-        }
-      } catch (e) {
-        console.log('读取本地存储失败:', e);
-      }
-      return null;
-    },
+	mounted() {
+		this.locatinCitys = this.ChinaCitys[0].citys;
+		this.locationAreas = this.locatinCitys[0].areas;
 
-    saveFormDataToLocalDebounce: debounce(function () {
-      this.saveFormDataToLocal();
-    }, 500),
+		if (this.formData.invite_code_other) {
+			this.validateInviteCode(this.formData.invite_code_other);
+		}
+	},
 
-    saveFormDataToLocal() {
-      try {
-        uni.setStorageSync('qualification_form_data', this.formData);
-        console.log('数据已保存到本地存储');
-      } catch (e) {
-        console.log('保存数据失败:', e);
-      }
-    },
+	onHide() {
+		this.saveFormDataToLocal();
+	},
 
-    clearFormDataLocal() {
-      try {
-        uni.removeStorageSync('qualification_form_data');
-        console.log('已清空本地存储数据');
-      } catch (e) {
-        console.log('清空数据失败:', e);
-      }
-    },
+	methods: {
+		loadInviteStateFromLocal() {
+			try {
+				const inviteState = uni.getStorageSync('store_invite_state');
+				if (inviteState) {
+					console.log('加载邀请码验证状态:', inviteState);
 
-    getUserInfo() {
-      return new Promise((resolve, reject) => {
-        request.post('/sj/user/getuser').then(result => {
-          if (result.state === 1) {
-            this.userId = result.data.id;
-            console.log('用户ID获取成功:', this.userId);
-            resolve(this.userId);
-          } else {
-            console.error('获取用户信息失败:', result.msg);
-            reject(result.msg);
-          }
-        }).catch(error => {
-          console.error('获取用户信息接口错误:', error);
-          reject(error);
-        });
-      });
-    },
+					// 恢复邀请码验证状态
+					this.inviterInfo = inviteState.inviterInfo || null;
+					this.inviteCodeError = inviteState.inviteCodeError || false;
+					this.currentValidatingCode = inviteState.currentValidatingCode || '';
 
-    getFormData() {
-      return { ...this.formData };
-    },
+					// 特殊处理：如果当前邀请码是13131313，确保状态正确
+					if (this.formData.invite_code_other === '13131313') {
+						console.log('检测到特殊邀请码13131313，重置验证状态');
+						this.inviteCodeError = false;
+						this.inviterInfo = null;
+						this.currentValidatingCode = '13131313';
+					}
 
-    saveFormData() {
-      if (!this.formData.name) {
-        uni.showToast({ title: '请输入店铺名称', icon: 'none' });
-        return false;
-      }
-      if (!this.formData.dependency) {
-        uni.showToast({ title: '请选择门店所在地', icon: 'none' });
-        return false;
-      }
-      if (!this.formData.address) {
-        uni.showToast({ title: '请选择门店详细地址', icon: 'none' });
-        return false;
-      }
-      if (!this.formData.contact_name) {
-        uni.showToast({ title: '请输入联系人', icon: 'none' });
-        return false;
-      }
-      if (!this.formData.contact_phone) {
-        uni.showToast({ title: '请输入联系人电话', icon: 'none' });
-        return false;
-      }
-      if (!/^1[3-9]\d{9}$/.test(this.formData.contact_phone)) {
-        uni.showToast({ title: '请输入正确的手机号码', icon: 'none' });
-        return false;
-      }
-      if (!this.formData.invite_code) {
-        uni.showToast({ title: '请输入邀请码', icon: 'none' });
-        return false;
-      }
-      this.saveFormDataToLocal();
-      return true;
-    },
+					// 如果正在验证的邀请码与当前表单中的一致，保持验证状态
+					if (this.currentValidatingCode === this.formData.invite_code_other) {
+						// 状态已恢复，无需额外操作
+					} else {
+						// 如果不一致，重新验证
+						if (this.formData.invite_code_other && this.formData.invite_code_other.trim() !== '') {
+							console.log('邀请码不一致，重新验证:', this.formData.invite_code_other);
+							this.handleInviteCodeInput({
+								detail: {
+									value: this.formData.invite_code_other
+								}
+							});
+						}
+					}
+				} else {
+					// 如果没有保存的状态，重置为初始状态
+					this.resetInviteCodeState();
+				}
+			} catch (e) {
+				console.log('加载邀请码验证状态失败:', e);
+				this.resetInviteCodeState();
+			}
+		},
 
-    setContactType(type) {
-      this.$set(this.formData, 'contact_type', type);
-      this.saveFormDataToLocal();
-    },
+		// 新增方法：重置邀请码状态
+		resetInviteCodeState() {
+			this.inviteCodeValidating = false;
+			this.inviteCodeError = false;
+			this.inviterInfo = null;
+			this.currentValidatingCode = '';
+			this.shakeInviteError = false;
+		},
 
-    showTipPopup(field) {
-      const tipConfig = {
-        'name': {
-          title: '如何找到店铺名称',
-          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
-        }
-      };
+		// 新增方法：专门保存邀请码验证状态
+		saveInviteStateToLocal() {
+			try {
+				const inviteState = {
+					inviterInfo: this.inviterInfo,
+					inviteCodeError: this.inviteCodeError,
+					currentValidatingCode: this.currentValidatingCode || this.formData.invite_code_other || ''
+				};
+				uni.setStorageSync('store_invite_state', inviteState);
 
-      if (tipConfig[field]) {
-        this.tipTitle = tipConfig[field].title;
-        this.tipImage = tipConfig[field].image;
-        this.showTipPopupFlag = true;
-      }
-    },
+				console.log('邀请码验证状态已保存:', {
+					hasInviterInfo: !!this.inviterInfo,
+					inviteCodeError: this.inviteCodeError,
+					currentValidatingCode: this.currentValidatingCode
+				});
+			} catch (e) {
+				console.log('保存邀请码验证状态失败:', e);
+			}
+		},
+		// 触发邀请码错误抖动效果
+		triggerInviteErrorShake() {
+			// 触发抖动效果
+			this.shakeInviteError = true;
 
-    hideTipPopup() {
-      this.showTipPopupFlag = false;
-    },
+			// 滚动到邀请码容器位置
+			this.$nextTick(() => {
+				// 使用uni.createSelectorQuery获取邀请码容器的位置
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.invite-code-container').boundingClientRect((rect) => {
+					if (rect) {
+						// 获取当前窗口高度
+						const windowHeight = uni.getSystemInfoSync().windowHeight;
 
-    showLocationPopup() {
-      this.showLocationPopupFlag = true;
-    },
+						// 判断邀请码容器是否已经在可视区域内
+						// 计算容器在屏幕中的位置比例（0-1之间）
+						const containerTopRatio = rect.top / windowHeight;
+						const containerBottomRatio = (rect.top + rect.height) / windowHeight;
 
-    hideLocationPopup() {
-      this.showLocationPopupFlag = false;
-    },
+						// 如果容器已经在屏幕中上部（顶部在屏幕中间以上），就不需要滚动
+						// 或者容器整体都在屏幕内，也不需要滚动
+						if (containerTopRatio >= 0 && containerTopRatio < 0.7 &&
+							containerBottomRatio <= 1) {
+							console.log('邀请码容器已在可视区域内，不需要滚动');
+							return;
+						}
 
-    bindChangeLocation(e) {
-      this.locationValue = e.detail.value;
-      let index1 = e.detail.value[0] || 0;
-      let index2 = e.detail.value[1] || 0;
-      this.locatinCitys = this.ChinaCitys[index1].citys;
-      this.locationAreas = this.locatinCitys[index2].areas;
-    },
+						// 滚动到邀请码容器位置，减去一些偏移量让用户体验更好
+						uni.pageScrollTo({
+							scrollTop: rect.top - 50,
+							duration: 300
+						});
+					}
+				}).exec();
+			});
 
-    confirmLocationSelect() {
-      let valueArr = this.locationValue;
-      let index1 = valueArr[0] || 0;
-      let index2 = valueArr[1] || 0;
-      let index3 = valueArr[2] || 0;
-      let province = this.ChinaCitys[index1].province;
-      let city = this.locatinCitys[index2].city;
-      let area = this.locationAreas[index3].area;
-      this.formData.dependency = province + '-' + city + '-' + area;
+			// 0.5秒后重置抖动状态
+			setTimeout(() => {
+				this.shakeInviteError = false;
+			}, 500);
+		},
 
-      this.formData.address = '';
-      this.formData.longitude = '';
-      this.formData.latitude = '';
+		// 处理邀请码输入
+		handleInviteCodeInput(e) {
+			const code = e.detail ? e.detail.value : this.formData.invite_code_other;
 
-      if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
-        let provinceCode = this.ChinaCitys[index1].code.toString();
-        this.formData.dependency_province = provinceCode.substring(0, 6);
-      }
-      if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
-        let cityCode = this.locatinCitys[index2].code.toString();
-        this.formData.dependency_city = cityCode.substring(0, 6);
-      }
-      if (this.locationAreas[index3] && this.locationAreas[index3].code) {
-        let areaCode = this.locationAreas[index3].code.toString();
-        this.formData.dependency_code = areaCode.substring(0, 6);
-      }
+			console.log('邀请码输入:', code);
 
-      this.saveFormDataToLocal();
-      this.hideLocationPopup();
-    },
+			// 立即重置状态
+			this.inviteCodeValidating = false;
+			this.inviteCodeError = false;
+			this.inviterInfo = null;
 
-    buildRegionTextForSearch() {
-      const dependency = String(this.formData.dependency || '').trim();
-      if (!dependency) return '';
+			// 如果邀请码为空，不进行验证
+			if (!code || code.trim() === '') {
+				this.formData.invite_code_other = '';
+				this.saveFormDataToLocalDebounce();
+				// 保存空状态
+				this.saveInviteStateToLocal();
+				return;
+			}
 
-      const parts = dependency.split('-');
-      const province = parts[0] || '';
-      const city = parts[1] || '';
-      const district = parts[2] || '';
+			this.formData.invite_code_other = code;
+			this.saveFormDataToLocalDebounce();
 
-      let regionText = '';
-      if (province) regionText += province;
-      if (city && city !== province) regionText += city;
-      if (district) regionText += district;
+			// 【关键修复】如果是13131313，立即通过验证并取消任何正在进行的验证
+			if (code === '13131313') {
+				console.log('检测到特殊邀请码13131313，立即通过');
 
-      return regionText;
-    },
+				// 清除任何可能的定时器
+				if (this.inviteValidationTimer) {
+					clearTimeout(this.inviteValidationTimer);
+					this.inviteValidationTimer = null;
+				}
 
-    getAddressValueForSearch() {
-      const rawAddress = String(this.formData.address || '').trim();
-      if (!rawAddress) return '';
+				// 立即更新状态
+				this.inviteCodeValidating = false;
+				this.inviteCodeError = false;
+				this.inviterInfo = null;
+				this.currentValidatingCode = code;
 
-      const dependencyText = String(this.formData.dependency || '').trim();
-      const regionText = this.buildRegionTextForSearch();
+				// 特殊邀请码也需要保存状态
+				const inviteState = {
+					inviterInfo: null,
+					inviteCodeError: false,
+					currentValidatingCode: code
+				};
+				uni.setStorageSync('store_invite_state', inviteState);
 
-      let detail = rawAddress;
+				// 强制更新视图
+				this.$forceUpdate();
+				return;
+			}
 
-      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();
-      }
+			// 记录当前正在验证的邀请码
+			this.currentValidatingCode = code;
 
-      detail = detail.replace(/^[\s,-]+/, '').trim();
+			// 立即保存状态（验证中）
+			this.saveInviteStateToLocal();
 
-      return detail || rawAddress;
-    },
+			// 清除之前的定时器
+			if (this.inviteValidationTimer) {
+				clearTimeout(this.inviteValidationTimer);
+				this.inviteValidationTimer = null;
+			}
 
-    getAddressInfo() {
-      this.saveFormDataToLocal();
+			// 设置新的定时器
+			this.inviteValidationTimer = setTimeout(() => {
+				// 检查邀请码是否变化
+				if (this.formData.invite_code_other !== this.currentValidatingCode) {
+					console.log('邀请码已变化，取消验证');
+					return;
+				}
 
-      const dependency = String(this.formData.dependency || '').trim();
-      const dependencyCode = String(this.formData.dependency_code || '').trim();
-      const address = this.getAddressValueForSearch();
-      const longitude = String(this.formData.longitude || '').trim();
-      const latitude = String(this.formData.latitude || '').trim();
+				// 再次检查是否是13131313（双重检查）
+				if (this.formData.invite_code_other === '13131313') {
+					console.log('双重检查：检测到特殊邀请码13131313');
+					this.inviteCodeValidating = false;
+					this.inviteCodeError = false;
+					this.inviterInfo = null;
+					this.currentValidatingCode = '13131313';
 
-      const hasDependency = !!dependency;
-      const hasAddress = !!address;
-      const hasLocation = !!(longitude && latitude);
+					const inviteState = {
+						inviterInfo: null,
+						inviteCodeError: false,
+						currentValidatingCode: '13131313'
+					};
+					uni.setStorageSync('store_invite_state', inviteState);
+					return;
+				}
 
-      let params = 'source=sj_info';
+				console.log('开始验证邀请码:', this.formData.invite_code_other);
+				this.validateInviteCode(this.formData.invite_code_other);
 
-      if (hasDependency) {
-        params += `&dependency=${encodeURIComponent(dependency)}`;
-        if (dependencyCode) {
-          params += `&dependency_code=${dependencyCode}`;
-        }
-      }
+				// 清理定时器
+				this.inviteValidationTimer = null;
+			}, 600); // 适当增加延迟时间
+		},
 
-      if (hasAddress) {
-        params += `&address=${encodeURIComponent(address)}`;
-      }
+		// 验证邀请码
+		async validateInviteCode(code) {
+			console.log('开始验证邀请码:', code);
 
-      if (hasLocation) {
-        params += `&longitude=${longitude}&latitude=${latitude}`;
-      }
+			// 特殊邀请码13131313直接通过
+			if (code === '13131313') {
+				console.log('特殊邀请码13131313，直接通过');
+				this.inviteCodeValidating = false;
+				this.inviteCodeError = false;
+				this.inviterInfo = null;
+				this.currentValidatingCode = code;
+				// 特殊邀请码也需要保存状态
+				const inviteState = {
+					inviterInfo: null,
+					inviteCodeError: false,
+					currentValidatingCode: code
+				};
+				uni.setStorageSync('store_invite_state', inviteState);
 
-      if (!hasDependency && !hasAddress && !hasLocation) {
-        params += '&init_current_location=1&silent_locate=1';
-      }
+				// 强制更新视图
+				this.$forceUpdate();
+				return;
+			}
 
-      uni.navigateTo({
-        url: `/pages/address/search?${params}`
-      });
-    },
+			// 如果邀请码为空
+			if (!code || code.trim() === '') {
+				this.inviteCodeValidating = false;
+				this.inviteCodeError = false;
+				this.inviterInfo = null;
+				this.currentValidatingCode = '';
+				const inviteState = {
+					inviterInfo: null,
+					inviteCodeError: false,
+					currentValidatingCode: ''
+				};
+				uni.setStorageSync('store_invite_state', inviteState);
+				return;
+			}
 
-    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);
-    },
+			// 设置验证中状态
+			this.inviteCodeValidating = true;
+			this.inviteCodeError = false;
+			this.inviterInfo = null;
+			this.currentValidatingCode = code;
 
-    checkAddressData() {
-      try {
-        const storedAddress = uni.getStorageSync('sj_selected_address');
-        if (storedAddress) {
-          this.handleAddressSelected(storedAddress);
-          uni.removeStorageSync('sj_selected_address');
-          return;
-        }
-      } catch (e) { }
+			try {
+				// 调用接口验证邀请码
+				const response = await request.post('/user/user/getInvite', {
+					invite_code: code
+				});
 
-      if (getApp().globalData && getApp().globalData.selectedAddress) {
-        this.handleAddressSelected(getApp().globalData.selectedAddress);
-        delete getApp().globalData.selectedAddress;
-      }
+				console.log('邀请码验证响应:', response);
 
-      try {
-        const selectedAddress = uni.getStorageSync('selectedAddress');
-        if (selectedAddress) {
-          this.handleAddressSelected(selectedAddress);
-          uni.removeStorageSync('selectedAddress');
-        }
-      } catch (e) { }
-    },
+				// 验证完成
+				this.inviteCodeValidating = false;
 
-    handleAddressSelected(addressData) {
-      if (!addressData) return;
+				if (response && (response.state === 1 || response.code === 200) && response.data) {
+					const userData = response.data;
 
-      let detailAddress = '';
-      if (addressData.address) {
-        detailAddress = String(addressData.address).trim();
-      } else if (addressData.name) {
-        detailAddress = String(addressData.name).trim();
+					if (userData.account) {
+						// 邀请码有效，保存邀请人信息
+						this.inviterInfo = userData;
+						this.inviteCodeError = false;
+						console.log('邀请码验证通过，邀请人:', userData);
+					} else {
+						// 接口返回数据但没有account字段，说明不是有效邀请人
+						console.log('接口返回数据无效，没有account字段:', userData);
+						this.inviterInfo = null;
+						this.inviteCodeError = true;
+					}
+				} else {
+					// 接口返回错误或数据为空
+					console.log('接口返回错误:', response?.msg || '未知错误');
+					this.inviterInfo = null;
+					this.inviteCodeError = true;
+				}
+			} catch (error) {
+				console.error('验证邀请码失败:', error);
+				this.inviteCodeValidating = false;
+				this.inviteCodeError = true;
+				this.inviterInfo = null;
+			} finally {
+				// 无论成功失败都保存状态
+				const inviteState = {
+					inviterInfo: this.inviterInfo,
+					inviteCodeError: this.inviteCodeError,
+					currentValidatingCode: this.currentValidatingCode
+				};
+				uni.setStorageSync('store_invite_state', inviteState);
+			}
+		},
+		checkGlobalData() {
+			if (getApp().globalData.qualificationData) {
+				this.formData = {
+					...this.formData,
+					...getApp().globalData.qualificationData
+				};
+				this.saveFormDataToLocal();
+				getApp().globalData.qualificationData = null;
+			}
+		},
 
-        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);
+		loadFormDataFromLocal() {
+			try {
+				const stored = uni.getStorageSync('qualification_form_data');
+				if (stored) {
+					console.log('从本地存储加载数据:', stored);
 
-        const regionText = regionParts.join('');
+					const inviteState = uni.getStorageSync('store_invite_state');
+					if (inviteState) {
+						this.inviterInfo = inviteState.inviterInfo;
+						this.inviteCodeError = inviteState.inviteCodeError || false;
+						this.currentValidatingCode = inviteState.currentValidatingCode || '';
+						console.log('加载邀请码验证状态:', inviteState);
+					}
 
-        if (regionText && detailAddress.indexOf(regionText) === 0) {
-          detailAddress = detailAddress.slice(regionText.length).trim();
-        }
+					return stored;
+				}
+			} catch (e) {
+				console.log('读取本地存储失败:', e);
+			}
+			return null;
+		},
 
-        detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
-      }
+		saveFormDataToLocalDebounce: debounce(function () {
+			this.saveFormDataToLocal();
+		}, 500),
 
-      this.formData.address = detailAddress;
+		saveFormDataToLocal() {
+			try {
+				uni.setStorageSync('qualification_form_data', this.formData);
 
-      if (addressData.location) {
-        const [longitude, latitude] = String(addressData.location).split(',');
-        this.formData.longitude = longitude || '';
-        this.formData.latitude = latitude || '';
-      }
+				const inviteState = {
+					inviterInfo: this.inviterInfo,
+					inviteCodeError: this.inviteCodeError,
+					currentValidatingCode: this.currentValidatingCode
+				};
+				uni.setStorageSync('store_invite_state', inviteState);
+				console.log('数据已保存到本地存储');
+			} catch (e) {
+				console.log('保存数据失败:', e);
+			}
+		},
 
-      if (addressData.pname || addressData.cityname || addressData.adname) {
-        const locationParts = [];
-        if (addressData.pname) locationParts.push(addressData.pname);
-        if (addressData.cityname) locationParts.push(addressData.cityname);
-        if (addressData.adname) locationParts.push(addressData.adname);
-        this.formData.dependency = locationParts.join('-');
-      }
+		clearFormDataLocal() {
+			try {
+				uni.removeStorageSync('qualification_form_data');
+				console.log('已清空本地存储数据');
+			} catch (e) {
+				console.log('清空数据失败:', e);
+			}
+		},
 
-      this.formData.dependency_province = addressData.provinceCode || '';
-      this.formData.dependency_city = addressData.cityCode || '';
-      this.formData.dependency_code = addressData.districtCode || '';
+		getUserInfo() {
+			return new Promise((resolve, reject) => {
+				request.post('/sj/user/getuser').then(result => {
+					if (result.state === 1) {
+						this.userId = result.data.id;
+						console.log('用户ID获取成功:', this.userId);
+						resolve(this.userId);
+					} else {
+						console.error('获取用户信息失败:', result.msg);
+						reject(result.msg);
+					}
+				}).catch(error => {
+					console.error('获取用户信息接口错误:', error);
+					reject(error);
+				});
+			});
+		},
 
-      this.saveFormDataToLocal();
-      this.$forceUpdate();
-    }
-  }
+		getFormData() {
+			return {
+				...this.formData
+			};
+		},
+
+		saveFormData() {
+			if (!this.formData.name) {
+				uni.showToast({
+					title: '请输入店铺名称',
+					icon: 'none'
+				});
+				return false;
+			}
+			if (!this.formData.dependency) {
+				uni.showToast({
+					title: '请选择门店所在地',
+					icon: 'none'
+				});
+				return false;
+			}
+			if (!this.formData.address) {
+				uni.showToast({
+					title: '请选择门店详细地址',
+					icon: 'none'
+				});
+				return false;
+			}
+			if (!this.formData.contact_name) {
+				uni.showToast({
+					title: '请输入联系人',
+					icon: 'none'
+				});
+				return false;
+			}
+			if (!this.formData.contact_phone) {
+				uni.showToast({
+					title: '请输入联系人电话',
+					icon: 'none'
+				});
+				return false;
+			}
+			if (!/^1[3-9]\d{9}$/.test(this.formData.contact_phone)) {
+				uni.showToast({
+					title: '请输入正确的手机号码',
+					icon: 'none'
+				});
+				return false;
+			}
+			if (!this.formData.invite_code) {
+				uni.showToast({
+					title: '请输入邀请码',
+					icon: 'none'
+				});
+				return false;
+			}
+			this.saveFormDataToLocal();
+			return true;
+		},
+
+		setContactType(type) {
+			this.$set(this.formData, 'contact_type', type);
+			this.saveFormDataToLocal();
+		},
+
+		showTipPopup(field) {
+			const tipConfig = {
+				'name': {
+					title: '如何找到店铺名称',
+					image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
+				}
+			};
+
+			if (tipConfig[field]) {
+				this.tipTitle = tipConfig[field].title;
+				this.tipImage = tipConfig[field].image;
+				this.showTipPopupFlag = true;
+			}
+		},
+
+		hideTipPopup() {
+			this.showTipPopupFlag = false;
+		},
+
+		showLocationPopup() {
+			this.showLocationPopupFlag = true;
+		},
+
+		hideLocationPopup() {
+			this.showLocationPopupFlag = false;
+		},
+
+		bindChangeLocation(e) {
+			this.locationValue = e.detail.value;
+			let index1 = e.detail.value[0] || 0;
+			let index2 = e.detail.value[1] || 0;
+			this.locatinCitys = this.ChinaCitys[index1].citys;
+			this.locationAreas = this.locatinCitys[index2].areas;
+		},
+
+		confirmLocationSelect() {
+			let valueArr = this.locationValue;
+			let index1 = valueArr[0] || 0;
+			let index2 = valueArr[1] || 0;
+			let index3 = valueArr[2] || 0;
+			let province = this.ChinaCitys[index1].province;
+			let city = this.locatinCitys[index2].city;
+			let area = this.locationAreas[index3].area;
+			this.formData.dependency = province + '-' + city + '-' + area;
+
+			this.formData.address = '';
+			this.formData.longitude = '';
+			this.formData.latitude = '';
+
+			if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+				let provinceCode = this.ChinaCitys[index1].code.toString();
+				this.formData.dependency_province = provinceCode.substring(0, 6);
+			}
+			if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
+				let cityCode = this.locatinCitys[index2].code.toString();
+				this.formData.dependency_city = cityCode.substring(0, 6);
+			}
+			if (this.locationAreas[index3] && this.locationAreas[index3].code) {
+				let areaCode = this.locationAreas[index3].code.toString();
+				this.formData.dependency_code = areaCode.substring(0, 6);
+			}
+
+			this.saveFormDataToLocal();
+			this.hideLocationPopup();
+		},
+
+		buildRegionTextForSearch() {
+			const dependency = String(this.formData.dependency || '').trim();
+			if (!dependency) return '';
+
+			const parts = dependency.split('-');
+			const province = parts[0] || '';
+			const city = parts[1] || '';
+			const district = parts[2] || '';
+
+			let regionText = '';
+			if (province) regionText += province;
+			if (city && city !== province) regionText += city;
+			if (district) regionText += district;
+
+			return regionText;
+		},
+
+		getAddressValueForSearch() {
+			const rawAddress = String(this.formData.address || '').trim();
+			if (!rawAddress) return '';
+
+			const dependencyText = String(this.formData.dependency || '').trim();
+			const regionText = this.buildRegionTextForSearch();
+
+			let detail = rawAddress;
+
+			if (regionText && detail.indexOf(regionText) === 0) {
+				detail = detail.slice(regionText.length).trim();
+			} else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+				detail = detail.slice(dependencyText.length).trim();
+			}
+
+			detail = detail.replace(/^[\s,-]+/, '').trim();
+
+			return detail || rawAddress;
+		},
+
+		getAddressInfo() {
+			this.saveFormDataToLocal();
+
+			const dependency = String(this.formData.dependency || '').trim();
+			const dependencyCode = String(this.formData.dependency_code || '').trim();
+			const address = this.getAddressValueForSearch();
+			const longitude = String(this.formData.longitude || '').trim();
+			const latitude = String(this.formData.latitude || '').trim();
+
+			const hasDependency = !!dependency;
+			const hasAddress = !!address;
+			const hasLocation = !!(longitude && latitude);
+
+			let params = 'source=sj_info';
+
+			if (hasDependency) {
+				params += `&dependency=${encodeURIComponent(dependency)}`;
+				if (dependencyCode) {
+					params += `&dependency_code=${dependencyCode}`;
+				}
+			}
+
+			if (hasAddress) {
+				params += `&address=${encodeURIComponent(address)}`;
+			}
+
+			if (hasLocation) {
+				params += `&longitude=${longitude}&latitude=${latitude}`;
+			}
+
+			if (!hasDependency && !hasAddress && !hasLocation) {
+				params += '&init_current_location=1&silent_locate=1';
+			}
+
+			uni.navigateTo({
+				url: `/pages/address/search?${params}`
+			});
+		},
+
+		setupAddressListener() {
+			this.addressListener = (addressData) => {
+				this.handleAddressSelected(addressData);
+			};
+			this.sjAddressListener = (addressData) => {
+				this.handleAddressSelected(addressData);
+			};
+			uni.$on('address-selected', this.addressListener);
+			uni.$on('address-selected-for-sj', this.sjAddressListener);
+		},
+
+		checkAddressData() {
+			try {
+				const storedAddress = uni.getStorageSync('sj_selected_address');
+				if (storedAddress) {
+					this.handleAddressSelected(storedAddress);
+					uni.removeStorageSync('sj_selected_address');
+					return;
+				}
+			} catch (e) { }
+
+			if (getApp().globalData && getApp().globalData.selectedAddress) {
+				this.handleAddressSelected(getApp().globalData.selectedAddress);
+				delete getApp().globalData.selectedAddress;
+			}
+
+			try {
+				const selectedAddress = uni.getStorageSync('selectedAddress');
+				if (selectedAddress) {
+					this.handleAddressSelected(selectedAddress);
+					uni.removeStorageSync('selectedAddress');
+				}
+			} catch (e) { }
+		},
+
+		handleAddressSelected(addressData) {
+			if (!addressData) return;
+
+			let detailAddress = '';
+			if (addressData.address) {
+				detailAddress = String(addressData.address).trim();
+			} else if (addressData.name) {
+				detailAddress = String(addressData.name).trim();
+
+				const regionParts = [];
+				if (addressData.pname) regionParts.push(addressData.pname);
+				if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData
+					.cityname);
+				if (addressData.adname) regionParts.push(addressData.adname);
+
+				const regionText = regionParts.join('');
+
+				if (regionText && detailAddress.indexOf(regionText) === 0) {
+					detailAddress = detailAddress.slice(regionText.length).trim();
+				}
+
+				detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
+			}
+
+			this.formData.address = detailAddress;
+
+			if (addressData.location) {
+				const [longitude, latitude] = String(addressData.location).split(',');
+				this.formData.longitude = longitude || '';
+				this.formData.latitude = latitude || '';
+			}
+
+			if (addressData.pname || addressData.cityname || addressData.adname) {
+				const locationParts = [];
+				if (addressData.pname) locationParts.push(addressData.pname);
+				if (addressData.cityname) locationParts.push(addressData.cityname);
+				if (addressData.adname) locationParts.push(addressData.adname);
+				this.formData.dependency = locationParts.join('-');
+			}
+
+			this.formData.dependency_province = addressData.provinceCode || '';
+			this.formData.dependency_city = addressData.cityCode || '';
+			this.formData.dependency_code = addressData.districtCode || '';
+
+			this.saveFormDataToLocal();
+			this.$forceUpdate();
+		}
+	}
 }
 </script>
 
@@ -609,394 +1006,448 @@ export default {
 .qualification-page {}
 
 .section {
-  margin-bottom: 30rpx;
+	margin-bottom: 30rpx;
 }
 
 .section-title {
-  display: flex;
-  align-items: center;
-  margin-bottom: 30rpx;
+	display: flex;
+	align-items: center;
+	margin-bottom: 30rpx;
 }
 
 .title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 7rpx;
-  border-radius: 5rpx;
+	width: 6rpx;
+	height: 30rpx;
+	background-color: #E8101E;
+	margin-right: 7rpx;
+	border-radius: 5rpx;
 }
 
 .title-text {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #1D2129;
-  line-height: 48rpx;
-  text-align: left;
-  font-style: normal;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 500;
+	font-size: 32rpx;
+	color: #1D2129;
+	line-height: 48rpx;
+	text-align: left;
+	font-style: normal;
 }
 
 .section-title text {
-  font-size: 36rpx;
-  color: #1D2129;
-  font-weight: 500;
+	font-size: 36rpx;
+	color: #1D2129;
+	font-weight: 500;
 }
 
 .box-cont {
-  background: #FFFFFF;
-  border-radius: 20rpx;
-  margin-bottom: 24rpx;
-  margin-left: 8rpx;
-  margin-right: 8rpx;
-  box-shadow: none;
+	background: #FFFFFF;
+	border-radius: 20rpx;
+	margin-bottom: 24rpx;
+	margin-left: 8rpx;
+	margin-right: 8rpx;
+	box-shadow: none;
 }
 
 .form-item {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 24rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 24rpx;
 }
 
 .form-item-one {
-  display: flex;
-  align-items: center;
-  padding: 24rpx;
+	display: flex;
+	align-items: center;
+	padding: 24rpx;
 }
 
 .form-item-two {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 24rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 24rpx;
 }
 
 .form-item-two>text.label {
-  flex-shrink: 0;
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
+	flex-shrink: 0;
+	font-size: 28rpx;
+	color: #333333;
+	font-weight: 500;
+}
+
+.invite-code-top {
+	display: flex;
+	align-items: center;
+	padding: 24rpx;
+	width: 100%;
+	box-sizing: border-box;
 }
 
 .label-wrapper {
-  display: inline-flex;
-  align-items: center;
+	display: inline-flex;
+	align-items: center;
 }
 
 .label {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-  line-height: 1;
+	font-size: 28rpx;
+	color: #333333;
+	font-weight: 500;
+	line-height: 1;
 }
 
 .label-icon {
-  width: 26rpx;
-  height: 26rpx;
-  margin-left: 8rpx;
-  align-items: center;
+	width: 26rpx;
+	height: 26rpx;
+	margin-left: 8rpx;
+	align-items: center;
 }
 
 .required::before {
-  content: '*';
-  color: #FF0000;
-  margin-right: 4rpx;
+	content: '*';
+	color: #FF0000;
+	margin-right: 4rpx;
 }
 
 .picker-content {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+	flex: 1;
 }
 
 .picker-content text {
-  margin-right: 19rpx;
+	margin-right: 19rpx;
 }
 
 .arrow-right {
-  width: 14rpx;
-  height: 26rpx;
+	width: 14rpx;
+	height: 26rpx;
 }
 
 .placeholder {
-  color: #999999;
-  font-size: 28rpx;
+	color: #999999;
+	font-size: 28rpx;
 }
 
 .picker-value {
-  font-size: 28rpx;
-  color: #333333;
+	font-size: 28rpx;
+	color: #333333;
 }
 
 .input {
-  flex: 1;
-  font-size: 28rpx;
-  color: #333333;
-  text-align: right;
-  margin-left: 20rpx;
+	flex: 1;
+	font-size: 28rpx;
+	color: #333333;
+	text-align: right;
+	margin-left: 20rpx;
 }
 
 .radio-group {
-  display: flex;
+	display: flex;
 }
 
 .radio-item {
-  display: flex;
-  align-items: center;
-  margin-right: 130rpx;
+	display: flex;
+	align-items: center;
+	margin-right: 130rpx;
 }
 
 .radio {
-  width: 30rpx;
-  height: 30rpx;
-  border: 2rpx solid #DDDDDD;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 16rpx;
+	width: 30rpx;
+	height: 30rpx;
+	border: 2rpx solid #DDDDDD;
+	border-radius: 50%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-right: 16rpx;
 }
 
 .radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+	background-color: #E8101E;
+	border-color: #E8101E;
 }
 
 .radio-icon-image {
-  width: 32rpx;
-  height: 32rpx;
+	width: 32rpx;
+	height: 32rpx;
 }
 
 .radio-label {
-  font-size: 28rpx;
-  color: #333333;
+	font-size: 28rpx;
+	color: #333333;
 }
 
 .invite-tip {
-  padding: 24rpx;
+	padding: 24rpx;
 }
 
 .invite-tip-text {
-  font-size: 26rpx;
-  color: #999999;
-  line-height: 40rpx;
+	font-size: 26rpx;
+	color: #999999;
+	line-height: 40rpx;
 }
 
 .popup {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 999;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 999;
+	visibility: hidden;
+	opacity: 0;
+	transition: all 0.3s ease;
 }
 
 .popup.show {
-  visibility: visible;
-  opacity: 1;
+	visibility: visible;
+	opacity: 1;
 }
 
 .popup-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
 }
 
 .popup-content {
-  position: relative;
-  background-color: #FFFFFF;
-  border-radius: 24rpx 24rpx 0 0;
-  padding: 32rpx;
-  transform: translateY(100%);
-  transition: transform 0.3s ease;
-  max-height: 70vh;
+	position: relative;
+	background-color: #FFFFFF;
+	border-radius: 24rpx 24rpx 0 0;
+	padding: 32rpx;
+	transform: translateY(100%);
+	transition: transform 0.3s ease;
+	max-height: 70vh;
 }
 
 .popup.show .popup-content {
-  transform: translateY(0);
+	transform: translateY(0);
 }
 
 .popup-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 32rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 32rpx;
 }
 
 .popup-title {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
+	font-size: 32rpx;
+	color: #333333;
+	font-weight: 500;
 }
 
 .popup-close {
-  font-size: 40rpx;
-  color: #999999;
-  padding: 16rpx;
+	font-size: 40rpx;
+	color: #999999;
+	padding: 16rpx;
 }
 
 .popup-footer {
-  margin-top: 32rpx;
-  display: flex;
-  justify-content: space-between;
-  gap: 20rpx;
-  padding: 0 24rpx 24rpx;
+	margin-top: 32rpx;
+	display: flex;
+	justify-content: space-between;
+	gap: 20rpx;
+	padding: 0 24rpx 24rpx;
 }
 
 .popup-btn {
-  flex: 1;
-  height: 88rpx;
-  border-radius: 44rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+	flex: 1;
+	height: 88rpx;
+	border-radius: 44rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
 }
 
 .popup-btn.cancel {
-  background-color: #F5F5F5;
+	background-color: #F5F5F5;
 }
 
 .popup-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+	background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
 }
 
 .popup-btn .btn-text {
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #FFFFFF;
+	font-size: 32rpx;
+	font-weight: 500;
+	color: #FFFFFF;
 }
 
 .popup-btn.cancel .btn-text {
-  color: #666666;
+	color: #666666;
 }
 
 .popup-btn.confirm .btn-text {
-  color: #FFFFFF;
+	color: #FFFFFF;
 }
 
 .region-body {
-  height: 400rpx;
+	height: 400rpx;
 }
 
 .picker-scroll {
-  height: 400rpx;
+	height: 400rpx;
 }
 
 .picker-item {
-  height: 68rpx;
-  line-height: 68rpx;
-  text-align: center;
-  font-size: 28rpx;
+	height: 68rpx;
+	line-height: 68rpx;
+	text-align: center;
+	font-size: 28rpx;
 }
 
 .tip-popup {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 1000;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  visibility: hidden;
-  opacity: 0;
-  transition: all 0.3s ease;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 1000;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	visibility: hidden;
+	opacity: 0;
+	transition: all 0.3s ease;
 }
 
 .tip-popup.show {
-  visibility: visible;
-  opacity: 1;
+	visibility: visible;
+	opacity: 1;
 }
 
 .tip-popup-mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
 }
 
 .tip-popup-content {
-  position: relative;
-  width: 620rpx;
-  height: 810rpx;
+	position: relative;
+	width: 620rpx;
+	height: 810rpx;
 }
 
 .tip-popup-bg {
-  width: 620rpx;
-  height: 810rpx;
-  position: absolute;
-  top: 0;
-  left: 0;
+	width: 620rpx;
+	height: 810rpx;
+	position: absolute;
+	top: 0;
+	left: 0;
 }
 
 .tip-popup-body {
-  position: relative;
-  flex-direction: column;
-  padding: 80rpx 20rpx 40rpx 20rpx;
-  box-sizing: border-box;
+	position: relative;
+	flex-direction: column;
+	padding: 80rpx 20rpx 40rpx 20rpx;
+	box-sizing: border-box;
 }
 
 .tip-title {
-  font-size: 36rpx;
-  font-weight: bold;
-  color: #333;
-  text-align: center;
-  margin-top: 107rpx;
-  margin-bottom: 37rpx;
+	font-size: 36rpx;
+	font-weight: bold;
+	color: #333;
+	text-align: center;
+	margin-top: 107rpx;
+	margin-bottom: 37rpx;
 }
 
 .tip-image-container {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 50rpx;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 50rpx;
 }
 
 .tip-image {
-  width: 90%;
-  max-height: 400rpx;
+	width: 90%;
+	max-height: 400rpx;
 }
 
 .tip-buttons {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 28rpx;
+	display: flex;
+	justify-content: space-between;
+	padding: 0 28rpx;
 }
 
 .tip-btn {
-  width: 250rpx;
-  height: 80rpx;
-  border-radius: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 32rpx;
-  font-weight: 500;
+	width: 250rpx;
+	height: 80rpx;
+	border-radius: 40rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 32rpx;
+	font-weight: 500;
 }
 
 .tip-btn.cancel {
-  border: #E8101E 2rpx solid;
-  background-color: transparent;
-  color: #e8101e;
+	border: #E8101E 2rpx solid;
+	background-color: transparent;
+	color: #e8101e;
 }
 
 .tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-  color: #FFFFFF;
+	background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+	color: #FFFFFF;
 }
 
 .tip-btn .btn-text {
-  color: inherit;
+	color: inherit;
 }
-</style>
+
+.invite-info-container {
+	padding: 20rpx 24rpx;
+	width: 100%;
+	box-sizing: border-box;
+	min-height: 60rpx;
+}
+
+.invite-tip {
+	font-size: 24rpx;
+	color: #666666;
+}
+
+.invite-validating {
+	font-size: 20rpx;
+	color: #999999;
+}
+
+.invite-error {
+	font-size: 24rpx;
+	color: #E8101E;
+}
+
+.inviter-info {
+	display: flex;
+	align-items: center;
+	font-size: 20rpx;
+}
+
+.inviter-label {
+	color: #666666;
+}
+
+.inviter-name {
+	color: #333333;
+	font-weight: 500;
+}
+
+.inviter-divider {
+	color: #666666;
+	margin: 0 5rpx;
+}
+
+.inviter-phone {
+	color: #666666;
+}
+</style>
\ No newline at end of file

From fa17e04f3090a7d678e525026d10cf67b874c909 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 17:21:44 +0800
Subject: [PATCH 065/118] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/qualification_sj.vue | 17 +++++++++++------
 pages/ruzhu/ruzhu.vue            |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue
index 23a90f2..62c54c1 100644
--- a/pages/ruzhu/qualification_sj.vue
+++ b/pages/ruzhu/qualification_sj.vue
@@ -9,6 +9,9 @@
 			<view class="form-item-one box-cont">
 				<view class="label-wrapper">
 					<text class="label required">店铺名称</text>
+					<image class="label-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+						mode="aspectFit" @click="showTipPopup('name')"></image>
 				</view>
 				<input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" placeholder-class="placeholder"
 					class="input" @input="saveFormDataToLocalDebounce" />
@@ -87,7 +90,7 @@
 		<view class="form-item-one-yqr box-cont invite-code-container">
 			<view class="invite-code-top">
 				<view class="label-wrapper">
-					<text class="label required" >邀请码</text>
+					<text class="label required">邀请码</text>
 				</view>
 				<input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码"
 					placeholder-class="placeholder" class="input" @input="handleInviteCodeInput" />
@@ -181,7 +184,7 @@
 				<view class="tip-popup-body">
 					<view class="tip-title">{{ tipTitle }}</view>
 					<view class="tip-image-container">
-						<image class="tip-image" :src="tipImage" mode="widthFix"></image>
+						<image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
 					</view>
 					<view class="tip-buttons">
 						<view class="tip-btn cancel" @click="hideTipPopup">
@@ -229,6 +232,7 @@ export default {
 			indicatorStyle: 'height: 68rpx;',
 			tipTitle: '',
 			tipImage: '',
+			currentTipType: '',
 			isSubmit: false,
 			identity: 2,
 
@@ -586,7 +590,7 @@ export default {
 			try {
 				// 调用接口验证邀请码
 				const response = await request.post('/user/user/getInvite', {
-					invite_code: code
+					invite_code_other: code
 				});
 
 				console.log('邀请码验证响应:', response);
@@ -758,7 +762,7 @@ export default {
 				});
 				return false;
 			}
-			if (!this.formData.invite_code) {
+			if (!this.formData.invite_code_other) {
 				uni.showToast({
 					title: '请输入邀请码',
 					icon: 'none'
@@ -777,12 +781,13 @@ export default {
 		showTipPopup(field) {
 			const tipConfig = {
 				'name': {
-					title: '如何找到店铺名称',
-					image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030'
+					title: '如何查看店铺名称',
+					image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
 				}
 			};
 
 			if (tipConfig[field]) {
+				this.currentTipType = field;
 				this.tipTitle = tipConfig[field].title;
 				this.tipImage = tipConfig[field].image;
 				this.showTipPopupFlag = true;
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index aa64e95..8caea0d 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -416,8 +416,8 @@
 				if (qualificationData.contact_type) {
 					formData.contact_type = qualificationData.contact_type;
 				}
-				if (qualificationData.invite_code) {
-					formData.invite_code_other = qualificationData.invite_code;
+				if (qualificationData.invite_code_other) {
+					formData.invite_code_other = qualificationData.invite_code_other;
 				}
 				if (qualificationData.contact_name) {
 					formData.contact_name = qualificationData.contact_name;

From d6bae3034b1da94170889af82faf153cd3af678c Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Mon, 1 Jun 2026 17:21:51 +0800
Subject: [PATCH 066/118] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 110 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 89 insertions(+), 21 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5a3ba8f..453d470 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -53,14 +53,16 @@
 
             <view class="missing-item" v-if="!isCertified">
               <view class="item-left">
-                <image class="item-icon" :src="userInfo.id_type === -1 ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'"></image>
+                <image class="item-icon" :src="isUnderReview ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'"></image>
                 <view class="item-texts">
-                  <text class="item-title">{{ userInfo.id_type === -1 ? '资质认证中' : '资质未认证' }}</text>
+                  <!-- 只有在审核中时赋予蓝色样式 blue-text -->
+                  <text class="item-title" :class="{'blue-text': isUnderReview}">{{ isUnderReview ? '资质认证中' : '资质未认证' }}</text>
                   <text class="item-desc">请完成资质认证</text>
                 </view>
               </view>
-              <view class="item-right" :class="userInfo.id_type === -1 ? 'grey' : 'orange'" @tap="goToAuth">
-                {{ userInfo.id_type === -1 ? '查看进度' : '去认证' }}
+              <!-- 只有在审核中时为灰色，其余未认证状态为浅绿色 light-green -->
+              <view class="item-right" :class="isUnderReview ? 'grey' : 'light-green'" @tap="goToAuth">
+                {{ isUnderReview ? '查看进度' : '去认证' }}
               </view>
             </view>
           </view>
@@ -81,14 +83,14 @@
       </view>
     </view>
 
-    <view class="quick-actions card-box" v-if="isLogin && isSettled">
+    <view class="quick-actions card-box" v-if="isLogin && isCertified">
       <view class="action-item" v-for="(item, index) in quickActions" :key="index" @tap="handleQuickAction(item)">
         <image class="action-icon" :src="item.icon"></image>
         <text class="action-text">{{ item.name }}</text>
       </view>
     </view>
 
-    <view class="order-stats-basic card-box" v-if="isLogin && isSettled">
+    <view class="order-stats-basic card-box" v-if="isLogin && isCertified">
       <view class="card-header">
         <view class="header-left">
           <text class="title">接单管理</text>
@@ -113,7 +115,7 @@
       </view>
     </view>
 
-    <view class="order-stats-detail card-box" v-if="isLogin && isSettled">
+    <view class="order-stats-detail card-box" v-if="isLogin && isCertified">
       <view class="card-header">
         <view class="header-left">
           <text class="title">当日实时数据</text>
@@ -247,14 +249,30 @@ export default {
     };
   },
   computed: {
+    // 依靠后端实际返回的资料详情来判断是否真的提交过申请，而不是无脑信 id_type: -1
+    isUnderReview() {
+      if (!this.isLogin) return false;
+      // 只要拿到了具体的入驻详情数据对象（比如填了各种地址、执照等，内容肯定不为空），就说明填过表了
+      if (this.authDetails && Object.keys(this.authDetails).length > 0) {
+        // 如果后端是用特定的状态值判断，比如 this.authDetails.state === 0，你可以自己加 && 后面
+        return true; 
+      }
+      return false; // 啥也没返回，说明只是刚注册没填资料
+    },
+
     // 判断是否具备接单的大前提条件
     canOpenStore() {
       return this.hasBusinessTime && this.hasServiceSkill && this.isCertified;
     },
     // 修复：使用 authDetails 里的真实接口返回字段判定服务技能
     hasServiceSkill() {
-      // 只要 authDetails 里拿到了后端的 servers_kill 且该数组有内容，就说明配置过了
-      return this.authDetails && Array.isArray(this.authDetails.servers_kill) && this.authDetails.servers_kill.length > 0;
+      // 检查 userInfo 中是否有值
+      const fromUser = this.userInfo && Array.isArray(this.userInfo.servers_kill) && this.userInfo.servers_kill.length > 0;
+      // 检查 authDetails 中是否有值
+      const fromAuth = this.authDetails && Array.isArray(this.authDetails.servers_kill) && this.authDetails.servers_kill.length > 0;
+      
+      // 只要有一边配了，就算已配置
+      return this.isLogin && (fromUser || fromAuth);
     },
     
     // 状态显示完全由计算属性控制，去除了手动修改可能导致的冲突
@@ -353,9 +371,51 @@ export default {
       this.showSetupModal = false;
       uni.navigateTo({ url: '/pages/shop/service-skills' });
     },
+
+    // 专门给【提示弹窗】点击用的 (查看进度 / 去认证)
     goToAuth() {
+      // 1. 点击后先关闭提示弹窗
       this.showSetupModal = false;
-      uni.navigateTo({ url: '/pages/ruzhu/ruzhu' });
+
+      // 2. 根据咱们新的严谨判断，决定它是真提交了还是纯没填
+      if (this.isUnderReview) {
+        // === 查看进度 ===
+        uni.navigateTo({ 
+          url: '/pages/ruzhu/submitres' 
+        });
+      } else {
+        // === 去认证 / 被驳回重新认证 ===
+        this.navigateToForm();
+      }
+    },
+
+    // 专门给【横幅】点击用的 (去入驻 / 去认证)
+    goToSettle() {
+      if (!this.isSettled) {
+        // 完全没入驻过（新手），从头开始
+        uni.navigateTo({ url: '/pages/ruzhu/ruzhu' });
+      } else if (this.isUnderReview) {
+        // 如果在横幅里处于审核中，也送去进度页
+        uni.navigateTo({ url: '/pages/ruzhu/submitres' });
+      } else {
+        // 已经开启入驻但没完成表单，继续去填表！
+        this.navigateToForm();
+      }
+    },
+
+    // 提取公共的【去填表】路由分发大脑
+    navigateToForm() {
+      if (this.isSettled) {
+        // 已经开启入驻（老手），直接空降到 ruzhu 的最后一个流程（第3步：门店信息）
+        uni.navigateTo({ 
+          url: '/pages/ruzhu/ruzhu?step=3' 
+        });
+      } else {
+        // 完全没入驻过（纯新手），老老实实从第 0 步开始
+        uni.navigateTo({ 
+          url: '/pages/ruzhu/ruzhu' 
+        });
+      }
     },
 
     goToBrandList() {
@@ -399,12 +459,14 @@ export default {
           uni.setStorageSync("sjId", result.data.id);
           this.sjId = result.data.id;
 
-          // 如果在系统里（即使没通过认证），检查一下条件
-          if (this.isSettled) {
+          // 优化 1：只有完全通过认证，才去后台查单量和收益数据
+          if (this.isCertified) {
             this.fetchOrderNum();
             this.fetchRealTimeData();
+          }
 
-            // 必须先去拉取认证详情（包含服务技能配置），再判断弹窗逻辑
+          // 优化 2：只要开启了入驻流程（哪怕只是在“去认证”阶段），依然需要拉详情来判断有没有补全三大件
+          if (this.isSettled) {
             this.fetchAuthDetails();
           }
         }
@@ -522,10 +584,6 @@ export default {
     goToNoticeList() {
       uni.navigateTo({ url: '/pages/notice/notice_list' });
     },
-    // 跳转：去入驻
-    goToSettle() {
-      uni.navigateTo({ url: '/pages/ruzhu/ruzhu' });
-    },
 
     // 营业中 / 休息中 按钮逻辑判断
     toggleStatus() {
@@ -647,7 +705,7 @@ export default {
         position: relative;
         z-index: 1;
         flex: 1;
-        padding: 50rpx 40rpx;
+        padding: 24rpx 40rpx;
         
         .modal-subtitle {
           font-size: 28rpx;
@@ -668,12 +726,14 @@ export default {
             
             .item-left {
               display: flex;
-              align-items: center;
+              align-items: flex-start;
               
               .item-icon {
-                width: 36rpx;
-                height: 36rpx;
+                width: 32rpx;
+                height: 32rpx;
                 margin-right: 16rpx;
+                flex-shrink: 0; /* 防止图标被挤压变形 */
+                margin-top: 6rpx;
               }
               
               .item-texts {
@@ -685,6 +745,11 @@ export default {
                   color: #333333;
                   font-weight: 500;
                   margin-bottom: 8rpx;
+                  
+                  /* 增加蓝色字体样式 */
+                  &.blue-text {
+                    color: #2b85e4;
+                  }
                 }
                 
                 .item-desc {
@@ -697,9 +762,12 @@ export default {
             .item-right {
               font-size: 26rpx;
               font-weight: 400;
+              margin-top: -45rpx;
               
               &.orange { color: #FF7B00; }
               &.grey { color: #999999; }
+              /* 增加浅绿色样式 */
+              &.light-green { color: #5CAC81; }
             }
           }
         }

From a800372ad241af1b163a661bcb63c8ebf249f39d Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Mon, 1 Jun 2026 17:27:11 +0800
Subject: [PATCH 067/118] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artisan/profile.vue | 40 +++++++++++++++++++++++++++++----------
 pages/ruzhu/ruzhu.vue     |  6 ++++++
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index 5d62d4f..9ee4fa5 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -631,16 +631,36 @@
 			},
 
 			navigateToQualification() { 
-				if (this.userInfo.credentials_state == '1') {
-					uni.navigateTo({
-						url: '/pages/ruzhu/ruzhu?type=1'
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/shop/qualification_sj_change'
-					})
-				}
-			},
+                const state = this.userInfo.credentials_state;
+
+                if (state === 1) {
+                    // === 1. 审核中 ===
+                    // 跳转到最新确认的专属进度/客服二维码页面
+                    uni.navigateTo({
+                        url: '/pages/ruzhu/submitres'
+                    });
+                } else if (state === 0) {
+                    // === 2. 待完善 / 被驳回 ===
+                    // 同步首页逻辑：判断是老手还是纯新手
+                    if (this.userInfo.id_type !== 0) {
+                        // 已经开启过入驻，直接空降到最后一步（门店信息）
+                        uni.navigateTo({
+                            url: '/pages/ruzhu/ruzhu?step=3'
+                        });
+                    } else {
+                        // 完全没入驻过的纯新手，老老实实从第一步开始
+                        uni.navigateTo({
+                            url: '/pages/ruzhu/ruzhu'
+                        });
+                    }
+                } else {
+                    // === 3. 已认证 ===
+                    // 跳转到资质信息的查看/修改页面
+                    uni.navigateTo({
+                        url: '/pages/shop/qualification_sj_change'
+                    });
+                }
+            },
 
 			navigateToBelongShop() { // 手艺人：所属门店
 				uni.navigateTo({
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 8caea0d..87dd098 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -141,6 +141,12 @@
 			if (options.type == 1) {
 				this.currentStep = 4
 			}
+
+			// 如果首页传了 step 参数，就直接空降到对应的流程
+			if (options.step) {
+				this.currentStep = Number(options.step);
+			}
+
 			this.identity = 2;
 			await this.getUserInfoSync()
 			// 确保子组件也能访问到 identity

From 917a0af084ec4ad881c5819e5592a0657c752375 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Mon, 1 Jun 2026 18:18:08 +0800
Subject: [PATCH 068/118] =?UTF-8?q?=E9=97=A8=E5=BA=97=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=93=E4=B8=9A=E7=BB=8F=E9=AA=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=88=B0=E6=9C=8D=E5=8A=A1=E6=8A=80=E8=83=BD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/service-skills.vue | 1521 ++++++++-------
 pages/shop/sj-info-change.vue | 3371 ++++++++++++++++-----------------
 2 files changed, 2485 insertions(+), 2407 deletions(-)

diff --git a/pages/shop/service-skills.vue b/pages/shop/service-skills.vue
index 8b49c83..1c8ed7a 100644
--- a/pages/shop/service-skills.vue
+++ b/pages/shop/service-skills.vue
@@ -45,6 +45,20 @@
 					</view>
 				</view>
 			</view>
+
+            <view class="box-cont" style="padding: 0;">
+                <view class="form-item-two" @click="editable ? openExperiencePicker() : null">
+                    <text class="label required">专业经验：</text>
+                    <view class="picker-content">
+                        <text :class="displayMajor ? 'picker-value' : 'placeholder'">
+                            {{ displayExperienceText || '请选择' }}
+                        </text>
+                        <image v-if="editable"
+                            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+                            class="arrow-right" mode="aspectFit"></image>
+                    </view>
+                </view>
+            </view>
 		</view>
 
 		<!-- 底部按钮 -->
@@ -84,737 +98,850 @@
 </template>
 
 <script>
-	import request from '../../utils/request';
-
-	export default {
-		data() {
-			return {
-				sjInformation: {},
-				serviceList: [], // 服务技能列表
-				selectedSkills: [], // 已选中的技能ID（待审核的）
-				originalSkills: [], // 原始选中的技能ID（当前生效的）
-				editable: false, // 是否可编辑
-				buttonType: 'change', // 按钮类型: change-去变更信息, edit-取消/提交, view-查看我的变更
-				showAuditTip: false, // 是否显示审核中提示
-				auditStatus: null, // 审核状态
-				applyId: null, // 申请ID
-				isLoading: true, // 添加加载状态
-				showPendingSkills: false, // 是否显示待审核的技能
-				currentSkills: [], // 当前生效的技能ID
-				navTitle: '服务技能', // 导航栏标题
-				buttonAreaHeight: 120, // 按钮区域高度，用于计算底部padding
-				backText: '', // 驳回原因
-				identity: '', // 用户身份
-				lastApplyTime: null, //记录最后申请时间
-			}
-		},
-		computed: {
-			selectedSkillsText() {
-				const selectedTitles = this.serviceList
-					.filter(item => item.checked)
-					.map(item => item.title);
-				return selectedTitles.join('、');
-			},
-			hasChanges() {
-				// 检查是否有变更
-				const current = [...this.selectedSkills].sort().join(',');
-				const original = [...this.originalSkills].sort().join(',');
-				return current !== original;
-			},
-			// 控制驳回提示是否显示
-			shouldShowRejectReason() {
-				// 只有在审核驳回状态、不显示待审核技能、且技能未变更时才显示驳回提示
-				return this.auditStatus === 3 &&
-					!this.showPendingSkills &&
-					!this.skillsChanged &&
-					this.backText;
-				!this.hasPendingApply();
-			},
-			// 检查是否有待处理的申请（基于时间）
-			hasPendingApply() {
-				if (!this.lastApplyTime) return false;
-				// 如果最后申请时间在驳回时间之后，说明有新的申请
-				return true;
-			}
-		},
-		async onLoad() {
-			this.sjInformation = await request.post('/sj/user/getUser');
-			await this.initPage();
-		},
-		onReady() {
-			// 获取按钮区域高度，用于设置页面内容padding
-			this.getButtonAreaHeight();
-		},
-		methods: {
-			// 初始化页面
-			async initPage() {
-				this.isLoading = true;
-				try {
-					// 先加载服务技能列表
-					await this.loadServiceSkills();
-					// 然后加载申请详情
-					await this.loadApplyDetails();
-				} catch (error) {
-					console.error('初始化页面失败:', error);
-				} finally {
-					this.isLoading = false;
-				}
-			},
-
-			// 清理驳回技能存储的逻辑
-			async cleanupRejectedSkillsIfNeeded() {
-				try {
-					const rejectedSkills = uni.getStorageSync('rejectedSkills');
-					const lastApplyTime = uni.getStorageSync('lastApplyTime');
-
-					if (rejectedSkills && rejectedSkills.length > 0) {
-						// 获取当前生效技能
-						const params = {
-							type: 3
-						};
-						const res = this.sjInformation;
-
-						if (res.state === 1 && res.data && res.data.servers_kill) {
-							let currentSkillIds = [];
-							if (Array.isArray(res.data.servers_kill)) {
-								currentSkillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(
-									id));
-							} else if (typeof res.data.servers_kill === 'string') {
-								currentSkillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim()))
-									.filter(id => !isNaN(id));
-							}
-
-							const currentSorted = [...currentSkillIds].sort().join(',');
-							const rejectedSorted = [...rejectedSkills].sort().join(',');
-
-							// 如果当前生效技能与被驳回技能不一致，说明有新的申请已生效
-							if (currentSorted !== rejectedSorted) {
-								console.log('检测到技能已变更，清理驳回相关存储');
-								uni.removeStorageSync('rejectedSkills');
-								uni.removeStorageSync('lastRejectTime');
-							}
-						}
-					}
-				} catch (error) {
-					console.error('清理驳回技能存储失败:', error);
-				}
-			},
-
-			// 获取按钮区域高度
-			getButtonAreaHeight() {
-				// 使用setTimeout确保DOM已渲染
-				setTimeout(() => {
-					const query = uni.createSelectorQuery().in(this);
-					query.select('.bottom-actions').boundingClientRect(data => {
-						if (data) {
-							this.buttonAreaHeight = data.height + 20; // 增加一些边距
-						}
-					}).exec();
-				}, 100);
-			},
-
-			// 更新导航栏标题
-			updateNavTitle() {
-				if (this.editable || this.showPendingSkills) {
-					this.navTitle = '服务技能变更';
-				} else {
-					this.navTitle = '服务技能';
-				}
-			},
-
-			// 加载服务技能列表
-			async loadServiceSkills() {
-				try {
-					const res = await request.post('/sj/firstclass');
-					this.serviceList = res.data.map(item => ({
-						...item,
-						checked: false
-					}));
-					console.log('服务技能列表:', this.serviceList);
-				} catch (error) {
-					console.error('加载服务技能失败:', error);
-					uni.showToast({
-						title: '加载服务技能失败',
-						icon: 'none'
-					});
-				}
-			},
-
-			// 加载申请详情
-			async loadApplyDetails() {
-				try {
-					console.log('开始加载申请详情...');
-					const res = await request.post('/sj/userSjAuth/details', {
-						apply_type: 2 // 服务技能变更
-					});
-
-					console.log('申请详情接口返回:', res);
-
-					if (res.code === 200 && res.data) {
-						const detail = res.data;
-						this.applyId = detail.id;
-						this.auditStatus = detail.apply_state;
-						this.backText = detail.back_text || ''; // 获取驳回原因
-
-						console.log('审核状态:', this.auditStatus);
-						console.log('原始servers_kill数据:', detail.servers_kill);
-
-						// 处理服务技能数据
-						if (detail.servers_kill) {
-							let skillIds = [];
-
-							if (Array.isArray(detail.servers_kill)) {
-								skillIds = detail.servers_kill.map(id => {
-									const num = parseInt(id);
-									return isNaN(num) ? null : num;
-								}).filter(id => id !== null);
-							} else if (typeof detail.servers_kill === 'string') {
-								skillIds = detail.servers_kill.split(',').map(id => {
-									const num = parseInt(id.trim());
-									return isNaN(num) ? null : num;
-								}).filter(id => id !== null);
-							}
-
-							console.log('解析后的技能ID:', skillIds);
-
-							// 根据审核状态正确处理数据
-							if (this.auditStatus === 1) { // 审核中
-								this.selectedSkills = [...skillIds];
-								console.log('审核中，待审核技能:', this.selectedSkills);
-								// 记录申请时间
-								uni.setStorageSync('lastApplyTime', new Date().getTime());
-							} else if (this.auditStatus === 3) { // 审核驳回
-								// 检查驳回数据是否是最新的
-								await this.handleRejectedSkills(skillIds);
-							}
-
-							this.updateCheckedStatus();
-						}
-
-						// 无论审核状态如何，都加载当前生效的技能
-						await this.loadCurrentEffectiveSkills();
-
-					} else {
-						console.log('申请详情返回数据为空或code不为200:', res);
-						// 清理可能的驳回存储
-						uni.removeStorageSync('rejectedSkills');
-						uni.removeStorageSync('lastRejectTime');
-						await this.loadCurrentEffectiveSkills();
-					}
-
-				} catch (error) {
-					console.error('加载申请详情失败:', error);
-					// 出错时也尝试加载当前生效的技能
-					await this.loadCurrentEffectiveSkills();
-				}
-			},
-
-			// 处理驳回技能逻辑
-			async handleRejectedSkills(rejectedSkillIds) {
-				const storedRejectedSkills = uni.getStorageSync('rejectedSkills');
-				const lastRejectTime = uni.getStorageSync('lastRejectTime');
-
-				// 获取当前生效技能进行比较
-				const currentSkills = await this.getCurrentEffectiveSkillIds();
-
-				const rejectedSorted = [...rejectedSkillIds].sort().join(',');
-				const storedSorted = storedRejectedSkills ? [...storedRejectedSkills].sort().join(',') : '';
-				const currentSorted = [...currentSkills].sort().join(',');
-
-				// 如果驳回的技能与当前生效技能相同，说明驳回数据过时
-				if (rejectedSorted === currentSorted) {
-					console.log('驳回数据与当前生效技能相同，可能数据过时，忽略本次驳回数据');
-					this.selectedSkills = [...currentSkills];
-					// 清理驳回存储
-					uni.removeStorageSync('rejectedSkills');
-					uni.removeStorageSync('lastRejectTime');
-					this.backText = ''; // 清空驳回原因
-					return;
-				}
-
-				// 如果驳回技能与存储的驳回技能不同，更新存储
-				if (rejectedSorted !== storedSorted) {
-					console.log('发现新的驳回数据，更新存储:', rejectedSkillIds);
-					uni.setStorageSync('rejectedSkills', rejectedSkillIds);
-					uni.setStorageSync('lastRejectTime', new Date().getTime());
-				}
-
-				this.selectedSkills = [...rejectedSkillIds];
-				console.log('审核驳回，被驳回技能:', this.selectedSkills);
-			},
-
-			// 获取当前生效技能ID
-			async getCurrentEffectiveSkillIds() {
-				try {
-					const params = {
-						type: 3
-					};
-					const res = this.sjInformation;
-
-					if (res.state === 1 && res.data && res.data.servers_kill) {
-						let skillIds = [];
-						if (Array.isArray(res.data.servers_kill)) {
-							skillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(id));
-						} else if (typeof res.data.servers_kill === 'string') {
-							skillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim())).filter(id => !
-								isNaN(id));
-						}
-						return skillIds;
-					}
-					return [];
-				} catch (error) {
-					console.error('获取当前生效技能失败:', error);
-					return [];
-				}
-			},
-
-
-			// 加载当前生效的服务技能
-			async loadCurrentEffectiveSkills() {
-				try {
-					console.log('开始加载当前生效的服务技能...');
-					const currentSkills = await this.getCurrentEffectiveSkillIds();
-
-					this.currentSkills = [...currentSkills];
-					this.originalSkills = [...currentSkills];
-
-					console.log('当前生效的技能ID:', this.currentSkills);
-
-					// 只有在无申请状态或审核通过状态时，才用当前技能更新选中技能
-					if (this.auditStatus === null || this.auditStatus === 2) {
-						this.selectedSkills = [...currentSkills];
-					}
-					// 审核中状态保持原有的selectedSkills不变
-					// 审核驳回状态已经在handleRejectedSkills中处理
-
-					this.updateCheckedStatus();
-					this.updatePageStatus();
-
-				} catch (error) {
-					console.error('加载当前生效技能失败:', error);
-					this.currentSkills = [];
-					this.originalSkills = [];
-					if (this.auditStatus !== 1) {
-						this.selectedSkills = [];
-					}
-					this.updateCheckedStatus();
-					this.updatePageStatus();
-				}
-			},
-
-
-
-			// 检查技能是否在当前生效的技能中
-			isCurrentSkillSelected(skillId) {
-				return this.currentSkills.includes(skillId);
-			},
-
-			// 更新选中状态（用于待审核的技能）
-			updateCheckedStatus() {
-				console.log('更新选中状态，当前服务技能列表:', this.serviceList);
-				console.log('要选中的技能ID:', this.selectedSkills);
-				this.serviceList.forEach(item => {
-					item.checked = this.selectedSkills.includes(item.id);
-				});
-			},
-
-			// 根据审核状态更新页面状态
-			updatePageStatus() {
-				console.log('更新页面状态，审核状态:', this.auditStatus);
-
-				// 检查是否有变更
-				const currentSorted = [...this.currentSkills].sort().join(',');
-				const selectedSorted = [...this.selectedSkills].sort().join(',');
-				const hasChanges = currentSorted !== selectedSorted;
-
-				console.log('技能变更检查 - 当前生效:', this.currentSkills, '选中:', this.selectedSkills, '是否变更:', hasChanges);
-
-				if (this.auditStatus === 1) { // 审核中
-					this.showAuditTip = true;
-					this.buttonType = 'view';
-					this.editable = false;
-					this.showPendingSkills = false;
-				} else if (this.auditStatus === 3) { // 审核驳回
-					// 检查驳回数据是否有效
-					const rejectedSkills = uni.getStorageSync('rejectedSkills');
-					const rejectedSorted = rejectedSkills ? [...rejectedSkills].sort().join(',') : '';
-					const currentSorted = [...this.currentSkills].sort().join(',');
-
-					// 如果驳回技能与当前技能相同，说明驳回数据无效
-					if (rejectedSorted === currentSorted) {
-						console.log('驳回数据无效，按无申请状态处理');
-						this.showAuditTip = false;
-						this.buttonType = 'change';
-						this.editable = false;
-						this.showPendingSkills = false;
-						this.backText = ''; // 清空驳回原因
-					} else {
-						this.showAuditTip = false;
-						this.buttonType = 'change';
-						this.editable = false;
-						this.showPendingSkills = false;
-					}
-				} else { // 无申请或审核通过
-					this.showAuditTip = false;
-					this.buttonType = 'change';
-					this.editable = false;
-					this.showPendingSkills = false;
-				}
-
-				this.updateNavTitle();
-
-				console.log('最终页面状态:', {
-					showAuditTip: this.showAuditTip,
-					buttonType: this.buttonType,
-					editable: this.editable,
-					showPendingSkills: this.showPendingSkills,
-					currentSkills: this.currentSkills,
-					selectedSkills: this.selectedSkills,
-					backText: this.backText
-				});
-			},
-
-			// 切换技能选择状态（仅用于编辑模式）
-			toggleSkillSelect(index) {
-				if (!this.editable) return;
-
-				this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
-
-				// 更新选中的技能ID数组
-				this.selectedSkills = this.serviceList
-					.filter(item => item.checked)
-					.map(item => item.id);
-
-				console.log('当前选中的技能ID:', this.selectedSkills);
-			},
-
-			// 切换显示待审核的技能
-			togglePendingSkills() {
-				this.showPendingSkills = !this.showPendingSkills;
-				// 更新导航栏标题
-				this.updateNavTitle();
-			},
-
-			// 开始变更
-			startChange() {
-				this.editable = true;
-				this.buttonType = 'edit';
-				// 进入编辑模式时，显示待审核的技能
-				this.showPendingSkills = true;
-				// 更新导航栏标题
-				this.updateNavTitle();
-			},
-
-			// 取消变更
-			cancelChange() {
-				// 恢复原始选择
-				this.selectedSkills = [...this.originalSkills];
-				this.updateCheckedStatus();
-
-				this.editable = false;
-				this.buttonType = 'change';
-				this.showPendingSkills = false; // 取消后显示当前生效的技能
-				// 更新导航栏标题
-				this.updateNavTitle();
-			},
-
-			// 提交变更 - 修改为传递数组格式
-			async submitChange() {
-				if (this.selectedSkills.length === 0) {
-					uni.showToast({
-						title: '请至少选择一个服务技能',
-						icon: 'none'
-					});
-					return;
-				}
-
-				if (!this.hasChanges) {
-					uni.showToast({
-						title: '未检测到变更',
-						icon: 'none'
-					});
-					return;
-				}
-
-				try {
-					uni.showLoading({
-						title: '提交中...'
-					});
-					const params = {
-						apply_type: 2, // 服务技能变更
-						servers_kill: this.selectedSkills // 直接传递数组
-					};
-
-					console.log('提交的数据:', params);
-
-					const res = await request.post('/sj/userSjAuth/apply', params);
-
-					uni.hideLoading();
-
-					if (res.code === 200) {
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none'
-							// icon: 'success'
-						});
-
-						// 清理驳回相关存储
-						uni.removeStorageSync('rejectedSkills');
-						uni.removeStorageSync('lastRejectTime');
-
-						// 记录申请时间
-						uni.setStorageSync('lastApplyTime', new Date().getTime());
-
-						// 更新页面状态为审核中
-						this.showAuditTip = true;
-						this.editable = false;
-						this.buttonType = 'view';
-						this.auditStatus = 1; // 审核中
-						this.showPendingSkills = false; // 提交后默认显示当前生效的技能
-						// 更新导航栏标题
-						this.updateNavTitle();
-
-						// 重新加载申请详情获取最新状态
-						setTimeout(() => {
-							this.loadApplyDetails();
-						}, 1000);
-					} else {
-						uni.showToast({
-							title: res.msg || '提交失败',
-							icon: 'none'
-						});
-					}
-				} catch (error) {
-					uni.hideLoading();
-					console.error('提交变更失败:', error);
-					uni.showToast({
-						title: '提交失败',
-						icon: 'none'
-					});
-				}
-			}
-		}
-	}
+    import request from '../../utils/request';
+
+    export default {
+        data() {
+            return {
+                sjInformation: {},
+                serviceList: [], // 服务技能列表
+                selectedSkills: [], // 已选中的技能ID（待审核的）
+                originalSkills: [], // 原始选中的技能ID（当前生效的）
+
+                // 新增：专业经验数据流
+                originalMajor: null, // 当前生效的经验
+                pendingMajor: null,  // 待审核的经验
+                displayMajor: null,  // 页面展示的经验
+
+                editable: false, // 是否可编辑
+                buttonType: 'change', // 按钮类型: change-去变更信息, edit-取消/提交, view-查看我的变更
+                showAuditTip: false, // 是否显示审核中提示
+                auditStatus: null, // 审核状态
+                applyId: null, // 申请ID
+                isLoading: true, // 添加加载状态
+                showPendingSkills: false, // 是否显示待审核的技能
+                currentSkills: [], // 当前生效的技能ID
+                navTitle: '服务技能', // 导航栏标题
+                buttonAreaHeight: 120, // 按钮区域高度，用于计算底部padding
+                backText: '', // 驳回原因
+                identity: '', // 用户身份
+                lastApplyTime: null, //记录最后申请时间
+            }
+        },
+        computed: {
+            selectedSkillsText() {
+                const selectedTitles = this.serviceList
+                    .filter(item => item.checked)
+                    .map(item => item.title);
+                return selectedTitles.join('、');
+            },
+            // 新增：将 major 数值转换为文字
+            displayExperienceText() {
+                return this.getExperienceText(this.displayMajor);
+            },
+            hasChanges() {
+                // 检查是否有变更 (合并技能和经验检查)
+                const currentSorted = [...this.currentSkills].sort().join(',');
+                const selectedSorted = [...this.selectedSkills].sort().join(',');
+                const skillsChanged = currentSorted !== selectedSorted;
+                const majorChanged = String(this.displayMajor || '') !== String(this.originalMajor || '');
+                return skillsChanged || majorChanged;
+            },
+            // 控制驳回提示是否显示
+            shouldShowRejectReason() {
+                // 只有在审核驳回状态、不显示待审核技能、且技能未变更时才显示驳回提示
+                return this.auditStatus === 3 &&
+                    !this.showPendingSkills &&
+                    !this.hasChanges &&
+                    this.backText;
+                // 检查是否有待处理的申请（基于时间）
+                !this.hasPendingApply();
+            },
+            // 检查是否有待处理的申请（基于时间）
+            hasPendingApply() {
+                if (!this.lastApplyTime) return false;
+                // 如果最后申请时间在驳回时间之后，说明有新的申请
+                return true;
+            }
+        },
+        async onLoad() {
+            this.sjInformation = await request.post('/sj/user/getUser');
+            await this.initPage();
+        },
+        onReady() {
+            // 获取按钮区域高度，用于设置页面内容padding
+            this.getButtonAreaHeight();
+        },
+        methods: {
+            // 初始化页面
+            async initPage() {
+                this.isLoading = true;
+                try {
+                    this.originalMajor = this.sjInformation?.data?.major || null;
+                    this.displayMajor = this.originalMajor;
+
+                    // 先加载服务技能列表
+                    await this.loadServiceSkills();
+                    // 然后加载申请详情
+                    await this.loadApplyDetails();
+                } catch (error) {
+                    console.error('初始化页面失败:', error);
+                } finally {
+                    this.isLoading = false;
+                }
+            },
+
+            // 转换专业经验为文字
+            getExperienceText(major) {
+                const experiences = ['', '实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+                return experiences[major] || '';
+            },
+
+            // 打开专业经验选择器
+            openExperiencePicker() {
+                if (!this.editable) return;
+                uni.showActionSheet({
+                    itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
+                    success: (res) => {
+                        this.displayMajor = res.tapIndex + 1;
+                    }
+                });
+            },
+
+            // 清理驳回技能存储的逻辑
+            async cleanupRejectedSkillsIfNeeded() {
+                try {
+                    const rejectedSkills = uni.getStorageSync('rejectedSkills');
+                    const rejectedMajor = uni.getStorageSync('rejectedMajor');
+                    const lastApplyTime = uni.getStorageSync('lastApplyTime');
+
+                    if (rejectedSkills && rejectedSkills.length > 0) {
+                        // 获取当前生效技能
+                        const params = {
+                            type: 3
+                        };
+                        const res = this.sjInformation;
+
+                        if (res.state === 1 && res.data && res.data.servers_kill) {
+                            let currentSkillIds = [];
+                            if (Array.isArray(res.data.servers_kill)) {
+                                currentSkillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(
+                                    id));
+                            } else if (typeof res.data.servers_kill === 'string') {
+                                currentSkillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim()))
+                                    .filter(id => !isNaN(id));
+                            }
+
+                            const currentSorted = [...currentSkillIds].sort().join(',');
+                            const rejectedSorted = [...rejectedSkills].sort().join(',');
+                            const currentMajor = res.data.major;
+
+                            // 如果当前生效技能与被驳回技能不一致，说明有新的申请已生效
+                            if (currentSorted !== rejectedSorted || String(currentMajor) !== String(rejectedMajor)) {
+                                console.log('检测到技能已变更，清理驳回相关存储');
+                                uni.removeStorageSync('rejectedSkills');
+                                uni.removeStorageSync('rejectedMajor');
+                                uni.removeStorageSync('lastRejectTime');
+                            }
+                        }
+                    }
+                } catch (error) {
+                    console.error('清理驳回技能存储失败:', error);
+                }
+            },
+
+            // 获取按钮区域高度
+            getButtonAreaHeight() {
+                // 使用setTimeout确保DOM已渲染
+                setTimeout(() => {
+                    const query = uni.createSelectorQuery().in(this);
+                    query.select('.bottom-actions').boundingClientRect(data => {
+                        if (data) {
+                            this.buttonAreaHeight = data.height + 20; // 增加一些边距
+                        }
+                    }).exec();
+                }, 100);
+            },
+
+            // 更新导航栏标题
+            updateNavTitle() {
+                if (this.editable || this.showPendingSkills) {
+                    this.navTitle = '服务技能变更';
+                } else {
+                    this.navTitle = '服务技能';
+                }
+            },
+
+            // 加载服务技能列表
+            async loadServiceSkills() {
+                try {
+                    const res = await request.post('/sj/firstclass');
+                    this.serviceList = res.data.map(item => ({
+                        ...item,
+                        checked: false
+                    }));
+                    console.log('服务技能列表:', this.serviceList);
+                } catch (error) {
+                    console.error('加载服务技能失败:', error);
+                    uni.showToast({
+                        title: '加载服务技能失败',
+                        icon: 'none'
+                    });
+                }
+            },
+
+            // 加载申请详情
+            async loadApplyDetails() {
+                try {
+                    console.log('开始加载申请详情...');
+                    const res = await request.post('/sj/userSjAuth/details', {
+                        apply_type: 2 // 服务技能变更
+                    });
+
+                    console.log('申请详情接口返回:', res);
+
+                    if (res.code === 200 && res.data) {
+                        const detail = res.data;
+                        this.applyId = detail.id;
+                        this.auditStatus = detail.apply_state;
+                        this.backText = detail.back_text || ''; // 获取驳回原因
+
+                        console.log('审核状态:', this.auditStatus);
+                        console.log('原始servers_kill数据:', detail.servers_kill);
+
+                        // 处理服务技能数据
+                        if (detail.servers_kill) {
+                            let skillIds = [];
+
+                            if (Array.isArray(detail.servers_kill)) {
+                                skillIds = detail.servers_kill.map(id => {
+                                    const num = parseInt(id);
+                                    return isNaN(num) ? null : num;
+                                }).filter(id => id !== null);
+                            } else if (typeof detail.servers_kill === 'string') {
+                                skillIds = detail.servers_kill.split(',').map(id => {
+                                    const num = parseInt(id.trim());
+                                    return isNaN(num) ? null : num;
+                                }).filter(id => id !== null);
+                            }
+
+                            console.log('解析后的技能ID:', skillIds);
+                            
+                            this.pendingMajor = detail.major || this.originalMajor;
+
+                            // 根据审核状态正确处理数据
+                            if (this.auditStatus === 1) { // 审核中
+                                this.selectedSkills = [...skillIds];
+                                this.displayMajor = this.pendingMajor;
+                                console.log('审核中，待审核技能:', this.selectedSkills);
+                                // 记录申请时间
+                                uni.setStorageSync('lastApplyTime', new Date().getTime());
+                            } else if (this.auditStatus === 3) { // 审核驳回
+                                // 检查驳回数据是否是最新的
+                                await this.handleRejectedData(skillIds, detail.major);
+                            }
+
+                            this.updateCheckedStatus();
+                        }
+
+                        // 无论审核状态如何，都加载当前生效的技能
+                        await this.loadCurrentEffectiveSkills();
+
+                    } else {
+                        console.log('申请详情返回数据为空或code不为200:', res);
+                        // 清理可能的驳回存储
+                        uni.removeStorageSync('rejectedSkills');
+                        uni.removeStorageSync('rejectedMajor');
+                        uni.removeStorageSync('lastRejectTime');
+                        await this.loadCurrentEffectiveSkills();
+                    }
+
+                } catch (error) {
+                    console.error('加载申请详情失败:', error);
+                    // 出错时也尝试加载当前生效的技能
+                    await this.loadCurrentEffectiveSkills();
+                }
+            },
+
+            // 处理驳回技能逻辑
+            async handleRejectedData(rejectedSkillIds, rejectedMajor) {
+                const storedRejectedSkills = uni.getStorageSync('rejectedSkills');
+                const storedRejectedMajor = uni.getStorageSync('rejectedMajor');
+                const lastRejectTime = uni.getStorageSync('lastRejectTime');
+
+                // 获取当前生效技能进行比较
+                const currentSkills = await this.getCurrentEffectiveSkillIds();
+                const currentMajor = this.sjInformation?.data?.major || null;
+
+                const rejectedSorted = [...rejectedSkillIds].sort().join(',');
+                const storedSorted = storedRejectedSkills ? [...storedRejectedSkills].sort().join(',') : '';
+                const currentSorted = [...currentSkills].sort().join(',');
+
+                // 如果驳回的技能与当前生效技能相同，说明驳回数据过时
+                if (rejectedSorted === currentSorted && String(rejectedMajor||'') === String(currentMajor||'')) {
+                    console.log('驳回数据与当前生效技能相同，可能数据过时，忽略本次驳回数据');
+                    this.selectedSkills = [...currentSkills];
+                    this.displayMajor = currentMajor;
+                    // 清理驳回存储
+                    uni.removeStorageSync('rejectedSkills');
+                    uni.removeStorageSync('rejectedMajor');
+                    uni.removeStorageSync('lastRejectTime');
+                    this.backText = ''; // 清空驳回原因
+                    return;
+                }
+
+                // 如果驳回技能与存储的驳回技能不同，更新存储
+                if (rejectedSorted !== storedSorted || String(rejectedMajor) !== String(storedRejectedMajor)) {
+                    console.log('发现新的驳回数据，更新存储:', rejectedSkillIds);
+                    uni.setStorageSync('rejectedSkills', rejectedSkillIds);
+                    uni.setStorageSync('rejectedMajor', rejectedMajor);
+                    uni.setStorageSync('lastRejectTime', new Date().getTime());
+                }
+
+                this.selectedSkills = [...rejectedSkillIds];
+                this.displayMajor = rejectedMajor || currentMajor;
+                console.log('审核驳回，被驳回技能:', this.selectedSkills);
+            },
+
+            // 获取当前生效技能ID
+            async getCurrentEffectiveSkillIds() {
+                try {
+                    const params = {
+                        type: 3
+                    };
+                    const res = this.sjInformation;
+
+                    if (res.state === 1 && res.data && res.data.servers_kill) {
+                        let skillIds = [];
+                        if (Array.isArray(res.data.servers_kill)) {
+                            skillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(id));
+                        } else if (typeof res.data.servers_kill === 'string') {
+                            skillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim())).filter(id => !
+                                isNaN(id));
+                        }
+                        return skillIds;
+                    }
+                    return [];
+                } catch (error) {
+                    console.error('获取当前生效技能失败:', error);
+                    return [];
+                }
+            },
+
+
+            // 加载当前生效的服务技能
+            async loadCurrentEffectiveSkills() {
+                try {
+                    console.log('开始加载当前生效的服务技能...');
+                    const currentSkills = await this.getCurrentEffectiveSkillIds();
+
+                    this.currentSkills = [...currentSkills];
+                    this.originalSkills = [...currentSkills];
+                    
+                    this.originalMajor = this.sjInformation?.data?.major || null;
+
+                    console.log('当前生效的技能ID:', this.currentSkills);
+
+                    // 只有在无申请状态或审核通过状态时，才用当前技能更新选中技能
+                    if (this.auditStatus === null || this.auditStatus === 2) {
+                        this.selectedSkills = [...currentSkills];
+                        this.displayMajor = this.originalMajor;
+                    }
+                    // 审核中状态保持原有的selectedSkills不变
+                    // 审核驳回状态已经在handleRejectedSkills中处理
+
+                    this.updateCheckedStatus();
+                    this.updatePageStatus();
+
+                } catch (error) {
+                    console.error('加载当前生效技能失败:', error);
+                    this.currentSkills = [];
+                    this.originalSkills = [];
+                    if (this.auditStatus !== 1) {
+                        this.selectedSkills = [];
+                    }
+                    this.updateCheckedStatus();
+                    this.updatePageStatus();
+                }
+            },
+
+
+
+            // 检查技能是否在当前生效的技能中
+            isCurrentSkillSelected(skillId) {
+                return this.currentSkills.includes(skillId);
+            },
+
+            // 更新选中状态（用于待审核的技能）
+            updateCheckedStatus() {
+                console.log('更新选中状态，当前服务技能列表:', this.serviceList);
+                console.log('要选中的技能ID:', this.selectedSkills);
+                this.serviceList.forEach(item => {
+                    item.checked = this.selectedSkills.includes(item.id);
+                });
+            },
+
+            // 根据审核状态更新页面状态
+            updatePageStatus() {
+                console.log('更新页面状态，审核状态:', this.auditStatus);
+
+                // 检查是否有变更
+                const currentSorted = [...this.currentSkills].sort().join(',');
+                const selectedSorted = [...this.selectedSkills].sort().join(',');
+                const hasChanges = currentSorted !== selectedSorted;
+
+                console.log('技能变更检查 - 当前生效:', this.currentSkills, '选中:', this.selectedSkills, '是否变更:', hasChanges);
+
+                if (this.auditStatus === 1) { // 审核中
+                    this.showAuditTip = true;
+                    this.buttonType = 'view';
+                    this.editable = false;
+                    this.showPendingSkills = false;
+                } else if (this.auditStatus === 3) { // 审核驳回
+                    // 检查驳回数据是否无效
+                    const rejectedSkills = uni.getStorageSync('rejectedSkills');
+                    const rejectedMajor = uni.getStorageSync('rejectedMajor');
+                    const rejectedSorted = rejectedSkills ? [...rejectedSkills].sort().join(',') : '';
+                    const currentSorted = [...this.currentSkills].sort().join(',');
+
+                    // 如果驳回技能与当前技能相同，说明驳回数据无效
+                    if (rejectedSorted === currentSorted && String(rejectedMajor||'') === String(this.originalMajor||'')) {
+                        console.log('驳回数据无效，按无申请状态处理');
+                        this.showAuditTip = false;
+                        this.buttonType = 'change';
+                        this.editable = false;
+                        this.showPendingSkills = false;
+                        this.backText = ''; // 清空驳回原因
+                    } else {
+                        this.showAuditTip = false;
+                        this.buttonType = 'change';
+                        this.editable = false;
+                        this.showPendingSkills = false;
+                    }
+                } else { // 无申请或审核通过
+                    this.showAuditTip = false;
+                    this.buttonType = 'change';
+                    this.editable = false;
+                    this.showPendingSkills = false;
+                }
+
+                this.updateNavTitle();
+
+                console.log('最终页面状态:', {
+                    showAuditTip: this.showAuditTip,
+                    buttonType: this.buttonType,
+                    editable: this.editable,
+                    showPendingSkills: this.showPendingSkills,
+                    currentSkills: this.currentSkills,
+                    selectedSkills: this.selectedSkills,
+                    backText: this.backText
+                });
+            },
+
+            // 切换技能选择状态（仅用于编辑模式）
+            toggleSkillSelect(index) {
+                if (!this.editable) return;
+
+                this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
+
+                // 更新选中的技能ID数组
+                this.selectedSkills = this.serviceList
+                    .filter(item => item.checked)
+                    .map(item => item.id);
+
+                console.log('当前选中的技能ID:', this.selectedSkills);
+            },
+
+            // 切换显示待审核的技能
+            togglePendingSkills() {
+                this.showPendingSkills = !this.showPendingSkills;
+                if (this.showPendingSkills) {
+                    this.displayMajor = this.pendingMajor;
+                } else {
+                    this.displayMajor = this.originalMajor;
+                }
+                // 更新导航栏标题
+                this.updateNavTitle();
+            },
+
+            // 开始变更
+            startChange() {
+                this.editable = true;
+                this.buttonType = 'edit';
+                // 进入编辑模式时，显示待审核的技能
+                this.showPendingSkills = true;
+                this.displayMajor = this.pendingMajor || this.originalMajor;
+                // 更新导航栏标题
+                this.updateNavTitle();
+            },
+
+            // 取消变更
+            cancelChange() {
+                // 恢复原始选择
+                this.selectedSkills = [...this.originalSkills];
+                this.displayMajor = this.originalMajor;
+                this.updateCheckedStatus();
+
+                this.editable = false;
+                this.buttonType = 'change';
+                this.showPendingSkills = false; // 取消后显示当前生效的技能
+                // 更新导航栏标题
+                this.updateNavTitle();
+            },
+
+            // 提交变更 - 修改为传递数组格式
+            async submitChange() {
+                if (this.selectedSkills.length === 0) {
+                    uni.showToast({
+                        title: '请至少选择一个服务技能',
+                        icon: 'none'
+                    });
+                    return;
+                }
+                if (!this.displayMajor) {
+                    uni.showToast({ title: '请选择专业经验', icon: 'none' });
+                    return;
+                }
+
+                if (!this.hasChanges) {
+                    uni.showToast({
+                        title: '未检测到变更',
+                        icon: 'none'
+                    });
+                    return;
+                }
+
+                try {
+                    uni.showLoading({
+                        title: '提交中...'
+                    });
+                    const params = {
+                        apply_type: 2, // 服务技能变更
+                        servers_kill: this.selectedSkills, // 直接传递数组
+                        major: this.displayMajor
+                    };
+
+                    console.log('提交的数据:', params);
+
+                    const res = await request.post('/sj/userSjAuth/apply', params);
+
+                    uni.hideLoading();
+
+                    if (res.code === 200) {
+                        uni.showToast({
+                            title: '提交成功',
+                            icon: 'none'
+                            // icon: 'success'
+                        });
+
+                        // 清理驳回相关存储
+                        uni.removeStorageSync('rejectedSkills');
+                        uni.removeStorageSync('rejectedMajor');
+                        uni.removeStorageSync('lastRejectTime');
+
+                        // 记录申请时间
+                        uni.setStorageSync('lastApplyTime', new Date().getTime());
+                        this.pendingMajor = this.displayMajor;
+
+                        // 更新页面状态为审核中
+                        this.showAuditTip = true;
+                        this.editable = false;
+                        this.buttonType = 'view';
+                        this.auditStatus = 1; // 审核中
+                        this.showPendingSkills = false; // 提交后默认显示当前生效的技能
+                        // 更新导航栏标题
+                        this.updateNavTitle();
+
+                        // 重新加载申请详情获取最新状态
+                        setTimeout(() => {
+                            this.loadApplyDetails();
+                        }, 1000);
+                    } else {
+                        uni.showToast({
+                            title: res.msg || '提交失败',
+                            icon: 'none'
+                        });
+                    }
+                } catch (error) {
+                    uni.hideLoading();
+                    console.error('提交变更失败:', error);
+                    uni.showToast({
+                        title: '提交失败',
+                        icon: 'none'
+                    });
+                }
+            }
+        }
+    }
 </script>
 
 <style scoped>
-	.service-skills-page {
-		background-color: #f5f5f5;
-		min-height: 100vh;
-		box-sizing: border-box;
-		display: flex;
-		flex-direction: column;
-	}
+    .service-skills-page {
+        background-color: #f5f5f5;
+        min-height: 100vh;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+    }
 
-	/* 页面内容区域 */
-	.page-content {
-		flex: 1;
-		overflow-y: auto;
-		padding: 20rpx 0;
-		box-sizing: border-box;
-	}
+    /* 页面内容区域 */
+    .page-content {
+        flex: 1;
+        overflow-y: auto;
+        padding: 20rpx 0;
+        box-sizing: border-box;
+    }
 
-	/* 审核中提示 */
-	.audit-tip {
-		margin: 20rpx 24rpx 20rpx 24rpx;
-		border-radius: 12rpx;
-	}
+    /* 审核中提示 */
+    .audit-tip {
+        margin: 20rpx 24rpx 20rpx 24rpx;
+        border-radius: 12rpx;
+    }
 
-	.audit-text {
-		font-weight: 400;
-		font-size: 32rpx;
-		color: #333333;
-		text-align: center;
-		display: block;
-	}
+    .audit-text {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #333333;
+        text-align: center;
+        display: block;
+    }
 
-	/* 驳回原因样式 */
-	.reject-reason {
-		background: transparent;
-		padding: 24rpx;
-	}
+    /* 驳回原因样式 */
+    .reject-reason {
+        background: transparent;
+        padding: 24rpx;
+    }
 
-	.reject-title {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #333333;
-		line-height: 45rpx;
-		text-align: center;
-		font-style: normal;
-	}
+    .reject-title {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #333333;
+        line-height: 45rpx;
+        text-align: center;
+        font-style: normal;
+    }
 
-	.reject-detail {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #999999;
-		line-height: 40rpx;
-		text-align: center;
-		font-style: normal;
-		margin-top: 12rpx;
+    .reject-detail {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #999999;
+        line-height: 40rpx;
+        text-align: center;
+        font-style: normal;
+        margin-top: 12rpx;
 
-	}
+    }
 
-	.skills-header {
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
-	}
+    .skills-header {
+        display: flex;
+        align-items: center;
+        margin-bottom: 20rpx;
+    }
 
-	.title-bar {
-		width: 6rpx;
-		height: 30rpx;
-		background-color: #E8101E;
-		margin-right: 10rpx;
-		border-radius: 5rpx;
-	}
+    .title-bar {
+        width: 6rpx;
+        height: 30rpx;
+        background-color: #E8101E;
+        margin-right: 10rpx;
+        border-radius: 5rpx;
+    }
 
-	.skills-title {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #1D2129;
-		line-height: 48rpx;
-		text-align: left;
-		font-style: normal;
-	}
+    .skills-title {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #1D2129;
+        line-height: 48rpx;
+        text-align: left;
+        font-style: normal;
+    }
 
-	.skills-subtitle {
-		margin-left: 20rpx;
-		margin-bottom: 20rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #333333;
-		line-height: 40rpx;
-		text-align: left;
-		font-style: normal;
-	}
+    .skills-subtitle {
+        margin-left: 20rpx;
+        margin-bottom: 20rpx;
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 40rpx;
+        text-align: left;
+        font-style: normal;
+    }
 
-	.box-cont {
-		background: #ffffff;
-		border-radius: 20rpx;
-		margin: 0 24rpx 24rpx 24rpx;
-		box-shadow: none;
-	}
+    .box-cont {
+        background: #ffffff;
+        border-radius: 20rpx;
+        margin: 0 24rpx 24rpx 24rpx;
+        box-shadow: none;
+    }
 
-	.skills-container {
-		padding: 32rpx;
-	}
+    .skills-container {
+        padding: 32rpx;
+    }
 
-	.skills-list {
-		display: flex;
-		flex-wrap: wrap;
-		margin: 0 -16rpx;
-	}
+    .skills-list {
+        display: flex;
+        flex-wrap: wrap;
+        margin: 0 -16rpx;
+    }
 
-	.skill-item {
-		width: 100%;
-		display: flex;
-		align-items: center;
-		padding: 20rpx 16rpx;
-		box-sizing: border-box;
-	}
+    .skill-item {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        padding: 20rpx 16rpx;
+        box-sizing: border-box;
+    }
 
-	.checkbox-wrapper {
-		margin-right: 20rpx;
-	}
+    .checkbox-wrapper {
+        margin-right: 20rpx;
+    }
 
-	.checkbox {
-		width: 40rpx;
-		height: 40rpx;
-		border: 2rpx solid #DDDDDD;
-		border-radius: 8rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
+    .checkbox {
+        width: 40rpx;
+        height: 40rpx;
+        border: 2rpx solid #DDDDDD;
+        border-radius: 8rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
 
-	.checkbox.checked {
-		background-color: #E8101E;
-		border-color: #E8101E;
-	}
+    .checkbox.checked {
+        background-color: #E8101E;
+        border-color: #E8101E;
+    }
 
-	.check-icon {
-		width: 42rpx;
-		height: 42rpx;
-	}
+    .check-icon {
+        width: 42rpx;
+        height: 42rpx;
+    }
 
-	.skill-name {
-		font-size: 28rpx;
-		color: #333333;
-	}
+    .skill-name {
+        font-size: 28rpx;
+        color: #333333;
+    }
 
-	.bottom-actions {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		padding: 0rpx 24rpx 40rpx 24rpx;
-		background: #ffffff;
-		z-index: 100;
-	}
+    /* 迁移的专业经验表单样式 */
+    .form-item-two {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 24rpx 24rpx;
+    }
 
-	/* 单个按钮样式 */
-	.action-btn {
-		height: 88rpx;
-		border-radius: 43rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 32rpx;
-		font-weight: 400;
-		margin-top: 20rpx;
-	}
+    .form-item-two > text.label {
+        flex-shrink: 0;
+        font-size: 28rpx;
+        color: #333333;
+        font-weight: 500;
+    }
 
-	.change-info-btn {
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-	}
+    .required::before {
+        content: '*';
+        color: #FF0000;
+        margin-right: 4rpx;
+    }
 
-	.view-change-btn {
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-	}
+    .picker-content {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        gap: 16rpx;
+    }
 
-	/* 双按钮行样式 */
-	.action-buttons-row {
-		display: flex;
-		justify-content: space-between;
-		margin: 0 30rpx;
-	}
+    .picker-value,
+    .placeholder {
+        font-size: 28rpx;
+        text-align: right;
+    }
 
-	.action-buttons-row .action-btn {
-		width: 270rpx;
-	}
+    .picker-value {
+        color: #333333;
+    }
 
-	.cancel-btn {
-		background: #E5E5E5;
-		border-radius: 43rpx;
-		padding: 0 15rpx;
-	}
+    .placeholder {
+        color: #999999;
+    }
 
-	.submit-btn {
-		background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
-		border-radius: 43rpx;
-		padding: 0 15rpx;
-	}
+    .arrow-right {
+        width: 9rpx;
+        height: 16rpx;
+        flex-shrink: 0;
+    }
 
-	.btn-text {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 36rpx;
-		color: #FFFFFF;
-		line-height: 50rpx;
-		text-align: left;
-		font-style: normal;
-	}
+    .bottom-actions {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        padding: 0rpx 24rpx 40rpx 24rpx;
+        background: #ffffff;
+        z-index: 100;
+    }
 
-	.cancel-text {
-		color: #666666;
-	}
+    /* 单个按钮样式 */
+    .action-btn {
+        height: 88rpx;
+        border-radius: 43rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 32rpx;
+        font-weight: 400;
+        margin-top: 20rpx;
+    }
 
-	/* 响应式适配 */
-	/* @media (max-width: 375px) {
+    .change-info-btn {
+        background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+    }
+
+    .view-change-btn {
+        background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+    }
+
+    /* 双按钮行样式 */
+    .action-buttons-row {
+        display: flex;
+        justify-content: space-between;
+        margin: 0 30rpx;
+    }
+
+    .action-buttons-row .action-btn {
+        width: 270rpx;
+    }
+
+    .cancel-btn {
+        background: #E5E5E5;
+        border-radius: 43rpx;
+        padding: 0 15rpx;
+    }
+
+    .submit-btn {
+        background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+        border-radius: 43rpx;
+        padding: 0 15rpx;
+    }
+
+    .btn-text {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 36rpx;
+        color: #FFFFFF;
+        line-height: 50rpx;
+        text-align: left;
+        font-style: normal;
+    }
+
+    .cancel-text {
+        color: #666666;
+    }
+
+    /* 响应式适配 */
+    /* @media (max-width: 375px) {
   .skill-item {
     width: 100%;
   }
diff --git a/pages/shop/sj-info-change.vue b/pages/shop/sj-info-change.vue
index 4a88b7c..9f5dac9 100644
--- a/pages/shop/sj-info-change.vue
+++ b/pages/shop/sj-info-change.vue
@@ -1,1731 +1,1682 @@
 <template>
-	<view class="store-info-page">
-		<!-- 顶部导航栏 -->
-		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
-		<!-- 变更提示 -->
-		<view class="change-tip" v-if="editable">
-			<text>请变更您需要变更的信息</text>
-		</view>
+    <view class="store-info-page">
+        <!-- 顶部导航栏 -->
+        <custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
+        <!-- 变更提示 -->
+        <view class="change-tip" v-if="editable">
+            <text>请变更您需要变更的信息</text>
+        </view>
 
-		<!-- 页面内容容器 -->
-		<view class="page-content" :style="{ paddingBottom: buttonAreaHeight + 'px' }">
-			<!-- 门店信息标题 -->
-			<view class="section-title">
-				<view class="title-bar"></view>
-				<text>门店信息</text>
-			</view>
+        <!-- 页面内容容器 -->
+        <view class="page-content" :style="{ paddingBottom: buttonAreaHeight + 'px' }">
+            <!-- 门店信息标题 -->
+            <view class="section-title">
+                <view class="title-bar"></view>
+                <text>门店信息</text>
+            </view>
 
-			<!-- 店铺logo -->
-			<view class="form-item box-cont">
-				<view class="label-wrapper">
-					<text class="label required">店铺logo</text>
-					<image class="label-icon"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
-						mode="aspectFit" @click="showTipPopup('store_logo')"></image>
-				</view>
-				<view class="upload-box" @click="chooseImage('head_photo')">
-					<image v-if="displayData.head_photo" :src="displayData.head_photo" mode="aspectFill"
-						class="logo-image"></image>
-					<view class="upload-placeholder" v-else>
-						<image src="/static/images/upload-img.png" mode="aspectFit" class="upload-icon"></image>
-					</view>
-				</view>
-			</view>
+            <!-- 店铺logo -->
+            <view class="form-item box-cont">
+                <view class="label-wrapper">
+                    <text class="label required">店铺logo</text>
+                    <image class="label-icon"
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+                        mode="aspectFit" @click="showTipPopup('store_logo')"></image>
+                </view>
+                <view class="upload-box" @click="chooseImage('head_photo')">
+                    <image v-if="displayData.head_photo" :src="displayData.head_photo" mode="aspectFill"
+                        class="logo-image"></image>
+                    <view class="upload-placeholder" v-else>
+                        <image src="/static/images/upload-img.png" mode="aspectFit" class="upload-icon"></image>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 店铺名称 -->
-			<view class="form-item-one box-cont">
-				<view class="label-wrapper">
-					<text class="label required">店铺名称</text>
-					<image class="label-icon"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
-						mode="aspectFit" @click="showTipPopup('store_name')"></image>
-				</view>
-				<input type="text" v-model="displayData.name" placeholder="请输入营业执照的店铺名称" :disabled="!editable"
-					placeholder-class="placeholder" class="input" />
-			</view>
+            <!-- 店铺名称 -->
+            <view class="form-item-one box-cont">
+                <view class="label-wrapper">
+                    <text class="label required">店铺名称</text>
+                    <image class="label-icon"
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+                        mode="aspectFit" @click="showTipPopup('store_name')"></image>
+                </view>
+                <input type="text" v-model="displayData.name" placeholder="请输入营业执照的店铺名称" :disabled="!editable"
+                    placeholder-class="placeholder" class="input" />
+            </view>
 
-			<!-- 门店所在地 -->
-			<view class="form-item-two box-cont" @click="editable ? showLocationPopup() : null">
-				<text class="label required">门店所在地：</text>
-				<view class="picker-content">
-					<text :class="displayData.dependency ? 'picker-value' : 'placeholder'">
-						{{displayData.dependency || '请选择'}}
-					</text>
-					<image v-if="editable"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
-						class="arrow-right" mode="aspectFit"></image>
-				</view>
-			</view>
+            <!-- 门店所在地 -->
+            <view class="form-item-two box-cont" @click="editable ? showLocationPopup() : null">
+                <text class="label required">门店所在地：</text>
+                <view class="picker-content">
+                    <text :class="displayData.dependency ? 'picker-value' : 'placeholder'">
+                        {{displayData.dependency || '请选择'}}
+                    </text>
+                    <image v-if="editable"
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+                        class="arrow-right" mode="aspectFit"></image>
+                </view>
+            </view>
 
-			<!-- 门店详细地址 -->
-			<view class="form-item-two box-cont" @click="getAddressInfo">
-				<text class="label required">门店详细地址：</text>
-				<view class="picker-content">
-					<text :class="displayData.address ? 'picker-value' : 'placeholder'">
-						{{displayData.address || '请选择'}}
-					</text>
-					<image v-if="editable"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
-						class="arrow-right" mode="aspectFit"></image>
-				</view>
-			</view>
+            <!-- 门店详细地址 -->
+            <view class="form-item-two box-cont" @click="getAddressInfo">
+                <text class="label required">门店详细地址：</text>
+                <view class="picker-content">
+                    <text :class="displayData.address ? 'picker-value' : 'placeholder'">
+                        {{displayData.address || '请选择'}}
+                    </text>
+                    <image v-if="editable"
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+                        class="arrow-right" mode="aspectFit"></image>
+                </view>
+            </view>
+        </view>
 
-			<!-- 其他信息标题 -->
-			<view class="section-title">
-				<view class="title-bar"></view>
-				<text>其他信息</text>
-			</view>
+        <!-- 底部按钮区域 -->
+        <view class="bottom-actions" ref="buttonArea">
+            <!-- 驳回原因提示 -->
+            <view class="reject-reason" v-if="shouldShowRejectReason && auditStatus === 3 && backText">
+                <view class="reject-title">您的提交已驳回</view>
+                <view class="reject-detail">驳回原因：{{ backText }}</view>
+            </view>
+            <!-- 审核中提示 -->
+            <view class="audit-tip" v-if="showAuditTip">
+                <text class="audit-text">您的提交变更正在审核中...</text>
+            </view>
 
-			<!-- 专业经验 -->
-			<view class="form-item-two box-cont" @click="editable ? openExperiencePicker() : null">
-				<text class="label required">专业经验：</text>
-				<view class="picker-content">
-					<text :class="displayData.major ? 'picker-value' : 'placeholder'">
-						{{displayData.experienceText || '请选择'}}
-					</text>
-					<image v-if="editable"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
-						class="arrow-right" mode="aspectFit"></image>
-				</view>
-			</view>
-		</view>
+            <!-- 变更信息按钮 -->
+            <view class="action-btn change-info-btn" v-if="buttonType === 'change'" @click="startChange">
+                <text class="btn-text">变更信息</text>
+            </view>
 
-		<!-- 底部按钮区域 -->
-		<view class="bottom-actions" ref="buttonArea">
-			<!-- 驳回原因提示 -->
-			<view class="reject-reason" v-if="shouldShowRejectReason && auditStatus === 3 && backText">
-				<view class="reject-title">您的提交已驳回</view>
-				<view class="reject-detail">驳回原因：{{ backText }}</view>
-			</view>
-			<!-- 审核中提示 -->
-			<view class="audit-tip" v-if="showAuditTip">
-				<text class="audit-text">您的提交变更正在审核中...</text>
-			</view>
+            <!-- 取消和提交按钮 -->
+            <view class="action-buttons-row" v-if="buttonType === 'edit'">
+                <view class="action-btn cancel-btn" @click="cancelChange">
+                    <text class="btn-text cancel-text">取消</text>
+                </view>
+                <view class="action-btn submit-btn" @click="submitChange">
+                    <text class="btn-text">提交</text>
+                </view>
+            </view>
 
-			<!-- 变更信息按钮 -->
-			<view class="action-btn change-info-btn" v-if="buttonType === 'change'" @click="startChange">
-				<text class="btn-text">变更信息</text>
-			</view>
+            <!-- 查看我的变更/返回按钮 -->
+            <view class="action-btn view-change-btn" v-if="buttonType === 'view'" @click="togglePendingData">
+                <text class="btn-text">{{ showPendingData ? '返回' : '查看我的变更' }}</text>
+            </view>
 
-			<!-- 取消和提交按钮 -->
-			<view class="action-buttons-row" v-if="buttonType === 'edit'">
-				<view class="action-btn cancel-btn" @click="cancelChange">
-					<text class="btn-text cancel-text">取消</text>
-				</view>
-				<view class="action-btn submit-btn" @click="submitChange">
-					<text class="btn-text">提交</text>
-				</view>
-			</view>
+            <!-- 重新提交按钮 -->
+            <view class="action-btn resubmit-btn" v-if="buttonType === 'reject'" @click="startChange">
+                <text class="btn-text">重新提交</text>
+            </view>
+        </view>
 
-			<!-- 查看我的变更/返回按钮 -->
-			<view class="action-btn view-change-btn" v-if="buttonType === 'view'" @click="togglePendingData">
-				<text class="btn-text">{{ showPendingData ? '返回' : '查看我的变更' }}</text>
-			</view>
+        <!-- 所在地选择弹出框 -->
+        <view class="popup" :class="{ show: showLocationPopupFlag }">
+            <view class="popup-mask" @click="hideLocationPopup"></view>
+            <view class="popup-content">
+                <view class="popup-header">
+                    <text class="popup-title">选择所在地</text>
+                    <text class="popup-close" @click="hideLocationPopup">×</text>
+                </view>
+                <view class="region-body">
+                    <picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
+                        :value="locationValue">
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">
+                                {{item.province}}
+                            </view>
+                        </picker-view-column>
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">
+                                {{item.city}}
+                            </view>
+                        </picker-view-column>
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item,index) in locationAreas" :key="index">
+                                {{item.area}}
+                            </view>
+                        </picker-view-column>
+                    </picker-view>
+                </view>
+                <view class="popup-footer">
+                    <view class="popup-btn cancel" @click="hideLocationPopup">
+                        <text class="btn-text">取消</text>
+                    </view>
+                    <view class="popup-btn confirm" @click="confirmLocationSelect">
+                        <text class="btn-text">确定</text>
+                    </view>
+                </view>
+            </view>
+        </view>
 
-			<!-- 重新提交按钮 -->
-			<view class="action-btn resubmit-btn" v-if="buttonType === 'reject'" @click="startChange">
-				<text class="btn-text">重新提交</text>
-			</view>
-		</view>
+        <!-- 提示信息弹窗 -->
+        <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+            <view class="tip-popup-mask" @click="hideTipPopup"></view>
+            <view class="tip-popup-content">
+                <image class="tip-popup-bg"
+                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
+                    mode="aspectFit"></image>
+                <view class="tip-popup-body">
+                    <view class="tip-title">{{ tipTitle }}</view>
+                    <view class="tip-image-container">
+                        <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
+                    </view>
+                    <view class="tip-buttons">
+                        <view class="tip-btn cancel" @click="hideTipPopup">
+                            <text class="btn-text">取消</text>
+                        </view>
+                        <view class="tip-btn confirm" @click="hideTipPopup">
+                            <text class="btn-text">我已了解</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
 
-		<!-- 所在地选择弹出框 -->
-		<view class="popup" :class="{ show: showLocationPopupFlag }">
-			<view class="popup-mask" @click="hideLocationPopup"></view>
-			<view class="popup-content">
-				<view class="popup-header">
-					<text class="popup-title">选择所在地</text>
-					<text class="popup-close" @click="hideLocationPopup">×</text>
-				</view>
-				<view class="region-body">
-					<picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
-						:value="locationValue">
-						<picker-view-column>
-							<view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">
-								{{item.province}}
-							</view>
-						</picker-view-column>
-						<picker-view-column>
-							<view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">
-								{{item.city}}
-							</view>
-						</picker-view-column>
-						<picker-view-column>
-							<view class="picker-item" v-for="(item,index) in locationAreas" :key="index">
-								{{item.area}}
-							</view>
-						</picker-view-column>
-					</picker-view>
-				</view>
-				<view class="popup-footer">
-					<view class="popup-btn cancel" @click="hideLocationPopup">
-						<text class="btn-text">取消</text>
-					</view>
-					<view class="popup-btn confirm" @click="confirmLocationSelect">
-						<text class="btn-text">确定</text>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 提示信息弹窗 -->
-		<view class="tip-popup" :class="{ show: showTipPopupFlag }">
-			<view class="tip-popup-mask" @click="hideTipPopup"></view>
-			<view class="tip-popup-content">
-				<image class="tip-popup-bg"
-					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
-					mode="aspectFit"></image>
-				<view class="tip-popup-body">
-					<view class="tip-title">{{ tipTitle }}</view>
-					<view class="tip-image-container">
-						<image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
-					</view>
-					<view class="tip-buttons">
-						<view class="tip-btn cancel" @click="hideTipPopup">
-							<text class="btn-text">取消</text>
-						</view>
-						<view class="tip-btn confirm" @click="hideTipPopup">
-							<text class="btn-text">我已了解</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 存储权限提示 -->
-		<view class="permission" :class="{ transform: isShowStoragePer }">
-			<view class="per-tit">美融融plus 对储存空间/照片权限申请说明</view>
-			<view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中读取相册和文件内容。</view>
-		</view>
-		<!-- 相机权限提示 -->
-		<view class="permission" :class="{ transform: isShowCameraPer }">
-			<view class="per-tit">美融融plus 对相机拍摄权限申请说明</view>
-			<view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。</view>
-		</view>
-		<!-- 定位权限提示 -->
-		<view class="permission" :class="{ transform: isShowLocationPer }">
-			<view class="per-tit">美融融plus 对精确定位权限申请说明</view>
-			<view class="per-cont">便于您使用该功能获取您附近的手艺人以及店铺下的服务内容。</view>
-		</view>
-	</view>
+        <!-- 存储权限提示 -->
+        <view class="permission" :class="{ transform: isShowStoragePer }">
+            <view class="per-tit">美融融plus 对储存空间/照片权限申请说明</view>
+            <view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中读取相册和文件内容。</view>
+        </view>
+        <!-- 相机权限提示 -->
+        <view class="permission" :class="{ transform: isShowCameraPer }">
+            <view class="per-tit">美融融plus 对相机拍摄权限申请说明</view>
+            <view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。</view>
+        </view>
+        <!-- 定位权限提示 -->
+        <view class="permission" :class="{ transform: isShowLocationPer }">
+            <view class="per-tit">美融融plus 对精确定位权限申请说明</view>
+            <view class="per-cont">便于您使用该功能获取您附近的手艺人以及店铺下的服务内容。</view>
+        </view>
+    </view>
 </template>
 
 <script>
-	import request from '../../utils/request';
-	import ChinaCitys from '../../static/data/ChinaCitys.json';
-	import {
-		debounce
-	} from '@/utils/debounce.js';
-	import uploadImage from '../../utils/uploadImage';
-	import permissionUtils from '../../utils/per'; // 新增
-	import locationService from '../../utils/locationService'; // 新增
-
-	export default {
-		data() {
-			return {
-				// 页面状态
-				editable: false,
-				buttonType: 'change',
-				showAuditTip: false,
-				auditStatus: null,
-				applyId: null,
-				showPendingData: false,
-				navTitle: '门店信息变更',
-				buttonAreaHeight: 120,
-				backText: '',
-				hasResubmitted: false,
-
-				// 数据管理
-				originalData: {},
-				pendingData: {},
-				displayData: {},
-
-				// 门店信息字段
-				ChinaCitys: ChinaCitys,
-				locatinCitys: [],
-				locationAreas: [],
-				locationValue: [0, 0, 0],
-				showLocationPopupFlag: false,
-				showTipPopupFlag: false,
-				tipTitle: '',
-				tipImage: '',
-				currentTipType: '',
-				userId: null,
-				identity: 3,
-				applyType: 3,
-
-				// 选择器数据
-				hours: Array.from({
-					length: 24
-				}, (_, i) => i < 10 ? `0${i}` : `${i}`),
-				minutes: Array.from({
-					length: 60
-				}, (_, i) => i < 10 ? `0${i}` : `${i}`),
-				indicatorStyle: 'height: 68rpx;',
-
-				// 地址相关
-				fromAddressPage: false,
-				addressListener: null,
-				dependency_code: '',
-				dependency_province: '',
-				dependency_city: '',
-				longitude: '',
-				latitude: '',
-
-				// 权限控制变量
-				isShowStoragePer: false,
-				isShowCameraPer: false,
-				isShowLocationPer: false,
-			}
-		},
-		computed: {
-			shouldShowRejectReason() {
-				if (this.auditStatus !== 3) return false;
-				if (!this.backText) return false;
-				if (this.showPendingData) return false;
-				return true;
-			}
-		},
-		onLoad() {
-			uni.$on('address-selected-for-sj', (addressData) => {
-				this.handleAddressSelected(addressData);
-			});
-
-			console.log('页面开始加载...');
-			this.identity = getApp().globalData.artisanType;
-			console.log('当前身份类型:', this.identity);
-
-			this.getUserInfo();
-			this.loadApplyDetails();
-
-			this.locatinCitys = this.ChinaCitys[0].citys;
-			this.locationAreas = this.locatinCitys[0]?.areas || [];
-		},
-		onUnload() {
-			uni.$off('address-selected-for-sj');
-		},
-		onReady() {
-			this.getButtonAreaHeight();
-		},
-		onShow() {
-			console.log('页面显示，检查地址数据');
-			this.checkAddressData();
-
-			if (!this.editable) {
-				this.loadApplyDetails();
-			} else {
-				console.log('编辑模式下，跳过自动刷新，保持当前编辑状态');
-			}
-
-			if (this.auditStatus !== 3) {
-				this.backText = '';
-				this.hasResubmitted = false;
-			}
-		},
-		onHide() {
-			this.fromAddressPage = false;
-		},
-		methods: {
-			// 检查地址数据（原有）
-			checkAddressData() {
-				try {
-					const sjAddress = uni.getStorageSync('sj_selected_address');
-					if (sjAddress) {
-						this.handleAddressSelected(sjAddress);
-						uni.removeStorageSync('sj_selected_address');
-						return;
-					}
-				} catch (e) {}
-
-				if (getApp().globalData && getApp().globalData.selectedAddress) {
-					this.handleAddressSelected(getApp().globalData.selectedAddress);
-					delete getApp().globalData.selectedAddress;
-				}
-
-				try {
-					const storedAddress = uni.getStorageSync('selectedAddress');
-					if (storedAddress) {
-						this.handleAddressSelected(storedAddress);
-						uni.removeStorageSync('selectedAddress');
-					}
-				} catch (e) {}
-			},
-
-			// 获取用户信息（原有，未变）
-			getUserInfo() {
-				console.log('开始获取用户信息...');
-				const type = 3;
-
-				request.post('/user/getuser', {
-					type
-				}).then(result => {
-					console.log('接口返回完整数据:', result);
-
-					if (result.state === 1 && result.data) {
-						const userData = result.data;
-						console.log('用户数据详情:', userData);
-
-						this.userId = userData.id;
-
-						this.originalData = {
-							head_photo: userData.head_photo || '',
-							name: userData.name || '',
-							dependency: userData.dependency || '',
-							address: userData.address || '',
-							major: userData.major || '',
-							dependency_code: userData.dependency_code || '',
-							dependency_province: userData.dependency_province || '',
-							dependency_city: userData.dependency_city || '',
-							longitude: userData.longitude || '',
-							latitude: userData.latitude || '',
-							experienceText: this.getExperienceText(userData.major)
-						};
-
-						this.dependency_code = userData.dependency_code || '';
-						this.dependency_province = userData.dependency_province || '';
-						this.dependency_city = userData.dependency_city || '';
-						this.longitude = userData.longitude || '';
-						this.latitude = userData.latitude || '';
-
-						this.pendingData = {
-							...this.originalData
-						};
-						this.displayData = {
-							...this.originalData
-						};
-
-						console.log('数据初始化完成');
-					} else {
-						console.warn('接口返回state不是1或data为空');
-					}
-				}).catch(error => {
-					console.error('获取用户信息失败:', error);
-				});
-			},
-
-			// 智能判断申请状态（原有）
-			intelligentStatusCheck(detail) {
-				if (detail.apply_state === 2) {
-					console.log('智能判断：申请已审核通过');
-					return {
-						isValid: true,
-						status: 2,
-						backText: ''
-					};
-				}
-				if (detail.apply_time) {
-					const applyDate = new Date(detail.apply_time);
-					const now = new Date();
-					const daysDiff = (now - applyDate) / (1000 * 60 * 60 * 24);
-					if (daysDiff > 7 && this.originalData.name !== detail.name) {
-						console.log('智能判断：申请记录已过期，忽略历史记录');
-						return {
-							isValid: false,
-							status: null,
-							backText: ''
-						};
-					}
-				}
-				return {
-					isValid: true,
-					status: detail.apply_state,
-					backText: detail.back_text || ''
-				};
-			},
-
-			// 加载申请详情（原有）
-			async loadApplyDetails() {
-				try {
-					console.log('开始加载申请详情...');
-					const res = await request.post('/sj/userSjAuth/details', {
-						apply_type: this.applyType
-					});
-
-					console.log('申请详情接口返回:', res);
-
-					if (res.code === 200 && res.data) {
-						const detail = res.data;
-						const statusCheck = this.intelligentStatusCheck(detail);
-
-						if (!statusCheck.isValid) {
-							this.auditStatus = null;
-							this.backText = '';
-							this.applyId = null;
-						} else {
-							this.applyId = detail.id;
-							this.auditStatus = statusCheck.status;
-							this.backText = statusCheck.backText;
-
-							console.log('审核状态:', this.auditStatus);
-							console.log('驳回原因:', this.backText);
-
-							if (this.auditStatus === 2) {
-								console.log('审核通过，强制清除驳回相关状态');
-								this.backText = '';
-								this.hasResubmitted = false;
-							}
-
-							if (this.auditStatus === 1 || this.auditStatus === 3) {
-								this.pendingData = {
-									head_photo: detail.head_photo || this.originalData.head_photo,
-									name: detail.name || this.originalData.name,
-									dependency: detail.dependency || this.originalData.dependency,
-									address: detail.address || this.originalData.address,
-									major: detail.major || this.originalData.major,
-									dependency_code: detail.dependency_code || this.originalData.dependency_code,
-									dependency_province: detail.dependency_province || this.originalData
-										.dependency_province,
-									dependency_city: detail.dependency_city || this.originalData.dependency_city,
-									longitude: detail.longitude || this.originalData.longitude,
-									latitude: detail.latitude || this.originalData.latitude,
-									experienceText: this.getExperienceText(detail.major || this.originalData.major)
-								};
-							}
-
-							if (this.auditStatus === 2) {
-								this.originalData = {
-									...this.pendingData
-								};
-							}
-						}
-
-						this.updatePageStatus();
-
-					} else {
-						console.log('申请详情返回数据为空或code不为200:', res);
-						this.backText = '';
-						this.updatePageStatus();
-					}
-				} catch (error) {
-					console.error('加载申请详情失败:', error);
-					this.backText = '';
-					this.updatePageStatus();
-				}
-			},
-
-			// 更新页面状态（原有）
-			updatePageStatus() {
-				console.log('更新页面状态，审核状态:', this.auditStatus);
-
-				if (this.auditStatus !== 3) {
-					this.backText = '';
-				}
-
-				if (this.hasResubmitted && this.auditStatus === 3) {
-					console.log('检测到已重新提交，强制设置为审核中状态');
-					this.auditStatus = 1;
-					this.backText = '';
-				}
-
-				if (this.auditStatus === 1) {
-					this.showAuditTip = true;
-					this.buttonType = 'view';
-					this.editable = false;
-					this.showPendingData = false;
-					this.displayData = {
-						...this.originalData
-					};
-				} else if (this.auditStatus === 3) {
-					this.showAuditTip = false;
-					this.buttonType = 'reject';
-					this.editable = false;
-					this.showPendingData = false;
-					this.displayData = {
-						...this.originalData
-					};
-				} else {
-					this.showAuditTip = false;
-					this.buttonType = 'change';
-					this.editable = false;
-					this.showPendingData = false;
-					this.displayData = {
-						...this.originalData
-					};
-				}
-
-				this.updateNavTitle();
-			},
-
-			updateNavTitle() {
-				if (this.editable || this.showPendingData) {
-					this.navTitle = '门店信息变更';
-				} else {
-					this.navTitle = '门店信息';
-				}
-			},
-
-			getExperienceText(major) {
-				const experiences = ['', '实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-				return experiences[major] || '';
-			},
-
-			startChange() {
-				this.editable = true;
-				this.buttonType = 'edit';
-				this.displayData = {
-					...this.pendingData
-				};
-				this.updateNavTitle();
-			},
-
-			cancelChange() {
-				this.editable = false;
-				this.buttonType = 'change';
-				this.displayData = {
-					...this.originalData
-				};
-				this.updateNavTitle();
-			},
-
-			togglePendingData() {
-				this.showPendingData = !this.showPendingData;
-				if (this.showPendingData) {
-					this.displayData = {
-						...this.pendingData
-					};
-				} else {
-					this.displayData = {
-						...this.originalData
-					};
-				}
-				this.updateNavTitle();
-			},
-
-			async submitChange() {
-				console.log('开始提交变更...');
-				console.log('提交前的displayData:', this.displayData);
-
-				if (!this.validateForm()) {
-					return;
-				}
-
-				try {
-					uni.showLoading({
-						title: '提交中...'
-					});
-
-					this.pendingData = {
-						...this.displayData
-					};
-
-					const submitData = {
-						apply_type: this.applyType,
-						head_photo: this.displayData.head_photo,
-						name: this.displayData.name,
-						dependency: this.displayData.dependency,
-						address: this.displayData.address,
-						longitude: this.displayData.longitude,
-						latitude: this.displayData.latitude,
-						dependency_code: this.displayData.dependency_code,
-						dependency_province: this.displayData.dependency_province,
-						dependency_city: this.displayData.dependency_city,
-						major: this.displayData.major
-					};
-
-					console.log('提交的数据:', submitData);
-
-					const res = await request.post('/sj/userSjAuth/apply', submitData);
-
-					uni.hideLoading();
-
-					if (res.code === 200) {
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none'
-						});
-
-						this.backText = '';
-						this.auditStatus = 1;
-						this.hasResubmitted = true;
-
-						this.pendingData = {
-							...this.displayData
-						};
-
-						this.editable = false;
-						this.buttonType = 'view';
-						this.showAuditTip = true;
-						this.showPendingData = false;
-
-						setTimeout(() => {
-							this.loadApplyDetails();
-						}, 1500);
-
-					} else {
-						uni.showToast({
-							title: res.msg || '提交失败',
-							icon: 'none'
-						});
-					}
-				} catch (error) {
-					uni.hideLoading();
-					console.error('提交失败:', error);
-					uni.showToast({
-						title: '网络错误，请重试',
-						icon: 'none'
-					});
-				}
-			},
-
-			validateForm() {
-				if (!this.displayData.head_photo) {
-					uni.showToast({
-						title: '请上传店铺logo',
-						icon: 'none'
-					});
-					return false;
-				}
-				if (!this.displayData.name) {
-					uni.showToast({
-						title: '请输入店铺名称',
-						icon: 'none'
-					});
-					return false;
-				}
-				if (!this.displayData.dependency) {
-					uni.showToast({
-						title: '请选择门店所在地',
-						icon: 'none'
-					});
-					return false;
-				}
-				if (!this.displayData.address) {
-					uni.showToast({
-						title: '请选择门店详细地址',
-						icon: 'none'
-					});
-					return false;
-				}
-				if (!this.displayData.major) {
-					uni.showToast({
-						title: '请选择专业经验',
-						icon: 'none'
-					});
-					return false;
-				}
-				return true;
-			},
-
-			getButtonAreaHeight() {
-				setTimeout(() => {
-					const query = uni.createSelectorQuery().in(this);
-					query.select('.bottom-actions').boundingClientRect(data => {
-						if (data) this.buttonAreaHeight = data.height + 20;
-					}).exec();
-				}, 100);
-			},
-
-			showTipPopup(field) {
-				const tipConfig = {
-					'store_logo': {
-						title: '如何查看店铺logo',
-						image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9'
-					},
-					'store_name': {
-						title: '如何查看店铺名称',
-						image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
-					}
-				};
-				if (tipConfig[field]) {
-					this.currentTipType = field;
-					this.tipTitle = tipConfig[field].title;
-					this.tipImage = tipConfig[field].image;
-					this.showTipPopupFlag = true;
-				}
-			},
-
-			hideTipPopup() {
-				this.showTipPopupFlag = false;
-			},
-
-			// 修改后的 chooseImage（加入权限检查）
-			async chooseImage(type) {
-				if (!this.editable) return;
-
-				const systemInfo = uni.getSystemInfoSync();
-				const isIOS = systemInfo.platform === 'ios';
-
-				// 弹出操作菜单
-				const res = await new Promise((resolve, reject) => {
-					uni.showActionSheet({
-						itemList: ['拍照', '从相册选择'],
-						success: resolve,
-						fail: reject
-					});
-				}).catch(() => ({
-					tapIndex: -1
-				}));
-
-				if (res.tapIndex === -1) return; // 用户取消
-
-				// 处理拍照
-				if (res.tapIndex === 0) {
-					if (isIOS) {
-						this._openCamera(type, ['camera']);
-					} else {
-						this.isShowCameraPer = true;
-						const {
-							granted
-						} = await permissionUtils.checkPermission('camera', '需要相机权限以拍照');
-						if (granted) {
-							this.isShowCameraPer = false;
-							this._openCamera(type, ['camera']);
-							return;
-						}
-						this.isShowCameraPer = false;
-						const confirm = await this.showPermissionDialog('相机权限申请', '我们需要访问您的相机权限，以便您拍照上传店铺logo');
-						if (!confirm) return;
-						const result = await permissionUtils.requestPermission('camera', '需要相机权限以拍照');
-						if (result) {
-							this._openCamera(type, ['camera']);
-						} else {
-							locationService.openAppSettings();
-						}
-					}
-				}
-				// 处理从相册选择
-				else if (res.tapIndex === 1) {
-					if (isIOS) {
-						this._openCamera(type, ['album']);
-					} else {
-						this.isShowStoragePer = true;
-						const {
-							granted
-						} = await permissionUtils.checkPermission('photo_library', '需要存储权限以选择照片');
-						if (granted) {
-							this.isShowStoragePer = false;
-							this._openCamera(type, ['album']);
-							return;
-						}
-						this.isShowStoragePer = false;
-						const confirm = await this.showPermissionDialog('存储权限申请', '我们需要访问您的相册权限，以便您上传店铺logo');
-						if (!confirm) return;
-						const result = await permissionUtils.requestPermission('photo_library', '需要存储权限以选择照片');
-						if (result) {
-							this._openCamera(type, ['album']);
-						} else {
-							locationService.openAppSettings();
-						}
-					}
-				}
-			},
-
-			// 实际打开相机/相册
-			async _openCamera(type, sourceType) {
-				try {
-					const chooseResult = await new Promise((resolve, reject) => {
-						uni.chooseImage({
-							count: 1,
-							sizeType: ['compressed'],
-							sourceType: sourceType,
-							success: resolve,
-							fail: reject
-						});
-					});
-
-					if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) return;
-
-					const tempFilePath = chooseResult.tempFilePaths[0];
-					const file = {
-						path: tempFilePath,
-						size: 0
-					};
-
-					const result = await this.directUpload(file, this.userId, this.identity + 1);
-
-					if (result) {
-						this.displayData.head_photo = result;
-						console.log('图片上传成功，head_photo 更新为:', result);
-					}
-				} catch (err) {
-					console.log('上传图片错误:', err);
-					if (!err.errMsg || !err.errMsg.includes('cancel')) {
-						uni.showToast({
-							title: '上传失败',
-							icon: 'none'
-						});
-					}
-				}
-			},
-
-			// 显示权限说明弹窗
-			showPermissionDialog(title, content) {
-				return new Promise((resolve) => {
-					uni.showModal({
-						title,
-						content,
-						confirmText: '去开启',
-						success(res) {
-							resolve(res.confirm);
-						}
-					});
-				});
-			},
-
-			async openCamera(type) {
-				try {
-					const chooseResult = await new Promise((resolve, reject) => {
-						uni.chooseImage({
-							count: 1,
-							sizeType: ['compressed'],
-							sourceType: ['album', 'camera'],
-							success: resolve,
-							fail: reject
-						});
-					});
-
-					if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) return;
-
-					const tempFilePath = chooseResult.tempFilePaths[0];
-					const file = {
-						path: tempFilePath,
-						size: 0
-					};
-
-					const result = await this.directUpload(file, this.userId, this.identity + 1);
-
-					if (result) {
-						this.displayData.head_photo = result;
-						console.log('图片上传成功，head_photo 更新为:', result);
-					}
-				} catch (err) {
-					console.log('上传图片错误:', err);
-					if (!err.errMsg || !err.errMsg.includes('cancel')) {
-						uni.showToast({
-							title: '上传失败',
-							icon: 'none'
-						});
-					}
-				}
-			},
-
-			// 直接上传方法（原有）
-			async directUpload(file, userId, type) {
-				try {
-					let date = new Date().getTime();
-					let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
-
-					let fileExtension = 'jpg';
-					if (file.path.includes('.')) {
-						let parts = file.path.split('.');
-						let ext = parts[parts.length - 1].toLowerCase();
-						if (ext && ext.length <= 4) {
-							fileExtension = ext;
-						}
-					}
-
-					let name = `${userId}_${artisan}_${date}.${fileExtension}`;
-					console.log('安全文件名:', name);
-
-					const ossConfig = await request.post('/user/getalioss', {
-						type,
-						kind: 1
-					});
-
-					return await new Promise((resolve, reject) => {
-						uni.uploadFile({
-							url: ossConfig.host,
-							filePath: file.path,
-							name: 'file',
-							formData: {
-								key: ossConfig.dir + name,
-								policy: ossConfig.policy,
-								OSSAccessKeyId: ossConfig.ossAccessKeyId,
-								success_action_status: '200',
-								signature: ossConfig.signature
-							},
-							success: (res) => {
-								if (res.statusCode === 200) {
-									const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
-									resolve(fileUrl);
-								} else {
-									reject(new Error('上传失败'));
-								}
-							},
-							fail: reject
-						});
-					});
-				} catch (error) {
-					console.error('直接上传失败:', error);
-					throw error;
-				}
-			},
-
-			// 所在地选择相关方法（原有，略）
-			showLocationPopup() {
-				if (!this.editable) return;
-				this.showLocationPopupFlag = true;
-			},
-			hideLocationPopup() {
-				this.showLocationPopupFlag = false;
-			},
-			bindChangeLocation(e) {
-				this.locationValue = e.detail.value;
-				let index1 = e.detail.value[0] || 0;
-				let index2 = e.detail.value[1] || 0;
-				this.locatinCitys = this.ChinaCitys[index1].citys;
-				this.locationAreas = this.locatinCitys[index2]?.areas || [];
-			},
-			confirmLocationSelect() {
-				let valueArr = this.locationValue;
-				let index1 = valueArr[0] || 0;
-				let index2 = valueArr[1] || 0;
-				let index3 = valueArr[2] || 0;
-				let province = this.ChinaCitys[index1].province;
-				let city = this.locatinCitys[index2].city;
-				let area = this.locationAreas[index3].area;
-				this.displayData.dependency = province + '-' + city + '-' + area;
-				this.displayData.address = '';
-				this.displayData.longitude = '';
-				this.displayData.latitude = '';
-
-				if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
-					let provinceCode = this.ChinaCitys[index1].code.toString();
-					this.displayData.dependency_province = provinceCode.substring(0, 6);
-				}
-				if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
-					let cityCode = this.locatinCitys[index2].code.toString();
-					this.displayData.dependency_city = cityCode.substring(0, 6);
-				}
-				if (this.locationAreas[index3] && this.locationAreas[index3].code) {
-					let areaCode = this.locationAreas[index3].code.toString();
-					this.displayData.dependency_code = areaCode.substring(0, 6);
-				}
-
-				this.hideLocationPopup();
-			},
-
-			buildRegionTextForSearch() {
-				const dependency = String(this.displayData.dependency || '').trim();
-				if (!dependency) return '';
-
-				const parts = dependency.split('-');
-				const province = parts[0] || '';
-				const city = parts[1] || '';
-				const district = parts[2] || '';
-
-				let regionText = '';
-				if (province) regionText += province;
-				if (city && city !== province) regionText += city;
-				if (district) regionText += district;
-
-				return regionText;
-			},
-
-			getAddressValueForSearch() {
-				const rawAddress = String(this.displayData.address || '').trim();
-				if (!rawAddress) return '';
-
-				const dependencyText = String(this.displayData.dependency || '').trim();
-				const regionText = this.buildRegionTextForSearch();
-
-				let detail = rawAddress;
-
-				// 兼容“完整地址被存进address字段”的情况，进入搜索页时只传详细地址
-				if (regionText && detail.indexOf(regionText) === 0) {
-					detail = detail.slice(regionText.length).trim();
-				} else if (dependencyText && detail.indexOf(dependencyText) === 0) {
-					detail = detail.slice(dependencyText.length).trim();
-				}
-
-				detail = detail.replace(/^[\s,-]+/, '').trim();
-
-				return detail || rawAddress;
-			},
-
-			async getAddressInfo() {
-				if (!this.editable) return;
-
-				const systemInfo = uni.getSystemInfoSync();
-				const isIOS = systemInfo.platform === 'ios';
-
-				const hasDependency = !!String(this.displayData.dependency || '').trim();
-				const hasAddress = !!String(this.getAddressValueForSearch() || '').trim();
-				const hasLocation = !!(this.displayData.longitude && this.displayData.latitude);
-				const hasExistingAddressData = hasDependency || hasAddress || hasLocation;
-
-				// iOS不走你这套权限工具的二次弹窗逻辑，直接进搜索页
-				// 如果当前没有任何地址信息，则让搜索页自己只尝试一次定位
-				if (isIOS) {
-					this._navigateToAddress({
-						canInitCurrentLocation: !hasExistingAddressData
-					});
-					return;
-				}
-
-				// 已有所在地/详细地址/经纬度时，直接带现有值进入，不再额外申请定位
-				if (hasExistingAddressData) {
-					this._navigateToAddress({
-						canInitCurrentLocation: false
-					});
-					return;
-				}
-
-				// 只有完全空白进入时，才申请一次定位权限
-				this.isShowLocationPer = true;
-
-				let granted = false;
-
-				try {
-					const checkRes = await permissionUtils.checkPermission('location', '需要定位权限以获取您的位置');
-					granted = typeof checkRes === 'boolean' ? checkRes : !!(checkRes && checkRes.granted);
-
-					if (!granted) {
-						const requestRes = await permissionUtils.requestPermission('location', '需要定位权限以获取您的位置');
-						granted = typeof requestRes === 'boolean' ? requestRes : !!(requestRes && requestRes.granted);
-					}
-				} catch (error) {
-					console.log('定位权限申请流程异常:', error);
-					granted = false;
-				}
-
-				this.isShowLocationPer = false;
-
-				// 不管用户同不同意，都进入搜索地址页
-				// 同意：按当前位置初始化
-				// 不同意/没给权限：进入页面但不自动精确定位
-				this._navigateToAddress({
-					canInitCurrentLocation: granted
-				});
-			},
-
-			_navigateToAddress({
-				canInitCurrentLocation = false
-			} = {}) {
-				let params = 'source=sj_info';
-
-				const dependency = String(this.displayData.dependency || '').trim();
-				const dependencyCode = String(this.displayData.dependency_code || '').trim();
-				const address = this.getAddressValueForSearch();
-				const longitude = this.displayData.longitude;
-				const latitude = this.displayData.latitude;
-
-				const hasDependency = !!dependency;
-				const hasAddress = !!address;
-				const hasLocation = !!(longitude && latitude);
-
-				if (hasDependency) {
-					params += `&dependency=${encodeURIComponent(dependency)}`;
-					if (dependencyCode) {
-						params += `&dependency_code=${dependencyCode}`;
-					}
-				}
-
-				// 关键修复：把详细地址带过去，搜索页才能回填
-				if (hasAddress) {
-					params += `&address=${encodeURIComponent(address)}`;
-				}
-
-				if (hasLocation) {
-					params += `&longitude=${longitude}&latitude=${latitude}`;
-				}
-
-				// 当前门店信息页没有任何已知地址数据时，再决定搜索页是否初始化当前位置
-				if (!hasDependency && !hasAddress && !hasLocation) {
-					if (canInitCurrentLocation) {
-						params += '&init_current_location=1&silent_locate=1';
-					} else {
-						params += '&skip_auto_locate=1';
-					}
-				}
-
-				this.fromAddressPage = true;
-
-				uni.navigateTo({
-					url: `/pages/address/search?${params}`,
-					success: () => console.log('成功跳转到地址选择页面'),
-					fail: (err) => console.error('跳转地址选择页面失败:', err)
-				});
-			},
-
-			handleAddressSelected(addressData) {
-				if (!addressData) return;
-
-				// 详细地址只取 address，不再优先取 name
-				let detailAddress = '';
-				if (addressData.address) {
-					detailAddress = String(addressData.address).trim();
-				} else if (addressData.name) {
-					// 兜底：老数据里如果只有name，就尝试去掉前面的省市区
-					detailAddress = String(addressData.name).trim();
-
-					const regionParts = [];
-					if (addressData.pname) regionParts.push(addressData.pname);
-					if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData
-						.cityname);
-					if (addressData.adname) regionParts.push(addressData.adname);
-
-					const regionText = regionParts.join('');
-					const regionTextWithDash = regionParts.join('-');
-
-					if (regionText && detailAddress.indexOf(regionText) === 0) {
-						detailAddress = detailAddress.slice(regionText.length).trim();
-					} else if (regionTextWithDash && detailAddress.indexOf(regionTextWithDash) === 0) {
-						detailAddress = detailAddress.slice(regionTextWithDash.length).trim();
-					}
-
-					detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
-				}
-
-				this.displayData.address = detailAddress;
-				this.pendingData.address = detailAddress;
-
-				if (addressData.location) {
-					const [longitude, latitude] = addressData.location.split(',');
-					this.displayData.longitude = longitude || '';
-					this.displayData.latitude = latitude || '';
-					this.pendingData.longitude = longitude || '';
-					this.pendingData.latitude = latitude || '';
-				}
-
-				if (addressData.pname || addressData.cityname || addressData.adname) {
-					const locationParts = [];
-					if (addressData.pname) locationParts.push(addressData.pname);
-					if (addressData.cityname) locationParts.push(addressData.cityname);
-					if (addressData.adname) locationParts.push(addressData.adname);
-
-					const dependency = locationParts.join('-');
-					this.displayData.dependency = dependency;
-					this.pendingData.dependency = dependency;
-				}
-
-				if (addressData.provinceCode || addressData.cityCode || addressData.districtCode) {
-					this.displayData.dependency_province = addressData.provinceCode || '';
-					this.displayData.dependency_city = addressData.cityCode || '';
-					this.displayData.dependency_code = addressData.districtCode || '';
-
-					this.pendingData.dependency_province = addressData.provinceCode || '';
-					this.pendingData.dependency_city = addressData.cityCode || '';
-					this.pendingData.dependency_code = addressData.districtCode || '';
-				}
-
-				console.log('地址更新完成:', {
-					address: this.displayData.address,
-					dependency: this.displayData.dependency,
-					longitude: this.displayData.longitude,
-					latitude: this.displayData.latitude
-				});
-
-				this.$forceUpdate();
-			},
-
-			openExperiencePicker() {
-				if (!this.editable) return;
-				uni.showActionSheet({
-					itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
-					success: (res) => {
-						const experiences = ['实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-						this.displayData.major = res.tapIndex + 1;
-						this.displayData.experienceText = experiences[res.tapIndex];
-						console.log('选择专业经验:', this.displayData.major, this.displayData.experienceText);
-					}
-				});
-			}
-		}
-	}
+    import request from '../../utils/request';
+    import ChinaCitys from '../../static/data/ChinaCitys.json';
+    import {
+        debounce
+    } from '@/utils/debounce.js';
+    import uploadImage from '../../utils/uploadImage';
+    import permissionUtils from '../../utils/per'; // 新增
+    import locationService from '../../utils/locationService'; // 新增
+
+    export default {
+        data() {
+            return {
+                // 页面状态
+                editable: false,
+                buttonType: 'change',
+                showAuditTip: false,
+                auditStatus: null,
+                applyId: null,
+                showPendingData: false,
+                navTitle: '门店信息变更',
+                buttonAreaHeight: 120,
+                backText: '',
+                hasResubmitted: false,
+
+                // 数据管理
+                originalData: {},
+                pendingData: {},
+                displayData: {},
+
+                // 门店信息字段
+                ChinaCitys: ChinaCitys,
+                locatinCitys: [],
+                locationAreas: [],
+                locationValue: [0, 0, 0],
+                showLocationPopupFlag: false,
+                showTipPopupFlag: false,
+                tipTitle: '',
+                tipImage: '',
+                currentTipType: '',
+                userId: null,
+                identity: 3,
+                applyType: 3,
+
+                // 选择器数据
+                hours: Array.from({
+                    length: 24
+                }, (_, i) => i < 10 ? `0${i}` : `${i}`),
+                minutes: Array.from({
+                    length: 60
+                }, (_, i) => i < 10 ? `0${i}` : `${i}`),
+                indicatorStyle: 'height: 68rpx;',
+
+                // 地址相关
+                fromAddressPage: false,
+                addressListener: null,
+                dependency_code: '',
+                dependency_province: '',
+                dependency_city: '',
+                longitude: '',
+                latitude: '',
+
+                // 权限控制变量
+                isShowStoragePer: false,
+                isShowCameraPer: false,
+                isShowLocationPer: false,
+            }
+        },
+        computed: {
+            shouldShowRejectReason() {
+                if (this.auditStatus !== 3) return false;
+                if (!this.backText) return false;
+                if (this.showPendingData) return false;
+                return true;
+            }
+        },
+        onLoad() {
+            uni.$on('address-selected-for-sj', (addressData) => {
+                this.handleAddressSelected(addressData);
+            });
+
+            console.log('页面开始加载...');
+            this.identity = getApp().globalData.artisanType;
+            console.log('当前身份类型:', this.identity);
+
+            this.getUserInfo();
+            this.loadApplyDetails();
+
+            this.locatinCitys = this.ChinaCitys[0].citys;
+            this.locationAreas = this.locatinCitys[0]?.areas || [];
+        },
+        onUnload() {
+            uni.$off('address-selected-for-sj');
+        },
+        onReady() {
+            this.getButtonAreaHeight();
+        },
+        onShow() {
+            console.log('页面显示，检查地址数据');
+            this.checkAddressData();
+
+            if (!this.editable) {
+                this.loadApplyDetails();
+            } else {
+                console.log('编辑模式下，跳过自动刷新，保持当前编辑状态');
+            }
+
+            if (this.auditStatus !== 3) {
+                this.backText = '';
+                this.hasResubmitted = false;
+            }
+        },
+        onHide() {
+            this.fromAddressPage = false;
+        },
+        methods: {
+            // 检查地址数据（原有）
+            checkAddressData() {
+                try {
+                    const sjAddress = uni.getStorageSync('sj_selected_address');
+                    if (sjAddress) {
+                        this.handleAddressSelected(sjAddress);
+                        uni.removeStorageSync('sj_selected_address');
+                        return;
+                    }
+                } catch (e) {}
+
+                if (getApp().globalData && getApp().globalData.selectedAddress) {
+                    this.handleAddressSelected(getApp().globalData.selectedAddress);
+                    delete getApp().globalData.selectedAddress;
+                }
+
+                try {
+                    const storedAddress = uni.getStorageSync('selectedAddress');
+                    if (storedAddress) {
+                        this.handleAddressSelected(storedAddress);
+                        uni.removeStorageSync('selectedAddress');
+                    }
+                } catch (e) {}
+            },
+
+            // 获取用户信息（原有，未变）
+            getUserInfo() {
+                console.log('开始获取用户信息...');
+                const type = 3;
+
+                request.post('/user/getuser', {
+                    type
+                }).then(result => {
+                    console.log('接口返回完整数据:', result);
+
+                    if (result.state === 1 && result.data) {
+                        const userData = result.data;
+                        console.log('用户数据详情:', userData);
+
+                        this.userId = userData.id;
+
+                        this.originalData = {
+                            head_photo: userData.head_photo || '',
+                            name: userData.name || '',
+                            dependency: userData.dependency || '',
+                            address: userData.address || '',
+                            dependency_code: userData.dependency_code || '',
+                            dependency_province: userData.dependency_province || '',
+                            dependency_city: userData.dependency_city || '',
+                            longitude: userData.longitude || '',
+                            latitude: userData.latitude || ''
+                        };
+
+                        this.dependency_code = userData.dependency_code || '';
+                        this.dependency_province = userData.dependency_province || '';
+                        this.dependency_city = userData.dependency_city || '';
+                        this.longitude = userData.longitude || '';
+                        this.latitude = userData.latitude || '';
+
+                        this.pendingData = {
+                            ...this.originalData
+                        };
+                        this.displayData = {
+                            ...this.originalData
+                        };
+
+                        console.log('数据初始化完成');
+                    } else {
+                        console.warn('接口返回state不是1或data为空');
+                    }
+                }).catch(error => {
+                    console.error('获取用户信息失败:', error);
+                });
+            },
+
+            // 智能判断申请状态（原有）
+            intelligentStatusCheck(detail) {
+                if (detail.apply_state === 2) {
+                    console.log('智能判断：申请已审核通过');
+                    return {
+                        isValid: true,
+                        status: 2,
+                        backText: ''
+                    };
+                }
+                if (detail.apply_time) {
+                    const applyDate = new Date(detail.apply_time);
+                    const now = new Date();
+                    const daysDiff = (now - applyDate) / (1000 * 60 * 60 * 24);
+                    if (daysDiff > 7 && this.originalData.name !== detail.name) {
+                        console.log('智能判断：申请记录已过期，忽略历史记录');
+                        return {
+                            isValid: false,
+                            status: null,
+                            backText: ''
+                        };
+                    }
+                }
+                return {
+                    isValid: true,
+                    status: detail.apply_state,
+                    backText: detail.back_text || ''
+                };
+            },
+
+            // 加载申请详情（原有）
+            async loadApplyDetails() {
+                try {
+                    console.log('开始加载申请详情...');
+                    const res = await request.post('/sj/userSjAuth/details', {
+                        apply_type: this.applyType
+                    });
+
+                    console.log('申请详情接口返回:', res);
+
+                    if (res.code === 200 && res.data) {
+                        const detail = res.data;
+                        const statusCheck = this.intelligentStatusCheck(detail);
+
+                        if (!statusCheck.isValid) {
+                            this.auditStatus = null;
+                            this.backText = '';
+                            this.applyId = null;
+                        } else {
+                            this.applyId = detail.id;
+                            this.auditStatus = statusCheck.status;
+                            this.backText = statusCheck.backText;
+
+                            console.log('审核状态:', this.auditStatus);
+                            console.log('驳回原因:', this.backText);
+
+                            if (this.auditStatus === 2) {
+                                console.log('审核通过，强制清除驳回相关状态');
+                                this.backText = '';
+                                this.hasResubmitted = false;
+                            }
+
+                            if (this.auditStatus === 1 || this.auditStatus === 3) {
+                                this.pendingData = {
+                                    head_photo: detail.head_photo || this.originalData.head_photo,
+                                    name: detail.name || this.originalData.name,
+                                    dependency: detail.dependency || this.originalData.dependency,
+                                    address: detail.address || this.originalData.address,
+                                    dependency_code: detail.dependency_code || this.originalData.dependency_code,
+                                    dependency_province: detail.dependency_province || this.originalData
+                                        .dependency_province,
+                                    dependency_city: detail.dependency_city || this.originalData.dependency_city,
+                                    longitude: detail.longitude || this.originalData.longitude,
+                                    latitude: detail.latitude || this.originalData.latitude
+                                };
+                            }
+
+                            if (this.auditStatus === 2) {
+                                this.originalData = {
+                                    ...this.pendingData
+                                };
+                            }
+                        }
+
+                        this.updatePageStatus();
+
+                    } else {
+                        console.log('申请详情返回数据为空或code不为200:', res);
+                        this.backText = '';
+                        this.updatePageStatus();
+                    }
+                } catch (error) {
+                    console.error('加载申请详情失败:', error);
+                    this.backText = '';
+                    this.updatePageStatus();
+                }
+            },
+
+            // 更新页面状态（原有）
+            updatePageStatus() {
+                console.log('更新页面状态，审核状态:', this.auditStatus);
+
+                if (this.auditStatus !== 3) {
+                    this.backText = '';
+                }
+
+                if (this.hasResubmitted && this.auditStatus === 3) {
+                    console.log('检测到已重新提交，强制设置为审核中状态');
+                    this.auditStatus = 1;
+                    this.backText = '';
+                }
+
+                if (this.auditStatus === 1) {
+                    this.showAuditTip = true;
+                    this.buttonType = 'view';
+                    this.editable = false;
+                    this.showPendingData = false;
+                    this.displayData = {
+                        ...this.originalData
+                    };
+                } else if (this.auditStatus === 3) {
+                    this.showAuditTip = false;
+                    this.buttonType = 'reject';
+                    this.editable = false;
+                    this.showPendingData = false;
+                    this.displayData = {
+                        ...this.originalData
+                    };
+                } else {
+                    this.showAuditTip = false;
+                    this.buttonType = 'change';
+                    this.editable = false;
+                    this.showPendingData = false;
+                    this.displayData = {
+                        ...this.originalData
+                    };
+                }
+
+                this.updateNavTitle();
+            },
+
+            updateNavTitle() {
+                if (this.editable || this.showPendingData) {
+                    this.navTitle = '门店信息变更';
+                } else {
+                    this.navTitle = '门店信息';
+                }
+            },
+
+            startChange() {
+                this.editable = true;
+                this.buttonType = 'edit';
+                this.displayData = {
+                    ...this.pendingData
+                };
+                this.updateNavTitle();
+            },
+
+            cancelChange() {
+                this.editable = false;
+                this.buttonType = 'change';
+                this.displayData = {
+                    ...this.originalData
+                };
+                this.updateNavTitle();
+            },
+
+            togglePendingData() {
+                this.showPendingData = !this.showPendingData;
+                if (this.showPendingData) {
+                    this.displayData = {
+                        ...this.pendingData
+                    };
+                } else {
+                    this.displayData = {
+                        ...this.originalData
+                    };
+                }
+                this.updateNavTitle();
+            },
+
+            async submitChange() {
+                console.log('开始提交变更...');
+                console.log('提交前的displayData:', this.displayData);
+
+                if (!this.validateForm()) {
+                    return;
+                }
+
+                try {
+                    uni.showLoading({
+                        title: '提交中...'
+                    });
+
+                    this.pendingData = {
+                        ...this.displayData
+                    };
+
+                    const submitData = {
+                        apply_type: this.applyType,
+                        head_photo: this.displayData.head_photo,
+                        name: this.displayData.name,
+                        dependency: this.displayData.dependency,
+                        address: this.displayData.address,
+                        longitude: this.displayData.longitude,
+                        latitude: this.displayData.latitude,
+                        dependency_code: this.displayData.dependency_code,
+                        dependency_province: this.displayData.dependency_province,
+                        dependency_city: this.displayData.dependency_city
+                    };
+
+                    console.log('提交的数据:', submitData);
+
+                    const res = await request.post('/sj/userSjAuth/apply', submitData);
+
+                    uni.hideLoading();
+
+                    if (res.code === 200) {
+                        uni.showToast({
+                            title: '提交成功',
+                            icon: 'none'
+                        });
+
+                        this.backText = '';
+                        this.auditStatus = 1;
+                        this.hasResubmitted = true;
+
+                        this.pendingData = {
+                            ...this.displayData
+                        };
+
+                        this.editable = false;
+                        this.buttonType = 'view';
+                        this.showAuditTip = true;
+                        this.showPendingData = false;
+
+                        setTimeout(() => {
+                            this.loadApplyDetails();
+                        }, 1500);
+
+                    } else {
+                        uni.showToast({
+                            title: res.msg || '提交失败',
+                            icon: 'none'
+                        });
+                    }
+                } catch (error) {
+                    uni.hideLoading();
+                    console.error('提交失败:', error);
+                    uni.showToast({
+                        title: '网络错误，请重试',
+                        icon: 'none'
+                    });
+                }
+            },
+
+            validateForm() {
+                if (!this.displayData.head_photo) {
+                    uni.showToast({
+                        title: '请上传店铺logo',
+                        icon: 'none'
+                    });
+                    return false;
+                }
+                if (!this.displayData.name) {
+                    uni.showToast({
+                        title: '请输入店铺名称',
+                        icon: 'none'
+                    });
+                    return false;
+                }
+                if (!this.displayData.dependency) {
+                    uni.showToast({
+                        title: '请选择门店所在地',
+                        icon: 'none'
+                    });
+                    return false;
+                }
+                if (!this.displayData.address) {
+                    uni.showToast({
+                        title: '请选择门店详细地址',
+                        icon: 'none'
+                    });
+                    return false;
+                }
+                return true;
+            },
+
+            getButtonAreaHeight() {
+                setTimeout(() => {
+                    const query = uni.createSelectorQuery().in(this);
+                    query.select('.bottom-actions').boundingClientRect(data => {
+                        if (data) this.buttonAreaHeight = data.height + 20;
+                    }).exec();
+                }, 100);
+            },
+
+            showTipPopup(field) {
+                const tipConfig = {
+                    'store_logo': {
+                        title: '如何查看店铺logo',
+                        image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/98ad5649-db6d-4453-a308-c592fe155ed9'
+                    },
+                    'store_name': {
+                        title: '如何查看店铺名称',
+                        image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
+                    }
+                };
+                if (tipConfig[field]) {
+                    this.currentTipType = field;
+                    this.tipTitle = tipConfig[field].title;
+                    this.tipImage = tipConfig[field].image;
+                    this.showTipPopupFlag = true;
+                }
+            },
+
+            hideTipPopup() {
+                this.showTipPopupFlag = false;
+            },
+
+            // 修改后的 chooseImage（加入权限检查）
+            async chooseImage(type) {
+                if (!this.editable) return;
+
+                const systemInfo = uni.getSystemInfoSync();
+                const isIOS = systemInfo.platform === 'ios';
+
+                // 弹出操作菜单
+                const res = await new Promise((resolve, reject) => {
+                    uni.showActionSheet({
+                        itemList: ['拍照', '从相册选择'],
+                        success: resolve,
+                        fail: reject
+                    });
+                }).catch(() => ({
+                    tapIndex: -1
+                }));
+
+                if (res.tapIndex === -1) return; // 用户取消
+
+                // 处理拍照
+                if (res.tapIndex === 0) {
+                    if (isIOS) {
+                        this._openCamera(type, ['camera']);
+                    } else {
+                        this.isShowCameraPer = true;
+                        const {
+                            granted
+                        } = await permissionUtils.checkPermission('camera', '需要相机权限以拍照');
+                        if (granted) {
+                            this.isShowCameraPer = false;
+                            this._openCamera(type, ['camera']);
+                            return;
+                        }
+                        this.isShowCameraPer = false;
+                        const confirm = await this.showPermissionDialog('相机权限申请', '我们需要访问您的相机权限，以便您拍照上传店铺logo');
+                        if (!confirm) return;
+                        const result = await permissionUtils.requestPermission('camera', '需要相机权限以拍照');
+                        if (result) {
+                            this._openCamera(type, ['camera']);
+                        } else {
+                            locationService.openAppSettings();
+                        }
+                    }
+                }
+                // 处理从相册选择
+                else if (res.tapIndex === 1) {
+                    if (isIOS) {
+                        this._openCamera(type, ['album']);
+                    } else {
+                        this.isShowStoragePer = true;
+                        const {
+                            granted
+                        } = await permissionUtils.checkPermission('photo_library', '需要存储权限以选择照片');
+                        if (granted) {
+                            this.isShowStoragePer = false;
+                            this._openCamera(type, ['album']);
+                            return;
+                        }
+                        this.isShowStoragePer = false;
+                        const confirm = await this.showPermissionDialog('存储权限申请', '我们需要访问您的相册权限，以便您上传店铺logo');
+                        if (!confirm) return;
+                        const result = await permissionUtils.requestPermission('photo_library', '需要存储权限以选择照片');
+                        if (result) {
+                            this._openCamera(type, ['album']);
+                        } else {
+                            locationService.openAppSettings();
+                        }
+                    }
+                }
+            },
+
+            // 实际打开相机/相册
+            async _openCamera(type, sourceType) {
+                try {
+                    const chooseResult = await new Promise((resolve, reject) => {
+                        uni.chooseImage({
+                            count: 1,
+                            sizeType: ['compressed'],
+                            sourceType: sourceType,
+                            success: resolve,
+                            fail: reject
+                        });
+                    });
+
+                    if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) return;
+
+                    const tempFilePath = chooseResult.tempFilePaths[0];
+                    const file = {
+                        path: tempFilePath,
+                        size: 0
+                    };
+
+                    const result = await this.directUpload(file, this.userId, this.identity + 1);
+
+                    if (result) {
+                        this.displayData.head_photo = result;
+                        console.log('图片上传成功，head_photo 更新为:', result);
+                    }
+                } catch (err) {
+                    console.log('上传图片错误:', err);
+                    if (!err.errMsg || !err.errMsg.includes('cancel')) {
+                        uni.showToast({
+                            title: '上传失败',
+                            icon: 'none'
+                        });
+                    }
+                }
+            },
+
+            // 显示权限说明弹窗
+            showPermissionDialog(title, content) {
+                return new Promise((resolve) => {
+                    uni.showModal({
+                        title,
+                        content,
+                        confirmText: '去开启',
+                        success(res) {
+                            resolve(res.confirm);
+                        }
+                    });
+                });
+            },
+
+            async openCamera(type) {
+                try {
+                    const chooseResult = await new Promise((resolve, reject) => {
+                        uni.chooseImage({
+                            count: 1,
+                            sizeType: ['compressed'],
+                            sourceType: ['album', 'camera'],
+                            success: resolve,
+                            fail: reject
+                        });
+                    });
+
+                    if (!chooseResult.tempFilePaths || chooseResult.tempFilePaths.length === 0) return;
+
+                    const tempFilePath = chooseResult.tempFilePaths[0];
+                    const file = {
+                        path: tempFilePath,
+                        size: 0
+                    };
+
+                    const result = await this.directUpload(file, this.userId, this.identity + 1);
+
+                    if (result) {
+                        this.displayData.head_photo = result;
+                        console.log('图片上传成功，head_photo 更新为:', result);
+                    }
+                } catch (err) {
+                    console.log('上传图片错误:', err);
+                    if (!err.errMsg || !err.errMsg.includes('cancel')) {
+                        uni.showToast({
+                            title: '上传失败',
+                            icon: 'none'
+                        });
+                    }
+                }
+            },
+
+            // 直接上传方法（原有）
+            async directUpload(file, userId, type) {
+                try {
+                    let date = new Date().getTime();
+                    let artisan = type == 1 ? 'yh' : type == 2 ? 'syr' : type == 3 ? 'sj' : '';
+
+                    let fileExtension = 'jpg';
+                    if (file.path.includes('.')) {
+                        let parts = file.path.split('.');
+                        let ext = parts[parts.length - 1].toLowerCase();
+                        if (ext && ext.length <= 4) {
+                            fileExtension = ext;
+                        }
+                    }
+
+                    let name = `${userId}_${artisan}_${date}.${fileExtension}`;
+                    console.log('安全文件名:', name);
+
+                    const ossConfig = await request.post('/user/getalioss', {
+                        type,
+                        kind: 1
+                    });
+
+                    return await new Promise((resolve, reject) => {
+                        uni.uploadFile({
+                            url: ossConfig.host,
+                            filePath: file.path,
+                            name: 'file',
+                            formData: {
+                                key: ossConfig.dir + name,
+                                policy: ossConfig.policy,
+                                OSSAccessKeyId: ossConfig.ossAccessKeyId,
+                                success_action_status: '200',
+                                signature: ossConfig.signature
+                            },
+                            success: (res) => {
+                                if (res.statusCode === 200) {
+                                    const fileUrl = `${ossConfig.host}/${ossConfig.dir}${name}`;
+                                    resolve(fileUrl);
+                                } else {
+                                    reject(new Error('上传失败'));
+                                }
+                            },
+                            fail: reject
+                        });
+                    });
+                } catch (error) {
+                    console.error('直接上传失败:', error);
+                    throw error;
+                }
+            },
+
+            // 所在地选择相关方法（原有，略）
+            showLocationPopup() {
+                if (!this.editable) return;
+                this.showLocationPopupFlag = true;
+            },
+            hideLocationPopup() {
+                this.showLocationPopupFlag = false;
+            },
+            bindChangeLocation(e) {
+                this.locationValue = e.detail.value;
+                let index1 = e.detail.value[0] || 0;
+                let index2 = e.detail.value[1] || 0;
+                this.locatinCitys = this.ChinaCitys[index1].citys;
+                this.locationAreas = this.locatinCitys[index2]?.areas || [];
+            },
+            confirmLocationSelect() {
+                let valueArr = this.locationValue;
+                let index1 = valueArr[0] || 0;
+                let index2 = valueArr[1] || 0;
+                let index3 = valueArr[2] || 0;
+                let province = this.ChinaCitys[index1].province;
+                let city = this.locatinCitys[index2].city;
+                let area = this.locationAreas[index3].area;
+                this.displayData.dependency = province + '-' + city + '-' + area;
+                this.displayData.address = '';
+                this.displayData.longitude = '';
+                this.displayData.latitude = '';
+
+                if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+                    let provinceCode = this.ChinaCitys[index1].code.toString();
+                    this.displayData.dependency_province = provinceCode.substring(0, 6);
+                }
+                if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
+                    let cityCode = this.locatinCitys[index2].code.toString();
+                    this.displayData.dependency_city = cityCode.substring(0, 6);
+                }
+                if (this.locationAreas[index3] && this.locationAreas[index3].code) {
+                    let areaCode = this.locationAreas[index3].code.toString();
+                    this.displayData.dependency_code = areaCode.substring(0, 6);
+                }
+
+                this.hideLocationPopup();
+            },
+
+            buildRegionTextForSearch() {
+                const dependency = String(this.displayData.dependency || '').trim();
+                if (!dependency) return '';
+
+                const parts = dependency.split('-');
+                const province = parts[0] || '';
+                const city = parts[1] || '';
+                const district = parts[2] || '';
+
+                let regionText = '';
+                if (province) regionText += province;
+                if (city && city !== province) regionText += city;
+                if (district) regionText += district;
+
+                return regionText;
+            },
+
+            getAddressValueForSearch() {
+                const rawAddress = String(this.displayData.address || '').trim();
+                if (!rawAddress) return '';
+
+                const dependencyText = String(this.displayData.dependency || '').trim();
+                const regionText = this.buildRegionTextForSearch();
+
+                let detail = rawAddress;
+
+                // 兼容“完整地址被存进address字段”的情况，进入搜索页时只传详细地址
+                if (regionText && detail.indexOf(regionText) === 0) {
+                    detail = detail.slice(regionText.length).trim();
+                } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+                    detail = detail.slice(dependencyText.length).trim();
+                }
+
+                detail = detail.replace(/^[\s,-]+/, '').trim();
+
+                return detail || rawAddress;
+            },
+
+            async getAddressInfo() {
+                if (!this.editable) return;
+
+                const systemInfo = uni.getSystemInfoSync();
+                const isIOS = systemInfo.platform === 'ios';
+
+                const hasDependency = !!String(this.displayData.dependency || '').trim();
+                const hasAddress = !!String(this.getAddressValueForSearch() || '').trim();
+                const hasLocation = !!(this.displayData.longitude && this.displayData.latitude);
+                const hasExistingAddressData = hasDependency || hasAddress || hasLocation;
+
+                // iOS不走你这套权限工具的二次弹窗逻辑，直接进搜索页
+                // 如果当前没有任何地址信息，则让搜索页自己只尝试一次定位
+                if (isIOS) {
+                    this._navigateToAddress({
+                        canInitCurrentLocation: !hasExistingAddressData
+                    });
+                    return;
+                }
+
+                // 已有所在地/详细地址/经纬度时，直接带现有值进入，不再额外申请定位
+                if (hasExistingAddressData) {
+                    this._navigateToAddress({
+                        canInitCurrentLocation: false
+                    });
+                    return;
+                }
+
+                // 只有完全空白进入时，才申请一次定位权限
+                this.isShowLocationPer = true;
+
+                let granted = false;
+
+                try {
+                    const checkRes = await permissionUtils.checkPermission('location', '需要定位权限以获取您的位置');
+                    granted = typeof checkRes === 'boolean' ? checkRes : !!(checkRes && checkRes.granted);
+
+                    if (!granted) {
+                        const requestRes = await permissionUtils.requestPermission('location', '需要定位权限以获取您的位置');
+                        granted = typeof requestRes === 'boolean' ? requestRes : !!(requestRes && requestRes.granted);
+                    }
+                } catch (error) {
+                    console.log('定位权限申请流程异常:', error);
+                    granted = false;
+                }
+
+                this.isShowLocationPer = false;
+
+                // 不管用户同不同意，都进入搜索地址页
+                // 同意：按当前位置初始化
+                // 不同意/没给权限：进入页面但不自动精确定位
+                this._navigateToAddress({
+                    canInitCurrentLocation: granted
+                });
+            },
+
+            _navigateToAddress({
+                canInitCurrentLocation = false
+            } = {}) {
+                let params = 'source=sj_info';
+
+                const dependency = String(this.displayData.dependency || '').trim();
+                const dependencyCode = String(this.displayData.dependency_code || '').trim();
+                const address = this.getAddressValueForSearch();
+                const longitude = this.displayData.longitude;
+                const latitude = this.displayData.latitude;
+
+                const hasDependency = !!dependency;
+                const hasAddress = !!address;
+                const hasLocation = !!(longitude && latitude);
+
+                if (hasDependency) {
+                    params += `&dependency=${encodeURIComponent(dependency)}`;
+                    if (dependencyCode) {
+                        params += `&dependency_code=${dependencyCode}`;
+                    }
+                }
+
+                // 关键修复：把详细地址带过去，搜索页才能回填
+                if (hasAddress) {
+                    params += `&address=${encodeURIComponent(address)}`;
+                }
+
+                if (hasLocation) {
+                    params += `&longitude=${longitude}&latitude=${latitude}`;
+                }
+
+                // 当前门店信息页没有任何已知地址数据时，再决定搜索页是否初始化当前位置
+                if (!hasDependency && !hasAddress && !hasLocation) {
+                    if (canInitCurrentLocation) {
+                        params += '&init_current_location=1&silent_locate=1';
+                    } else {
+                        params += '&skip_auto_locate=1';
+                    }
+                }
+
+                this.fromAddressPage = true;
+
+                uni.navigateTo({
+                    url: `/pages/address/search?${params}`,
+                    success: () => console.log('成功跳转到地址选择页面'),
+                    fail: (err) => console.error('跳转地址选择页面失败:', err)
+                });
+            },
+
+            handleAddressSelected(addressData) {
+                if (!addressData) return;
+
+                // 详细地址只取 address，不再优先取 name
+                let detailAddress = '';
+                if (addressData.address) {
+                    detailAddress = String(addressData.address).trim();
+                } else if (addressData.name) {
+                    // 兜底：老数据里如果只有name，就尝试去掉前面的省市区
+                    detailAddress = String(addressData.name).trim();
+
+                    const regionParts = [];
+                    if (addressData.pname) regionParts.push(addressData.pname);
+                    if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData
+                        .cityname);
+                    if (addressData.adname) regionParts.push(addressData.adname);
+
+                    const regionText = regionParts.join('');
+                    const regionTextWithDash = regionParts.join('-');
+
+                    if (regionText && detailAddress.indexOf(regionText) === 0) {
+                        detailAddress = detailAddress.slice(regionText.length).trim();
+                    } else if (regionTextWithDash && detailAddress.indexOf(regionTextWithDash) === 0) {
+                        detailAddress = detailAddress.slice(regionTextWithDash.length).trim();
+                    }
+
+                    detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
+                }
+
+                this.displayData.address = detailAddress;
+                this.pendingData.address = detailAddress;
+
+                if (addressData.location) {
+                    const [longitude, latitude] = addressData.location.split(',');
+                    this.displayData.longitude = longitude || '';
+                    this.displayData.latitude = latitude || '';
+                    this.pendingData.longitude = longitude || '';
+                    this.pendingData.latitude = latitude || '';
+                }
+
+                if (addressData.pname || addressData.cityname || addressData.adname) {
+                    const locationParts = [];
+                    if (addressData.pname) locationParts.push(addressData.pname);
+                    if (addressData.cityname) locationParts.push(addressData.cityname);
+                    if (addressData.adname) locationParts.push(addressData.adname);
+
+                    const dependency = locationParts.join('-');
+                    this.displayData.dependency = dependency;
+                    this.pendingData.dependency = dependency;
+                }
+
+                if (addressData.provinceCode || addressData.cityCode || addressData.districtCode) {
+                    this.displayData.dependency_province = addressData.provinceCode || '';
+                    this.displayData.dependency_city = addressData.cityCode || '';
+                    this.displayData.dependency_code = addressData.districtCode || '';
+
+                    this.pendingData.dependency_province = addressData.provinceCode || '';
+                    this.pendingData.dependency_city = addressData.cityCode || '';
+                    this.pendingData.dependency_code = addressData.districtCode || '';
+                }
+
+                console.log('地址更新完成:', {
+                    address: this.displayData.address,
+                    dependency: this.displayData.dependency,
+                    longitude: this.displayData.longitude,
+                    latitude: this.displayData.latitude
+                });
+
+                this.$forceUpdate();
+            }
+        }
+    }
 </script>
 
 <style scoped lang="less">
-	.store-info-page {
-		padding-bottom: 20rpx;
-	}
-
-	.page-content {
-		flex: 1;
-		overflow-y: auto;
-		box-sizing: border-box;
-		padding: 20rpx 20rpx;
-	}
-
-	.change-tip {
-		background: #FAE7EC;
-		padding: 20rpx;
-		text-align: center;
-	}
-
-	.change-tip text {
-		font-size: 28rpx;
-		color: #D4131F;
-	}
-
-	.audit-tip {
-		margin: 20rpx 24rpx 20rpx 24rpx;
-		border-radius: 12rpx;
-	}
-
-	.audit-text {
-		font-weight: 400;
-		font-size: 32rpx;
-		color: #333333;
-		text-align: center;
-		display: block;
-	}
-
-	.reject-reason {
-		background: transparent;
-		padding: 24rpx;
-	}
-
-	.reject-title {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #333333;
-		line-height: 45rpx;
-		text-align: center;
-		font-style: normal;
-	}
-
-	.reject-detail {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #999999;
-		line-height: 40rpx;
-		text-align: center;
-		font-style: normal;
-		margin-top: 12rpx;
-	}
-
-	.section-title {
-		display: flex;
-		align-items: center;
-		margin-bottom: 30rpx;
-	}
-
-	.title-bar {
-		width: 6rpx;
-		height: 30rpx;
-		background-color: #E8101E;
-		margin-right: 7rpx;
-		border-radius: 5rpx;
-	}
-
-	.section-title text {
-		font-size: 36rpx;
-		color: #1D2129;
-		font-weight: 400;
-	}
-
-	.box-cont {
-		background: #ffffff;
-		border-radius: 20rpx;
-		margin-bottom: 24rpx;
-		margin-left: 8rpx;
-		margin-right: 8rpx;
-		box-shadow: none;
-	}
-
-	.form-item {
-		padding: 24rpx;
-	}
-
-	.label {
-		display: block;
-		font-size: 28rpx;
-		color: #333333;
-		font-weight: 500;
-	}
-
-	.required::before {
-		content: '*';
-		color: #FF0000;
-		margin-right: 4rpx;
-	}
-
-	.upload-box {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 160rpx;
-		border-radius: 20rpx;
-	}
-
-	.upload-placeholder {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.upload-icon {
-		width: 120rpx;
-		height: 120rpx;
-	}
-
-	.logo-image {
-		width: 120rpx;
-		height: 120rpx;
-		border-radius: 20rpx;
-	}
-
-	.form-item-one {
-		display: flex;
-		align-items: center;
-		padding: 24rpx;
-	}
-
-	.label-wrapper {
-		display: inline-flex;
-		align-items: center;
-		transform: translateY(4rpx);
-	}
-
-	.label {
-		font-size: 28rpx;
-		color: #333333;
-		font-weight: 500;
-		line-height: 1;
-	}
-
-	.label-icon {
-		width: 26rpx;
-		height: 26rpx;
-		margin-left: 8rpx;
-		align-items: center;
-	}
-
-	.form-item-two {
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
-		padding: 24rpx;
-
-		.label {
-			transform: translateY(4rpx);
-		}
-
-	}
-
-	/* 左侧标签：固定宽度，不换行 */
-	.form-item-two>text.label {
-		flex-shrink: 0;
-		font-size: 28rpx;
-		color: #333333;
-		font-weight: 500;
-	}
-
-	.input {
-		flex: 1;
-		font-size: 28rpx;
-		color: #333333;
-		text-align: right;
-	}
-
-	.placeholder {
-		color: #999999;
-	}
-
-	.picker-content {
-		flex: 1;
-		display: flex;
-		align-items: center;
-		/* justify-content: center; */
-		gap: 16rpx;
-		word-break: break-all;
-	}
-
-	.picker-value,
-	.placeholder {
-		flex: 1;
-		/* 占据剩余宽度 */
-		text-align: right;
-		/* 文字右对齐 */
-		font-size: 28rpx;
-		word-break: break-all;
-		white-space: normal;
-		line-height: 1.4;
-	}
-
-	.arrow-right {
-		width: 14rpx;
-		height: 26rpx;
-		flex-shrink: 0;
-		/* margin-left: 16rpx; */
-	}
-
-	.bottom-actions {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		padding: 0rpx 24rpx 40rpx 24rpx;
-		background: #ffffff;
-		z-index: 100;
-	}
-
-	.action-btn {
-		height: 88rpx;
-		border-radius: 43rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 32rpx;
-		font-weight: 400;
-		margin-top: 20rpx;
-	}
-
-	.change-info-btn,
-	.view-change-btn,
-	.resubmit-btn {
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-	}
-
-	.action-buttons-row {
-		display: flex;
-		justify-content: space-between;
-		margin: 0 30rpx;
-	}
-
-	.action-buttons-row .action-btn {
-		width: 270rpx;
-	}
-
-	.cancel-btn {
-		background: #E5E5E5;
-		border-radius: 43rpx;
-		padding: 0 15rpx;
-	}
-
-	.submit-btn {
-		background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
-		border-radius: 43rpx;
-		padding: 0 15rpx;
-	}
-
-	.btn-text {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 36rpx;
-		color: #FFFFFF;
-		line-height: 50rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.cancel-text {
-		color: #666666;
-	}
-
-	.popup {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 999;
-		visibility: hidden;
-		opacity: 0;
-		transition: all 0.3s ease;
-	}
-
-	.popup.show {
-		visibility: visible;
-		opacity: 1;
-	}
-
-	.popup-mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-	}
-
-	.popup-content {
-		position: relative;
-		background-color: #FFFFFF;
-		border-radius: 24rpx 24rpx 0 0;
-		padding: 32rpx;
-		transform: translateY(100%);
-		transition: transform 0.3s ease;
-	}
-
-	.popup.show .popup-content {
-		transform: translateY(0);
-	}
-
-	.popup-header {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 20rpx;
-	}
-
-	.popup-title {
-		font-size: 32rpx;
-		color: #333333;
-		font-weight: 500;
-	}
-
-	.popup-close {
-		font-size: 40rpx;
-		color: #999999;
-		padding: 16rpx;
-	}
-
-	.region-body {
-		height: 400rpx;
-	}
-
-	.picker-scroll {
-		height: 400rpx;
-	}
-
-	.picker-item {
-		height: 68rpx;
-		line-height: 68rpx;
-		text-align: center;
-	}
-
-	.popup-footer {
-		display: flex;
-		margin-top: 32rpx;
-	}
-
-	.popup-btn {
-		flex: 1;
-		height: 88rpx;
-		border-radius: 44rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin: 0 16rpx;
-	}
-
-	.popup-btn.cancel {
-		background-color: #F5F5F5;
-	}
-
-	.popup-btn.confirm {
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-	}
-
-	.popup-btn .btn-text {
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	.popup-btn.cancel .btn-text {
-		color: #666666;
-	}
-
-	.popup-btn.confirm .btn-text {
-		color: #FFFFFF;
-	}
-
-	.tip-popup {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 1000;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		visibility: hidden;
-		opacity: 0;
-		transition: all 0.3s ease;
-	}
-
-	.tip-popup.show {
-		visibility: visible;
-		opacity: 1;
-	}
-
-	.tip-popup-mask {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-	}
-
-	.tip-popup-content {
-		position: relative;
-		width: 620rpx;
-		height: 810rpx;
-	}
-
-	.tip-popup-bg {
-		width: 620rpx;
-		height: 810rpx;
-		position: absolute;
-		top: 0;
-		left: 0;
-	}
-
-	.tip-popup-body {
-		position: relative;
-		flex-direction: column;
-		padding: 80rpx 20rpx 40rpx 20rpx;
-		box-sizing: border-box;
-	}
-
-	.tip-title {
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #333;
-		text-align: center;
-		margin-top: 107rpx;
-		margin-bottom: 37rpx;
-	}
-
-	.tip-image-container {
-		align-items: center;
-		justify-content: center;
-		margin-bottom: 50rpx;
-	}
-
-	.tip-image.store_logo {
-		width: 582rpx;
-		height: 327rpx;
-		margin-right: 0;
-		margin-left: -15rpx;
-	}
-
-	.tip-image.store_name {
-		width: 627rpx;
-		height: 327rpx;
-		margin-left: 13rpx;
-	}
-
-	.tip-buttons {
-		display: flex;
-		justify-content: space-between;
-		padding: 0 28rpx;
-	}
-
-	.tip-btn {
-		width: 250rpx;
-		height: 80rpx;
-		border-radius: 40rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 32rpx;
-		font-weight: 500;
-	}
-
-	.tip-btn.cancel {
-		border: #E8101E 2rpx solid;
-		background-color: transparent;
-		color: #e8101e;
-	}
-
-	.tip-btn.confirm {
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
-		color: #FFFFFF;
-	}
-
-	.tip-btn .btn-text {
-		color: inherit;
-	}
-
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-		opacity: 1;
-		visibility: visible;
-	}
+    .store-info-page {
+        padding-bottom: 20rpx;
+    }
+
+    .page-content {
+        flex: 1;
+        overflow-y: auto;
+        box-sizing: border-box;
+        padding: 20rpx 20rpx;
+    }
+
+    .change-tip {
+        background: #FAE7EC;
+        padding: 20rpx;
+        text-align: center;
+    }
+
+    .change-tip text {
+        font-size: 28rpx;
+        color: #D4131F;
+    }
+
+    .audit-tip {
+        margin: 20rpx 24rpx 20rpx 24rpx;
+        border-radius: 12rpx;
+    }
+
+    .audit-text {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #333333;
+        text-align: center;
+        display: block;
+    }
+
+    .reject-reason {
+        background: transparent;
+        padding: 24rpx;
+    }
+
+    .reject-title {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #333333;
+        line-height: 45rpx;
+        text-align: center;
+        font-style: normal;
+    }
+
+    .reject-detail {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #999999;
+        line-height: 40rpx;
+        text-align: center;
+        font-style: normal;
+        margin-top: 12rpx;
+    }
+
+    .section-title {
+        display: flex;
+        align-items: center;
+        margin-bottom: 30rpx;
+    }
+
+    .title-bar {
+        width: 6rpx;
+        height: 30rpx;
+        background-color: #E8101E;
+        margin-right: 7rpx;
+        border-radius: 5rpx;
+    }
+
+    .section-title text {
+        font-size: 36rpx;
+        color: #1D2129;
+        font-weight: 400;
+    }
+
+    .box-cont {
+        background: #ffffff;
+        border-radius: 20rpx;
+        margin-bottom: 24rpx;
+        margin-left: 8rpx;
+        margin-right: 8rpx;
+        box-shadow: none;
+    }
+
+    .form-item {
+        padding: 24rpx;
+    }
+
+    .label {
+        display: block;
+        font-size: 28rpx;
+        color: #333333;
+        font-weight: 500;
+    }
+
+    .required::before {
+        content: '*';
+        color: #FF0000;
+        margin-right: 4rpx;
+    }
+
+    .upload-box {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 160rpx;
+        border-radius: 20rpx;
+    }
+
+    .upload-placeholder {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .upload-icon {
+        width: 120rpx;
+        height: 120rpx;
+    }
+
+    .logo-image {
+        width: 120rpx;
+        height: 120rpx;
+        border-radius: 20rpx;
+    }
+
+    .form-item-one {
+        display: flex;
+        align-items: center;
+        padding: 24rpx;
+    }
+
+    .label-wrapper {
+        display: inline-flex;
+        align-items: center;
+        transform: translateY(4rpx);
+    }
+
+    .label {
+        font-size: 28rpx;
+        color: #333333;
+        font-weight: 500;
+        line-height: 1;
+    }
+
+    .label-icon {
+        width: 26rpx;
+        height: 26rpx;
+        margin-left: 8rpx;
+        align-items: center;
+    }
+
+    .form-item-two {
+        display: flex;
+        align-items: flex-start;
+        justify-content: space-between;
+        padding: 24rpx;
+
+        .label {
+            transform: translateY(4rpx);
+        }
+
+    }
+
+    /* 左侧标签：固定宽度，不换行 */
+    .form-item-two>text.label {
+        flex-shrink: 0;
+        font-size: 28rpx;
+        color: #333333;
+        font-weight: 500;
+    }
+
+    .input {
+        flex: 1;
+        font-size: 28rpx;
+        color: #333333;
+        text-align: right;
+    }
+
+    .placeholder {
+        color: #999999;
+    }
+
+    .picker-content {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        /* justify-content: center; */
+        gap: 16rpx;
+        word-break: break-all;
+    }
+
+    .picker-value,
+    .placeholder {
+        flex: 1;
+        /* 占据剩余宽度 */
+        text-align: right;
+        /* 文字右对齐 */
+        font-size: 28rpx;
+        word-break: break-all;
+        white-space: normal;
+        line-height: 1.4;
+    }
+
+    .arrow-right {
+        width: 14rpx;
+        height: 26rpx;
+        flex-shrink: 0;
+        /* margin-left: 16rpx; */
+    }
+
+    .bottom-actions {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        padding: 0rpx 24rpx 40rpx 24rpx;
+        background: #ffffff;
+        z-index: 100;
+    }
+
+    .action-btn {
+        height: 88rpx;
+        border-radius: 43rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 32rpx;
+        font-weight: 400;
+        margin-top: 20rpx;
+    }
+
+    .change-info-btn,
+    .view-change-btn,
+    .resubmit-btn {
+        background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+    }
+
+    .action-buttons-row {
+        display: flex;
+        justify-content: space-between;
+        margin: 0 30rpx;
+    }
+
+    .action-buttons-row .action-btn {
+        width: 270rpx;
+    }
+
+    .cancel-btn {
+        background: #E5E5E5;
+        border-radius: 43rpx;
+        padding: 0 15rpx;
+    }
+
+    .submit-btn {
+        background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+        border-radius: 43rpx;
+        padding: 0 15rpx;
+    }
+
+    .btn-text {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 36rpx;
+        color: #FFFFFF;
+        line-height: 50rpx;
+        text-align: left;
+        font-style: normal;
+    }
+
+    .cancel-text {
+        color: #666666;
+    }
+
+    .popup {
+        position: fixed;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 999;
+        visibility: hidden;
+        opacity: 0;
+        transition: all 0.3s ease;
+    }
+
+    .popup.show {
+        visibility: visible;
+        opacity: 1;
+    }
+
+    .popup-mask {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba(0, 0, 0, 0.5);
+    }
+
+    .popup-content {
+        position: relative;
+        background-color: #FFFFFF;
+        border-radius: 24rpx 24rpx 0 0;
+        padding: 32rpx;
+        transform: translateY(100%);
+        transition: transform 0.3s ease;
+    }
+
+    .popup.show .popup-content {
+        transform: translateY(0);
+    }
+
+    .popup-header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 20rpx;
+    }
+
+    .popup-title {
+        font-size: 32rpx;
+        color: #333333;
+        font-weight: 500;
+    }
+
+    .popup-close {
+        font-size: 40rpx;
+        color: #999999;
+        padding: 16rpx;
+    }
+
+    .region-body {
+        height: 400rpx;
+    }
+
+    .picker-scroll {
+        height: 400rpx;
+    }
+
+    .picker-item {
+        height: 68rpx;
+        line-height: 68rpx;
+        text-align: center;
+    }
+
+    .popup-footer {
+        display: flex;
+        margin-top: 32rpx;
+    }
+
+    .popup-btn {
+        flex: 1;
+        height: 88rpx;
+        border-radius: 44rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin: 0 16rpx;
+    }
+
+    .popup-btn.cancel {
+        background-color: #F5F5F5;
+    }
+
+    .popup-btn.confirm {
+        background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+    }
+
+    .popup-btn .btn-text {
+        font-size: 32rpx;
+        font-weight: 500;
+    }
+
+    .popup-btn.cancel .btn-text {
+        color: #666666;
+    }
+
+    .popup-btn.confirm .btn-text {
+        color: #FFFFFF;
+    }
+
+    .tip-popup {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 1000;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        visibility: hidden;
+        opacity: 0;
+        transition: all 0.3s ease;
+    }
+
+    .tip-popup.show {
+        visibility: visible;
+        opacity: 1;
+    }
+
+    .tip-popup-mask {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba(0, 0, 0, 0.5);
+    }
+
+    .tip-popup-content {
+        position: relative;
+        width: 620rpx;
+        height: 810rpx;
+    }
+
+    .tip-popup-bg {
+        width: 620rpx;
+        height: 810rpx;
+        position: absolute;
+        top: 0;
+        left: 0;
+    }
+
+    .tip-popup-body {
+        position: relative;
+        flex-direction: column;
+        padding: 80rpx 20rpx 40rpx 20rpx;
+        box-sizing: border-box;
+    }
+
+    .tip-title {
+        font-size: 36rpx;
+        font-weight: bold;
+        color: #333;
+        text-align: center;
+        margin-top: 107rpx;
+        margin-bottom: 37rpx;
+    }
+
+    .tip-image-container {
+        align-items: center;
+        justify-content: center;
+        margin-bottom: 50rpx;
+    }
+
+    .tip-image.store_logo {
+        width: 582rpx;
+        height: 327rpx;
+        margin-right: 0;
+        margin-left: -15rpx;
+    }
+
+    .tip-image.store_name {
+        width: 627rpx;
+        height: 327rpx;
+        margin-left: 13rpx;
+    }
+
+    .tip-buttons {
+        display: flex;
+        justify-content: space-between;
+        padding: 0 28rpx;
+    }
+
+    .tip-btn {
+        width: 250rpx;
+        height: 80rpx;
+        border-radius: 40rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 32rpx;
+        font-weight: 500;
+    }
+
+    .tip-btn.cancel {
+        border: #E8101E 2rpx solid;
+        background-color: transparent;
+        color: #e8101e;
+    }
+
+    .tip-btn.confirm {
+        background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+        color: #FFFFFF;
+    }
+
+    .tip-btn .btn-text {
+        color: inherit;
+    }
+
+    .permission.transform {
+        top: calc(var(--status-bar-height) + 88rpx + 20rpx);
+        opacity: 1;
+        visibility: visible;
+    }
 </style>
\ No newline at end of file

From f65e18ea3d68bb413a9f0cd845dc0ef3f620441e Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 10:26:55 +0800
Subject: [PATCH 069/118] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/business-time.vue | 567 +++++++++++++++++++++++++++++------
 1 file changed, 482 insertions(+), 85 deletions(-)

diff --git a/pages/shop/business-time.vue b/pages/shop/business-time.vue
index ed88f68..905b550 100644
--- a/pages/shop/business-time.vue
+++ b/pages/shop/business-time.vue
@@ -1,31 +1,99 @@
 <template>
   <view class="service-time-page">
-    <!-- 顶部导航栏 -->
-    <custom-navbar title="营业时间" :showBack="true"></custom-navbar>
+    <custom-navbar title="营业设置" :showBack="true"></custom-navbar>
     
-    <!-- 内容区域 -->
     <view class="content">
-      <!--营业时间卡片 -->
-      <view class="section-card">
-        <view class="section-header">
-          <view class="title-bar"></view>
-          <text class="section-title">营业时间</text>
+      
+      <view class="setting-row">
+        <text class="setting-label">当前接单状态</text>
+        <view class="custom-switch" :class="{ 'is-on': isOpenStore }" @click="toggleStatus">
+          <text class="switch-text text-on">接单中</text>
+          <text class="switch-text text-off">不接单</text>
+          <view class="switch-dot"></view>
+        </view>
+      </view>
+
+      <view class="service-time-card">
+        <view class="card-header-flex" @click="isExpandTime = !isExpandTime">
+          <text class="header-title">{{ isExpandTime ? '服务时间' : '设置服务时间' }}</text>
+          <image class="arrow-icon" :class="{ 'rotated': isExpandTime }" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6cfe4592-e9c6-45b6-ac45-625bc361aded.png"></image>
         </view>
         
-        <!-- 时间显示 -->
-        <view class="time-display-section">
-          <view class = "time-value-box">
-          <text class="time-value">营业时间</text>
-          <text class="time-value2">{{ currentTime }}</text>
+        <view class="time-content" v-if="isExpandTime">
+          <view class="time-blocks-container">
+            <view class="t-block">
+              <text class="t-time">{{ formatTime(startTime) }}</text>
+              <text class="t-label">开始时间</text>
+            </view>
+            <text class="t-separator">至</text>
+            <view class="t-block">
+              <text class="t-time">{{ formatTime(endTime) }}</text>
+              <text class="t-label">结束时间</text>
+            </view>
           </view>
-          <view class="change-button" @click="showTimePicker" v-if="!showBottomActions && !showTimePickerFlag">
-            <text class="change-text">信息变更 </text>
-            <image class="arrow-right" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b87d4918-4282-4f51-931c-292435ba5d36" mode="aspectFit"></image>
+          
+          <view class="modify-btn-outline" @click="showTimePicker" v-if="!showBottomActions && !showTimePickerFlag">
+            <image class="edit-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d67adcda-d334-440f-87d4-d709983b0101.png"></image>
+            <text>修改服务时间</text>
+          </view>
+        </view>
+      </view>
+
+      <view class="setup-modal-mask" v-if="showSetupModal" catchtouchmove="true">
+        <view class="setup-modal-content">
+          <image class="modal-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ac2cb4aa-a7c5-4776-98f4-b77e9c0cfa85.png"></image>
+          
+          <view class="modal-header">
+            <text>温馨提示</text>
+          </view>
+
+          <view class="modal-body">
+            <text class="modal-subtitle">发布服务请完善以下资料：</text>
+            
+            <view class="missing-list">
+              <view class="missing-item" v-if="!hasBusinessTime">
+                <view class="item-left">
+                  <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png"></image>
+                  <view class="item-texts">
+                    <text class="item-title">营业时间未配置</text>
+                    <text class="item-desc">请完善店铺的营业时间</text>
+                  </view>
+                </view>
+                <view class="item-right orange" @tap="goToBusinessTime">去配置</view>
+              </view>
+
+              <view class="missing-item" v-if="!hasServiceSkill">
+                <view class="item-left">
+                  <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png"></image>
+                  <view class="item-texts">
+                    <text class="item-title">服务技能未配置</text>
+                    <text class="item-desc">请完善服务技能</text>
+                  </view>
+                </view>
+                <view class="item-right orange" @tap="goToServiceSkill">去配置</view>
+              </view>
+
+              <view class="missing-item" v-if="!isCertified">
+                <view class="item-left">
+                  <image class="item-icon" :src="isUnderReview ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'"></image>
+                  <view class="item-texts">
+                    <text class="item-title" :class="{'blue-text': isUnderReview}">{{ isUnderReview ? '资质认证中' : '资质未认证' }}</text>
+                    <text class="item-desc">请完成资质认证</text>
+                  </view>
+                </view>
+                <view class="item-right" :class="isUnderReview ? 'grey' : 'light-green'" @tap="goToAuth">
+                  {{ isUnderReview ? '查看进度' : '去认证' }}
+                </view>
+              </view>
+            </view>
+          </view>
+
+          <view class="modal-footer">
+            <view class="btn-know" @tap="closeSetupModal">知道了</view>
           </view>
         </view>
       </view>
 
-      <!-- 营业时间选择器（五列选择器） -->
       <view class="popup" :class="{ show: showTimePickerFlag }">
         <view class="popup-mask" @click="hideTimePicker"></view>
         <view class="popup-content">
@@ -78,7 +146,6 @@
         </view>
       </view>
 
-      <!-- 底部操作按钮（在选择时间后显示） -->
       <view class="bottom-actions" v-if="showBottomActions">
         <view class="action-buttons">
           <button class="btn-cancel-large" @click="cancelChange">取消</button>
@@ -115,14 +182,62 @@ export default {
       endTime: {
         hour: '21',
         minute: '00'
+      },
+
+      // 以下为首页同步过来的弹窗与状态判定数据
+      userInfo: {},
+      authDetails: null,
+      sjId: null,
+      showSetupModal: false,
+      isExpandTime: false, // 控制服务时间卡片的折叠（false）与展开（true）
+      isLogin: true // 默认已登录
+    }
+  },
+  computed: {
+    // 依据后端详情判断是否真实处于审核中
+    isUnderReview() {
+      if (!this.isLogin) return false;
+      if (this.authDetails && Object.keys(this.authDetails).length > 0) {
+        return true; 
       }
+      return false; 
+    },
+    // 判断是否具备接单的大前提条件
+    canOpenStore() {
+      return this.hasBusinessTime && this.hasServiceSkill && this.isCertified;
+    },
+    // 判定服务技能
+    hasServiceSkill() {
+      const fromUser = this.userInfo && Array.isArray(this.userInfo.servers_kill) && this.userInfo.servers_kill.length > 0;
+      const fromAuth = this.authDetails && Array.isArray(this.authDetails.servers_kill) && this.authDetails.servers_kill.length > 0;
+      return this.isLogin && (fromUser || fromAuth);
+    },
+    // 当前开关状态显示
+    isOpenStore() {
+      if (!this.canOpenStore) {
+        return false; 
+      }
+      return this.userInfo.order_taking == 1; 
+    },
+    isSettled() {
+      if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+      return this.userInfo.id_type !== 0; 
+    },
+    isCertified() {
+      if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+      return this.userInfo.id_type > 0;
+    },
+    hasBusinessTime() {
+      const timeFromUser = this.userInfo && this.userInfo.business_time;
+      const timeFromAuth = this.authDetails && this.authDetails.business_time;
+      return this.isLogin && !!(timeFromUser || timeFromAuth);
     }
   },
   onLoad() {
     this.loadCurrentTime();
   },
   methods: {
-    // 加载当前营业时间
+    // 加载当前营业时间 (合并了首页获取用户信息的逻辑)
     async loadCurrentTime() {
       try {
         const res = await request.post('/sj/user/getuser', {
@@ -131,6 +246,10 @@ export default {
         console.log('获取用户信息响应:', res)
 
         if (res.state === 1 && res.data) {
+          // 同步给页面 userInfo 对象，以驱动计算属性与弹窗开关
+          this.userInfo = res.data;
+          this.sjId = res.data.id;
+          
           // 检查营业时间字段
           if (res.data.business_time) {
             this.currentTime = res.data.business_time
@@ -144,6 +263,11 @@ export default {
             this.originalTime = '09:00-21:00'
             this.parseTimeString('09:00-21:00')
           }
+
+          // 如果已经开启入驻，顺便拉取一下详情用于判定服务技能等
+          if (this.isSettled) {
+            this.fetchAuthDetails();
+          }
         } else {
           throw new Error(res.msg || '获取用户信息失败')
         }
@@ -161,6 +285,80 @@ export default {
       }
     },
 
+    // 弹窗路由：获取入驻详情
+    fetchAuthDetails() {
+      request.post("/sj/userSjAuth/details", {
+        type: 1, 
+        id_type: '1' 
+      }).then(res => {
+        if (res.code == 200 && res.data) {
+          this.authDetails = res.data;
+        }
+      });
+    },
+
+    // 弹窗路由：关闭弹窗
+    closeSetupModal() {
+      this.showSetupModal = false;
+    },
+    // 弹窗路由：去配置营业时间
+    goToBusinessTime() {
+      this.showSetupModal = false;
+      uni.showToast({ title: '您当前正在营业时间页面', icon: 'none' });
+    },
+    // 弹窗路由：去配置服务技能
+    goToServiceSkill() {
+      this.showSetupModal = false;
+      uni.navigateTo({ url: '/pages/shop/service-skills' });
+    },
+    // 弹窗路由：去认证
+    goToAuth() {
+      this.showSetupModal = false;
+      if (this.isUnderReview) {
+        uni.navigateTo({ url: '/pages/ruzhu/submitres' });
+      } else {
+        this.navigateToForm();
+      }
+    },
+    // 提取公共的【去填表】路由
+    navigateToForm() {
+      if (this.isSettled) {
+        uni.navigateTo({ url: '/pages/ruzhu/ruzhu?step=3' });
+      } else {
+        uni.navigateTo({ url: '/pages/ruzhu/ruzhu' });
+      }
+    },
+
+    // 核心切换逻辑：营业中 / 休息中
+    toggleStatus() {
+      const currentStatus = this.userInfo.order_taking;
+      const isCurrentlyResting = currentStatus != 1; // 当前不是营业中即为休息中
+
+      // 强力拦截：在休息中且三大件没配全，想要接单时直接拦截弹窗
+      if (isCurrentlyResting && !this.canOpenStore) {
+        this.showSetupModal = true;
+        return;
+      }
+
+      // 准备切换的新状态
+      let newStatus = currentStatus == 1 ? 2 : 1;
+      
+      uni.showLoading({ title: '切换中...', mask: true });
+
+      request.post("/sj/sjordertaking", {
+        order_taking: newStatus,
+        sjid: this.sjId 
+      }).then((res) => {
+        uni.hideLoading();
+        this.userInfo.order_taking = newStatus; // 本地状态切换
+        this.loadCurrentTime(); // 重新拉取确认最新数据
+        uni.showToast({ title: newStatus == 1 ? '已开启接单' : '已停止接单', icon: 'none' });
+      }).catch(() => {
+        uni.hideLoading();
+        uni.showToast({ title: '网络异常，切换失败', icon: 'none' });
+      });
+    },
+
     // 解析时间字符串到开始和结束时间
     parseTimeString(timeStr) {
       const times = timeStr.split('-')
@@ -261,6 +459,7 @@ export default {
     cancelChange() {
       // 恢复原来的时间
       this.currentTime = this.originalTime
+      this.parseTimeString(this.originalTime) // 同步将方块内的时间退回
       this.showBottomActions = false
       this.tempTime = ''
     },
@@ -322,7 +521,6 @@ export default {
       }
     },
 
-
     // 验证时间合理性
     validateTime(startTime, endTime) {
       const start = new Date(`2000/01/01 ${startTime.hour}:${startTime.minute}`)
@@ -340,84 +538,281 @@ export default {
 }
 
 .content {
-  padding: 20rpx;
+  padding: 40rpx 24rpx 24rpx 24rpx;
 }
 
-.section-card {
-  background: white;
-  border-radius: 20rpx;
-  padding: 22rpx;
-  margin-bottom: 20rpx;
-}
-
-.section-header {
-  display: flex;
-  align-items: center;
-  margin-bottom: 20rpx;
-}
-
-.section-title {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #1D2129;
-  line-height: 48rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.title-bar {
-  width: 6rpx;
-  height: 30rpx;
-  background-color: #E8101E;
-  margin-right: 10rpx;
-  border-radius: 5rpx;
-}
-
-.time-display-section {
+/* 接单状态开关行样式 (依据设计图定制) */
+.setting-row {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 20rpx 0 10rpx 0 ;
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 18rpx 24rpx;
+  margin-bottom: 34rpx;
 }
-
-.time-value-box {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #333333;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-  margin-left: 16rpx;
-} 
-
-.time-value {
-  margin-right: 15rpx;
-}
-.time-value2 {
+.setting-label {
+  font-size: 30rpx;
+  color: #333;
   font-weight: 500;
 }
-
-.change-button {
+.custom-switch {
+  width: 140rpx;
+  height: 56rpx;
+  border-radius: 28rpx;
+  background-color: #D3D3D3;
+  position: relative;
   display: flex;
   align-items: center;
+  transition: background-color 0.3s;
+  box-sizing: border-box;
+  
+  &.is-on {
+    background-color: #FF4767;
+  }
+  
+  .switch-text {
+    font-size: 24rpx;
+    color: #FFFFFF;
+    position: absolute;
+    transition: opacity 0.3s;
+    font-weight: 500;
+  }
+  .text-on {
+    left: 12rpx;
+    opacity: 0;
+  }
+  .text-off {
+    right: 12rpx;
+    opacity: 1;
+  }
+  &.is-on .text-on { opacity: 1; }
+  &.is-on .text-off { opacity: 0; }
+  
+  .switch-dot {
+    width: 48rpx;
+    height: 48rpx;
+    background-color: #FFFFFF;
+    border-radius: 50%;
+    position: absolute;
+    left: 4rpx;
+    transition: transform 0.3s cubic-bezier(0.25, 1, 0.5, 1);
+    box-shadow: 0 2rpx 6rpx rgba(0,0,0,0.15);
+  }
+  &.is-on .switch-dot {
+    transform: translateX(84rpx);
+  }
 }
 
-.change-text {
-  font-family: PingFangSC, PingFang SC;
+/* 展开折叠服务时间卡片样式 */
+.service-time-card {
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 24rpx 24rpx;
+}
+.card-header-flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.header-title {
+  font-size: 30rpx;
+  color: #333;
+  font-weight: 500;
+  transition: all 0.3s ease-in-out;
+}
+.arrow-icon {
+  width: 16rpx;
+  height: 9rpx;
+  transition: transform 0.3s;
+  transform: rotate(-360deg); /* 默认朝下 */
+}
+.arrow-icon.rotated {
+  transform: rotate(180deg); /* 展开朝上 */
+}
+.time-blocks-container {
+  margin-top: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.t-block {
+  width: 280rpx;
+  height: 150rpx;
+  background: #F5F5F5 ;
+  border-radius: 16rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.t-time {
+  font-size: 42rpx;
+  color: #333;
+  font-weight: 500;
+}
+.t-label {
+  font-size: 24rpx;
+  color: #999;
+  margin-top: 12rpx;
+}
+.t-separator {
   font-weight: 400;
   font-size: 28rpx;
-  color: #E8101E;
+  color: #999999;
   line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
+}
+.modify-btn-outline {
+  margin-top: 50rpx;
+  height: 78rpx;
+  border-radius: 43rpx;
+  border: 1rpx solid #FF4767;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #FF4767;
+  font-size: 28rpx;
+  margin-bottom: 10rpx;
+}
+.edit-icon {
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 12rpx;
 }
 
-.arrow-right {
-  margin-left: 10rpx;
-  width: 11rpx;
-  height: 22rpx;
+/* ============ 提示弹窗样式 (完全一致) ============ */
+.setup-modal-mask {
+  position: fixed;
+  top: 0; left: 0; right: 0; bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  
+  .setup-modal-content {
+    width: 630rpx;
+    height: 775rpx;
+    background: #FFFFFF;
+    border-radius: 32rpx;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    
+    .modal-bg {
+      position: absolute;
+      top: 0; left: 0;
+      width: 630rpx;
+      height: 265rpx;
+      z-index: 0;
+    }
+    
+    .modal-header {
+      position: relative;
+      z-index: 1;
+      height: 150rpx;
+      display: flex;
+      align-items: flex-end;
+      justify-content: center;
+      padding-bottom: 20rpx;
+      
+      text {
+        font-size: 36rpx;
+        font-weight: bold;
+        color: #333333;
+        letter-spacing: 2rpx;
+      }
+    }
+    
+    .modal-body {
+      position: relative;
+      z-index: 1;
+      flex: 1;
+      padding: 24rpx 40rpx;
+      
+      .modal-subtitle {
+        font-size: 28rpx;
+        color: #333333;
+        margin-bottom: 40rpx;
+        display: block;
+      }
+      
+      .missing-list {
+        display: flex;
+        flex-direction: column;
+        gap: 46rpx;
+        
+        .missing-item {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          
+          .item-left {
+            display: flex;
+            align-items: flex-start;
+            
+            .item-icon {
+              width: 32rpx;
+              height: 32rpx;
+              margin-right: 16rpx;
+              flex-shrink: 0;
+              margin-top: 6rpx;
+            }
+            
+            .item-texts {
+              display: flex;
+              flex-direction: column;
+              
+              .item-title {
+                font-size: 30rpx;
+                color: #333333;
+                font-weight: 500;
+                margin-bottom: 8rpx;
+                
+                &.blue-text {
+                  color: #2b85e4;
+                }
+              }
+              
+              .item-desc {
+                font-size: 24rpx;
+                color: #999999;
+              }
+            }
+          }
+          
+          .item-right {
+            font-size: 26rpx;
+            font-weight: 400;
+            margin-top: -45rpx;
+            
+            &.orange { color: #FF7B00; }
+            &.grey { color: #999999; }
+            &.light-green { color: #18b566; }
+          }
+        }
+      }
+    }
+    
+    .modal-footer {
+      position: relative;
+      z-index: 1;
+      padding: 0 50rpx 50rpx;
+      
+      .btn-know {
+        width: 100%;
+        height: 88rpx;
+        background: #FF4767;
+        border-radius: 44rpx;
+        color: #FFFFFF;
+        font-size: 32rpx;
+        font-weight: 500;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+  }
 }
 
 /* 五列选择器样式 */
@@ -474,7 +869,7 @@ export default {
 
 .confirm-text {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -511,8 +906,10 @@ export default {
 }
 
 .time-label {
+  font-weight: 400;
   font-size: 26rpx;
   color: #999999;
+  line-height: 37rpx;
   margin-top: 8rpx;
 }
 
@@ -524,7 +921,7 @@ export default {
 }
 
 .time-block.active .time-value-picker {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .time-separator {
@@ -570,7 +967,7 @@ export default {
   border: none;
   width: 290rpx;
   height: 86rpx;
-  background: linear-gradient( 180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(135deg, #FF4767, #FF6B8A);
   border-radius: 43rpx;
 }
 
@@ -590,7 +987,7 @@ export default {
 }
 
 .btn-confirm-large {
-  background: #E8101E;
+  background: linear-gradient(135deg, #FF4767, #FF6B8A);
   color: white;
 }
 </style>
\ No newline at end of file

From 8299492d12f574b2d4e6bc1483be62ca8ef2a2c4 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 11:39:23 +0800
Subject: [PATCH 070/118] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=89=B2=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/MyTabBar.vue                       |   2 +-
 .../circle-progress/circle-progress.vue       |   2 +-
 components/common/CommonFilter.vue            |   6 ++--
 components/common/service-first-tab.vue       |   2 +-
 components/common/service-second-icon-tab.vue |   6 ++--
 components/filter-popup/filter-popup.vue      |  10 +++---
 components/filterCard/filterCard.vue          |   4 +--
 .../hao-indexList/hao-indexList.vue           |   2 +-
 components/hot-card/hot-card.vue              |   4 +--
 components/noData/noLogin.vue                 |   2 +-
 .../select-time-page/select-time-page.vue     |   6 ++--
 .../select-time-page/select-time-page2.vue    |   6 ++--
 components/service-grid/service-grid.vue      |  10 +++---
 components/shop-list/shop-list.vue            |   6 ++--
 components/step-tab/step-tab.vue              |   6 ++--
 components/time-picker/time-date-picker.vue   |   2 +-
 components/time-picker/time-picker.vue        |   2 +-
 components/upload-app/upload-app.vue          |   6 ++--
 pages.json                                    |   2 +-
 pages/address/add.nvue                        |   4 +--
 pages/address/list.vue                        |   6 ++--
 pages/address/newSearch.nvue                  |   8 ++---
 pages/address/revise.nvue                     |   4 +--
 pages/address/search-副本.nvue              |   2 +-
 pages/address/search.vue                      |  10 +++---
 pages/address/selectAddress.vue               |   2 +-
 pages/address/selectCity.vue                  |   2 +-
 pages/album/index.nvue                        |   2 +-
 pages/artisan/add-service.vue                 |  14 ++++----
 pages/artisan/belong_shop.vue                 |  22 ++++++-------
 pages/artisan/index.vue                       |  12 +++----
 pages/artisan/my.vue                          |   4 +--
 pages/artisan/profile.vue                     |   2 +-
 pages/artisan/profile_bk.vue                  |  18 +++++------
 pages/artisan/qualification_syr_change.vue    |  14 ++++----
 pages/artisan/service-area.vue                |  22 ++++++-------
 pages/artisan/service-list.vue                |  14 ++++----
 pages/artisan/service-skills.vue              |  16 +++++-----
 pages/artisan/service-time.vue                |  12 +++----
 pages/artisan/syr-info-change.vue             |  26 +++++++--------
 pages/artisan/unavailable-time.vue            |   4 +--
 pages/blogPopup/blogPopup.vue                 |   4 +--
 pages/complaint/detail.vue                    |   2 +-
 pages/contact/contact.vue                     |   2 +-
 .../evaluate/components/evaluationDetail.nvue |   2 +-
 .../evaluate/components/evaluationDetail.vue  |   2 +-
 pages/evaluate/evaluationDetails.vue          |   2 +-
 pages/evaluate/evaluationList.vue             |   2 +-
 pages/home/components/filters.vue             |   8 ++---
 pages/home/components/orderCard2.vue          |  10 +++---
 pages/home/components/project-tabs.vue        |   4 +--
 pages/home/components/workOrderCard.vue       |   8 ++---
 pages/login/login.vue                         |   2 +-
 pages/message/active_setting.vue              |   8 ++---
 pages/message/message.vue                     |   2 +-
 pages/message/message_setting.vue             |  10 +++---
 pages/message/settings.vue                    |   6 ++--
 pages/my/my.vue                               |   8 ++---
 pages/my/profile.vue                          |   8 ++---
 pages/order/all-orders.vue                    |   8 ++---
 pages/order/artisanorder-detail.vue           |   8 ++---
 pages/order/pay.vue                           |  10 +++---
 pages/order/submit.vue                        |  12 +++----
 pages/order/userorder-detail.vue              |  18 +++++------
 pages/order/userorder-list.vue                |  22 ++++++-------
 pages/promotion/components/serveList.vue      |   2 +-
 pages/promotion/effect.vue                    |   2 +-
 pages/promotion/promotion.vue                 |  18 +++++------
 pages/promotion/selectServe.vue               |   4 +--
 pages/promotion/setUpServe.vue                |  10 +++---
 pages/ruzhu/complete.vue                      |  20 ++++++------
 pages/ruzhu/qualification_sj copy.vue         |  24 +++++++-------
 pages/ruzhu/qualification_sj.vue              |  22 ++++++-------
 pages/ruzhu/ruzhu.vue                         |   4 +--
 pages/ruzhu/sj-info.vue                       |  22 ++++++-------
 pages/ruzhu/stopuse.vue                       |   2 +-
 pages/ruzhu/submitres.vue                     |   6 ++--
 pages/search/components/confirm-modal.vue     |   2 +-
 pages/search/components/filter.vue            |  10 +++---
 pages/search/components/search-box.vue        |   2 +-
 pages/search/components/search_box_result.vue |   6 ++--
 pages/search/components/serviceCardList.vue   |   6 ++--
 pages/search/components/shopCard.vue          |   4 +--
 pages/search/components/syrCardList.vue       |   4 +--
 pages/search/search-result.vue                |   8 ++---
 pages/selfOperated/addWe.vue                  |   2 +-
 pages/selfOperated/agreement.vue              |   2 +-
 .../selfOperated/components/select-adress.vue |   2 +-
 .../components/self-card-list.vue             |   4 +--
 pages/selfOperated/components/self-pay.vue    |   6 ++--
 pages/selfOperated/detail.nvue                |  10 +++---
 pages/selfOperated/list.vue                   |  14 ++++----
 pages/selfOperated/selectSyr.vue              |   6 ++--
 pages/selfOperated/serveList.vue              |   4 +--
 pages/service/appointment.vue                 |   4 +--
 pages/service/class.vue                       |   8 ++---
 pages/service/components/filter.vue           |  10 +++---
 pages/service/components/intmentFilter.vue    |   2 +-
 pages/service/components/search-box.vue       |   6 ++--
 pages/service/components/self-pay.vue         |   6 ++--
 pages/service/components/shopCard.vue         |   4 +--
 pages/service/detail.nvue                     |   6 ++--
 pages/service/store-list.vue                  |   4 +--
 pages/settings/password.vue                   |   6 ++--
 pages/settings/paypsd.vue                     |   2 +-
 pages/share/syrandsjshare.vue                 |   2 +-
 pages/share/usershare.vue                     |   2 +-
 pages/shop/SellerDetail.vue                   |   6 ++--
 pages/shop/add-service.vue                    |  14 ++++----
 pages/shop/buy-order.vue                      |   8 ++---
 pages/shop/buy-service.vue                    |  28 ++++++++--------
 pages/shop/buyorder-detail.vue                |  10 +++---
 pages/shop/components/orderCard.vue           |  10 +++---
 pages/shop/components/orderCard2.vue          |  10 +++---
 pages/shop/create-order.vue                   |   6 ++--
 pages/shop/groupBuying/addGroupBuying.vue     |  14 ++++----
 .../shop/groupBuying/components/listCard.vue  |   2 +-
 .../shop/groupBuying/components/serveCard.vue |   2 +-
 pages/shop/groupBuying/list.vue               |   6 ++--
 pages/shop/groupBuying/selectServe.vue        |   2 +-
 pages/shop/manHour/addManHour.vue             |   8 ++---
 pages/shop/manHour/buyManHour.vue             |   8 ++---
 .../shop/manHour/components/buyOrderCard.vue  |   4 +--
 .../shop/manHour/components/class_select.vue  |  12 +++----
 pages/shop/manHour/components/manHourCard.vue |  10 +++---
 pages/shop/manHour/components/orderCard.vue   |   8 ++---
 pages/shop/manHour/list.vue                   |   2 +-
 pages/shop/manHour/manHourDetail.vue          |   6 ++--
 pages/shop/manHour/manHourOrder.vue           |   6 ++--
 pages/shop/manHour/saleList.vue               |   2 +-
 pages/shop/manHourDetail.vue                  |  10 +++---
 pages/shop/pay-order.vue                      |  10 +++---
 pages/shop/pay.vue                            |  10 +++---
 pages/shop/photoAlbum/addPhoto.vue            |  24 +++++++-------
 pages/shop/photoAlbum/photoManage.vue         |   2 +-
 pages/shop/photoAlbum/videoList.vue           |  12 +++----
 pages/shop/qualification_sj_change.vue        |  30 +++++++++---------
 pages/shop/service-detail.nvue                |  12 +++----
 pages/shop/service-skills.vue                 |  16 +++++-----
 pages/shop/servicesyr-home.nvue               |   6 ++--
 pages/shop/set.vue                            |   2 +-
 pages/shop/sj-info-change.vue                 |  14 ++++----
 pages/shop/staff/addStaff.vue                 |  12 +++----
 pages/shop/staff/components/orderCard.vue     |  10 +++---
 pages/shop/staff/components/search-box.vue    |   6 ++--
 pages/shop/staff/detail.vue                   |  10 +++---
 pages/shop/staff/distribution-service.vue     |  10 +++---
 pages/shop/staff/manage.vue                   |  16 +++++-----
 pages/shop/staff/record.vue                   |   8 ++---
 pages/shop/staff/selectSyr.vue                |   8 ++---
 pages/shop/staff/serviceList.vue              |  10 +++---
 pages/shop/staff/staffDetail.vue              |   2 +-
 pages/shop/staff/unbundleList.vue             |   6 ++--
 pages/shop/userorder-detail.vue               |   6 ++--
 pages/shop/userorders.vue                     |  10 +++---
 pages/shop/workSpace/addWorkSpace.vue         |   8 ++---
 .../workSpace/components/class_select.vue     |  12 +++----
 pages/shop/workSpace/components/orderCard.vue |   8 ++---
 .../workSpace/components/workSpaceCard.vue    |  10 +++---
 pages/shop/workSpace/list.vue                 |   2 +-
 pages/shop/workSpace/saleList.vue             |   2 +-
 pages/syr/components/orderCard.vue            |   4 +--
 pages/syr/home.vue                            |  10 +++---
 pages/syr/manHour/addManHour.vue              |   8 ++---
 pages/syr/manHour/components/class_select.vue |  12 +++----
 pages/syr/manHour/components/manHourCard.vue  |  10 +++---
 pages/syr/manHour/components/orderCard.vue    |   8 ++---
 pages/syr/manHour/list.vue                    |   2 +-
 pages/syr/manHour/saleList.vue                |   2 +-
 pages/syr/manHourDetail.vue                   |   8 ++---
 pages/syr/migration.vue                       |   2 +-
 pages/syr/my.vue                              |   6 ++--
 pages/syr/shoporder-detail.vue                |   8 ++---
 pages/syr/shoporders.vue                      |   8 ++---
 pages/syr/userorder-detail.vue                |   8 ++---
 pages/syr/userorders.vue                      |   4 +--
 pages/syr/workstation/buyList.vue             |   2 +-
 pages/syr/workstation/buyWorkstation.vue      |   8 ++---
 .../workstation/components/buyOrderCard.vue   |   4 +--
 .../syr/workstation/components/orderCard.vue  |   8 ++---
 pages/syr/workstation/workstationDetail.vue   |   6 ++--
 pages/syr/workstation/workstationOrder.vue    |   6 ++--
 pages/user/components/project-tabs.vue        |   6 ++--
 pages/user/components/serviceCardList.vue     |   6 ++--
 pages/user/employee-detail.vue                |   2 +-
 pages/user/store-detail.vue                   |   4 +--
 pages/user/syr-detail.vue                     |   6 ++--
 pages/wallet/alipay.vue                       |   2 +-
 pages/wallet/alipayAccount.vue                |   4 +--
 pages/wallet/components/addPop.vue            |   4 +--
 pages/wallet/components/cashPop.vue           |   4 +--
 pages/wallet/wallet.vue                       |  10 +++---
 pages/wallet/withdrawCash.vue                 |   4 +--
 static/css/common.css                         |   4 +--
 static/images/agree_y.png                     | Bin 2894 -> 2287 bytes
 utils/ui-config.js                            |   6 ++--
 196 files changed, 724 insertions(+), 724 deletions(-)

diff --git a/components/MyTabBar.vue b/components/MyTabBar.vue
index 8f4b0e6..54c8af2 100644
--- a/components/MyTabBar.vue
+++ b/components/MyTabBar.vue
@@ -95,7 +95,7 @@ export default {
   color: #999;
 }
 .tab-text.active {
-  color: #E8101E; /* 选中颜色 */
+  color: #FF4767; /* 选中颜色 */
 }
 .tab-badge {
   position: absolute;
diff --git a/components/circle-progress/circle-progress.vue b/components/circle-progress/circle-progress.vue
index b683442..ea989e3 100644
--- a/components/circle-progress/circle-progress.vue
+++ b/components/circle-progress/circle-progress.vue
@@ -43,7 +43,7 @@ export default {
     // 圆环颜色
     color: {
       type: String,
-      default: '#E8101E'
+      default: '#FF4767'
     },
     // 背景圆环颜色
     backgroundColor: {
diff --git a/components/common/CommonFilter.vue b/components/common/CommonFilter.vue
index 8e06ee6..406a915 100644
--- a/components/common/CommonFilter.vue
+++ b/components/common/CommonFilter.vue
@@ -402,7 +402,7 @@ export default {
   }
 
   .time-option.active .time-text {
-    color: #E8101E;
+    color: #FF4767;
     font-weight: 500;
   }
 
@@ -413,7 +413,7 @@ export default {
 
   .time-discount {
     font-size: 24rpx;
-    color: #E8101E;
+    color: #FF4767;
     padding: 4rpx 12rpx;
     background-color: #fff5f6;
     border-radius: 20rpx;
@@ -444,7 +444,7 @@ export default {
   color: #666;
 }
 .active {
-  color: #E8101E; /* 选中态主题色 */
+  color: #FF4767; /* 选中态主题色 */
 }
 
 /* 服务时间按钮专属：控制下拉图标尺寸 */
diff --git a/components/common/service-first-tab.vue b/components/common/service-first-tab.vue
index cd5dbac..e911c06 100644
--- a/components/common/service-first-tab.vue
+++ b/components/common/service-first-tab.vue
@@ -52,7 +52,7 @@ export default {
     // 已定义的激活色props（无需修改）
     activeColor: {
       type: String,
-      default: "#E8101E",
+      default: "#FF4767",
     },
     // 已定义的非激活色props（无需修改）
     inactiveColor: {
diff --git a/components/common/service-second-icon-tab.vue b/components/common/service-second-icon-tab.vue
index f5c689d..757650b 100644
--- a/components/common/service-second-icon-tab.vue
+++ b/components/common/service-second-icon-tab.vue
@@ -59,7 +59,7 @@ export default {
     // 激活状态的颜色
     activeColor: {
       type: String,
-      default: "#E8101E",
+      default: "#FF4767",
     },
     // 非激活状态的颜色
     inactiveColor: {
@@ -129,7 +129,7 @@ export default {
   left: 0;
   right: 0;
   bottom: 0;
-  border: 2rpx solid #E8101E;
+  border: 2rpx solid #FF4767;
   border-radius: 48rpx;
 }
 
@@ -143,6 +143,6 @@ export default {
 }
 
 .icon-item.active .icon-text {
-  color: #E8101E;
+  color: #FF4767;
 }
 </style>
diff --git a/components/filter-popup/filter-popup.vue b/components/filter-popup/filter-popup.vue
index 4189288..9db6136 100644
--- a/components/filter-popup/filter-popup.vue
+++ b/components/filter-popup/filter-popup.vue
@@ -208,7 +208,7 @@ export default {
         padding-left: 30rpx;
         position: relative;
         &__point {
-          background-color: #E8101E;
+          background-color: #FF4767;
           height: 6rpx;
           width: 6rpx;
           border-radius: 50%;
@@ -221,7 +221,7 @@ export default {
       }
       .active {
         background: #ffffff;
-        color: #E8101E;
+        color: #FF4767;
       }
     }
     &__right {
@@ -295,17 +295,17 @@ export default {
       height: 82rpx;
       font-weight: 400;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
       line-height: 42rpx;
       text-align: left;
       font-style: normal;
     }
     &__sure {
       border-radius: 41rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
     }
     &__reset {
-      background: #E8101E;
+      background: #FF4767;
       border-radius: 41rpx;
       color: #ffffff;
     }
diff --git a/components/filterCard/filterCard.vue b/components/filterCard/filterCard.vue
index 9c203e5..3ef8b7d 100644
--- a/components/filterCard/filterCard.vue
+++ b/components/filterCard/filterCard.vue
@@ -114,8 +114,8 @@ export default {
   }
   .active {
     background: rgba(252, 67, 124, 0.1);
-    color: #E8101E;
-    border: 1rpx solid #E8101E;
+    color: #FF4767;
+    border: 1rpx solid #FF4767;
   }
 }
 </style>
diff --git a/components/hao-indexList/hao-indexList/hao-indexList.vue b/components/hao-indexList/hao-indexList/hao-indexList.vue
index eff530a..aabce58 100644
--- a/components/hao-indexList/hao-indexList/hao-indexList.vue
+++ b/components/hao-indexList/hao-indexList/hao-indexList.vue
@@ -548,7 +548,7 @@
 				width: 690rpx;
 				height: 68rpx;
 				background: #FFFFFF;
-				border: 2rpx solid #E8101E;
+				border: 2rpx solid #FF4767;
 				background-color: #fafafa;
 				display: flex;
 				align-items: center;
diff --git a/components/hot-card/hot-card.vue b/components/hot-card/hot-card.vue
index 47f3f6e..7bc0b2d 100644
--- a/components/hot-card/hot-card.vue
+++ b/components/hot-card/hot-card.vue
@@ -121,7 +121,7 @@ export default {
         border: 1rpx solid #fba9bb;
         font-weight: 500;
         font-size: 24rpx;
-        color: #E8101E;
+        color: #FF4767;
         text-align: left;
         font-style: normal;
       }
@@ -197,7 +197,7 @@ export default {
         margin-top: 10rpx;
         font-weight: 500;
         font-size: 24rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 33rpx;
         text-align: left;
         font-style: normal;
diff --git a/components/noData/noLogin.vue b/components/noData/noLogin.vue
index 5c3b06c..47e85de 100644
--- a/components/noData/noLogin.vue
+++ b/components/noData/noLogin.vue
@@ -59,7 +59,7 @@ export default {
   .loginBtn {
     width: 262rpx;
     height: 86rpx;
-    background: #e8101e;
+    background: #FF4767;
     border-radius: 43rpx;
     text-align: center;
     line-height: 86rpx;
diff --git a/components/select-time-page/select-time-page.vue b/components/select-time-page/select-time-page.vue
index 9636437..5e39ee0 100644
--- a/components/select-time-page/select-time-page.vue
+++ b/components/select-time-page/select-time-page.vue
@@ -408,11 +408,11 @@ export default {
 
 .isActive {
   background: rgba(252, 67, 124, 0.08);
-  color: #e8101e !important;
+  color: #FF4767 !important;
 }
 
 .isActive .time-picker-content__time__list__item__text {
-  color: #e8101e !important;
+  color: #FF4767 !important;
 }
 
 /* 选中样式前后弧度 */
@@ -433,7 +433,7 @@ border-radius: 0rpx 51rpx 51rpx 0rpx}
 .time-picker-content__time__sure__box {
   width: 648rpx;
   height: 94rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 48rpx;
   display: flex;
   align-items: center;
diff --git a/components/select-time-page/select-time-page2.vue b/components/select-time-page/select-time-page2.vue
index c9b03bd..e8fdd4a 100644
--- a/components/select-time-page/select-time-page2.vue
+++ b/components/select-time-page/select-time-page2.vue
@@ -467,8 +467,8 @@
 			.isActive {
 				background: rgba(252, 67, 124, 0.08);
 				border-radius: 10rpx;
-				border: 1rpx solid #E8101E;
-				color: #E8101E;
+				border: 1rpx solid #FF4767;
+				color: #FF4767;
 				/* 选中状态 */
 			}
 
@@ -493,7 +493,7 @@
 			&__box {
 				width: 648rpx;
 				height: 94rpx;
-				background: linear-gradient(140deg, #fa4e9a 0%, #E8101E 100%);
+				background: linear-gradient(140deg, #fa4e9a 0%, #FF4767 100%);
 				border-radius: 48rpx;
 				display: flex;
 				align-items: center;
diff --git a/components/service-grid/service-grid.vue b/components/service-grid/service-grid.vue
index 16b665c..a7e55ec 100644
--- a/components/service-grid/service-grid.vue
+++ b/components/service-grid/service-grid.vue
@@ -181,7 +181,7 @@
 		position: absolute;
 		top: 0rpx;
 		left: 0rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		color: #FFFFFF;
 		font-size: 24rpx;
 		padding: 6rpx 14rpx;
@@ -247,7 +247,7 @@
 	.price-symbol {
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
@@ -256,7 +256,7 @@
 	.price-value {
 		font-weight: 500;
 		font-size: 36rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
@@ -332,12 +332,12 @@
 
 .price-symbol {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-value {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
   margin-right: 12rpx;
 }
diff --git a/components/shop-list/shop-list.vue b/components/shop-list/shop-list.vue
index a7b2a0b..f6f4458 100644
--- a/components/shop-list/shop-list.vue
+++ b/components/shop-list/shop-list.vue
@@ -336,7 +336,7 @@
 	.price-text{
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
@@ -345,7 +345,7 @@
 	.price-symbol {
 		font-weight: 500;
 		font-size: 20rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
@@ -354,7 +354,7 @@
 	.price-value {
 		font-weight: 500;
 		font-size: 30rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
diff --git a/components/step-tab/step-tab.vue b/components/step-tab/step-tab.vue
index 228ad96..943a842 100644
--- a/components/step-tab/step-tab.vue
+++ b/components/step-tab/step-tab.vue
@@ -184,7 +184,7 @@ export default {
   justify-content: center;
   align-items: center;
   font-size: 28rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
   transition: all 0.3s ease;
   box-shadow: inset 0 0 4rpx rgba(232, 16, 30, 0.2);
@@ -239,13 +239,13 @@ export default {
 
 .line-progress.active {
   width: 100%;
-  background-color: #E8101E;
+  background-color: #FF4767;
   transition: width 0.3s ease;
 }
 
 .line-progress.deactivating {
   width: 0%;
-  background-color: #E8101E;
+  background-color: #FF4767;
   transition: width 0.3s ease;
   transform-origin: right center;
 }
diff --git a/components/time-picker/time-date-picker.vue b/components/time-picker/time-date-picker.vue
index 3e40274..965f575 100644
--- a/components/time-picker/time-date-picker.vue
+++ b/components/time-picker/time-date-picker.vue
@@ -383,7 +383,7 @@
 			justify-content: center;
 			width: 690rpx;
 			height: 80rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 38rpx;
 			font-weight: 400;
 			font-size: 30rpx;
diff --git a/components/time-picker/time-picker.vue b/components/time-picker/time-picker.vue
index 1cc688b..641a639 100644
--- a/components/time-picker/time-picker.vue
+++ b/components/time-picker/time-picker.vue
@@ -169,7 +169,7 @@ export default {
     justify-content: center;
     width: 690rpx;
     height: 80rpx;
-    background: #E8101E;
+    background: #FF4767;
     border-radius: 38rpx;
     font-weight: 400;
     font-size: 30rpx;
diff --git a/components/upload-app/upload-app.vue b/components/upload-app/upload-app.vue
index 917bbaf..c0ff40e 100644
--- a/components/upload-app/upload-app.vue
+++ b/components/upload-app/upload-app.vue
@@ -307,7 +307,7 @@ export default {
       &__text {
         font-weight: 400;
         font-size: 18rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 25rpx;
         text-align: left;
         font-style: normal;
@@ -371,7 +371,7 @@ export default {
       &__immediately {
         width: 236rpx;
         height: 78rpx;
-        background: #E8101E;
+        background: #FF4767;
         border-radius: 39rpx;
         display: flex;
         align-items: center;
@@ -405,7 +405,7 @@ export default {
 
         &__active {
           height: 28rpx;
-          background: linear-gradient(270deg, #fe78b3 0%, #E8101E 100%);
+          background: linear-gradient(270deg, #fe78b3 0%, #FF4767 100%);
           border-radius: 39rpx;
         }
 
diff --git a/pages.json b/pages.json
index 08037e4..a4d132a 100644
--- a/pages.json
+++ b/pages.json
@@ -1036,7 +1036,7 @@
 	},
 	"tabBar": {
 		"color": "#999",
-		"selectedColor": "#E8101E",
+		"selectedColor": "#FF4767",
 		"backgroundColor": "#fff",
 		"list": [{
 				"iconPath": "/static/images/tabbar/home_icon_dis.png",
diff --git a/pages/address/add.nvue b/pages/address/add.nvue
index 4fe7123..2e2a5d5 100644
--- a/pages/address/add.nvue
+++ b/pages/address/add.nvue
@@ -55,7 +55,7 @@
 				<!-- 设为默认地址 -->
 				<view class="form-item switch-item">
 					<text class="label">设为默认地址</text>
-					<switch :checked="addressInfo.is_default == 1" @change="onSwitchChange" color="#E8101E" />
+					<switch :checked="addressInfo.is_default == 1" @change="onSwitchChange" color="#FF4767" />
 				</view>
 				<!-- 顶部图标 -->
 				<view class="biao"></view>
@@ -622,7 +622,7 @@
 	.save-btn {
 		width: 630rpx;
 		height: 96rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 44rpx;
 		display: flex;
 		justify-content: center;
diff --git a/pages/address/list.vue b/pages/address/list.vue
index 8d7fa59..bbe9d94 100644
--- a/pages/address/list.vue
+++ b/pages/address/list.vue
@@ -261,7 +261,7 @@
 
 	/* .tag {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
   background-color: rgba(252, 67, 124, 0.08);
   padding: 6rpx 16rpx;
   border-radius: 6rpx;
@@ -370,7 +370,7 @@
 		width: 690rpx;
 		height: 78rpx;
 		border-radius: 39rpx;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		text-align: center;
 		line-height: 64rpx;
 		display: flex;
@@ -383,7 +383,7 @@
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
 		font-size: 30rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 42rpx;
 		text-align: left;
 		font-style: normal;
diff --git a/pages/address/newSearch.nvue b/pages/address/newSearch.nvue
index b0d7c08..4194541 100644
--- a/pages/address/newSearch.nvue
+++ b/pages/address/newSearch.nvue
@@ -7,7 +7,7 @@
 		<!-- <view class="search-container">
 			<text class="search-container-text" @click="goSelectCity">{{ city.name }}</text>
 			<search-box v-model="searchKeyword" placeholder="请输入地址" width="571rpx" height="68rpx"
-				border="1px solid #E8101E" style="padding: 0;" @confirm="onSearch" :showBack="false"></search-box>
+				border="1px solid #FF4767" style="padding: 0;" @confirm="onSearch" :showBack="false"></search-box>
 		</view> -->
 		<view class="search-container">
 			<text class="search-container-text" @click="goSelectCity">
@@ -858,7 +858,7 @@
 			flex: 1;
 			height: 68rpx;
 			background: #FFFFFF;
-			border: 2rpx solid #E8101E;
+			border: 2rpx solid #FF4767;
 			border-radius: 60rpx;
 			position: relative;
 
@@ -936,7 +936,7 @@
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 34rpx;
 				text-align: center;
 				font-style: normal;
@@ -1124,7 +1124,7 @@
 		width: 48rpx;
 		height: 26rpx;
 		border-radius: 6rpx;
-		background: #E8101E;
+		background: #FF4767;
 		margin-right: 10rpx;
 
 		&__text {
diff --git a/pages/address/revise.nvue b/pages/address/revise.nvue
index 86bbf04..d535b87 100644
--- a/pages/address/revise.nvue
+++ b/pages/address/revise.nvue
@@ -55,7 +55,7 @@
 				<!-- 设为默认地址 -->
 				<view class="form-item switch-item">
 					<text class="label">设为默认地址</text>
-					<switch :checked="addressInfo.is_default == 1" @change="onSwitchChange" color="#E8101E" />
+					<switch :checked="addressInfo.is_default == 1" @change="onSwitchChange" color="#FF4767" />
 				</view>
 				<!-- 顶部图标 -->
 				<view class="biao"></view>
@@ -614,7 +614,7 @@
 	.save-btn {
 		width: 630rpx;
 		height: 96rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 44rpx;
 		display: flex;
 		justify-content: center;
diff --git a/pages/address/search-副本.nvue b/pages/address/search-副本.nvue
index 6cc05bc..81f7f5d 100644
--- a/pages/address/search-副本.nvue
+++ b/pages/address/search-副本.nvue
@@ -666,7 +666,7 @@
 			flex: 1;
 			height: 68rpx;
 			background: #FFFFFF;
-			border: 2rpx solid #E8101E;
+			border: 2rpx solid #FF4767;
 			border-radius: 60rpx;
 			position: relative;
 
diff --git a/pages/address/search.vue b/pages/address/search.vue
index 71d9bbd..4f803a5 100644
--- a/pages/address/search.vue
+++ b/pages/address/search.vue
@@ -38,7 +38,7 @@
 					<view class="action-btn smart-btn" :class="{ 'smart-btn-active': hasRawContent }"
 						@click="onSmartRecognize">
 						<text class="btn-text"
-							:style="{ color: hasRawContent ? '#E8101E' : '#999999' }">{{ smartBtnText }}</text>
+							:style="{ color: hasRawContent ? '#FF4767' : '#999999' }">{{ smartBtnText }}</text>
 					</view>
 				</view>
 			</view>
@@ -2534,8 +2534,8 @@
 	}
 
 	.smart-btn.smart-btn-active {
-		border-color: #E8101E;
-		color: #E8101E;
+		border-color: #FF4767;
+		color: #FF4767;
 	}
 
 	.address-info-panel {
@@ -2606,7 +2606,7 @@
 	}
 
 	.confirm-btn {
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 49rpx;
 		height: 98rpx;
 		display: flex;
@@ -2722,7 +2722,7 @@
 	}
 
 	.popup-btn.confirm {
-		background: #e8101e;
+		background: #FF4767;
 	}
 
 	.popup-btn .btn-text {
diff --git a/pages/address/selectAddress.vue b/pages/address/selectAddress.vue
index 22ea79b..5c31a9d 100644
--- a/pages/address/selectAddress.vue
+++ b/pages/address/selectAddress.vue
@@ -274,7 +274,7 @@
 				flex: 1;
 				height: 68rpx;
 				background: #FFFFFF;
-				border: 2rpx solid #E8101E;
+				border: 2rpx solid #FF4767;
 				background-color: #fafafa;
 				display: flex;
 				align-items: center;
diff --git a/pages/address/selectCity.vue b/pages/address/selectCity.vue
index 0deb358..930e821 100644
--- a/pages/address/selectCity.vue
+++ b/pages/address/selectCity.vue
@@ -8,7 +8,7 @@
     ></custom-navbar>
     <!-- <view class="search-container">
 			<search-box v-model="searchKeyword" placeholder="请输入你的服务地址" width="690rpx" height="68rpx"
-				border="1px solid #E8101E" style="padding: 0;" @confirm="onSearch" :showBack="false"></search-box>
+				border="1px solid #FF4767" style="padding: 0;" @confirm="onSearch" :showBack="false"></search-box>
 		</view>
 		<scroll-view scroll-y class="hao-scroll">
 			<view class="hot-citys">
diff --git a/pages/album/index.nvue b/pages/album/index.nvue
index 97b70ad..cd2c2cd 100644
--- a/pages/album/index.nvue
+++ b/pages/album/index.nvue
@@ -357,7 +357,7 @@
 				.container-tab-text {
 					font-weight: 400;
 					font-size: 28rpx;
-					color: #E8101E;
+					color: #FF4767;
 					line-height: 40rpx;
 					text-align: left;
 					font-style: normal;
diff --git a/pages/artisan/add-service.vue b/pages/artisan/add-service.vue
index 4fe750c..1d8dc24 100644
--- a/pages/artisan/add-service.vue
+++ b/pages/artisan/add-service.vue
@@ -86,7 +86,7 @@
               ? "门店下单购买后，您需到上门至门店进行服务，门店端展示价格为"
               : ""
           }}
-          <text style="color: #e8101e" v-if="showShopPrice">{{
+          <text style="color: #FF4767" v-if="showShopPrice">{{
             shopPrice
           }}</text>
           {{ showShopPrice ? "元。" : "" }}
@@ -1207,13 +1207,13 @@ export default {
 
 .btn-draft {
   background-color: #ffffff;
-  color: #e8101e;
-  border: 2rpx solid #e8101e;
+  color: #FF4767;
+  border: 2rpx solid #FF4767;
   box-sizing: border-box;
 }
 
 .btn-submit {
-  background-color: #e8101e;
+  background-color: #FF4767;
   color: #ffffff;
 }
 
@@ -1485,13 +1485,13 @@ export default {
 }
 
 .popup-btn-know {
-  background-color: #e8101e;
+  background-color: #FF4767;
   color: #ffffff;
 }
 
 .popup-btn-notshow {
   background-color: #ffffff;
-  color: #e8101e;
-  border: 1rpx #e8101e solid;
+  color: #FF4767;
+  border: 1rpx #FF4767 solid;
 }
 </style>
diff --git a/pages/artisan/belong_shop.vue b/pages/artisan/belong_shop.vue
index 9abb429..e38624d 100644
--- a/pages/artisan/belong_shop.vue
+++ b/pages/artisan/belong_shop.vue
@@ -1204,7 +1204,7 @@ export default {
 }
 
 .change-info-btn, .view-change-btn, .resubmit-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -1225,7 +1225,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
@@ -1257,7 +1257,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 7rpx;
   border-radius: 5rpx;
 }
@@ -1405,7 +1405,7 @@ export default {
   width: 60rpx;
   height: 60rpx;
   border: 4rpx solid #fff;
-  border-top: 4rpx solid #E8101E;
+  border-top: 4rpx solid #FF4767;
   border-radius: 50%;
   animation: spin 1s linear infinite;
   margin-bottom: 16rpx;
@@ -1470,8 +1470,8 @@ export default {
 }
 
 .radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .radio-icon-image {
@@ -1640,7 +1640,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .popup-btn .btn-text {
@@ -1659,7 +1659,7 @@ export default {
 }
 
 .confirm-text {
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -1771,13 +1771,13 @@ export default {
 }
 
 .tip-btn.cancel {
-  border: #E8101E 2rpx solid;
+  border: #FF4767 2rpx solid;
   background-color: transparent;
-  color: #e8101e;
+  color: #FF4767;
 }
 
 .tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   color: #FFFFFF;
 }
 
diff --git a/pages/artisan/index.vue b/pages/artisan/index.vue
index 7d3d163..3aac651 100644
--- a/pages/artisan/index.vue
+++ b/pages/artisan/index.vue
@@ -165,7 +165,7 @@ export default {
       timeRange: '7days',
 	  count: 0,
       chartOpts: {
-        color: ["#E8101E"],
+        color: ["#FF4767"],
         padding: [15, 15, 0, 15],
         enableScroll: false,
         legend: false,
@@ -657,7 +657,7 @@ page {
 }
 
 .time-filter .active {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .chart-container {
@@ -676,7 +676,7 @@ page {
 	width: 214rpx;
 	height: 56rpx;
 	background-color: #FFFFFF;
-	border: 1rpx solid #E8101E;
+	border: 1rpx solid #FF4767;
 	border-radius: 8rpx;
 	display: flex;
 	justify-content: center;
@@ -687,7 +687,7 @@ page {
 
 .type-name {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .type-count {
@@ -708,7 +708,7 @@ page {
   background-color: #F53F3F;
 }
 .order-type-item.active {
-	background-color: #E8101E;
+	background-color: #FF4767;
 }
 .order-type-item.active .type-name {
   color: #FFFFFF;
@@ -800,7 +800,7 @@ page {
 }
 .action-btn.verify .action-text {
   font-size: 28rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .nothings-box {
diff --git a/pages/artisan/my.vue b/pages/artisan/my.vue
index fdf0dce..02a83a9 100644
--- a/pages/artisan/my.vue
+++ b/pages/artisan/my.vue
@@ -249,7 +249,7 @@ page {
   flex-flow: row nowrap;
   justify-content: center;
   align-items: center;
-  border: 1rpx solid #E8101E;
+  border: 1rpx solid #FF4767;
   background-color: #FFF1F1;
   border-radius: 22rpx;
   box-sizing: border-box;
@@ -267,7 +267,7 @@ page {
 }
 .verified-text {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 .verified-text.no {
   color: #666666;
diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index 9ee4fa5..bbf4a0c 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -782,7 +782,7 @@
 	.title-bar {
 		width: 6rpx;
 		height: 30rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		margin-right: 10rpx;
 		border-radius: 5rpx;
 	}
diff --git a/pages/artisan/profile_bk.vue b/pages/artisan/profile_bk.vue
index 3d92880..1097b5d 100644
--- a/pages/artisan/profile_bk.vue
+++ b/pages/artisan/profile_bk.vue
@@ -1544,7 +1544,7 @@ export default {
 
 .tag {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
   margin-left: 14rpx;
 }
 .textarea {
@@ -1655,7 +1655,7 @@ export default {
 .save-btn {
   width: 702rpx;
   height: 64rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 32rpx;
   display: flex;
   align-items: center;
@@ -1762,8 +1762,8 @@ export default {
 }
 
 .checkbox.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .check-icon {
@@ -1796,7 +1796,7 @@ export default {
 }
 
 .popup-btn.confirm {
-  background: linear-gradient(90deg, #E8101E 0%, #FF618F 100%);
+  background: linear-gradient(90deg, #FF4767 0%, #FF618F 100%);
 }
 
 .popup-btn .btn-text {
@@ -1834,7 +1834,7 @@ export default {
 }
 
 .region-tab.active {
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -1846,7 +1846,7 @@ export default {
   transform: translateX(-50%);
   width: 40rpx;
   height: 4rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 2rpx;
 }
 
@@ -1907,7 +1907,7 @@ export default {
 
 .confirm-text {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -1949,7 +1949,7 @@ export default {
 }
 
 .time-block.active .time-value {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .time-separator {
diff --git a/pages/artisan/qualification_syr_change.vue b/pages/artisan/qualification_syr_change.vue
index c25553b..3bfb332 100644
--- a/pages/artisan/qualification_syr_change.vue
+++ b/pages/artisan/qualification_syr_change.vue
@@ -43,7 +43,7 @@
             <view class="radio-item" @click="editable && setHealthCardValidType('permanent')">
               <view class="radio" :class="{ checked: displayData.health_card_expiry_type === 1 }">
                   <image v-if="displayData.health_card_expiry_type === 1" 
-                      src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" 
+                      src="/static/images/agree_y.png" 
                       class="radio-icon-image" 
                       mode="aspectFit"></image>
               </view>
@@ -52,7 +52,7 @@
               <view class="radio-item" @click="editable && setHealthCardValidType('date')">
               <view class="radio" :class="{ checked: displayData.health_card_expiry_type === 2 }">
                   <image v-if="displayData.health_card_expiry_type === 2" 
-                      src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" 
+                      src="/static/images/agree_y.png" 
                       class="radio-icon-image" 
                       mode="aspectFit"></image>
               </view>
@@ -1292,7 +1292,7 @@ export default {
 }
 
 .change-info-btn, .view-change-btn, .resubmit-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -1313,7 +1313,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
@@ -1345,7 +1345,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 7rpx;
   border-radius: 5rpx;
 }
@@ -1472,8 +1472,8 @@ export default {
 }
 
 .radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .radio-icon-image {
diff --git a/pages/artisan/service-area.vue b/pages/artisan/service-area.vue
index 3911adf..f57ff1b 100644
--- a/pages/artisan/service-area.vue
+++ b/pages/artisan/service-area.vue
@@ -104,7 +104,7 @@
               @click="toggleDistrictSelect(index)"
             >
               <view class="checkbox" :class="{ checked: district.checked }">
-                <image v-if="district.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" mode="aspectFit"></image>
+                <image v-if="district.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png" mode="aspectFit"></image>
               </view>
               <text class="checkbox-label">{{district.area}}</text>
             </view>
@@ -752,7 +752,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 10rpx;
   border-radius: 5rpx;
 }
@@ -854,7 +854,7 @@ export default {
 
 .limit-text {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 /* 区域选择器样式 */
@@ -942,7 +942,7 @@ export default {
 }
 
 .region-tab.active {
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -954,7 +954,7 @@ export default {
   transform: translateX(-50%);
   width: 40rpx;
   height: 4rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 2rpx;
 }
 
@@ -994,8 +994,8 @@ export default {
 }
 
 .checkbox.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .check-icon {
@@ -1035,7 +1035,7 @@ export default {
 }
 
 .popup-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .popup-btn .btn-text {
@@ -1075,11 +1075,11 @@ export default {
 }
 
 .change-info-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .view-change-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -1100,7 +1100,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
diff --git a/pages/artisan/service-list.vue b/pages/artisan/service-list.vue
index 942f783..b910542 100644
--- a/pages/artisan/service-list.vue
+++ b/pages/artisan/service-list.vue
@@ -467,7 +467,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
@@ -512,7 +512,7 @@
 		top: 0;
 		width: 160rpx;
 		height: 100%;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		color: #ffffff;
 		display: flex;
 		justify-content: center;
@@ -558,20 +558,20 @@
 
 	.price-symbol {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
 	.price-value {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 		margin: 0 4rpx;
 	}
 
 	.price-unit {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.status-tag {
@@ -593,7 +593,7 @@
 	}
 
 	.status-tag.state2 .status-text {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* 审核中 */
@@ -735,7 +735,7 @@
 			height: 88rpx;
 			text-align: center;
 			line-height: 88rpx;
-			background-color: #E8101E;
+			background-color: #FF4767;
 			border-radius: 16px;
 
 			.serviceBtn-text {
diff --git a/pages/artisan/service-skills.vue b/pages/artisan/service-skills.vue
index ac46be0..8b1b4dd 100644
--- a/pages/artisan/service-skills.vue
+++ b/pages/artisan/service-skills.vue
@@ -25,7 +25,7 @@
               <view class="checkbox" :class="{ checked: isCurrentSkillSelected(skill.id) }">
                 <image v-if="isCurrentSkillSelected(skill.id)" 
                        class="check-icon" 
-                       src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" 
+                       src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png" 
                        mode="aspectFit">
                 </image>
               </view>
@@ -45,7 +45,7 @@
               <view class="checkbox" :class="{ checked: skill.checked }">
                 <image v-if="skill.checked" 
                        class="check-icon" 
-                       src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" 
+                       src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png" 
                        mode="aspectFit">
                 </image>
               </view>
@@ -721,7 +721,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 10rpx;
   border-radius: 5rpx;
 }
@@ -790,8 +790,8 @@ export default {
 }
 
 .checkbox.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .check-icon {
@@ -827,12 +827,12 @@ export default {
 
 .change-info-btn {
   margin-top: 20rpx;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .view-change-btn {
   margin-top: 20rpx;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -853,7 +853,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
diff --git a/pages/artisan/service-time.vue b/pages/artisan/service-time.vue
index 0687a71..badd4d2 100644
--- a/pages/artisan/service-time.vue
+++ b/pages/artisan/service-time.vue
@@ -371,7 +371,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 10rpx;
   border-radius: 5rpx;
 }
@@ -410,7 +410,7 @@ export default {
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 28rpx;
-  color: #E8101E;
+  color: #FF4767;
   line-height: 40rpx;
   text-align: left;
   font-style: normal;
@@ -476,7 +476,7 @@ export default {
 
 .confirm-text {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -526,7 +526,7 @@ export default {
 }
 
 .time-block.active .time-value-picker {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .time-separator {
@@ -572,7 +572,7 @@ export default {
   border: none;
   width: 290rpx;
   height: 86rpx;
-  background: linear-gradient( 180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient( 180deg, #F52540 0%, #FF4767 100%, #FF4767 100%);
   border-radius: 43rpx;
 }
 
@@ -592,7 +592,7 @@ export default {
 }
 
 .btn-confirm-large {
-  background: #E8101E;
+  background: #FF4767;
   color: white;
 }
 </style>
\ No newline at end of file
diff --git a/pages/artisan/syr-info-change.vue b/pages/artisan/syr-info-change.vue
index 399e22c..6224f8d 100644
--- a/pages/artisan/syr-info-change.vue
+++ b/pages/artisan/syr-info-change.vue
@@ -100,13 +100,13 @@
           <view class="radio-group">
             <view class="radio-item" @click="editable && setIdCardValidType(1)">
               <view class="radio" :class="{ checked: displayData.idcard_expiry_type === 1 }">
-                <image v-if="displayData.idcard_expiry_type === 1" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+                <image v-if="displayData.idcard_expiry_type === 1" src="/static/images/agree_y.png" class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">长久有效</text>
             </view>
             <view class="radio-item" @click="editable && setIdCardValidType(2)">
               <view class="radio" :class="{ checked: displayData.idcard_expiry_type === 2 }">
-                <image v-if="displayData.idcard_expiry_type === 2" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60" class="radio-icon-image" mode="aspectFit"></image>
+                <image v-if="displayData.idcard_expiry_type === 2" src="/static/images/agree_y.png" class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">指定日期有效</text>
             </view>
@@ -1813,7 +1813,7 @@ export default {
 }
 
 .change-info-btn, .view-change-btn, .resubmit-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -1834,7 +1834,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
@@ -1866,7 +1866,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 7rpx;
   border-radius: 5rpx;
 }
@@ -2029,7 +2029,7 @@ export default {
   width: 60rpx;
   height: 60rpx;
   border: 4rpx solid #fff;
-  border-top: 4rpx solid #E8101E;
+  border-top: 4rpx solid #FF4767;
   border-radius: 50%;
   animation: spin 1s linear infinite;
   margin-bottom: 16rpx;
@@ -2115,8 +2115,8 @@ export default {
 }
 
 .radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .radio-icon-image {
@@ -2291,7 +2291,7 @@ export default {
 
 .confirm-text {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -2321,7 +2321,7 @@ export default {
 }
 
 .popup-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .popup-btn .btn-text {
@@ -2431,13 +2431,13 @@ export default {
 }
 
 .tip-btn.cancel {
-  border: #E8101E 2rpx solid;
+  border: #FF4767 2rpx solid;
   background-color: transparent;
-  color: #e8101e;
+  color: #FF4767;
 }
 
 .tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   color: #FFFFFF;
 }
 
diff --git a/pages/artisan/unavailable-time.vue b/pages/artisan/unavailable-time.vue
index 685339f..576d088 100644
--- a/pages/artisan/unavailable-time.vue
+++ b/pages/artisan/unavailable-time.vue
@@ -326,7 +326,7 @@ export default {
 
 .add-icon {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   margin-right: 8rpx;
 }
 
@@ -367,7 +367,7 @@ export default {
 }
 
 .confirm-btn {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .title {
diff --git a/pages/blogPopup/blogPopup.vue b/pages/blogPopup/blogPopup.vue
index c5ee426..46d706b 100644
--- a/pages/blogPopup/blogPopup.vue
+++ b/pages/blogPopup/blogPopup.vue
@@ -934,7 +934,7 @@
 			.get-code-btn {
 				font-weight: 400;
 				font-size: 30rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 42rpx;
 				text-align: center;
 				font-style: normal;
@@ -959,7 +959,7 @@
 		.input-error {
 			display: block;
 			font-size: 24rpx;
-			color: #e8101e;
+			color: #FF4767;
 			margin-left: 30rpx;
 			margin-top: -20rpx;
 			margin-bottom: 20rpx;
diff --git a/pages/complaint/detail.vue b/pages/complaint/detail.vue
index f41697a..2813423 100644
--- a/pages/complaint/detail.vue
+++ b/pages/complaint/detail.vue
@@ -132,7 +132,7 @@ import request from '../../utils/request';
 .state {
   height: 60rpx;
   line-height: 60rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   padding: 0 24rpx;
 }
 .state-text {
diff --git a/pages/contact/contact.vue b/pages/contact/contact.vue
index e0e24e2..d6f6a8b 100644
--- a/pages/contact/contact.vue
+++ b/pages/contact/contact.vue
@@ -118,7 +118,7 @@ import locationService from "@/utils/locationService";
 	color: #91908F;
 }
 .btn-box {
-	background: linear-gradient( 180deg, #F52540 0%, #E8101E 100%);
+	background: linear-gradient( 180deg, #F52540 0%, #FF4767 100%);
 	height: 88rpx;
 	border-radius: 43rpx;
 	font-weight: 500;
diff --git a/pages/evaluate/components/evaluationDetail.nvue b/pages/evaluate/components/evaluationDetail.nvue
index cf22188..d47e4fb 100644
--- a/pages/evaluate/components/evaluationDetail.nvue
+++ b/pages/evaluate/components/evaluationDetail.nvue
@@ -226,7 +226,7 @@
 	.score {
 		font-weight: 400;
 		font-size: 26rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 37rpx;
 	}
 
diff --git a/pages/evaluate/components/evaluationDetail.vue b/pages/evaluate/components/evaluationDetail.vue
index 7cc6076..e12cd55 100644
--- a/pages/evaluate/components/evaluationDetail.vue
+++ b/pages/evaluate/components/evaluationDetail.vue
@@ -251,7 +251,7 @@
 			.score {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
diff --git a/pages/evaluate/evaluationDetails.vue b/pages/evaluate/evaluationDetails.vue
index 698b4a7..2ad5aa2 100644
--- a/pages/evaluate/evaluationDetails.vue
+++ b/pages/evaluate/evaluationDetails.vue
@@ -279,7 +279,7 @@
 			.score {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
diff --git a/pages/evaluate/evaluationList.vue b/pages/evaluate/evaluationList.vue
index c41ac4f..5a92678 100644
--- a/pages/evaluate/evaluationList.vue
+++ b/pages/evaluate/evaluationList.vue
@@ -177,7 +177,7 @@
 			}
 
 			.active {
-				color: #E8101E;
+				color: #FF4767;
 			}
 		}
 
diff --git a/pages/home/components/filters.vue b/pages/home/components/filters.vue
index 903fbaf..8bd2c80 100644
--- a/pages/home/components/filters.vue
+++ b/pages/home/components/filters.vue
@@ -578,7 +578,7 @@
 
 				// 选中状态样式
 				&.active {
-					color: #e8101e; // 选中文字颜色
+					color: #FF4767; // 选中文字颜色
 					font-weight: 600; // 选中时加粗（可选，根据图片效果）
 
 					// 横条效果：通过伪元素实现
@@ -592,8 +592,8 @@
 						bottom: -6rpx; // 距离文字底部的距离（可调整）
 						height: 6rpx; // 横条高度
 						background: linear-gradient(306deg,
-								#e8101e 0%,
-								#e8101e 100%); // 横条颜色（与文字颜色一致）
+								#FF4767 0%,
+								#FF4767 100%); // 横条颜色（与文字颜色一致）
 						border-radius: 3rpx; // 横条圆角（可选，更柔和）
 					}
 				}
@@ -628,7 +628,7 @@
 
 				// 选中状态样式
 				&.active {
-					color: #e8101e; // 选中颜色
+					color: #FF4767; // 选中颜色
 					background: rgba(252, 67, 124, 0.1); // 可选：选中时背景色变化
 					font-weight: 600; // 可选：选中时加粗
 				}
diff --git a/pages/home/components/orderCard2.vue b/pages/home/components/orderCard2.vue
index eb096fa..bf8bdf5 100644
--- a/pages/home/components/orderCard2.vue
+++ b/pages/home/components/orderCard2.vue
@@ -205,7 +205,7 @@
 		.stateText {
 			font-weight: 400;
 			font-size: 26rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: left;
 			font-style: normal;
 			position: absolute;
@@ -255,7 +255,7 @@
 	.service-price {
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -292,7 +292,7 @@
 			letter-spacing: 2px;
 			text-align: left;
 			font-style: normal;
-			background: linear-gradient(166deg, #FC5E72 0%, #E8101E 100%);
+			background: linear-gradient(166deg, #FC5E72 0%, #FF4767 100%);
 			border-radius: 6rpx;
 			padding: 4rpx 4rpx 4rpx 8rpx;
 			margin-right: 13rpx;
@@ -388,8 +388,8 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 
 	.order-address {
diff --git a/pages/home/components/project-tabs.vue b/pages/home/components/project-tabs.vue
index 9c14580..ec0caad 100644
--- a/pages/home/components/project-tabs.vue
+++ b/pages/home/components/project-tabs.vue
@@ -129,7 +129,7 @@
 							
 							.tab-text {
 								font-weight: 500;
-								color: #E8101E;
+								color: #FF4767;
 								&::after{
 									content: '';
 									// 绝对定位在元素底部
@@ -139,7 +139,7 @@
 									transform: translateX(-50%);
 									bottom: -6rpx; // 距离文字底部的距离（可调整）
 									height: 6rpx; // 横条高度
-									background: linear-gradient( 306deg, #E8101E 0%, #F25988 100%); // 横条颜色（与文字颜色一致）
+									background: linear-gradient( 306deg, #FF4767 0%, #F25988 100%); // 横条颜色（与文字颜色一致）
 									border-radius: 3rpx; // 横条圆角（可选，更柔和）
 								}
 							}
diff --git a/pages/home/components/workOrderCard.vue b/pages/home/components/workOrderCard.vue
index cb77c81..b4e560d 100644
--- a/pages/home/components/workOrderCard.vue
+++ b/pages/home/components/workOrderCard.vue
@@ -135,7 +135,7 @@ export default {
 	.stateText {
 		font-weight: 400;
 		font-size: 26rpx;
-		color: #E8101E;
+		color: #FF4767;
 		text-align: left;
 		font-style: normal;
 		position: absolute;
@@ -223,7 +223,7 @@ export default {
 		font-family: DINPro, DINPro;
 		font-weight: 500;
 		font-size: 36rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -298,7 +298,7 @@ export default {
 
 /* 接单按钮 */
 .accept-btn {
-	border: 2rpx solid #E8101E;
-	color: #E8101E;
+	border: 2rpx solid #FF4767;
+	color: #FF4767;
 }
 </style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f036a6b..3367646 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -405,7 +405,7 @@
 	.login {
 		width: 630rpx;
 		height: 96rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		color: #fff;
 		font-size: 40rpx;
 		line-height: 96rpx;
diff --git a/pages/message/active_setting.vue b/pages/message/active_setting.vue
index 27cb9df..3a44ad2 100644
--- a/pages/message/active_setting.vue
+++ b/pages/message/active_setting.vue
@@ -18,7 +18,7 @@
 						</view>
 					</view>
 				</view>
-				<uv-switch v-model="mainSwitch.switch" activeColor="#E8101E" @change="handleSwitchChange('total',mainSwitch, $event)"></uv-switch>
+				<uv-switch v-model="mainSwitch.switch" activeColor="#FF4767" @change="handleSwitchChange('total',mainSwitch, $event)"></uv-switch>
 			</view>
 		</view>
 		<view class="settings-title" v-if="kindList.length">
@@ -34,7 +34,7 @@
 					</view>
 					<view class="card-tip">{{ item.text }}</view>
 				</view>
-				<uv-switch v-model="item.switch" activeColor="#E8101E" @change="handleSwitchChange('branch',item, $event)"></uv-switch>
+				<uv-switch v-model="item.switch" activeColor="#FF4767" @change="handleSwitchChange('branch',item, $event)"></uv-switch>
 			</view>
 		</view>
 
@@ -267,7 +267,7 @@
 		}
 
 		.color-red {
-			color: #E8101E !important;
+			color: #FF4767 !important;
 		}
 
 		/* 弹窗样式 */
@@ -324,7 +324,7 @@
 		.dialog-btn {
 			width: 476rpx;
 			height: 86rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 44rpx;
 			display: flex;
 			align-items: center;
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 2e1dd3c..8f68ef9 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -332,7 +332,7 @@
 			width: 16rpx;
 			height: 16rpx;
 			border-radius: 50%;
-			background-color: #E8101E;
+			background-color: #FF4767;
 			margin-left: 8rpx;
 		}
 
diff --git a/pages/message/message_setting.vue b/pages/message/message_setting.vue
index 60f9d48..22d0fee 100644
--- a/pages/message/message_setting.vue
+++ b/pages/message/message_setting.vue
@@ -18,7 +18,7 @@
 						</view>
 					</view>
 				</view>
-				<uv-switch v-model="mainSwitch.switch" activeColor="#E8101E"
+				<uv-switch v-model="mainSwitch.switch" activeColor="#FF4767"
 					@change="handleSwitchChange('total',mainSwitch, $event)"></uv-switch>
 			</view>
 		</view>
@@ -35,7 +35,7 @@
 					</view>
 					<view class="card-tip">{{ item.text }}</view>
 				</view>
-				<uv-switch v-model="item.switch" activeColor="#E8101E"
+				<uv-switch v-model="item.switch" activeColor="#FF4767"
 					@change="handleSwitchChange('branch',item, $event)"></uv-switch>
 			</view>
 		</view>
@@ -289,7 +289,7 @@
 		}
 
 		.color-red {
-			color: #E8101E !important;
+			color: #FF4767 !important;
 		}
 
 		/* 弹窗样式 */
@@ -346,7 +346,7 @@
 		.dialog-btn {
 			width: 476rpx;
 			height: 86rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 44rpx;
 			display: flex;
 			align-items: center;
@@ -437,7 +437,7 @@
 		width: 300rpx;
 		height: 80rpx;
 		line-height: 80rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 40rpx;
 		margin: 0 auto;
 	}
diff --git a/pages/message/settings.vue b/pages/message/settings.vue
index a4b1e58..d2de657 100644
--- a/pages/message/settings.vue
+++ b/pages/message/settings.vue
@@ -29,7 +29,7 @@
 					</view>
 					<view class="card-tip"> 开启语音提示避免落单</view>
 				</view>
-				<uv-switch v-model="value" @change="changeVoice" activeColor="#E8101E"></uv-switch>
+				<uv-switch v-model="value" @change="changeVoice" activeColor="#FF4767"></uv-switch>
 			</view>
 		</view>
 
@@ -292,7 +292,7 @@
 		}
 
 		.color-red {
-			color: #E8101E !important;
+			color: #FF4767 !important;
 		}
 
 		// 弹窗遮罩
@@ -348,7 +348,7 @@
 		.dialog-btn {
 			width: 400rpx;
 			height: 88rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 44rpx;
 			display: flex;
 			align-items: center;
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 71cf155..f501b8d 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -41,7 +41,7 @@
 						<image
 							src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/931c0992-5243-4c70-ab2b-b99b430661c8.png"
 							mode="aspectFill" class="wallet_content_img"></image>
-						<view class="wallet_content_text">钱包余额：<text style="color: #e8101e">{{ userInfo.money }}元</text>
+						<view class="wallet_content_text">钱包余额：<text style="color: #FF4767">{{ userInfo.money }}元</text>
 						</view>
 					</view>
 				</view>
@@ -120,7 +120,7 @@
 					<view class="imageText-content">
 						<image :src="card.url" mode="widthFix"></image>
 						<view class="text-status">入驻成功啦！</view>
-						<view class="text-next">下一步:等待<text style="color: #e8101e">专属门店商家邀约绑定</text>，解锁订单资源与服</view>
+						<view class="text-next">下一步:等待<text style="color: #FF4767">专属门店商家邀约绑定</text>，解锁订单资源与服</view>
 						<view class="text-next">务通道，开启高效变现、共创共赢的新旅程～</view>
 					</view>
 				</view>
@@ -995,7 +995,7 @@ page {
 
 				.user-identity {
 					margin-top: 10rpx;
-					border: 1rpx solid #e8101e;
+					border: 1rpx solid #FF4767;
 					border-radius: 22rpx;
 					width: 112rpx;
 					height: 44rpx;
@@ -1005,7 +1005,7 @@ page {
 
 					.identity-text {
 						font-size: 20rpx;
-						color: #e8101e;
+						color: #FF4767;
 						font-weight: 400;
 					}
 				}
diff --git a/pages/my/profile.vue b/pages/my/profile.vue
index d2b5fad..9bc603f 100644
--- a/pages/my/profile.vue
+++ b/pages/my/profile.vue
@@ -400,7 +400,7 @@ export default {
   left: 60rpx;
   width: 630rpx;
   height: 96rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 58rpx;
   display: flex;
   align-items: center;
@@ -499,7 +499,7 @@ export default {
 }
 
 .region-tab.active {
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -511,7 +511,7 @@ export default {
   transform: translateX(-50%);
   width: 40rpx;
   height: 4rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 2rpx;
 }
 
@@ -552,7 +552,7 @@ export default {
 }
 
 .popup-btn.confirm {
-  background: linear-gradient(90deg, #E8101E 0%, #FF618F 100%);
+  background: linear-gradient(90deg, #FF4767 0%, #FF618F 100%);
 }
 
 .popup-btn .btn-text {
diff --git a/pages/order/all-orders.vue b/pages/order/all-orders.vue
index 84d416c..0d6d70b 100644
--- a/pages/order/all-orders.vue
+++ b/pages/order/all-orders.vue
@@ -275,18 +275,18 @@ export default {
 
 .rating-score {
   font-size: 16rpx;
-  color: #E8101E;
+  color: #FF4767;
   margin-left: 68rpx;
 }
 
 .currency {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .amount {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -328,7 +328,7 @@ export default {
 }
 .load-date {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .load-text {
diff --git a/pages/order/artisanorder-detail.vue b/pages/order/artisanorder-detail.vue
index 258b92c..e5377c4 100644
--- a/pages/order/artisanorder-detail.vue
+++ b/pages/order/artisanorder-detail.vue
@@ -716,7 +716,7 @@ page {
 .real-price {
   font-size: 32rpx;
   font-weight: 500;
-  color: #E8101E;
+  color: #FF4767;
 }
 /* 订单信息卡片 */
 .order-card {
@@ -788,13 +788,13 @@ page {
   margin-left: 20rpx;
 }
 .btn-border {
-  border: 1rpx solid #E8101E;
+  border: 1rpx solid #FF4767;
   background-color: #fff;
   box-sizing: border-box;
   margin-left: 20rpx;
 }
 .btn-bg {
-  background-color: #E8101E;
+  background-color: #FF4767;
 }
 .button-text {
   font-size: 28rpx;
@@ -804,7 +804,7 @@ page {
 .btn-border .button-text {
   font-size: 28rpx;
   font-weight: 400;
-  color: #E8101E;
+  color: #FF4767;
 }
 /* APP适配 */
 /* #ifdef APP-PLUS */
diff --git a/pages/order/pay.vue b/pages/order/pay.vue
index 8edf58c..3f58277 100644
--- a/pages/order/pay.vue
+++ b/pages/order/pay.vue
@@ -24,7 +24,7 @@
 						<image :src="item.icon" mode="aspectFit" class="method-icon"></image>
 						<text class="method-name">{{ item.name }}</text>
 					</view>
-					<agree-radio :isAgree="item.selected" :yesImg="`/static/images/icons/yes_icon.png`" :radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
+					<agree-radio :isAgree="item.selected" :yesImg="`/static/images/agree_y.png`" :radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
 				</view>
 			</view>
 		</view>
@@ -494,7 +494,7 @@
 			::v-deep .uv-count-down__text {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;;
+				color: #FF4767;;
 				line-height: 37rpx;
 				text-align: center;
 				font-style: normal;
@@ -559,13 +559,13 @@
 	.total-amount .symbol {
 		font-size: 24rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.total-amount .amount {
 		font-size: 28rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.amount-lable {
@@ -576,7 +576,7 @@
 	.pay-btn {
 		width: 680rpx;
 		height: 88rpx;
-		background: linear-gradient( 180deg, #F52540 0%, #E8101E 100%);
+		background: linear-gradient( 180deg, #F52540 0%, #FF4767 100%);
 		border-radius: 43rpx;
 		font-weight: 500;
 		font-size: 30rpx;
diff --git a/pages/order/submit.vue b/pages/order/submit.vue
index 747777c..36d5abd 100644
--- a/pages/order/submit.vue
+++ b/pages/order/submit.vue
@@ -623,7 +623,7 @@ export default {
   height: 28rpx;
   border: 3rpx;
   margin-right: 16rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
 }
 
 .service-item {
@@ -766,7 +766,7 @@ export default {
 .price-total .price {
   font-size: 28rpx;
   font-weight: 500;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .amount-lable {
@@ -777,7 +777,7 @@ export default {
 .submit-btn {
   width: 492rpx;
   height: 64rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 32rpx;
   color: #ffffff;
   font-size: 28rpx;
@@ -984,8 +984,8 @@ export default {
     .isActive {
       background: rgba(252, 67, 124, 0.08);
       border-radius: 10rpx;
-      border: 1rpx solid #E8101E;
-      color: #E8101E;
+      border: 1rpx solid #FF4767;
+      color: #FF4767;
       /* 选中状态 */
     }
 
@@ -1010,7 +1010,7 @@ export default {
     &__box {
       width: 648rpx;
       height: 94rpx;
-      background: linear-gradient(140deg, #fa4e9a 0%, #E8101E 100%);
+      background: linear-gradient(140deg, #fa4e9a 0%, #FF4767 100%);
       border-radius: 48rpx;
       display: flex;
       align-items: center;
diff --git a/pages/order/userorder-detail.vue b/pages/order/userorder-detail.vue
index c0b9355..b046130 100644
--- a/pages/order/userorder-detail.vue
+++ b/pages/order/userorder-detail.vue
@@ -18,7 +18,7 @@
 			<view class="group-invite"
 				v-if="orderInfo.state !=1 && orderInfo.team_buy_id &&  (orderInfo.team_buy_order_state==1||orderInfo.team_buy_order_state==2)">
 				<view class="invite-text" v-if="orderInfo.team_buy_order_state == 1">参团成功，需邀请<text
-						style="color: #E8101E">{{orderInfo.team_buy.person_num - orderInfo.team_buy.pay_person_num}}</text>人才可完成拼团
+						style="color: #FF4767">{{orderInfo.team_buy.person_num - orderInfo.team_buy.pay_person_num}}</text>人才可完成拼团
 				</view>
 				<view class="invite-text" v-if="orderInfo.team_buy_order_state == 2">参团成功，已拼团成功！</view>
 
@@ -266,16 +266,16 @@
 						              formatPriceNumber(this.orderInfo.cost_money-this.orderInfo.order_money),
 						              18,
 						              2
-						            )}rpx;color: #E8101E;line-height: 25rpx;text-align: left;font-style: normal;`" />
+						            )}rpx;color: #FF4767;line-height: 25rpx;text-align: left;font-style: normal;`" />
 				</l-painter-view>
 				<l-painter-view css="margin-top:44rpx;">
 					<l-painter-text text="¥"
-						css="font-weight: 500;font-size: 26rpx;color: #E8101E;line-height: 48rpx;text-align: left;font-style: normal;" />
+						css="font-weight: 500;font-size: 26rpx;color: #FF4767;line-height: 48rpx;text-align: left;font-style: normal;" />
 					<l-painter-text :text=" formatPriceNumber(this.orderInfo.order_money)" :css="`font-weight: 500;font-size:${formatPriceSize(
 						              formatPriceNumber(this.orderInfo.order_money),
 						              56,
 						              3
-						            )}rpx;color: #E8101E;line-height: 34rpx;text-align: left;font-style: normal;`" />
+						            )}rpx;color: #FF4767;line-height: 34rpx;text-align: left;font-style: normal;`" />
 				</l-painter-view>
 				<l-painter-view css="margin-top:0rpx;">
 					<l-painter-text :text="`原价¥${formatPriceNumber(this.orderInfo.cost_money)}`" :css="`text-decoration: line-through;font-weight: 400;font-size:${formatPriceSize(
@@ -1005,7 +1005,7 @@
 	.phone-btn {
 		width: 64rpx;
 		height: 64rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 32rpx;
 	}
 
@@ -1249,7 +1249,7 @@
 	.service-price2 {
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -1282,7 +1282,7 @@
 		font-family: DINPro, DINPro;
 		font-weight: 500;
 		font-size: 36rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -1352,7 +1352,7 @@
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
@@ -1444,7 +1444,7 @@
 				align-items: center;
 				font-weight: 500;
 				font-size: 24rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 33rpx;
 				text-align: left;
 				font-style: normal;
diff --git a/pages/order/userorder-list.vue b/pages/order/userorder-list.vue
index 5129425..a1e487e 100644
--- a/pages/order/userorder-list.vue
+++ b/pages/order/userorder-list.vue
@@ -637,7 +637,7 @@
 	}
 
 	.tab-item.active {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -649,7 +649,7 @@
 		left: 50%;
 		bottom: 0;
 		transform: translateX(-50%);
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
@@ -678,7 +678,7 @@
 	}
 
 	.tab-item2.active {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 		background: #FEE5E7;
 	}
@@ -709,7 +709,7 @@
 
 	.order-tag {
 		padding: 2rpx 6rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 6rpx;
 		display: flex;
 		align-items: center;
@@ -735,22 +735,22 @@
 	.order-status {
 		font-weight: 400;
 		font-size: 26rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 39rpx;
 		text-align: left;
 		font-style: normal;
 	}
 
 	.status-pending {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.status-cancelled {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.status-completed {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.order-content {
@@ -867,13 +867,13 @@
 	}
 
 	.action-btn.primary {
-		background-color: #E8101E;
+		background-color: #FF4767;
 		color: #FFFFFF;
 	}
 
 	.action-btn.review {
 		border-color: transparent;
-		background: linear-gradient(143deg, #F52540 0%, #E8101E 100%);
+		background: linear-gradient(143deg, #F52540 0%, #FF4767 100%);
 		color: #FFFFFF;
 	}
 
@@ -961,7 +961,7 @@
 			font-family: DINPro, DINPro;
 			font-weight: 500;
 			font-size: 24rpx;
-			color: #E8101E;
+			color: #FF4767;
 			line-height: 34rpx;
 			text-align: left;
 			font-style: normal;
diff --git a/pages/promotion/components/serveList.vue b/pages/promotion/components/serveList.vue
index 4944d73..1febc7b 100644
--- a/pages/promotion/components/serveList.vue
+++ b/pages/promotion/components/serveList.vue
@@ -15,7 +15,7 @@
 							<view>
 								<view class="serve-card-right__content__title">{{item.title}}</view>
 								<view class="serve-card-right__content__price"><text
-										style="color: #E8101E;font-weight: 500;">¥{{item.server_price}} </text> {{' '}}|
+										style="color: #FF4767;font-weight: 500;">¥{{item.server_price}} </text> {{' '}}|
 									{{item.server_time}}分钟
 								</view>
 							</view>
diff --git a/pages/promotion/effect.vue b/pages/promotion/effect.vue
index b79bf9a..4106206 100644
--- a/pages/promotion/effect.vue
+++ b/pages/promotion/effect.vue
@@ -25,7 +25,7 @@
 								<text class="service-name">{{ item.server_title }}</text>
 								<text class="order-time">下单时间：{{ item.pay_time }}</text>
 								<text class="order-status">
-									订单状态：<text style="color: #E8101E;">{{ getDescriptionByNumber(item.state) }}</text>
+									订单状态：<text style="color: #FF4767;">{{ getDescriptionByNumber(item.state) }}</text>
 								</text>
 							</view>
 						</view>
diff --git a/pages/promotion/promotion.vue b/pages/promotion/promotion.vue
index 6337d93..6b7dc5d 100644
--- a/pages/promotion/promotion.vue
+++ b/pages/promotion/promotion.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="promotion">
 		<custom-navbar title="推广服务" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"
 			borderBottom="none"></custom-navbar>
 		<view class="promotion-search">
 			<view class="promotion-add">
@@ -224,7 +224,7 @@
 <style lang="less">
 	.promotion {
 		.promotion-search {
-			background: linear-gradient(134deg, #f52540 0%, #e8101e 100%);
+			background: linear-gradient(134deg, #f52540 0%, #FF4767 100%);
 			box-sizing: border-box;
 			padding: 31rpx 20rpx 60rpx 20rpx;
 
@@ -292,7 +292,7 @@
 					position: relative;
 
 					&.active {
-						color: #E8101E;
+						color: #FF4767;
 
 						&::after {
 							content: '';
@@ -325,7 +325,7 @@
 						width: 100%;
 						font-weight: 400;
 						font-size: 22rpx;
-						color: #E8101E;
+						color: #FF4767;
 						line-height: 30rpx;
 						text-align: left;
 						font-style: normal;
@@ -374,7 +374,7 @@
 								border: 1rpx solid rgba(232, 16, 30, 0.2);
 								font-weight: 400;
 								font-size: 24rpx;
-								color: #E8101E;
+								color: #FF4767;
 								line-height: 33rpx;
 								text-align: left;
 								font-style: normal;
@@ -398,7 +398,7 @@
 								font-family: DINPro, DINPro;
 								font-weight: 500;
 								font-size: 36rpx;
-								color: #E8101E;
+								color: #FF4767;
 								line-height: 46rpx;
 								text-align: left;
 								font-style: normal;
@@ -468,12 +468,12 @@
 		}
 
 		.closeModal {
-			border: 2rpx solid #E8101E;
-			color: #E8101E;
+			border: 2rpx solid #FF4767;
+			color: #FF4767;
 		}
 
 		.sureModal {
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 40rpx;
 			color: #FFFFFF;
 		}
diff --git a/pages/promotion/selectServe.vue b/pages/promotion/selectServe.vue
index a1c288f..521958e 100644
--- a/pages/promotion/selectServe.vue
+++ b/pages/promotion/selectServe.vue
@@ -2,7 +2,7 @@
 	<view class="select-serve">
 		<custom-navbar title="选择服务" backgroundColor="#FFFFFF"></custom-navbar>
 		<view class="select-tip">
-			<text style="color: #E8101E;">温馨提示：</text>您可自主勾选需推广的服务，灵活设置「比例」形式的推广佣金；
+			<text style="color: #FF4767;">温馨提示：</text>您可自主勾选需推广的服务，灵活设置「比例」形式的推广佣金；
 			配置完成后，服务将自动进入推广平台曝光，触达更多潜在客户；后续通过推广渠道（如达人链接、分享码）成功成交的订单，
 			系统会从该笔订单中，自动扣除您预设的佣金，全程无需手动操作。
 		</view>
@@ -85,7 +85,7 @@
 			&__btn {
 				width: 690rpx;
 				height: 78rpx;
-				background: #E8101E;
+				background: #FF4767;
 				border-radius: 798rpx;
 				display: flex;
 				align-items: center;
diff --git a/pages/promotion/setUpServe.vue b/pages/promotion/setUpServe.vue
index b188ff5..35f8dac 100644
--- a/pages/promotion/setUpServe.vue
+++ b/pages/promotion/setUpServe.vue
@@ -2,7 +2,7 @@
 	<view class="select-serve">
 		<custom-navbar title="设置佣金" backgroundColor="#FFFFFF"></custom-navbar>
 		<view class="select-tip">
-			<text style="color: #E8101E;">温馨提示：</text>支持 按1%~30%区间设置佣金比例，订单成功成交后，系统将按实付金额 × 佣金比例自动扣减。
+			<text style="color: #FF4767;">温馨提示：</text>支持 按1%~30%区间设置佣金比例，订单成功成交后，系统将按实付金额 × 佣金比例自动扣减。
 		</view>
 		<view v-for="(item,index) in selectedItems" :key="index" class="serve-card">
 			<image :src="item.photo[0]" mode="aspectFill" class="serve-card__img"></image>
@@ -34,7 +34,7 @@
 
 		<uv-modal ref="modal" title="提示" width="620rpx">
 			<view class="slot-content">
-				预估佣金按<text style="color: #E8101E;">「订单实付金额 × 佣金比例」</text>计算。因服务实付金额受活动参与程度影响存在波动，最终佣金以订单实际结算结果为准。
+				预估佣金按<text style="color: #FF4767;">「订单实付金额 × 佣金比例」</text>计算。因服务实付金额受活动参与程度影响存在波动，最终佣金以订单实际结算结果为准。
 			</view>
 			<template v-slot:confirmButton>
 				<view type="default" @click="closeModal" class="closeModal">确定</view>
@@ -271,7 +271,7 @@
 					font-family: DINPro, DINPro;
 					font-weight: 500;
 					font-size: 22rpx;
-					color: #E8101E;
+					color: #FF4767;
 					line-height: 34rpx;
 					text-align: left;
 					font-style: normal;
@@ -328,7 +328,7 @@
 			&__btn {
 				width: 690rpx;
 				height: 78rpx;
-				background: #E8101E;
+				background: #FF4767;
 				border-radius: 798rpx;
 				display: flex;
 				align-items: center;
@@ -347,7 +347,7 @@
 	.closeModal {
 		width: 556rpx;
 		height: 80rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 40rpx;
 		font-weight: 500;
 		font-size: 28rpx;
diff --git a/pages/ruzhu/complete.vue b/pages/ruzhu/complete.vue
index 220fef5..41d1c7f 100644
--- a/pages/ruzhu/complete.vue
+++ b/pages/ruzhu/complete.vue
@@ -1386,7 +1386,7 @@
 	.title-bar {
 		width: 6rpx;
 		height: 48rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		margin-right: 16rpx;
 		border-radius: 3rpx;
 	}
@@ -1585,7 +1585,7 @@
 
 	.promise-title {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 400;
 		margin-bottom: 24rpx;
 		text-align: center;
@@ -1603,7 +1603,7 @@
 		width: 12rpx;
 		height: 12rpx;
 		border-radius: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		margin-right: 24rpx;
 	}
 
@@ -1711,8 +1711,8 @@
 	}
 
 	.checkbox.checked {
-		background-color: #E8101E;
-		border-color: #E8101E;
+		background-color: #FF4767;
+		border-color: #FF4767;
 	}
 
 	.check-icon {
@@ -1745,7 +1745,7 @@
 	}
 
 	.popup-btn.confirm {
-		background: linear-gradient(90deg, #E8101E 0%, #FF618F 100%);
+		background: linear-gradient(90deg, #FF4767 0%, #FF618F 100%);
 	}
 
 	.popup-btn .btn-text {
@@ -1783,7 +1783,7 @@
 	}
 
 	.region-tab.active {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -1795,7 +1795,7 @@
 		transform: translateX(-50%);
 		width: 40rpx;
 		height: 4rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 2rpx;
 	}
 
@@ -1858,7 +1858,7 @@
 
 	.confirm-text {
 		font-size: 32rpx;
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -1900,7 +1900,7 @@
 	}
 
 	.time-block.active .time-value {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.time-separator {
diff --git a/pages/ruzhu/qualification_sj copy.vue b/pages/ruzhu/qualification_sj copy.vue
index 39037df..8f3fa0f 100644
--- a/pages/ruzhu/qualification_sj copy.vue	
+++ b/pages/ruzhu/qualification_sj copy.vue	
@@ -167,7 +167,7 @@
             <view class="checkbox-item" v-for="(item, index) in serviceList" :key="index"
                   @click="toggleServiceSelect(index)">
               <view class="checkbox" :class="{ checked: item.checked }">
-                <image v-if="item.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9" mode="aspectFit"></image>
+                <image v-if="item.checked" class="check-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png" mode="aspectFit"></image>
               </view>
               <text class="checkbox-label">{{item.title}}</text>
             </view>
@@ -1524,7 +1524,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 7rpx;
   border-radius: 5rpx;
 }
@@ -1708,7 +1708,7 @@ export default {
 
 .invite-error {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .inviter-info {
@@ -1744,7 +1744,7 @@ export default {
 
 .shake-animation {
   animation: shake 0.5s ease-in-out;
-  color: #E8101E; /* 保持红色 */
+  color: #FF4767; /* 保持红色 */
 }
 
 /* 弹窗样式 */
@@ -1834,8 +1834,8 @@ export default {
 }
 
 .checkbox.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .check-icon {
@@ -1868,7 +1868,7 @@ export default {
 }
 
 .popup-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
 }
 
 .popup-btn .btn-text {
@@ -1906,7 +1906,7 @@ export default {
 
 .confirm-text {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -1946,7 +1946,7 @@ export default {
 }
 
 .time-block.active .time-value {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .time-separator {
@@ -2060,13 +2060,13 @@ export default {
 }
 
 .tip-btn.cancel {
-  border: #E8101E 2rpx solid;
+  border: #FF4767 2rpx solid;
   background-color: transparent;
-  color: #e8101e;
+  color: #FF4767;
 }
 
 .tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
   color: #FFFFFF;
 }
 
diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue
index 62c54c1..57808b7 100644
--- a/pages/ruzhu/qualification_sj.vue
+++ b/pages/ruzhu/qualification_sj.vue
@@ -52,7 +52,7 @@
 					<view class="radio-item" @click="setContactType('1')">
 						<view class="radio" :class="{ checked: formData.contact_type === '1' }">
 							<image v-if="formData.contact_type === '1'"
-								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+								src="/static/images/agree_y.png"
 								class="radio-icon-image" mode="aspectFit"></image>
 						</view>
 						<text class="radio-label">法人</text>
@@ -60,7 +60,7 @@
 					<view class="radio-item" @click="setContactType('2')">
 						<view class="radio" :class="{ checked: formData.contact_type === '2' }">
 							<image v-if="formData.contact_type === '2'"
-								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+								src="/static/images/agree_y.png"
 								class="radio-icon-image" mode="aspectFit"></image>
 						</view>
 						<text class="radio-label">其他</text>
@@ -1023,7 +1023,7 @@ export default {
 .title-bar {
 	width: 6rpx;
 	height: 30rpx;
-	background-color: #E8101E;
+	background-color: #FF4767;
 	margin-right: 7rpx;
 	border-radius: 5rpx;
 }
@@ -1169,8 +1169,8 @@ export default {
 }
 
 .radio.checked {
-	background-color: #E8101E;
-	border-color: #E8101E;
+	background-color: #FF4767;
+	border-color: #FF4767;
 }
 
 .radio-icon-image {
@@ -1266,7 +1266,7 @@ export default {
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+	background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
 }
 
 .popup-btn.cancel {
@@ -1274,7 +1274,7 @@ export default {
 }
 
 .popup-btn.confirm {
-	background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+	background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
 }
 
 .popup-btn .btn-text {
@@ -1396,13 +1396,13 @@ export default {
 }
 
 .tip-btn.cancel {
-	border: #E8101E 2rpx solid;
+	border: #FF4767 2rpx solid;
 	background-color: transparent;
-	color: #e8101e;
+	color: #FF4767;
 }
 
 .tip-btn.confirm {
-	background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+	background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
 	color: #FFFFFF;
 }
 
@@ -1429,7 +1429,7 @@ export default {
 
 .invite-error {
 	font-size: 24rpx;
-	color: #E8101E;
+	color: #FF4767;
 }
 
 .inviter-info {
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 87dd098..41efe32 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -724,7 +724,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+		background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 		border-radius: 49rpx;
 	}
 
@@ -746,7 +746,7 @@
 	}
 
 	.prev-text {
-		color: #E8101E;
+		color: #FF4767;
 		font-size: 36rpx;
 		font-weight: 500;
 	}
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index b5496e2..3791ae7 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -124,7 +124,7 @@
           <view class="radio-item" @click="setIdcardExpiryType('1')">
             <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === '1' }">
               <image v-if="formData.legal_idcard_expiry_type === '1'"
-                src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+                src="/static/images/agree_y.png"
                 class="radio-icon-image" mode="aspectFit"></image>
             </view>
             <text class="radio-label">永久有效</text>
@@ -132,7 +132,7 @@
           <view class="radio-item" @click="setIdcardExpiryType('2')">
             <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === '2' }">
               <image v-if="formData.legal_idcard_expiry_type === '2'"
-                src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cb185ec8-9d30-4e53-b5dc-14b546013a60"
+                src="/static/images/agree_y.png"
                 class="radio-icon-image" mode="aspectFit"></image>
             </view>
             <text class="radio-label">指定日期有效</text>
@@ -986,7 +986,7 @@ export default {
 .title-bar {
   width: 8rpx;
   height: 32rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 4rpx;
   margin-right: 12rpx;
 }
@@ -1105,7 +1105,7 @@ export default {
 
 .label.required::before {
   content: '*';
-  color: #E8101E;
+  color: #FF4767;
   margin-right: 4rpx;
 }
 
@@ -1130,7 +1130,7 @@ export default {
 
 .placeholder1.required::before {
   content: '*';
-  color: #E8101E;
+  color: #FF4767;
   margin-right: 4rpx;
 }
 
@@ -1176,8 +1176,8 @@ export default {
 }
 
 .radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .radio-icon-image {
@@ -1222,7 +1222,7 @@ export default {
 
 .upload-hint {
   font-size: 24rpx;
-  /* color: #E8101E; */
+  /* color: #FF4767; */
   text-align: center;
 }
 
@@ -1276,7 +1276,7 @@ export default {
   right: -10rpx;
   width: 36rpx;
   height: 36rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 50%;
   display: flex;
   align-items: center;
@@ -1397,7 +1397,7 @@ export default {
 }
 
 .popup-btn.confirm {
-  background: #E8101E;
+  background: #FF4767;
 }
 
 .popup-btn .btn-text {
@@ -1424,6 +1424,6 @@ export default {
 }
 
 .picker-item-row text.active {
-  color: #E8101E;
+  color: #FF4767;
 }
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/stopuse.vue b/pages/ruzhu/stopuse.vue
index 35d8ad8..1de2e1b 100644
--- a/pages/ruzhu/stopuse.vue
+++ b/pages/ruzhu/stopuse.vue
@@ -73,7 +73,7 @@
 }
 .btn-wallet {
 	font-size: 24rpx;
-	color: #E8101E;
+	color: #FF4767;
 	margin-top: 40rpx;
 }
 .btn-contact {
diff --git a/pages/ruzhu/submitres.vue b/pages/ruzhu/submitres.vue
index 6ea3b4e..c43127c 100644
--- a/pages/ruzhu/submitres.vue
+++ b/pages/ruzhu/submitres.vue
@@ -247,7 +247,7 @@ export default {
 .btn-back {
   width: 630rpx;
   height: 96rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 48rpx;
   display: flex;
   align-items: center;
@@ -267,11 +267,11 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  border: 1rpx solid #E8101E;
+  border: 1rpx solid #FF4767;
   margin-top: 32rpx;
 }
 .fail-back-btn .btn-text {
-	color: #E8101E;
+	color: #FF4767;
 }
 
 .submitres-page /deep/ .back-btn {
diff --git a/pages/search/components/confirm-modal.vue b/pages/search/components/confirm-modal.vue
index 05347c5..a370d78 100644
--- a/pages/search/components/confirm-modal.vue
+++ b/pages/search/components/confirm-modal.vue
@@ -116,6 +116,6 @@ export default {
 }
 
 .delete {
-  color: #e8101e;
+  color: #FF4767;
 }
 </style>
diff --git a/pages/search/components/filter.vue b/pages/search/components/filter.vue
index ae2ef4b..6e5c5fb 100644
--- a/pages/search/components/filter.vue
+++ b/pages/search/components/filter.vue
@@ -279,10 +279,10 @@
 			
 			getIconColor(index) {
 				if (this.activeIndex === index) {
-					return '#E8101E';
+					return '#FF4767';
 				}
 				if (this.hasValue(this.filterTabs[index].key)) {
-					return '#E8101E';
+					return '#FF4767';
 				}
 				return '#666';
 			},
@@ -527,7 +527,7 @@
 			}
 			
 			&.active {
-				color: #E8101E;
+				color: #FF4767;
 			}
 			
 			.check-icon {
@@ -567,7 +567,7 @@
 			}
 			&.active {
 				background: #FFECF0;
-				color: #E8101E;
+				color: #FF4767;
 			}
 		}
 		
@@ -620,7 +620,7 @@
 					height: 100%;
 					
 					.custom-price-container.active & {
-						color: #E8101E;
+						color: #FF4767;
 					}
 				}
 				
diff --git a/pages/search/components/search-box.vue b/pages/search/components/search-box.vue
index 7753540..e47bb5d 100644
--- a/pages/search/components/search-box.vue
+++ b/pages/search/components/search-box.vue
@@ -192,7 +192,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+  background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
   background-size: cover;
   color: #fff;
   font-size: 26rpx;
diff --git a/pages/search/components/search_box_result.vue b/pages/search/components/search_box_result.vue
index 0f84257..368d17a 100644
--- a/pages/search/components/search_box_result.vue
+++ b/pages/search/components/search_box_result.vue
@@ -52,7 +52,7 @@ export default {
     },
 	bgClor: {
       type: String,
-	   default: "linear-gradient(134deg, #f52540 0%, #e8101e 100%)",
+	   default: "linear-gradient(134deg, #f52540 0%, #FF4767 100%)",
     },
   },
   data() {
@@ -126,7 +126,7 @@ export default {
   justify-content: center;
   align-items: center;
   position: relative;
-  background: linear-gradient(134deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(134deg, #f52540 0%, #FF4767 100%);
   transform: translateY(0rpx);
 }
 
@@ -197,7 +197,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+  background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
   background-size: cover;
   color: #fff;
   font-size: 26rpx;
diff --git a/pages/search/components/serviceCardList.vue b/pages/search/components/serviceCardList.vue
index 3f37322..186a368 100644
--- a/pages/search/components/serviceCardList.vue
+++ b/pages/search/components/serviceCardList.vue
@@ -309,7 +309,7 @@
 			padding: 0 8rpx;
 			height: 38rpx;
 			line-height: 38rpx;
-			background: linear-gradient(124deg, #f52540 0%, #e8101e 100%);
+			background: linear-gradient(124deg, #f52540 0%, #FF4767 100%);
 			border-radius: 12rpx 2rpx 12rpx 2rpx;
 			font-size: 22rpx;
 			color: #ffffff;
@@ -405,7 +405,7 @@
 		.price {
 			font-weight: 700;
 			font-size: 26rpx;
-			color: #e8101e;
+			color: #FF4767;
 			font-family: DINPro, DINPro;
 		}
 
@@ -454,7 +454,7 @@
 		line-height: 60rpx;
 		height: 60rpx;
 		padding: 0rpx 20rpx;
-		background: linear-gradient(107deg, #f84c63 0%, #e8101e 100%);
+		background: linear-gradient(107deg, #f84c63 0%, #FF4767 100%);
 		border-radius: 30rpx;
 		text-align: center;
 		color: #fff;
diff --git a/pages/search/components/shopCard.vue b/pages/search/components/shopCard.vue
index cfea6ba..eea4a8c 100644
--- a/pages/search/components/shopCard.vue
+++ b/pages/search/components/shopCard.vue
@@ -131,7 +131,7 @@
 
 					&__tip {
 						padding: 0 8rpx;
-						background: linear-gradient(160deg, #fc5e72 0%, #e8101e 100%);
+						background: linear-gradient(160deg, #fc5e72 0%, #FF4767 100%);
 						border-radius: 6rpx;
 						font-weight: 500;
 						font-size: 20rpx;
@@ -147,7 +147,7 @@
 					font-family: DINPro, DINPro;
 					font-weight: 500;
 					font-size: 26rpx;
-					color: #e8101e;
+					color: #FF4767;
 					line-height: 33rpx;
 					text-align: left;
 					font-style: normal;
diff --git a/pages/search/components/syrCardList.vue b/pages/search/components/syrCardList.vue
index da60a08..dc88cad 100644
--- a/pages/search/components/syrCardList.vue
+++ b/pages/search/components/syrCardList.vue
@@ -229,7 +229,7 @@ export default {
   background: #fdf3f5;
   border-radius: 20rpx;
   font-size: 22rpx;
-  color: #e8101e;
+  color: #FF4767;
   padding: 2rpx 12rpx;
 }
 
@@ -246,7 +246,7 @@ export default {
   padding: 0rpx 30rpx;
   height: 60rpx;
   line-height: 60rpx;
-  background: linear-gradient(107deg, #f84c63 0%, #e8101e 100%);
+  background: linear-gradient(107deg, #f84c63 0%, #FF4767 100%);
   border-radius: 30rpx;
   text-align: center;
   color: #fff;
diff --git a/pages/search/search-result.vue b/pages/search/search-result.vue
index 3b1b2e1..608d86a 100644
--- a/pages/search/search-result.vue
+++ b/pages/search/search-result.vue
@@ -2,7 +2,7 @@
 	<view class="search-page">
 		<!-- 自定义导航栏 -->
 		<custom-navbar title="搜索" :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e8f7c37f-b446-41da-b578-59098a56bc4d.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"
 			borderBottom="none"></custom-navbar>
 		
 		<!-- 顶部搜索和标签区域 -->
@@ -859,7 +859,7 @@
 		.tabItem_active {
 			font-weight: 500;
 			font-size: 30rpx;
-			color: #E8101E;
+			color: #FF4767;
 			line-height: 42rpx;
 			text-align: left;
 			font-style: normal;
@@ -875,7 +875,7 @@
 			transform: translateX(-50%);
 			width: 34rpx;
 			height: 6rpx;
-			background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+			background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
 			border-radius: 2rpx;
 		}
 	}
@@ -902,7 +902,7 @@
 		width: 60rpx;
 		height: 60rpx;
 		border: 4rpx solid #f3f3f3;
-		border-top: 4rpx solid #E8101E;
+		border-top: 4rpx solid #FF4767;
 		border-radius: 50%;
 		animation: spin 1s linear infinite;
 		margin-bottom: 24rpx;
diff --git a/pages/selfOperated/addWe.vue b/pages/selfOperated/addWe.vue
index e8afceb..16049e6 100644
--- a/pages/selfOperated/addWe.vue
+++ b/pages/selfOperated/addWe.vue
@@ -337,7 +337,7 @@
 		.agreement-btn {
 			width: 690rpx;
 			height: 78rpx;
-			background: #e8101e;
+			background: #FF4767;
 			border-radius: 798rpx;
 			font-weight: 400;
 			font-size: 30rpx;
diff --git a/pages/selfOperated/agreement.vue b/pages/selfOperated/agreement.vue
index 2696aca..9bf64d8 100644
--- a/pages/selfOperated/agreement.vue
+++ b/pages/selfOperated/agreement.vue
@@ -180,7 +180,7 @@
 		.agreement-btn {
 			width: 690rpx;
 			height: 78rpx;
-			background: #e8101e;
+			background: #FF4767;
 			border-radius: 798rpx;
 			font-weight: 400;
 			font-size: 30rpx;
diff --git a/pages/selfOperated/components/select-adress.vue b/pages/selfOperated/components/select-adress.vue
index 5f52d8a..d783e54 100644
--- a/pages/selfOperated/components/select-adress.vue
+++ b/pages/selfOperated/components/select-adress.vue
@@ -372,7 +372,7 @@
 				padding-right: 20rpx;
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;
+				color: #FF4767;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
diff --git a/pages/selfOperated/components/self-card-list.vue b/pages/selfOperated/components/self-card-list.vue
index a68c39e..8b460d1 100644
--- a/pages/selfOperated/components/self-card-list.vue
+++ b/pages/selfOperated/components/self-card-list.vue
@@ -68,7 +68,7 @@ export default {
       width: 80rpx;
       height: 49rpx;
 	  z-index: 1;
-      background: linear-gradient( 124deg, #F52540 0%, #E8101E 100%);
+      background: linear-gradient( 124deg, #F52540 0%, #FF4767 100%);
       border-radius: 20rpx 2rpx 20rpx 2rpx;
 	  font-weight: 400;
 	  font-size: 26rpx;
@@ -109,7 +109,7 @@ export default {
         font-family: DINPro, DINPro;
         font-weight: 500;
         font-size: 28rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 36rpx;
         text-align: left;
         font-style: normal;
diff --git a/pages/selfOperated/components/self-pay.vue b/pages/selfOperated/components/self-pay.vue
index 3e75a88..94ecd97 100644
--- a/pages/selfOperated/components/self-pay.vue
+++ b/pages/selfOperated/components/self-pay.vue
@@ -89,7 +89,7 @@
 								<image :src="item.icon" mode="aspectFit" class="method-icon"></image>
 								<text class="method-name">{{ item.name }}</text>
 							</view>
-							<agree-radio :isAgree="item.selected" :yesImg="`/static/images/icons/yes_icon.png`"
+							<agree-radio :isAgree="item.selected" :yesImg="`/static/images/agree_y.png`"
 								:radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
 						</view>
 					</view>
@@ -770,7 +770,7 @@
 						font-family: DINPro, DINPro;
 						font-weight: 500;
 						font-size: 52rpx;
-						color: #e8101e;
+						color: #FF4767;
 						line-height: 67rpx;
 						text-align: left;
 						font-style: normal;
@@ -780,7 +780,7 @@
 				.pop-submit-btn {
 					width: 226rpx;
 					height: 82rpx;
-					background: #e8101e;
+					background: #FF4767;
 					border-radius: 41rpx;
 
 					.pop-submit-btn-text {
diff --git a/pages/selfOperated/detail.nvue b/pages/selfOperated/detail.nvue
index e1936e9..6a331e9 100644
--- a/pages/selfOperated/detail.nvue
+++ b/pages/selfOperated/detail.nvue
@@ -1091,7 +1091,7 @@
 		margin: 27rpx;
 		width: 130rpx;
 		height: 56rpx;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		display: flex;
 		flex-flow: row nowrap;
 		justify-content: center;
@@ -1101,7 +1101,7 @@
 
 	.look-text {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* 评论区域 */
@@ -1170,7 +1170,7 @@
 		font-size: 16rpx;
 		padding: 0 8rpx;
 		border-radius: 12rpx;
-		color: #E8101E;
+		color: #FF4767;
 		background-color: rgba(255, 148, 180, 0.50);
 		margin-right: 8rpx;
 	}
@@ -1289,7 +1289,7 @@
 	.submit-btn {
 		width: 670rpx;
 		height: 86rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 50rpx;
 		font-weight: 400;
 		font-size: 34rpx;
@@ -1303,7 +1303,7 @@
 
 	.disabled-btn {
 		opacity: 0.5 !important;
-		background-color: #E8101E; /* 保持原有颜色，只是降低透明度 */
+		background-color: #FF4767; /* 保持原有颜色，只是降低透明度 */
 	}
 
 	.cannot-submit {
diff --git a/pages/selfOperated/list.vue b/pages/selfOperated/list.vue
index 3899988..59589e8 100644
--- a/pages/selfOperated/list.vue
+++ b/pages/selfOperated/list.vue
@@ -4,7 +4,7 @@
       title="平台自营服务列表"
       :leftImg="'/static/images/whiteBack.png'"
       :showUser="true"
-      backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)"
+      backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
       headleSrc="/static/images/recruit/guide.png"
       :showHeadle="true"
       titleColor="#fff"
@@ -218,7 +218,7 @@ export default {
       /* 预先设置透明边框，防止切换时布局跳动 */
 
       &.active {
-        color: #e8101e;
+        color: #FF4767;
         font-weight: 500;
         position: relative;
 
@@ -232,7 +232,7 @@ export default {
           /* 激活时显示红色边框 */
           width: 34rpx;
           height: 6rpx;
-          background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+          background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
           border-radius: 3rpx;
         }
       }
@@ -279,10 +279,10 @@ export default {
       width: 246rpx;
       height: 80rpx;
       border-radius: 40rpx;
-      border: 2rpx solid #e8101e;
+      border: 2rpx solid #FF4767;
       font-weight: 500;
       font-size: 28rpx;
-      color: #e8101e;
+      color: #FF4767;
       text-align: left;
       font-style: normal;
       display: flex;
@@ -292,7 +292,7 @@ export default {
     .pop-content-sure {
       width: 246rpx;
       height: 80rpx;
-      background: #e8101e;
+      background: #FF4767;
       border-radius: 40rpx;
       font-weight: 500;
       font-size: 28rpx;
@@ -347,7 +347,7 @@ export default {
         .list-item-left-price-text {
           font-weight: 500;
           font-size: 40rpx;
-          color: #e8101e;
+          color: #FF4767;
           line-height: 48rpx;
           text-align: left;
           font-style: normal;
diff --git a/pages/selfOperated/selectSyr.vue b/pages/selfOperated/selectSyr.vue
index b7ff011..9ba0760 100644
--- a/pages/selfOperated/selectSyr.vue
+++ b/pages/selfOperated/selectSyr.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="selectSyr">
 		<custom-navbar title="选择手艺人" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"
 			borderBottom="none"></custom-navbar>
 		<searchBox placeholder="搜索手艺人名称" v-model="queryData.name" @confirm="searchConfrim" @search="searchConfrim">
 		</searchBox>
@@ -575,7 +575,7 @@
 			margin: 0 21rpx;
 			width: 648rpx;
 			height: 94rpx;
-			background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+			background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
 			border-radius: 48rpx;
 			font-weight: 400;
 			font-size: 30rpx;
@@ -794,7 +794,7 @@
 
 		/* 选中状态样式 */
 		.sj-pop-item.active {
-			color: #E8101E ;
+			color: #FF4767 ;
 		}
 	}
 
diff --git a/pages/selfOperated/serveList.vue b/pages/selfOperated/serveList.vue
index b438936..04cbce1 100644
--- a/pages/selfOperated/serveList.vue
+++ b/pages/selfOperated/serveList.vue
@@ -56,7 +56,7 @@
 
 					<view class="serveList-tabs">
 						<serviecFirstTab :tabs="tabs" bgColor="transparent" :activeId="queryData.first_class"
-							activeColor="#E8101E" @tab-click="tabClick">
+							activeColor="#FF4767" @tab-click="tabClick">
 						</serviecFirstTab>
 						<view class="icon-tabs">
 							<view v-for="(item, idx) in iconTabs" :key="item.id" class="icon-tab flex-row-center-center"
@@ -321,7 +321,7 @@
 
 						.icon-text {
 							font-weight: 500;
-							color: #E8101E;
+							color: #FF4767;
 						}
 					}
 				}
diff --git a/pages/service/appointment.vue b/pages/service/appointment.vue
index 14b1381..632bf70 100644
--- a/pages/service/appointment.vue
+++ b/pages/service/appointment.vue
@@ -4,7 +4,7 @@
       title="预约到家"
       :leftImg="'/static/images/whiteBack.png'"
       :showUser="true"
-      backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)"
+      backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
       titleColor="#fff"
       borderBottom="none"
     ></custom-navbar>
@@ -12,7 +12,7 @@
     <serviecFirstTab
       :tabs="tabs"
       :activeId="activeId"
-      activeColor="#E8101E"
+      activeColor="#FF4767"
       @tab-click="tabClick"
       bgColor="#fff"
     ></serviecFirstTab>
diff --git a/pages/service/class.vue b/pages/service/class.vue
index c8e438c..43e1bcb 100644
--- a/pages/service/class.vue
+++ b/pages/service/class.vue
@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<custom-navbar title="分类" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff"></custom-navbar>
-		<serviecFirstTab :tabs="tabs" :activeId="activeId" activeColor="#E8101E" @tab-click="tabClick" bgColor="#fff">
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"></custom-navbar>
+		<serviecFirstTab :tabs="tabs" :activeId="activeId" activeColor="#FF4767" @tab-click="tabClick" bgColor="#fff">
 		</serviecFirstTab>
 
 		<!-- <FilterPanel @filterConfirm="handleFilter"></FilterPanel> -->
@@ -253,11 +253,11 @@
 	}
 
 	.icon-tab.active .icon-text {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.icon-tab.active .icon-img {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 	}
 	
 	::v-deep .list-scroll{
diff --git a/pages/service/components/filter.vue b/pages/service/components/filter.vue
index ae2ef4b..6e5c5fb 100644
--- a/pages/service/components/filter.vue
+++ b/pages/service/components/filter.vue
@@ -279,10 +279,10 @@
 			
 			getIconColor(index) {
 				if (this.activeIndex === index) {
-					return '#E8101E';
+					return '#FF4767';
 				}
 				if (this.hasValue(this.filterTabs[index].key)) {
-					return '#E8101E';
+					return '#FF4767';
 				}
 				return '#666';
 			},
@@ -527,7 +527,7 @@
 			}
 			
 			&.active {
-				color: #E8101E;
+				color: #FF4767;
 			}
 			
 			.check-icon {
@@ -567,7 +567,7 @@
 			}
 			&.active {
 				background: #FFECF0;
-				color: #E8101E;
+				color: #FF4767;
 			}
 		}
 		
@@ -620,7 +620,7 @@
 					height: 100%;
 					
 					.custom-price-container.active & {
-						color: #E8101E;
+						color: #FF4767;
 					}
 				}
 				
diff --git a/pages/service/components/intmentFilter.vue b/pages/service/components/intmentFilter.vue
index 63490d9..0ad411e 100644
--- a/pages/service/components/intmentFilter.vue
+++ b/pages/service/components/intmentFilter.vue
@@ -267,7 +267,7 @@
 							&.active {
 								background-color: #ffecf0;
 								font-weight: 500;
-								color: #e8101e;
+								color: #FF4767;
 								border-color: @primary-color;
 							}
 						}
diff --git a/pages/service/components/search-box.vue b/pages/service/components/search-box.vue
index 0f84257..368d17a 100644
--- a/pages/service/components/search-box.vue
+++ b/pages/service/components/search-box.vue
@@ -52,7 +52,7 @@ export default {
     },
 	bgClor: {
       type: String,
-	   default: "linear-gradient(134deg, #f52540 0%, #e8101e 100%)",
+	   default: "linear-gradient(134deg, #f52540 0%, #FF4767 100%)",
     },
   },
   data() {
@@ -126,7 +126,7 @@ export default {
   justify-content: center;
   align-items: center;
   position: relative;
-  background: linear-gradient(134deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(134deg, #f52540 0%, #FF4767 100%);
   transform: translateY(0rpx);
 }
 
@@ -197,7 +197,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+  background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
   background-size: cover;
   color: #fff;
   font-size: 26rpx;
diff --git a/pages/service/components/self-pay.vue b/pages/service/components/self-pay.vue
index d8c1a8c..ccb18d4 100644
--- a/pages/service/components/self-pay.vue
+++ b/pages/service/components/self-pay.vue
@@ -89,7 +89,7 @@
 								<image :src="item.icon" mode="aspectFit" class="method-icon"></image>
 								<text class="method-name">{{ item.name }}</text>
 							</view>
-							<agree-radio :isAgree="item.selected" :yesImg="`/static/images/icons/yes_icon.png`"
+							<agree-radio :isAgree="item.selected" :yesImg="`/static/images/agree_y.png`"
 								:radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
 						</view>
 					</view>
@@ -793,7 +793,7 @@
 						font-family: DINPro, DINPro;
 						font-weight: 500;
 						font-size: 52rpx;
-						color: #e8101e;
+						color: #FF4767;
 						line-height: 67rpx;
 						text-align: left;
 						font-style: normal;
@@ -803,7 +803,7 @@
 				.pop-submit-btn {
 					width: 226rpx;
 					height: 82rpx;
-					background: #e8101e;
+					background: #FF4767;
 					border-radius: 41rpx;
 
 					.pop-submit-btn-text {
diff --git a/pages/service/components/shopCard.vue b/pages/service/components/shopCard.vue
index 4e2cfd5..218660b 100644
--- a/pages/service/components/shopCard.vue
+++ b/pages/service/components/shopCard.vue
@@ -165,7 +165,7 @@ export default {
         font-style: normal;
         &__tip {
           padding: 0 8rpx;
-          background: linear-gradient(160deg, #fc5e72 0%, #e8101e 100%);
+          background: linear-gradient(160deg, #fc5e72 0%, #FF4767 100%);
           border-radius: 6rpx;
           font-weight: 500;
           font-size: 20rpx;
@@ -180,7 +180,7 @@ export default {
         font-family: DINPro, DINPro;
         font-weight: 500;
         font-size: 26rpx;
-        color: #e8101e;
+        color: #FF4767;
         line-height: 33rpx;
         text-align: left;
         font-style: normal;
diff --git a/pages/service/detail.nvue b/pages/service/detail.nvue
index 80e19e7..ef223f5 100644
--- a/pages/service/detail.nvue
+++ b/pages/service/detail.nvue
@@ -985,14 +985,14 @@
 		margin: 27rpx;
 		padding: 0 18rpx;
 		height: 56rpx;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 
 		border-radius: 28rpx;
 	}
 
 	.look-text {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 56rpx;
 	}
 
@@ -1062,7 +1062,7 @@
 		font-size: 16rpx;
 		padding: 0 8rpx;
 		border-radius: 12rpx;
-		color: #E8101E;
+		color: #FF4767;
 		background-color: rgba(255, 148, 180, 0.50);
 		margin-right: 8rpx;
 	}
diff --git a/pages/service/store-list.vue b/pages/service/store-list.vue
index 10a4bb6..599e8d4 100644
--- a/pages/service/store-list.vue
+++ b/pages/service/store-list.vue
@@ -4,7 +4,7 @@
       title="附近门店"
       :leftImg="'/static/images/whiteBack.png'"
       :showUser="true"
-      backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)"
+      backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
       titleColor="#fff"
 	  borderBottom="none"
     ></custom-navbar>
@@ -12,7 +12,7 @@
       <serviecFirstTab
       :tabs="tabs"
       :activeId="activeId"
-      activeColor="#E8101E"
+      activeColor="#FF4767"
       @tab-click="tabClick"
 
     ></serviecFirstTab>
diff --git a/pages/settings/password.vue b/pages/settings/password.vue
index 298518c..88d79af 100644
--- a/pages/settings/password.vue
+++ b/pages/settings/password.vue
@@ -8,7 +8,7 @@
 		</view>
 
 		<view class="password-tip">
-			<text>登录密码用于美融融商家登录，密码<text style="color: #E8101E;">至少6个字符，不能全是字母或者数字</text></text>
+			<text>登录密码用于美融融商家登录，密码<text style="color: #FF4767;">至少6个字符，不能全是字母或者数字</text></text>
 		</view>
 
 		<!-- 新密码输入区域 -->
@@ -286,7 +286,7 @@
 		.pwd-error {
 			display: block;
 			font-size: 24rpx;
-			color: #E8101E;
+			color: #FF4767;
 			margin-left: 30rpx;
 			margin-top: 10rpx;
 			line-height: 1.2;
@@ -319,7 +319,7 @@
 			}
 
 			.active {
-				background: #E8101E;
+				background: #FF4767;
 
 				&:active {
 					opacity: 0.9; // 点击反馈
diff --git a/pages/settings/paypsd.vue b/pages/settings/paypsd.vue
index b024be0..cfb4fa9 100644
--- a/pages/settings/paypsd.vue
+++ b/pages/settings/paypsd.vue
@@ -133,7 +133,7 @@ page {
 .code-btn {
 	font-size: 28rpx;
 	font-weight: 400;
-	color: #E8101E;
+	color: #FF4767;
 }
 .pay-cont {
 	padding-top: 168rpx;
diff --git a/pages/share/syrandsjshare.vue b/pages/share/syrandsjshare.vue
index 167eed3..3fcd6bc 100644
--- a/pages/share/syrandsjshare.vue
+++ b/pages/share/syrandsjshare.vue
@@ -141,7 +141,7 @@ import request from '../../utils/request'
 	width: 360rpx;
 	height: 360rpx;
 	border-radius: 16rpx;
-	border: 6rpx solid #E8101E;
+	border: 6rpx solid #FF4767;
 	margin-top: 34rpx;
 }
 .invite-lists {
diff --git a/pages/share/usershare.vue b/pages/share/usershare.vue
index a84ba66..179ccf4 100644
--- a/pages/share/usershare.vue
+++ b/pages/share/usershare.vue
@@ -107,7 +107,7 @@ import request from '../../utils/request'
 	width: 360rpx;
 	height: 360rpx;
 	border-radius: 16rpx;
-	border: 6rpx solid #E8101E;
+	border: 6rpx solid #FF4767;
 	margin-top: 34rpx;
 	background-color: #fff;
 }
diff --git a/pages/shop/SellerDetail.vue b/pages/shop/SellerDetail.vue
index 47a86ab..de3970f 100644
--- a/pages/shop/SellerDetail.vue
+++ b/pages/shop/SellerDetail.vue
@@ -131,7 +131,7 @@
 
 				<!-- <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_money">
 					<text class="label">支付小计</text>
-					<text class="value" style="color: #E8101E">{{ orderInfo.order_money }}元</text>
+					<text class="value" style="color: #FF4767">{{ orderInfo.order_money }}元</text>
 				</view> -->
 				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_time">
 					<text class="label">支付时间</text>
@@ -849,7 +849,7 @@
 	.real-price {
 		font-size: 42rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 		transform: translateY(-5rpx);
 
 		.icon {
@@ -1035,7 +1035,7 @@
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
diff --git a/pages/shop/add-service.vue b/pages/shop/add-service.vue
index db7b857..af35f5b 100644
--- a/pages/shop/add-service.vue
+++ b/pages/shop/add-service.vue
@@ -79,7 +79,7 @@
               ? "门店下单购买后，您需到上门至门店进行服务，门店端展示价格为"
               : ""
           }}
-					<text style="color: #e8101e" v-if="showShopPrice">{{
+					<text style="color: #FF4767" v-if="showShopPrice">{{
             shopPrice
           }}</text>
 					{{ showShopPrice ? "元。" : "" }}
@@ -1189,13 +1189,13 @@
 
 	.btn-draft {
 		background-color: #ffffff;
-		color: #e8101e;
-		border: 2rpx solid #e8101e;
+		color: #FF4767;
+		border: 2rpx solid #FF4767;
 		box-sizing: border-box;
 	}
 
 	.btn-submit {
-		background-color: #e8101e;
+		background-color: #FF4767;
 		color: #ffffff;
 		width: 705rpx;
 		height: 76rpx;
@@ -1472,13 +1472,13 @@
 	}
 
 	.popup-btn-know {
-		background-color: #e8101e;
+		background-color: #FF4767;
 		color: #ffffff;
 	}
 
 	.popup-btn-notshow {
 		background-color: #ffffff;
-		color: #e8101e;
-		border: 1rpx #e8101e solid;
+		color: #FF4767;
+		border: 1rpx #FF4767 solid;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue
index 5ae0473..534ac96 100644
--- a/pages/shop/buy-order.vue
+++ b/pages/shop/buy-order.vue
@@ -491,7 +491,7 @@
 		left: 50%;
 		bottom: 0;
 		transform: translateX(-50%);
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
@@ -531,7 +531,7 @@
 	.order-status-badge {
 		font-weight: 400;
 		font-size: 26rpx;
-		color: #E8101E;
+		color: #FF4767;
 		text-align: left;
 		font-style: normal;
 		position: absolute;
@@ -703,8 +703,8 @@
 
 	.red-btn {
 		background-color: #FFFFFF;
-		border: 1rpx solid #E8101E;
-		color: #E8101E;
+		border: 1rpx solid #FF4767;
+		color: #FF4767;
 	}
 
 	.nologin_part {
diff --git a/pages/shop/buy-service.vue b/pages/shop/buy-service.vue
index a2918dc..714cc1a 100644
--- a/pages/shop/buy-service.vue
+++ b/pages/shop/buy-service.vue
@@ -523,7 +523,7 @@
 	}
 
 	.main-tab.active .tab-text {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -535,7 +535,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 3rpx;
 	}
 
@@ -570,11 +570,11 @@
 	}
 
 	.icon-tab.active .icon-text {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.icon-tab.active .icon-img {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 	}
 
 	.service-list {
@@ -633,7 +633,7 @@
 	}
 
 	.time-option.active .time-text {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -644,7 +644,7 @@
 
 	.time-discount {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		padding: 4rpx 12rpx;
 		background-color: #fff5f6;
 		border-radius: 20rpx;
@@ -685,7 +685,7 @@
 	}
 
 	.filter-item.active .filter-item-text {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.sq-icon {
@@ -750,7 +750,7 @@
 		text-align: center;
 		line-height: 50rpx;
 		border-radius: 26rpx;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		font-size: 24rpx;
 		color: #3d3d3d;
 		box-sizing: border-box;
@@ -759,9 +759,9 @@
 	.price-tag.active,
 	.sort-tag.active,
 	.star-tag.active {
-		background-color: #E8101E;
+		background-color: #FF4767;
 		color: #ffffff;
-		border-color: #E8101E;
+		border-color: #FF4767;
 	}
 
 	.price-input {
@@ -776,7 +776,7 @@
 		height: 52rpx;
 		line-height: 50rpx;
 		text-align: center;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		border-radius: 26rpx;
 		font-size: 24rpx;
 		color: #3d3d3d;
@@ -806,12 +806,12 @@
 
 	.reset-btn {
 		background-color: #ffffff;
-		border: 1rpx solid #E8101E;
-		color: #E8101E;
+		border: 1rpx solid #FF4767;
+		color: #FF4767;
 	}
 
 	.confirm-btn {
-		background-color: #E8101E;
+		background-color: #FF4767;
 		color: #ffffff;
 	}
 
diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue
index 5768e0a..3a4a8b3 100644
--- a/pages/shop/buyorder-detail.vue
+++ b/pages/shop/buyorder-detail.vue
@@ -745,7 +745,7 @@
 	.phone-btn {
 		width: 64rpx;
 		height: 64rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 32rpx;
 	}
 
@@ -914,7 +914,7 @@
 	.real-price {
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* 订单信息卡片 */
@@ -991,14 +991,14 @@
 	}
 
 	.btn-border {
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 20rpx;
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
@@ -1010,7 +1010,7 @@
 	.btn-border .button-text {
 		font-size: 28rpx;
 		font-weight: 400;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* APP适配 */
diff --git a/pages/shop/components/orderCard.vue b/pages/shop/components/orderCard.vue
index c15cd4d..3013f58 100644
--- a/pages/shop/components/orderCard.vue
+++ b/pages/shop/components/orderCard.vue
@@ -217,7 +217,7 @@
 		.stateText {
 			font-weight: 400;
 			font-size: 26rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: left;
 			font-style: normal;
 			position: absolute;
@@ -283,7 +283,7 @@
 		font-family: DINPro, DINPro;
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -320,7 +320,7 @@
 			letter-spacing: 2px;
 			text-align: left;
 			font-style: normal;
-			background: linear-gradient(166deg, #FC5E72 0%, #E8101E 100%);
+			background: linear-gradient(166deg, #FC5E72 0%, #FF4767 100%);
 			border-radius: 6rpx;
 			padding: 4rpx 4rpx 4rpx 8rpx;
 			margin-right: 13rpx;
@@ -432,7 +432,7 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/components/orderCard2.vue b/pages/shop/components/orderCard2.vue
index 57602ea..bcd9f68 100644
--- a/pages/shop/components/orderCard2.vue
+++ b/pages/shop/components/orderCard2.vue
@@ -205,7 +205,7 @@
 		.stateText {
 			font-weight: 400;
 			font-size: 26rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: left;
 			font-style: normal;
 			position: absolute;
@@ -255,7 +255,7 @@
 	.service-price {
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -291,7 +291,7 @@
 			letter-spacing: 2px;
 			text-align: left;
 			font-style: normal;
-			background: linear-gradient(166deg, #FC5E72 0%, #E8101E 100%);
+			background: linear-gradient(166deg, #FC5E72 0%, #FF4767 100%);
 			border-radius: 6rpx;
 			padding: 4rpx 4rpx 4rpx 8rpx;
 			margin-right: 13rpx;
@@ -387,8 +387,8 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 
 	.order-address {
diff --git a/pages/shop/create-order.vue b/pages/shop/create-order.vue
index c900ed6..7052a2e 100644
--- a/pages/shop/create-order.vue
+++ b/pages/shop/create-order.vue
@@ -500,7 +500,7 @@ export default {
   height: 28rpx;
   border: 3rpx;
   margin-right: 16rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
 }
 .service-item {
   padding-top: 24rpx;
@@ -636,7 +636,7 @@ export default {
 .price-total .price {
   font-size: 28rpx;
   font-weight: 500;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .amount-lable {
@@ -646,7 +646,7 @@ export default {
 .submit-btn {
   width: 492rpx;
   height: 64rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 32rpx;
   color: #ffffff;
   font-size: 28rpx;
diff --git a/pages/shop/groupBuying/addGroupBuying.vue b/pages/shop/groupBuying/addGroupBuying.vue
index 8a6b0a1..043b1a5 100644
--- a/pages/shop/groupBuying/addGroupBuying.vue
+++ b/pages/shop/groupBuying/addGroupBuying.vue
@@ -67,7 +67,7 @@
 				<view class="form-radio-box">
 					<uv-radio-group v-model="formData.quota_type" placement="row" :labelColor="`#333333`"
 						:labelSize="`28rpx`" :disabled="disabled">
-						<uv-radio :name="1" activeColor="#E8101E" label="限购">
+						<uv-radio :name="1" activeColor="#FF4767" label="限购">
 
 							<template #icon>
 
@@ -77,7 +77,7 @@
 
 							</template>
 						</uv-radio>
-						<uv-radio :name="2" activeColor="#E8101E" label="不限购" @change="formData.person_quota = null">
+						<uv-radio :name="2" activeColor="#FF4767" label="不限购" @change="formData.person_quota = null">
 							<template #icon>
 
 								<image src="/static/images/shop/pintuan/yes.png" class="radioYes"
@@ -105,7 +105,7 @@
 				<view class="form-radio-box2">
 					<uv-radio-group v-model="formData.time_quota" placement="row" :labelColor="`#333333`"
 						:labelSize="`28rpx`" :disabled="disabled">
-						<uv-radio :name="12" activeColor="#E8101E" label="12小时">
+						<uv-radio :name="12" activeColor="#FF4767" label="12小时">
 							<template #icon>
 
 								<image src="/static/images/shop/pintuan/yes.png" class="radioYes"
@@ -114,7 +114,7 @@
 
 							</template>
 						</uv-radio>
-						<uv-radio :name="24" activeColor="#E8101E" label="24小时">
+						<uv-radio :name="24" activeColor="#FF4767" label="24小时">
 							<template #icon>
 
 								<image src="/static/images/shop/pintuan/yes.png" class="radioYes"
@@ -123,7 +123,7 @@
 
 							</template>
 						</uv-radio>
-						<uv-radio :name="48" activeColor="#E8101E" label="48小时">
+						<uv-radio :name="48" activeColor="#FF4767" label="48小时">
 							<template #icon>
 
 								<image src="/static/images/shop/pintuan/yes.png" class="radioYes"
@@ -417,7 +417,7 @@
 	.redTip {
 		font-weight: 400;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 33rpx;
 		text-align: left;
 		font-style: normal;
@@ -571,7 +571,7 @@
 		&__btn {
 			width: 690rpx;
 			height: 78rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 798rpx;
 			display: flex;
 			align-items: center;
diff --git a/pages/shop/groupBuying/components/listCard.vue b/pages/shop/groupBuying/components/listCard.vue
index c7e4cf3..532975c 100644
--- a/pages/shop/groupBuying/components/listCard.vue
+++ b/pages/shop/groupBuying/components/listCard.vue
@@ -154,7 +154,7 @@ export default {
     border-radius: 0rpx 20rpx 0rpx 20rpx;
     font-weight: 400;
     font-size: 26rpx;
-    color: #E8101E;
+    color: #FF4767;
     line-height: 37rpx;
     text-align: left;
     font-style: normal;
diff --git a/pages/shop/groupBuying/components/serveCard.vue b/pages/shop/groupBuying/components/serveCard.vue
index cbb9f84..b88f92c 100644
--- a/pages/shop/groupBuying/components/serveCard.vue
+++ b/pages/shop/groupBuying/components/serveCard.vue
@@ -14,7 +14,7 @@
 				<view>
 					<view class="serve-card-right__content__title">{{info.title}}</view>
 					<view class="serve-card-right__content__price"><text
-							style="color: #E8101E;font-weight: 500;">¥{{info.server_price}} </text> {{' '}}|
+							style="color: #FF4767;font-weight: 500;">¥{{info.server_price}} </text> {{' '}}|
 						{{info.server_time}}分钟
 					</view>
 				</view>
diff --git a/pages/shop/groupBuying/list.vue b/pages/shop/groupBuying/list.vue
index 7084609..678dfad 100644
--- a/pages/shop/groupBuying/list.vue
+++ b/pages/shop/groupBuying/list.vue
@@ -62,11 +62,11 @@
       :sureText="'确定'"
     >
       <text v-if="tipsState == 6"
-        >您当前操作为<text style="color: #E8101E">结束拼团活动</text
+        >您当前操作为<text style="color: #FF4767">结束拼团活动</text
         >，根据平台规则，此操作需提交平台审核（审核通过后方可生效），请问您是否确认发起该申请？</text
       >
       <text v-else
-        >您当前操作为<text style="color: #E8101E">结束拼团活动</text
+        >您当前操作为<text style="color: #FF4767">结束拼团活动</text
         >，请问您是否确认此操作吗？</text
       >
     </tipsPopup>
@@ -413,7 +413,7 @@ export default {
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 3rpx;
 }
 
diff --git a/pages/shop/groupBuying/selectServe.vue b/pages/shop/groupBuying/selectServe.vue
index 2cc7816..8aca99f 100644
--- a/pages/shop/groupBuying/selectServe.vue
+++ b/pages/shop/groupBuying/selectServe.vue
@@ -89,7 +89,7 @@ export default {
     &__btn {
       width: 690rpx;
       height: 78rpx;
-      background: #E8101E;
+      background: #FF4767;
       border-radius: 798rpx;
       display: flex;
       align-items: center;
diff --git a/pages/shop/manHour/addManHour.vue b/pages/shop/manHour/addManHour.vue
index 7dbbd57..d3f5976 100644
--- a/pages/shop/manHour/addManHour.vue
+++ b/pages/shop/manHour/addManHour.vue
@@ -698,13 +698,13 @@ export default {
 
 .btn-draft {
   background-color: #ffffff;
-  color: #E8101E;
-  border: 2rpx solid #E8101E;
+  color: #FF4767;
+  border: 2rpx solid #FF4767;
   box-sizing: border-box;
 }
 
 .btn-submit {
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
 }
 .form-step {
@@ -854,7 +854,7 @@ export default {
 /* #endif */
 
 .redTip {
-  color: #E8101E;
+  color: #FF4767;
   font-size: 24rpx;
   margin-left: 10rpx;
 }
diff --git a/pages/shop/manHour/buyManHour.vue b/pages/shop/manHour/buyManHour.vue
index c1107bd..e8aebc6 100644
--- a/pages/shop/manHour/buyManHour.vue
+++ b/pages/shop/manHour/buyManHour.vue
@@ -713,7 +713,7 @@ export default {
 
     .filter__left__select__item.active {
       .filter__left__select__item__title {
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -819,7 +819,7 @@ export default {
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 3rpx;
 }
 
@@ -855,11 +855,11 @@ export default {
 }
 
 .icon-tab.active .icon-text {
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .icon-tab.active .icon-img {
-  border: 2rpx solid #E8101E;
+  border: 2rpx solid #FF4767;
 }
 
 .service-list {
diff --git a/pages/shop/manHour/components/buyOrderCard.vue b/pages/shop/manHour/components/buyOrderCard.vue
index 19e4a4d..7c2df91 100644
--- a/pages/shop/manHour/components/buyOrderCard.vue
+++ b/pages/shop/manHour/components/buyOrderCard.vue
@@ -146,14 +146,14 @@
 						justify-content: center;
 						font-weight: 400;
 						font-size: 26rpx;
-						color: #E8101E;
+						color: #FF4767;
 						line-height: 37rpx;
 						text-align: left;
 						font-style: normal;
 						width: 160rpx;
 						height: 58rpx;
 						border-radius: 32rpx;
-						border: 2rpx solid #E8101E;
+						border: 2rpx solid #FF4767;
 					}
 				}
 			}
diff --git a/pages/shop/manHour/components/class_select.vue b/pages/shop/manHour/components/class_select.vue
index 72ec610..597c3e8 100644
--- a/pages/shop/manHour/components/class_select.vue
+++ b/pages/shop/manHour/components/class_select.vue
@@ -184,7 +184,7 @@ export default {
         color: #333333;
       }
       .activeText {
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -212,9 +212,9 @@ export default {
         border: 2rpx solid transparent;
       }
       .secondClassItemActive {
-        border: 1rpx solid #E8101E;
+        border: 1rpx solid #FF4767;
         background: rgba(252, 67, 124, 0.1);
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -224,7 +224,7 @@ export default {
     margin-top: 30rpx;
     font-size: 26rpx;
     .red {
-      color: #E8101E;
+      color: #FF4767;
     }
   }
   .fixBottomBtn {
@@ -241,10 +241,10 @@ export default {
     .btn {
       width: 100%;
       height: 39rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
       border-radius: 39rpx;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
     }
   }
 }
diff --git a/pages/shop/manHour/components/manHourCard.vue b/pages/shop/manHour/components/manHourCard.vue
index d14b856..1933485 100644
--- a/pages/shop/manHour/components/manHourCard.vue
+++ b/pages/shop/manHour/components/manHourCard.vue
@@ -272,7 +272,7 @@ export default {
   top: 0;
   width: 160rpx;
   height: 100%;
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
   display: flex;
   justify-content: center;
@@ -326,17 +326,17 @@ export default {
 
 .price-symbol {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-value {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-unit {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .status-tag {
@@ -356,7 +356,7 @@ export default {
   background-color: rgba(255, 0, 55, 0.2);
 }
 .status-tag.state2 .status-text {
-  color: #E8101E;
+  color: #FF4767;
 }
 /* 审核中 */
 .status-tag.state1 {
diff --git a/pages/shop/manHour/components/orderCard.vue b/pages/shop/manHour/components/orderCard.vue
index 9bbae47..a2cada2 100644
--- a/pages/shop/manHour/components/orderCard.vue
+++ b/pages/shop/manHour/components/orderCard.vue
@@ -195,7 +195,7 @@
 		.stateText {
 			font-weight: 400;
 			font-size: 26rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: left;
 			font-style: normal;
 			position: absolute;
@@ -283,7 +283,7 @@
 			font-family: DINPro, DINPro;
 			font-weight: 500;
 			font-size: 36rpx;
-			color: #E8101E;
+			color: #FF4767;
 			line-height: 34rpx;
 			text-align: left;
 			font-style: normal;
@@ -367,7 +367,7 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/manHour/list.vue b/pages/shop/manHour/list.vue
index 469437c..4f5a91f 100644
--- a/pages/shop/manHour/list.vue
+++ b/pages/shop/manHour/list.vue
@@ -310,7 +310,7 @@ export default {
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 3rpx;
 }
 
diff --git a/pages/shop/manHour/manHourDetail.vue b/pages/shop/manHour/manHourDetail.vue
index 294a88d..b4660cd 100644
--- a/pages/shop/manHour/manHourDetail.vue
+++ b/pages/shop/manHour/manHourDetail.vue
@@ -167,7 +167,7 @@ export default {
         &__price {
           font-weight: 500;
           font-size: 36rpx;
-          color: #E8101E;
+          color: #FF4767;
           line-height: 50rpx;
           text-align: left;
           font-style: normal;
@@ -247,10 +247,10 @@ export default {
       width: 696rpx;
       height: 78rpx;
       border-radius: 798rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
       font-weight: 400;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
       line-height: 39rpx;
       text-align: right;
       font-style: normal;
diff --git a/pages/shop/manHour/manHourOrder.vue b/pages/shop/manHour/manHourOrder.vue
index 70200f4..25c05d1 100644
--- a/pages/shop/manHour/manHourOrder.vue
+++ b/pages/shop/manHour/manHourOrder.vue
@@ -236,7 +236,7 @@ export default {
           margin-top: 38rpx;
           font-weight: 500;
           font-size: 28rpx;
-          color: #E8101E;
+          color: #FF4767;
           line-height: 34rpx;
           text-align: left;
           font-style: normal;
@@ -289,7 +289,7 @@ export default {
       &__price {
         font-weight: 500;
         font-size: 42rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 59rpx;
         font-style: normal;
       }
@@ -297,7 +297,7 @@ export default {
     &__right {
       width: 188rpx;
       height: 68rpx;
-      background: linear-gradient(73deg, #fe78b3 0%, #E8101E 100%);
+      background: linear-gradient(73deg, #fe78b3 0%, #FF4767 100%);
       border-radius: 798rpx;
       font-weight: 400;
       font-size: 30rpx;
diff --git a/pages/shop/manHour/saleList.vue b/pages/shop/manHour/saleList.vue
index 09ba921..f7d0b45 100644
--- a/pages/shop/manHour/saleList.vue
+++ b/pages/shop/manHour/saleList.vue
@@ -290,7 +290,7 @@ export default {
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 3rpx;
 }
 
diff --git a/pages/shop/manHourDetail.vue b/pages/shop/manHourDetail.vue
index 5229af5..5d9d04a 100644
--- a/pages/shop/manHourDetail.vue
+++ b/pages/shop/manHourDetail.vue
@@ -134,7 +134,7 @@
 
 				<!-- <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_money">
 					<text class="label">支付小计</text>
-					<text class="value" style="color: #E8101E">{{ orderInfo.order_money }}元</text>
+					<text class="value" style="color: #FF4767">{{ orderInfo.order_money }}元</text>
 				</view> -->
 				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_time">
 					<text class="label">支付时间</text>
@@ -923,7 +923,7 @@
 	.real-price {
 		font-size: 42rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 		transform: translateY(-5rpx);
 
 		.icon {
@@ -1067,14 +1067,14 @@
 	}
 
 	.btn-border {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 60rpx;
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
@@ -1086,7 +1086,7 @@
 	.btn-border .button-text {
 		font-size: 28rpx;
 		font-weight: 400;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* 权限提示 */
diff --git a/pages/shop/pay-order.vue b/pages/shop/pay-order.vue
index 06887d8..94a2717 100644
--- a/pages/shop/pay-order.vue
+++ b/pages/shop/pay-order.vue
@@ -330,13 +330,13 @@ export default {
 
 .symbol {
   font-size: 28rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
 .value {
   font-size: 40rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 700;
 }
 
@@ -392,13 +392,13 @@ export default {
 .total-amount .symbol {
   font-size: 24rpx;
   font-weight: 500;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .total-amount .amount {
   font-size: 28rpx;
   font-weight: 500;
-  color: #E8101E;
+  color: #FF4767;
 }
 .amount-lable {
 	font-size: 24rpx;
@@ -407,7 +407,7 @@ export default {
 .pay-btn {
   width: 492rpx;
   height: 64rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 32rpx;
   color: #FFFFFF;
   font-size: 28rpx;
diff --git a/pages/shop/pay.vue b/pages/shop/pay.vue
index 9d76ba8..1e07185 100644
--- a/pages/shop/pay.vue
+++ b/pages/shop/pay.vue
@@ -24,7 +24,7 @@
 						<image :src="item.icon" mode="aspectFit" class="method-icon"></image>
 						<text class="method-name">{{ item.name }}</text>
 					</view>
-					<agree-radio :isAgree="item.selected" :yesImg="`/static/images/icons/yes_icon.png`"
+					<agree-radio :isAgree="item.selected" :yesImg="`/static/images/agree_y.png`"
 						:radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
 				</view>
 			</view>
@@ -267,7 +267,7 @@
 											console.log("查询状态", err);
 										});
 								},
-								fail: function(err) {
+								fail: function(err) {
 									console.log(err,'erererererer');
 									uni.showModal({
 										title: "提示",
@@ -530,13 +530,13 @@
 	.total-amount .symbol {
 		font-size: 24rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.total-amount .amount {
 		font-size: 28rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.amount-lable {
@@ -547,7 +547,7 @@
 	.pay-btn {
 		width: 680rpx;
 		height: 88rpx;
-		background: linear-gradient(180deg, #F52540 0%, #E8101E 100%);
+		background: linear-gradient(180deg, #F52540 0%, #FF4767 100%);
 		border-radius: 43rpx;
 		font-weight: 500;
 		font-size: 30rpx;
diff --git a/pages/shop/photoAlbum/addPhoto.vue b/pages/shop/photoAlbum/addPhoto.vue
index 51c7d5e..3746216 100644
--- a/pages/shop/photoAlbum/addPhoto.vue
+++ b/pages/shop/photoAlbum/addPhoto.vue
@@ -12,7 +12,7 @@
 		</view>
 		<view class="review" v-if="imgItem.apply_state==2">
 			<view class="review-title">
-				<text class="review-title-text">审核成功<text style="color: #E8101E;">、线上展示中</text></text>
+				<text class="review-title-text">审核成功<text style="color: #FF4767;">、线上展示中</text></text>
 			</view>
 		</view>
 		<view class="review" v-if="imgItem.apply_state==3">
@@ -428,12 +428,12 @@
 							title: '取消上传',
 							icon: 'none'
 						});
-					} else {
-						console.error('上传失败：', err.errMsg);
-						uni.showToast({
-							title: err.errMsg || '上传失败',
-							icon: 'none'
-						}); // 新增：上传失败提示
+					} else {
+						console.error('上传失败：', err.errMsg);
+						uni.showToast({
+							title: err.errMsg || '上传失败',
+							icon: 'none'
+						}); // 新增：上传失败提示
 					}
 
 				} finally {
@@ -533,7 +533,7 @@
 				.review-title-text {
 					font-weight: 500;
 					font-size: 28rpx;
-					color: #E8101E;
+					color: #FF4767;
 					line-height: 40rpx;
 					text-align: left;
 					font-style: normal;
@@ -724,10 +724,10 @@
 				width: 278rpx;
 				height: 98rpx;
 				border-radius: 49rpx;
-				border: 1rpx solid #E8101E;
+				border: 1rpx solid #FF4767;
 				font-weight: 400;
 				font-size: 32rpx;
-				color: #E8101E;
+				color: #FF4767;
 				text-align: center;
 				font-style: normal;
 			}
@@ -735,7 +735,7 @@
 			.container-buttons-sure {
 				width: 278rpx;
 				height: 98rpx;
-				background: #E8101E;
+				background: #FF4767;
 				border-radius: 49rpx;
 				font-weight: 400;
 				font-size: 32rpx;
@@ -747,7 +747,7 @@
 			.container-buttons-sure2 {
 				width: 710rpx;
 				height: 98rpx;
-				background: #E8101E;
+				background: #FF4767;
 				border-radius: 49rpx;
 				font-weight: 400;
 				font-size: 38rpx;
diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue
index c0c8ad0..6d3d7a6 100644
--- a/pages/shop/photoAlbum/photoManage.vue
+++ b/pages/shop/photoAlbum/photoManage.vue
@@ -275,7 +275,7 @@
 				.titles-bar {
 					width: 6rpx;
 					height: 30rpx;
-					background-color: #E8101E;
+					background-color: #FF4767;
 					margin-right: 10rpx;
 					border-radius: 5rpx;
 				}
diff --git a/pages/shop/photoAlbum/videoList.vue b/pages/shop/photoAlbum/videoList.vue
index abd5501..0d11f06 100644
--- a/pages/shop/photoAlbum/videoList.vue
+++ b/pages/shop/photoAlbum/videoList.vue
@@ -24,7 +24,7 @@
 					@click="isManage ? toggleSelect(index2) : goAdd(class_type,item2)">
 					<!-- 选择框 -->
 					<image class="content-photo-select" v-if="isManage"
-						:src="selectedItems.includes(index2) ? '/static/images/icons/yes_icon.png' : '/static/images/icons/no_icon2.png'">
+						:src="selectedItems.includes(index2) ? '/static/images/agree_y.png' : '/static/images/icons/no_icon2.png'">
 					</image>
 					<image class="content-photo-img" mode="aspectFill" :src="getItem(item2).url"></image>
 					<view class="content-photo-title">
@@ -47,7 +47,7 @@
 					v-if="imgVideoList" @click="isManage ? toggleSelect(index2) : goAdd(class_type,item2)">
 					<!-- 选择框 -->
 					<image class="content-photo-select" v-if="isManage"
-						:src="selectedItems.includes(index2) ? '/static/images/icons/yes_icon.png' : '/static/images/icons/no_icon2.png'">
+						:src="selectedItems.includes(index2) ? '/static/images/agree_y.png' : '/static/images/icons/no_icon2.png'">
 					</image>
 					<image class="content-photo-video" mode="aspectFill" :src="getItem(item2).url"></image>
 					<view class="content-photo-title">
@@ -474,10 +474,10 @@
 			width: 278rpx;
 			height: 98rpx;
 			border-radius: 49rpx;
-			border: 1rpx solid #E8101E;
+			border: 1rpx solid #FF4767;
 			font-weight: 400;
 			font-size: 32rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: center;
 			font-style: normal;
 		}
@@ -485,7 +485,7 @@
 		.container-buttons-sure {
 			width: 278rpx;
 			height: 98rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 49rpx;
 			font-weight: 400;
 			font-size: 32rpx;
@@ -497,7 +497,7 @@
 		.container-buttons-sure2 {
 			width: 710rpx;
 			height: 98rpx;
-			background: #E8101E;
+			background: #FF4767;
 			border-radius: 49rpx;
 			font-weight: 400;
 			font-size: 38rpx;
diff --git a/pages/shop/qualification_sj_change.vue b/pages/shop/qualification_sj_change.vue
index de7f180..7bef678 100644
--- a/pages/shop/qualification_sj_change.vue
+++ b/pages/shop/qualification_sj_change.vue
@@ -170,7 +170,7 @@
             <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"
+                  src="/static/images/agree_y.png"
                   class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">长久有效</text>
@@ -178,7 +178,7 @@
             <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"
+                  src="/static/images/agree_y.png"
                   class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">指定日期有效</text>
@@ -314,7 +314,7 @@
               @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"
+                  src="/static/images/agree_y.png"
                   class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">{{ item.label }}</text>
@@ -2252,7 +2252,7 @@ export default {
 .title-bar {
   width: 6rpx;
   height: 30rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   margin-right: 7rpx;
   border-radius: 5rpx;
 }
@@ -2405,7 +2405,7 @@ export default {
   width: 60rpx;
   height: 60rpx;
   border: 4rpx solid #fff;
-  border-top: 4rpx solid #E8101E;
+  border-top: 4rpx solid #FF4767;
   border-radius: 50%;
   animation: spin 1s linear infinite;
   margin-bottom: 16rpx;
@@ -2511,8 +2511,8 @@ export default {
 }
 
 .radio.checked {
-  background-color: #E8101E;
-  border-color: #E8101E;
+  background-color: #FF4767;
+  border-color: #FF4767;
 }
 
 .radio-icon-image {
@@ -2614,7 +2614,7 @@ export default {
 .change-info-btn,
 .view-change-btn,
 .resubmit-btn {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 /* 双按钮行样式 */
@@ -2635,7 +2635,7 @@ export default {
 }
 
 .submit-btn {
-  background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   border-radius: 43rpx;
   padding: 0 15rpx;
 }
@@ -2732,7 +2732,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
 .popup-btn .btn-text {
@@ -2752,7 +2752,7 @@ export default {
 }
 
 .confirm-text {
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -2857,13 +2857,13 @@ export default {
 }
 
 .tip-btn.cancel {
-  border: #E8101E 2rpx solid;
+  border: #FF4767 2rpx solid;
   background-color: transparent;
-  color: #e8101e;
+  color: #FF4767;
 }
 
 .tip-btn.confirm {
-  background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+  background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
   color: #FFFFFF;
 }
 
@@ -2902,7 +2902,7 @@ export default {
   right: -10rpx;
   width: 36rpx;
   height: 36rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 50%;
   display: flex;
   align-items: center;
diff --git a/pages/shop/service-detail.nvue b/pages/shop/service-detail.nvue
index c92093e..17e7151 100644
--- a/pages/shop/service-detail.nvue
+++ b/pages/shop/service-detail.nvue
@@ -527,14 +527,14 @@
 
 	.price-symbol {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 		margin-right: 2rpx;
 	}
 
 	.price-value {
 		font-size: 32rpx;
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -655,7 +655,7 @@
 	.look-btn {
 		width: 130rpx;
 		height: 56rpx;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		display: flex;
 		flex-flow: row nowrap;
 		justify-content: center;
@@ -665,7 +665,7 @@
 
 	.look-text {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* 评论区域 */
@@ -734,7 +734,7 @@
 		font-size: 16rpx;
 		padding: 0 8rpx;
 		border-radius: 12rpx;
-		color: #E8101E;
+		color: #FF4767;
 		background-color: rgba(255, 148, 180, 0.50);
 		margin-right: 8rpx;
 	}
@@ -852,7 +852,7 @@
 	.submit-btn {
 		width: 410rpx;
 		height: 64rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 32rpx;
 		color: #FFFFFF;
 		font-size: 28rpx;
diff --git a/pages/shop/service-skills.vue b/pages/shop/service-skills.vue
index 1c8ed7a..0007c80 100644
--- a/pages/shop/service-skills.vue
+++ b/pages/shop/service-skills.vue
@@ -20,7 +20,7 @@
 						<view class="checkbox-wrapper">
 							<view class="checkbox" :class="{ checked: isCurrentSkillSelected(skill.id) }">
 								<image class="check-icon"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png"
 									mode="aspectFit">
 								</image>
 							</view>
@@ -36,7 +36,7 @@
 						<view class="checkbox-wrapper">
 							<view class="checkbox" :class="{ checked: skill.checked }">
 								<image v-if="skill.checked" class="check-icon"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/66325904-4603-48fd-b03b-90c684af96e9"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png"
 									mode="aspectFit">
 								</image>
 							</view>
@@ -743,7 +743,7 @@
     .title-bar {
         width: 6rpx;
         height: 30rpx;
-        background-color: #E8101E;
+        background-color: #FF4767;
         margin-right: 10rpx;
         border-radius: 5rpx;
     }
@@ -810,8 +810,8 @@
     }
 
     .checkbox.checked {
-        background-color: #E8101E;
-        border-color: #E8101E;
+        background-color: #FF4767;
+        border-color: #FF4767;
     }
 
     .check-icon {
@@ -896,11 +896,11 @@
     }
 
     .change-info-btn {
-        background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
     }
 
     .view-change-btn {
-        background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
     }
 
     /* 双按钮行样式 */
@@ -921,7 +921,7 @@
     }
 
     .submit-btn {
-        background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
         border-radius: 43rpx;
         padding: 0 15rpx;
     }
diff --git a/pages/shop/servicesyr-home.nvue b/pages/shop/servicesyr-home.nvue
index 7dd7841..a5aa9df 100644
--- a/pages/shop/servicesyr-home.nvue
+++ b/pages/shop/servicesyr-home.nvue
@@ -427,7 +427,7 @@ export default {
 }
 
 .tab-item.active .tab-lable {
-  color: #E8101E;
+  color: #FF4767;
 }
 .tab-line {
   width: 32rpx;
@@ -437,7 +437,7 @@ export default {
 }
 
 .tab-item.active .tab-line {
-  background: #E8101E;
+  background: #FF4767;
 }
 
 .info-content {
@@ -455,7 +455,7 @@ export default {
 
 .check-text {
   font-size: 28rpx;
-  color: #E8101E;
+  color: #FF4767;
   margin-left: 12rpx;
 }
 
diff --git a/pages/shop/set.vue b/pages/shop/set.vue
index 79214c1..98539f4 100644
--- a/pages/shop/set.vue
+++ b/pages/shop/set.vue
@@ -139,7 +139,7 @@ page {
       font-weight: 500;
       &.btn_change_yes {
         box-sizing: border-box;
-        background: #e8101e;
+        background: #FF4767;
         color: #ffffff;
         text-align: left;
         padding-left: 15rpx;
diff --git a/pages/shop/sj-info-change.vue b/pages/shop/sj-info-change.vue
index 9f5dac9..924baf2 100644
--- a/pages/shop/sj-info-change.vue
+++ b/pages/shop/sj-info-change.vue
@@ -1246,7 +1246,7 @@
     .title-bar {
         width: 6rpx;
         height: 30rpx;
-        background-color: #E8101E;
+        background-color: #FF4767;
         margin-right: 7rpx;
         border-radius: 5rpx;
     }
@@ -1418,7 +1418,7 @@
     .change-info-btn,
     .view-change-btn,
     .resubmit-btn {
-        background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
     }
 
     .action-buttons-row {
@@ -1438,7 +1438,7 @@
     }
 
     .submit-btn {
-        background: linear-gradient(180deg, #F52540 0%, #E8101E 100%, #E8101E 100%);
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
         border-radius: 43rpx;
         padding: 0 15rpx;
     }
@@ -1548,7 +1548,7 @@
     }
 
     .popup-btn.confirm {
-        background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
     }
 
     .popup-btn .btn-text {
@@ -1660,13 +1660,13 @@
     }
 
     .tip-btn.cancel {
-        border: #E8101E 2rpx solid;
+        border: #FF4767 2rpx solid;
         background-color: transparent;
-        color: #e8101e;
+        color: #FF4767;
     }
 
     .tip-btn.confirm {
-        background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
         color: #FFFFFF;
     }
 
diff --git a/pages/shop/staff/addStaff.vue b/pages/shop/staff/addStaff.vue
index 9eb0dd6..baec068 100644
--- a/pages/shop/staff/addStaff.vue
+++ b/pages/shop/staff/addStaff.vue
@@ -58,7 +58,7 @@
 					<image class="tip-icon" src="/static//images/icons/tip_icon.png"></image>温馨提示：
 				</view>
 				<view class="tip-text">
-					<text style="color: #e8101e">门店商家主动邀请入驻的</text>
+					<text style="color: #FF4767">门店商家主动邀请入驻的</text>
 					<text>合作型服务从业者，需线下达成合作协议后，邀请员工入驻成为挂靠手艺人后，再进行添加操作。</text>
 				</view>
 			</view>
@@ -68,7 +68,7 @@
 				</view>
 				<view class="tip-text">
 					<text>门店商家主动邀请入驻的合作型服务从业者，需线下达成合作协议后，</text>
-					<text style="color: #e8101e">员工入驻成为门店手艺人后(搜索美融融手艺人)</text>
+					<text style="color: #FF4767">员工入驻成为门店手艺人后(搜索美融融手艺人)</text>
 					<text>，再进行添加操作。</text>
 				</view>
 			</view>
@@ -296,7 +296,7 @@
 					border: 1rpx solid rgba(232, 16, 30, 0.28);
 					font-weight: 400;
 					font-size: 24rpx;
-					color: #e8101e;
+					color: #FF4767;
 					text-align: right;
 					font-style: normal;
 				}
@@ -334,7 +334,7 @@
 				.mc-line {
 					width: 6rpx;
 					height: 22rpx;
-					background: #e8101e;
+					background: #FF4767;
 					border-radius: 4rpx;
 					margin-right: 10rpx;
 				}
@@ -385,7 +385,7 @@
 				.item-index {
 					font-weight: 500;
 					font-size: 18rpx;
-					color: #e8101e;
+					color: #FF4767;
 					text-align: left;
 					font-style: normal;
 					width: 30rpx;
@@ -434,7 +434,7 @@
 		.agreement-btn {
 			width: 710rpx;
 			height: 98rpx;
-			background: #e8101e;
+			background: #FF4767;
 			border-radius: 49rpx;
 			font-weight: 400;
 			font-size: 38rpx;
diff --git a/pages/shop/staff/components/orderCard.vue b/pages/shop/staff/components/orderCard.vue
index bf5c4b8..0e03f0b 100644
--- a/pages/shop/staff/components/orderCard.vue
+++ b/pages/shop/staff/components/orderCard.vue
@@ -176,7 +176,7 @@
 
 		.stateText {
 			font-size: 28rpx;
-			color: #e8101e;
+			color: #FF4767;
 			line-height: 39rpx;
 		}
 
@@ -212,7 +212,7 @@
 	.service-price {
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #e8101e;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -240,7 +240,7 @@
 			letter-spacing: 2px;
 			text-align: left;
 			font-style: normal;
-			background: linear-gradient(166deg, #fc5e72 0%, #e8101e 100%);
+			background: linear-gradient(166deg, #fc5e72 0%, #FF4767 100%);
 			border-radius: 6rpx;
 			padding: 4rpx 4rpx 4rpx 8rpx;
 			margin-right: 13rpx;
@@ -298,7 +298,7 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #e8101e;
-		color: #e8101e;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/staff/components/search-box.vue b/pages/shop/staff/components/search-box.vue
index 0e93444..1554e91 100644
--- a/pages/shop/staff/components/search-box.vue
+++ b/pages/shop/staff/components/search-box.vue
@@ -44,7 +44,7 @@
 			},
 			bgClor: {
 				type: String,
-				default: "linear-gradient(134deg, #f52540 0%, #e8101e 100%)",
+				default: "linear-gradient(134deg, #f52540 0%, #FF4767 100%)",
 			},
 			showAdd: {
 				type: Boolean,
@@ -123,7 +123,7 @@
 		justify-content: center;
 		align-items: center;
 		position: relative;
-		background: linear-gradient(134deg, #f52540 0%, #e8101e 100%);
+		background: linear-gradient(134deg, #f52540 0%, #FF4767 100%);
 		transform: translateY(0rpx);
 	}
 
@@ -195,7 +195,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+		background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
 		background-size: cover;
 		color: #fff;
 		font-size: 26rpx;
diff --git a/pages/shop/staff/detail.vue b/pages/shop/staff/detail.vue
index c878ed9..c3f38a1 100644
--- a/pages/shop/staff/detail.vue
+++ b/pages/shop/staff/detail.vue
@@ -486,7 +486,7 @@
 				height: 52rpx;
 				line-height: 52rpx;
 				border-radius: 26rpx;
-				background-color: #e8101e;
+				background-color: #FF4767;
 				display: flex;
 				flex-flow: row nowrap;
 				justify-content: center;
@@ -552,7 +552,7 @@
 
 					// 选中态样式
 					&.active {
-						color: #e8101e; // 红色文字（匹配设计）
+						color: #FF4767; // 红色文字（匹配设计）
 
 						&::after {
 							content: "";
@@ -562,7 +562,7 @@
 							transform: translateX(-50%);
 							width: 28rpx;
 							height: 6rpx;
-							background: #e8101e;
+							background: #FF4767;
 							border-radius: 3rpx;
 						}
 					}
@@ -597,7 +597,7 @@
 
 					// 选中态样式
 					&.active {
-						color: #e8101e;
+						color: #FF4767;
 						background-color: #fee5e7; // 深粉色（更贴近设计的选中色）
 					}
 				}
@@ -618,7 +618,7 @@
 		margin: 20rpx auto;
 		width: 710rpx;
 		height: 98rpx;
-		background: #e8101e;
+		background: #FF4767;
 		border-radius: 49rpx;
 		font-weight: 400;
 		font-size: 38rpx;
diff --git a/pages/shop/staff/distribution-service.vue b/pages/shop/staff/distribution-service.vue
index 034b965..706b209 100644
--- a/pages/shop/staff/distribution-service.vue
+++ b/pages/shop/staff/distribution-service.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<custom-navbar title="给员工分配服务" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff" borderBottom="none"></custom-navbar>
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff" borderBottom="none"></custom-navbar>
 		<searchBox placeholder="服务名称" v-model="queryData.title" :showAdd="false" @confirm="search" @search="search">
 		</searchBox>
 		<view class="container-tip flex-row-center">
@@ -21,9 +21,9 @@
 									{{ item.title }}
 								</view>
 								<view class="flex-row-center">
-									<text class="item-left-text2" style="color: #e8101e">¥</text>
+									<text class="item-left-text2" style="color: #FF4767">¥</text>
 									<text class="item-left-text2"
-										style="color: #e8101e; font-size: 28rpx">{{ item.server_price }}</text>
+										style="color: #FF4767; font-size: 28rpx">{{ item.server_price }}</text>
 								</view>
 							</view>
 						</view>
@@ -95,7 +95,7 @@
 			.container-tip-text {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #e8101e;
+				color: #FF4767;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
@@ -174,7 +174,7 @@
 					border-radius: 27rpx;
 					border: 1rpx solid rgba(232, 16, 30, 0.5);
 					font-size: 24rpx;
-					color: #e8101e;
+					color: #FF4767;
 					text-align: left;
 					font-style: normal;
 				}
diff --git a/pages/shop/staff/manage.vue b/pages/shop/staff/manage.vue
index 09037aa..aad5e6e 100644
--- a/pages/shop/staff/manage.vue
+++ b/pages/shop/staff/manage.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<custom-navbar title="员工管理" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
 			headleSrc="/static/images/recruit/guide.png" :showHeadle="false" titleColor="#fff" borderBottom="none"
 			@onHeadleClick="openPop"></custom-navbar>
 		<searchBox placeholder="手艺人名字/手机号" v-model="queryData.nameorphone" :showAdd="true" @confirm="search" @search="search"
@@ -259,7 +259,7 @@
 				/* 预先设置透明边框，防止切换时布局跳动 */
 
 				&.active {
-					color: #e8101e;
+					color: #FF4767;
 					font-weight: 500;
 					position: relative;
 
@@ -273,7 +273,7 @@
 						/* 激活时显示红色边框 */
 						width: 34rpx;
 						height: 6rpx;
-						background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+						background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
 						border-radius: 3rpx;
 					}
 				}
@@ -323,10 +323,10 @@
 				width: 246rpx;
 				height: 80rpx;
 				border-radius: 40rpx;
-				border: 2rpx solid #e8101e;
+				border: 2rpx solid #FF4767;
 				font-weight: 500;
 				font-size: 28rpx;
-				color: #e8101e;
+				color: #FF4767;
 				text-align: left;
 				font-style: normal;
 				display: flex;
@@ -337,7 +337,7 @@
 			.pop-content-sure {
 				width: 246rpx;
 				height: 80rpx;
-				background: #e8101e;
+				background: #FF4767;
 				border-radius: 40rpx;
 				font-weight: 500;
 				font-size: 28rpx;
@@ -381,7 +381,7 @@
 					font-style: normal;
 					width: 124rpx;
 					height: 34rpx;
-					background: #E8101E;
+					background: #FF4767;
 					border-radius: 18rpx;
 					position: absolute;
 					bottom: 0;
@@ -479,7 +479,7 @@
 		.switch-text {
 			font-weight: 500;
 			font-size: 24rpx;
-			color: #E8101E;
+			color: #FF4767;
 			line-height: 33rpx;
 			text-align: right;
 			font-style: normal;
diff --git a/pages/shop/staff/record.vue b/pages/shop/staff/record.vue
index 7465cf5..71b5c1f 100644
--- a/pages/shop/staff/record.vue
+++ b/pages/shop/staff/record.vue
@@ -160,7 +160,7 @@
 	}
 
 	.tab-item.active {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 
@@ -172,7 +172,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
@@ -192,7 +192,7 @@
 			.stateText {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #E8101E;
+				color: #FF4767;
 				text-align: left;
 				font-style: normal;
 				position: absolute;
@@ -269,7 +269,7 @@
 				.reason-label {
 					font-weight: 400;
 					font-size: 24rpx;
-					color: #E8101E;
+					color: #FF4767;
 					line-height: 33rpx;
 					text-align: left;
 					font-style: normal;
diff --git a/pages/shop/staff/selectSyr.vue b/pages/shop/staff/selectSyr.vue
index b4b2ca3..0f5e2db 100644
--- a/pages/shop/staff/selectSyr.vue
+++ b/pages/shop/staff/selectSyr.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<custom-navbar title="选择员工" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
 			titleColor="#fff" borderBottom="none"></custom-navbar>
 		<searchBox placeholder="输入员工名/手机号" v-model="queryData.str_val" :showAdd="false" @confirm="search"
 			@search="search">
@@ -205,7 +205,7 @@
 
 				/* 预先设置透明边框，防止切换时布局跳动 */
 				&.active {
-					color: #e8101e;
+					color: #FF4767;
 					font-weight: 500;
 					position: relative;
 
@@ -219,7 +219,7 @@
 						/* 激活时显示红色边框 */
 						width: 34rpx;
 						height: 6rpx;
-						background: linear-gradient(306deg, #e8101e 0%, #fc563b 100%);
+						background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
 						border-radius: 3rpx;
 					}
 				}
@@ -303,7 +303,7 @@
 			margin: 0 20rpx;
 			width: 710rpx;
 			height: 98rpx;
-			background: #e8101e;
+			background: #FF4767;
 			border-radius: 49rpx;
 			font-weight: 400;
 			font-size: 38rpx;
diff --git a/pages/shop/staff/serviceList.vue b/pages/shop/staff/serviceList.vue
index 8636f8f..61d3860 100644
--- a/pages/shop/staff/serviceList.vue
+++ b/pages/shop/staff/serviceList.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="container">
 		<custom-navbar title="服务项目" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" :showHeadle="false" titleColor="#fff"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" :showHeadle="false" titleColor="#fff"
 			borderBottom="none"></custom-navbar>
-		<serviecFirstTab :tabs="tabs" :activeId="activeId" activeColor="#E8101E" @tab-click="tabClick" bgColor="#fff">
+		<serviecFirstTab :tabs="tabs" :activeId="activeId" activeColor="#FF4767" @tab-click="tabClick" bgColor="#fff">
 		</serviecFirstTab>
 
 		<view class="service-list">
@@ -15,9 +15,9 @@
 							{{ item.title }}
 						</view>
 						<view class="flex-row-center">
-							<text class="item-left-text2" style="color: #e8101e">¥</text>
+							<text class="item-left-text2" style="color: #FF4767">¥</text>
 							<text class="item-left-text2"
-								style="color: #e8101e; font-size: 28rpx">{{ item.server_price }}</text>
+								style="color: #FF4767; font-size: 28rpx">{{ item.server_price }}</text>
 							<view class="item-left-line"></view>
 							<text class="item-left-text2">{{ item.server_time }}分钟</text>
 						</view>
@@ -219,7 +219,7 @@
 			width: 670rpx;
 			height: 86rpx;
 			border-radius: 100rpx;
-			background: #e8101e;
+			background: #FF4767;
 			font-weight: 400;
 			font-size: 34rpx;
 			color: #ffffff;
diff --git a/pages/shop/staff/staffDetail.vue b/pages/shop/staff/staffDetail.vue
index 857ede7..6e77b00 100644
--- a/pages/shop/staff/staffDetail.vue
+++ b/pages/shop/staff/staffDetail.vue
@@ -165,7 +165,7 @@
 						border: 2rpx solid rgba(232, 16, 30, 0.28);
 						font-weight: 400;
 						font-size: 24rpx;
-						color: #e8101e;
+						color: #FF4767;
 						line-height: 32rpx;
 						text-align: right;
 						font-style: normal;
diff --git a/pages/shop/staff/unbundleList.vue b/pages/shop/staff/unbundleList.vue
index 1c49b87..9a015ad 100644
--- a/pages/shop/staff/unbundleList.vue
+++ b/pages/shop/staff/unbundleList.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<custom-navbar title="解绑记录" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #E8101E 100%)" titleColor="#fff"
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"
 			borderBottom="none"></custom-navbar>
 		<searchBox placeholder="手艺人名称" v-model="queryData.str_val" :showAdd="false" @confirm="search" @search="search" />
 		<CommonList ref="groupRef" apiUrl="/sj/getUnbindReadList"
@@ -85,7 +85,7 @@
 			.container-tip-text {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #e8101e;
+				color: #FF4767;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
@@ -159,7 +159,7 @@
 					border-radius: 27rpx;
 					border: 1rpx solid rgba(232, 16, 30, 0.5);
 					font-size: 24rpx;
-					color: #e8101e;
+					color: #FF4767;
 					text-align: left;
 					font-style: normal;
 				}
diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue
index 80f8863..1168036 100644
--- a/pages/shop/userorder-detail.vue
+++ b/pages/shop/userorder-detail.vue
@@ -1323,7 +1323,7 @@
 		font-family: DINPro, DINPro;
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
@@ -1356,7 +1356,7 @@
 		font-family: DINPro, DINPro;
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 
 		.icon {
 			font-size: 20rpx;
@@ -1476,7 +1476,7 @@
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
diff --git a/pages/shop/userorders.vue b/pages/shop/userorders.vue
index 8acdbc3..54cc7d8 100644
--- a/pages/shop/userorders.vue
+++ b/pages/shop/userorders.vue
@@ -335,7 +335,7 @@
 	}
 	
 	.tab-item.active {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 	}
 	
@@ -347,7 +347,7 @@
 		left: 50%;
 		bottom: 0;
 		transform: translateX(-50%);
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 	
@@ -376,7 +376,7 @@
 	}
 	
 	.tab-item2.active {
-		color: #E8101E;
+		color: #FF4767;
 		font-weight: 500;
 		background: #FEE5E7;
 	}
@@ -443,7 +443,7 @@
 
 	.rating-score {
 		font-size: 16rpx;
-		color: #E8101E;
+		color: #FF4767;
 		margin-left: 68rpx;
 	}
 
@@ -497,7 +497,7 @@
 
 	.load-date {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.load-text {
diff --git a/pages/shop/workSpace/addWorkSpace.vue b/pages/shop/workSpace/addWorkSpace.vue
index 41b3b07..ce7194f 100644
--- a/pages/shop/workSpace/addWorkSpace.vue
+++ b/pages/shop/workSpace/addWorkSpace.vue
@@ -707,8 +707,8 @@ font-style: normal;
 
 .btn-draft {
   background-color: #ffffff;
-  color: #E8101E;
-  border: 2rpx solid #E8101E;
+  color: #FF4767;
+  border: 2rpx solid #FF4767;
   box-sizing: border-box;
 }
 
@@ -717,7 +717,7 @@ font-style: normal;
 }
 
 .btn-submit {
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
 }
 .form-step {
@@ -867,7 +867,7 @@ font-style: normal;
 /* #endif */
 
 .redTip {
-  color: #E8101E;
+  color: #FF4767;
   font-size: 24rpx;
   margin-left: 10rpx;
 }
diff --git a/pages/shop/workSpace/components/class_select.vue b/pages/shop/workSpace/components/class_select.vue
index 0c3065b..89ebbf5 100644
--- a/pages/shop/workSpace/components/class_select.vue
+++ b/pages/shop/workSpace/components/class_select.vue
@@ -186,7 +186,7 @@ export default {
         color: #333333;
       }
       .activeText {
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -214,9 +214,9 @@ export default {
         border: 2rpx solid transparent;
       }
       .secondClassItemActive {
-        border: 1rpx solid #E8101E;
+        border: 1rpx solid #FF4767;
         background: rgba(252, 67, 124, 0.1);
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -226,7 +226,7 @@ export default {
     margin-top: 30rpx;
     font-size: 26rpx;
     .red {
-      color: #E8101E;
+      color: #FF4767;
     }
   }
   .fixBottomBtn {
@@ -243,10 +243,10 @@ export default {
     .btn {
       width: 100%;
       height: 39rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
       border-radius: 39rpx;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
     }
   }
 }
diff --git a/pages/shop/workSpace/components/orderCard.vue b/pages/shop/workSpace/components/orderCard.vue
index 41613b0..9f440b4 100644
--- a/pages/shop/workSpace/components/orderCard.vue
+++ b/pages/shop/workSpace/components/orderCard.vue
@@ -184,7 +184,7 @@
 		.stateText {
 			font-weight: 400;
 			font-size: 26rpx;
-			color: #E8101E;
+			color: #FF4767;
 			text-align: left;
 			font-style: normal;
 			position: absolute;
@@ -272,7 +272,7 @@
 			font-family: DINPro, DINPro;
 			font-weight: 500;
 			font-size: 36rpx;
-			color: #E8101E;
+			color: #FF4767;
 			line-height: 34rpx;
 			text-align: left;
 			font-style: normal;
@@ -357,7 +357,7 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/workSpace/components/workSpaceCard.vue b/pages/shop/workSpace/components/workSpaceCard.vue
index 388aacb..d48c182 100644
--- a/pages/shop/workSpace/components/workSpaceCard.vue
+++ b/pages/shop/workSpace/components/workSpaceCard.vue
@@ -282,7 +282,7 @@ export default {
   top: 0;
   width: 160rpx;
   height: 100%;
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
   display: flex;
   justify-content: center;
@@ -336,17 +336,17 @@ export default {
 
 .price-symbol {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-value {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-unit {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .status-tag {
@@ -367,7 +367,7 @@ export default {
 .status-tag.state2 .status-text {
 font-weight: 400;
 font-size: 26rpx;
-color: #E8101E;
+color: #FF4767;
 line-height: 37rpx;
 text-align: left;
 font-style: normal;
diff --git a/pages/shop/workSpace/list.vue b/pages/shop/workSpace/list.vue
index c9a83ac..fc4b36f 100644
--- a/pages/shop/workSpace/list.vue
+++ b/pages/shop/workSpace/list.vue
@@ -348,7 +348,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
diff --git a/pages/shop/workSpace/saleList.vue b/pages/shop/workSpace/saleList.vue
index 6068598..b17345b 100644
--- a/pages/shop/workSpace/saleList.vue
+++ b/pages/shop/workSpace/saleList.vue
@@ -320,7 +320,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
diff --git a/pages/syr/components/orderCard.vue b/pages/syr/components/orderCard.vue
index 4da2ca8..996c782 100644
--- a/pages/syr/components/orderCard.vue
+++ b/pages/syr/components/orderCard.vue
@@ -189,7 +189,7 @@
 
 	/* 接单按钮 */
 	.accept-btn {
-		border: 2rpx solid #E8101E;
-		color: #E8101E;
+		border: 2rpx solid #FF4767;
+		color: #FF4767;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/syr/home.vue b/pages/syr/home.vue
index 52d3d38..dc092de 100644
--- a/pages/syr/home.vue
+++ b/pages/syr/home.vue
@@ -179,7 +179,7 @@
 					},
 				],
 				chartOpts: {
-					color: ["#E8101E"],
+					color: ["#FF4767"],
 					padding: [15, 15, 0, 15],
 					enableScroll: false,
 					legend: false,
@@ -671,7 +671,7 @@
 		height: 52rpx;
 		line-height: 52rpx;
 		border-radius: 26rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		display: flex;
 		flex-flow: row nowrap;
 		justify-content: center;
@@ -761,7 +761,7 @@
 		width: 70rpx;
 		height: 6rpx;
 		border-radius: 4rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		position: absolute;
 		bottom: -10rpx;
 		z-index: 99;
@@ -833,7 +833,7 @@
 	}
 
 	.order-state-item.active {
-		background: linear-gradient(43deg, #f52540 0%, #E8101E 100%);
+		background: linear-gradient(43deg, #f52540 0%, #FF4767 100%);
 	}
 
 	.order-state-item.active .state-name,
@@ -935,7 +935,7 @@
 
 	.action-btn.verify .action-text {
 		font-size: 28rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.nothings-box {
diff --git a/pages/syr/manHour/addManHour.vue b/pages/syr/manHour/addManHour.vue
index facc2b1..470bd44 100644
--- a/pages/syr/manHour/addManHour.vue
+++ b/pages/syr/manHour/addManHour.vue
@@ -711,13 +711,13 @@ font-style: normal;
 
 .btn-draft {
   background-color: #ffffff;
-  color: #E8101E;
-  border: 2rpx solid #E8101E;
+  color: #FF4767;
+  border: 2rpx solid #FF4767;
   box-sizing: border-box;
 }
 
 .btn-submit {
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
 }
 .form-step {
@@ -867,7 +867,7 @@ font-style: normal;
 /* #endif */
 
 .redTip {
-  color: #E8101E;
+  color: #FF4767;
   font-size: 24rpx;
   margin-left: 10rpx;
 }
diff --git a/pages/syr/manHour/components/class_select.vue b/pages/syr/manHour/components/class_select.vue
index bcb2bf3..3c90b56 100644
--- a/pages/syr/manHour/components/class_select.vue
+++ b/pages/syr/manHour/components/class_select.vue
@@ -184,7 +184,7 @@ export default {
         color: #333333;
       }
       .activeText {
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -212,9 +212,9 @@ export default {
         border: 2rpx solid transparent;
       }
       .secondClassItemActive {
-        border: 1rpx solid #E8101E;
+        border: 1rpx solid #FF4767;
         background: rgba(252, 67, 124, 0.1);
-        color: #E8101E;
+        color: #FF4767;
       }
     }
   }
@@ -224,7 +224,7 @@ export default {
     margin-top: 30rpx;
     font-size: 26rpx;
     .red {
-      color: #E8101E;
+      color: #FF4767;
     }
   }
   .fixBottomBtn {
@@ -241,10 +241,10 @@ export default {
     .btn {
       width: 100%;
       height: 39rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
       border-radius: 39rpx;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
     }
   }
 }
diff --git a/pages/syr/manHour/components/manHourCard.vue b/pages/syr/manHour/components/manHourCard.vue
index 54ba73c..48b73d0 100644
--- a/pages/syr/manHour/components/manHourCard.vue
+++ b/pages/syr/manHour/components/manHourCard.vue
@@ -282,7 +282,7 @@ export default {
   top: 0;
   width: 160rpx;
   height: 100%;
-  background-color: #E8101E;
+  background-color: #FF4767;
   color: #ffffff;
   display: flex;
   justify-content: center;
@@ -336,17 +336,17 @@ export default {
 
 .price-symbol {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-value {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .price-unit {
   font-size: 30rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .status-tag {
@@ -367,7 +367,7 @@ export default {
 .status-tag.state2 .status-text {
 font-weight: 400;
 font-size: 26rpx;
-color: #E8101E;
+color: #FF4767;
 line-height: 37rpx;
 text-align: left;
 font-style: normal;
diff --git a/pages/syr/manHour/components/orderCard.vue b/pages/syr/manHour/components/orderCard.vue
index 1eb482d..7e76749 100644
--- a/pages/syr/manHour/components/orderCard.vue
+++ b/pages/syr/manHour/components/orderCard.vue
@@ -166,7 +166,7 @@ export default {
   margin-bottom: 40rpx;
   .stateText {
     font-size: 28rpx;
-    color: #E8101E;
+    color: #FF4767;
     line-height: 39rpx;
   }
 }
@@ -213,7 +213,7 @@ export default {
       .service-price {
         font-weight: 500;
         font-size: 30rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 34rpx;
       }
     }
@@ -275,7 +275,7 @@ font-style: normal;
 
 /* 接单按钮 */
 .accept-btn {
-  border: 2rpx solid #E8101E;
-  color: #E8101E;
+  border: 2rpx solid #FF4767;
+  color: #FF4767;
 }
 </style>
diff --git a/pages/syr/manHour/list.vue b/pages/syr/manHour/list.vue
index 5bd9828..1e373a3 100644
--- a/pages/syr/manHour/list.vue
+++ b/pages/syr/manHour/list.vue
@@ -351,7 +351,7 @@ font-style: normal;
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 3rpx;
 }
 
diff --git a/pages/syr/manHour/saleList.vue b/pages/syr/manHour/saleList.vue
index 47fd849..5ecdc07 100644
--- a/pages/syr/manHour/saleList.vue
+++ b/pages/syr/manHour/saleList.vue
@@ -309,7 +309,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background-color: #E8101E;
+		background-color: #FF4767;
 		border-radius: 3rpx;
 	}
 
diff --git a/pages/syr/manHourDetail.vue b/pages/syr/manHourDetail.vue
index 905323e..3542ca0 100644
--- a/pages/syr/manHourDetail.vue
+++ b/pages/syr/manHourDetail.vue
@@ -80,7 +80,7 @@
         </view>
         <view class="info-item" v-if="orderInfo.state != 1">
           <text class="label">支付小计</text>
-          <text class="value" style="color: #E8101E"
+          <text class="value" style="color: #FF4767"
             >{{ orderInfo.order_money }}元</text
           >
         </view>
@@ -723,13 +723,13 @@ page {
   margin-left: 60rpx;
 }
 .btn-border {
-  border: 1rpx solid #E8101E;
+  border: 1rpx solid #FF4767;
   background-color: #fff;
   box-sizing: border-box;
   margin-left: 60rpx;
 }
 .btn-bg {
-  background-color: #E8101E;
+  background-color: #FF4767;
 }
 .button-text {
   font-size: 28rpx;
@@ -739,7 +739,7 @@ page {
 .btn-border .button-text {
   font-size: 28rpx;
   font-weight: 400;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 /* 权限提示 */
diff --git a/pages/syr/migration.vue b/pages/syr/migration.vue
index 7ac9c6f..ddfc88e 100644
--- a/pages/syr/migration.vue
+++ b/pages/syr/migration.vue
@@ -236,7 +236,7 @@
 	.jump-button {
 		width: 100%;
 		height: 100rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 60rpx;
 		display: flex;
 		align-items: center;
diff --git a/pages/syr/my.vue b/pages/syr/my.vue
index e0293fb..3447801 100644
--- a/pages/syr/my.vue
+++ b/pages/syr/my.vue
@@ -314,7 +314,7 @@
 		flex-flow: row nowrap;
 		justify-content: center;
 		align-items: center;
-		border: 1rpx solid #E8101E;
+		border: 1rpx solid #FF4767;
 		background-color: #FFF1F1;
 		border-radius: 22rpx;
 		box-sizing: border-box;
@@ -334,7 +334,7 @@
 
 	.verified-text {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.verified-text.no {
@@ -401,7 +401,7 @@
 		line-height: 30rpx;
 		text-align: left;
 		font-style: normal;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.function-list {
diff --git a/pages/syr/shoporder-detail.vue b/pages/syr/shoporder-detail.vue
index c8ba45a..54ab2e5 100644
--- a/pages/syr/shoporder-detail.vue
+++ b/pages/syr/shoporder-detail.vue
@@ -890,7 +890,7 @@
 	.real-price {
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 
 		.icon {
 			font-size: 20rpx;
@@ -1001,14 +1001,14 @@
 	}
 
 	.btn-border {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 60rpx;
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
@@ -1020,7 +1020,7 @@
 	.btn-border .button-text {
 		font-size: 28rpx;
 		font-weight: 400;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* APP适配 */
diff --git a/pages/syr/shoporders.vue b/pages/syr/shoporders.vue
index a3ae68c..8165090 100644
--- a/pages/syr/shoporders.vue
+++ b/pages/syr/shoporders.vue
@@ -261,18 +261,18 @@ export default {
 
 .rating-score {
   font-size: 16rpx;
-  color: #E8101E;
+  color: #FF4767;
   margin-left: 68rpx;
 }
 
 .currency {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .amount {
   font-size: 32rpx;
-  color: #E8101E;
+  color: #FF4767;
   font-weight: 500;
 }
 
@@ -314,7 +314,7 @@ export default {
 }
 .load-date {
   font-size: 24rpx;
-  color: #E8101E;
+  color: #FF4767;
 }
 
 .load-text {
diff --git a/pages/syr/userorder-detail.vue b/pages/syr/userorder-detail.vue
index 81c10fb..f670994 100644
--- a/pages/syr/userorder-detail.vue
+++ b/pages/syr/userorder-detail.vue
@@ -899,7 +899,7 @@
 	.real-price {
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #E8101E;
+		color: #FF4767;
 
 		.icon {
 			font-size: 20rpx;
@@ -1010,14 +1010,14 @@
 	}
 
 	.btn-border {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 60rpx;
 	}
 
 	.btn-bg {
-		background-color: #E8101E;
+		background-color: #FF4767;
 	}
 
 	.button-text {
@@ -1029,7 +1029,7 @@
 	.btn-border .button-text {
 		font-size: 28rpx;
 		font-weight: 400;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	/* APP适配 */
diff --git a/pages/syr/userorders.vue b/pages/syr/userorders.vue
index ae934c2..6dd6e49 100644
--- a/pages/syr/userorders.vue
+++ b/pages/syr/userorders.vue
@@ -326,7 +326,7 @@
 
 	.rating-score {
 		font-size: 16rpx;
-		color: #E8101E;
+		color: #FF4767;
 		margin-left: 68rpx;
 	}
 
@@ -380,7 +380,7 @@
 
 	.load-date {
 		font-size: 24rpx;
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.load-text {
diff --git a/pages/syr/workstation/buyList.vue b/pages/syr/workstation/buyList.vue
index af5b825..aba63ac 100644
--- a/pages/syr/workstation/buyList.vue
+++ b/pages/syr/workstation/buyList.vue
@@ -281,7 +281,7 @@ export default {
   transform: translateX(-50%);
   width: 32rpx;
   height: 6rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 3rpx;
 }
 
diff --git a/pages/syr/workstation/buyWorkstation.vue b/pages/syr/workstation/buyWorkstation.vue
index bf2cc2c..9dd7620 100644
--- a/pages/syr/workstation/buyWorkstation.vue
+++ b/pages/syr/workstation/buyWorkstation.vue
@@ -633,7 +633,7 @@
 
 			.filter__left__select__item.active {
 				.filter__left__select__item__title {
-					color: #E8101E;
+					color: #FF4767;
 				}
 			}
 		}
@@ -736,7 +736,7 @@
 		transform: translateX(-50%);
 		width: 32rpx;
 		height: 6rpx;
-		background: #E8101E;
+		background: #FF4767;
 		border-radius: 3rpx;
 	}
 
@@ -771,11 +771,11 @@
 	}
 
 	.icon-tab.active .icon-text {
-		color: #E8101E;
+		color: #FF4767;
 	}
 
 	.icon-tab.active .icon-img {
-		border: 2rpx solid #E8101E;
+		border: 2rpx solid #FF4767;
 	}
 
 	.service-list {
diff --git a/pages/syr/workstation/components/buyOrderCard.vue b/pages/syr/workstation/components/buyOrderCard.vue
index 48a8e06..635c68e 100644
--- a/pages/syr/workstation/components/buyOrderCard.vue
+++ b/pages/syr/workstation/components/buyOrderCard.vue
@@ -141,14 +141,14 @@ export default {
           justify-content: center;
           font-weight: 400;
           font-size: 26rpx;
-          color: #E8101E;
+          color: #FF4767;
           line-height: 37rpx;
           text-align: left;
           font-style: normal;
           width: 160rpx;
           height: 58rpx;
           border-radius: 32rpx;
-          border: 2rpx solid #E8101E;
+          border: 2rpx solid #FF4767;
         }
       }
     }
diff --git a/pages/syr/workstation/components/orderCard.vue b/pages/syr/workstation/components/orderCard.vue
index 6ae4f3f..d3d7a04 100644
--- a/pages/syr/workstation/components/orderCard.vue
+++ b/pages/syr/workstation/components/orderCard.vue
@@ -181,7 +181,7 @@ export default {
   margin-bottom: 40rpx;
   .stateText {
     font-size: 28rpx;
-    color: #E8101E;
+    color: #FF4767;
     line-height: 39rpx;
   }
 }
@@ -228,7 +228,7 @@ export default {
       .service-price {
         font-weight: 500;
         font-size: 30rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 34rpx;
       }
     }
@@ -289,7 +289,7 @@ font-style: normal;
 
 /* 接单按钮 */
 .accept-btn {
-  border: 2rpx solid #E8101E;
-  color: #E8101E;
+  border: 2rpx solid #FF4767;
+  color: #FF4767;
 }
 </style>
diff --git a/pages/syr/workstation/workstationDetail.vue b/pages/syr/workstation/workstationDetail.vue
index ed0b5ef..6cfaf02 100644
--- a/pages/syr/workstation/workstationDetail.vue
+++ b/pages/syr/workstation/workstationDetail.vue
@@ -234,7 +234,7 @@ export default {
         &__price {
           font-weight: 500;
           font-size: 36rpx;
-          color: #E8101E;
+          color: #FF4767;
           line-height: 50rpx;
           text-align: left;
           font-style: normal;
@@ -332,10 +332,10 @@ font-style: normal;
       width: 696rpx;
       height: 78rpx;
       border-radius: 798rpx;
-      border: 2rpx solid #E8101E;
+      border: 2rpx solid #FF4767;
       font-weight: 400;
       font-size: 30rpx;
-      color: #E8101E;
+      color: #FF4767;
       line-height: 39rpx;
       text-align: right;
       font-style: normal;
diff --git a/pages/syr/workstation/workstationOrder.vue b/pages/syr/workstation/workstationOrder.vue
index a808314..3f05714 100644
--- a/pages/syr/workstation/workstationOrder.vue
+++ b/pages/syr/workstation/workstationOrder.vue
@@ -238,7 +238,7 @@ export default {
           margin-top: 38rpx;
           font-weight: 500;
           font-size: 28rpx;
-          color: #E8101E;
+          color: #FF4767;
           line-height: 34rpx;
           text-align: left;
           font-style: normal;
@@ -291,7 +291,7 @@ export default {
       &__price {
         font-weight: 500;
         font-size: 42rpx;
-        color: #E8101E;
+        color: #FF4767;
         line-height: 59rpx;
         font-style: normal;
       }
@@ -299,7 +299,7 @@ export default {
     &__right {
       width: 188rpx;
       height: 68rpx;
-      background: linear-gradient(73deg, #fe78b3 0%, #E8101E 100%);
+      background: linear-gradient(73deg, #fe78b3 0%, #FF4767 100%);
       border-radius: 798rpx;
       font-weight: 400;
       font-size: 30rpx;
diff --git a/pages/user/components/project-tabs.vue b/pages/user/components/project-tabs.vue
index cb50375..6e3f47e 100644
--- a/pages/user/components/project-tabs.vue
+++ b/pages/user/components/project-tabs.vue
@@ -157,7 +157,7 @@ export default {
             height: 18rpx;
           }
           .active {
-            color: #e8101e;
+            color: #FF4767;
           }
           .tab-active-indicator {
             position: absolute;
@@ -166,7 +166,7 @@ export default {
             transform: translateX(-50%);
             width: 32rpx;
             height: 6rpx;
-            background: linear-gradient(107deg, #f84c63 0%, #e8101e 100%);
+            background: linear-gradient(107deg, #f84c63 0%, #FF4767 100%);
             border-radius: 10rpx;
           }
         }
@@ -212,7 +212,7 @@ export default {
         }
         .active {
           background: #ffecf0;
-          color: #e8101e;
+          color: #FF4767;
           font-weight: 500;
           transform: scale(1.05);
         }
diff --git a/pages/user/components/serviceCardList.vue b/pages/user/components/serviceCardList.vue
index b0f6063..f8d43c4 100644
--- a/pages/user/components/serviceCardList.vue
+++ b/pages/user/components/serviceCardList.vue
@@ -157,7 +157,7 @@ export default {
     padding: 0 8rpx;
     height: 38rpx;
     line-height: 38rpx;
-    background: linear-gradient(124deg, #f52540 0%, #e8101e 100%);
+    background: linear-gradient(124deg, #f52540 0%, #FF4767 100%);
     border-radius: 12rpx 2rpx 12rpx 2rpx;
     font-size: 22rpx;
     color: #ffffff;
@@ -225,7 +225,7 @@ export default {
   .price {
     font-weight: 500;
     font-size: 26rpx;
-    color: #e8101e;
+    color: #FF4767;
   }
   .service_time {
     font-size: 26rpx;
@@ -264,7 +264,7 @@ export default {
   width: 144rpx;
   height: 60rpx;
   line-height: 60rpx;
-  background: linear-gradient(107deg, #f84c63 0%, #e8101e 100%);
+  background: linear-gradient(107deg, #f84c63 0%, #FF4767 100%);
   border-radius: 30rpx;
   text-align: center;
   color: #fff;
diff --git a/pages/user/employee-detail.vue b/pages/user/employee-detail.vue
index 410e326..a0bfc02 100644
--- a/pages/user/employee-detail.vue
+++ b/pages/user/employee-detail.vue
@@ -1024,7 +1024,7 @@
 				width: 448rpx;
 				height: 86rpx;
 				margin-left: 240rpx;
-				background: #E8101E;
+				background: #FF4767;
 				border-radius: 43rpx;
 				display: flex;
 				align-items: center;
diff --git a/pages/user/store-detail.vue b/pages/user/store-detail.vue
index 334df00..e7de41f 100644
--- a/pages/user/store-detail.vue
+++ b/pages/user/store-detail.vue
@@ -1313,7 +1313,7 @@
 					transition: all 0.3s ease;
 
 					&.active {
-						color: #E8101E;
+						color: #FF4767;
 					}
 				}
 			}
@@ -1442,7 +1442,7 @@
 
 						.showcase-tag {
 							font-size: 20rpx;
-							color: #E8101E;
+							color: #FF4767;
 							background: rgba(232, 16, 30, 0.1);
 							border-radius: 15rpx;
 							padding: 4rpx 12rpx;
diff --git a/pages/user/syr-detail.vue b/pages/user/syr-detail.vue
index b707045..55eaf51 100644
--- a/pages/user/syr-detail.vue
+++ b/pages/user/syr-detail.vue
@@ -648,14 +648,14 @@
 						align-items: center;
 						background: #ffffff;
 						border-radius: 8rpx;
-						border: 2rpx solid #e8101e;
+						border: 2rpx solid #FF4767;
 						padding-right: 10rpx;
 
 						&__text {
 							font-family: DINPro, DINPro;
 							font-weight: bold;
 							font-size: 20rpx;
-							color: #e8101e;
+							color: #FF4767;
 							line-height: 24rpx;
 							text-align: left;
 							font-style: normal;
@@ -672,7 +672,7 @@
 							justify-content: center;
 							font-weight: 500;
 							font-size: 20rpx;
-							color: #e8101e;
+							color: #FF4767;
 							text-align: left;
 							font-style: normal;
 						}
diff --git a/pages/wallet/alipay.vue b/pages/wallet/alipay.vue
index 900eeaf..45e3e87 100644
--- a/pages/wallet/alipay.vue
+++ b/pages/wallet/alipay.vue
@@ -417,7 +417,7 @@ button {
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 22rpx;
-  color: #e8101e;
+  color: #FF4767;
   line-height: 30rpx;
   text-align: left;
   font-style: normal;
diff --git a/pages/wallet/alipayAccount.vue b/pages/wallet/alipayAccount.vue
index 248ae34..e396139 100644
--- a/pages/wallet/alipayAccount.vue
+++ b/pages/wallet/alipayAccount.vue
@@ -377,10 +377,10 @@ export default {
     width: 666rpx;
     height: 84rpx;
     border-radius: 69rpx;
-    border: 2rpx solid #e8101e;
+    border: 2rpx solid #FF4767;
     font-weight: 500;
     font-size: 32rpx;
-    color: #e8101e;
+    color: #FF4767;
     line-height: 45rpx;
     text-align: left;
     font-style: normal;
diff --git a/pages/wallet/components/addPop.vue b/pages/wallet/components/addPop.vue
index 3488642..1070379 100644
--- a/pages/wallet/components/addPop.vue
+++ b/pages/wallet/components/addPop.vue
@@ -80,10 +80,10 @@ export default {
     width: 666rpx;
     height: 84rpx;
     border-radius: 69rpx;
-    border: 2rpx solid #e8101e;
+    border: 2rpx solid #FF4767;
     font-weight: 500;
     font-size: 32rpx;
-    color: #e8101e;
+    color: #FF4767;
     line-height: 45rpx;
     text-align: left;
     font-style: normal;
diff --git a/pages/wallet/components/cashPop.vue b/pages/wallet/components/cashPop.vue
index c471439..d560fe3 100644
--- a/pages/wallet/components/cashPop.vue
+++ b/pages/wallet/components/cashPop.vue
@@ -171,7 +171,7 @@ export default {
       font-style: normal;
     }
     .popRed {
-      color: #e8101e;
+      color: #FF4767;
     }
   }
   .pop-btn {
@@ -181,7 +181,7 @@ export default {
     justify-content: center;
     width: 672rpx;
     height: 96rpx;
-    background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+    background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
     border-radius: 48rpx;
     font-weight: 500;
     font-size: 34rpx;
diff --git a/pages/wallet/wallet.vue b/pages/wallet/wallet.vue
index 7d87de1..80d5710 100644
--- a/pages/wallet/wallet.vue
+++ b/pages/wallet/wallet.vue
@@ -315,7 +315,7 @@
 						font-family: DINPro, DINPro;
 						font-weight: 500;
 						font-size: 36rpx;
-						color: #e8101e;
+						color: #FF4767;
 						line-height: 46rpx;
 						text-align: left;
 						font-style: normal;
@@ -357,7 +357,7 @@
 				margin-top: 69rpx;
 				width: 614rpx;
 				height: 88rpx;
-				background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+				background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 				border-radius: 44rpx;
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
@@ -414,14 +414,14 @@
 
 				.tabActive {
 					font-weight: 500;
-					color: #e8101e;
+					color: #FF4767;
 				}
 
 				.walletDetailTab.tabActive::after {
 					content: "";
 					width: 56rpx;
 					height: 8rpx;
-					background: #e8101e;
+					background: #FF4767;
 					border-radius: 5rpx;
 					position: absolute;
 					left: 50%;
@@ -469,7 +469,7 @@
 				justify-content: center;
 				width: 430rpx;
 				height: 86rpx;
-				background: linear-gradient(181deg, #f52540 0%, #e8101e 100%);
+				background: linear-gradient(181deg, #f52540 0%, #FF4767 100%);
 				border-radius: 43rpx;
 				font-weight: 400;
 				font-size: 36rpx;
diff --git a/pages/wallet/withdrawCash.vue b/pages/wallet/withdrawCash.vue
index 4b699a8..67e3ea0 100644
--- a/pages/wallet/withdrawCash.vue
+++ b/pages/wallet/withdrawCash.vue
@@ -431,7 +431,7 @@ export default {
     .cash-card-text1 {
       font-weight: 400;
       font-size: 30rpx;
-      color: #e8101e;
+      color: #FF4767;
       line-height: 42rpx;
       text-align: left;
       font-style: normal;
@@ -512,7 +512,7 @@ export default {
     justify-content: center;
     width: 710rpx;
     height: 108rpx;
-    background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+    background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
     border-radius: 55rpx;
     font-weight: 400;
     font-size: 42rpx;
diff --git a/static/css/common.css b/static/css/common.css
index 997106c..15c3944 100644
--- a/static/css/common.css
+++ b/static/css/common.css
@@ -575,7 +575,7 @@ page {
   height: 64rpx;
   text-align: center;
   line-height: 64rpx;
-  background-color: #E8101E;
+  background-color: #FF4767;
   border-radius: 32rpx;
   position: fixed;
   left: 24rpx;
@@ -607,7 +607,7 @@ page {
 }
 .fixed-btn {
   height: 80rpx;
-  background: #E8101E;
+  background: #FF4767;
   border-radius: 40rpx;
   display: flex;
   align-items: center;
diff --git a/static/images/agree_y.png b/static/images/agree_y.png
index 811e97ff6e23000c75db178992ac31989b5b2aa6..e53c94b51ee71d3439ba6119d003dd18f5db26ae 100644
GIT binary patch
literal 2287
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
JPDHLkV1k2bPoMw*

literal 2894
zcmV-U3$gTxP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$000XENkl<Zcmd>`
zYj9NM8ONXZgoKja&<z4fV-g^xgF|bv7ZtJC))s9)NIR|l!Uv~<${i9C?jUWav>(bK
zBh%K-R8Udm5>P;)qEodUna<#}6)hv96CjB(v`97^aC6<$|Nq@h%w;d<oIRWDE<4Y2
zF7M^J{Px`5_iSRw2!5IhO2%LMeEFP@3nwjW_Lc2y_LZN6o`If+UWRr=l-n$09om%b
zWFPjWjS);ih818#Y3Z2e!t(n7<*{bpq<4&*QU5iSoK&W{Q$#HjkvY(tp_8FEK=UHX
zZI-bPZPYUMVPD#yt!7{OW3){l=re4Ra)73Y`q)?cZ5&}w=3X_L#gwBWQYm77RYa5|
z|A7r{tCF_qgTCmKzLPf}-$Kd&ejrmvUn(qHbjer#p%UW_5j9^##zIpq@S)}__@r;f
zz*r<jAH!|CJcXKlWmN^f&N|ane}w%C=txNgV_+<diLtpIh^qjbaec!nbXG)d7m*TZ
zx(H%X+Zh{UbTcSd05<uiOu|L{2(Lj1ju(5Z(o!ZfM#kDySW)gqgh>Ou<eT&pLwf#=
zVCF(IMdli2_dAR|*?=7b{Etk}!#DZ3Ddr&r;e%$H_!v8LU@lIBcLcCuZ0Wcgd{<wG
z)8)`im*vcbIXOwhHo(SlH<soa#^2#=7BpLA7IR{5b`!D%@S}n$(?*4IPQl4^Xtv38
z=EfZDBxV^Pznz?%o>yVK44TOjFZMF#$Xw$!>R)FGAg>Sjc3wfpY=(#Qw3IPd=B)P;
zED{3b9SYZnW3ZErr!CToD$|)WbB|ivuP`A%+@ZFieKy@Nkd7sp70Eqr<G27L51QHV
zs1g@KoXX`91~Hq&1jykT9yFhf+4DN7AcJ_rzL)?pJbN6BGI4}~uw4}&hJBdujczk4
zz{re6CXH>QXXjq&+z68)7KZ@Tb7rRS=o`{F8wzr7|EBo%@0JPY-j)gPpBCS~U6Om-
zHxj1?CYsHlmO}vMT~&+GCY`6G5S}yfZeA_pjvtiK_uMVU#0g>)O_b61eow}os1;A;
zl0-%)=U!Ed1~(c2kW=5LsOrIuvSGjAw_C)s3h%9q0V#)5LmA=b-um_Me$1t+A*24)
z1FVfL?068Bn7zd^i=^N;k4pX`zLJTP6d-!40XR+*RFy;+VKXd!08J6RDO9T^%RU8L
zH%tEF1(vePy@hX0<2S`Smepj{+o}&>v#<0n6prKzAh?eu&dLjZy-D(yJY>DI>cbJQ
zPep{4ZqwI8iF!bnWXVFqTl%oAY`V_8XQ_RERvKXV_N?x=)H?$j75r+W<lBTNrYWE9
z;9FQL399?U%tSQ6+-t`7(G4%8vCMGM@RmPfJBv^M@Mr0K>mOG8jg2r11H`MoyRG(2
z=XTy-ZjgKj@Pg0mleW!U?WJalW~Pro5v6w|gFoJ1tQXIUg|;&Y?%6Ma%5}n1*k0!_
zGb8--Ff;M}+n)7dZSCE%PCP4z3=$H?py91t>i`~2n>Ul4kz<Vd8g>;lBgMOAt#~Rq
z`m`5*@Yw?ra12lTQe<bCN^a7-8MyF1x(4tPj$wyn7JM#gc-m&jP}2-0<}|&RVGE93
zJylC>M;+XIPy#D(+J-{5`ws44n4y~tQ&h$Q^lqvNPYevsD8YX4`C17qUnAlIJh~z~
z-i3>}lPT)m2zb@@U(;xK%P`b;30{O(5djuNcI>Z|lAJG2k({X*LStJ}{L%1g?89r{
zcSr*6!(+Au&H(1*=*NbM7vGcdZ@(eqProkQ_Ha@Xb+jxlFT5M7#p49t{=?F`w8pj5
zc2HW*0Q&a)N%-KZ3cP*xxXnk3!XtY{c|3jPZftnhuM*Gd6}C;a6W)^QRKa6B8Xz|;
z>zH{zlhHq%6SIBZoinAd_G#B3de>EnXU)o({$f?MA9z7pQwvYK<|*8!w=6C`H!ty|
zP43KF#dq+jq#=6NRtnW(XnoDv5571o@Zhk`Ho)AkSo?`g-W|7vA?D}9kA2}$$D_|~
z&-U6Q(z<w+NKcR5u1?z92N=52V%d>Xh`iqMx@Xx@q+$CZz*|%`T=3{s1H8m7tJ-z?
zpH`ddc6qaIw{;})PRl#4?rdYB;Vm3ic#N)@L%DO@vZ`0NZWHs`HLJ~aI}P!`Zc$^#
z=>1p=4<3;DtQV_3R(bp3qtZJ3@DPr9&Il>veQa5lp87`2pRKq3Xu!L(?*MKrF(7Jq
z7@}DYB+{_`@G)t9q;fb<+lXfoQyJ$BBV^h-0@<4vY9~+jdEc5T(IE1LH^;ZMZAaT*
zcnR?Eh%-Dlj3J?sozWBO{ugRYs4dZBO9umU4RQZxr!!|%IJ08QIU0{NJcMA9ol(-(
zbXi2bD-J$Rr-t%o-y!@_kA76aoSt3R?JvF@KJvP|?RIssy?U4I_#6nM=3lXJBu*zM
z^X{4@jviHx9GBLIF{~R=ctjOu76zz917xuibzyqklG~1>C#3Zu%*Kp3JcJuzrU7<&
zLa(7H0Cg<My`V|#mhk)wmWiYTJdr?znP`Azjg3Lvlxq{G5x<3o=;#$;e7haT{vv4v
z55bzXVP+Brh!Qcye1_{}l`p9SRqOG6*uJqxb=~pOD}aZ0AL()A=@|R7(nlami~Ws%
z!@3Tdv;?1iUIME&Bn`3SWx$)iM5JpZ@3up5)D?$W>54vp3h63k{!W*=un0c2R|3@=
zVb$4@sNp@hB;DW%8Ie^lqCS8u2(*mejdc^$6$$Qs&Jo0p<0r+RhVTHTDZ&VwVHp7M
zOY&g{4jKMwSGd-NWf<Znn6-8!cAR)s{6Aluc1K<qg}E)vD7?qz0Dvs$@|sUzeF5s4
z1b06xftt+;Arf9|+QO3y5jF$33<0Qb&r0y9KcHRGJHcIhFpINJ%nlsnQLO1{c)&9|
zyQ0*lK@pf}HiJSL0+98^E%p5KR{o17?z*OY#JMv22f`^RPK$+F{L=a6TjGCUp&r|&
zEj*E<5hg=eL<PuJA<5xU=;yYZ+WkSDv|>bYdB&aczls^s^5c2J2W2;XxNOTGQll__
zjBYh1z!LxYi%OKWzYmCRJ0nUH1xW@aEp_#=+QkIO4n_Wphp~?Nmx`#%cG($W5HruX
z0NLvkzqbbKQ_$;8PDOH$n|DHhUzW3-U7^r@uyPi9y~tVS%-j<toDd)llm!~EbQ?YQ
zV!HvF?b5(pnX{EdEdivV(kmY|_VncNM={w9v4J@<SLSR*Ed!*n8{5vG!?(l#;E|1|
z^I7J`9GR<CwFQty`R(BPFdN(1bYnTioR}N(vL&_w(mJmXxI=vx+u87lvy-_nC*)&W
z908;k-l2;9^(*k8`BUt>K4O8*REwXnGY974)R|*|y$<=HiDBO@*mr&G44bKvqZppe
zVC=~{NE#pm;II$h<c~zjT<p6#6$X25$_2*ASmO=P>^O7<V6Q{YSaf+q)0LRjD06LQ
z8@7^_CdS0r7-O==`uBGgAPsZQtjOQ6z0IFjf%gZCQC0_aQ|#EPV+@RiF)=nfovpNW
z9bm6hPJI`(G(1t{ub*m4=sTE>-i5lPUf!d>6@d?P7k$z<V_+;+Iyz~SGJw6oD3JSt
zzwymtf5QTtLdCoWp>BtWIwPoqCM%|dZSA0K`k*iRq;E;_C*=V9$InxU*Pvp5eO0ml
z;*3yF_e5pNJ!pf+A@lcG^Cu?!rPu{*e**1{D7RV0y4P?$W7`$%OB=MMZDJ;!KG0{_
s<o^Hw0RR6*V*G~y000I_L_t&o0FbE`t!Z?IrvLx|07*qoM6N<$f`#CjJpcdz

diff --git a/utils/ui-config.js b/utils/ui-config.js
index 28c229e..a8f2f8a 100644
--- a/utils/ui-config.js
+++ b/utils/ui-config.js
@@ -694,9 +694,9 @@ function buildSheet() {
 				conectTexts: "[' ',' ',' ']",
 				baseColor: "#898989 ", //协议文案非协议部分颜色
 				//operatorColor: "#FFB5C5", //单独设置运营商协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
-				oneColor: "#E8101E", //单独设置第一个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
-				twoColor: "#E8101E", //单独设置第二个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
-				threeColor: "#E8101E", //单独设置第三个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
+				oneColor: "#FF4767", //单独设置第一个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
+				twoColor: "#FF4767", //单独设置第二个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
+				threeColor: "#FF4767", //单独设置第三个协议富文本颜色，该字段优先级最高，设置了该字段之后protocolColor字段设置的将失效，若该字段不设置，则采用protocolColor的值
 			},
 			setAppPrivacyOne: {
 				title: '《用户注册协议》',

From 00833b420814d991eeb463de64c4f4c16cb0646b Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 13:08:29 +0800
Subject: [PATCH 071/118] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tabbar/tabbar.vue         |    2 +-
 pages.json                           |    2 +-
 pages/home/components/orderCard2.vue |    5 +-
 pages/order/userorder-list.vue       | 1635 +++++++++++---------------
 4 files changed, 701 insertions(+), 943 deletions(-)

diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index a72a431..32b9d65 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -51,7 +51,7 @@ export default {
                     iconPath: "/static/images/tabbar/new_order_gray.png",
                     text: "订单",
                     selectedIconPath: "/static/images/tabbar/new_order.png",
-                    pagePath: "/pages/order/all-orders"
+                    pagePath: "/pages/order/userorder-list"
                 },
                 {
                     iconPath: "/static/images/tabbar/new_message_gray.png",
diff --git a/pages.json b/pages.json
index a4d132a..9f3daa3 100644
--- a/pages.json
+++ b/pages.json
@@ -1048,7 +1048,7 @@
 				"iconPath": "/static/images/tabbar/new_order_gray.png",
 				"text": "订单",
 				"selectedIconPath": "/static/images/tabbar/new_order.png",
-				"pagePath": "pages/order/all-orders"
+				"pagePath": "pages/order/userorder-list"
 			},
 			{
 				"iconPath": "/static/images/tabbar/new_message_gray.png",
diff --git a/pages/home/components/orderCard2.vue b/pages/home/components/orderCard2.vue
index bf8bdf5..6049cee 100644
--- a/pages/home/components/orderCard2.vue
+++ b/pages/home/components/orderCard2.vue
@@ -171,6 +171,7 @@
 			},
 			emitStart() {
 				this.$emit("start");
+				
 			},
 			emitDone() {
 				this.$emit("done");
@@ -181,8 +182,8 @@
 
 <style scoped lang="less">
 	.order-card {
-		padding: 20rpx 30rpx 20rpx 30rpx;
-		margin: 0rpx 30rpx 20rpx 30rpx;
+		padding: 24rpx 20rpx 24rpx 20rpx;
+		margin: 0;
 		background-color: #fff;
 		border-radius: 12px;
 		/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
diff --git a/pages/order/userorder-list.vue b/pages/order/userorder-list.vue
index a1e487e..81038d1 100644
--- a/pages/order/userorder-list.vue
+++ b/pages/order/userorder-list.vue
@@ -1,970 +1,727 @@
 <template>
-	<view class="order-list">
-		<view v-if="isLogin">
-			<!-- 订单状态标签 -->
-			<view class="status">
-				<scroll-view scroll-x class="status-tabs" :show-scrollbar="false">
-					<view style="padding-left: 20rpx;">
-						<view class="tab-item" v-for="(tab, index) in OrderType" :key="tab.id"
-							:class="{ active: OrderTypeIndex === tab.id }" @click="switchOrderTab(tab.id)">
-							{{tab.title}}
-						</view>
-					</view>
-					
-				</scroll-view>
-				<scroll-view scroll-x class="status-tabs2" :show-scrollbar="false">
-					<view class="tab-item2" v-for="(tab, index) in tabs" :key="tab.id"
-						:class="{ active: currentTab === tab.id }" @click="switchTab(tab.id)">
-						{{tab.title}}
-					</view>
-				</scroll-view>
-			</view>
+    <view class="order-list-page" style="background-color: #fafafa">
+        
+        <view class="status" v-if="isLogin">
+            <scroll-view scroll-x class="status-tabs" :show-scrollbar="false">
+                <view style="padding-left: 20rpx">
+                    <view 
+                        class="tab-item"
+                        v-for="(item, index) in firstTabs" 
+                        :key="index"
+                        :class="{ active: activeFirstId === item.id }" 
+                        @click="handleFirstTabClick(item)"
+                    >
+                        {{ item.title }}
+                    </view>
+                </view>
+            </scroll-view>
 
+            <scroll-view scroll-x class="status-tabs2" :show-scrollbar="false">
+                <view style="padding-left: 20rpx; white-space: nowrap; padding-bottom: 20rpx;">
+                    <view 
+                        class="tab-item2"
+                        v-for="(item, index) in secondTabs" 
+                        :key="index"
+                        :class="{ active: activeSecondId === item.id }" 
+                        @click="handleSecondTabClick(item.id, item.title)"
+                    >
+                        {{ item.title }}
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
 
-			<!-- 订单列表 -->
-			<scroll-view scroll-y class="order-scroll" @scrolltolower="loadMore" refresher-enabled
-				:refresher-triggered="isRefreshing" @refresherrefresh="onRefresh"
-				:style="{height:`calc(100vh - ${210}rpx)`}">
-				<view class="order-item" v-for="(order, index) in orderList" :key="index">
-					<!-- 订单编号和状态 -->
-					<view class="order-header">
-						<view class="order-tag" v-if="!order.team_buy_id || order.team_buy_id==`0`">
-							<text
-								class="order-tag-text">{{order.order_kind == 1 ? '到家' : order.order_kind == 2 ? '到店' :  order.order_kind == 3 ? '到家' : ''}}</text>
-						</view>
-						<text class="order-number">订单编号：{{order.number}}</text>
-						<text class="order-status"
-							:class="order.statusClass">{{order.state == 1 ? '待支付' : order.state == 2 ? '待接单' : order.state == 3 ? '待服务' : order.state == 4 ? '待完成' : order.state == 5 ? '已完成' : order.state == 6 ? '待评价' : order.state == 7 ? '已取消' : ''}}</text>
-					</view>
+        <CommonList 
+            ref="groupRef" 
+            :isLogin="isLogin" 
+            :apiUrl="apiUrl" 
+            :listScrollHeight="`calc(100vh - 280rpx - 100rpx)`"
+            @load-success="loadSuccess"
+        >
+            <template #listData="{ list }">
+                <view class="order-item-wrap" v-for="item in popList" :key="item.id">
+                    <OrderCard 
+                        v-if="activeFirstId != 3" 
+                        :haveButton="haveButton" 
+                        :showState="false" 
+                        :dataItem="item"
+                        :typeId="activeFirstId" 
+                        @cancel="cancelOrder($event, item)" 
+                        @start="startOrder($event, item)"
+                        @done="endOrder($event, item)" 
+                        @goOrderDetail="goOrderDetail" 
+                    />
+                    
+                    <WorkHourOrderCard 
+                        v-else 
+                        :showState="false" 
+                        :dataItem="item" 
+                        :typeId="activeFirstId"
+                        @cancel="cancelOrder($event, item)" 
+                        @accept="confirmOrder($event, item)"
+                        @start="startOrder($event, item)" 
+                        @done="endOrder($event, item)" 
+                        @goOrderDetail="goOrderDetail"
+                    >
+                    </WorkHourOrderCard>
+                </view>
+            </template>
 
-					<!-- 订单内容 -->
-					<view class="order-content" @click="goDetail(order)">
-						<image v-if="order.order_photo" :src="order.order_photo[0]" mode="aspectFill"
-							class="service-image"></image>
-						<view class="service-image" v-else></view>
-						<view class="service-info">
-							<view class="service-name">
-								<image v-if="order.team_buy_id && order.team_buy_id!=0"
-									:src="getGroupType(order.team_buy_order_state)" class="service-name-type"
-									mode="heightFix"></image>
-								<text class="service-name-text">
-									{{order.server_title}}
-								</text>
+            <template #empty>
+                <view class="noDataBox">
+                    <noData tipText="暂无服务订单哟～" v-if="isLogin"></noData>
+                    <view class="nologin_part" v-else>
+                        <image src="/static/images/no_login.png" class="nologin_icon" mode="aspectFit"></image>
+                        <view class="btn-login" @click="goLogin">
+                            <text class="login-text">前去登录</text>
+                        </view>
+                    </view>
+                </view>
+            </template>
+        </CommonList>
 
-							</view>
-							<view class="service-time" v-if="order.order_kind == 1 || order.order_kind == 3">
-								<!-- <image src="/static/images/time_icon.png" class="time-icon"></image> -->
-								<text>下单时间：{{order.reservation_time }}</text>
-							</view>
-							<view class="service-time"
-								v-if="order.order_kind == 2 && (!order.team_buy_id || order.team_buy_id==0)">
-								<!-- <image src="/static/images/time_icon.png" class="time-icon"></image> -->
-								<text>下单时间：{{order.add_time}}</text>
-							</view>
-							<view class="service-address" v-if="order.order_kind == 1 || order.order_kind == 3">
-								<!-- <image src="/static/images/position_icon.png" class="location-icon"></image> -->
-								<text
-									class="text-overflow-1">到家地址：{{Object.assign({},order.reservation_address_arr).server_address}}</text>
-							</view>
-							<view class="service-group" v-if="order.team_buy_id && order.team_buy_id!=0">
-								<view class="service-group-time">
-									下单时间：{{ order.add_time }}
-								</view>
-								<view class="service-group-price">
-									团购价:<text style="font-size: 34rpx;">{{ order.order_money }}</text>
-								</view>
+        <serviceCodeInput :show="showInput" @close="showInput = false" @confirm="onConfirm" />
 
-							</view>
-						</view>
-					</view>
-
-					<!-- 订单操作按钮 -->
-					<view class="order-actions">
-						<view class="action-left">
-							<image src="/static/images/evaluate/delete-icon.png" class="delete-icon"
-								@click="deleteOrder(order)"
-								v-if="order.state == 5 || order.state == 6 || order.state == 7"></image>
-						</view>
-						<view class="action-right">
-							<text class="action-btn contact" @click="cancelService(order)"
-								v-if="order.state == 1">取消订单</text>
-							<text class="action-btn contact" @click="refoundService(order)"
-								v-if="order.state == 2 || order.state == 3">申请退款</text>
-							<text class="action-btn contact" @click="contactService(order.order_shopphone)">联系客服</text>
-							<text class="action-btn review" v-if="order.state == 1" @click="payOrder(order)">立即支付</text>
-
-							<text class="action-btn again" v-if="order.state == 5 || order.state == 6"
-								@click="orderAgain(order)">再来一单</text>
-							<text class="action-btn again" v-if="order.state == 5 && order.appeal == 1"
-								@click="addComplaint(order)">投诉</text>
-							<text class="action-btn again" v-if="order.state == 5 && order.appeal == 2"
-								@click="lookComplaint(order)">查看投诉</text>
-							<text class="action-btn review" v-if="order.state == 5 && order.evaluate==2"
-								@click="reviewOrder(order)">立即评价</text>
-							<text class="action-btn again" v-if="order.state == 5 && order.evaluate==1"
-								@click="goEvaluateDetail(order)">已评价</text>
-						</view>
-					</view>
-				</view>
-
-				<!-- 加载更多 -->
-				<view class="loading-more" v-if="hasMore">加载中...</view>
-				<view class="no-more" v-if="!hasMore && orderList.length">暂无数据哦～</view>
-
-				<!-- 没数据的情况 -->
-				<noData v-if="orderList.length==0"></noData>
-
-
-				<!-- 获取权限提示匡内容 -->
-				<view class="permission" :class="{ transform: isShowPer }">
-					<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
-					<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
-				</view>
-			</scroll-view>
-		</view>
-		<view class="nologin_part" v-else>
-			<image src="/static/images/no_login.png" class="nologin_icon" mode="aspectFit"></image>
-			<view class="btn-login">
-				<text class="login-text" @click="goLogin">前去登录</text>
-			</view>
-		</view>
-
-		<!-- 自定义TabBar -->
-		<TabBar :selected="1"></TabBar>
-	</view>
+        <TabBar :selected="1"></TabBar>
+    </view>
 </template>
 
 <script>
-	import TabBar from "@/components/tabbar/tabbar.vue"
-	import request from '../../utils/request'
-	import locationService from '../../utils/locationService';
-	import permissionUtils from '../../utils/per'
-	import {
-		debounce
-	} from '@/utils/debounce.js'
-	import {
-		url
-	} from '../../uni_modules/uv-ui-tools/libs/function/test';
-	export default {
-		components: {
-			TabBar,
-		},
-		data() {
-			return {
-				isShowPer: false,
-				OrderType: [{
-					id: 0,
-					title: '全部订单',
-					url: "/user/order/list",
-				}, {
-					id: 1,
-					title: '普通订单',
-					url: "/user/userorders",
-				}, {
-					id: 2,
-					title: '自营订单',
-					url: "/user/orderSelf/list",
-				}],
-				urls: {
-					order: {
-						cancelorder: "/user/cancelorder",
-						deleteorder: "/user/deleteorder"
-					},
-					order_self: {
-						cancelorder: "/user/orderSelf/cancel",
-						deleteorder: "/user/orderSelf/del"
-					}
-				},
-				OrderTypeIndex: 0,
-				tabs: [{
-					id: 0,
-					title: '全部'
-				}, {
-					id: 1,
-					title: '待支付'
-				}, {
-					id: 2,
-					title: '待接单'
-				}, {
-					id: 3,
-					title: '待服务'
-				}, {
-					id: 4,
-					title: '服务中'
-				}, {
-					id: 5,
-					title: '已完成'
-				}, {
-					id: 7,
-					title: '已取消'
-				}],
-				// ,{id: 6,title: '待评价'}
-				currentTab: 0,
-				isRefreshing: false,
-				hasMore: true,
-				orderList: [],
-				formData: {
-					page: 1,
-					limit: 10
-				},
-				isLogin: false
-			}
-		},
-		computed: {
+    import OrderCard from "@/pages/home/components/orderCard2.vue";
+    import WorkHourOrderCard from "@/pages/home/components/workOrderCard.vue";
+    import CommonList from "@/components/common/CommonList.vue";
+    import noLogin from "@/components/noData/noLogin.vue";
+    import request from "@/utils/request";
+    import serviceCodeInput from "@/components/service-code-input/service-code-input.vue";
+    import TabBar from "@/components/tabbar/tabbar.vue";
 
-		},
-		onLoad() {
-			//隐藏原生Tabar
-			uni.hideTabBar()
-			// this.loadOrders();
-			this.handleOrderTypeFromGlobal();
-		},
-		onShow() {
-			this.isLogin = uni.getStorageSync('accessToken') ? true : false;
-			if (!this.isLogin) return;
+    export default {
+        name: "filters",
+        props: {
+            title: {
+                type: String,
+                default: "",
+            },
+            userInfo: {
+                type: Object,
+                default: () => ({}),
+            },
+            // 自营状态 0未加入 1加入 2停用
+            selfState: {
+                type: Number,
+                default: 0,
+            },
+        },
+        components: {
+            CommonList,
+            noLogin,
+            serviceCodeInput,
+            OrderCard,
+            WorkHourOrderCard,
+            TabBar
+        },
+        data() {
+            return {
+                isLogin: false, // 将isLogin移至data内管理
+                popList:[],
+                haveButton: true,
+                statusBarHeight: 0,
+                tabs: [{
+                        title: "到店订单",
+                        id: 1
+                    },
+                    {
+                        title: "自营到店订单",
+                        id: 2,
+                        isNeedLogin: true,
+                        isRuzHu: true,
+                        isSelfOrder: true
+                    },
+                    {
+                        title: "工位订单",
+                        id: 3,
+                        isNeedLogin: true,
+                        id_type: 1
+                    },
+                    {
+                        title: "上门订单",
+                        id: 4,
+                        isNeedLogin: true,
+                        id_type: 1
+                    },
+                    {
+                        title: "自营上门订单",
+                        id: 5,
+                        isNeedLogin: true,
+                        id_type: 1
+                    },
+                ], // 1级类目
+                activeFirstId: 1, // 记录选中的1级tab id
+                activeSecondId: 3, // 记录选中的2级tab id（null表示"全部"）
+                numInfo: {
+                    djd: 0,
+                    dfw: 0,
+                    dwc: 0,
+                    nocompletednum: 0,
+                    noconfirmnum: 0,
+                    noservernum: 0,
+                },
+                sjId: undefined,
+                idType: undefined,
+                showInput: false,
+                orderInfo: {},
+                urls: {
+                    1: {
+                        weChatRefund: "/sj/yhwechatrefund",
+                        aliRefund: "/sj/yhalirefund",
+                        startOrder: "/sj/startserver",
+                        endOrder: "/sj/endserver",
+                        ordernum: "/sj/ordernum",
+                        list: "/sj/sjgetyhorder",
+                    },
+                    2: {
+                        weChatRefund: "/sj/orderSelf/weChatRefund",
+                        aliRefund: "/sj/orderSelf/aliRefund",
+                        startOrder: "/sj/orderSelf/start",
+                        endOrder: "/sj/orderSelf/end",
+                        ordernum: "/sj/orderSelf/orderNum",
+                        list: "/sj/orderSelf/list",
+                    },
+                    3: {
+                        weChatRefund: "/sj/workSeatOrder/weChatRefund",
+                        aliRefund: "/sj/workSeatOrder/aliRefund",
+                        startOrder: "/sj/workSeatOrder/start",
+                        sureOrder:"/sj/workSeatOrder/sure",
+                        endOrder: "/sj/workSeatOrder/end",
+                        ordernum: "/sj/workSeatOrder/orderNum",
+                        list: "/sj/workSeatOrder/list",
+                    },
+                    4: {
+                        ordernum: "/sj/sjonsiteordernum",
+                        list: "/sj/sjonsiteorder",
+                    },
+                    5: {
+                        ordernum: "/sj/sjonsiteordernumself",
+                        list: "/sj/sjonsiteorderself",
+                    }
+                },
+            };
+        },
+        computed: {
+            apiUrl() {
+                if(!this.urls[this.activeFirstId]){
+                    return ""
+                } 
+                const urls = this.urls[this.activeFirstId];
+                return urls.list;
+            },
+            getNumUrl() {
+                const urls = this.urls[this.activeFirstId];
+                return urls.ordernum;
+            },
+            // 计算是否显示自营订单tab
+            showSelfOrderTab() {
+                // 只有当self_state为1或2时才显示自营订单tab
+                return this.selfState == 1 || this.selfState == 2;
+            },
+            firstTabs() {
+                return this.tabs
+                    .filter((tab) => !tab.isNeedLogin || this.isLogin)
+                    .filter((tab) => {
+                        if (tab.id_type) {
+                            return this.idType == tab.id_type;
+                        }
+                        return true;
+                    })
+                    .filter((tab) => !tab.isRuzHu || this.idType != 0)
+                    // 自营订单tab显示条件
+                    .filter((tab) => {
+                        if (tab.isSelfOrder) {
+                            return this.showSelfOrderTab;
+                        }
+                        return true;
+                    });
+            },
+            secondTabs() {
+                if (this.activeFirstId == 1 || this.activeFirstId == 2) {
+                    return [{
+                            title: `待开始(${this.numInfo.noservernum})`,
+                            id: 3
+                        },
+                        {
+                            title: `待完成(${this.numInfo.nocompletednum})`,
+                            id: 4
+                        },
+                    ];
+                } else if (this.activeFirstId == 4 || this.activeFirstId == 5) {
+                    return [{
+                            title: `待接单(${this.numInfo.noconfirmnum})`,
+                            id: 2
+                        },
+                        {
+                            title: `待开始(${this.numInfo.noservernum})`,
+                            id: 3
+                        },
+                        {
+                            title: `待完成(${this.numInfo.nocompletednum})`,
+                            id: 4
+                        },
+                    ];
+                } else {
+                    return [{
+                            title: `待接单(${this.numInfo.djd})`,
+                            id: 2
+                        },
+                        {
+                            title: `待服务(${this.numInfo.dfw})`,
+                            id: 3
+                        },
+                        {
+                            title: `待完成(${this.numInfo.dwc})`,
+                            id: 4
+                        },
+                    ];
+                }
 
-			// 在 onShow 中也处理全局变量
-			this.handleOrderTypeFromGlobal();
+            },
+        },
+        onLoad() {
+            uni.hideTabBar(); // 隐藏原生TabBar
+        },
+        onShow() {
+            this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+            if (this.isLogin) {
+                // 默认选中判断
+                if(!this.activeFirstId) this.activeFirstId = 1;
+                if(!this.activeSecondId) this.activeSecondId = 3;
+                this.searchList();
+            } else {
+                this.activeFirstId = null;
+                this.activeSecondId = null; 
+            }
+        },
+        watch: {
+            isLogin(newVal) {
+                if (newVal) {
+                    this.activeFirstId = 1;
+                    this.activeSecondId = 2; // 默认选中"待接单"
+                    this.searchList();
+                }
+            },
+        },
+        methods: {
+            searchList() {
+                if (this.syrId && this.idType) {
+                    this.$refs.groupRef.manualRefresh({
+                        sjid: this.sjId,
+                        state: this.activeSecondId || undefined,
 
-			this.orderList = [];
-			this.formData.page = 1;
-			this.loadOrders();
-		},
-		methods: {
-			//获取拼团状态文字
-			// getGroupType(id) {
-			// 	let list = [{
-			// 			id: 1,
-			// 			text: "团购中",
-			// 		},
-			// 		{
-			// 			id: 2,
-			// 			text: "已成团",
-			// 		},
-			// 		{
-			// 			id: 3,
-			// 			text: "拼团失败",
-			// 		},
-			// 	];
-			// 	let name = list.find((it) => it.id == id)?.text;
-			// 	return name;
-			getGroupType(id) {
-				const imageBasePath = '/static/images/';
-				const imageMap = {
-					1: imageBasePath + 'pintuan_ing.png', // 团购中
-					2: imageBasePath + 'pintuan_done.png', // 已成团
-					3: imageBasePath + 'pintuan_fail.png' // 拼团失败
-				};
-				return imageMap[id] || ''; // 如果id不在1-3范围内，返回空字符串
-			},
-			// 切换标签
-			switchOrderTab(index) {
-				this.OrderTypeIndex = index;
-				this.orderList = [];
-				this.formData.page = 1;
-				// TODO: 根据当前标签加载对应订单数据
-				delete this.formData.state;
-				this.currentTab = 0;
-				this.loadOrders()
-			},
-			// 切换标签
-			switchTab(index) {
-				this.currentTab = index;
-				this.orderList = [];
-				this.formData.page = 1;
-				// TODO: 根据当前标签加载对应订单数据
-				if (this.currentTab != 0) {
-					this.formData.state = this.currentTab;
-				} else {
-					delete this.formData.state;
-				}
-				this.loadOrders()
-			},
+                    });
+                } else {
+                    request.post("/sj/user/getUser").then((result) => {
+                        this.sjId = result.data.id;
+                        this.idType = result.data.id_type;
+                        this.$refs.groupRef.manualRefresh({
+                            sjid: this.sjId,
+                            state: this.activeSecondId,
+                        });
+                    });
+                }
+            },
+            loadSuccess(res) {
+                this.popList = res.list
+                request
+                    .post(this.getNumUrl, {
+                        sjid: this.sjId,
+                    })
+                    .then((result) => {
+                        for (let key in result.data) {
+                            this.numInfo[key] = result.data[key];
+                        }
+                    });
+            },
+            // 一级tab点击事件
+            handleFirstTabClick(item) {
+                this.popList = []
+                if (!this.isLogin) return;
+                // 避免重复点击
+                if (this.activeFirstId === item.id) return;
+                // 更新1级选中状态
+                this.activeFirstId = item.id;
 
-			// 加载订单数据
-			loadOrders() {
-				request.post(this.OrderType[this.OrderTypeIndex].url, this.formData).then(res => {
-					this.orderList = [...this.orderList, ...res.data];
-					if (res.count == this.orderList.length) {
-						this.hasMore = false
-					} else {
-						this.hasMore = true
-						this.formData.page = this.formData.page + 1;
-					}
-					this.isRefreshing = false
-				})
-			},
+                this.haveButton = true
+                if (this.activeFirstId == 4 || this.activeFirstId == 5) {
+                    this.haveButton = false
+                }
 
-			// 下拉刷新
-			onRefresh() {
-				this.isRefreshing = true
-				this.formData.page = 1;
-				this.orderList = [];
-				this.loadOrders()
-			},
+                // 重置2级选中状态（默认选中"全部"）
+                if (this.activeFirstId == 1 || this.activeFirstId == 2) {
+                    this.activeSecondId = 3;
+                } else {
+                    this.activeSecondId = 2;
+                }
 
-			// 加载更多
-			loadMore() {
-				if (!this.hasMore) return
-				// TODO: 加载更多订单数据
-				this.loadOrders();
-			},
-
-			// 跳转订单详情
-			goDetail(order) {
-				console.log('order', order)
-				if (order.table_source == "order") {
-					//如果是普通订单
-					uni.navigateTo({
-						url: `/pages/order/userorder-detail?id=${order.id}`
-					})
-				} else if (order.table_source == "order_self") {
-					//如果是自营订单
-					uni.navigateTo({
-						url: `/pages/order/userorder-detail?id=${order.id}&serviceType=2`
-					})
-				}
-
-			},
-
-			// 删除订单
-			deleteOrder: debounce(async function(order) {
-				uni.showModal({
-					title: '提示',
-					content: '确定要删除该订单吗？',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 删除订单
-							request.post(this.urls[order.table_source].deleteorder, {
-								id: order.id
-							}).then(res => {
-								uni.showToast({
-									title: '删除成功！',
-									icon: 'none'
-								})
-								this.formData.page = 1;
-								this.orderList = [];
-								this.loadOrders();
-							})
-						}
-					}
-				})
-			}, 500),
-
-			// 显示权限说明弹窗
-			showPermissionDialog(title, content) {
-				return new Promise((resolve) => {
-					uni.showModal({
-						title,
-						content,
-						confirmText: '去开启',
-						success(res) {
-							resolve(res.confirm);
-						}
-					});
-				});
-			},
-			// 订单状态全局变量
-			handleOrderTypeFromGlobal() {
-				const orderType = getApp().globalData.selectedOrderType;
-				console.log('接收到的订单类型:', orderType);
-
-				if (orderType) {
-					// 创建类型映射
-					const typeMap = {
-						'unpaid': 1, // 待支付
-						'unaccepted': 2, // 待接单  
-						'unserved': 3, // 待服务
-						'finnish': 5 // 已完成
-					};
-
-					// 映射到对应的数字类型
-					this.currentTab = typeMap[orderType] || 0;
-					console.log('映射后的currentTab:', this.currentTab);
-
-					// 根据currentTab设置formData.state
-					if (this.currentTab !== 0) {
-						this.formData.state = this.currentTab;
-					} else {
-						delete this.formData.state;
-					}
-
-					// 清除全局变量
-					getApp().globalData.selectedOrderType = null;
-				}
-			},
-
-			// 联系客服
-			async contactService(phone) {
-				// TODO: 实现联系客服功能
-				uni.navigateTo({
-					url: '/pages/contact/contact'
-				})
-				//  const systemInfo = uni.getSystemInfoSync()
-				//  if(systemInfo.platform === 'ios') {
-				//  	uni.makePhoneCall({
-				//  		phoneNumber: phone //仅为示例
-				//  	})
-				//  }else {
-				//  	let permission = '';
-				//  	if(systemInfo.platform === 'ios') {
-				//  		permission = 'phone'
-				//  	}else {
-				//  		permission = 'android.permission.CALL_PHONE'
-				//  	}
-				// this.isShowPer = true;
-				//  	const firstRequest = !plus.storage.getItem(`perm_${permission}`)
-				//  	if(firstRequest) {
-				//  		this.isShowPer = true;
-				//  	}
-				//  	// 1. 检查权限
-				//  	const { granted } = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-				//  	if (granted) {
-				//   this.isShowPer = false;
-				//  	  uni.makePhoneCall({
-				//  	  	phoneNumber: phone //仅为示例
-				//  	  })
-				//  	  return;
-				//  	}
-				//  	this.isShowPer = false;
-				//  	// 2. 显示权限说明弹窗
-				//  	const confirm = await this.showPermissionDialog(
-				//  	  '拨打电话权限申请',
-				//  	  '我们需要拨打电话权限，方便您联系商家或平台'
-				//  	);
-
-				//  	if (!confirm) return;
-
-				//  	// 3. 请求权限
-				//  	const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-				//  	console.log('result',result)
-				//  	if (result) {
-				//  	  uni.makePhoneCall({
-				//  	  	phoneNumber: phone //仅为示例
-				//  	  })
-				//  	  return;
-				//  	} else {
-				//  	  locationService.openAppSettings();
-				//  	  return;
-				//  	  // uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-				//  	}
-				//  }
-
-			},
-			// 取消订单
-			async cancelService(order) {
-				let id = '';
-				await request.post('/user/getuser', {
-					type: 1
-				}).then(res => {
-					console.log(res)
-					id = res.data.id
-				})
-				console.log(order)
-				uni.showModal({
-					title: '取消订单',
-					content: '确定要取消该订单吗？',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 取消订单
-							let data = {
-								orderNo: order.number,
-								amount: order.pay_money,
-								cancel_state: 1,
-								cancel_id: id
-							}
-							request.post(this.urls[order.table_source].cancelorder, data).then(res => {
-								uni.showToast({
-									title: '取消成功！',
-									icon: 'none'
-								})
-								this.formData.page = 1;
-								this.orderList = [];
-								this.loadOrders();
-							}).catch(err => {
-								console.log(err)
-							})
-						}
-					}
-				})
-			},
-			// 申请退款
-			async refoundService(order) {
-				let id = '';
-				await request.post('/user/getuser', {
-					type: 1
-				}).then(res => {
-					console.log(res)
-					id = res.data.id
-				})
-				uni.showModal({
-					title: '申请退款',
-					content: '确定申请退款？退款后则订单取消！',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 申请退款
-							let data = {
-								orderNo: order.number,
-								amount: order.pay_money,
-								cancel_state: 1,
-								cancel_id: id
-							}
-							let url = '';
-							if (order.pay_kind == 1) {
-								url = ''
-							} else if (order.pay_kind == 2) {
-								url = '/user/wechatrefund'
-							} else if (order.pay_kind == 3) {
-								url = '/user/alirefund'
-							}
-							console.log(data, url)
-							request.post(url, data).then(res => {
-								console.log('申请退款订单返回结果', res)
-								uni.showToast({
-									title: '申请退款成功！',
-									icon: 'none'
-								})
-								this.formData.page = 1;
-								this.orderList = [];
-								this.loadOrders();
-							}).catch(err => {
-								console.log(err)
-							})
-						}
-					}
-				})
-			},
-
-			// 支付订单
-			payOrder(order) {
-				if(order.table_source == "order_self"){
-					// TODO: 实现支付功能
-					uni.navigateTo({
-						url: `/pages/order/pay?id=${order.id}&money=${order.order_money}&title=${order.server_title}&number=${order.number}&table_source=order_self`
-					})
-				}else{
-					// TODO: 实现支付功能
-					uni.navigateTo({
-						url: `/pages/order/pay?id=${order.id}&money=${order.order_money}&title=${order.server_title}&number=${order.number}`
-					})
-				}
-				
-			},
-
-			// 评价订单
-			reviewOrder(order) {
-				uni.navigateTo({
-					url: `/pages/evaluate/comment?id=${order.id}&evaluator_type=3&order_type=1&order_kind=${order.order_kind}`
-				})
-			},
-			goEvaluateDetail(order) {
-				uni.navigateTo({
-					url: `/pages/evaluate/evaluationDetails?order_id=${order.id}&order_type=1`
-				});
-			},
-
-			// 再次下单
-			orderAgain(order) {
-				console.log(1111111,order)
-				if(order.table_source=="order_self"){
-					// TODO: 实现再次下单功能
-					uni.navigateTo({
-						url: '/pages/selfOperated/detail?id=' + order.server_id
-					})
-				}else{
-					// TODO: 实现再次下单功能
-					uni.navigateTo({
-						url: '/pages/service/detail?id=' + order.server_id
-					})
-				}
-				
-			},
-			// 投诉
-			addComplaint(order) {
-				uni.navigateTo({
-					url: '/pages/complaint/add-complaint?number=' + order.number
-				})
-			},
-			// 查看投诉
-			lookComplaint(order) {
-				uni.navigateTo({
-					url: '/pages/complaint/detail?number=' + order.number
-				})
-			},
-			goLogin() {
-				// uni.oprPresentLogin()
-				uni.navigateTo({
-					url: '/pages/blogPopup/blogPopup'
-				});
-			}
-		}
-	}
+                // 传递给父组件（1级选中数据）
+                this.$emit("tabChange", {
+                    firstId: this.activeFirstId,
+                    secondId: this.activeSecondId,
+                });
+                this.$nextTick(() => {
+                    this.searchList();
+                });
+            },
+            // 二级tab点击事件
+            handleSecondTabClick(id, title) {
+                this.popList = []
+                if (!this.isLogin) return;
+                if (this.activeSecondId === id) return;
+                // 更新2级选中状态
+                this.activeSecondId = id;
+                // 传递给父组件（2级选中数据）
+                this.$emit("tabChange", {
+                    firstId: this.activeFirstId,
+                    secondId: this.activeSecondId,
+                });
+                this.$nextTick(() => {
+                    this.searchList();
+                });
+            },
+            cancelOrder(e, order) {
+                uni.showModal({
+                    title: "取消订单",
+                    content: "确定要取消该订单吗？（订单取消后，支付金额将原路退回）",
+                    success: (res) => {
+                        if (res.confirm) {
+                            // TODO: 取消订单
+                            let data = {
+                                orderNo: order.number,
+                                amount: order.pay_money,
+                                syrid: this.syrId,
+                            };
+                            let url = "";
+                            if (order.pay_kind == 1) {
+                                url = "";
+                            } else if (order.pay_kind == 2) {
+                                url = this.urls[this.activeFirstId].weChatRefund;
+                            } else if (order.pay_kind == 3) {
+                                url = this.urls[this.activeFirstId].aliRefund;
+                            }
+                            console.log(data, url);
+                            if (this.clickType) {
+                                return;
+                            }
+                            this.clickType = true;
+                            request
+                                .post(url, data)
+                                .then((res) => {
+                                    if (res.state == 1 || res.code == 200 || res.code == 1) {
+                                        uni.showToast({
+                                            title: "取消成功！",
+                                            icon: "none",
+                                        });
+                                        this.searchList();
+                                    } else {
+                                        uni.showToast({
+                                            title: res.msg,
+                                            icon: "none",
+                                        });
+                                    }
+                                })
+                                .catch((err) => {
+                                    console.log(err);
+                                })
+                                .finally(() => {
+                                    this.clickType = false;
+                                });
+                        }
+                    },
+                });
+            },
+            // 确认接单
+            confirmOrder(e, order) {
+                if (this.clickType) {
+                    return;
+                }
+                this.clickType = true;
+                console.log(111,this.activeFirstId,this.urls)
+                request
+                    .post(this.urls[this.activeFirstId].sureOrder, {
+                        id: order.id,
+                        syrid: this.syrId,
+                        order_kind: this.idType == 2 ? 3 : 1,
+                    })
+                    .then((res) => {
+                        if (res.state != 1 || res.code != 200) {
+                            uni.showToast({
+                                title: "开始服务",
+                                icon: "none",
+                            });
+                        } else {
+                            uni.showToast({
+                                title: "已接单",
+                                icon: "none",
+                            });
+                        }
+                        this.searchList();
+                    })
+                    .finally(() => {
+                        this.clickType = false;
+                    });
+            },
+            // 开始服务
+            startOrder(e, order) {
+                if (order.team_buy_order_state == 1) {
+                    uni.showToast({
+                        title: "订单当前处于拼团中，服务将在拼团完成后才开启~",
+                        icon: "none",
+                    });
+                    return
+                }
+                this.showInput = true;
+                this.orderInfo = order;
+            },
+            // 输入完成
+            onConfirm(code) {
+                this.showInput = false;
+                if (this.clickType) {
+                    return;
+                }
+                this.clickType = true;
+                console.log(this.orderInfo, "this.urls[this.activeFirstId].startOrder");
+                request
+                    .post(this.urls[this.activeFirstId].startOrder, {
+                        id: this.orderInfo.id,
+                        server_code: code,
+                        sjid: this.sjId,
+                    })
+                    .then((res) => {
+                        console.log(res);
+                        if (res.state == 1 || res.code == 200) {
+                            uni.showToast({
+                                title: "开始服务",
+                                icon: "none",
+                            });
+                            this.searchList();
+                        } else {
+                            uni.showToast({
+                                title: res.msg,
+                                icon: "none",
+                            });
+                        }
+                        this.orderInfo = {};
+                    })
+                    .finally(() => {
+                        this.clickType = false;
+                    });
+            },
+            // 完成服务
+            endOrder(e, order) {
+                // app阻止事件冒泡
+                // #ifdef APP-PLUS
+                // e.preventDefault();
+                // e.stopPropagation();
+                // #endif
+                if (this.clickType) {
+                    return;
+                }
+                this.clickType = true;
+                request
+                    .post(this.urls[this.activeFirstId].endOrder, {
+                        id: order.id,
+                        sjid: this.sjId,
+                    })
+                    .then((res) => {
+                        if (res.state == 1 || res.code == 200) {
+                            uni.showToast({
+                                title: res.msg,
+                                icon: "none",
+                            });
+                            this.searchList();
+                        } else {
+                            uni.showToast({
+                                title: res.msg,
+                                icon: "none",
+                            });
+                        }
+                    })
+                    .finally(() => {
+                        this.clickType = false;
+                    });
+            },
+            goOrderDetail(order) {
+                if (this.idType == 1) {
+                    if (this.activeFirstId == 1) {
+                        uni.navigateTo({
+                            url:  `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
+                        });
+                    }
+                    if (this.activeFirstId == 2) {
+                        uni.navigateTo({
+                            url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2&haveButton=${this.haveButton}`,
+                        });
+                    }
+                    if (this.activeFirstId == 3) {
+                        uni.navigateTo({
+                            url: `/pages/shop/SellerDetail?order_id=${order.id}&haveButton=${this.haveButton}`,
+                        });
+                    }
+                    if (this.activeFirstId == 4) {
+                        uni.navigateTo({
+                            url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
+                        });
+                    }
+                    if (this.activeFirstId == 5) {
+                        uni.navigateTo({
+                            url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2&haveButton=${this.haveButton}`,
+                        });
+                    }
+                }
+            },
+            // 去登录
+            goLogin() {
+                uni.navigateTo({ url: '/pages/blogPopup/blogPopup' });
+            }
+        },
+    };
 </script>
 
-<style lang="less">
-	/* 状态标签栏 */
-	.status {
-		position: sticky;
-		top: 0;
-		/* #ifdef H5 */
-		top: 88rpx;
-		/* H5端顶部适配 */
-		/* #endif */
-		left: 0;
-		right: 0;
-	}
+<style scoped lang="less">
+    .order-list-page {
+        min-height: 100vh;
+        display: flex;
+        flex-direction: column;
+    }
 
-	.status-tabs {
+    /* 状态标签栏 (移植自用户端示例) */
+    .status {
+        position: sticky;
+        top: 0;
+        /* #ifdef H5 */
+        top: 88rpx;
+        /* H5端顶部适配 */
+        /* #endif */
+        left: 0;
+        right: 0;
+        background: #fff;
+        z-index: 99;
+    }
 
-		height: 94rpx;
-		background-color: #FFFFFF;
-		z-index: 99;
-		white-space: nowrap;
-		// padding-left: 20rpx;
-	}
+    .status-tabs {
+        height: 94rpx;
+        background-color: #ffffff;
+        white-space: nowrap;
+    }
 
-	.tab-item {
-		display: inline-block;
-		height: 48rpx;
-		position: relative;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 42rpx;
-		text-align: left;
-		font-style: normal;
-		margin: 20rpx 50rpx 26rpx 0rpx;
-	}
+    .tab-item {
+        display: inline-block;
+        height: 48rpx;
+        position: relative;
+        font-weight: 500;
+        font-size: 30rpx;
+        color: #333333;
+        line-height: 42rpx;
+        text-align: left;
+        font-style: normal;
+        margin: 20rpx 50rpx 26rpx 0rpx;
+        
+        &.active {
+            color: #ff4767;
+            font-weight: 500;
+        }
 
-	.tab-item.active {
-		color: #FF4767;
-		font-weight: 500;
-	}
+        &.active::after {
+            content: "";
+            position: absolute;
+            width: 34rpx;
+            height: 6rpx;
+            left: 50%;
+            bottom: -16rpx;
+            transform: translateX(-50%);
+            background-color: #ff4767;
+            border-radius: 3rpx;
+        }
+    }
 
-	.tab-item.active::after {
-		content: '';
-		position: absolute;
-		width: 28rpx;
-		height: 6rpx;
-		left: 50%;
-		bottom: 0;
-		transform: translateX(-50%);
-		background-color: #FF4767;
-		border-radius: 3rpx;
-	}
+    .status-tabs2 {
+        height: 56rpx;
+        background-color: #ffffff;
+        white-space: nowrap;
+        padding-bottom: 30rpx;
+        padding-top: 10rpx;
+    }
 
-	.status-tabs2 {
-		height: 56rpx;
-		background-color: #FFFFFF;
-		z-index: 99;
-		white-space: nowrap;
-		padding-bottom: 30rpx;
-	}
+    .tab-item2 {
+        display: inline-block;
+        height: 56rpx;
+        padding: 0 20rpx;
+        background: #f3f5f6;
+        border-radius: 10rpx;
+        position: relative;
+        margin: 0 18rpx 0 0;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 56rpx;
+        text-align: left;
+        font-style: normal;
+        
+        &.active {
+            color: #ff4767;
+            font-weight: 500;
+            background: #fee5e7;
+        }
+    }
 
-	.tab-item2 {
-		display: inline-block;
-		height: 56rpx;
-		padding: 0 20rpx;
-		background: #F3F5F6;
-		border-radius: 10rpx;
-		position: relative;
-		margin: 0 18rpx;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #333333;
-		line-height: 56rpx;
-		text-align: left;
-		font-style: normal;
-	}
+    /* 数据列表及卡片外框样式 */
+    .order-item-wrap {
+        margin: 0 0 24rpx 0;
+        border-radius: 20rpx;
+        overflow: hidden;
+    }
 
-	.tab-item2.active {
-		color: #FF4767;
-		font-weight: 500;
-		background: #FEE5E7;
-	}
+    .noDataBox {
+        background-color: transparent;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
 
+    /* 未登录状态的样式 */
+    .nologin_part {
+        display: flex;
+        flex-flow: column nowrap;
+        justify-content: center;
+        align-items: center;
+    }
 
+    .nologin_icon {
+        width: 360rpx;
+        height: 360rpx;
+        margin-top: 100rpx;
+        margin-bottom: 40rpx;
+    }
 
-	/* 订单列表 */
-	.order-scroll {
-		padding: 0 20rpx 24rpx;
-		margin-top: 24rpx;
-		height: calc(100vh - 112rpx - 24rpx);
-		box-sizing: border-box;
-	}
+    .btn-login {
+        width: 200rpx;
+        height: 68rpx;
+        background-color: #ff4767;
+        border-radius: 34rpx;
+        display: flex;
+        flex-flow: row nowrap;
+        justify-content: center;
+        align-items: center;
+        box-shadow: 0 4rpx 10rpx rgba(255, 71, 103, 0.3);
+    }
 
-	.order-item {
-		background-color: #FFFFFF;
-		border-radius: 16rpx;
-		margin-bottom: 24rpx;
-		padding: 20rpx;
-		box-sizing: border-box;
-	}
+    .login-text {
+        font-size: 30rpx;
+        color: #fff;
+    }
 
-	.order-header {
-		display: flex;
-		align-items: center;
-		margin-bottom: 34rpx;
-	}
-
-	.order-tag {
-		padding: 2rpx 6rpx;
-		background: #FF4767;
-		border-radius: 6rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-right: 10rpx;
-	}
-
-	.order-tag-text {
-		font-weight: 400;
-		font-size: 20rpx;
-		color: #FFFFFF;
-		line-height: 25rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.order-number {
-		flex: 1;
-		font-size: 24rpx;
-		color: #666666;
-	}
-
-	.order-status {
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #FF4767;
-		line-height: 39rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.status-pending {
-		color: #FF4767;
-	}
-
-	.status-cancelled {
-		color: #FF4767;
-	}
-
-	.status-completed {
-		color: #FF4767;
-	}
-
-	.order-content {
-		display: flex;
-		margin-bottom: 24rpx;
-	}
-
-	.service-image {
-		width: 182rpx;
-		height: 182rpx;
-		border-radius: 16rpx;
-		margin-right: 24rpx;
-		background-color: #000000;
-	}
-
-	.service-info {
-		flex: 1;
-	}
-
-	.service-name {
-		width: 400rpx;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-		display: flex;
-		align-items: center;
-
-		.service-name-type {
-			height: 28rpx;
-			margin-right: 10rpx;
-		}
-
-		.service-name-text {
-			flex: 1;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-	}
-
-	.service-time,
-	.service-address {
-		display: flex;
-		align-items: center;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-		margin-top: 6rpx;
-	}
-
-	.service-time {
-		margin-top: 16rpx;
-	}
-
-	.time-icon,
-	.location-icon {
-		width: 24rpx;
-		height: 24rpx;
-		margin-right: 4rpx;
-		flex-shrink: 0;
-	}
-
-	.order-actions {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		border-top: 1rpx solid #EEEEEE;
-		padding-top: 24rpx;
-	}
-
-	.delete-icon {
-		width: 36rpx;
-		height: 40rpx;
-	}
-
-	.action-left {
-		display: flex;
-		align-items: center;
-	}
-
-	.action-right {
-		display: flex;
-		align-items: center;
-		padding: 4rpx 0;
-		gap: 18rpx;
-	}
-
-	.action-btn {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 129rpx;
-		height: 56rpx;
-		border-radius: 32rpx;
-		border: 2rpx solid #979797;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #333333;
-		line-height: 33rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.action-btn.contact {
-		background-color: #FFFFFF;
-		border: 1rpx solid #999999;
-		color: #333333;
-	}
-
-	.action-btn.primary {
-		background-color: #FF4767;
-		color: #FFFFFF;
-	}
-
-	.action-btn.review {
-		border-color: transparent;
-		background: linear-gradient(143deg, #F52540 0%, #FF4767 100%);
-		color: #FFFFFF;
-	}
-
-	.action-btn.again {
-		background-color: #FFFFFF;
-		border: 1rpx solid #999999;
-		color: #666666;
-	}
-
-	.nologin_part {
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.nologin_icon {
-		width: 360rpx;
-		height: 360rpx;
-		margin-top: 100rpx;
-		margin-bottom: 40rpx;
-	}
-
-	.btn-login {
-		width: 200rpx;
-		height: 68rpx;
-		background-color: yellowgreen;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.login-text {
-		font-size: 36rpx;
-		color: #fff;
-		text-shadow:
-			1px 1px 1px #919191,
-			2px 2px 1px #919191,
-			2px 3px 1px #919191,
-			2px 4px 1px #919191,
-			2px 5px 1px #919191,
-			2px 6px 1px #919191,
-			2px 7px 2px rgba(16, 16, 16, 0.4);
-	}
-
-	/* 加载更多 */
-	.loading-more,
-	.no-more {
-		text-align: center;
-		font-size: 26rpx;
-		color: #999999;
-		padding: 24rpx 0;
-	}
-
-	/* #ifdef APP-PLUS */
-	/* APP端权限弹窗位置适配 */
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-		opacity: 1;
-		visibility: visible;
-	}
-
-	/* #endif */
-
-	.service-group {
-		display: flex;
-		flex-wrap: wrap;
-		align-content: space-between;
-		flex: 1;
-		margin-top: 16rpx;
-
-		.service-group-time {
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #999999;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-			width: 100%;
-		}
-
-		.service-group-price {
-			margin-top: 56rpx;
-			font-family: DINPro, DINPro;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #FF4767;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-		}
-	}
+    ::v-deep .list-scroll {
+        margin-top: 0 !important;
+        box-sizing: border-box;
+        /* padding-top: 24rpx; */
+    }
 </style>
\ No newline at end of file

From b03ffe7225dae9b56a0b39ed36a299628a3a3c76 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 14:16:40 +0800
Subject: [PATCH 072/118] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/qualification_sj copy.vue | 2 +-
 pages/ruzhu/qualification_sj.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/ruzhu/qualification_sj copy.vue b/pages/ruzhu/qualification_sj copy.vue
index 8f3fa0f..b407e4c 100644
--- a/pages/ruzhu/qualification_sj copy.vue	
+++ b/pages/ruzhu/qualification_sj copy.vue	
@@ -748,7 +748,7 @@ export default {
       
       try {
         // 调用接口验证邀请码
-        const response = await request.post('/user/user/getInvite', {
+        const response = await request.post('/sj/user/getInvite', {
           invite_code: code
         });
         
diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue
index 57808b7..4fd57a0 100644
--- a/pages/ruzhu/qualification_sj.vue
+++ b/pages/ruzhu/qualification_sj.vue
@@ -589,7 +589,7 @@ export default {
 
 			try {
 				// 调用接口验证邀请码
-				const response = await request.post('/user/user/getInvite', {
+				const response = await request.post('/sj/user/getInvite', {
 					invite_code_other: code
 				});
 

From fc78b157a9ca7e6586457e31a3e55cae0ed03edd Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 15:02:18 +0800
Subject: [PATCH 073/118] =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=A0=81=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/qualification_sj.vue | 2361 +++++++++++++++++-------------
 pages/ruzhu/ruzhu.vue            | 1276 ++++++++--------
 utils/request.js                 |    8 +-
 3 files changed, 1970 insertions(+), 1675 deletions(-)

diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue
index 4fd57a0..c0e8734 100644
--- a/pages/ruzhu/qualification_sj.vue
+++ b/pages/ruzhu/qualification_sj.vue
@@ -197,1262 +197,1555 @@
 				</view>
 			</view>
 		</view>
-	</view>
+
+        <uni-popup ref="existingInvitePopup" type="center" :mask-click="false">
+            <view class="invite-popup-content">
+                <view class="invite-popup-header">
+                    <text class="invite-popup-title">请确认邀请信息</text>
+                </view>
+                <view class="invite-popup-body">
+                    <view class="invite-item">
+                        <text class="invite-label">邀请码</text>
+                        <text class="invite-value">{{ existingInviterInfo && (existingInviterInfo.invite_code || existingInviterInfo.invite_code_other) }}</text>
+                    </view>
+                    <view class="invite-item">
+                        <text class="invite-label">邀请人</text>
+                        <text class="invite-value">{{ (existingInviterInfo && (existingInviterInfo.name || existingInviterInfo.nick_name)) || '' }}</text>
+                    </view>
+                </view>
+                <view class="invite-popup-footer">
+                    <view class="invite-btn cancel" @click="cancelInviteConfirm">关闭</view>
+                    <view class="invite-btn confirm" @click="useExistingInviteCode">确认</view>
+                </view>
+            </view>
+        </uni-popup>
+
+    </view>
 </template>
 
 <script>
 import request from '../../utils/request';
 import {
-	debounce
+    debounce
 } from '@/utils/debounce.js';
 import ChinaCitys from '../../static/data/ChinaCitys.json';
 
 export default {
-	data() {
-		const loadedData = this.loadFormDataFromLocal();
-
-		return {
-			userId: null,
-			formData: loadedData || {
-				name: '',
-				contact_type: '1',
-				contact_name: '',
-				contact_phone: '',
-				backup_phone: '',
-				invite_code_other: '',
-				dependency: '',
-				address: '',
-				dependency_code: '',
-				dependency_province: '',
-				dependency_city: '',
-				longitude: '',
-				latitude: ''
-			},
-			showTipPopupFlag: false,
-			indicatorStyle: 'height: 68rpx;',
-			tipTitle: '',
-			tipImage: '',
-			currentTipType: '',
-			isSubmit: false,
-			identity: 2,
-
-			ChinaCitys: ChinaCitys,
-			locatinCitys: [],
-			locationAreas: [],
-			locationValue: [0, 0, 0],
-			showLocationPopupFlag: false,
-			// 抖动效果控制
-			shakeInviteError: false,
-
-			// 邀请码相关字段
-			inviteCodeValidating: false,
-			inviteCodeError: false,
-			inviterInfo: null,
-			currentValidatingCode: '',
-			inviteValidationTimer: null,
-		}
-	},
-	computed: {
-
-	},
-
-	watch: {
-		'formData.name'(newVal) {
-			this.saveFormDataToLocalDebounce();
-		},
-		'formData.contact_name'(newVal) {
-			this.saveFormDataToLocalDebounce();
-		},
-		'formData.contact_phone'(newVal) {
-			this.saveFormDataToLocalDebounce();
-		},
-		'formData.backup_phone'(newVal) {
-			this.saveFormDataToLocalDebounce();
-		},
-		'formData.invite_code_other'(newVal) {
-			this.saveFormDataToLocalDebounce();
-		},
-		'formData.dependency'(newVal) {
-			this.saveFormDataToLocalDebounce();
-		},
-		'formData.address'(newVal) {
-			this.saveFormDataToLocalDebounce();
-		}
-	},
-
-	created() {
-		this.getUserInfo();
-		this.checkGlobalData();
-		this.setupAddressListener();
-	},
-
-	onShow() {
-		const localData = this.loadFormDataFromLocal();
-		if (localData) {
-			this.formData = {
-				...this.formData,
-				...localData
-			};
-		}
-
-		this.checkGlobalData();
-		this.checkAddressData();
-
-		this.loadInviteStateFromLocal();
-
-		if (this.formData.invite_code_other) {
-			this.validateInviteCode(this.formData.invite_code_other);
-		}
-	},
-
-	onUnload() {
-		this.saveFormDataToLocal();
-	},
-
-	beforeDestroy() {
-		if (this.addressListener) {
-			uni.$off('address-selected', this.addressListener);
-		}
-		if (this.sjAddressListener) {
-			uni.$off('address-selected-for-sj', this.sjAddressListener);
-		}
-	},
-
-	mounted() {
-		this.locatinCitys = this.ChinaCitys[0].citys;
-		this.locationAreas = this.locatinCitys[0].areas;
-
-		if (this.formData.invite_code_other) {
-			this.validateInviteCode(this.formData.invite_code_other);
-		}
-	},
-
-	onHide() {
-		this.saveFormDataToLocal();
-	},
-
-	methods: {
-		loadInviteStateFromLocal() {
-			try {
-				const inviteState = uni.getStorageSync('store_invite_state');
-				if (inviteState) {
-					console.log('加载邀请码验证状态:', inviteState);
-
-					// 恢复邀请码验证状态
-					this.inviterInfo = inviteState.inviterInfo || null;
-					this.inviteCodeError = inviteState.inviteCodeError || false;
-					this.currentValidatingCode = inviteState.currentValidatingCode || '';
-
-					// 特殊处理：如果当前邀请码是13131313，确保状态正确
-					if (this.formData.invite_code_other === '13131313') {
-						console.log('检测到特殊邀请码13131313，重置验证状态');
-						this.inviteCodeError = false;
-						this.inviterInfo = null;
-						this.currentValidatingCode = '13131313';
-					}
-
-					// 如果正在验证的邀请码与当前表单中的一致，保持验证状态
-					if (this.currentValidatingCode === this.formData.invite_code_other) {
-						// 状态已恢复，无需额外操作
-					} else {
-						// 如果不一致，重新验证
-						if (this.formData.invite_code_other && this.formData.invite_code_other.trim() !== '') {
-							console.log('邀请码不一致，重新验证:', this.formData.invite_code_other);
-							this.handleInviteCodeInput({
-								detail: {
-									value: this.formData.invite_code_other
-								}
-							});
-						}
-					}
-				} else {
-					// 如果没有保存的状态，重置为初始状态
-					this.resetInviteCodeState();
-				}
-			} catch (e) {
-				console.log('加载邀请码验证状态失败:', e);
-				this.resetInviteCodeState();
-			}
-		},
-
-		// 新增方法：重置邀请码状态
-		resetInviteCodeState() {
-			this.inviteCodeValidating = false;
-			this.inviteCodeError = false;
-			this.inviterInfo = null;
-			this.currentValidatingCode = '';
-			this.shakeInviteError = false;
-		},
-
-		// 新增方法：专门保存邀请码验证状态
-		saveInviteStateToLocal() {
-			try {
-				const inviteState = {
-					inviterInfo: this.inviterInfo,
-					inviteCodeError: this.inviteCodeError,
-					currentValidatingCode: this.currentValidatingCode || this.formData.invite_code_other || ''
-				};
-				uni.setStorageSync('store_invite_state', inviteState);
-
-				console.log('邀请码验证状态已保存:', {
-					hasInviterInfo: !!this.inviterInfo,
-					inviteCodeError: this.inviteCodeError,
-					currentValidatingCode: this.currentValidatingCode
-				});
-			} catch (e) {
-				console.log('保存邀请码验证状态失败:', e);
-			}
-		},
-		// 触发邀请码错误抖动效果
-		triggerInviteErrorShake() {
-			// 触发抖动效果
-			this.shakeInviteError = true;
-
-			// 滚动到邀请码容器位置
-			this.$nextTick(() => {
-				// 使用uni.createSelectorQuery获取邀请码容器的位置
-				const query = uni.createSelectorQuery().in(this);
-				query.select('.invite-code-container').boundingClientRect((rect) => {
-					if (rect) {
-						// 获取当前窗口高度
-						const windowHeight = uni.getSystemInfoSync().windowHeight;
-
-						// 判断邀请码容器是否已经在可视区域内
-						// 计算容器在屏幕中的位置比例（0-1之间）
-						const containerTopRatio = rect.top / windowHeight;
-						const containerBottomRatio = (rect.top + rect.height) / windowHeight;
-
-						// 如果容器已经在屏幕中上部（顶部在屏幕中间以上），就不需要滚动
-						// 或者容器整体都在屏幕内，也不需要滚动
-						if (containerTopRatio >= 0 && containerTopRatio < 0.7 &&
-							containerBottomRatio <= 1) {
-							console.log('邀请码容器已在可视区域内，不需要滚动');
-							return;
-						}
-
-						// 滚动到邀请码容器位置，减去一些偏移量让用户体验更好
-						uni.pageScrollTo({
-							scrollTop: rect.top - 50,
-							duration: 300
-						});
-					}
-				}).exec();
-			});
-
-			// 0.5秒后重置抖动状态
-			setTimeout(() => {
-				this.shakeInviteError = false;
-			}, 500);
-		},
-
-		// 处理邀请码输入
-		handleInviteCodeInput(e) {
-			const code = e.detail ? e.detail.value : this.formData.invite_code_other;
-
-			console.log('邀请码输入:', code);
-
-			// 立即重置状态
-			this.inviteCodeValidating = false;
-			this.inviteCodeError = false;
-			this.inviterInfo = null;
-
-			// 如果邀请码为空，不进行验证
-			if (!code || code.trim() === '') {
-				this.formData.invite_code_other = '';
-				this.saveFormDataToLocalDebounce();
-				// 保存空状态
-				this.saveInviteStateToLocal();
-				return;
-			}
-
-			this.formData.invite_code_other = code;
-			this.saveFormDataToLocalDebounce();
-
-			// 【关键修复】如果是13131313，立即通过验证并取消任何正在进行的验证
-			if (code === '13131313') {
-				console.log('检测到特殊邀请码13131313，立即通过');
-
-				// 清除任何可能的定时器
-				if (this.inviteValidationTimer) {
-					clearTimeout(this.inviteValidationTimer);
-					this.inviteValidationTimer = null;
-				}
-
-				// 立即更新状态
-				this.inviteCodeValidating = false;
-				this.inviteCodeError = false;
-				this.inviterInfo = null;
-				this.currentValidatingCode = code;
-
-				// 特殊邀请码也需要保存状态
-				const inviteState = {
-					inviterInfo: null,
-					inviteCodeError: false,
-					currentValidatingCode: code
-				};
-				uni.setStorageSync('store_invite_state', inviteState);
-
-				// 强制更新视图
-				this.$forceUpdate();
-				return;
-			}
-
-			// 记录当前正在验证的邀请码
-			this.currentValidatingCode = code;
-
-			// 立即保存状态（验证中）
-			this.saveInviteStateToLocal();
-
-			// 清除之前的定时器
-			if (this.inviteValidationTimer) {
-				clearTimeout(this.inviteValidationTimer);
-				this.inviteValidationTimer = null;
-			}
-
-			// 设置新的定时器
-			this.inviteValidationTimer = setTimeout(() => {
-				// 检查邀请码是否变化
-				if (this.formData.invite_code_other !== this.currentValidatingCode) {
-					console.log('邀请码已变化，取消验证');
-					return;
-				}
-
-				// 再次检查是否是13131313（双重检查）
-				if (this.formData.invite_code_other === '13131313') {
-					console.log('双重检查：检测到特殊邀请码13131313');
-					this.inviteCodeValidating = false;
-					this.inviteCodeError = false;
-					this.inviterInfo = null;
-					this.currentValidatingCode = '13131313';
-
-					const inviteState = {
-						inviterInfo: null,
-						inviteCodeError: false,
-						currentValidatingCode: '13131313'
-					};
-					uni.setStorageSync('store_invite_state', inviteState);
-					return;
-				}
-
-				console.log('开始验证邀请码:', this.formData.invite_code_other);
-				this.validateInviteCode(this.formData.invite_code_other);
-
-				// 清理定时器
-				this.inviteValidationTimer = null;
-			}, 600); // 适当增加延迟时间
-		},
-
-		// 验证邀请码
-		async validateInviteCode(code) {
-			console.log('开始验证邀请码:', code);
-
-			// 特殊邀请码13131313直接通过
-			if (code === '13131313') {
-				console.log('特殊邀请码13131313，直接通过');
-				this.inviteCodeValidating = false;
-				this.inviteCodeError = false;
-				this.inviterInfo = null;
-				this.currentValidatingCode = code;
-				// 特殊邀请码也需要保存状态
-				const inviteState = {
-					inviterInfo: null,
-					inviteCodeError: false,
-					currentValidatingCode: code
-				};
-				uni.setStorageSync('store_invite_state', inviteState);
-
-				// 强制更新视图
-				this.$forceUpdate();
-				return;
-			}
-
-			// 如果邀请码为空
-			if (!code || code.trim() === '') {
-				this.inviteCodeValidating = false;
-				this.inviteCodeError = false;
-				this.inviterInfo = null;
-				this.currentValidatingCode = '';
-				const inviteState = {
-					inviterInfo: null,
-					inviteCodeError: false,
-					currentValidatingCode: ''
-				};
-				uni.setStorageSync('store_invite_state', inviteState);
-				return;
-			}
-
-			// 设置验证中状态
-			this.inviteCodeValidating = true;
-			this.inviteCodeError = false;
-			this.inviterInfo = null;
-			this.currentValidatingCode = code;
-
-			try {
-				// 调用接口验证邀请码
-				const response = await request.post('/sj/user/getInvite', {
-					invite_code_other: code
-				});
-
-				console.log('邀请码验证响应:', response);
-
-				// 验证完成
-				this.inviteCodeValidating = false;
-
-				if (response && (response.state === 1 || response.code === 200) && response.data) {
-					const userData = response.data;
-
-					if (userData.account) {
-						// 邀请码有效，保存邀请人信息
-						this.inviterInfo = userData;
-						this.inviteCodeError = false;
-						console.log('邀请码验证通过，邀请人:', userData);
-					} else {
-						// 接口返回数据但没有account字段，说明不是有效邀请人
-						console.log('接口返回数据无效，没有account字段:', userData);
-						this.inviterInfo = null;
-						this.inviteCodeError = true;
-					}
-				} else {
-					// 接口返回错误或数据为空
-					console.log('接口返回错误:', response?.msg || '未知错误');
-					this.inviterInfo = null;
-					this.inviteCodeError = true;
-				}
-			} catch (error) {
-				console.error('验证邀请码失败:', error);
-				this.inviteCodeValidating = false;
-				this.inviteCodeError = true;
-				this.inviterInfo = null;
-			} finally {
-				// 无论成功失败都保存状态
-				const inviteState = {
-					inviterInfo: this.inviterInfo,
-					inviteCodeError: this.inviteCodeError,
-					currentValidatingCode: this.currentValidatingCode
-				};
-				uni.setStorageSync('store_invite_state', inviteState);
-			}
-		},
-		checkGlobalData() {
-			if (getApp().globalData.qualificationData) {
-				this.formData = {
-					...this.formData,
-					...getApp().globalData.qualificationData
-				};
-				this.saveFormDataToLocal();
-				getApp().globalData.qualificationData = null;
-			}
-		},
-
-		loadFormDataFromLocal() {
-			try {
-				const stored = uni.getStorageSync('qualification_form_data');
-				if (stored) {
-					console.log('从本地存储加载数据:', stored);
-
-					const inviteState = uni.getStorageSync('store_invite_state');
-					if (inviteState) {
-						this.inviterInfo = inviteState.inviterInfo;
-						this.inviteCodeError = inviteState.inviteCodeError || false;
-						this.currentValidatingCode = inviteState.currentValidatingCode || '';
-						console.log('加载邀请码验证状态:', inviteState);
-					}
-
-					return stored;
-				}
-			} catch (e) {
-				console.log('读取本地存储失败:', e);
-			}
-			return null;
-		},
-
-		saveFormDataToLocalDebounce: debounce(function () {
-			this.saveFormDataToLocal();
-		}, 500),
-
-		saveFormDataToLocal() {
-			try {
-				uni.setStorageSync('qualification_form_data', this.formData);
-
-				const inviteState = {
-					inviterInfo: this.inviterInfo,
-					inviteCodeError: this.inviteCodeError,
-					currentValidatingCode: this.currentValidatingCode
-				};
-				uni.setStorageSync('store_invite_state', inviteState);
-				console.log('数据已保存到本地存储');
-			} catch (e) {
-				console.log('保存数据失败:', e);
-			}
-		},
-
-		clearFormDataLocal() {
-			try {
-				uni.removeStorageSync('qualification_form_data');
-				console.log('已清空本地存储数据');
-			} catch (e) {
-				console.log('清空数据失败:', e);
-			}
-		},
-
-		getUserInfo() {
-			return new Promise((resolve, reject) => {
-				request.post('/sj/user/getuser').then(result => {
-					if (result.state === 1) {
-						this.userId = result.data.id;
-						console.log('用户ID获取成功:', this.userId);
-						resolve(this.userId);
-					} else {
-						console.error('获取用户信息失败:', result.msg);
-						reject(result.msg);
-					}
-				}).catch(error => {
-					console.error('获取用户信息接口错误:', error);
-					reject(error);
-				});
-			});
-		},
-
-		getFormData() {
-			return {
-				...this.formData
-			};
-		},
-
-		saveFormData() {
-			if (!this.formData.name) {
-				uni.showToast({
-					title: '请输入店铺名称',
-					icon: 'none'
-				});
-				return false;
-			}
-			if (!this.formData.dependency) {
-				uni.showToast({
-					title: '请选择门店所在地',
-					icon: 'none'
-				});
-				return false;
-			}
-			if (!this.formData.address) {
-				uni.showToast({
-					title: '请选择门店详细地址',
-					icon: 'none'
-				});
-				return false;
-			}
-			if (!this.formData.contact_name) {
-				uni.showToast({
-					title: '请输入联系人',
-					icon: 'none'
-				});
-				return false;
-			}
-			if (!this.formData.contact_phone) {
-				uni.showToast({
-					title: '请输入联系人电话',
-					icon: 'none'
-				});
-				return false;
-			}
-			if (!/^1[3-9]\d{9}$/.test(this.formData.contact_phone)) {
-				uni.showToast({
-					title: '请输入正确的手机号码',
-					icon: 'none'
-				});
-				return false;
-			}
-			if (!this.formData.invite_code_other) {
-				uni.showToast({
-					title: '请输入邀请码',
-					icon: 'none'
-				});
-				return false;
-			}
-			this.saveFormDataToLocal();
-			return true;
-		},
-
-		setContactType(type) {
-			this.$set(this.formData, 'contact_type', type);
-			this.saveFormDataToLocal();
-		},
-
-		showTipPopup(field) {
-			const tipConfig = {
-				'name': {
-					title: '如何查看店铺名称',
-					image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
-				}
-			};
-
-			if (tipConfig[field]) {
-				this.currentTipType = field;
-				this.tipTitle = tipConfig[field].title;
-				this.tipImage = tipConfig[field].image;
-				this.showTipPopupFlag = true;
-			}
-		},
-
-		hideTipPopup() {
-			this.showTipPopupFlag = false;
-		},
-
-		showLocationPopup() {
-			this.showLocationPopupFlag = true;
-		},
-
-		hideLocationPopup() {
-			this.showLocationPopupFlag = false;
-		},
-
-		bindChangeLocation(e) {
-			this.locationValue = e.detail.value;
-			let index1 = e.detail.value[0] || 0;
-			let index2 = e.detail.value[1] || 0;
-			this.locatinCitys = this.ChinaCitys[index1].citys;
-			this.locationAreas = this.locatinCitys[index2].areas;
-		},
-
-		confirmLocationSelect() {
-			let valueArr = this.locationValue;
-			let index1 = valueArr[0] || 0;
-			let index2 = valueArr[1] || 0;
-			let index3 = valueArr[2] || 0;
-			let province = this.ChinaCitys[index1].province;
-			let city = this.locatinCitys[index2].city;
-			let area = this.locationAreas[index3].area;
-			this.formData.dependency = province + '-' + city + '-' + area;
-
-			this.formData.address = '';
-			this.formData.longitude = '';
-			this.formData.latitude = '';
-
-			if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
-				let provinceCode = this.ChinaCitys[index1].code.toString();
-				this.formData.dependency_province = provinceCode.substring(0, 6);
-			}
-			if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
-				let cityCode = this.locatinCitys[index2].code.toString();
-				this.formData.dependency_city = cityCode.substring(0, 6);
-			}
-			if (this.locationAreas[index3] && this.locationAreas[index3].code) {
-				let areaCode = this.locationAreas[index3].code.toString();
-				this.formData.dependency_code = areaCode.substring(0, 6);
-			}
-
-			this.saveFormDataToLocal();
-			this.hideLocationPopup();
-		},
-
-		buildRegionTextForSearch() {
-			const dependency = String(this.formData.dependency || '').trim();
-			if (!dependency) return '';
-
-			const parts = dependency.split('-');
-			const province = parts[0] || '';
-			const city = parts[1] || '';
-			const district = parts[2] || '';
-
-			let regionText = '';
-			if (province) regionText += province;
-			if (city && city !== province) regionText += city;
-			if (district) regionText += district;
-
-			return regionText;
-		},
-
-		getAddressValueForSearch() {
-			const rawAddress = String(this.formData.address || '').trim();
-			if (!rawAddress) return '';
-
-			const dependencyText = String(this.formData.dependency || '').trim();
-			const regionText = this.buildRegionTextForSearch();
-
-			let detail = rawAddress;
-
-			if (regionText && detail.indexOf(regionText) === 0) {
-				detail = detail.slice(regionText.length).trim();
-			} else if (dependencyText && detail.indexOf(dependencyText) === 0) {
-				detail = detail.slice(dependencyText.length).trim();
-			}
-
-			detail = detail.replace(/^[\s,-]+/, '').trim();
-
-			return detail || rawAddress;
-		},
-
-		getAddressInfo() {
-			this.saveFormDataToLocal();
-
-			const dependency = String(this.formData.dependency || '').trim();
-			const dependencyCode = String(this.formData.dependency_code || '').trim();
-			const address = this.getAddressValueForSearch();
-			const longitude = String(this.formData.longitude || '').trim();
-			const latitude = String(this.formData.latitude || '').trim();
-
-			const hasDependency = !!dependency;
-			const hasAddress = !!address;
-			const hasLocation = !!(longitude && latitude);
-
-			let params = 'source=sj_info';
-
-			if (hasDependency) {
-				params += `&dependency=${encodeURIComponent(dependency)}`;
-				if (dependencyCode) {
-					params += `&dependency_code=${dependencyCode}`;
-				}
-			}
-
-			if (hasAddress) {
-				params += `&address=${encodeURIComponent(address)}`;
-			}
-
-			if (hasLocation) {
-				params += `&longitude=${longitude}&latitude=${latitude}`;
-			}
-
-			if (!hasDependency && !hasAddress && !hasLocation) {
-				params += '&init_current_location=1&silent_locate=1';
-			}
-
-			uni.navigateTo({
-				url: `/pages/address/search?${params}`
-			});
-		},
-
-		setupAddressListener() {
-			this.addressListener = (addressData) => {
-				this.handleAddressSelected(addressData);
-			};
-			this.sjAddressListener = (addressData) => {
-				this.handleAddressSelected(addressData);
-			};
-			uni.$on('address-selected', this.addressListener);
-			uni.$on('address-selected-for-sj', this.sjAddressListener);
-		},
-
-		checkAddressData() {
-			try {
-				const storedAddress = uni.getStorageSync('sj_selected_address');
-				if (storedAddress) {
-					this.handleAddressSelected(storedAddress);
-					uni.removeStorageSync('sj_selected_address');
-					return;
-				}
-			} catch (e) { }
-
-			if (getApp().globalData && getApp().globalData.selectedAddress) {
-				this.handleAddressSelected(getApp().globalData.selectedAddress);
-				delete getApp().globalData.selectedAddress;
-			}
-
-			try {
-				const selectedAddress = uni.getStorageSync('selectedAddress');
-				if (selectedAddress) {
-					this.handleAddressSelected(selectedAddress);
-					uni.removeStorageSync('selectedAddress');
-				}
-			} catch (e) { }
-		},
-
-		handleAddressSelected(addressData) {
-			if (!addressData) return;
-
-			let detailAddress = '';
-			if (addressData.address) {
-				detailAddress = String(addressData.address).trim();
-			} else if (addressData.name) {
-				detailAddress = String(addressData.name).trim();
-
-				const regionParts = [];
-				if (addressData.pname) regionParts.push(addressData.pname);
-				if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData
-					.cityname);
-				if (addressData.adname) regionParts.push(addressData.adname);
-
-				const regionText = regionParts.join('');
-
-				if (regionText && detailAddress.indexOf(regionText) === 0) {
-					detailAddress = detailAddress.slice(regionText.length).trim();
-				}
-
-				detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
-			}
-
-			this.formData.address = detailAddress;
-
-			if (addressData.location) {
-				const [longitude, latitude] = String(addressData.location).split(',');
-				this.formData.longitude = longitude || '';
-				this.formData.latitude = latitude || '';
-			}
-
-			if (addressData.pname || addressData.cityname || addressData.adname) {
-				const locationParts = [];
-				if (addressData.pname) locationParts.push(addressData.pname);
-				if (addressData.cityname) locationParts.push(addressData.cityname);
-				if (addressData.adname) locationParts.push(addressData.adname);
-				this.formData.dependency = locationParts.join('-');
-			}
-
-			this.formData.dependency_province = addressData.provinceCode || '';
-			this.formData.dependency_city = addressData.cityCode || '';
-			this.formData.dependency_code = addressData.districtCode || '';
-
-			this.saveFormDataToLocal();
-			this.$forceUpdate();
-		}
-	}
+    data() {
+        const loadedData = this.loadFormDataFromLocal();
+
+        return {
+            userId: null,
+            userMobile: null, // 保存用户手机号用以查询邀请人
+            formData: loadedData || {
+                name: '',
+                contact_type: '1',
+                contact_name: '',
+                contact_phone: '',
+                backup_phone: '',
+                invite_code_other: '',
+                dependency: '',
+                address: '',
+                dependency_code: '',
+                dependency_province: '',
+                dependency_city: '',
+                longitude: '',
+                latitude: ''
+            },
+            showTipPopupFlag: false,
+            indicatorStyle: 'height: 68rpx;',
+            tipTitle: '',
+            tipImage: '',
+            currentTipType: '',
+            isSubmit: false,
+            identity: 2,
+
+            ChinaCitys: ChinaCitys,
+            locatinCitys: [],
+            locationAreas: [],
+            locationValue: [0, 0, 0],
+            showLocationPopupFlag: false,
+            // 抖动效果控制
+            shakeInviteError: false,
+
+            // 邀请码相关字段
+            inviteCodeValidating: false,
+            inviteCodeError: false,
+            inviterInfo: null,
+            currentValidatingCode: '',
+            inviteValidationTimer: null,
+            
+            // 新增邀请码弹窗和替换逻辑需要的状态变量
+            existingInviterInfo: null,
+            hasExistingInviter: false,
+            hasAutoReplacedInvite: false,
+            confirmResolve: null // 存储 saveFormData 的 Promise resolve 方法
+        }
+    },
+    computed: {
+
+    },
+
+    watch: {
+        'formData.name'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.contact_name'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.contact_phone'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.backup_phone'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.invite_code_other'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.dependency'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        },
+        'formData.address'(newVal) {
+            this.saveFormDataToLocalDebounce();
+        }
+    },
+
+    created() {
+        this.getUserInfo();
+        this.checkGlobalData();
+        this.setupAddressListener();
+    },
+
+    onShow() {
+        const localData = this.loadFormDataFromLocal();
+        if (localData) {
+            // 如果已经自动替换了邀请码，不要再覆盖
+            if (this.hasAutoReplacedInvite) {
+                const { invite_code_other, ...otherData } = localData;
+                Object.keys(otherData).forEach(key => {
+                    if (this.formData[key] !== undefined && key !== 'invite_code_other') {
+                        this.formData[key] = otherData[key];
+                    }
+                });
+            } else {
+                this.formData = {
+                    ...this.formData,
+                    ...localData
+                };
+            }
+        }
+
+        this.checkGlobalData();
+        this.checkAddressData();
+
+        this.loadInviteStateFromLocal();
+
+        if (this.formData.invite_code_other) {
+            this.validateInviteCode(this.formData.invite_code_other);
+        }
+    },
+
+    onUnload() {
+        this.saveFormDataToLocal();
+    },
+
+    beforeDestroy() {
+        if (this.addressListener) {
+            uni.$off('address-selected', this.addressListener);
+        }
+        if (this.sjAddressListener) {
+            uni.$off('address-selected-for-sj', this.sjAddressListener);
+        }
+    },
+
+    async mounted() {
+        this.locatinCitys = this.ChinaCitys[0].citys;
+        this.locationAreas = this.locatinCitys[0].areas;
+
+        // 先检查绑定邀请人信息
+        await this.forceUseExistingInviter();
+
+        if (!this.hasAutoReplacedInvite && this.formData.invite_code_other) {
+            this.validateInviteCode(this.formData.invite_code_other);
+        }
+    },
+
+    onHide() {
+        this.saveFormDataToLocal();
+    },
+
+    methods: {
+        // 强制使用已绑定的邀请人
+        async forceUseExistingInviter() {
+            if (this.hasAutoReplacedInvite) return false;
+            
+            // 确保我们有手机号，如果没有则再获取一次
+            if (!this.userMobile) {
+                await this.getUserInfo();
+            }
+            if (!this.userMobile) {
+                console.log('用户手机号未获取，跳过强制替换');
+                return false;
+            }
+            
+            try {
+                // 1. 调用查询已绑定的邀请码
+                const res = await request.post('/sj/User/getBInviteCode', {
+                    account: this.userMobile,
+                    type: 2 // 商家端类型
+                });
+                
+                if (res && (res.code === 200 || res.state === 1) && res.data) {
+                    const oldInviteCode = res.data.invite_code || res.data.invite_code_other;
+                    
+                    if (oldInviteCode) {
+                        console.log('检测到已绑定邀请码:', oldInviteCode);
+                        
+                        // 2. 用邀请码获取完整的邀请人信息
+                        const inviteRes = await request.post('/sj/user/getInvite', {
+                            invite_code: oldInviteCode
+                        });
+                        
+                        if (inviteRes && (inviteRes.code === 200 || inviteRes.state === 1) && inviteRes.data && inviteRes.data.account) {
+                            const fullInviterInfo = inviteRes.data;
+                            
+                            // 强制填充
+                            this.formData.invite_code_other = oldInviteCode;
+                            this.hasExistingInviter = true;
+                            this.hasAutoReplacedInvite = true;
+                            this.inviteCodeError = false;
+                            this.inviterInfo = fullInviterInfo;
+                            this.currentValidatingCode = oldInviteCode;
+                            this.existingInviterInfo = fullInviterInfo;
+                            
+                            // 保存状态
+                            this.saveInviteStateToLocal();
+                            this.saveFormDataToLocal();
+                            
+                            return true;
+                        }
+                    }
+                }
+            } catch (error) {
+                console.error('强制替换邀请人失败:', error);
+            }
+            return false;
+        },
+
+        // 显示邀请码确认弹窗
+        showInviteConfirmPopup(inviterData) {
+            this.$nextTick(() => {
+                if (this.$refs.existingInvitePopup) {
+                    this.existingInviterInfo = inviterData;
+                    this.$refs.existingInvitePopup.open();
+                } else {
+                    uni.showModal({
+                        title: '请确认邀请信息',
+                        content: `邀请码：${inviterData?.invite_code || inviterData?.invite_code_other}\n邀请人：${inviterData?.name || inviterData?.nick_name}`,
+                        confirmText: '确认',
+                        cancelText: '取消',
+                        success: (res) => {
+                            if (res.confirm) {
+                                this.useExistingInviteCode();
+                            } else {
+                                this.cancelInviteConfirm();
+                            }
+                        }
+                    });
+                }
+            });
+        },
+
+        // 隐藏邀请码确认弹窗
+        hideExistingInviteTipPopup() {
+            if (this.$refs.existingInvitePopup) {
+                this.$refs.existingInvitePopup.close();
+            }
+        },
+
+        // 用户点击确认按钮使用邀请码
+        useExistingInviteCode() {
+            if (this.existingInviterInfo) {
+                const inviteState = {
+                    inviterInfo: this.existingInviterInfo,
+                    inviteCodeError: false,
+                    currentValidatingCode: this.existingInviterInfo.invite_code || this.existingInviterInfo.invite_code_other
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+                this.saveFormDataToLocal();
+            }
+            this.hideExistingInviteTipPopup();
+            
+            // 触发 Promise 解决，以继续表单提交流程
+            if (this.confirmResolve) {
+                this.confirmResolve(true);
+                this.confirmResolve = null;
+            }
+        },
+
+        // 用户点击关闭/取消按钮
+        cancelInviteConfirm() {
+            this.hideExistingInviteTipPopup();
+            // 触发 Promise 拒绝拦截提交
+            if (this.confirmResolve) {
+                this.confirmResolve(false);
+                this.confirmResolve = null;
+            }
+        },
+
+        loadInviteStateFromLocal() {
+            try {
+                const inviteState = uni.getStorageSync('store_invite_state');
+                if (inviteState) {
+                    console.log('加载邀请码验证状态:', inviteState);
+
+                    // 恢复邀请码验证状态
+                    this.inviterInfo = inviteState.inviterInfo || null;
+                    this.inviteCodeError = inviteState.inviteCodeError || false;
+                    this.currentValidatingCode = inviteState.currentValidatingCode || '';
+
+                    // 特殊处理：如果当前邀请码是13131313，确保状态正确
+                    if (this.formData.invite_code_other === '13131313') {
+                        console.log('检测到特殊邀请码13131313，重置验证状态');
+                        this.inviteCodeError = false;
+                        this.inviterInfo = null;
+                        this.currentValidatingCode = '13131313';
+                    }
+
+                    // 如果正在验证的邀请码与当前表单中的一致，保持验证状态
+                    if (this.currentValidatingCode === this.formData.invite_code_other) {
+                        // 状态已恢复，无需额外操作
+                    } else {
+                        // 如果不一致，重新验证
+                        if (this.formData.invite_code_other && this.formData.invite_code_other.trim() !== '') {
+                            console.log('邀请码不一致，重新验证:', this.formData.invite_code_other);
+                            this.handleInviteCodeInput({
+                                detail: {
+                                    value: this.formData.invite_code_other
+                                }
+                            });
+                        }
+                    }
+                } else {
+                    // 如果没有保存的状态，重置为初始状态
+                    this.resetInviteCodeState();
+                }
+            } catch (e) {
+                console.log('加载邀请码验证状态失败:', e);
+                this.resetInviteCodeState();
+            }
+        },
+
+        // 新增方法：重置邀请码状态
+        resetInviteCodeState() {
+            this.inviteCodeValidating = false;
+            this.inviteCodeError = false;
+            this.inviterInfo = null;
+            this.currentValidatingCode = '';
+            this.shakeInviteError = false;
+        },
+
+        // 新增方法：专门保存邀请码验证状态
+        saveInviteStateToLocal() {
+            try {
+                const inviteState = {
+                    inviterInfo: this.inviterInfo,
+                    inviteCodeError: this.inviteCodeError,
+                    currentValidatingCode: this.currentValidatingCode || this.formData.invite_code_other || ''
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+
+                console.log('邀请码验证状态已保存:', {
+                    hasInviterInfo: !!this.inviterInfo,
+                    inviteCodeError: this.inviteCodeError,
+                    currentValidatingCode: this.currentValidatingCode
+                });
+            } catch (e) {
+                console.log('保存邀请码验证状态失败:', e);
+            }
+        },
+        // 触发邀请码错误抖动效果
+        triggerInviteErrorShake() {
+            // 触发抖动效果
+            this.shakeInviteError = true;
+
+            // 滚动到邀请码容器位置
+            this.$nextTick(() => {
+                // 使用uni.createSelectorQuery获取邀请码容器的位置
+                const query = uni.createSelectorQuery().in(this);
+                query.select('.invite-code-container').boundingClientRect((rect) => {
+                    if (rect) {
+                        // 获取当前窗口高度
+                        const windowHeight = uni.getSystemInfoSync().windowHeight;
+
+                        // 判断邀请码容器是否已经在可视区域内
+                        // 计算容器在屏幕中的位置比例（0-1之间）
+                        const containerTopRatio = rect.top / windowHeight;
+                        const containerBottomRatio = (rect.top + rect.height) / windowHeight;
+
+                        // 如果容器已经在屏幕中上部（顶部在屏幕中间以上），就不需要滚动
+                        // 或者容器整体都在屏幕内，也不需要滚动
+                        if (containerTopRatio >= 0 && containerTopRatio < 0.7 &&
+                            containerBottomRatio <= 1) {
+                            console.log('邀请码容器已在可视区域内，不需要滚动');
+                            return;
+                        }
+
+                        // 滚动到邀请码容器位置，减去一些偏移量让用户体验更好
+                        uni.pageScrollTo({
+                            scrollTop: rect.top - 50,
+                            duration: 300
+                        });
+                    }
+                }).exec();
+            });
+
+            // 0.5秒后重置抖动状态
+            setTimeout(() => {
+                this.shakeInviteError = false;
+            }, 500);
+        },
+
+        // 处理邀请码输入
+        handleInviteCodeInput(e) {
+            // 【改动】如果已经被强制替换为已有邀请人，禁止任何手动修改
+            if (this.hasAutoReplacedInvite) {
+                console.log('已强制使用原邀请人，禁止修改邀请码');
+                this.formData.invite_code_other = this.inviterInfo ? (this.inviterInfo.invite_code || this.inviterInfo.invite_code_other) : '';
+                return;
+            }
+            
+            const code = e.detail ? e.detail.value : this.formData.invite_code_other;
+
+            console.log('邀请码输入:', code);
+
+            // 立即重置状态
+            this.inviteCodeValidating = false;
+            this.inviteCodeError = false;
+            this.inviterInfo = null;
+
+            // 如果邀请码为空，不进行验证
+            if (!code || code.trim() === '') {
+                this.formData.invite_code_other = '';
+                this.saveFormDataToLocalDebounce();
+                // 保存空状态
+                this.saveInviteStateToLocal();
+                return;
+            }
+
+            this.formData.invite_code_other = code;
+            this.saveFormDataToLocalDebounce();
+
+            // 【关键修复】如果是13131313，立即通过验证并取消任何正在进行的验证
+            if (code === '13131313') {
+                console.log('检测到特殊邀请码13131313，立即通过');
+
+                // 清除任何可能的定时器
+                if (this.inviteValidationTimer) {
+                    clearTimeout(this.inviteValidationTimer);
+                    this.inviteValidationTimer = null;
+                }
+
+                // 立即更新状态
+                this.inviteCodeValidating = false;
+                this.inviteCodeError = false;
+                this.inviterInfo = null;
+                this.currentValidatingCode = code;
+
+                // 特殊邀请码也需要保存状态
+                const inviteState = {
+                    inviterInfo: null,
+                    inviteCodeError: false,
+                    currentValidatingCode: code
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+
+                // 强制更新视图
+                this.$forceUpdate();
+                return;
+            }
+
+            // 记录当前正在验证的邀请码
+            this.currentValidatingCode = code;
+
+            // 立即保存状态（验证中）
+            this.saveInviteStateToLocal();
+
+            // 清除之前的定时器
+            if (this.inviteValidationTimer) {
+                clearTimeout(this.inviteValidationTimer);
+                this.inviteValidationTimer = null;
+            }
+
+            // 设置新的定时器
+            this.inviteValidationTimer = setTimeout(() => {
+                // 检查邀请码是否变化
+                if (this.formData.invite_code_other !== this.currentValidatingCode) {
+                    console.log('邀请码已变化，取消验证');
+                    return;
+                }
+
+                // 再次检查是否是13131313（双重检查）
+                if (this.formData.invite_code_other === '13131313') {
+                    console.log('双重检查：检测到特殊邀请码13131313');
+                    this.inviteCodeValidating = false;
+                    this.inviteCodeError = false;
+                    this.inviterInfo = null;
+                    this.currentValidatingCode = '13131313';
+
+                    const inviteState = {
+                        inviterInfo: null,
+                        inviteCodeError: false,
+                        currentValidatingCode: '13131313'
+                    };
+                    uni.setStorageSync('store_invite_state', inviteState);
+                    return;
+                }
+
+                console.log('开始验证邀请码:', this.formData.invite_code_other);
+                this.validateInviteCode(this.formData.invite_code_other);
+
+                // 清理定时器
+                this.inviteValidationTimer = null;
+            }, 600); // 适当增加延迟时间
+        },
+
+        // 验证邀请码
+        async validateInviteCode(code) {
+            console.log('开始验证邀请码:', code);
+
+            // 特殊邀请码13131313直接通过
+            if (code === '13131313') {
+                console.log('特殊邀请码13131313，直接通过');
+                this.inviteCodeValidating = false;
+                this.inviteCodeError = false;
+                this.inviterInfo = null;
+                this.currentValidatingCode = code;
+                // 特殊邀请码也需要保存状态
+                const inviteState = {
+                    inviterInfo: null,
+                    inviteCodeError: false,
+                    currentValidatingCode: code
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+
+                // 强制更新视图
+                this.$forceUpdate();
+                return;
+            }
+
+            // 如果邀请码为空
+            if (!code || code.trim() === '') {
+                this.inviteCodeValidating = false;
+                this.inviteCodeError = false;
+                this.inviterInfo = null;
+                this.currentValidatingCode = '';
+                const inviteState = {
+                    inviterInfo: null,
+                    inviteCodeError: false,
+                    currentValidatingCode: ''
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+                return;
+            }
+
+            // 设置验证中状态
+            this.inviteCodeValidating = true;
+            this.inviteCodeError = false;
+            this.inviterInfo = null;
+            this.currentValidatingCode = code;
+
+            try {
+                // 调用接口验证邀请码
+                const response = await request.post('/sj/user/getInvite', {
+                    invite_code: code
+                });
+
+                console.log('邀请码验证响应:', response);
+
+                // 验证完成
+                this.inviteCodeValidating = false;
+
+                if (response && (response.state === 1 || response.code === 200) && response.data) {
+                    const userData = response.data;
+
+                    if (userData.account) {
+                        // 邀请码有效，保存邀请人信息
+                        this.inviterInfo = userData;
+                        this.inviteCodeError = false;
+                        console.log('邀请码验证通过，邀请人:', userData);
+                    } else {
+                        // 接口返回数据但没有account字段，说明不是有效邀请人
+                        console.log('接口返回数据无效，没有account字段:', userData);
+                        this.inviterInfo = null;
+                        this.inviteCodeError = true;
+                    }
+                } else {
+                    // 接口返回错误或数据为空
+                    console.log('接口返回错误:', response?.msg || '未知错误');
+                    this.inviterInfo = null;
+                    this.inviteCodeError = true;
+                }
+            } catch (error) {
+                console.error('验证邀请码失败:', error);
+                this.inviteCodeValidating = false;
+                this.inviteCodeError = true;
+                this.inviterInfo = null;
+            } finally {
+                // 无论成功失败都保存状态
+                const inviteState = {
+                    inviterInfo: this.inviterInfo,
+                    inviteCodeError: this.inviteCodeError,
+                    currentValidatingCode: this.currentValidatingCode
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+            }
+        },
+        checkGlobalData() {
+            if (getApp().globalData.qualificationData) {
+                this.formData = {
+                    ...this.formData,
+                    ...getApp().globalData.qualificationData
+                };
+                this.saveFormDataToLocal();
+                getApp().globalData.qualificationData = null;
+            }
+        },
+
+        loadFormDataFromLocal() {
+            try {
+                const stored = uni.getStorageSync('qualification_form_data');
+                if (stored) {
+                    console.log('从本地存储加载数据:', stored);
+
+                    const inviteState = uni.getStorageSync('store_invite_state');
+                    if (inviteState) {
+                        this.inviterInfo = inviteState.inviterInfo;
+                        this.inviteCodeError = inviteState.inviteCodeError || false;
+                        this.currentValidatingCode = inviteState.currentValidatingCode || '';
+                        console.log('加载邀请码验证状态:', inviteState);
+                    }
+
+                    return stored;
+                }
+            } catch (e) {
+                console.log('读取本地存储失败:', e);
+            }
+            return null;
+        },
+
+        saveFormDataToLocalDebounce: debounce(function () {
+            this.saveFormDataToLocal();
+        }, 500),
+
+        saveFormDataToLocal() {
+            try {
+                uni.setStorageSync('qualification_form_data', this.formData);
+
+                const inviteState = {
+                    inviterInfo: this.inviterInfo,
+                    inviteCodeError: this.inviteCodeError,
+                    currentValidatingCode: this.currentValidatingCode
+                };
+                uni.setStorageSync('store_invite_state', inviteState);
+                console.log('数据已保存到本地存储');
+            } catch (e) {
+                console.log('保存数据失败:', e);
+            }
+        },
+
+        clearFormDataLocal() {
+            try {
+                uni.removeStorageSync('qualification_form_data');
+                console.log('已清空本地存储数据');
+            } catch (e) {
+                console.log('清空数据失败:', e);
+            }
+        },
+
+        getUserInfo() {
+            // 【改动】增加了对手机号的抓取并暴露至 data 内，以供给查询上级分销/邀请人使用
+            return new Promise((resolve, reject) => {
+                request.post('/sj/user/getuser').then(result => {
+                    if (result.state === 1) {
+                        this.userId = result.data.id;
+                        this.userMobile = result.data.mobile || result.data.account; // 记录手机号
+                        if (this.userMobile && getApp().globalData) {
+                            getApp().globalData.userMobile = this.userMobile;
+                        }
+                        console.log('用户ID获取成功:', this.userId);
+                        resolve(this.userId);
+                    } else {
+                        console.error('获取用户信息失败:', result.msg);
+                        reject(result.msg);
+                    }
+                }).catch(error => {
+                    console.error('获取用户信息接口错误:', error);
+                    reject(error);
+                });
+            });
+        },
+
+        getFormData() {
+            return {
+                ...this.formData
+            };
+        },
+
+        // 这里改造为了 Promise，以拦截并弹窗等待用户操作
+        saveFormData() {
+            return new Promise((resolve) => {
+                if (!this.formData.name) {
+                    uni.showToast({
+                        title: '请输入店铺名称',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!this.formData.dependency) {
+                    uni.showToast({
+                        title: '请选择门店所在地',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!this.formData.address) {
+                    uni.showToast({
+                        title: '请选择门店详细地址',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!this.formData.contact_name) {
+                    uni.showToast({
+                        title: '请输入联系人',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!this.formData.contact_phone) {
+                    uni.showToast({
+                        title: '请输入联系人电话',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!/^1[3-9]\d{9}$/.test(this.formData.contact_phone)) {
+                    uni.showToast({
+                        title: '请输入正确的手机号码',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                if (!this.formData.invite_code_other) {
+                    uni.showToast({
+                        title: '请输入邀请码',
+                        icon: 'none'
+                    });
+                    return resolve(false);
+                }
+                
+                // 验证邀请码的有效性状态
+                if (this.inviteCodeValidating) {
+                    uni.showToast({ title: '邀请码验证中，请稍候', icon: 'none' });
+                    return resolve(false);
+                }
+
+                if (this.formData.invite_code_other === '13131313') {
+                    // 特殊跳过判断
+                } else if (this.inviteCodeError || !this.inviterInfo) {
+                    this.triggerInviteErrorShake();
+                    return resolve(false);
+                }
+
+                // 挂载 resolve，在确认弹窗触发后再予以抛出
+                this.confirmResolve = resolve;
+
+                if (this.formData.invite_code_other === '13131313') {
+                    this.showInviteConfirmPopup({ invite_code_other: '13131313', name: '暂无邀请人' });
+                } else if (this.inviterInfo && this.formData.invite_code_other) {
+                    this.showInviteConfirmPopup(this.inviterInfo);
+                } else {
+                    this.saveFormDataToLocal();
+                    resolve(true);
+                }
+            });
+        },
+
+        setContactType(type) {
+            this.$set(this.formData, 'contact_type', type);
+            this.saveFormDataToLocal();
+        },
+
+        showTipPopup(field) {
+            const tipConfig = {
+                'name': {
+                    title: '如何查看店铺名称',
+                    image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23'
+                }
+            };
+
+            if (tipConfig[field]) {
+                this.currentTipType = field;
+                this.tipTitle = tipConfig[field].title;
+                this.tipImage = tipConfig[field].image;
+                this.showTipPopupFlag = true;
+            }
+        },
+
+        hideTipPopup() {
+            this.showTipPopupFlag = false;
+        },
+
+        showLocationPopup() {
+            this.showLocationPopupFlag = true;
+        },
+
+        hideLocationPopup() {
+            this.showLocationPopupFlag = false;
+        },
+
+        bindChangeLocation(e) {
+            this.locationValue = e.detail.value;
+            let index1 = e.detail.value[0] || 0;
+            let index2 = e.detail.value[1] || 0;
+            this.locatinCitys = this.ChinaCitys[index1].citys;
+            this.locationAreas = this.locatinCitys[index2].areas;
+        },
+
+        confirmLocationSelect() {
+            let valueArr = this.locationValue;
+            let index1 = valueArr[0] || 0;
+            let index2 = valueArr[1] || 0;
+            let index3 = valueArr[2] || 0;
+            let province = this.ChinaCitys[index1].province;
+            let city = this.locatinCitys[index2].city;
+            let area = this.locationAreas[index3].area;
+            this.formData.dependency = province + '-' + city + '-' + area;
+
+            this.formData.address = '';
+            this.formData.longitude = '';
+            this.formData.latitude = '';
+
+            if (this.ChinaCitys[index1] && this.ChinaCitys[index1].code) {
+                let provinceCode = this.ChinaCitys[index1].code.toString();
+                this.formData.dependency_province = provinceCode.substring(0, 6);
+            }
+            if (this.locatinCitys[index2] && this.locatinCitys[index2].code) {
+                let cityCode = this.locatinCitys[index2].code.toString();
+                this.formData.dependency_city = cityCode.substring(0, 6);
+            }
+            if (this.locationAreas[index3] && this.locationAreas[index3].code) {
+                let areaCode = this.locationAreas[index3].code.toString();
+                this.formData.dependency_code = areaCode.substring(0, 6);
+            }
+
+            this.saveFormDataToLocal();
+            this.hideLocationPopup();
+        },
+
+        buildRegionTextForSearch() {
+            const dependency = String(this.formData.dependency || '').trim();
+            if (!dependency) return '';
+
+            const parts = dependency.split('-');
+            const province = parts[0] || '';
+            const city = parts[1] || '';
+            const district = parts[2] || '';
+
+            let regionText = '';
+            if (province) regionText += province;
+            if (city && city !== province) regionText += city;
+            if (district) regionText += district;
+
+            return regionText;
+        },
+
+        getAddressValueForSearch() {
+            const rawAddress = String(this.formData.address || '').trim();
+            if (!rawAddress) return '';
+
+            const dependencyText = String(this.formData.dependency || '').trim();
+            const regionText = this.buildRegionTextForSearch();
+
+            let detail = rawAddress;
+
+            if (regionText && detail.indexOf(regionText) === 0) {
+                detail = detail.slice(regionText.length).trim();
+            } else if (dependencyText && detail.indexOf(dependencyText) === 0) {
+                detail = detail.slice(dependencyText.length).trim();
+            }
+
+            detail = detail.replace(/^[\s,-]+/, '').trim();
+
+            return detail || rawAddress;
+        },
+
+        getAddressInfo() {
+            this.saveFormDataToLocal();
+
+            const dependency = String(this.formData.dependency || '').trim();
+            const dependencyCode = String(this.formData.dependency_code || '').trim();
+            const address = this.getAddressValueForSearch();
+            const longitude = String(this.formData.longitude || '').trim();
+            const latitude = String(this.formData.latitude || '').trim();
+
+            const hasDependency = !!dependency;
+            const hasAddress = !!address;
+            const hasLocation = !!(longitude && latitude);
+
+            let params = 'source=sj_info';
+
+            if (hasDependency) {
+                params += `&dependency=${encodeURIComponent(dependency)}`;
+                if (dependencyCode) {
+                    params += `&dependency_code=${dependencyCode}`;
+                }
+            }
+
+            if (hasAddress) {
+                params += `&address=${encodeURIComponent(address)}`;
+            }
+
+            if (hasLocation) {
+                params += `&longitude=${longitude}&latitude=${latitude}`;
+            }
+
+            if (!hasDependency && !hasAddress && !hasLocation) {
+                params += '&init_current_location=1&silent_locate=1';
+            }
+
+            uni.navigateTo({
+                url: `/pages/address/search?${params}`
+            });
+        },
+
+        setupAddressListener() {
+            this.addressListener = (addressData) => {
+                this.handleAddressSelected(addressData);
+            };
+            this.sjAddressListener = (addressData) => {
+                this.handleAddressSelected(addressData);
+            };
+            uni.$on('address-selected', this.addressListener);
+            uni.$on('address-selected-for-sj', this.sjAddressListener);
+        },
+
+        checkAddressData() {
+            try {
+                const storedAddress = uni.getStorageSync('sj_selected_address');
+                if (storedAddress) {
+                    this.handleAddressSelected(storedAddress);
+                    uni.removeStorageSync('sj_selected_address');
+                    return;
+                }
+            } catch (e) { }
+
+            if (getApp().globalData && getApp().globalData.selectedAddress) {
+                this.handleAddressSelected(getApp().globalData.selectedAddress);
+                delete getApp().globalData.selectedAddress;
+            }
+
+            try {
+                const selectedAddress = uni.getStorageSync('selectedAddress');
+                if (selectedAddress) {
+                    this.handleAddressSelected(selectedAddress);
+                    uni.removeStorageSync('selectedAddress');
+                }
+            } catch (e) { }
+        },
+
+        handleAddressSelected(addressData) {
+            if (!addressData) return;
+
+            let detailAddress = '';
+            if (addressData.address) {
+                detailAddress = String(addressData.address).trim();
+            } else if (addressData.name) {
+                detailAddress = String(addressData.name).trim();
+
+                const regionParts = [];
+                if (addressData.pname) regionParts.push(addressData.pname);
+                if (addressData.cityname && addressData.cityname !== addressData.pname) regionParts.push(addressData
+                    .cityname);
+                if (addressData.adname) regionParts.push(addressData.adname);
+
+                const regionText = regionParts.join('');
+
+                if (regionText && detailAddress.indexOf(regionText) === 0) {
+                    detailAddress = detailAddress.slice(regionText.length).trim();
+                }
+
+                detailAddress = detailAddress.replace(/^[\s,-]+/, '').trim();
+            }
+
+            this.formData.address = detailAddress;
+
+            if (addressData.location) {
+                const [longitude, latitude] = String(addressData.location).split(',');
+                this.formData.longitude = longitude || '';
+                this.formData.latitude = latitude || '';
+            }
+
+            if (addressData.pname || addressData.cityname || addressData.adname) {
+                const locationParts = [];
+                if (addressData.pname) locationParts.push(addressData.pname);
+                if (addressData.cityname) locationParts.push(addressData.cityname);
+                if (addressData.adname) locationParts.push(addressData.adname);
+                this.formData.dependency = locationParts.join('-');
+            }
+
+            this.formData.dependency_province = addressData.provinceCode || '';
+            this.formData.dependency_city = addressData.cityCode || '';
+            this.formData.dependency_code = addressData.districtCode || '';
+
+            this.saveFormDataToLocal();
+            this.$forceUpdate();
+        }
+    }
 }
 </script>
 
 <style scoped>
+/* 继承你以前的所有原有样式 */
 .qualification-page {}
 
 .section {
-	margin-bottom: 30rpx;
+    margin-bottom: 30rpx;
 }
 
 .section-title {
-	display: flex;
-	align-items: center;
-	margin-bottom: 30rpx;
+    display: flex;
+    align-items: center;
+    margin-bottom: 30rpx;
 }
 
 .title-bar {
-	width: 6rpx;
-	height: 30rpx;
-	background-color: #FF4767;
-	margin-right: 7rpx;
-	border-radius: 5rpx;
+    width: 6rpx;
+    height: 30rpx;
+    background-color: #FF4767;
+    margin-right: 7rpx;
+    border-radius: 5rpx;
 }
 
 .title-text {
-	font-family: PingFangSC, PingFang SC;
-	font-weight: 500;
-	font-size: 32rpx;
-	color: #1D2129;
-	line-height: 48rpx;
-	text-align: left;
-	font-style: normal;
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #1D2129;
+    line-height: 48rpx;
+    text-align: left;
+    font-style: normal;
 }
 
 .section-title text {
-	font-size: 36rpx;
-	color: #1D2129;
-	font-weight: 500;
+    font-size: 36rpx;
+    color: #1D2129;
+    font-weight: 500;
 }
 
 .box-cont {
-	background: #FFFFFF;
-	border-radius: 20rpx;
-	margin-bottom: 24rpx;
-	margin-left: 8rpx;
-	margin-right: 8rpx;
-	box-shadow: none;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    margin-bottom: 24rpx;
+    margin-left: 8rpx;
+    margin-right: 8rpx;
+    box-shadow: none;
 }
 
 .form-item {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 24rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24rpx;
 }
 
 .form-item-one {
-	display: flex;
-	align-items: center;
-	padding: 24rpx;
+    display: flex;
+    align-items: center;
+    padding: 24rpx;
 }
 
 .form-item-two {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 24rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24rpx;
 }
 
 .form-item-two>text.label {
-	flex-shrink: 0;
-	font-size: 28rpx;
-	color: #333333;
-	font-weight: 500;
+    flex-shrink: 0;
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
 }
 
 .invite-code-top {
-	display: flex;
-	align-items: center;
-	padding: 24rpx;
-	width: 100%;
-	box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    padding: 24rpx;
+    width: 100%;
+    box-sizing: border-box;
 }
 
 .label-wrapper {
-	display: inline-flex;
-	align-items: center;
+    display: inline-flex;
+    align-items: center;
 }
 
 .label {
-	font-size: 28rpx;
-	color: #333333;
-	font-weight: 500;
-	line-height: 1;
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+    line-height: 1;
 }
 
 .label-icon {
-	width: 26rpx;
-	height: 26rpx;
-	margin-left: 8rpx;
-	align-items: center;
+    width: 26rpx;
+    height: 26rpx;
+    margin-left: 8rpx;
+    align-items: center;
 }
 
 .required::before {
-	content: '*';
-	color: #FF0000;
-	margin-right: 4rpx;
+    content: '*';
+    color: #FF0000;
+    margin-right: 4rpx;
 }
 
 .picker-content {
-	display: flex;
-	align-items: center;
-	justify-content: flex-end;
-	flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    flex: 1;
 }
 
 .picker-content text {
-	margin-right: 19rpx;
+    margin-right: 19rpx;
 }
 
 .arrow-right {
-	width: 14rpx;
-	height: 26rpx;
+    width: 14rpx;
+    height: 26rpx;
 }
 
 .placeholder {
-	color: #999999;
-	font-size: 28rpx;
+    color: #999999;
+    font-size: 28rpx;
 }
 
 .picker-value {
-	font-size: 28rpx;
-	color: #333333;
+    font-size: 28rpx;
+    color: #333333;
 }
 
 .input {
-	flex: 1;
-	font-size: 28rpx;
-	color: #333333;
-	text-align: right;
-	margin-left: 20rpx;
+    flex: 1;
+    font-size: 28rpx;
+    color: #333333;
+    text-align: right;
+    margin-left: 20rpx;
 }
 
 .radio-group {
-	display: flex;
+    display: flex;
 }
 
 .radio-item {
-	display: flex;
-	align-items: center;
-	margin-right: 130rpx;
+    display: flex;
+    align-items: center;
+    margin-right: 130rpx;
 }
 
 .radio {
-	width: 30rpx;
-	height: 30rpx;
-	border: 2rpx solid #DDDDDD;
-	border-radius: 50%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	margin-right: 16rpx;
+    width: 30rpx;
+    height: 30rpx;
+    border: 2rpx solid #DDDDDD;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 16rpx;
 }
 
 .radio.checked {
-	background-color: #FF4767;
-	border-color: #FF4767;
+    background-color: #FF4767;
+    border-color: #FF4767;
 }
 
 .radio-icon-image {
-	width: 32rpx;
-	height: 32rpx;
+    width: 32rpx;
+    height: 32rpx;
 }
 
 .radio-label {
-	font-size: 28rpx;
-	color: #333333;
+    font-size: 28rpx;
+    color: #333333;
 }
 
 .invite-tip {
-	padding: 24rpx;
+    padding: 24rpx;
 }
 
 .invite-tip-text {
-	font-size: 26rpx;
-	color: #999999;
-	line-height: 40rpx;
+    font-size: 26rpx;
+    color: #999999;
+    line-height: 40rpx;
 }
 
 .popup {
-	position: fixed;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	z-index: 999;
-	visibility: hidden;
-	opacity: 0;
-	transition: all 0.3s ease;
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 999;
+    visibility: hidden;
+    opacity: 0;
+    transition: all 0.3s ease;
 }
 
 .popup.show {
-	visibility: visible;
-	opacity: 1;
+    visibility: visible;
+    opacity: 1;
 }
 
 .popup-mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background-color: rgba(0, 0, 0, 0.5);
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.5);
 }
 
 .popup-content {
-	position: relative;
-	background-color: #FFFFFF;
-	border-radius: 24rpx 24rpx 0 0;
-	padding: 32rpx;
-	transform: translateY(100%);
-	transition: transform 0.3s ease;
-	max-height: 70vh;
+    position: relative;
+    background-color: #FFFFFF;
+    border-radius: 24rpx 24rpx 0 0;
+    padding: 32rpx;
+    transform: translateY(100%);
+    transition: transform 0.3s ease;
+    max-height: 70vh;
 }
 
 .popup.show .popup-content {
-	transform: translateY(0);
+    transform: translateY(0);
 }
 
 .popup-header {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-bottom: 32rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 32rpx;
 }
 
 .popup-title {
-	font-size: 32rpx;
-	color: #333333;
-	font-weight: 500;
+    font-size: 32rpx;
+    color: #333333;
+    font-weight: 500;
 }
 
 .popup-close {
-	font-size: 40rpx;
-	color: #999999;
-	padding: 16rpx;
+    font-size: 40rpx;
+    color: #999999;
+    padding: 16rpx;
 }
 
 .popup-footer {
-	margin-top: 32rpx;
-	display: flex;
-	justify-content: space-between;
-	gap: 20rpx;
-	padding: 0 24rpx 24rpx;
+    margin-top: 32rpx;
+    display: flex;
+    justify-content: space-between;
+    gap: 20rpx;
+    padding: 0 24rpx 24rpx;
 }
 
 .popup-btn {
-	flex: 1;
-	height: 88rpx;
-	border-radius: 44rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+    flex: 1;
+    height: 88rpx;
+    border-radius: 44rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
 }
 
 .popup-btn.cancel {
-	background-color: #F5F5F5;
+    background-color: #F5F5F5;
 }
 
 .popup-btn.confirm {
-	background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+    background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
 }
 
 .popup-btn .btn-text {
-	font-size: 32rpx;
-	font-weight: 500;
-	color: #FFFFFF;
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #FFFFFF;
 }
 
 .popup-btn.cancel .btn-text {
-	color: #666666;
+    color: #666666;
 }
 
 .popup-btn.confirm .btn-text {
-	color: #FFFFFF;
+    color: #FFFFFF;
 }
 
 .region-body {
-	height: 400rpx;
+    height: 400rpx;
 }
 
 .picker-scroll {
-	height: 400rpx;
+    height: 400rpx;
 }
 
 .picker-item {
-	height: 68rpx;
-	line-height: 68rpx;
-	text-align: center;
-	font-size: 28rpx;
+    height: 68rpx;
+    line-height: 68rpx;
+    text-align: center;
+    font-size: 28rpx;
 }
 
 .tip-popup {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	z-index: 1000;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	visibility: hidden;
-	opacity: 0;
-	transition: all 0.3s ease;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    visibility: hidden;
+    opacity: 0;
+    transition: all 0.3s ease;
 }
 
 .tip-popup.show {
-	visibility: visible;
-	opacity: 1;
+    visibility: visible;
+    opacity: 1;
 }
 
 .tip-popup-mask {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background-color: rgba(0, 0, 0, 0.5);
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.5);
 }
 
 .tip-popup-content {
-	position: relative;
-	width: 620rpx;
-	height: 810rpx;
+    position: relative;
+    width: 620rpx;
+    height: 810rpx;
 }
 
 .tip-popup-bg {
-	width: 620rpx;
-	height: 810rpx;
-	position: absolute;
-	top: 0;
-	left: 0;
+    width: 620rpx;
+    height: 810rpx;
+    position: absolute;
+    top: 0;
+    left: 0;
 }
 
 .tip-popup-body {
-	position: relative;
-	flex-direction: column;
-	padding: 80rpx 20rpx 40rpx 20rpx;
-	box-sizing: border-box;
+    position: relative;
+    flex-direction: column;
+    padding: 80rpx 20rpx 40rpx 20rpx;
+    box-sizing: border-box;
 }
 
 .tip-title {
-	font-size: 36rpx;
-	font-weight: bold;
-	color: #333;
-	text-align: center;
-	margin-top: 107rpx;
-	margin-bottom: 37rpx;
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333;
+    text-align: center;
+    margin-top: 107rpx;
+    margin-bottom: 37rpx;
 }
 
 .tip-image-container {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	margin-bottom: 50rpx;
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 50rpx;
 }
 
 .tip-image {
-	width: 90%;
-	max-height: 400rpx;
+    width: 90%;
+    max-height: 400rpx;
 }
 
 .tip-buttons {
-	display: flex;
-	justify-content: space-between;
-	padding: 0 28rpx;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 28rpx;
 }
 
 .tip-btn {
-	width: 250rpx;
-	height: 80rpx;
-	border-radius: 40rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 32rpx;
-	font-weight: 500;
+    width: 250rpx;
+    height: 80rpx;
+    border-radius: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    font-weight: 500;
 }
 
 .tip-btn.cancel {
-	border: #FF4767 2rpx solid;
-	background-color: transparent;
-	color: #FF4767;
+    border: #FF4767 2rpx solid;
+    background-color: transparent;
+    color: #FF4767;
 }
 
 .tip-btn.confirm {
-	background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
-	color: #FFFFFF;
+    background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+    color: #FFFFFF;
 }
 
 .tip-btn .btn-text {
-	color: inherit;
+    color: inherit;
 }
 
 .invite-info-container {
-	padding: 20rpx 24rpx;
-	width: 100%;
-	box-sizing: border-box;
-	min-height: 60rpx;
+    padding: 20rpx 24rpx;
+    width: 100%;
+    box-sizing: border-box;
+    min-height: 60rpx;
 }
 
 .invite-tip {
-	font-size: 24rpx;
-	color: #666666;
+    font-size: 24rpx;
+    color: #666666;
 }
 
 .invite-validating {
-	font-size: 20rpx;
-	color: #999999;
+    font-size: 20rpx;
+    color: #999999;
 }
 
 .invite-error {
-	font-size: 24rpx;
-	color: #FF4767;
+    font-size: 24rpx;
+    color: #FF4767;
 }
 
 .inviter-info {
-	display: flex;
-	align-items: center;
-	font-size: 20rpx;
+    display: flex;
+    align-items: center;
+    font-size: 20rpx;
 }
 
 .inviter-label {
-	color: #666666;
+    color: #666666;
 }
 
 .inviter-name {
-	color: #333333;
-	font-weight: 500;
+    color: #333333;
+    font-weight: 500;
 }
 
 .inviter-divider {
-	color: #666666;
-	margin: 0 5rpx;
+    color: #666666;
+    margin: 0 5rpx;
 }
 
 .inviter-phone {
-	color: #666666;
+    color: #666666;
+}
+
+/* 邀请码和禁用样式 */
+/* 输入框禁用样式 */
+.input:disabled {
+  color: #999999;
+  background-color: #F5F5F5;
+}
+
+/* 邀请码确认弹窗样式 */
+.invite-popup-content {
+  width: 571rpx;
+  height: 535rpx;
+  background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6f130301-f3df-467c-8a1c-dc49f85e5295.png');
+  background-size: cover;
+  background-position: center;
+  border-radius: 30rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 40rpx;
+  box-sizing: border-box;
+}
+
+.invite-popup-header {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 40rpx;
+}
+
+.invite-popup-title {
+  font-size: 36rpx;
+  font-weight: 500;
+  color: #333333;
+}
+
+.invite-popup-body {
+  flex: 1;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 24rpx;
+  margin-top: 20rpx;
+}
+
+.invite-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx;
+  background-color: rgba(255, 255, 255, 0.9);
+  border-radius: 16rpx;
+}
+
+.invite-label {
+  font-size: 28rpx;
+  color: #666666;
+}
+
+.invite-value {
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.invite-popup-footer {
+  width: 100%;
+  display: flex;
+  gap: 20rpx;
+  margin-top: 40rpx;
+}
+
+.invite-btn {
+  flex: 1;
+  height: 88rpx;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  font-weight: 500;
+  margin: 0 5rpx;
+}
+
+.invite-btn.cancel {
+  background-color: #FFFFFF;
+  color: #FC437C;
+  border: 2rpx solid #FC437C;
+}
+
+.invite-btn.confirm {
+  background: linear-gradient(90deg, #FC437C 0%, #FF618F 100%);
+  color: #FFFFFF;
 }
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 41efe32..f11b01a 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -101,354 +101,353 @@
 	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) {
-			console.log(options, 'options---');
-			if (options.type == 1) {
-				this.currentStep = 4
-			}
+    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) {
+            console.log(options, 'options---');
+            if (options.type == 1) {
+                this.currentStep = 4
+            }
 
-			// 如果首页传了 step 参数，就直接空降到对应的流程
-			if (options.step) {
-				this.currentStep = Number(options.step);
-			}
+            // 如果首页传了 step 参数，就直接空降到对应的流程
+            if (options.step) {
+                this.currentStep = Number(options.step);
+            }
 
-			this.identity = 2;
-			await this.getUserInfoSync()
-			// 确保子组件也能访问到 identity
-			this.getXieyi(1);
-		},
+            this.identity = 2;
+            await this.getUserInfoSync()
+            // 确保子组件也能访问到 identity
+            this.getXieyi(1);
+        },
 
-		onShow() {
-			console.log('入驻页面 onShow - 检查地址数据');
-			// 检查商家地址数据
-			this.checkAndPassAddressToSj();
-		},
+        onShow() {
+            console.log('入驻页面 onShow - 检查地址数据');
+            // 检查商家地址数据
+            this.checkAndPassAddressToSj();
+        },
 
-		methods: {
-			topt() {
-				uni.switchTab({
-					url: '/pages/home/home'
-				})
-			},
-			// 获取用户信息（复用不可服务时间页面的方法）
-			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) {
+        methods: {
+            topt() {
+                uni.switchTab({
+                    url: '/pages/home/home'
+                })
+            },
+            // 获取用户信息（复用不可服务时间页面的方法）
+            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 || '',
+                            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,
+                                "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);
-						}
+                                "apply_state": data.apply_state,
+                                "invite_code_other": data.invite_code_other,
+                                "major": data.major
+                            }
+                            console.log(111111111, store_info_form_data)
+                            uni.setStorageSync('store_info_form_data', store_info_form_data);
+                        }
 
-					}
-				}).catch(error => {
-					console.error('获取用户信息接口错误:', error);
-				});
-			},
-			// 检查并传递地址给商家组件
-			checkAndPassAddressToSj() {
-				try {
-					const sjAddress = uni.getStorageSync('sj_selected_address');
-					if (sjAddress) {
-						console.log('找到商家地址数据，准备传递:', sjAddress);
+                    }
+                }).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);
-				}
-			},
+                        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('步骤切换时发现地址数据，传递给组件');
+            // 新增方法：检查并传递地址数据
+            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();
-						}
+                        // 传递给组件
+                        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);
-				}
-			},
+                        // 清理
+                        uni.removeStorageSync('syr_selected_address');
+                    }
+                } catch (e) {
+                    console.error('检查地址数据失败:', e);
+                }
+            },
 
-			// 检查用户信息
-			checkUserInfo() {
-				console.log('检查用户信息...');
+            // 检查用户信息
+            checkUserInfo() {
+                console.log('检查用户信息...');
 
-				// 从多种可能的存储位置检查用户信息
-				const sources = [{
-						name: '本地存储-userInfo',
-						data: uni.getStorageSync('userInfo')
-					},
-					{
-						name: '本地存储-loginInfo',
-						data: uni.getStorageSync('loginInfo')
-					},
-					{
-						name: '本地存储-token',
-						data: uni.getStorageSync('token')
-					}
-				];
+                // 从多种可能的存储位置检查用户信息
+                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);
-				});
+                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'
-					});
-				}
-			},
+                // 检查是否有token（确认登录状态）
+                const token = uni.getStorageSync('token');
+                if (!token) {
+                    console.warn('未检测到登录token');
+                    uni.showToast({
+                        title: '请先登录',
+                        icon: 'none'
+                    });
+                }
+            },
 
-			// 获取用户信息（复用不可服务时间页面的方法）
-			getUserInfo() {
-				return new Promise((resolve, reject) => {
-					request.post('/sj/User/getUser', {
-						type: 1
-					}).then(result => {
-						if (result.state == 1) {
-							// 保存用户信息到全局数据和本地存储
-							uni.setStorageSync('userInfo', result.data);
-							console.log('用户信息获取成功:', result.data);
-							resolve(result.data);
-						} else {
-							console.error('获取用户信息失败:', result.msg);
-							reject(result.msg);
-						}
-					}).catch(error => {
-						console.error('获取用户信息接口错误:', error);
-						reject(error);
-					});
-				});
-			},
+            // 获取用户信息（复用不可服务时间页面的方法）
+            getUserInfo() {
+                return new Promise((resolve, reject) => {
+                    request.post('/sj/User/getUser', {
+                        type: 1
+                    }).then(result => {
+                        if (result.state == 1) {
+                            // 保存用户信息到全局数据和本地存储
+                            uni.setStorageSync('userInfo', result.data);
+                            console.log('用户信息获取成功:', result.data);
+                            resolve(result.data);
+                        } else {
+                            console.error('获取用户信息失败:', result.msg);
+                            reject(result.msg);
+                        }
+                    }).catch(error => {
+                        console.error('获取用户信息接口错误:', error);
+                        reject(error);
+                    });
+                });
+            },
 
-			// 检查并获取用户信息
-			async checkAndGetUserInfo() {
-				// 先检查是否已有用户信息
-				const existingUserInfo = uni.getStorageSync('userInfo');
-				if (existingUserInfo && existingUserInfo.account) {
-					console.log('已有用户信息:', existingUserInfo);
-					return existingUserInfo;
-				}
+            // 检查并获取用户信息
+            async checkAndGetUserInfo() {
+                // 先检查是否已有用户信息
+                const existingUserInfo = uni.getStorageSync('userInfo');
+                if (existingUserInfo && existingUserInfo.account) {
+                    console.log('已有用户信息:', existingUserInfo);
+                    return existingUserInfo;
+                }
 
-				// 如果没有，则调用接口获取
-				try {
-					const userInfo = await this.getUserInfo();
-					return userInfo;
-				} catch (error) {
-					console.error('获取用户信息失败:', error);
-					uni.showModal({
-						title: '提示',
-						content: '获取用户信息失败，请重新登录',
-						showCancel: false,
-						success: () => {
-							uni.navigateTo({
-								url: '/pages/login/login'
-							});
-						}
-					});
-					return null;
-				}
-			},
+                // 如果没有，则调用接口获取
+                try {
+                    const userInfo = await this.getUserInfo();
+                    return userInfo;
+                } catch (error) {
+                    console.error('获取用户信息失败:', error);
+                    uni.showModal({
+                        title: '提示',
+                        content: '获取用户信息失败，请重新登录',
+                        showCancel: false,
+                        success: () => {
+                            uni.navigateTo({
+                                url: '/pages/login/login'
+                            });
+                        }
+                    });
+                    return null;
+                }
+            },
 
-			// 审核提交方法
-			async submitForReview() {
-				const userInfo = await this.checkAndGetUserInfo();
-				if (!userInfo) {
-					return;
-				}
+            // 审核提交方法
+            async submitForReview() {
+                const userInfo = await this.checkAndGetUserInfo();
+                if (!userInfo) {
+                    return;
+                }
 
-				uni.showLoading({
-					title: '提交中...'
-				});
+                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();
+                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'
-					});
-				}
-			},
+                    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);
+            // 构建商家数据
+            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.uscc_type) {
+                    formData.uscc_type = qualificationData.uscc_type;
+                }
 				// if (qualificationData.contact_identity) {
 				// 	formData.contact_identity = qualificationData.contact_identity;
 				// }
 				// if (qualificationData.contact_name) {
 				// 	formData.contact_name = qualificationData.contact_name;
 				// }
-				if (qualificationData.contact_phone) {
-					formData.contact_phone = qualificationData.contact_phone;
-				}
-				if (qualificationData.backup_phone) {
-					formData.backup_phone = qualificationData.backup_phone;
-				}
-				if (qualificationData.contact_type) {
-					formData.contact_type = qualificationData.contact_type;
-				}
-				if (qualificationData.invite_code_other) {
-					formData.invite_code_other = qualificationData.invite_code_other;
-				}
-				if (qualificationData.contact_name) {
-					formData.contact_name = qualificationData.contact_name;
-				}
+                if (qualificationData.contact_phone) {
+                    formData.contact_phone = qualificationData.contact_phone;
+                }
+                if (qualificationData.backup_phone) {
+                    formData.backup_phone = qualificationData.backup_phone;
+                }
+                if (qualificationData.contact_type) {
+                    formData.contact_type = qualificationData.contact_type;
+                }
+                if (qualificationData.invite_code_other) {
+                    formData.invite_code_other = qualificationData.invite_code_other;
+                }
+                if (qualificationData.contact_name) {
+                    formData.contact_name = qualificationData.contact_name;
+                }
 
-				if (qualificationData.dependency) {
-					formData.dependency = qualificationData.dependency;
-				}
-				if (qualificationData.dependency_code) {
-					formData.dependency_code = qualificationData.dependency_code;
-				}
-				if (qualificationData.dependency_province) {
-					formData.dependency_province = qualificationData.dependency_province;
-				}
-				if (qualificationData.dependency_city) {
-					formData.dependency_city = qualificationData.dependency_city;
-				}
-				if (qualificationData.name) {
-					formData.name = qualificationData.name;
-				}
-				if (qualificationData.address) {
-					formData.address = qualificationData.address;
-				}
-				if (qualificationData.longitude) formData.longitude = qualificationData.longitude;
-				if (qualificationData.latitude) formData.latitude = qualificationData.latitude;
+                if (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) ?
@@ -456,364 +455,367 @@
 				// } 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;
-				}
+                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;
-					}
-				}
+                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;
+                return formData;
 
-			},
+            },
 
-			async goNext() {
-				if (this.currentStep === 0 && !this.isAgree) {
-					uni.showToast({
-						title: '请阅读并同意以上协议',
-						icon: 'none'
-					});
-					return;
-				}
+            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 === 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);
-				}
-			},
+                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();
-				}
+            async submitApplication() {
+                if (this.$refs.storeInfo) {
+                    // 增加了 await 进行异步表单验证，等待弹窗确认结果
+                    const isValid = await this.$refs.storeInfo.saveFormData();
+                    if (!isValid) {
+                        return;
+                    }
+                    this.storeInfoData = this.$refs.storeInfo.getFormData();
+                }
 
-				uni.showLoading({
-					title: '提交中...'
-				});
-				try {
-					const formData = this.buildBusinessData(this.qualificationData, this.storeInfoData);
-					if (!formData) {
-						uni.hideLoading();
-						return;
-					}
-					formData.type = 1;
-					formData.id_type = 1;
-					console.log(formData, '-----------');
-					if (formData.legal_idcard_expiry_start && formData.legal_idcard_expiry_end) {
-						formData.legal_idcard_expiry =
-							formData.legal_idcard_expiry_end === '长久有效' ?
-							`${formData.legal_idcard_expiry_start} —— 长久` :
-							`${formData.legal_idcard_expiry_start} —— ${formData.legal_idcard_expiry_end}`;
-					}
-					delete formData.legal_idcard_expiry_start
-					delete formData.legal_idcard_expiry_end
-					delete formData.contact_phone
-					delete formData.contact_type
-					delete formData.contact_name
-					delete formData.invite_code_other
-					if (Array.isArray(formData.qualifications_sector)) {
-						formData.qualifications_sector = JSON.stringify(formData.qualifications_sector);
-					}
-					if (Array.isArray(formData.qualifications_other)) {
-						formData.qualifications_other = JSON.stringify(formData.qualifications_other);
-					}
-					console.log(formData, 'formData请求参数');
-					const res = await request.post('/sj/userSjAuth/apply', formData);
-					uni.hideLoading();
-					if (res.state == 1 || res.code == 200) {
-						this.successData = res.data ? (res.data.customer_service || {}) : {};
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none'
-						});
-						setTimeout(() => {
-							this.currentStep = 4;
-						}, 1500);
-					} else {
-						uni.showToast({
-							title: res.msg || '提交失败了',
-							icon: 'none'
-						});
-					}
-				} catch (error) {
-					console.error('提交失败：', error);
-					uni.hideLoading();
-					uni.showToast({
-						title: '提交失败，请重试',
-						icon: 'none'
-					});
-				}
-			},
+                uni.showLoading({
+                    title: '提交中...'
+                });
+                try {
+                    const formData = this.buildBusinessData(this.qualificationData, this.storeInfoData);
+                    if (!formData) {
+                        uni.hideLoading();
+                        return;
+                    }
+                    formData.type = 1;
+                    formData.id_type = 1;
+                    console.log(formData, '-----------');
+                    if (formData.legal_idcard_expiry_start && formData.legal_idcard_expiry_end) {
+                        formData.legal_idcard_expiry =
+                            formData.legal_idcard_expiry_end === '长久有效' ?
+                            `${formData.legal_idcard_expiry_start} —— 长久` :
+                            `${formData.legal_idcard_expiry_start} —— ${formData.legal_idcard_expiry_end}`;
+                    }
+                    delete formData.legal_idcard_expiry_start
+                    delete formData.legal_idcard_expiry_end
+                    delete formData.contact_phone
+                    delete formData.contact_type
+                    delete formData.contact_name
+                    delete formData.invite_code_other
+                    if (Array.isArray(formData.qualifications_sector)) {
+                        formData.qualifications_sector = JSON.stringify(formData.qualifications_sector);
+                    }
+                    if (Array.isArray(formData.qualifications_other)) {
+                        formData.qualifications_other = JSON.stringify(formData.qualifications_other);
+                    }
+                    console.log(formData, 'formData请求参数');
+                    const res = await request.post('/sj/userSjAuth/apply', formData);
+                    uni.hideLoading();
+                    if (res.state == 1 || res.code == 200) {
+                        this.successData = res.data ? (res.data.customer_service || {}) : {};
+                        uni.showToast({
+                            title: '提交成功',
+                            icon: 'none'
+                        });
+                        setTimeout(() => {
+                            this.currentStep = 4;
+                        }, 1500);
+                    } else {
+                        uni.showToast({
+                            title: res.msg || '提交失败了',
+                            icon: 'none'
+                        });
+                    }
+                } catch (error) {
+                    console.error('提交失败：', error);
+                    uni.hideLoading();
+                    uni.showToast({
+                        title: '提交失败，请重试',
+                        icon: 'none'
+                    });
+                }
+            },
 
-			goPrev() {
-				if (this.currentStep > 0) {
-					this.currentStep--;
-				}
-			},
-			scrollToTop() {
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 0
-				});
-			},
-			async getXieyi(type) {
-				this.loading = true;
-				this.error = null;
-				try {
-					const res = await request.post('/user/getsystemtext', {
-						type
-					});
-					this.textData = res.data;
-				} catch (err) {
-					console.error('获取协议失败:', err);
-					this.error = '获取协议内容失败，请重试';
-					uni.showToast({
-						title: '获取协议内容失败',
-						icon: 'none'
-					});
-				} finally {
-					this.loading = false;
-				}
-			},
-		}
-	}
+            goPrev() {
+                if (this.currentStep > 0) {
+                    this.currentStep--;
+                }
+            },
+            scrollToTop() {
+                uni.pageScrollTo({
+                    scrollTop: 0,
+                    duration: 0
+                });
+            },
+            async getXieyi(type) {
+                this.loading = true;
+                this.error = null;
+                try {
+                    const res = await request.post('/user/getsystemtext', {
+                        type
+                    });
+                    this.textData = res.data;
+                } catch (err) {
+                    console.error('获取协议失败:', err);
+                    this.error = '获取协议内容失败，请重试';
+                    uni.showToast({
+                        title: '获取协议内容失败',
+                        icon: 'none'
+                    });
+                } finally {
+                    this.loading = false;
+                }
+            },
+        }
+    }
 </script>
 
 <style>
-	.ruzhu-page {
-		background: #f5f5f5;
-	}
+/* ...与原来一致的代码... */
+    .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, #ff8e9d 0%, #FF4767 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, #ff8e9d 0%, #FF4767 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: #FF4767;
-		font-size: 36rpx;
-		font-weight: 500;
-	}
+    .prev-text {
+        color: #FF4767;
+        font-size: 36rpx;
+        font-weight: 500;
+    }
 
-	.button-row {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		width: 702rpx;
-		height: 147rpx;
-		gap: 20rpx;
-	}
+    .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;
-	}
+    .submit-text {
+        color: #ffffff;
+        font-size: 32rpx;
+        font-weight: 500;
+    }
 
-	.showziliao {
-		width: 690rpx;
-		height: 98rpx;
-		background: #FF4767;
-		border-radius: 49rpx;
-	}
+    .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;
-	}
+    .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/utils/request.js b/utils/request.js
index f0bec35..de82905 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -135,13 +135,13 @@ const request = async (options, isUpdate) => {
 
 	if (process.env.NODE_ENV === 'development') {
 		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。	
-		baseURL = 'http://116.63.163.121:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
-		//baseURL = 'http://116.63.163.121:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
+		baseURL = 'http://test.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。
+		//baseURL = 'http://dev.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'https://app.mrrweb.com.cn';
 	} else {
 		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
-		baseURL = 'http://116.63.163.121:93'; // 发布到生产环境时，此处代码会被摇树移除掉。	
-			//baseURL = 'http://116.63.163.121:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
+		baseURL = 'http://test.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。	
+			//baseURL = 'http://dev.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。
 		//baseURL = 'https://app.mrrweb.com.cn';
 
 		console.log('生产环境');

From 85fbbd099022a4c1d3f2183b067dbc6f801a5d2f Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 15:08:56 +0800
Subject: [PATCH 074/118] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 453d470..219e33b 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -341,6 +341,20 @@ export default {
     this.fetchBrandList();
     this.fetchSkillList();
   },
+  onPullDownRefresh() {
+    // 1. 重新请求首页需要的所有数据
+    if (this.isLogin) {
+      this.getUserInfo();
+    }
+    this.fetchNoticeList();
+    this.fetchBrandList();
+    this.fetchSkillList();
+
+    // 2. 停止下拉刷新的动画
+    setTimeout(() => {
+      uni.stopPullDownRefresh();
+    }, 500); 
+  },
   onLoad() {
     uni.hideTabBar();
   },

From 9610fe26797f6bb5d9d077b14c19f44f455e49d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Tue, 2 Jun 2026 15:23:41 +0800
Subject: [PATCH 075/118] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E6=94=B9=E7=89=88=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8E=E8=AF=B7=E6=B1=82=E5=B7=A5=E5=85=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artisan/profile.vue    | 2 +-
 pages/home/home.vue          | 4 ++--
 pages/ruzhu/successruzhu.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index bbf4a0c..99cc2d2 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -637,7 +637,7 @@
                     // === 1. 审核中 ===
                     // 跳转到最新确认的专属进度/客服二维码页面
                     uni.navigateTo({
-                        url: '/pages/ruzhu/submitres'
+                        url: '/pages/ruzhu/ruzhu?type=1'
                     });
                 } else if (state === 0) {
                     // === 2. 待完善 / 被驳回 ===
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 219e33b..93b14b9 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -395,7 +395,7 @@ export default {
       if (this.isUnderReview) {
         // === 查看进度 ===
         uni.navigateTo({ 
-          url: '/pages/ruzhu/submitres' 
+          url: '/pages/ruzhu/ruzhu?type=1' 
         });
       } else {
         // === 去认证 / 被驳回重新认证 ===
@@ -410,7 +410,7 @@ export default {
         uni.navigateTo({ url: '/pages/ruzhu/ruzhu' });
       } else if (this.isUnderReview) {
         // 如果在横幅里处于审核中，也送去进度页
-        uni.navigateTo({ url: '/pages/ruzhu/submitres' });
+        uni.navigateTo({ url: '/pages/ruzhu/ruzhu?type=1' });
       } else {
         // 已经开启入驻但没完成表单，继续去填表！
         this.navigateToForm();
diff --git a/pages/ruzhu/successruzhu.vue b/pages/ruzhu/successruzhu.vue
index b7a04db..e450ebc 100644
--- a/pages/ruzhu/successruzhu.vue
+++ b/pages/ruzhu/successruzhu.vue
@@ -35,7 +35,7 @@ export default {
 		async getCustomerService() {
 			try {
 				const res = await request.post('/sj/userSjAuth/getCustomerService');
-				console.log('客服接口返回：', JSON.stringify(res));
+				console.log('客服接口返回：', res);
 				if (res && (res.state == 1 || res.code == 200)) {
 					this.infoData = res.data || {};
 				}

From 55fd66f872496900e5834fc20d82b482a6a8060c Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 15:25:06 +0800
Subject: [PATCH 076/118] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/sj-info-change.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/shop/sj-info-change.vue b/pages/shop/sj-info-change.vue
index 924baf2..9cbdf31 100644
--- a/pages/shop/sj-info-change.vue
+++ b/pages/shop/sj-info-change.vue
@@ -336,7 +336,7 @@
                 console.log('开始获取用户信息...');
                 const type = 3;
 
-                request.post('/user/getuser', {
+                request.post('/sj/getuser', {
                     type
                 }).then(result => {
                     console.log('接口返回完整数据:', result);

From 45f6215e2fc3990c0e7f3e0c98aa04beec812557 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 15:46:40 +0800
Subject: [PATCH 077/118] 1

---
 pages/shop/sj-info-change.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/shop/sj-info-change.vue b/pages/shop/sj-info-change.vue
index 9cbdf31..ec44595 100644
--- a/pages/shop/sj-info-change.vue
+++ b/pages/shop/sj-info-change.vue
@@ -336,7 +336,7 @@
                 console.log('开始获取用户信息...');
                 const type = 3;
 
-                request.post('/sj/getuser', {
+                request.post('/sj/user/getuser', {
                     type
                 }).then(result => {
                     console.log('接口返回完整数据:', result);

From ceff1c73d6d467caafb34726a0af06cb914e903f Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 15:59:08 +0800
Subject: [PATCH 078/118] 1

---
 pages/home/home.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 93b14b9..d1fc9a5 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -97,7 +97,7 @@
           <text class="update-time">更新时间：{{ orderBasic.updateTime }}</text>
           <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png" @tap="fetchOrderNum"></image>
         </view>
-        <view class="header-right">更多数据 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image></view>
+        <view class="header-right" @tap="goToOrderList">更多数据 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image></view>
       </view>
       <view class="stats-content">
         <view class="stat-item">
@@ -590,6 +590,8 @@ export default {
       });
     },
 
+    
+
     // 跳转：通知详情页
     goToNotice(msg) {
       if(msg.id) { uni.navigateTo({ url: `/pages/notice/detail?id=${msg.id}` }); }
@@ -598,6 +600,10 @@ export default {
     goToNoticeList() {
       uni.navigateTo({ url: '/pages/notice/notice_list' });
     },
+    // 跳转：订单列表页
+    goToOrderList() {
+      uni.switchTab({ url: '/pages/order/userorder-list' });
+    },
 
     // 营业中 / 休息中 按钮逻辑判断
     toggleStatus() {

From ea6ad65b868a57ad7fbfc4c5ae22156295867f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Tue, 2 Jun 2026 16:14:19 +0800
Subject: [PATCH 079/118] =?UTF-8?q?=E5=85=A5=E4=BD=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/ruzhu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index f11b01a..e72ee37 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -110,7 +110,7 @@
         },
         data() {
             return {
-                currentStep: 0, // 当前步骤索引
+                currentStep: 1, // 当前步骤索引
                 isAgree: false,
                 identity: null,
                 textData: {},

From 753c9932aae0b0cc8c98dc61b8a92cc85e5bc6f6 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 18:21:35 +0800
Subject: [PATCH 080/118] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8+=E5=AF=8C=E6=96=87=E6=9C=AC=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/brand-detail.vue |  2 +-
 pages/my/myFavorite.vue         | 36 +++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pages/jingxuan/brand-detail.vue b/pages/jingxuan/brand-detail.vue
index e972eac..2fc93d5 100644
--- a/pages/jingxuan/brand-detail.vue
+++ b/pages/jingxuan/brand-detail.vue
@@ -72,7 +72,7 @@
     <view class="intro-section" v-if="info.name">
       <view class="section-title">品牌介绍</view>
       <view class="intro-content" :class="{ 'is-expanded': isExpanded }">
-        <text class="intro-text">{{ info.detail || '暂无品牌介绍' }}</text>
+        <text  v-html="info.detail || '暂无品牌介绍'" class="intro-text"></text>
       </view>
       <view class="expand-btn" @click="toggleExpand" v-if="info.detail && info.detail.length > 100">
         <text class="expand-text">{{ isExpanded ? '收起查看' : '展开查看' }}</text>
diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index d6274da..094dbde 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -332,13 +332,15 @@ export default {
     // ============ 真实接口调用 ============
     async fetchRealBrandList() {
       try {
-        const res = await request.post('/sj/brand/list', { page: 1, limit: 100 })
+        // 1. 接口路径换成真实的品牌收藏列表
+        const res = await request.post('/sj/brand/collectList', { page: 1, limit: 100 })
+        
         if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
-          const collectedBrands = res.data.list.filter(item => item.collect_state === 1)
-          this.rawBrandList = collectedBrands.map(item => {
+          // 2. 不需要前端再做 filter(item => item.collect_state === 1) 了，直接用！
+          this.rawBrandList = res.data.list.map(item => {
             let tags = []
-            if (item.franchise_state === 1) tags.push('franchise')
-            if (item.student_state === 1) tags.push('recruit')
+            if (item.franchise_state == 1) tags.push('franchise')
+            if (item.student_state == 1) tags.push('recruit')
             if (tags.length === 0) tags.push('more') 
             
             return {
@@ -347,33 +349,39 @@ export default {
               bgSrc: item.cover_img || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/default.jpg',
               avatar: item.logo_img || 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar',
               tagKeys: tags,
-              secondClassIds: item.second_class_ids ? item.second_class_ids.split(',').map(Number) : []
+              // 3. 强制转字符串，防止后端返回纯数字导致 split 报错，同时兼容后端没返回此字段的情况
+              secondClassIds: item.second_class_ids ? String(item.second_class_ids).split(',').map(Number) : []
             }
           })
+          console.log('成功获取品牌收藏列表:', this.rawBrandList)
         } else {
           this.rawBrandList = []
         }
       } catch (error) {
-        console.error('获取品牌收藏失败', error)
+        console.error('获取品牌收藏失败详情:', error)
       }
     },
     async fetchRealCourseList() {
       try {
-        const res = await request.post('/sj/skill/list', { page: 1, limit: 100 })
+        // 1. 接口路径换成真实的技能收藏列表
+        const res = await request.post('/sj/skill/collectList', { page: 1, limit: 100 })
+        
         if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
-          const collectedCourses = res.data.list.filter(item => item.collect_state === 1)
-          this.rawCourseList = collectedCourses.map(item => {
+          // 2. 同样不需要 filter，直接 map 映射数据
+          this.rawCourseList = res.data.list.map(item => {
             return {
               id: item.id,
               title: item.name,
               coverSrc: item.cover_img,
-              type: item.link_name || (item.link_type === 1 ? '平台课程' : '品牌课程'),
+              type: item.link_name || (item.link_type == 1 ? '平台课程' : '品牌课程'),
               link_type: item.link_type,
               views: item.browse_num || 0,
+              // 3. 使用安全的时间格式化
               time: item.create_time ? this.formatTimeAgo(item.create_time) : '', 
               typeIcon: item.link_logo || ''
             }
           })
+          console.log('成功获取课程收藏列表:', this.rawCourseList)
         } else {
           this.rawCourseList = []
         }
@@ -383,13 +391,15 @@ export default {
     },
 
     formatTimeAgo(timeStr) {
+      if (!timeStr) return '';
+      const timeStrSafe = String(timeStr);
       const now = new Date()
-      const time = new Date(timeStr.replace(/-/g, '/'))
+      const time = new Date(timeStrSafe.replace(/-/g, '/'))
       const diff = Math.floor((now - time) / 1000)
       if (diff < 3600) return Math.floor(diff / 60) + '分钟前'
       if (diff < 86400) return Math.floor(diff / 3600) + '小时前'
       if (diff < 604800) return Math.floor(diff / 86400) + '天前'
-      return timeStr.split(' ')[0]
+      return timeStrSafe.split(' ')[0]
     },
     goToBrandDetail(item) {
       if (item.id) {

From 6ae7b4d8892204b344bc739a5af1b0c8c4d29549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Tue, 2 Jun 2026 18:22:11 +0800
Subject: [PATCH 081/118] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E6=94=B9=E7=89=88=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8E=E8=AF=B7=E6=B1=82=E5=B7=A5=E5=85=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/brand-detail.vue        |   4 +-
 pages/jingxuan/skill-detail.vue        |   4 +-
 pages/my/my.vue                        | 103 +++++++------
 pages/ruzhu/ruzhu.vue                  |   2 +-
 pages/ruzhu/sj-info.vue                | 194 +++++++++++++++++++++++--
 pages/shop/qualification_sj_change.vue |   2 +-
 6 files changed, 244 insertions(+), 65 deletions(-)

diff --git a/pages/jingxuan/brand-detail.vue b/pages/jingxuan/brand-detail.vue
index 2fc93d5..5907cdc 100644
--- a/pages/jingxuan/brand-detail.vue
+++ b/pages/jingxuan/brand-detail.vue
@@ -19,9 +19,9 @@
       <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c164280f-1ab9-41b4-9d60-846368364e9c.png" class="nav-phone-icon"></image>
     </view>
                   
-    <view class="mock-switch" @click="toggleMockData">
+   <!-- <view class="mock-switch" @click="toggleMockData">
       <text>{{ useMockData ? '关闭模拟数据' : '开启模拟数据' }}</text>
-    </view>
+    </view> -->
                   
     <view class="banner-section" v-if="bannerList && bannerList.length || info.video">
       
diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
index 0830755..ea0045c 100644
--- a/pages/jingxuan/skill-detail.vue
+++ b/pages/jingxuan/skill-detail.vue
@@ -8,9 +8,9 @@
       borderBottom="none">
     </custom-navbar>
 
-    <view class="mock-switch" @click="toggleMockData">
+  <!--  <view class="mock-switch" @click="toggleMockData">
       <text>{{ useMockData ? '关闭模拟数据' : '开启模拟数据' }}</text>
-    </view>
+    </view> -->
 
     <view class="video-section" v-if="article.videoSrc">
       <view class="video-wrapper">
diff --git a/pages/my/my.vue b/pages/my/my.vue
index f501b8d..df01b52 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -20,19 +20,24 @@
 						<!-- @chooseavatar="getAvatar" -->
 					</view>
 
-					<view class="user-detail" @click="goToProfile">
+					<view class="user-detail">
 						<view class="nickname">
 							<text class="nickname-text">{{
 								userInfo.name || userInfo.nick_name || ""
 							}}</text>
 						</view>
-						<view class="user_detail_tip">
-							<view class="user_detail_tip_phone" v-if="id_type !== 0">
-								资料编辑
-								<image mode="aspectFill"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6a4b7bc9-174a-471a-9bf5-6ba167005960" />
+						<view class="user_detail_tip" @click="toruzhu">
+							<image
+								:src="userInfo.credentials_state === 2 ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/13cd25db-5b52-4d36-bad2-ee8680eed65f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/711e35a8-a7a1-4eb2-8a76-52ac9795fa7e.png'"
+								mode="widthFix" style="width:26rpx ;"></image>
+							<view class="user_detail_tip_phone" style="margin-left: -10rpx;">
+								{{ userInfo.credentials_state === 2 ? '认证通过' : userInfo.credentials_state === 1 ?
+									'资质审核中' : '资质待认证' }}
 							</view>
-							<view v-else class="user_detail_tip_phone" style="color: #999999">美融融小程序欢迎您</view>
+							<image mode="widthFix"
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/89f929a5-1486-481f-a696-af520a6bb0f2.png"
+								style="width:6rpx ;margin-left: -6rpx;" />
+
 						</view>
 					</view>
 				</view>
@@ -293,22 +298,21 @@ export default {
 			{
 				type: "listcard",
 				title: "我的服务",
-				list: [
-					{
-						text: "我的收藏",
-						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/83fa7f51-dda3-494b-a50e-f15f8fdcdb9c.png",
-						path: "/pages/my/myFavorite",
-					},
-					{
-						text: "设置",
-						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d1173680-386b-4db3-a74c-64108da6cec9.png",
-						path: "/pages/settings/index",
-					},
-					{
-						text: "联系客服",
-						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bbac7f8-940a-414a-be0b-e6faf5215f63.png",
-						path: "/pages/contact/contact",
-					},
+				list: [{
+					text: "我的收藏",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/83fa7f51-dda3-494b-a50e-f15f8fdcdb9c.png",
+					path: "/pages/my/myFavorite",
+				},
+				{
+					text: "设置",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d1173680-386b-4db3-a74c-64108da6cec9.png",
+					path: "/pages/settings/index",
+				},
+				{
+					text: "联系客服",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bbac7f8-940a-414a-be0b-e6faf5215f63.png",
+					path: "/pages/contact/contact",
+				},
 				],
 			},
 			],
@@ -653,17 +657,17 @@ export default {
 			request.post("/sj/user/getUser").then((result) => {
 				this.userInfo = result.data;
 				uni.setStorageSync("syrId", result.data.id);
-				const allReady = result.data.business_time
-					&& result.data.servers_kill_arr
-					&& result.data.servers_kill_arr.length > 0
-					&& result.data.credentials_state === 2;
+				const allReady = result.data.business_time &&
+					result.data.servers_kill_arr &&
+					result.data.servers_kill_arr.length > 0 &&
+					result.data.credentials_state === 2;
 				const mgmtCard = this.cardList.find(c => c.title === "管理中心");
 				if (mgmtCard) {
 					const shopItem = mgmtCard.list.find(i => i.title === "店铺装修");
 					if (shopItem) {
-						shopItem.url = allReady
-							? "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png"
-							: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png";
+						shopItem.url = allReady ?
+							"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png" :
+							"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png";
 					}
 				}
 			});
@@ -788,6 +792,21 @@ export default {
 				url: "/pages/artisan/profile",
 			});
 		},
+		toruzhu() {
+			if (this.userInfo.credentials_state === 2) {
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+			} else if (this.userInfo.credentials_state === 1) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			}
+		},
 		goToInviteList() {
 			// 添加访问检查
 			if (this.isAccountDisabled) {
@@ -1506,21 +1525,15 @@ button::after {
 	margin-top: 10rpx;
 
 	.user_detail_tip_phone {
-		max-width: 230rpx;
-		height: 36rpx;
-		line-height: 36rpx;
-		border-radius: 6rpx;
-		font-size: 24rpx;
-		color: #666666;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		gap: 7rpx;
-
-		image {
-			width: 8rpx;
-			height: 14rpx;
-		}
+		// width: 100rpx;
+		height: 28rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #6A574E;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
 	}
 
 	.user_detail_tip_invite_name {
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index e72ee37..7150001 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -110,7 +110,7 @@
         },
         data() {
             return {
-                currentStep: 1, // 当前步骤索引
+                currentStep: 4, // 当前步骤索引
                 isAgree: false,
                 identity: null,
                 textData: {},
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 3791ae7..63aafa5 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -28,18 +28,23 @@
       </view>
 
       <view class="form-item-two box-cont">
-        <text class="label required">证件号码</text>
-        <view class="picker-content">
-          <input type="text" v-model="formData.uscc_num" placeholder="请输入营业执照的证件号码" placeholder-class="placeholder"
-            class="input" />
+        <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.stop="showTipPopup('uscc_num')"></image>
+            mode="aspectFit" @click="showTipPopup('uscc_num')"></image>
         </view>
+        <input type="text" v-model="formData.uscc_num" placeholder="请输入营业执照的证件号码" placeholder-class="placeholder"
+          class="input" />
       </view>
 
       <view class="form-item-two box-cont">
-        <text class="label required">营业名称</text>
+        <view class="label-wrapper">
+          <text class="label required">企业名称</text>
+          <image class="label-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+            mode="aspectFit" @click="showTipPopup('uscc_name')"></image>
+        </view>
         <input type="text" v-model="formData.uscc_name" placeholder="请输入营业执照的企业名称" placeholder-class="placeholder"
           class="input" />
       </view>
@@ -101,7 +106,12 @@
       </view>
 
       <view class="form-item-two box-cont">
-        <text class="label required">法人代表</text>
+        <view class="label-wrapper">
+          <text class="label required">法人代表</text>
+          <image class="label-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+            mode="aspectFit" @click="showTipPopup('legal_name')"></image>
+        </view>
         <input type="text" v-model="formData.legal_name" placeholder="请输入营业执照的法人代表" placeholder-class="placeholder"
           class="input" />
       </view>
@@ -123,16 +133,14 @@
         <view class="radio-group">
           <view class="radio-item" @click="setIdcardExpiryType('1')">
             <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === '1' }">
-              <image v-if="formData.legal_idcard_expiry_type === '1'"
-                src="/static/images/agree_y.png"
+              <image v-if="formData.legal_idcard_expiry_type === '1'" src="/static/images/agree_y.png"
                 class="radio-icon-image" mode="aspectFit"></image>
             </view>
             <text class="radio-label">永久有效</text>
           </view>
           <view class="radio-item" @click="setIdcardExpiryType('2')">
             <view class="radio" :class="{ checked: formData.legal_idcard_expiry_type === '2' }">
-              <image v-if="formData.legal_idcard_expiry_type === '2'"
-                src="/static/images/agree_y.png"
+              <image v-if="formData.legal_idcard_expiry_type === '2'" src="/static/images/agree_y.png"
                 class="radio-icon-image" mode="aspectFit"></image>
             </view>
             <text class="radio-label">指定日期有效</text>
@@ -280,6 +288,30 @@
       </view>
     </view>
 
+    <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+      <view class="tip-popup-mask" @click="hideTipPopup"></view>
+      <view class="tip-popup-content">
+        <image class="tip-popup-bg"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
+          mode="aspectFit"></image>
+
+        <view class="tip-popup-body">
+          <view class="tip-title">{{ tipTitle }}</view>
+          <view class="tip-image-container">
+            <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
+          </view>
+          <view class="tip-buttons">
+            <view class="tip-btn cancel" @click="hideTipPopup">
+              <text class="btn-text">取消</text>
+            </view>
+            <view class="tip-btn confirm" @click="hideTipPopup">
+              <text class="btn-text">我已了解</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
   </view>
 </template>
 
@@ -328,7 +360,11 @@ export default {
       userId: null,
       identity: 3,
       addressListener: null,
-      sjAddressListener: null
+      sjAddressListener: null,
+      showTipPopupFlag: false,
+      tipTitle: '',
+      tipImage: '',
+      currentTipType: ''
     }
   },
 
@@ -841,7 +877,33 @@ export default {
       }
     },
 
-    showTipPopup(field) { },
+    showTipPopup(field) {
+      const tipConfig = {
+        'uscc_num': {
+          title: '如何查看证件号码',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c5d8d00b-de1e-414f-b310-0a3f99ed8ddb.png'
+        },
+        'uscc_name': {
+          title: '如何查看企业名称',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b8df241d-899f-4f8e-89c5-b61b61a9f1b1.png'
+        },
+        'legal_name': {
+          title: '如何查看法定代表人',
+          image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b8df241d-899f-4f8e-89c5-b61b61a9f1b1.png'
+        }
+      };
+
+      if (tipConfig[field]) {
+        this.currentTipType = field;
+        this.tipTitle = tipConfig[field].title;
+        this.tipImage = tipConfig[field].image;
+        this.showTipPopupFlag = true;
+      }
+    },
+
+    hideTipPopup() {
+      this.showTipPopupFlag = false;
+    },
 
     getFormData() {
       return this.formData;
@@ -881,7 +943,7 @@ export default {
       }
       if (!this.formData.uscc_name) {
         uni.showToast({
-          title: '请输入营业名称',
+          title: '请输入企业名称',
           icon: 'none'
         });
         return false;
@@ -1426,4 +1488,108 @@ export default {
 .picker-item-row text.active {
   color: #FF4767;
 }
+
+.tip-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.tip-popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.tip-popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.tip-popup-content {
+  position: relative;
+  width: 620rpx;
+  height: 810rpx;
+}
+
+.tip-popup-bg {
+  width: 620rpx;
+  height: 810rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.tip-popup-body {
+  position: relative;
+  flex-direction: column;
+  padding: 80rpx 20rpx 40rpx 20rpx;
+  box-sizing: border-box;
+}
+
+.tip-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  text-align: center;
+  margin-top: 107rpx;
+  margin-bottom: 37rpx;
+}
+
+.tip-image-container {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 50rpx;
+}
+
+.tip-image {
+  width: 90%;
+  max-height: 400rpx;
+}
+
+.tip-buttons {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 28rpx;
+}
+
+.tip-btn {
+  width: 250rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  font-weight: 500;
+}
+
+.tip-btn.cancel {
+  border: #FF4767 2rpx solid;
+  background-color: transparent;
+  color: #FF4767;
+}
+
+.tip-btn.confirm {
+  background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+  color: #FFFFFF;
+}
+
+.tip-btn .btn-text {
+  color: inherit;
+}
 </style>
\ No newline at end of file
diff --git a/pages/shop/qualification_sj_change.vue b/pages/shop/qualification_sj_change.vue
index 7bef678..f6b6a1d 100644
--- a/pages/shop/qualification_sj_change.vue
+++ b/pages/shop/qualification_sj_change.vue
@@ -267,7 +267,7 @@
     <view class="bottom-actions" ref="buttonArea">
       <!-- 驳回原因提示 -->
       <view class="reject-reason" v-if="shouldShowRejectReason">
-        <view class="reject-title">您的提交已驳回</view>
+        <view class="reject-title">您的变更申请已被驳回</view>
         <view class="reject-detail">驳回原因：{{ backText }}</view>
       </view>
       <!-- 审核中提示 -->

From 18805583c1f763212730434ec06cae48676b2057 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 18:32:15 +0800
Subject: [PATCH 082/118] =?UTF-8?q?=E6=94=B6=E8=97=8F=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E7=B1=BB=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/myFavorite.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index 094dbde..2542dcf 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -203,8 +203,7 @@ export default {
     // 加载一级分类并自动组装其对应的二级分类，兼容 state === 1
     async loadFilterCategories() {
       try {
-        const syrId = uni.getStorageSync('syrId') || 1; 
-        const res = await request.post('/sj/firstclass', { id: syrId })
+        const res = await request.post('/sj/firstclass', {})
         if ((res.code === 200 || res.state === 1) && res.data) {
           const firstClasses = res.data;
           

From 14e47ccf0e5246d52097182024df3282d4e7d80d Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 3 Jun 2026 11:26:56 +0800
Subject: [PATCH 083/118] =?UTF-8?q?=E5=93=81=E7=89=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3orderTyoe=E4=BC=A0=E5=80=BCbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/selected-brands.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/jingxuan/selected-brands.vue b/pages/jingxuan/selected-brands.vue
index 64d7d58..988a1dc 100644
--- a/pages/jingxuan/selected-brands.vue
+++ b/pages/jingxuan/selected-brands.vue
@@ -230,7 +230,8 @@ export default {
       const params = {
         first_class: this.activeId || undefined,
         second_class: targetSecondClass || undefined,
-        order_type: this.orderType
+        // 如果 orderType 是 0，则设为 undefined，使其不传给后端
+        order_type: this.orderType === 0 ? undefined : this.orderType
       };
 
       Object.keys(params).forEach(key => {

From c54fb1f2a9c78fa2c52806d2d18995cd85df5118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 3 Jun 2026 11:40:40 +0800
Subject: [PATCH 084/118] =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=8E=A8=E8=8D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/skill-detail.vue | 269 +++++++++++++++-----------------
 1 file changed, 129 insertions(+), 140 deletions(-)

diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
index ea0045c..87197a8 100644
--- a/pages/jingxuan/skill-detail.vue
+++ b/pages/jingxuan/skill-detail.vue
@@ -1,75 +1,55 @@
 <template>
   <view class="skill-detail-page">
-    
-    <custom-navbar 
-      title="技能集市" 
-      backgroundColor="#ffffff" 
-      titleColor="#333" 
-      borderBottom="none">
+
+    <custom-navbar title="技能集市" backgroundColor="#ffffff" titleColor="#333" borderBottom="none">
     </custom-navbar>
 
-  <!--  <view class="mock-switch" @click="toggleMockData">
+    <!--  <view class="mock-switch" @click="toggleMockData">
       <text>{{ useMockData ? '关闭模拟数据' : '开启模拟数据' }}</text>
     </view> -->
 
     <view class="video-section" v-if="article.videoSrc">
       <view class="video-wrapper">
-        
-        <video 
-          v-if="!tipShow"
-          id="customVideo"
-          class="main-video"
-          :src="article.videoSrc"
-          :poster="article.poster"
-          :controls="showNativeControls"
-          :show-center-play-btn="false"
-          :muted="isMuted"
-          object-fit="cover"
-          @timeupdate="onTimeUpdate"
-          @loadedmetadata="onLoadedMetaData"
-          @ended="onEnded"
-          @play="onPlay"
-          @pause="onPause"
-          @fullscreenchange="onFullScreenChange"
-        >
-          <cover-image 
-            v-if="!isPlaying && !showNativeControls" 
-            class="center-play-icon" 
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb720bb0-4ada-49f6-9ce5-38abfd613d5d.png" 
-            @click.stop="togglePlay"
-          ></cover-image>
+
+        <video v-if="!tipShow" id="customVideo" class="main-video" :src="article.videoSrc" :poster="article.poster"
+          :controls="showNativeControls" :show-center-play-btn="false" :muted="isMuted" object-fit="cover"
+          @timeupdate="onTimeUpdate" @loadedmetadata="onLoadedMetaData" @ended="onEnded" @play="onPlay" @pause="onPause"
+          @fullscreenchange="onFullScreenChange">
+          <cover-image v-if="!isPlaying && !showNativeControls" class="center-play-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb720bb0-4ada-49f6-9ce5-38abfd613d5d.png"
+            @click.stop="togglePlay"></cover-image>
 
           <cover-view class="custom-control-bar" v-if="!showNativeControls">
-            <cover-image class="bar-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce7f28f8-470d-4f5b-9c7e-ff2bf8635226.png"></cover-image>
-            
+            <cover-image class="bar-bg"
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce7f28f8-470d-4f5b-9c7e-ff2bf8635226.png"></cover-image>
+
             <cover-view class="bar-content">
               <cover-image v-if="isPlaying" class="ctrl-icon" :src="iconPause" @click.stop="togglePlay"></cover-image>
               <cover-image v-if="!isPlaying" class="ctrl-icon" :src="iconPlay" @click.stop="togglePlay"></cover-image>
-              
+
               <cover-view class="time-text">{{ formatTime(currentTime) }}</cover-view>
-              
+
               <cover-view class="slider-track">
                 <cover-view class="slider-bg"></cover-view>
                 <cover-view class="slider-active" :style="activeStyle"></cover-view>
                 <cover-view class="slider-thumb" :style="thumbStyle"></cover-view>
               </cover-view>
-              
+
               <cover-view class="time-text">{{ formatTime(duration) }}</cover-view>
-              
-              <cover-image v-if="!isMuted" class="ctrl-icon mute-icon" :src="iconSoundOn" @click.stop="toggleMute"></cover-image>
-              <cover-image v-if="isMuted" class="ctrl-icon mute-icon" :src="iconMute" @click.stop="toggleMute"></cover-image>
-              
-              <cover-image class="ctrl-icon fullscreen-icon" :src="iconFullscreen" @click.stop="toggleFullScreen"></cover-image>
+
+              <cover-image v-if="!isMuted" class="ctrl-icon mute-icon" :src="iconSoundOn"
+                @click.stop="toggleMute"></cover-image>
+              <cover-image v-if="isMuted" class="ctrl-icon mute-icon" :src="iconMute"
+                @click.stop="toggleMute"></cover-image>
+
+              <cover-image class="ctrl-icon fullscreen-icon" :src="iconFullscreen"
+                @click.stop="toggleFullScreen"></cover-image>
             </cover-view>
           </cover-view>
         </video>
-        
-        <image 
-          v-else 
-          class="main-video fallback-poster" 
-          :src="article.poster || article.videoSrc" 
-          mode="aspectFill"
-        ></image>
+
+        <image v-else class="main-video fallback-poster" :src="article.poster || article.videoSrc" mode="aspectFill">
+        </image>
       </view>
     </view>
 
@@ -81,12 +61,9 @@
           <text class="author-name">{{ article.authorName }}</text>
           <text class="date">{{ article.date }}</text>
         </view>
-        
+
         <view class="favorite-btn" @click="toggleFavorite">
-          <image 
-            class="star-icon" 
-            :src="isFavorite ? filledStarUrl : emptyStarUrl"
-            />
+          <image class="star-icon" :src="isFavorite ? filledStarUrl : emptyStarUrl" />
           <text :class="{ 'active-fav': isFavorite }">{{ isFavorite ? '已收藏' : '收藏' }}</text>
         </view>
       </view>
@@ -105,17 +82,15 @@
       <view class="section-header">
         <text class="section-title">相关推荐</text>
         <view class="refresh-btn" @click="refreshList">
-          <image class="refresh-icon" :class="{'is-rotating': isRefreshing}" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/f2152145-df2a-49ab-87f5-f66b3207d0b0.png"></image>
+          <image class="refresh-icon" :class="{ 'is-rotating': isRefreshing }"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/f2152145-df2a-49ab-87f5-f66b3207d0b0.png">
+          </image>
           <text>换一批</text>
         </view>
       </view>
-      
+
       <view class="list-container">
-        <skill-card 
-          v-for="(item, index) in recommendList" 
-          :key="index" 
-          :item="item"
-        ></skill-card>
+        <skill-card v-for="(item, index) in recommendList" :key="index" :item="item"></skill-card>
       </view>
     </view>
 
@@ -129,7 +104,7 @@
 <script>
 import request from "@/utils/request";
 import SkillCard from "@/pages/home/components/skill-card.vue";
-import tipsPopup2 from "@/components/tips-popup/tips-popup2"; 
+import tipsPopup2 from "@/components/tips-popup/tips-popup2";
 
 export default {
   components: {
@@ -139,7 +114,7 @@ export default {
   data() {
     return {
       useMockData: false,
-      
+
       articleId: null,
       isFavorite: false,
       emptyStarUrl: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/53378402-5456-4a80-b2ec-7c18d43d970e.png',
@@ -154,19 +129,19 @@ export default {
       videoContext: null,
       isPlaying: false,
       isMuted: false,
-      
-      showNativeControls: false, 
-      
+
+      showNativeControls: false,
+
       currentTime: 0,
       duration: 0,
       sliderValue: 0,
-      
-      iconPlay: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/88ca4fe3-645c-48a9-abda-1f9b45714970.png', 
-      iconPause: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cf9d6dd6-e9df-4c46-bafa-e1a72f7ddbcd.png', 
+
+      iconPlay: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/88ca4fe3-645c-48a9-abda-1f9b45714970.png',
+      iconPause: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cf9d6dd6-e9df-4c46-bafa-e1a72f7ddbcd.png',
       iconSoundOn: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9f13a630-7efd-4c61-b6fe-b6b282e28e42.png',
       iconMute: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/80f856c1-3d66-4b11-b21a-8eb6a3272a3c.png',
       iconFullscreen: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4286ef33-6849-4851-8866-4230d2523a33.png',
-      
+
       article: {},
       recommendList: []
     }
@@ -190,7 +165,7 @@ export default {
     if (options && options.id) {
       this.articleId = parseInt(options.id, 10);
     } else {
-      this.articleId = 1; 
+      this.articleId = 1;
     }
     this.getPageData();
   },
@@ -207,7 +182,7 @@ export default {
       const count = this.article.authorVideoCount || 0;
 
       uni.navigateTo({
-        url: `/pages/jingxuan/selected-skills?showAuthor=1&isOfficial=${isOfficial}&linkId=${linkId}&authorName=${name}&authorAvatar=${avatar}&videoCount=${count}` 
+        url: `/pages/jingxuan/selected-skills?showAuthor=1&isOfficial=${isOfficial}&linkId=${linkId}&authorName=${name}&authorAvatar=${avatar}&videoCount=${count}`
       });
     },
 
@@ -224,10 +199,10 @@ export default {
     okBtn() {
       if (this.tipType == "login") {
         uni.navigateTo({
-          url: "/pages/blogPopup/blogPopup", 
+          url: "/pages/blogPopup/blogPopup",
         });
       }
-      this.tipShow = false; 
+      this.tipShow = false;
     },
 
     formatTime(sec) {
@@ -260,7 +235,7 @@ export default {
     },
     onPlay() { this.isPlaying = true; },
     onPause() { this.isPlaying = false; },
-    
+
     onFullScreenChange(e) {
       const isFull = e.detail.fullScreen;
       if (!isFull) {
@@ -269,7 +244,7 @@ export default {
         this.showNativeControls = true;
       }
     },
-    
+
     togglePlay() {
       const ctx = this.getVideoContext();
       if (!ctx) return;
@@ -282,7 +257,7 @@ export default {
     toggleMute() {
       this.isMuted = !this.isMuted;
     },
-    
+
     toggleFullScreen() {
       const ctx = this.getVideoContext();
       if (!ctx) return;
@@ -304,27 +279,38 @@ export default {
         return;
       }
       uni.showLoading({ title: '加载中...' });
-      request.post("/sj/skill/details", { 
-        id: this.articleId 
+      request.post("/sj/skill/details", {
+        id: this.articleId
       }).then((res) => {
         if (res.code == 200 && res.data) {
           const data = res.data;
           this.article = {
-            title: data.name || '暂无标题', 
+            title: data.name || '暂无标题',
             // 【预留接口字段解析】：这里需要后端配合返回以下字段，如果没有的话目前会使用默认值
             linkType: data.link_type || 1,        // 1=官方 2=品牌
             linkId: data.link_id || 0,
-            authorName: data.author_name || '美融融平台', 
+            authorName: data.author_name || '美融融平台',
             authorAvatar: data.author_avatar || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bbe832bf-aae6-4579-b3cc-246d252488c3',
             authorVideoCount: data.link_publish_num || 0, // 关联者发布数
 
-            date: data.create_time ? data.create_time.substring(0, 10).replace(/-/g, '.') : '', 
+            date: data.create_time ? data.create_time.substring(0, 10).replace(/-/g, '.') : '',
             videoSrc: data.video || '',
             poster: data.cover_img || '',
             htmlContent: data.detail || ''
           };
           this.isFavorite = data.collect_state === 1;
-          this.loadMockRecommend(); 
+          request.post("/sj/skill/list", {
+            page: 1,
+            limit: 10,
+            link_type: data.link_type,
+            link_id: data.link_id
+          }).then((listRes) => {
+            if (listRes.code == 200 && listRes.data && listRes.data.list) {
+              this.recommendList = listRes.data.list;
+            }
+          }).catch((err) => {
+            console.error('获取推荐列表异常', err);
+          });
         } else {
           uni.showToast({ title: res.msg || '获取数据失败', icon: 'none' });
         }
@@ -337,13 +323,13 @@ export default {
 
     toggleFavorite() {
       if (!this.isLogin) {
-        if(this.isPlaying) {
+        if (this.isPlaying) {
           this.getVideoContext().pause();
         }
         this.tipsText = "您现在还未登录，是否确定前往登录？";
         this.tipShow = true;
         this.tipType = "login";
-        return; 
+        return;
       }
 
       if (this.useMockData) {
@@ -351,15 +337,15 @@ export default {
         uni.showToast({ title: this.isFavorite ? '收藏成功' : '已取消收藏', icon: 'none' });
         return;
       }
-      
+
       uni.showLoading({ title: '处理中' });
       const targetState = this.isFavorite ? 2 : 1;
-      
-      request.post("/sj/skill/collect", { 
-        id: this.articleId, 
-        state: targetState 
+
+      request.post("/sj/skill/collect", {
+        id: this.articleId,
+        state: targetState
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.isFavorite = !this.isFavorite;
           uni.showToast({ title: this.isFavorite ? '收藏成功' : '已取消收藏', icon: 'none' });
         } else {
@@ -371,9 +357,9 @@ export default {
         uni.hideLoading();
       });
     },
-    
+
     refreshList() {
-      if(this.isRefreshing) return;
+      if (this.isRefreshing) return;
       this.isRefreshing = true;
       uni.showLoading({ title: '加载中' });
       setTimeout(() => {
@@ -387,10 +373,10 @@ export default {
       this.isFavorite = false;
       this.article = {
         title: '穿戴甲的操作视频扫码验券操作',
-        
+
         // Mock作者相关数据(测试品牌跳转，将linkType改为2)
         linkType: 2,
-        linkId: 101, 
+        linkId: 101,
         authorName: '蜜丝卡伦官方品牌',
         authorAvatar: 'https://images.unsplash.com/photo-1512290923902-8a9f81dc236c?ixlib=rb-4.0.3&auto=format&fit=crop&w=100&q=80',
         authorVideoCount: 658,
@@ -457,12 +443,12 @@ export default {
 .video-section {
   width: 100%;
   height: 420rpx;
-  
+
   .video-wrapper {
     position: relative;
     width: 100%;
     height: 100%;
-    
+
     .main-video {
       width: 100%;
       height: 100%;
@@ -490,7 +476,7 @@ export default {
       width: 100%;
       height: 70rpx;
       z-index: 99;
-      
+
       .bar-bg {
         position: absolute;
         top: 0;
@@ -499,43 +485,45 @@ export default {
         height: 70rpx;
         z-index: 100;
       }
-      
+
       .bar-content {
         position: absolute;
         top: 0;
         left: 0;
         width: 100%;
         height: 70rpx;
-        z-index: 101; 
+        z-index: 101;
         display: flex;
         flex-direction: row;
         align-items: center;
         padding: 0 10rpx;
         box-sizing: border-box;
-        
+
         .ctrl-icon {
           width: 25rpx;
           height: 30rpx;
           margin: 0 10rpx;
           flex-shrink: 0;
         }
+
         .mute-icon {
           width: 38rpx;
           height: 30rpx;
           flex-shrink: 0;
         }
+
         .fullscreen-icon {
           width: 30rpx;
           height: 30rpx;
           flex-shrink: 0;
         }
-        
+
         .time-text {
           font-size: 22rpx;
           color: #ffffff;
           line-height: 70rpx;
         }
-        
+
         .slider-track {
           flex: 1;
           height: 70rpx;
@@ -544,16 +532,16 @@ export default {
           display: flex;
           flex-direction: column;
           justify-content: center;
-          
+
           .slider-bg {
             position: absolute;
-            top: 33rpx; 
+            top: 33rpx;
             left: 0;
             width: 100%;
             height: 4rpx;
             background-color: rgba(255, 255, 255, 0.4);
           }
-          
+
           .slider-active {
             position: absolute;
             top: 33rpx;
@@ -561,11 +549,11 @@ export default {
             height: 4rpx;
             background-color: #FF4767;
           }
-          
+
           .slider-thumb {
             position: absolute;
-            top: 25rpx; 
-            margin-left: -10rpx; 
+            top: 25rpx;
+            margin-left: -10rpx;
             width: 20rpx;
             height: 20rpx;
             border-radius: 50%;
@@ -579,7 +567,7 @@ export default {
 
 .article-header {
   padding: 30rpx 30rpx 20rpx;
-  
+
   .title {
     font-weight: 500;
     font-size: 32rpx;
@@ -587,23 +575,23 @@ export default {
     line-height: 45rpx;
     margin-bottom: 24rpx;
   }
-  
+
   .meta-row {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    
+
     .author-info {
       display: flex;
       align-items: center;
-      
+
       .avatar {
         width: 28rpx;
         height: 28rpx;
         border-radius: 50%;
         margin-right: 12rpx;
       }
-      
+
       .author-name {
         font-weight: 400;
         font-size: 24rpx;
@@ -611,7 +599,7 @@ export default {
         line-height: 33rpx;
         margin-right: 16rpx;
       }
-      
+
       .date {
         font-weight: 400;
         font-size: 24rpx;
@@ -619,25 +607,25 @@ export default {
         line-height: 33rpx;
       }
     }
-    
+
     .favorite-btn {
-        display: flex;
-        align-items: center;
-        font-weight: 400;
-        font-size: 24rpx;
-        color: #999999;
-        line-height: 33rpx;
-        
-        .star-icon {
-            width: 26rpx;
-            height: 26rpx;
-            margin-right: 6rpx;
-            margin-top: -2rpx;
-        }
-        
-        .active-fav {
-            color: #FD5A8C ; 
-        }
+      display: flex;
+      align-items: center;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #999999;
+      line-height: 33rpx;
+
+      .star-icon {
+        width: 26rpx;
+        height: 26rpx;
+        margin-right: 6rpx;
+        margin-top: -2rpx;
+      }
+
+      .active-fav {
+        color: #FD5A8C;
+      }
     }
   }
 }
@@ -649,11 +637,12 @@ export default {
     font-size: 28rpx;
     color: #2A2A2A;
     line-height: 40rpx;
-    
+
     ::v-deep p {
       margin-bottom: 24rpx;
       line-height: 40rpx;
     }
+
     ::v-deep img {
       max-width: 100%;
       height: auto;
@@ -669,14 +658,14 @@ export default {
     align-items: center;
     justify-content: center;
     padding: 50rpx 0 80rpx;
-    
+
     .empty-icon {
       width: 140rpx;
       height: 140rpx;
       margin-bottom: 24rpx;
       opacity: 0.8;
     }
-    
+
     .empty-text {
       font-size: 26rpx;
       color: #A9A9A9;
@@ -686,32 +675,32 @@ export default {
 
 .recommend-section {
   padding: 0 30rpx;
-  
+
   .section-header {
     display: flex;
     justify-content: space-between;
     align-items: center;
     margin-bottom: 30rpx;
-    
+
     .section-title {
       font-weight: 500;
       font-size: 30rpx;
       color: #333333;
       line-height: 42rpx;
     }
-    
+
     .refresh-btn {
       display: flex;
       align-items: center;
       font-size: 26rpx;
       color: #999999;
-      
+
       .refresh-icon {
         width: 24rpx;
         height: 28rpx;
         margin-right: 8rpx;
         transition: transform 0.5s ease;
-        
+
         &.is-rotating {
           transform: rotate(360deg);
         }

From 653858b9f810effa203e11b07658f7ca97040510 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 3 Jun 2026 11:51:10 +0800
Subject: [PATCH 085/118] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/skill-detail.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
index 87197a8..546f162 100644
--- a/pages/jingxuan/skill-detail.vue
+++ b/pages/jingxuan/skill-detail.vue
@@ -303,10 +303,24 @@ export default {
             page: 1,
             limit: 10,
             link_type: data.link_type,
-            link_id: data.link_id
+            link_id: data.link_id,
+            id: data.id
           }).then((listRes) => {
             if (listRes.code == 200 && listRes.data && listRes.data.list) {
-              this.recommendList = listRes.data.list;
+              // 使用 map 遍历数组，将后端返回的字段一对一映射成组件需要的字段
+              this.recommendList = listRes.data.list.map(item => {
+                return {
+                  id: item.id,
+                  title: item.name || '暂无标题',                 // 映射标题
+                  coverSrc: item.cover_img || '',               // 映射封面图
+                  type: item.link_name || '平台课程',             // 映射来源（平台/品牌）
+                  typeIcon: item.link_logo || '',               // 映射来源图标
+                  // 浏览量优先取总浏览量，如果没有则取实际/初始浏览量
+                  views: item.total_browse_num || item.real_browse_num || item.browse_num || 0,
+                  // 截取时间并格式化
+                  time: item.create_time ? item.create_time.substring(0, 10).replace(/-/g, '-') : '' 
+                };
+              });
             }
           }).catch((err) => {
             console.error('获取推荐列表异常', err);

From 6b85f31b62a508a84dc7f88a7132d86f493d0074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 3 Jun 2026 11:56:59 +0800
Subject: [PATCH 086/118] =?UTF-8?q?=E6=8A=80=E8=83=BD=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/skill-detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
index 546f162..66e81cb 100644
--- a/pages/jingxuan/skill-detail.vue
+++ b/pages/jingxuan/skill-detail.vue
@@ -304,7 +304,7 @@ export default {
             limit: 10,
             link_type: data.link_type,
             link_id: data.link_id,
-            id: data.id
+            skill_id: data.id
           }).then((listRes) => {
             if (listRes.code == 200 && listRes.data && listRes.data.list) {
               // 使用 map 遍历数组，将后端返回的字段一对一映射成组件需要的字段

From c51f20a3204f2279f942e7d6904e4f4d590fb2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 3 Jun 2026 14:13:17 +0800
Subject: [PATCH 087/118] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=85=A5=E9=A9=BB?=
 =?UTF-8?q?=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ruzhu/ruzhu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 7150001..f11b01a 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -110,7 +110,7 @@
         },
         data() {
             return {
-                currentStep: 4, // 当前步骤索引
+                currentStep: 0, // 当前步骤索引
                 isAgree: false,
                 identity: null,
                 textData: {},

From 811a72cf34ac2cc57d7168c8d456925da3130055 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 3 Jun 2026 16:37:31 +0800
Subject: [PATCH 088/118] =?UTF-8?q?=E6=A0=B8=E9=94=80=E9=A1=B5=EF=BC=88?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81+=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=A0=81=EF=BC=89=E7=BC=BA=E5=A4=B1=E5=8F=82=E6=95=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/verify/manual-verify.vue       | 1 +
 pages/shop/verify/verify-order-detail.vue | 8 +++++++-
 pages/shop/verify/verify-order.nvue       | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pages/shop/verify/manual-verify.vue b/pages/shop/verify/manual-verify.vue
index 26f883d..5ccb819 100644
--- a/pages/shop/verify/manual-verify.vue
+++ b/pages/shop/verify/manual-verify.vue
@@ -76,6 +76,7 @@ export default {
       }).then(res => {
         uni.hideLoading();
         if (res.code === 200 && res.data) {
+          res.data.server_code = this.code;
           // 查询成功，带上数据跳 detail 页
           const orderDataStr = encodeURIComponent(JSON.stringify(res.data));
           uni.navigateTo({
diff --git a/pages/shop/verify/verify-order-detail.vue b/pages/shop/verify/verify-order-detail.vue
index 8d93cec..9a5e610 100644
--- a/pages/shop/verify/verify-order-detail.vue
+++ b/pages/shop/verify/verify-order-detail.vue
@@ -73,6 +73,8 @@ export default {
       statusBarHeight: 44,
       orderData: {
         orderId: '',
+        orderType: '',   // 订单类型
+        serverCode: '',  // 核销码
         customerName: '',
         customerPhone: '',
         goodsImg: '',
@@ -111,6 +113,8 @@ export default {
     mapOrderData(data) {
       this.orderData = {
         orderId: data.order_id || '',
+        orderType: data.order_type || '', // 映射订单类型
+        serverCode: data.server_code || '', // 映射核销码
         customerName: data.user_name || '--',
         customerPhone: data.user_phone || '--',
         goodsImg: data.order_photo || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/default_goods.png',
@@ -154,7 +158,9 @@ export default {
 
       // 调用核销接口
       request.post('/sj/poster/useOrderServerCode', {
-        id: this.orderData.orderId
+        id: this.orderData.orderId,
+        order_type: this.orderData.orderType,
+        server_code: this.orderData.serverCode
       }).then(res => {
         uni.hideLoading();
         if (res.code === 200) {
diff --git a/pages/shop/verify/verify-order.nvue b/pages/shop/verify/verify-order.nvue
index 83e98c2..a21a35b 100644
--- a/pages/shop/verify/verify-order.nvue
+++ b/pages/shop/verify/verify-order.nvue
@@ -87,6 +87,7 @@ export default {
         uni.hideLoading();
         
         if (result.code === 200 && result.data) {
+          result.data.server_code = code;
           uni.showToast({ title: '扫码成功！', icon: 'none' });
           const orderDataStr = encodeURIComponent(JSON.stringify(result.data));
           uni.navigateTo({

From 7549907688769d2772fa3735a7f526a4d9b4e54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 3 Jun 2026 16:38:56 +0800
Subject: [PATCH 089/118] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=AD=A6=E5=91=98=E6=8B=9B=E5=8B=9F=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AE=A4=E8=AF=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                        |    3 +-
 pages/artisan/profile.vue            | 1193 +++++++++++++-------------
 pages/home/components/brand-card.vue |    4 +-
 pages/my/my.vue                      |   30 +-
 4 files changed, 619 insertions(+), 611 deletions(-)

diff --git a/manifest.json b/manifest.json
index f438265..32e4a62 100644
--- a/manifest.json
+++ b/manifest.json
@@ -41,7 +41,8 @@
             "Payment" : {},
             "VideoPlayer" : {},
             "OAuth" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "Barcode" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index 99cc2d2..06c95e3 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -167,7 +167,7 @@
 							<text style="margin-right: 16rpx;"
 								:style="{ color: userInfo.credentials_state === 0 ? '#ec5d57' : userInfo.credentials_state === 1 ? '#e59e45' : '#c9c9c9' }">
 								{{ userInfo.credentials_state === 0 ? '待完善' : userInfo.credentials_state === 1 ? '审核中' :
-								'已认证' }}
+									'已认证' }}
 							</text>
 							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
 							</image>
@@ -191,663 +191,658 @@
 </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 // 添加分享状态标记
+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;
 			}
-		},
-		onLoad() {
-			// 页面显示时重新加载身份信息，确保数据最新
-			this.loadIdentity()
-			console.log('当前身份:', this.identity)
-			// 加载用户信息
-			this.loadUserInfo()
-		},
-		onShow() {
-			// 页面显示时也重新加载，确保数据最新
-			this.loadIdentity()
-			this.loadUserInfo()
-		},
-		methods: {
-			// 返回按钮处理
-			handleBack() {
-				uni.navigateBack()
-			},
 
-			// 分享到微信
-			handleShareWechat() {
-				console.log('分享到微信')
+			// 设置分享状态
+			this.sharing = 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);
-					}
+			try {
+				// 显示加载提示
+				uni.showLoading({
+					title: '正在准备分享...',
+					mask: true
 				});
-			},
-
-			// APP环境自动分享
-			handleAppAutoShare() {
-				if (!this.currentUserId) {
-					uni.showToast({
-						title: '无法获取用户信息',
-						icon: 'none'
-					});
-					return;
-				}
-
-				// 清除旧的分享标记
-				uni.removeStorage({
-					key: 'share_success'
-				});
-
-				// 跳转到店铺主页并自动触发分享
-				const url = this.identity == '2' ?
-					`/pages/user/store-detail?id=${this.currentUserId}&autoShare=1` :
-					`/pages/user/syr-detail?id=${this.currentUserId}&autoShare=1`;
-
-				uni.navigateTo({
-					url: url,
-					success: () => {
-						console.log('跳转成功，将自动触发分享');
-						// 跳转成功后立即隐藏loading，避免页面闪烁
-						setTimeout(() => {
-							uni.hideLoading();
-							this.sharing = false;
-						}, 200);
-					},
-					fail: () => {
-						console.log('跳转失败:', err);
-						uni.hideLoading();
-						this.sharing = false;
-						this.showManualShareOption();
-					}
-				});
-			},
-
-			// 执行APP分享
-			executeAppShare(imageUrl) {
-				// 备用图片地址
-				const backupImageUrl =
-					"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/yh/1756713709528-717.png?x-oss-process=image/resize,p_40"
-
-				// 根据身份设置不同的分享标题
-				const shareTitle = this.identity == '2' ?
-					"好友刚推了个超赞商家！点开认识TA ~" :
-					"好友刚推了个超赞手艺人！点开认识TA ~"
-
-				// 生成分享配置
-				const shareConfig = {
-					provider: "weixin",
-					scene: "WXSceneSession",
-					type: 5,
-					title: shareTitle,
-					miniProgram: {
-						id: "gh_89c92e18b70b", // 小程序原始ID
-						path: this.getSharePath(), // 动态分享路径
-						type: 0, // 正式版
-						webUrl: "https://www.baidu.com/", // 降级网页地址
-					},
-					imageUrl: imageUrl,
-					success: (res) => {
-						console.log("分享成功:", JSON.stringify(res))
-						uni.showToast({
-							title: '分享成功',
-							icon: 'success'
-						})
-					},
-					fail: (err) => {
-						console.log("分享失败:", JSON.stringify(err))
-						// 尝试使用备用图片
-						if (imageUrl !== backupImageUrl) {
-							console.log("尝试使用备用图片分享...")
-							this.executeAppShare(backupImageUrl)
-						} else {
-							uni.showToast({
-								title: '分享失败',
-								icon: 'none'
-							})
-						}
-					}
-				}
-
-				// 检查是否支持分享API
-				if (uni.share) {
-					uni.share(shareConfig)
-				} else {
-					uni.showToast({
-						title: '当前环境不支持分享',
-						icon: 'none'
-					})
-				}
-			},
-
-			// 获取分享路径
-			getSharePath() {
-				// 根据身份生成不同的分享路径
-				if (this.identity == '2') {
-					// 商家分享店铺详情页
-					return `/pages/user/store-detail?id=${this.currentUserId || ''}`
-				} else {
-					// 手艺人分享个人主页
-					return `/pages/user/syr-detail?id=${this.currentUserId || ''}`
-				}
-			},
-
-			// 查看店铺
-			async handleViewShop() {
-				console.log('查看店铺')
 
 				// 确保用户信息已加载
 				if (!this.currentUserId) {
 					await this.loadUserInfo()
 				}
 
-				// 如果仍然没有用户ID，提示用户手动输入或联系客服
+				// 检查是否已加载用户信息
 				if (!this.currentUserId) {
-					uni.showModal({
-						title: '提示',
-						content: '无法获取用户信息，请联系客服或稍后重试',
-						showCancel: false,
-						confirmText: '确定'
+					uni.showToast({
+						title: '无法获取用户信息',
+						icon: 'none'
 					})
 					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
-					})
+				// 根据环境处理
+				// #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'
+						//     })
+						//   }
+						// })
+					}
 				}
-			},
+			})
+		},
 
-			// 加载用户信息 - 主要使用接口获取
-			async loadUserInfo() {
-				try {
-					// 根据身份设置type参数（参考个人中心页面的逻辑）
-					let type = 1 // 默认值
-					if (this.identity == '1') {
-						type = 2 // 手艺人
-					} else if (this.identity == '2') {
-						type = 3 // 商家
-					}
+		// 小程序环境处理
+		handleMpAutoShare() {
+			// 小程序无法自动触发分享，跳转后提示用户手动操作
+			const url = this.identity == '2' ?
+				`/pages/user/store-detail?id=${this.currentUserId}` :
+				`/pages/user/syr-detail?id=${this.currentUserId}`;
 
-					console.log('调用接口获取用户信息，type:', type)
+			uni.navigateTo({
+				url: url,
+				success: () => {
+					setTimeout(() => {
+						uni.showToast({
+							title: '请点击右上角分享',
+							icon: 'none',
+							duration: 2000
+						});
+					}, 500);
+				}
+			});
+		},
 
-					// 调用接口获取用户信息
-					const result = await request.post('/sj/user/getUser', {
-						type
-					})
+		// APP环境自动分享
+		handleAppAutoShare() {
+			if (!this.currentUserId) {
+				uni.showToast({
+					title: '无法获取用户信息',
+					icon: 'none'
+				});
+				return;
+			}
 
-					if (result.data && result.data.id) {
-						this.userInfo = result.data
-						this.currentUserId = result.data.id
+			// 清除旧的分享标记
+			uni.removeStorage({
+				key: 'share_success'
+			});
 
-						// 存储到本地，避免重复调用
-						uni.setStorageSync('userInfo', result.data)
-						console.log('从接口获取用户信息成功:', this.userInfo)
-					} else {
-						console.log('接口返回数据异常:', result)
-					}
-				} catch (error) {
-					console.log('获取用户信息失败:', error)
+			// 跳转到店铺主页并自动触发分享
+			const url = this.identity == '2' ?
+				`/pages/user/store-detail?id=${this.currentUserId}&autoShare=1` :
+				`/pages/user/syr-detail?id=${this.currentUserId}&autoShare=1`;
 
-					// 降级方案：尝试从其他可能的位置获取用户ID
-					this.tryAlternativeUserInfo()
+			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();
 				}
-			},
+			});
+		},
 
-			// 备用方案：从其他位置获取用户信息
-			tryAlternativeUserInfo() {
-				try {
-					const app = getApp()
+		// 执行APP分享
+		executeAppShare(imageUrl) {
+			// 备用图片地址
+			const backupImageUrl =
+				"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/yh/1756713709528-717.png?x-oss-process=image/resize,p_40"
 
-					// 方法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
-					}
+			// 根据身份设置不同的分享标题
+			const shareTitle = this.identity == '2' ?
+				"好友刚推了个超赞商家！点开认识TA ~" :
+				"好友刚推了个超赞手艺人！点开认识TA ~"
 
-					// 方法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)
+			// 生成分享配置
+			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 {
-						console.log('未获取到身份信息')
-						// 默认设为手艺人
-						this.identity = '1'
+						uni.showToast({
+							title: '分享失败',
+							icon: 'none'
+						})
 					}
 				}
+			}
 
-				console.log('当前身份:', this.identity)
-			},
-
-			navigateToTimeSetting() {
-				if (this.identity == '2') {
-					// 商家跳转到营业时间页面
-					uni.navigateTo({
-						url: '/pages/shop/business-time'
-					})
-				} else {
-					// 手艺人跳转到服务时间页面
-					uni.navigateTo({
-						url: '/pages/artisan/service-time'
-					})
-				}
-			},
-
-			navigateToServiceSkill() {
-				if (this.identity == '2') {
-					// 商家跳转到商家服务技能页面
-					uni.navigateTo({
-						url: '/pages/shop/service-skills'
-					})
-				} else {
-					// 手艺人跳转到手艺人服务技能页面
-					uni.navigateTo({
-						url: '/pages/artisan/service-skills'
-					})
-				}
-			},
-
-			navigateToShopInfo() { // 商家：门店信息 
-				uni.navigateTo({
-					url: '/pages/shop/sj-info-change'
-				})
-			},
-
-			navigateToServiceArea() { // 手艺人：服务区域
-				uni.navigateTo({
-					url: '/pages/artisan/service-area'
-				})
-			},
-
-			navigateToPersonalInfo() { // 手艺人：个人信息
-				uni.navigateTo({
-					url: '/pages/artisan/syr-info-change'
-				})
-			},
-
-			navigateToimg() { // 图片管理
-				uni.navigateTo({
-					url: '/pages/shop/photoAlbum/photoManage?type=1'
-				})
-			},
-
-			navigateTovideo() { // 视频管理
-				uni.navigateTo({
-					url: '/pages/shop/photoAlbum/photoManage?type=2'
-				})
-			},
-
-			navigateToQualification() { 
-                const state = this.userInfo.credentials_state;
-
-                if (state === 1) {
-                    // === 1. 审核中 ===
-                    // 跳转到最新确认的专属进度/客服二维码页面
-                    uni.navigateTo({
-                        url: '/pages/ruzhu/ruzhu?type=1'
-                    });
-                } else if (state === 0) {
-                    // === 2. 待完善 / 被驳回 ===
-                    // 同步首页逻辑：判断是老手还是纯新手
-                    if (this.userInfo.id_type !== 0) {
-                        // 已经开启过入驻，直接空降到最后一步（门店信息）
-                        uni.navigateTo({
-                            url: '/pages/ruzhu/ruzhu?step=3'
-                        });
-                    } else {
-                        // 完全没入驻过的纯新手，老老实实从第一步开始
-                        uni.navigateTo({
-                            url: '/pages/ruzhu/ruzhu'
-                        });
-                    }
-                } else {
-                    // === 3. 已认证 ===
-                    // 跳转到资质信息的查看/修改页面
-                    uni.navigateTo({
-                        url: '/pages/shop/qualification_sj_change'
-                    });
-                }
-            },
-
-			navigateToBelongShop() { // 手艺人：所属门店
-				uni.navigateTo({
-					url: '/pages/artisan/belong_shop'
+			// 检查是否支持分享API
+			if (uni.share) {
+				uni.share(shareConfig)
+			} else {
+				uni.showToast({
+					title: '当前环境不支持分享',
+					icon: 'none'
 				})
 			}
+		},
+
+		// 获取分享路径
+		getSharePath() {
+			// 根据身份生成不同的分享路径
+			if (this.identity == '2') {
+				// 商家分享店铺详情页
+				return `/pages/user/store-detail?id=${this.currentUserId || ''}`
+			} else {
+				// 手艺人分享个人主页
+				return `/pages/user/syr-detail?id=${this.currentUserId || ''}`
+			}
+		},
+
+		// 查看店铺
+		async handleViewShop() {
+			console.log('查看店铺')
+
+			// 确保用户信息已加载
+			if (!this.currentUserId) {
+				await this.loadUserInfo()
+			}
+
+			// 如果仍然没有用户ID，提示用户手动输入或联系客服
+			if (!this.currentUserId) {
+				uni.showModal({
+					title: '提示',
+					content: '无法获取用户信息，请联系客服或稍后重试',
+					showCancel: false,
+					confirmText: '确定'
+				})
+				return
+			}
+
+			// 根据身份跳转到不同的页面
+			if (this.identity == '2') {
+				// 商家跳转到店铺主页
+				uni.navigateTo({
+					url: '/pages/user/store-detail?id=' + this.currentUserId
+				})
+			} else {
+				// 手艺人跳转到个人主页
+				uni.navigateTo({
+					url: '/pages/user/syr-detail?id=' + this.currentUserId
+				})
+			}
+		},
+
+		// 加载用户信息 - 主要使用接口获取
+		async loadUserInfo() {
+			try {
+				// 根据身份设置type参数（参考个人中心页面的逻辑）
+				let type = 1 // 默认值
+				if (this.identity == '1') {
+					type = 2 // 手艺人
+				} else if (this.identity == '2') {
+					type = 3 // 商家
+				}
+
+				console.log('调用接口获取用户信息，type:', type)
+
+				// 调用接口获取用户信息
+				const result = await request.post('/sj/user/getUser', {
+					type
+				})
+
+				if (result.data && result.data.id) {
+					this.userInfo = result.data
+					this.currentUserId = result.data.id
+
+					// 存储到本地，避免重复调用
+					uni.setStorageSync('userInfo', result.data)
+					console.log('从接口获取用户信息成功:', this.userInfo)
+				} else {
+					console.log('接口返回数据异常:', result)
+				}
+			} catch (error) {
+				console.log('获取用户信息失败:', error)
+
+				// 降级方案：尝试从其他可能的位置获取用户ID
+				this.tryAlternativeUserInfo()
+				uni.hideLoading();
+			}
+		},
+
+		// 备用方案：从其他位置获取用户信息
+		tryAlternativeUserInfo() {
+			try {
+				const app = getApp()
+
+				// 方法1: 从全局数据获取用户ID
+				if (app.globalData.userInfo && app.globalData.userInfo.id) {
+					this.currentUserId = app.globalData.userInfo.id
+					this.userInfo = app.globalData.userInfo
+					console.log('从全局数据获取用户ID:', this.currentUserId)
+					return
+				}
+
+				// 方法2: 从本地存储获取完整的用户信息
+				const userInfo = uni.getStorageSync('userInfo')
+				if (userInfo && userInfo.id) {
+					this.currentUserId = userInfo.id
+					this.userInfo = userInfo
+					console.log('从存储获取用户ID:', this.currentUserId)
+					return
+				}
+
+				// 方法3: 直接获取用户ID
+				const userId = uni.getStorageSync('userId')
+				if (userId) {
+					this.currentUserId = userId
+					console.log('从存储获取用户ID:', userId)
+					return
+				}
+
+				console.log('所有获取用户信息的方法都失败了')
+			} catch (e) {
+				console.log('备用方案获取用户信息失败:', e)
+			}
+		},
+
+		loadIdentity() {
+			// 从全局数据获取身份
+			const app = getApp()
+			const globalIdentity = app.globalData.artisanType
+			console.log('从全局数据获取身份:', globalIdentity)
+
+			if (globalIdentity) {
+				this.identity = globalIdentity
+				uni.setStorageSync('user_identity', globalIdentity)
+			} else {
+				// 如果全局数据没有，尝试从本地存储获取
+				const localIdentity = uni.getStorageSync('user_identity')
+				if (localIdentity) {
+					this.identity = localIdentity
+					console.log('从本地存储获取身份:', localIdentity)
+				} else {
+					console.log('未获取到身份信息')
+					// 默认设为手艺人
+					this.identity = '1'
+				}
+			}
+
+			console.log('当前身份:', this.identity)
+		},
+
+		navigateToTimeSetting() {
+			if (this.identity == '2') {
+				// 商家跳转到营业时间页面
+				uni.navigateTo({
+					url: '/pages/shop/business-time'
+				})
+			} else {
+				// 手艺人跳转到服务时间页面
+				uni.navigateTo({
+					url: '/pages/artisan/service-time'
+				})
+			}
+		},
+
+		navigateToServiceSkill() {
+			if (this.identity == '2') {
+				// 商家跳转到商家服务技能页面
+				uni.navigateTo({
+					url: '/pages/shop/service-skills'
+				})
+			} else {
+				// 手艺人跳转到手艺人服务技能页面
+				uni.navigateTo({
+					url: '/pages/artisan/service-skills'
+				})
+			}
+		},
+
+		navigateToShopInfo() { // 商家：门店信息 
+			uni.navigateTo({
+				url: '/pages/shop/sj-info-change'
+			})
+		},
+
+		navigateToServiceArea() { // 手艺人：服务区域
+			uni.navigateTo({
+				url: '/pages/artisan/service-area'
+			})
+		},
+
+		navigateToPersonalInfo() { // 手艺人：个人信息
+			uni.navigateTo({
+				url: '/pages/artisan/syr-info-change'
+			})
+		},
+
+		navigateToimg() { // 图片管理
+			uni.navigateTo({
+				url: '/pages/shop/photoAlbum/photoManage?type=1'
+			})
+		},
+
+		navigateTovideo() { // 视频管理
+			uni.navigateTo({
+				url: '/pages/shop/photoAlbum/photoManage?type=2'
+			})
+		},
+
+		navigateToQualification() {
+			const idType = this.userInfo.id_type;
+			const credentialsState = this.userInfo.credentials_state;
+
+			if (idType === 0 && credentialsState === 0) {
+				// 从未入驻
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			} else if (idType > 0 && credentialsState === 0) {
+				// 已认证 + 待完善
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+			} else if (idType > 0 && credentialsState === 1) {
+				// 已认证 + 申请中
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+			} else if (idType < 0 && credentialsState === 1) {
+				// 未入驻 + 申请中
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			}
+		},
+
+		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: #FF4767;
-		margin-right: 10rpx;
-		border-radius: 5rpx;
-	}
+.title-bar {
+	width: 6rpx;
+	height: 30rpx;
+	background-color: #FF4767;
+	margin-right: 10rpx;
+	border-radius: 5rpx;
+}
 
-	.section-desc {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #666666;
-		line-height: 33rpx;
-		text-align: left;
-		font-style: normal;
-		margin-left: 20rpx;
-		letter-spacing: 0.5rpx;
-	}
+.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/home/components/brand-card.vue b/pages/home/components/brand-card.vue
index 894311d..c3ab8e5 100644
--- a/pages/home/components/brand-card.vue
+++ b/pages/home/components/brand-card.vue
@@ -34,8 +34,8 @@ const TAG_LIBRARY = {
     borderColor: '#D6CAC0 ',
     icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60816ae2-92ee-4473-9eca-562e1200dbca.png'
   },
-  recruit: {     // 学院招募
-    text: '学院招募',
+  recruit: {     // 学员招募
+    text: '学员招募',
     color: '#E5505F',
     borderColor: '#EFCFD2 ',
     icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fd0699b9-9f3c-4b1e-8693-d0c9ec7eabc3.png'
diff --git a/pages/my/my.vue b/pages/my/my.vue
index df01b52..85ed488 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -28,10 +28,11 @@
 						</view>
 						<view class="user_detail_tip" @click="toruzhu">
 							<image
-								:src="userInfo.credentials_state === 2 ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/13cd25db-5b52-4d36-bad2-ee8680eed65f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/711e35a8-a7a1-4eb2-8a76-52ac9795fa7e.png'"
+								:src="(userInfo.credentials_state === 2 || (userInfo.id_type > 0 && userInfo.credentials_state === 0)) ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/13cd25db-5b52-4d36-bad2-ee8680eed65f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/711e35a8-a7a1-4eb2-8a76-52ac9795fa7e.png'"
 								mode="widthFix" style="width:26rpx ;"></image>
 							<view class="user_detail_tip_phone" style="margin-left: -10rpx;">
-								{{ userInfo.credentials_state === 2 ? '认证通过' : userInfo.credentials_state === 1 ?
+								{{ (userInfo.credentials_state === 2 || (userInfo.id_type > 0 &&
+									userInfo.credentials_state === 0)) ? '认证通过' : userInfo.credentials_state === 1 ?
 									'资质审核中' : '资质待认证' }}
 							</view>
 							<image mode="widthFix"
@@ -793,18 +794,29 @@ export default {
 			});
 		},
 		toruzhu() {
-			if (this.userInfo.credentials_state === 2) {
+			const idType = this.userInfo.id_type;
+			const credentialsState = this.userInfo.credentials_state;
+
+			if (idType === 0 && credentialsState === 0) {
+				// 从未入驻
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			} else if (idType > 0 && credentialsState === 0) {
+				// 已认证 + 待完善
 				uni.navigateTo({
 					url: '/pages/shop/qualification_sj_change'
 				});
-			} else if (this.userInfo.credentials_state === 1) {
+			} else if (idType > 0 && credentialsState === 1) {
+				// 已认证 + 申请中
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+			} else if (idType < 0 && credentialsState === 1) {
+				// 未入驻 + 申请中
 				uni.navigateTo({
 					url: '/pages/ruzhu/ruzhu?type=1'
 				});
-			} else {
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu'
-				});
 			}
 		},
 		goToInviteList() {
@@ -867,7 +879,7 @@ page {
 	position: relative;
 	padding-bottom: 50rpx;
 	padding-top: var(--status-bar-height);
-	background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/825812de-54b3-486a-a3a0-2c4a1fb9fd28.png");
+	background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c7c4d24-9a21-4d21-b1ed-1aa985d188e6.png");
 	background-position: 0 0;
 	background-size: 100%;
 	background-repeat: no-repeat;

From 12826becd5c60e6b6bdbe8e8a8c08e895d00021e Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 3 Jun 2026 16:54:10 +0800
Subject: [PATCH 090/118] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E8=BF=9B=E5=85=A5=E4=B8=8D=E6=98=BE=E7=A4=BA+?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB=E7=9B=B8=E5=90=8Ctab?=
 =?UTF-8?q?=E4=BC=9A=E6=B8=85=E7=A9=BA=E6=95=B0=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/userorder-list.vue | 128 ++++++++++++++++++---------------
 1 file changed, 69 insertions(+), 59 deletions(-)

diff --git a/pages/order/userorder-list.vue b/pages/order/userorder-list.vue
index 81038d1..ada4742 100644
--- a/pages/order/userorder-list.vue
+++ b/pages/order/userorder-list.vue
@@ -289,26 +289,31 @@
             uni.hideTabBar(); // 隐藏原生TabBar
         },
         onShow() {
-            this.isLogin = uni.getStorageSync("accessToken") ? true : false;
-            if (this.isLogin) {
-                // 默认选中判断
-                if(!this.activeFirstId) this.activeFirstId = 1;
-                if(!this.activeSecondId) this.activeSecondId = 3;
-                this.searchList();
-            } else {
-                this.activeFirstId = null;
-                this.activeSecondId = null; 
-            }
-        },
-        watch: {
-            isLogin(newVal) {
-                if (newVal) {
-                    this.activeFirstId = 1;
-                    this.activeSecondId = 2; // 默认选中"待接单"
-                    this.searchList();
-                }
-            },
-        },
+			this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+			if (this.isLogin) {
+				// 确保默认选中项正确
+				if(!this.activeFirstId) this.activeFirstId = 1;
+				if(!this.activeSecondId) this.activeSecondId = 3; // 或者你想默认 2 (待接单)，这里统一就行
+				
+				// 使用 $nextTick 确保 CommonList 组件已经渲染完毕再调用刷新
+				this.$nextTick(() => {
+					this.searchList();
+				});
+			} else {
+				this.activeFirstId = null;
+				this.activeSecondId = null; 
+				this.popList = []; // 没登录清空数据
+			}
+		},
+        // watch: {
+        //     isLogin(newVal) {
+        //         if (newVal) {
+        //             this.activeFirstId = 1;
+        //             this.activeSecondId = 2; // 默认选中"待接单"
+        //             this.searchList();
+        //         }
+        //     },
+        // },
         methods: {
             searchList() {
                 if (this.syrId && this.idType) {
@@ -342,50 +347,55 @@
             },
             // 一级tab点击事件
             handleFirstTabClick(item) {
-                this.popList = []
-                if (!this.isLogin) return;
-                // 避免重复点击
-                if (this.activeFirstId === item.id) return;
-                // 更新1级选中状态
-                this.activeFirstId = item.id;
+				if (!this.isLogin) return;
+				// 避免重复点击 (一定要在最前面！)
+				if (this.activeFirstId === item.id) return;
+				
+				// 【修改点】：判断完不是重复点击后，再清空旧数据
+				this.popList = []; 
+				
+				// 更新1级选中状态
+				this.activeFirstId = item.id;
 
-                this.haveButton = true
-                if (this.activeFirstId == 4 || this.activeFirstId == 5) {
-                    this.haveButton = false
-                }
+				this.haveButton = true;
+				if (this.activeFirstId == 4 || this.activeFirstId == 5) {
+					this.haveButton = false;
+				}
 
-                // 重置2级选中状态（默认选中"全部"）
-                if (this.activeFirstId == 1 || this.activeFirstId == 2) {
-                    this.activeSecondId = 3;
-                } else {
-                    this.activeSecondId = 2;
-                }
+				// 重置2级选中状态
+				if (this.activeFirstId == 1 || this.activeFirstId == 2) {
+					this.activeSecondId = 3;
+				} else {
+					this.activeSecondId = 2;
+				}
 
-                // 传递给父组件（1级选中数据）
-                this.$emit("tabChange", {
-                    firstId: this.activeFirstId,
-                    secondId: this.activeSecondId,
-                });
-                this.$nextTick(() => {
-                    this.searchList();
-                });
-            },
+				this.$emit("tabChange", {
+					firstId: this.activeFirstId,
+					secondId: this.activeSecondId,
+				});
+				
+				this.$nextTick(() => {
+					this.searchList();
+				});
+			},
             // 二级tab点击事件
             handleSecondTabClick(id, title) {
-                this.popList = []
-                if (!this.isLogin) return;
-                if (this.activeSecondId === id) return;
-                // 更新2级选中状态
-                this.activeSecondId = id;
-                // 传递给父组件（2级选中数据）
-                this.$emit("tabChange", {
-                    firstId: this.activeFirstId,
-                    secondId: this.activeSecondId,
-                });
-                this.$nextTick(() => {
-                    this.searchList();
-                });
-            },
+				if (!this.isLogin) return;
+				// 避免重复点击！
+				if (this.activeSecondId === id) return;	
+				// 判断完不是重复点击后，再清空旧数据
+				this.popList = []; 		
+				// 更新2级选中状态
+				this.activeSecondId = id;			
+				this.$emit("tabChange", {
+					firstId: this.activeFirstId,
+					secondId: this.activeSecondId,
+				});
+				
+				this.$nextTick(() => {
+					this.searchList();
+				});
+			},
             cancelOrder(e, order) {
                 uni.showModal({
                     title: "取消订单",

From d5d7242ec76456d83ff52bfa4727f0eb535d2a75 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 3 Jun 2026 17:49:04 +0800
Subject: [PATCH 091/118] 1

---
 pages/home/home.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index d1fc9a5..0e100c6 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -146,8 +146,8 @@
           </view>
           <view class="grid-item">
             <text class="label">成交金额</text>
-            <view class="val-box"><text class="val">{{ orderDetail.amount }}</text> <text class="unit">万</text></view>
-            <text class="yesterday">昨日{{ orderDetail.yAmount }}万</text>
+            <view class="val-box"><text class="val">{{ orderDetail.amount }}</text> <text class="unit">元</text></view>
+            <text class="yesterday">昨日{{ orderDetail.yAmount }}元</text>
           </view>
         </view>
       </view>

From 1e56c78f12b28cc3d9c7137fe43cc429e3bacc6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 3 Jun 2026 17:49:38 +0800
Subject: [PATCH 092/118] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E6=94=B9=E7=89=88=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8E=E8=AF=B7=E6=B1=82=E5=B7=A5=E5=85=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/album/index.nvue          |  10 +-
 pages/home/home.vue             |   2 +-
 pages/jingxuan/brand-detail.vue | 329 +++++++++++++++++---------------
 3 files changed, 186 insertions(+), 155 deletions(-)

diff --git a/pages/album/index.nvue b/pages/album/index.nvue
index cd2c2cd..5fc2123 100644
--- a/pages/album/index.nvue
+++ b/pages/album/index.nvue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="positonFixed">
-			<view class="header-top flex-row-center" :style="{ height: `${100}rpx`,paddingTop:`${statusBarHeight}rpx`}">
+			<view class="header-top flex-row-center" :style="{ height: `${100 + statusBarHeight}rpx`,paddingTop:`${statusBarHeight}rpx`}">
 				<view class="left-area" @click="goBack">
 					<image src="/static/images/back.png" mode="aspectFit" class="back-icon"></image>
 				</view>
@@ -25,7 +25,7 @@
 			<swiper class="swiper" circular :style="swiperStyle" :current="current" @change="swiperChange"
 				:disable-touch="current==0">
 				<swiper-item>
-					<scroll-view scroll-y :style="{height:`${viewportHeight-100-this.statusBarHeight}rpx`}">
+					<scroll-view scroll-y :style="{height:`${viewportHeight - 100 - statusBarHeight}rpx`}">
 						<view class="swiper-items3">
 							<view class="swiper-item3" :class="{item2Left:index%2 == 0}"
 								v-for="(item,index) in videoList" :key="index" @click="tovideo(item)">
@@ -40,7 +40,7 @@
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
-					<scroll-view scroll-y :style="{height:`${viewportHeight-100-this.statusBarHeight-100}rpx`}">
+					<scroll-view scroll-y :style="{height:`${viewportHeight - 100 - statusBarHeight - 100}rpx`}">
 						<view class="swiper-items2">
 							<view class="swiper-item2" :class="{item2Left:index%2 == 0}"
 								v-for="(item,index) in imagObj[cardListIndex]" :key="index" @click="toimg(item)">
@@ -166,7 +166,7 @@
 					};
 				}
 				return {
-					height: `${this.viewportHeight}rpx`
+					height: `${this.viewportHeight - 100 - this.statusBarHeight}rpx`
 				};
 			},
 			swiperStyle2() {
@@ -176,7 +176,7 @@
 					};
 				}
 				return {
-					height: `${this.viewportHeight}rpx`
+					height: `${this.viewportHeight - 100 - this.statusBarHeight}rpx`
 				};
 			},
 			swiperStyle3() {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 0e100c6..3f0e943 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -542,7 +542,7 @@ export default {
 
     // 获取：通知公告列表
     fetchNoticeList() {
-      request.post('/sj/notice/list', { page: 1, limit: 6 }).then(res => {
+      request.post('/sj/notice/list', { page: 1, limit: 5 }).then(res => {
         if(res.code == 200 && res.data && res.data.list.length > 0) {
           this.noticeList = res.data.list;
         }
diff --git a/pages/jingxuan/brand-detail.vue b/pages/jingxuan/brand-detail.vue
index 5907cdc..600d72a 100644
--- a/pages/jingxuan/brand-detail.vue
+++ b/pages/jingxuan/brand-detail.vue
@@ -1,40 +1,27 @@
 <template>
   <view class="brand-detail-page">
-    
-    <custom-navbar 
-      :title="info.name || '品牌详情'" 
-      :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60ae3383-6ff6-4f42-818b-d9b09a9bd0e0.png'" 
-      :showUser="true"
-      backgroundColor="#ffffff" 
-      titleColor="#333" 
-      borderBottom="none"
-      :show-headle="true"
-      :headleSrc="isCollected ? iconCollectOn : iconCollectOff" 
-      @onHeadleClick="toggleCollectStatus"
-      >
+
+    <custom-navbar :title="info.name || '品牌详情'"
+      :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60ae3383-6ff6-4f42-818b-d9b09a9bd0e0.png'"
+      :showUser="true" backgroundColor="#ffffff" titleColor="#333" borderBottom="none" :show-headle="true"
+      :headleSrc="isCollected ? iconCollectOn : iconCollectOff" @onHeadleClick="toggleCollectStatus">
     </custom-navbar>
 
     <!-- 顶部导航栏扩展：动态计算位置的拨号图标 -->
     <view class="nav-phone-wrap" :style="{ top: phoneIconTop + 'px', right: phoneIconRight + 'px' }" @click="makeCall">
-      <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c164280f-1ab9-41b4-9d60-846368364e9c.png" class="nav-phone-icon"></image>
+      <image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c164280f-1ab9-41b4-9d60-846368364e9c.png"
+        class="nav-phone-icon"></image>
     </view>
-                  
-   <!-- <view class="mock-switch" @click="toggleMockData">
+
+    <!-- <view class="mock-switch" @click="toggleMockData">
       <text>{{ useMockData ? '关闭模拟数据' : '开启模拟数据' }}</text>
     </view> -->
-                  
+
     <view class="banner-section" v-if="bannerList && bannerList.length || info.video">
-      
+
       <!-- 原生视频组件 (就地播放) -->
-      <video 
-        v-if="info.video && isVideoPlaying" 
-        id="myVideo"
-        class="banner-video" 
-        :src="info.video" 
-        autoplay 
-        controls 
-        object-fit="cover"
-      ></video>
+      <video v-if="info.video && isVideoPlaying" id="myVideo" class="banner-video" :src="info.video" autoplay controls
+        object-fit="cover"></video>
 
       <!-- 轮播图区域 (当视频播放时隐藏) -->
       <swiper v-else class="banner-swiper" circular @change="onSwiperChange" :autoplay="!info.video">
@@ -42,15 +29,12 @@
           <image class="banner-img" :src="item" mode="aspectFill"></image>
         </swiper-item>
       </swiper>
-      
+
       <!-- 居中的视频播放大图标 (当视频播放时隐藏) -->
-      <image 
-        v-if="info.video && !isVideoPlaying" 
-        class="center-play-icon" 
-        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb720bb0-4ada-49f6-9ce5-38abfd613d5d.png" 
-        @click="playVideoInPlace"
-      ></image>
-      
+      <image v-if="info.video && !isVideoPlaying" class="center-play-icon"
+        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb720bb0-4ada-49f6-9ce5-38abfd613d5d.png"
+        @click="playVideoInPlace"></image>
+
       <!-- 视频/图片 相册切换组件 (当视频播放时隐藏) -->
       <view class="album" v-if="(info.video || bannerList.length > 0) && !isVideoPlaying">
         <view class="album-left" @click="info.video ? playVideoInPlace() : goAlbum()">
@@ -62,7 +46,7 @@
           <image src="/static/images/icons/right7_13.png" class="album-right-img"></image>
         </view>
       </view>
-      
+
       <!-- 指示器 (当视频播放时隐藏) -->
       <view class="indicator" v-if="!isVideoPlaying && bannerList.length > 0">
         <text>{{ currentBannerIndex + 1 }} / {{ bannerList.length }}</text>
@@ -72,7 +56,7 @@
     <view class="intro-section" v-if="info.name">
       <view class="section-title">品牌介绍</view>
       <view class="intro-content" :class="{ 'is-expanded': isExpanded }">
-        <text  v-html="info.detail || '暂无品牌介绍'" class="intro-text"></text>
+        <rich-text :nodes="formatDetailContent" class="intro-text"></rich-text>
       </view>
       <view class="expand-btn" @click="toggleExpand" v-if="info.detail && info.detail.length > 100">
         <text class="expand-text">{{ isExpanded ? '收起查看' : '展开查看' }}</text>
@@ -84,19 +68,14 @@
       <view class="divider-bg"></view>
       <view class="tab-section">
         <view class="tab-header">
-          <view 
-            class="tab-item" 
-            v-for="(tab, index) in availableTabs" 
-            :key="tab.key"
-            :class="{ active: activeTab === index }"
-            @click="switchTab(index)"
-          >
+          <view class="tab-item" v-for="(tab, index) in availableTabs" :key="tab.key"
+            :class="{ active: activeTab === index }" @click="switchTab(index)">
             <!-- 加上 class="tab-text" 以便控制层级 -->
             <text class="tab-text">{{ tab.name }}</text>
             <view v-if="activeTab === index" class="active-line"></view>
           </view>
         </view>
-        
+
         <view class="tab-content" v-if="availableTabs[activeTab]">
           <rich-text :nodes="availableTabs[activeTab].content"></rich-text>
         </view>
@@ -108,18 +87,19 @@
     <view class="form-section">
       <!-- 动态标题：当选中学员招募时显示"立即咨询"，否则显示"在线留言" -->
       <view class="section-title">{{ activeTabKey === 'student' ? '立即咨询' : '在线留言' }}</view>
-      
+
       <view class="form-list">
         <view class="form-item">
           <view class="label"><text class="required">*</text>姓名</view>
           <input class="input-el" v-model="formData.contact_name" placeholder="请输入您的姓名" placeholder-class="ph-style" />
         </view>
-        
+
         <view class="form-item">
           <view class="label"><text class="required">*</text>手机号码</view>
-          <input class="input-el" type="number" maxlength="11" v-model="formData.contact_phone" placeholder="请输入您的手机号码" placeholder-class="ph-style" />
+          <input class="input-el" type="number" maxlength="11" v-model="formData.contact_phone" placeholder="请输入您的手机号码"
+            placeholder-class="ph-style" />
         </view>
-        
+
         <view class="form-item">
           <view class="label"><text class="required">*</text>所在城市</view>
           <!-- 替换为复用的弹窗选择器 -->
@@ -130,7 +110,7 @@
             </view>
           </view>
         </view>
-        
+
         <view class="form-item">
           <view class="label"><text class="required">*</text>意向</view>
           <picker class="picker-el" :range="intentionOptions" range-key="label" @change="onIntentionChange">
@@ -140,10 +120,11 @@
             </view>
           </picker>
         </view>
-        
+
         <view class="form-item border-none" v-if="formData.intention === 1">
           <view class="label"><text class="required">*</text>其他意向</view>
-          <input class="input-el" v-model="formData.intention_other" placeholder="请填写您的其他意向" placeholder-class="ph-style" />
+          <input class="input-el" v-model="formData.intention_other" placeholder="请填写您的其他意向"
+            placeholder-class="ph-style" />
         </view>
       </view>
 
@@ -159,18 +140,16 @@
           <text class="popup-close" @click="hideLocationPopup">×</text>
         </view>
         <view class="region-body">
-          <picker-view @change="bindChangeLocation"
-            class="picker-scroll"
-            :indicator-style="indicatorStyle"
+          <picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
             :value="locationValue">
             <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in ChinaCitys" :key="index">{{item.province}}</view>
+              <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">{{ item.province }}</view>
             </picker-view-column>
             <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in locatinCitys" :key="index">{{item.city}}</view>
+              <view class="picker-item" v-for="(item, index) in locatinCitys" :key="index">{{ item.city }}</view>
             </picker-view-column>
             <picker-view-column>
-              <view class="picker-item" v-for="(item,index) in locationAreas" :key="index">{{item.area}}</view>
+              <view class="picker-item" v-for="(item, index) in locationAreas" :key="index">{{ item.area }}</view>
             </picker-view-column>
           </picker-view>
         </view>
@@ -196,7 +175,7 @@
 import request from "@/utils/request";
 import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
 import tipsPopup2 from "@/components/tips-popup/tips-popup2";
-import ChinaCitys from "@/static/data/ChinaCitys.json"; 
+import ChinaCitys from "@/static/data/ChinaCitys.json";
 
 export default {
   components: {
@@ -206,11 +185,11 @@ export default {
   data() {
     return {
       // 模拟数据开关
-      useMockData: false, 
-      
-      brandId: null, 
-      info: {},      
-      bannerList: [], 
+      useMockData: false,
+
+      brandId: null,
+      info: {},
+      bannerList: [],
 
       // ====== 收藏和登录相关的状态 ======
       isLogin: false, // 登录状态
@@ -220,19 +199,19 @@ export default {
 
       isCollected: false, // 是否已收藏
       // 未收藏时的灰色星星
-      iconCollectOff: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/561715a5-3de0-49f3-80e4-2662febec500.png', 
+      iconCollectOff: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/561715a5-3de0-49f3-80e4-2662febec500.png',
       // 已收藏时的粉色星星
       iconCollectOn: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fe2011b0-a34d-46ee-911a-0ea6f099ad77.png',
       // ==================================
-      
+
       isVideoPlaying: false, // 是否正在就地播放视频
       phoneIconTop: 20,      // 顶部电话图标初始Top
       phoneIconRight: 50,    // 顶部电话图标初始Right
-      
+
       currentBannerIndex: 0,
       isExpanded: false,
       activeTab: 0,
-      
+
       // 省市区选择器相关数据
       showLocationPopupFlag: false,
       indicatorStyle: 'height: 68rpx;',
@@ -243,18 +222,20 @@ export default {
 
       formData: {
         id: null,
-        intention: '',        
-        intention_other: '',  
-        contact_name: '',     
-        contact_phone: '',    
-        province_code: '',    
-        city_code: '',        
-        area_code: ''         
+        intention: '',
+        intention_other: '',
+        contact_name: '',
+        contact_phone: '',
+        province_code: '',
+        city_code: '',
+        area_code: ''
       },
-      
-      cityNameText: '',  
-      intentionText: '', 
-      
+
+      cityNameText: '',
+      intentionText: '',
+      hasSubmitted: false,
+      submittedData: null,
+
       intentionOptions: [
         { value: 2, label: '品牌加盟' },
         { value: 3, label: '购买产品' },
@@ -268,18 +249,30 @@ export default {
     activeTabKey() {
       return this.availableTabs[this.activeTab]?.key || '';
     },
+    formatDetailContent() {
+      const html = this.info.detail;
+      if (!html) return '<div style="color:#999;font-size:13px;text-align:center;">暂无品牌介绍</div>';
+
+      let newHtml = html.replace(/<img[^>]*>/gi, function (match) {
+        match = match.replace(/style\s*=\s*["'][^"']*["']/gi, '');
+        return match.replace(/<img/gi, '<img style="max-width:100%; height:auto; display:block; border-radius:20rpx; margin:8px 0;"');
+      });
+
+      newHtml = newHtml.replace(/<p[^>]*>/gi, '<p style="margin-bottom: 0px; line-height: 1.6; word-break: break-all;">');
+      return newHtml;
+    },
     availableTabs() {
       const tabs = [];
-      
+
       // 处理富文本图片和小程序样式丢失的绝佳方法
       const formatRichText = (html) => {
         if (!html) return '<div style="color:#999;font-size:13px;text-align:center;">暂无详细说明</div>';
-        
-        let newHtml = html.replace(/<img[^>]*>/gi, function(match) {
-          match = match.replace(/style\s*=\s*["'][^"']*["']/gi, ''); 
+
+        let newHtml = html.replace(/<img[^>]*>/gi, function (match) {
+          match = match.replace(/style\s*=\s*["'][^"']*["']/gi, '');
           return match.replace(/<img/gi, '<img style="max-width:100%; height:auto; display:block; border-radius:20rpx; margin:8px 0;"');
         });
-        
+
         newHtml = newHtml.replace(/<p[^>]*>/gi, '<p style="margin-bottom: 0px; line-height: 1.6; word-break: break-all;">');
         return newHtml;
       };
@@ -358,8 +351,8 @@ export default {
 
       // 2. 逻辑判断
       if (!this.brandId) return;
-      const targetState = this.isCollected ? 2 : 1; 
-      
+      const targetState = this.isCollected ? 2 : 1;
+
       // 3. 模拟环境 (Mock)
       if (this.useMockData) {
         this.isCollected = !this.isCollected;
@@ -375,9 +368,9 @@ export default {
       }).then((res) => {
         if (res.code == 200) {
           this.isCollected = !this.isCollected;
-          uni.showToast({ 
-            title: this.isCollected ? '收藏成功' : '已取消收藏', 
-            icon: 'none' 
+          uni.showToast({
+            title: this.isCollected ? '收藏成功' : '已取消收藏',
+            icon: 'none'
           });
         } else {
           uni.showToast({ title: res.msg || '操作失败', icon: 'none' });
@@ -410,36 +403,36 @@ export default {
       let index1 = valueArr[0] || 0;
       let index2 = valueArr[1] || 0;
       let index3 = valueArr[2] || 0;
-      
+
       let province = this.ChinaCitys[index1].province;
       let city = this.locatinCitys[index2].city;
       let area = this.locationAreas[index3].area;
-      
+
       // 更新展示文本及表单数据
       this.cityNameText = `${province} / ${city} / ${area}`;
       this.formData.province_code = province;
       this.formData.city_code = city;
       this.formData.area_code = area;
-      
+
       this.showLocationPopupFlag = false;
     },
 
     initNavLayout() {
       let sysInfo = uni.getSystemInfoSync();
       // NavBar 通常高度是 44px，悬浮容器设置为 40px 高，居中 Y 为 +2px
-      let top = (sysInfo.statusBarHeight || 0) + 2; 
+      let top = (sysInfo.statusBarHeight || 0) + 2;
       // 默认距离右侧边距
-      let right = 50; 
-      
+      let right = 50;
+
       // #ifdef MP-WEIXIN
       let menuBtn = uni.getMenuButtonBoundingClientRect();
       if (menuBtn) {
-        top = menuBtn.top + (menuBtn.height / 2) - 20; 
+        top = menuBtn.top + (menuBtn.height / 2) - 20;
         // 算出胶囊左侧的可用空间，再留出右侧搜索图标的距离(通常再向左偏移 45px 左右)
-        right = sysInfo.windowWidth - menuBtn.left + 45; 
+        right = sysInfo.windowWidth - menuBtn.left + 45;
       }
       // #endif
-      
+
       this.phoneIconTop = top;
       this.phoneIconRight = right;
     },
@@ -447,7 +440,7 @@ export default {
     // 拨打电话面板
     makeCall() {
       // 兼容可能存在的多种手机号字段
-      const phone = this.info.contact_phone || ''; 
+      const phone = this.info.contact_phone || '';
       if (phone) {
         uni.makePhoneCall({
           phoneNumber: String(phone),
@@ -486,8 +479,8 @@ export default {
       }
 
       uni.showLoading({ title: '加载中...' });
-      request.post("/sj/brand/details", { 
-        id: this.brandId 
+      request.post("/sj/brand/details", {
+        id: this.brandId
       }).then((res) => {
         if (res.code == 200 && res.data) {
           this.info = res.data;
@@ -507,8 +500,8 @@ export default {
     injectMockData() {
       this.info = {
         name: '蜜丝卡伦美甲美睫',
-        contact_phone: '400-888-8888', 
-        video: 'https://vjs.zencdn.net/v/oceans.mp4', 
+        contact_phone: '400-888-8888',
+        video: 'https://vjs.zencdn.net/v/oceans.mp4',
         banner_imgs: [
           'https://images.unsplash.com/photo-1610992015732-2449b76344bc?ixlib=rb-4.0.3&auto=format&fit=crop&w=750&q=80',
           'https://images.unsplash.com/photo-1522337660859-02fbefca4702?ixlib=rb-4.0.3&auto=format&fit=crop&w=750&q=80'
@@ -554,7 +547,7 @@ export default {
     switchTab(index) {
       this.activeTab = index;
     },
-    
+
     onIntentionChange(e) {
       const selectItem = this.intentionOptions[e.detail.value];
       this.intentionText = selectItem.label;
@@ -566,15 +559,37 @@ export default {
         uni.showToast({ title: '请填写完整必填信息', icon: 'none' });
         return;
       }
-      
+
       if (!/^1[3-9]\d{9}$/.test(this.formData.contact_phone)) {
         uni.showToast({ title: '请输入合法的手机号码', icon: 'none' });
         return;
       }
 
+      // 检查是否重复提交
+      if (this.hasSubmitted && this.submittedData) {
+        const currentData = JSON.stringify({
+          contact_name: this.formData.contact_name,
+          contact_phone: this.formData.contact_phone,
+          province_code: this.formData.province_code,
+          city_code: this.formData.city_code,
+          area_code: this.formData.area_code,
+          intention: this.formData.intention,
+          intention_other: this.formData.intention_other
+        });
+        if (currentData === this.submittedData) {
+          uni.showModal({
+            title: '提示',
+            content: '未修改内容，不能再次提交',
+            showCancel: false,
+            confirmText: '知道了'
+          });
+          return;
+        }
+      }
+
       if (this.useMockData) {
         uni.showToast({ title: '模拟环境下留言提交成功！', icon: 'success' });
-        this.resetForm();
+        this.saveSubmittedData();
         return;
       }
 
@@ -582,7 +597,7 @@ export default {
       request.post("/sj/brand/consult", this.formData).then((res) => {
         if (res.code == 200) {
           uni.showToast({ title: '留言提交成功！', icon: 'success', duration: 2000 });
-          this.resetForm();
+          this.saveSubmittedData();
         } else {
           uni.showToast({ title: res.msg || '提交失败', icon: 'none' });
         }
@@ -592,7 +607,20 @@ export default {
         uni.hideLoading();
       });
     },
-    
+
+    saveSubmittedData() {
+      this.hasSubmitted = true;
+      this.submittedData = JSON.stringify({
+        contact_name: this.formData.contact_name,
+        contact_phone: this.formData.contact_phone,
+        province_code: this.formData.province_code,
+        city_code: this.formData.city_code,
+        area_code: this.formData.area_code,
+        intention: this.formData.intention,
+        intention_other: this.formData.intention_other
+      });
+    },
+
     resetForm() {
       this.formData = {
         id: this.brandId,
@@ -630,11 +658,11 @@ export default {
   align-items: center;
   justify-content: center;
   transition: opacity 0.2s;
-  
+
   &:active {
     opacity: 0.7;
   }
-  
+
   .nav-phone-icon {
     width: 44rpx;
     height: 44rpx;
@@ -661,23 +689,23 @@ export default {
   width: 100%;
   height: 421rpx;
   background-color: #f5f5f5;
-  
+
   .banner-video {
     width: 100%;
     height: 100%;
     display: block;
   }
-  
+
   .banner-swiper {
     width: 100%;
     height: 100%;
   }
-  
+
   .banner-img {
     width: 100%;
     height: 100%;
   }
-  
+
   .center-play-icon {
     position: absolute;
     top: 50%;
@@ -687,12 +715,12 @@ export default {
     height: 120rpx;
     z-index: 20;
     transition: opacity 0.3s;
-    
+
     &:active {
       opacity: 0.8;
     }
   }
-  
+
   .album {
     position: absolute;
     bottom: 10rpx;
@@ -704,7 +732,7 @@ export default {
     display: flex;
     align-items: center;
     z-index: 10;
-    
+
     .album-left {
       width: 73rpx;
       height: 44rpx;
@@ -744,7 +772,7 @@ export default {
       }
     }
   }
-  
+
   .indicator {
     position: absolute;
     right: 20rpx;
@@ -764,7 +792,7 @@ export default {
 /* 2. 品牌介绍 */
 .intro-section {
   padding: 40rpx 30rpx;
-  
+
   .section-title {
     font-weight: 500;
     font-size: 30rpx;
@@ -772,7 +800,7 @@ export default {
     line-height: 42rpx;
     margin-bottom: 24rpx;
   }
-  
+
   .intro-content {
     font-weight: 400;
     font-size: 26rpx;
@@ -782,13 +810,13 @@ export default {
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 19;
     overflow: hidden;
-    white-space: pre-line; 
-    
+    white-space: pre-line;
+
     &.is-expanded {
       -webkit-line-clamp: 9999;
     }
   }
-  
+
   .expand-btn {
     display: flex;
     justify-content: center;
@@ -800,7 +828,7 @@ export default {
     width: fit-content;
     margin-left: auto;
     margin-right: auto;
-    
+
     .expand-text {
       font-weight: 400;
       font-size: 24rpx;
@@ -808,7 +836,7 @@ export default {
       line-height: 33rpx;
       margin-right: 8rpx;
     }
-    
+
     .arrow {
       margin-bottom: -2rpx;
       width: 10rpx;
@@ -817,7 +845,7 @@ export default {
       border-bottom: 2rpx solid #999999;
       transform: rotate(45deg) translateY(-2rpx);
       transition: transform 0.2s ease;
-      
+
       &.up {
         transform: rotate(-135deg) translateY(2rpx);
       }
@@ -834,7 +862,7 @@ export default {
 /* 3. 招募详情 Tab */
 .tab-section {
   padding: 0 30rpx 40rpx;
-  
+
   .tab-header {
     display: flex;
     justify-content: center;
@@ -842,7 +870,7 @@ export default {
     padding: 30rpx 0 0 0;
     gap: 120rpx;
     margin-bottom: 10rpx;
-    
+
     .tab-item {
       font-weight: 400;
       font-size: 28rpx;
@@ -851,7 +879,7 @@ export default {
       position: relative;
       padding-bottom: 16rpx;
       transition: all 0.2s;
-      
+
       &.active {
         font-weight: 500;
         font-size: 30rpx;
@@ -862,7 +890,7 @@ export default {
         position: relative;
         z-index: 2;
       }
-      
+
       .active-line {
         position: absolute;
         bottom: 20rpx;
@@ -877,13 +905,13 @@ export default {
       }
     }
   }
-  
+
   .tab-content {
     font-weight: 400;
     font-size: 26rpx;
     color: #333333;
     line-height: 37rpx;
-    
+
     ::v-deep img {
       max-width: 100% !important;
       height: auto !important;
@@ -891,8 +919,9 @@ export default {
       border-radius: 12rpx;
       margin: 20rpx 0;
     }
-    
-    ::v-deep p, ::v-deep div {
+
+    ::v-deep p,
+    ::v-deep div {
       margin-bottom: 24rpx;
       line-height: 1.6;
     }
@@ -902,7 +931,7 @@ export default {
 /* 4. 在线留言表单 */
 .form-section {
   padding: 40rpx 30rpx;
-  
+
   .section-title {
     font-weight: 500;
     font-size: 30rpx;
@@ -910,51 +939,52 @@ export default {
     line-height: 42rpx;
     margin-bottom: 20rpx;
   }
-  
+
   .form-list {
     .form-item {
       display: flex;
       align-items: center;
       min-height: 104rpx;
       border-bottom: 1rpx solid #F5F5F5;
-      
+
       &.border-none {
         border-bottom: none;
       }
-      
+
       .label {
         width: 190rpx;
         font-size: 28rpx;
         color: #333333;
         line-height: 40rpx;
-        
+
         .required {
           color: #E5505F;
           margin-right: 3rpx;
         }
       }
-      
-      .input-el, .picker-el {
+
+      .input-el,
+      .picker-el {
         flex: 1;
         font-size: 28rpx;
         color: #333333;
       }
-      
+
       .ph-style {
         color: #C4C4C4;
       }
-      
+
       .picker-value {
         color: #CCCCCC;
         display: flex;
         align-items: center;
         justify-content: space-between;
         width: 100%;
-        
+
         &.has-val {
           color: #333333;
         }
-        
+
         .arrow-right {
           width: 12rpx;
           height: 12rpx;
@@ -965,7 +995,7 @@ export default {
       }
     }
   }
-  
+
   .submit-btn {
     margin-top: 60rpx;
     width: 100%;
@@ -978,13 +1008,13 @@ export default {
     text-align: center;
     border: none;
     transition: all 0.2s ease;
-    
+
     &::after {
       border: none;
     }
-    
+
     &.is-active {
-      background-color: #FF4767; 
+      background-color: #FF4767;
       color: #FFFFFF;
       box-shadow: 0 8rpx 16rpx rgba(229, 80, 95, 0.15);
     }
@@ -997,7 +1027,8 @@ export default {
   left: 0;
   right: 0;
   bottom: 0;
-  z-index: 9999; /* 层级调高，防止被挡住 */
+  z-index: 9999;
+  /* 层级调高，防止被挡住 */
   visibility: hidden;
   opacity: 0;
   transition: all 0.3s ease;

From d6d5f533cf06580131262a29896346b6245a1d8d Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 3 Jun 2026 17:54:37 +0800
Subject: [PATCH 093/118] =?UTF-8?q?=E4=B8=87=E5=85=83=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 3f0e943..3ec9aa2 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -146,8 +146,11 @@
           </view>
           <view class="grid-item">
             <text class="label">成交金额</text>
-            <view class="val-box"><text class="val">{{ orderDetail.amount }}</text> <text class="unit">元</text></view>
-            <text class="yesterday">昨日{{ orderDetail.yAmount }}元</text>
+            <view class="val-box">
+              <text class="val">{{ formattedAmount.val }}</text> 
+              <text class="unit">{{ formattedAmount.unit }}</text>
+            </view>
+            <text class="yesterday">昨日{{ formattedYAmount.val }}{{ formattedYAmount.unit }}</text>
           </view>
         </view>
       </view>
@@ -249,6 +252,14 @@ export default {
     };
   },
   computed: {
+    // 格式化今日成交金额
+    formattedAmount() {
+      return this.formatMoney(this.orderDetail.amount);
+    },
+    // 格式化昨日成交金额
+    formattedYAmount() {
+      return this.formatMoney(this.orderDetail.yAmount);
+    },
     // 依靠后端实际返回的资料详情来判断是否真的提交过申请，而不是无脑信 id_type: -1
     isUnderReview() {
       if (!this.isLogin) return false;
@@ -364,6 +375,19 @@ export default {
     }
   },
   methods: {
+    // 金额转换万单位处理
+    formatMoney(amount) {
+      let num = parseFloat(amount);
+      if (isNaN(num)) return { val: '0', unit: '元' };
+      
+      if (num >= 10000) {
+        // 达到一万及以上，除以10000，最多保留两位小数（parseFloat会自动去掉末尾的0）
+        let val = parseFloat((num / 10000).toFixed(2));
+        return { val: val, unit: '万元' };
+      }
+      // 小于一万，原样返回，单位为元
+      return { val: num, unit: '元' };
+    },
     // 处理登录跳转
     handleLoginRedirect() {
     // 如果 isLogin 为 false（未登录状态），则跳转到登录页

From fc3bd046e9b62bf30f26cceb3daaee7997b0b93c Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 4 Jun 2026 10:51:59 +0800
Subject: [PATCH 094/118] =?UTF-8?q?=E7=B2=89=E8=89=B2=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/step-tab/step-tab.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/step-tab/step-tab.vue b/components/step-tab/step-tab.vue
index 943a842..7b9b60f 100644
--- a/components/step-tab/step-tab.vue
+++ b/components/step-tab/step-tab.vue
@@ -5,7 +5,7 @@
         <view class="step-icon">
           <image
             v-if="mappedStep === 0"
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d62a1d01-52cb-418e-ba5b-afef513061b9.png"
             class="step-img active-circle"
             mode="aspectFit"
           />
@@ -23,7 +23,7 @@
         <view class="step-icon">
           <image
             v-if="mappedStep === 1"
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d62a1d01-52cb-418e-ba5b-afef513061b9.png"
             class="step-img active-circle"
             mode="aspectFit"
           />
@@ -41,7 +41,7 @@
         <view class="step-icon">
           <image
             v-if="mappedStep === 2"
-            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/55a51333-318f-4ae4-8402-aca265bd499d"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d62a1d01-52cb-418e-ba5b-afef513061b9.png"
             class="step-img active-circle"
             mode="aspectFit"
           />

From d8d6be6206ddd55e175a6674b1960b916377cfac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Thu, 4 Jun 2026 11:45:11 +0800
Subject: [PATCH 095/118] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/brand-card.vue |  438 ++--
 pages/home/components/skill-card.vue |   63 +-
 pages/home/home.vue                  | 2951 ++++++++++++++------------
 pages/jingxuan/brand-detail.vue      |  228 +-
 pages/my/myFavorite.vue              |  208 +-
 5 files changed, 2125 insertions(+), 1763 deletions(-)

diff --git a/pages/home/components/brand-card.vue b/pages/home/components/brand-card.vue
index c3ab8e5..4abd582 100644
--- a/pages/home/components/brand-card.vue
+++ b/pages/home/components/brand-card.vue
@@ -1,212 +1,228 @@
-<template>
-  <view class="brand-card-comp" @click="onClick">
-    <image class="brand-bg" :src="item.bgSrc" mode="aspectFill"></image>
-    <image class="mask-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9bca353c-fa74-407e-a69e-6f5e9aa43955.png" mode="widthFix"></image>
-    
-    <view class="card-content">
-      <view class="avatar-wrapper" style="border-color: #F7E5D7;">
-        <image class="avatar-img" :src="item.avatar || 'https://dummyimage.com/100x100/ccc/fff.png&text=logo'"></image>
-      </view>
-      
-      <text class="brand-name">{{ item.name }}</text>
-      
-      <view class="tags-container">
-        <view 
-          class="tag-item" 
-          v-for="(tag, idx) in displayTags" 
-          :key="idx" 
-          :style="getTagStyle(tag)"
-        >
-          <image class="tag-icon" v-if="tag.icon" :src="tag.icon"></image>
-          <text class="tag-text">{{ tag.text }}</text>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-// 预定义的标签库（固定内容）
-const TAG_LIBRARY = {
-  franchise: {   // 品牌加盟
-    text: '品牌加盟',
-    color: '#8D4C1B ',
-    borderColor: '#D6CAC0 ',
-    icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60816ae2-92ee-4473-9eca-562e1200dbca.png'
-  },
-  recruit: {     // 学员招募
-    text: '学员招募',
-    color: '#E5505F',
-    borderColor: '#EFCFD2 ',
-    icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fd0699b9-9f3c-4b1e-8693-d0c9ec7eabc3.png'
-  },
-  more: {        // 更多详情
-    text: '更多详情',
-    color: '#333333',
-    borderColor: '#ECECEC',
-    icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cec453ce-f3fc-4881-8f2c-9ec5c61e759c.png'
-  }
-}
-
-export default {
-  name: 'brand-card',
-  props: {
-    // 基础信息
-    item: {
-      type: Object,
-      default: () => ({})
-    },
-    // 新方式：传入标签 key 数组，例如 ['franchise', 'recruit']
-    tagKeys: {
-      type: Array,
-      default: null
-    }
-  },
-  computed: {
-    // 最终要显示的标签列表（优先使用 tagKeys，否则兼容旧数据 item.tags）
-    displayTags() {
-      if (this.tagKeys && this.tagKeys.length) {
-        return this.tagKeys.map(key => TAG_LIBRARY[key]).filter(v => v)
-      }
-      // 兼容旧数据：如果 item.tags 存在且为数组，则直接使用（但建议逐步迁移）
-      if (this.item.tags && Array.isArray(this.item.tags)) {
-        return this.item.tags
-      }
-      return []
-    },
-    tagsLength() {
-      return this.displayTags.length
-    }
-  },
-  methods: {
-    // 点击品牌卡片跳转详情页
-    onClick() {
-      // 1. 保留 emit，方便外层如果有特殊需求可以监听到
-      this.$emit('click', this.item);
-      
-      // 2. 直接在此处处理跳转逻辑
-      if (this.item && this.item.id) {
-        uni.navigateTo({
-          url: `/pages/jingxuan/brand-detail?id=${this.item.id}`
-        });
-      }
-    },
-    getTagStyle(tag) {
-      const len = this.tagsLength
-      let sizeStyle = {}
-      if (len === 1) {
-        sizeStyle = {
-          width: '288rpx',
-          height: '42rpx',
-          padding: '0 12rpx',
-          boxSizing: 'border-box'
-        }
-      } else if (len === 2) {
-        sizeStyle = {
-          width: '134rpx',
-          height: '42rpx',
-          padding: '0 12rpx',
-          boxSizing: 'border-box'
-        }
-      }
-      return {
-        ...sizeStyle,
-        color: tag.color,
-        borderColor: tag.borderColor
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.brand-card-comp {
-  width: 328rpx;
-  height: 339rpx;
-  position: relative;
-  border-radius: 21rpx;
-  overflow: hidden;
-  background-color: #fff;
-}
-.brand-bg {
-  width: 100%;
-  height: 184rpx;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1;
-}
-.mask-bg {
-  width: 100%;
-  height: 251rpx;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  z-index: 2;
-  display: block;
-}
-.card-content {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  z-index: 3;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding-bottom: 24rpx;
-}
-.avatar-wrapper {
-  width: 80rpx;
-  height: 80rpx;
-  border-radius: 50%;
-  border: 2rpx solid;
-  background-color: #fff;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  overflow: hidden;
-  margin-top: -38rpx;
-  margin-bottom: 12rpx;
-}
-.avatar-img {
-  width: 100%;
-  height: 100%;
-}
-.brand-name {
-  font-size: 24rpx;
-  font-weight: 500;
-  color: #333333;
-  line-height: 34rpx;
-  margin-bottom: 12rpx;
-}
-.tags-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  gap: 20rpx;
-  flex-wrap: wrap;
-}
-.tag-item {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 21rpx;
-  border: 1rpx solid;
-  background-color: transparent;
-  padding: 7rpx 12rpx;
-}
-.tag-icon {
-  width: 24rpx;
-  height: 22rpx;
-  margin-right: 6rpx;
-  flex-shrink: 0;
-}
-.tag-text {
-  font-size: 20rpx;
-  line-height: 28rpx;
-  white-space: nowrap;
-  margin-top: 4rpx;
-  padding-right: 2rpx;
-}
+<template>
+	<view class="brand-card-comp" @click="onClick">
+		<image class="brand-bg" :src="item.bgSrc" mode="aspectFill"></image>
+		<image class="mask-bg"
+			src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9bca353c-fa74-407e-a69e-6f5e9aa43955.png"
+			mode="widthFix"></image>
+
+		<view class="card-content">
+			<view class="avatar-wrapper" style="border-color: #F7E5D7;">
+				<image class="avatar-img" :src="item.avatar || 'https://dummyimage.com/100x100/ccc/fff.png&text=logo'">
+				</image>
+			</view>
+
+			<text class="brand-name">{{ item.name }}</text>
+
+			<view class="tags-container">
+				<view class="tag-item" v-for="(tag, idx) in displayTags" :key="idx" :style="getTagStyle(tag)">
+					<image class="tag-icon" v-if="tag.icon" :src="tag.icon"></image>
+					<text class="tag-text">{{ tag.text }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+// 预定义的标签库（固定内容）
+const TAG_LIBRARY = {
+	franchise: { // 品牌加盟
+		text: '品牌加盟',
+		color: '#8D4C1B ',
+		borderColor: '#D6CAC0 ',
+		icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60816ae2-92ee-4473-9eca-562e1200dbca.png'
+	},
+	recruit: { // 学员招募
+		text: '学员招募',
+		color: '#E5505F',
+		borderColor: '#EFCFD2 ',
+		icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fd0699b9-9f3c-4b1e-8693-d0c9ec7eabc3.png'
+	},
+	more: { // 更多详情
+		text: '更多详情',
+		color: '#333333',
+		borderColor: '#ECECEC',
+		icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/cec453ce-f3fc-4881-8f2c-9ec5c61e759c.png'
+	}
+}
+
+export default {
+	name: 'brand-card',
+	props: {
+		// 基础信息
+		item: {
+			type: Object,
+			default: () => ({})
+		},
+		// 新方式：传入标签 key 数组，例如 ['franchise', 'recruit']
+		tagKeys: {
+			type: Array,
+			default: null
+		}
+	},
+	computed: {
+		// 最终要显示的标签列表（优先使用 tagKeys，否则兼容旧数据 item.tags）
+		displayTags() {
+			if (this.tagKeys && this.tagKeys.length) {
+				return this.tagKeys.map(key => TAG_LIBRARY[key]).filter(v => v)
+			}
+			// 兼容旧数据：如果 item.tags 存在且为数组，则直接使用（但建议逐步迁移）
+			if (this.item.tags && Array.isArray(this.item.tags)) {
+				return this.item.tags
+			}
+			return []
+		},
+		tagsLength() {
+			return this.displayTags.length
+		}
+	},
+	methods: {
+		// 点击品牌卡片跳转详情页
+		onClick() {
+			// 1. 保留 emit，方便外层如果有特殊需求可以监听到
+			this.$emit('click', this.item);
+
+			// 2. 检查登录状态
+			if (!uni.getStorageSync("accessToken")) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return;
+			}
+
+			// 3. 直接在此处处理跳转逻辑
+			if (this.item && this.item.id) {
+				uni.navigateTo({
+					url: `/pages/jingxuan/brand-detail?id=${this.item.id}`
+				});
+			}
+		},
+		getTagStyle(tag) {
+			const len = this.tagsLength
+			let sizeStyle = {}
+			if (len === 1) {
+				sizeStyle = {
+					width: '288rpx',
+					height: '42rpx',
+					padding: '0 12rpx',
+					boxSizing: 'border-box'
+				}
+			} else if (len === 2) {
+				sizeStyle = {
+					width: '134rpx',
+					height: '42rpx',
+					padding: '0 12rpx',
+					boxSizing: 'border-box'
+				}
+			}
+			return {
+				...sizeStyle,
+				color: tag.color,
+				borderColor: tag.borderColor
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.brand-card-comp {
+	width: 328rpx;
+	height: 339rpx;
+	position: relative;
+	border-radius: 21rpx;
+	overflow: hidden;
+	background-color: #fff;
+}
+
+.brand-bg {
+	width: 100%;
+	height: 184rpx;
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1;
+}
+
+.mask-bg {
+	width: 100%;
+	height: 251rpx;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	z-index: 2;
+	display: block;
+}
+
+.card-content {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 3;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding-bottom: 24rpx;
+}
+
+.avatar-wrapper {
+	width: 80rpx;
+	height: 80rpx;
+	border-radius: 50%;
+	border: 2rpx solid;
+	background-color: #fff;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	overflow: hidden;
+	margin-top: -38rpx;
+	margin-bottom: 12rpx;
+}
+
+.avatar-img {
+	width: 100%;
+	height: 100%;
+}
+
+.brand-name {
+	font-size: 24rpx;
+	font-weight: 500;
+	color: #333333;
+	line-height: 34rpx;
+	margin-bottom: 12rpx;
+}
+
+.tags-container {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	gap: 20rpx;
+	flex-wrap: wrap;
+}
+
+.tag-item {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 21rpx;
+	border: 1rpx solid;
+	background-color: transparent;
+	padding: 7rpx 12rpx;
+}
+
+.tag-icon {
+	width: 24rpx;
+	height: 22rpx;
+	margin-right: 6rpx;
+	flex-shrink: 0;
+}
+
+.tag-text {
+	font-size: 20rpx;
+	line-height: 28rpx;
+	white-space: nowrap;
+	margin-top: 4rpx;
+	padding-right: 2rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages/home/components/skill-card.vue b/pages/home/components/skill-card.vue
index e5c3e01..cff9da6 100644
--- a/pages/home/components/skill-card.vue
+++ b/pages/home/components/skill-card.vue
@@ -2,10 +2,8 @@
   <view class="skill-item" @click="handleClick">
     <view class="cover-box">
       <image class="cover" :src="item.coverSrc" mode="aspectFill"></image>
-      <image 
-        class="play-icon" 
-        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5c1ddfef-a200-424a-a9dc-03d9395568f6.png"
-      ></image>
+      <image v-if="item.video" class="play-icon"
+        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5c1ddfef-a200-424a-a9dc-03d9395568f6.png"></image>
     </view>
     <view class="skill-info">
       <view class="skill-title line-2">{{ item.title }}</view>
@@ -14,10 +12,9 @@
         <text class="type-text">{{ item.type || '平台课程' }}</text>
       </view>
       <view class="skill-stats">
-        <image 
-          class="view-icon" 
-          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2409b64a-56bb-4d9e-a4cc-5b3444fcf097.png"
-        ></image>
+        <image class="view-icon"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/2409b64a-56bb-4d9e-a4cc-5b3444fcf097.png">
+        </image>
         {{ formatViews(item.views) }}观看 · {{ item.time }}
       </view>
     </view>
@@ -68,14 +65,21 @@ export default {
     handleClick() {
       // 1. 保留 emit，方便外层如果有特殊需求可以监听到
       this.$emit('click', this.item);
-      
-      // 2. 直接在此处处理跳转逻辑
+
+      // 2. 检查登录状态
+      if (!uni.getStorageSync("accessToken")) {
+        uni.navigateTo({
+          url: '/pages/blogPopup/blogPopup'
+        });
+        return;
+      }
+
+      // 3. 直接在此处处理跳转逻辑
       if (this.item && this.item.id) {
         uni.navigateTo({
           url: `/pages/jingxuan/skill-detail?id=${this.item.id}`
         });
       }
-      // 跳转到技能/课程详情页
     }
   }
 }
@@ -85,7 +89,7 @@ export default {
 .skill-item {
   display: flex;
   margin-bottom: 20rpx;
-  
+
   &:last-child {
     margin-bottom: 0;
   }
@@ -99,17 +103,17 @@ export default {
     margin-right: 24rpx;
     flex-shrink: 0;
 
-    .cover { 
-      width: 100%; 
-      height: 100%; 
+    .cover {
+      width: 100%;
+      height: 100%;
     }
-    
+
     .play-icon {
       position: absolute;
-      top: 50%; 
+      top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
-      width: 39rpx; 
+      width: 39rpx;
       height: 39rpx;
     }
   }
@@ -132,20 +136,20 @@ export default {
       font-weight: 400;
       line-height: 40rpx;
     }
-    
+
     .skill-type {
       display: flex;
       align-items: center;
       font-size: 22rpx;
       margin-top: 10rpx;
-      
-      .type-icon { 
-        width: 26rpx; 
-        height: 26rpx; 
-        margin-right: 8rpx; 
+
+      .type-icon {
+        width: 26rpx;
+        height: 26rpx;
+        margin-right: 8rpx;
         border-radius: 50%;
       }
-      
+
       .type-text {
         border-radius: 7rpx;
         font-weight: 400;
@@ -153,25 +157,25 @@ export default {
         line-height: 33rpx;
         padding: 2rpx 10rpx;
       }
-      
+
       &.platform-course .type-text {
         background: #f9d3d760;
         color: #E55463;
       }
-      
+
       &.brand-course .type-text {
         background: #f9d3d760;
         color: #E55463;
       }
     }
-    
+
     .skill-stats {
       font-size: 22rpx;
       color: #999;
       margin-top: 10rpx;
       display: flex;
       align-items: center;
-      
+
       .view-icon {
         width: 26rpx;
         height: 22rpx;
@@ -188,5 +192,4 @@ export default {
   -webkit-line-clamp: 2;
   overflow: hidden;
 }
-
 </style>
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 3ec9aa2..626fc87 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,1376 +1,1577 @@
-<template>
-  <view class="homePage">
-    <image class="page-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0901dc51-ff5a-427f-aab1-993d80aced79.png" mode="widthFix"></image>
-
-    <view class="header-section">
-      <view class="user-info" @tap="handleLoginRedirect">
-        <image class="avatar" :src="currentAvatar"></image>
-        <view class="info-text">
-          <view class="name">{{ currentName }}</view>
-          <view class="desc">欢迎登录美融融商家版</view>
-        </view>
-      </view>
-      
-      <view class="status-toggle" :class="{ 'is-closed': !isOpenStore }" @tap="toggleStatus" v-if="isLogin && isSettled">
-        <text class="status-text">{{ isOpenStore ? '营业中' : '休息中' }}</text>
-        <view class="toggle-dot"></view>
-      </view>
-    </view>
-
-    <view class="setup-modal-mask" v-if="showSetupModal" catchtouchmove="true">
-      <view class="setup-modal-content">
-        <image class="modal-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ac2cb4aa-a7c5-4776-98f4-b77e9c0cfa85.png"></image>
-        
-        <view class="modal-header">
-          <text>温馨提示</text>
-        </view>
-
-        <view class="modal-body">
-          <text class="modal-subtitle">发布服务请完善以下资料：</text>
-          
-          <view class="missing-list">
-            <view class="missing-item" v-if="!hasBusinessTime">
-              <view class="item-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png"></image>
-                <view class="item-texts">
-                  <text class="item-title">营业时间未配置</text>
-                  <text class="item-desc">请完善店铺的营业时间</text>
-                </view>
-              </view>
-              <view class="item-right orange" @tap="goToBusinessTime">去配置</view>
-            </view>
-
-            <view class="missing-item" v-if="!hasServiceSkill">
-              <view class="item-left">
-                <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png"></image>
-                <view class="item-texts">
-                  <text class="item-title">服务技能未配置</text>
-                  <text class="item-desc">请完善服务技能</text>
-                </view>
-              </view>
-              <view class="item-right orange" @tap="goToServiceSkill">去配置</view>
-            </view>
-
-            <view class="missing-item" v-if="!isCertified">
-              <view class="item-left">
-                <image class="item-icon" :src="isUnderReview ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'"></image>
-                <view class="item-texts">
-                  <!-- 只有在审核中时赋予蓝色样式 blue-text -->
-                  <text class="item-title" :class="{'blue-text': isUnderReview}">{{ isUnderReview ? '资质认证中' : '资质未认证' }}</text>
-                  <text class="item-desc">请完成资质认证</text>
-                </view>
-              </view>
-              <!-- 只有在审核中时为灰色，其余未认证状态为浅绿色 light-green -->
-              <view class="item-right" :class="isUnderReview ? 'grey' : 'light-green'" @tap="goToAuth">
-                {{ isUnderReview ? '查看进度' : '去认证' }}
-              </view>
-            </view>
-          </view>
-        </view>
-
-        <view class="modal-footer">
-          <view class="btn-know" @tap="closeSetupModal">知道了</view>
-        </view>
-      </view>
-    </view>
-
-    <view class="settlement-guide card-box" v-if="isLogin && isUserInfoLoaded && !isCertified">
-      <view class="guide-header" :style="{ backgroundImage: 'url(' + (isSettled ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c3a6cdd8-0447-4b50-a8cc-7bab1eedb502.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/138ccbc3-486d-4287-b67f-f809de99e408.png') + ')' }">
-          <view class="guide-body">
-            <text class="guide-text">{{ isSettled ? '完成认证，开启您的接单之路' : '入驻美融融，生意更轻松' }}</text>
-            <view class="guide-btn" @tap="goToSettle">{{ isSettled ? '去认证' : '去入驻' }}</view>
-          </view>
-      </view>
-    </view>
-
-    <view class="quick-actions card-box" v-if="isLogin && isCertified">
-      <view class="action-item" v-for="(item, index) in quickActions" :key="index" @tap="handleQuickAction(item)">
-        <image class="action-icon" :src="item.icon"></image>
-        <text class="action-text">{{ item.name }}</text>
-      </view>
-    </view>
-
-    <view class="order-stats-basic card-box" v-if="isLogin && isCertified">
-      <view class="card-header">
-        <view class="header-left">
-          <text class="title">接单管理</text>
-          <text class="update-time">更新时间：{{ orderBasic.updateTime }}</text>
-          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png" @tap="fetchOrderNum"></image>
-        </view>
-        <view class="header-right" @tap="goToOrderList">更多数据 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image></view>
-      </view>
-      <view class="stats-content">
-        <view class="stat-item">
-          <text class="num">{{ orderBasic.waitStart }}</text>
-          <text class="label">待开始</text>
-        </view>
-        <view class="stat-item">
-          <text class="num">{{ orderBasic.waitFinish }}</text>
-          <text class="label">待完成</text>
-        </view>
-        <view class="stat-item">
-          <text class="num">{{ orderBasic.finished }}</text>
-          <text class="label">已完成</text>
-        </view>
-      </view>
-    </view>
-
-    <view class="order-stats-detail card-box" v-if="isLogin && isCertified">
-      <view class="card-header">
-        <view class="header-left">
-          <text class="title">当日实时数据</text>
-          <text class="update-time">更新时间：{{ orderDetail.updateTime }}</text>
-          <image class="refresh-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png" @tap="fetchRealTimeData"></image>
-        </view>
-      </view>
-      <view class="detail-content">
-        <view class="score-dashboard">
-          <view class="ring-track"></view>
-          <view class="ring-progress" :style="{'background': progressGradient}"></view>
-          <view class="dot start-dot" v-if="displayScore > 0"></view>
-          <view class="dot end-dot" v-if="displayScore > 0" :style="{'transform': `rotate(-${displayScoreDeg}deg) translateY(-67rpx)`}"></view>
-          <text class="score-num">{{ displayScore.toFixed(1) }}</text>
-          <image class="score-tag-img" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/52005bc0-2896-407d-8826-f34539637d20.png" mode="aspectFit"></image>
-        </view>
-
-        <view class="detail-grid">
-          <view class="grid-item">
-            <text class="label">访问人数</text>
-            <view class="val-box"><text class="val">{{ orderDetail.visitors }}</text> <text class="unit">人</text></view>
-            <text class="yesterday">昨日{{ orderDetail.yVisitors }}人</text>
-          </view>
-          <view class="grid-item">
-            <text class="label">下单量</text>
-            <view class="val-box"><text class="val">{{ orderDetail.orders }}</text> <text class="unit">单</text></view>
-            <text class="yesterday">昨日{{ orderDetail.yOrders }}单</text>
-          </view>
-          <view class="grid-item">
-            <text class="label">成交金额</text>
-            <view class="val-box">
-              <text class="val">{{ formattedAmount.val }}</text> 
-              <text class="unit">{{ formattedAmount.unit }}</text>
-            </view>
-            <text class="yesterday">昨日{{ formattedYAmount.val }}{{ formattedYAmount.unit }}</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="notice-bar card-box">
-      <image class="notice-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/75f624b8-a6ed-4787-9380-1a087062805b.png"></image>
-      <swiper class="notice-swiper" vertical autoplay circular interval="3000">
-        <swiper-item v-for="(msg, index) in noticeList" :key="index" @tap="goToNotice(msg)">
-          <text class="notice-text line-1">{{ msg.title }}</text>
-        </swiper-item>
-      </swiper>
-      <view class="notice-btn" @tap="goToNoticeList">点击查看</view>
-    </view>
-
-    <view class="brands-section card-box">
-      <view class="card-header">
-        <view class="header-left"><text class="title" style="margin-left: 10rpx;">精选品牌</text></view>
-        <view class="header-right" @tap="goToBrandList">更多品牌 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image></view>
-      </view>
-      
-      <view class="brand-grid">
-        <brand-card 
-          class="brand-card-wrap"
-          v-for="(item, index) in brands" 
-          :key="index" 
-          :item="item"
-          :tagKeys="item.tagKeys"
-        ></brand-card>
-      </view>
-    </view>
-
-    <view class="skills-section card-box">
-      <view class="card-header">
-        <view class="header-left"><text class="title">技能集市</text></view>
-        <view class="header-right" @tap="goToSkillList">更多技能 <image class="more-right-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png"></image> </view>
-      </view>
-      <view class="skill-list">
-        <skill-card 
-          v-for="(item, index) in skills" 
-          :key="index" 
-          :item="item"
-        ></skill-card>
-      </view>
-    </view>
-
-    <view style="height: 120rpx;"></view> 
-    <TabBar :selected="0"></TabBar>
-  </view>
-</template>
-
-<script>
-// 全局变量：用于控制每次杀进程启动后，只在首页弹一次弹窗
-let hasShownSetupModal = false;
-
-import TabBar from "@/components/tabbar/tabbar.vue"
-import projectTabs from "./components/project-tabs.vue";
-import request from "@/utils/request";
-import filters from "./components/filters.vue";
-import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
-import BrandCard from "./components/brand-card.vue";
-import SkillCard from "./components/skill-card.vue";
-
-export default {
-  components: {
-    filters,
-    projectTabs,
-    CustomNavbar,
-    TabBar,
-    BrandCard,
-    SkillCard
-  },
-  data() {
-    return {
-      isLogin: false, 
-      isUserInfoLoaded: false, // 新增：标识用户信息是否已经加载完毕
-      userInfo: {},   
-      authDetails: null, // 用于存储获取到的真实入驻详情配置
-      sjId: null,
-
-      showSetupModal: false, //  弹窗开关控制
-
-      displayScore: 0, 
-      animationTimer: null,
-
-      noticeList: [{ id: 0, title: '', url: '' }],
-
-      quickActions: [
-        { name: '扫码验券', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png' , path: '/pages/shop/verify/verify-order'},
-        { name: '服务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a90f02a2-9d39-440a-ad20-a4337bcd1b38.png' , path: '/pages/artisan/service-list'},
-        { name: '工位管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4c503603-6c2f-4a7a-9329-5e54b8ca769e.png' , path: '/pages/shop/workSpace/list'},
-        { name: '财务管理', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/728c659e-e395-4473-b83e-7e04539f7ec6.png' , path: '/pages/wallet/wallet'}
-      ],
-      orderBasic: { updateTime: '--:--', waitStart: 0, waitFinish: 0, finished: 0 },
-      orderDetail: { updateTime: '--:--', score: '0.0', visitors: 0, yVisitors: 0, orders: 0, yOrders: 0, amount: '0.00', yAmount: '0.00' },
-
-      brands: [],
-      skills: []
-    };
-  },
-  computed: {
-    // 格式化今日成交金额
-    formattedAmount() {
-      return this.formatMoney(this.orderDetail.amount);
-    },
-    // 格式化昨日成交金额
-    formattedYAmount() {
-      return this.formatMoney(this.orderDetail.yAmount);
-    },
-    // 依靠后端实际返回的资料详情来判断是否真的提交过申请，而不是无脑信 id_type: -1
-    isUnderReview() {
-      if (!this.isLogin) return false;
-      // 只要拿到了具体的入驻详情数据对象（比如填了各种地址、执照等，内容肯定不为空），就说明填过表了
-      if (this.authDetails && Object.keys(this.authDetails).length > 0) {
-        // 如果后端是用特定的状态值判断，比如 this.authDetails.state === 0，你可以自己加 && 后面
-        return true; 
-      }
-      return false; // 啥也没返回，说明只是刚注册没填资料
-    },
-
-    // 判断是否具备接单的大前提条件
-    canOpenStore() {
-      return this.hasBusinessTime && this.hasServiceSkill && this.isCertified;
-    },
-    // 修复：使用 authDetails 里的真实接口返回字段判定服务技能
-    hasServiceSkill() {
-      // 检查 userInfo 中是否有值
-      const fromUser = this.userInfo && Array.isArray(this.userInfo.servers_kill) && this.userInfo.servers_kill.length > 0;
-      // 检查 authDetails 中是否有值
-      const fromAuth = this.authDetails && Array.isArray(this.authDetails.servers_kill) && this.authDetails.servers_kill.length > 0;
-      
-      // 只要有一边配了，就算已配置
-      return this.isLogin && (fromUser || fromAuth);
-    },
-    
-    // 状态显示完全由计算属性控制，去除了手动修改可能导致的冲突
-    isOpenStore() {
-      // 如果连开门的前提条件都没满足，强制显示“休息中”
-      if (!this.canOpenStore) {
-        return false; 
-      }
-      // 满足条件后，听后端的 (使用 == 防止后端返回字符串 "1")
-      return this.userInfo.order_taking == 1; 
-    },
-
-    // 状态管理判定
-    // 是否已入驻 (0: 未入驻, -1: 入驻第一步, >0: 已认证) 只要不等于0，说明已经开启了入驻流程
-    isSettled() {
-      // 加上 typeof 判断，防止初始空对象时 undefined !== 0 造成的误判
-      if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
-      return this.userInfo.id_type !== 0; 
-    },
-    // 是否认证通过 (根据规则，> 0 说明认证通过了)
-    isCertified() {
-      if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
-      return this.userInfo.id_type > 0;
-    },
-    // 优化：兼容判定营业时间（userInfo 和 authDetails 里只要有就算配置了）
-    hasBusinessTime() {
-      const timeFromUser = this.userInfo && this.userInfo.business_time;
-      const timeFromAuth = this.authDetails && this.authDetails.business_time;
-      return this.isLogin && !!(timeFromUser || timeFromAuth);
-    },
-
-    // 根据登录状态动态返回头像
-    currentAvatar() {
-      if (!this.isLogin || !this.userInfo.head_photo) {
-        return 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4099a78b-d3bd-4cf5-8599-68dfe751af16.png'; // 默认未登录头像
-      }
-      return this.userInfo.head_photo;
-    },
-    // 根据登录状态动态返回昵称
-    currentName() {
-      if (!this.isLogin) return '未登录';
-      return this.userInfo.name || this.userInfo.nick_name || '手机用户';
-    },
-    displayScoreDeg() {
-      const score = this.displayScore || 0;
-      const percentage = Math.min(Math.max(score, 0), 100);
-      return (percentage / 100) * 360;
-    },
-    progressGradient() {
-      return `conic-gradient(
-        transparent 0deg,
-        transparent calc(360deg - ${this.displayScoreDeg}deg),
-        #FF4D4F calc(360deg - ${this.displayScoreDeg}deg),
-        #FF4D4F 360deg
-      )`;
-    }
-  },
-  onShow() {
-    // 登录判定逻辑
-    this.isLogin = uni.getStorageSync("accessToken") ? true : false;
-    if (this.isLogin) {
-      this.getUserInfo();
-    }
-    // 通知、品牌、技能 这三个接口不强依赖登录，无论登没登录都获取
-    this.fetchNoticeList();
-    this.fetchBrandList();
-    this.fetchSkillList();
-  },
-  onPullDownRefresh() {
-    // 1. 重新请求首页需要的所有数据
-    if (this.isLogin) {
-      this.getUserInfo();
-    }
-    this.fetchNoticeList();
-    this.fetchBrandList();
-    this.fetchSkillList();
-
-    // 2. 停止下拉刷新的动画
-    setTimeout(() => {
-      uni.stopPullDownRefresh();
-    }, 500); 
-  },
-  onLoad() {
-    uni.hideTabBar();
-  },
-  watch: {
-    'orderDetail.score'() {
-      this.animateScore();
-    }
-  },
-  methods: {
-    // 金额转换万单位处理
-    formatMoney(amount) {
-      let num = parseFloat(amount);
-      if (isNaN(num)) return { val: '0', unit: '元' };
-      
-      if (num >= 10000) {
-        // 达到一万及以上，除以10000，最多保留两位小数（parseFloat会自动去掉末尾的0）
-        let val = parseFloat((num / 10000).toFixed(2));
-        return { val: val, unit: '万元' };
-      }
-      // 小于一万，原样返回，单位为元
-      return { val: num, unit: '元' };
-    },
-    // 处理登录跳转
-    handleLoginRedirect() {
-    // 如果 isLogin 为 false（未登录状态），则跳转到登录页
-    if (!this.isLogin) {
-      uni.navigateTo({ 
-        url: '/pages/blogPopup/blogPopup' 
-      });
-    }
-  },
-    //  弹窗中的快捷跳转功能
-    closeSetupModal() {
-      this.showSetupModal = false;
-    },
-    goToBusinessTime() {
-      this.showSetupModal = false;
-      uni.navigateTo({ url: '/pages/shop/business-time' });
-    },
-    goToServiceSkill() {
-      this.showSetupModal = false;
-      uni.navigateTo({ url: '/pages/shop/service-skills' });
-    },
-
-    // 专门给【提示弹窗】点击用的 (查看进度 / 去认证)
-    goToAuth() {
-      // 1. 点击后先关闭提示弹窗
-      this.showSetupModal = false;
-
-      // 2. 根据咱们新的严谨判断，决定它是真提交了还是纯没填
-      if (this.isUnderReview) {
-        // === 查看进度 ===
-        uni.navigateTo({ 
-          url: '/pages/ruzhu/ruzhu?type=1' 
-        });
-      } else {
-        // === 去认证 / 被驳回重新认证 ===
-        this.navigateToForm();
-      }
-    },
-
-    // 专门给【横幅】点击用的 (去入驻 / 去认证)
-    goToSettle() {
-      if (!this.isSettled) {
-        // 完全没入驻过（新手），从头开始
-        uni.navigateTo({ url: '/pages/ruzhu/ruzhu' });
-      } else if (this.isUnderReview) {
-        // 如果在横幅里处于审核中，也送去进度页
-        uni.navigateTo({ url: '/pages/ruzhu/ruzhu?type=1' });
-      } else {
-        // 已经开启入驻但没完成表单，继续去填表！
-        this.navigateToForm();
-      }
-    },
-
-    // 提取公共的【去填表】路由分发大脑
-    navigateToForm() {
-      if (this.isSettled) {
-        // 已经开启入驻（老手），直接空降到 ruzhu 的最后一个流程（第3步：门店信息）
-        uni.navigateTo({ 
-          url: '/pages/ruzhu/ruzhu?step=3' 
-        });
-      } else {
-        // 完全没入驻过（纯新手），老老实实从第 0 步开始
-        uni.navigateTo({ 
-          url: '/pages/ruzhu/ruzhu' 
-        });
-      }
-    },
-
-    goToBrandList() {
-      uni.navigateTo({ url: '/pages/jingxuan/selected-brands' });
-    },
-    goToSkillList() {
-      uni.navigateTo({ url: '/pages/jingxuan/selected-skills' });
-    },
-    // 处理金刚区点击事件 (包含扫码验券核心逻辑)
-    handleQuickAction(item) {
-      if (item.name === '扫码验券') {
-        uni.navigateTo({
-          url: '/pages/shop/verify/verify-order',
-          fail: (err) => { console.error('跳转失败：', err); }
-        });
-        return;
-      } // 2. 通用跳转逻辑
-        else if (item.path) {
-        uni.navigateTo({
-          url: item.path,
-          fail: () => { uni.showToast({ title: '页面开发中...', icon: 'none' }); }
-        });
-      }
-    },
-
-    // 格式化时间 (提取 HH:mm)
-    formatTime(dateTimeStr) {
-      if (!dateTimeStr) return '--:--';
-      const arr = dateTimeStr.split(' ');
-      if (arr.length > 1) {
-        return arr[1].substring(0, 5); // 截取 HH:mm
-      }
-      return dateTimeStr;
-    },
-
-    getUserInfo() {
-      request.post("/sj/user/getUser").then((result) => {
-        if(result.code == 200 && result.data) {
-          this.userInfo = result.data;
-          this.isUserInfoLoaded = true; // 数据回来了，允许相关 UI 进行渲染
-          uni.setStorageSync("sjId", result.data.id);
-          this.sjId = result.data.id;
-
-          // 优化 1：只有完全通过认证，才去后台查单量和收益数据
-          if (this.isCertified) {
-            this.fetchOrderNum();
-            this.fetchRealTimeData();
-          }
-
-          // 优化 2：只要开启了入驻流程（哪怕只是在“去认证”阶段），依然需要拉详情来判断有没有补全三大件
-          if (this.isSettled) {
-            this.fetchAuthDetails();
-          }
-        }
-      });
-    },
-
-    // 获取入驻、修改资料审核详情（获取服务技能、营业时间等准确数据）
-    fetchAuthDetails() {
-      request.post("/sj/userSjAuth/details", {
-        type: 1, // 审核类型 1入驻申请
-        id_type: '1' // 平台商家
-      }).then(res => {
-        if (res.code == 200 && res.data) {
-          this.authDetails = res.data;
-        }
-        
-        // 只有确保拉到了配置详情后，再来判断三大件有没有配全
-        // 如果没有配全，且是首次大退打开进入首页，拉起弹窗
-        if (!this.canOpenStore && !hasShownSetupModal) {
-          this.showSetupModal = true;
-          hasShownSetupModal = true;
-        }
-      });
-    },
-
-    fetchOrderNum() {
-      request.post("/sj/poster/orderNum").then(res => {
-        if(res.code == 200 && res.data) {
-          this.orderBasic = {
-            updateTime: this.formatTime(res.data.now_date),
-            waitStart: res.data.dfw || 0,
-            waitFinish: res.data.dwc || 0,
-            finished: res.data.yqx || 0 
-          };
-        }
-      });
-    },
-
-    // 获取：首页实时数据
-    fetchRealTimeData() {
-      request.post("/sj/poster/realTimeData").then(res => {
-        if(res.code == 200 && res.data) {
-          const today = res.data.today || {};
-          const yesterday = res.data.yesterday || {};
-          
-          this.orderDetail = {
-            updateTime: this.formatTime(res.data.now_date),
-            score: today.rating_num || 0,
-            visitors: today.visitor_num || 0,
-            yVisitors: yesterday.visitor_num || 0,
-            orders: today.place_order || 0,
-            yOrders: yesterday.place_order || 0,
-            amount: today.deal_money || 0,
-            yAmount: yesterday.deal_money || 0
-          };
-        }
-      });
-    },
-
-    // 获取：通知公告列表
-    fetchNoticeList() {
-      request.post('/sj/notice/list', { page: 1, limit: 5 }).then(res => {
-        if(res.code == 200 && res.data && res.data.list.length > 0) {
-          this.noticeList = res.data.list;
-        }
-      });
-    },
-
-    // 获取：品牌列表
-    fetchBrandList() {
-      request.post('/sj/brand/list', { page: 1, limit: 4 }).then(res => {
-        if(res.code == 200 && res.data && res.data.list) {
-          this.brands = res.data.list.map(item => {
-            let tags = [];
-            if (item.franchise_state === 1) tags.push('franchise');
-            if (item.student_state === 1) tags.push('recruit');
-            if (tags.length === 0) tags.push('more'); 
-            
-            return {
-              id: item.id,
-              name: item.name,
-              bgSrc: item.cover_img || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg',
-              avatar: item.logo_img || 'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar',
-              tagKeys: tags
-            };
-          });
-        }
-      });
-    },
-
-    // 获取：技能集市列表
-    fetchSkillList() {
-      request.post('/sj/skill/list', { page: 1, limit: 4 }).then(res => {
-        if(res.code == 200 && res.data && res.data.list) {
-          this.skills = res.data.list.map(item => {
-            return {
-              id: item.id,
-              title: item.name,
-              type: item.link_name || '平台课程',
-              views: item.browse_num || 0,
-              time: item.create_time ? item.create_time.split(' ')[0] : '', 
-              coverSrc: item.cover_img || 'https://dummyimage.com/200x150/ccc/fff.png&text=Video',
-              typeIcon: item.link_logo || ''
-            };
-          });
-        }
-      });
-    },
-
-    
-
-    // 跳转：通知详情页
-    goToNotice(msg) {
-      if(msg.id) { uni.navigateTo({ url: `/pages/notice/detail?id=${msg.id}` }); }
-    },
-    // 跳转：通知公告列表页
-    goToNoticeList() {
-      uni.navigateTo({ url: '/pages/notice/notice_list' });
-    },
-    // 跳转：订单列表页
-    goToOrderList() {
-      uni.switchTab({ url: '/pages/order/userorder-list' });
-    },
-
-    // 营业中 / 休息中 按钮逻辑判断
-    toggleStatus() {
-      const currentStatus = this.userInfo.order_taking;
-      const isCurrentlyResting = currentStatus != 1; // 当前不是营业中即为休息中
-
-      // 强力拦截：在休息中且三大件没配全，想要营业时拦截弹窗
-      if (isCurrentlyResting && !this.canOpenStore) {
-        this.showSetupModal = true;
-        return;
-      }
-
-      // 准备切换的新状态
-      let newStatus = currentStatus == 1 ? 2 : 1;
-      
-      // 加入一个防连点的 Loading
-      uni.showLoading({ title: '切换中...', mask: true });
-
-      // 发起请求告诉后端
-      request.post("/sj/sjordertaking", {
-        order_taking: newStatus,
-        sjid: this.sjId 
-      }).then((res) => {
-        uni.hideLoading();
-        // 因为上一次的严格判断误伤了你，这里回归你最原始的写法，直接假定成功
-        this.userInfo.order_taking = newStatus; // 强行改一下本地状态让按钮动过去
-        this.getUserInfo(); // 无论如何刷新一下真实数据
-        uni.showToast({ title: newStatus == 1 ? '已开启营业' : '已休息', icon: 'none' });
-      }).catch(() => {
-        // 只有在彻底断网报错的情况下，才会弹下面这个
-        uni.hideLoading();
-        uni.showToast({ title: '网络异常，切换失败', icon: 'none' });
-      });
-    },
-
-    animateScore() {
-      const target = parseFloat(this.orderDetail.score) || 0;
-      if (this.animationTimer) clearInterval(this.animationTimer);
-
-      const start = this.displayScore; 
-      const change = target - start; 
-      
-      if (Math.abs(change) < 0.05) {
-        this.displayScore = target;
-        return;
-      }
-
-      const frames = 30; 
-      const duration = 600; 
-      let currentFrame = 0;
-
-      this.animationTimer = setInterval(() => {
-        currentFrame++;
-        const progress = currentFrame / frames;
-        const easeProgress = 1 - Math.pow(1 - progress, 3); 
-        
-        this.displayScore = start + change * easeProgress;
-
-        if (currentFrame >= frames) {
-          this.displayScore = target;
-          clearInterval(this.animationTimer);
-        }
-      }, duration / frames);
-    }
-  }
-};
-</script>
-
-<style lang="scss">
-  page {
-    background: #f5f6f8;
-  }
-
-  /* ============ 提示弹窗样式 ============ */
-  .setup-modal-mask {
-    position: fixed;
-    top: 0; left: 0; right: 0; bottom: 0;
-    background: rgba(0, 0, 0, 0.5);
-    z-index: 9999;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    
-    .setup-modal-content {
-      width: 630rpx;
-      height: 775rpx; /* 根据要求绝对固定宽高 */
-      background: #FFFFFF;
-      border-radius: 32rpx;
-      position: relative;
-      display: flex;
-      flex-direction: column;
-      
-      .modal-bg {
-        position: absolute;
-        top: 0; left: 0;
-        width: 630rpx;
-        height: 265rpx;
-        z-index: 0;
-      }
-      
-      .modal-header {
-        position: relative;
-        z-index: 1;
-        height: 150rpx;
-        display: flex;
-        align-items: flex-end;
-        justify-content: center;
-        padding-bottom: 20rpx;
-        
-        text {
-          font-size: 36rpx;
-          font-weight: bold;
-          color: #333333;
-          letter-spacing: 2rpx;
-        }
-      }
-      
-      .modal-body {
-        position: relative;
-        z-index: 1;
-        flex: 1;
-        padding: 24rpx 40rpx;
-        
-        .modal-subtitle {
-          font-size: 28rpx;
-          color: #333333;
-          margin-bottom: 40rpx;
-          display: block;
-        }
-        
-        .missing-list {
-          display: flex;
-          flex-direction: column;
-          gap: 46rpx; /* 间距拉开显得不那么拥挤 */
-          
-          .missing-item {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            
-            .item-left {
-              display: flex;
-              align-items: flex-start;
-              
-              .item-icon {
-                width: 32rpx;
-                height: 32rpx;
-                margin-right: 16rpx;
-                flex-shrink: 0; /* 防止图标被挤压变形 */
-                margin-top: 6rpx;
-              }
-              
-              .item-texts {
-                display: flex;
-                flex-direction: column;
-                
-                .item-title {
-                  font-size: 30rpx;
-                  color: #333333;
-                  font-weight: 500;
-                  margin-bottom: 8rpx;
-                  
-                  /* 增加蓝色字体样式 */
-                  &.blue-text {
-                    color: #2b85e4;
-                  }
-                }
-                
-                .item-desc {
-                  font-size: 24rpx;
-                  color: #999999;
-                }
-              }
-            }
-            
-            .item-right {
-              font-size: 26rpx;
-              font-weight: 400;
-              margin-top: -45rpx;
-              
-              &.orange { color: #FF7B00; }
-              &.grey { color: #999999; }
-              /* 增加浅绿色样式 */
-              &.light-green { color: #5CAC81; }
-            }
-          }
-        }
-      }
-      
-      .modal-footer {
-        position: relative;
-        z-index: 1;
-        padding: 0 50rpx 50rpx;
-        
-        .btn-know {
-          width: 100%;
-          height: 88rpx;
-          background: #FF4767;
-          border-radius: 44rpx;
-          color: #FFFFFF;
-          font-size: 32rpx;
-          font-weight: 500;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-      }
-    }
-  }
-  /* ==================================== */
-
-  .homePage {
-    position: relative;
-    min-height: 100vh;
-    padding: 0 24rpx;
-    padding-top: 100rpx; 
-
-    .page-bg {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      z-index: 0;
-    }
-
-    .card-box {
-      position: relative;
-      z-index: 1;
-      background: #ffffff;
-      border-radius: 24rpx;
-      margin-bottom: 24rpx;
-      padding: 20rpx 30rpx 30rpx;
-    }
-
-    .more-right-icon {
-      width: 8rpx;
-      height: 14rpx;
-      margin-left: 6rpx;
-    }
-
-    .card-header {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 24rpx;
-      
-      .header-left {
-        display: flex;
-        align-items: center;
-        .title {
-          margin-right: 20rpx;
-          font-family: PingFangSC, PingFang SC;
-          font-weight: 500;
-          font-size: 30rpx;
-          color: #101010;
-          line-height: 42rpx;
-          text-align: left;
-          font-style: normal;
-        }
-        .update-time {
-          font-family: PingFangSC, PingFang SC;
-          font-weight: 400;
-          font-size: 20rpx;
-          color: #8E694D;
-          line-height: 28rpx;
-          text-align: left;
-          font-style: normal;
-          margin-top: -4rpx;
-        }
-        .refresh-icon {
-          width: 18rpx;
-          height: 18rpx;
-          margin-left: 10rpx;
-        }
-      }
-      .header-right {
-        font-weight: 400;
-        font-size: 20rpx;
-        color: #666666;
-        line-height: 28rpx;
-      }
-    }
-
-    .header-section {
-      position: relative;
-      z-index: 1;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 40rpx;
-
-      .user-info {
-        display: flex;
-        align-items: center;
-        .avatar {
-          width: 96rpx;
-          height: 96rpx;
-          border-radius: 50%;
-          margin-right: 20rpx;
-        }
-        .name {
-          font-weight: 500;
-          font-size: 30rpx;
-          color: #333333;
-          line-height: 42rpx;
-          margin-bottom: 8rpx;
-        }
-        .desc {
-          font-weight: 400;
-          font-size: 20rpx;
-          color: #858796;
-          line-height: 28rpx;
-        }
-      }
-      
-      .status-toggle {
-        position: relative;
-        width: 173rpx;
-        height: 62rpx;
-        display: flex;
-        align-items: center;
-        border-radius: 31rpx;
-        box-sizing: border-box;
-        overflow: hidden; 
-        
-        background-image: linear-gradient(
-          316deg,
-          rgba(255, 161, 203, 1) 0,
-          rgba(251, 143, 180, 1) 49.381741%,
-          rgba(255, 130, 239, 1) 100%
-        );
-        transition: all 0.3s ease;
-
-        &::before {
-          content: "";
-          position: absolute;
-          top: 0; left: 0; width: 100%; height: 100%;
-          background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/269c1024-34ec-42af-8b20-1ce047c9851b.png") no-repeat center;
-          background-size: 100% 100%;
-          opacity: 0; 
-          z-index: 1;
-          transition: opacity 0.3s ease;
-        }
-
-        .status-text {
-          position: absolute;
-          font-weight: 500;
-          font-size: 28rpx;
-          color: #FFFFFF;
-          line-height: 40rpx;
-          z-index: 3;
-          left: 22rpx;
-          transition: transform 0.3s cubic-bezier(0.25, 1, 0.5, 1);
-        }
-
-        .toggle-dot {
-          position: absolute;
-          top: 5rpx;
-          right: 5rpx; 
-          width: 52rpx;
-          height: 52rpx;
-          background: #fff;
-          border-radius: 50%;
-          z-index: 3;
-          transition: transform 0.35s cubic-bezier(0.25, 1, 0.5, 1);
-        }
-
-        &.is-closed {
-          &::before {
-            opacity: 1;
-          }
-          .status-text {                
-            transform: translateX(46rpx); 
-          }
-          .toggle-dot {
-            transform: translate(-113rpx ,2rpx);
-          }
-        }
-      }
-    }
-
-    .settlement-guide {
-      padding: 0; 
-      overflow: hidden;
-      
-      .guide-header {
-        width: 100%;
-        height: 248rpx;
-        background-size: cover;
-      }
-
-      .guide-body {
-        padding: 90rpx 0 50rpx;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-
-        .guide-text {
-          margin-bottom: 20rpx;
-          font-weight: 400;
-          font-size: 28rpx;
-          color: #333333;
-          line-height: 40rpx;
-        }
-
-        .guide-btn {
-          width: 534rpx;
-          height: 70rpx;
-          border-radius: 35rpx;
-          border: 1rpx solid #FF4767;
-          
-          color: #FF4767;
-          font-weight: 500;
-          font-size: 28rpx;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-      }
-    }
-
-    .quick-actions {
-      display: flex;
-      justify-content: space-around;
-      padding: 30rpx 10rpx;
-      background: #F3F4FD;
-      
-      .action-item {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        .action-icon {
-          width: 60rpx;
-          height: 60rpx;
-          margin-bottom: 13rpx;
-        }
-        .action-text {
-          font-weight: 400;
-          font-size: 24rpx;
-          color: #101010;
-          line-height: 33rpx;
-          text-align: left;
-          font-style: normal;
-        }
-      }
-    }
-
-    .order-stats-basic {
-        background: linear-gradient( 176deg, #F0F4FF 0%, #FFFFFF 100%);
-        border-radius: 20rpx;
-        border: 1rpx solid #FFFFFF;
-      .stats-content {
-        display: flex;
-        justify-content: space-around;
-        text-align: center;
-        .num {
-          display: block;
-          font-weight: 500;
-          font-size: 40rpx;
-          color: #333333;
-          line-height: 56rpx;
-          font-style: normal;
-        }
-        .label {
-          font-weight: 400;
-          font-size: 24rpx;
-          color: #666666;
-          line-height: 33rpx;
-          text-align: left;
-          font-style: normal;
-        }
-      }
-    }
-
-    .order-stats-detail {
-      .detail-content {
-        display: flex;
-        align-items: center;
-        
-        .score-dashboard {
-          position: relative;
-          width: 140rpx;
-          height: 140rpx;
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          margin-right: 40rpx;
-          flex-shrink: 0;
-
-          .ring-track {
-            position: absolute;
-            width: 130rpx; 
-            height: 130rpx;
-            top: 5rpx;
-            left: 5rpx;
-            background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4189620a-fd4f-42eb-9977-817e521b4f12.png") no-repeat center;
-            background-size: contain;
-            z-index: 1;
-          }
-
-          .ring-progress {
-            position: absolute;
-            top: 2rpx;
-            left: 0;
-            width: 140rpx;
-            height: 140rpx;
-            border-radius: 50%;
-            mask: radial-gradient(transparent 62rpx, #000 65rpx);
-            -webkit-mask: radial-gradient(transparent 62rpx, #000 65rpx);
-            z-index: 2;
-          }
-
-          .dot {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            width: 7rpx;   
-            height: 7rpx;
-            background: #FF4D4F;
-            border-radius: 50%;
-            z-index: 3;    
-            margin-top: -3.5rpx; 
-            margin-left: -3.5rpx; 
-          }
-
-          .start-dot {
-            transform: translateY(-66rpx);
-          }
-
-          .end-dot {
-            transform-origin: center center;
-            margin-left: -4rpx;
-            margin-top: -2rpx;
-          }
-
-          .score-num {
-            position: absolute;
-            font-family: AlimamaShuHeiTi, sans-serif;
-            font-weight: bold;
-            font-size: 34rpx;
-            color: #333333;
-            z-index: 3;
-          }
-
-          .score-tag-img {
-            position: absolute;
-            bottom: -10rpx;
-            width: 85rpx;
-            height: 35rpx;
-            z-index: 4; 
-          }
-        }
-
-        .detail-grid {
-          flex: 1;
-          display: flex;
-          justify-content: space-between;
-
-          .grid-item {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            
-            .label {
-              font-weight: 400;
-              font-size: 24rpx;
-              color: #888888;
-              line-height: 33rpx;
-              margin-bottom: 12rpx;
-            }
-            
-            .val-box {
-              display: flex;
-              align-items: baseline;
-              margin-bottom: 6rpx;
-              
-              .val {
-                font-weight: 500;
-                font-size: 40rpx;
-                color: #333333;
-                line-height: 56rpx;
-              }
-              .unit {
-                font-weight: 400;
-                font-size: 24rpx;
-                color: #888888;
-                line-height: 33rpx;
-                margin-left: 6rpx;
-              }
-            }
-            
-            .yesterday {
-              margin-top: 6rpx;
-              font-weight: 400;
-              font-size: 24rpx;
-              color: #888888;
-              line-height: 33rpx;
-              text-align: center;
-            }
-          }
-        }
-      }
-    }
-
-    .notice-bar {
-      display: flex;
-      align-items: center;
-      padding: 13rpx 30rpx;
-      background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/3d9c6b4b-ef6f-4242-abd4-6194d13e02dc.png");
-      background-size: contain;
-
-      .notice-icon {
-        width: 25rpx;
-        height: 21rpx;
-        margin-right: 16rpx;
-      }
-      
-      .notice-swiper {
-        flex: 1;
-        height: 40rpx; 
-        line-height: 40rpx;
-
-        .notice-text {
-          font-weight: 400;
-          font-size: 24rpx;
-          color: #30353C;
-        }
-      }
-
-      .notice-btn {
-        font-weight: 400;
-        font-size: 18rpx;
-        color: #8D4C1B;
-        padding: 2rpx 15rpx;
-        border-radius: 30rpx;
-        border: 1rpx solid #8d4c1b50;
-        margin-left: 10rpx;
-      }
-    }
-
-    .brands-section {
-      padding: 20rpx 20rpx;
-      .brand-grid {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        
-        .brand-card-wrap {
-          width: 48.5%; 
-          margin-bottom: 14rpx;
-        }
-      }
-    }
-
-    .skills-section {
-      .skill-list {
-        display: flex;
-        flex-direction: column;
-      }
-      .skill-item {
-        display: flex;
-        margin-bottom: 30rpx;
-        &:last-child { margin-bottom: 0; }
-
-        .cover-box {
-          position: relative;
-          width: 224rpx;
-          height: 126rpx;
-          border-radius: 16rpx;
-          overflow: hidden;
-          margin-right: 24rpx;
-          flex-shrink: 0;
-
-          .cover { 
-            width: 100%; 
-            height: 100%; 
-          }
-          .play-icon {
-            position: absolute;
-            top: 50%; left: 50%;
-            transform: translate(-50%, -50%);
-            width: 39rpx; height: 39rpx;
-          }
-        }
-
-        .skill-info {
-          flex: 1;
-          display: flex;
-          min-width: 0;
-          flex-direction: column;
-          justify-content: space-between;
-
-          .skill-title {
-            display: block; 
-            font-size: 28rpx;
-            color: #333;
-            font-weight: 400;
-            line-height: 40rpx;
-            overflow: hidden;
-            text-overflow: ellipsis; 
-            white-space: nowrap;
-          }
-          .skill-type {
-            display: flex;
-            align-items: center;
-            font-size: 22rpx;
-            margin-top: 10rpx;
-            
-            .type-icon { 
-              width: 26rpx; 
-              height: 26rpx; 
-              margin-right: 8rpx; 
-              border-radius: 50%;
-            }
-            .type-text {
-              background: #f9d3d760;
-              border-radius: 7rpx;
-              font-weight: 400;
-              font-size: 24rpx;
-              color: #E55463;
-              line-height: 33rpx;
-              padding: 2rpx 10rpx;
-            }
-          }
-          .skill-stats {
-            font-size: 22rpx;
-            color: #999;
-            margin-top: 10rpx;
-            display: flex;
-            align-items: center;
-            .view-icon {
-              width: 26rpx;
-              height: 22rpx;
-              margin-right: 8rpx;
-              margin-top: -2rpx;
-            }
-          }
-        }
-      }
-    }
-
-    .line-1 { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
-    .line-2 { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; }
-  }
+<template>
+	<view class="homePage">
+		<image class="page-bg"
+			src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0901dc51-ff5a-427f-aab1-993d80aced79.png"
+			mode="widthFix"></image>
+
+		<view class="header-section">
+			<view class="user-info" @tap="handleLoginRedirect">
+				<image class="avatar" :src="currentAvatar"></image>
+				<view class="info-text">
+					<view class="name">{{ currentName }}</view>
+					<view class="desc">欢迎登录美融融商家版</view>
+				</view>
+			</view>
+
+			<view class="status-toggle" :class="{ 'is-closed': !isOpenStore }" @tap="toggleStatus"
+				v-if="isLogin && userInfo.id_type > 0">
+				<text class="status-text">{{ isOpenStore ? '营业中' : '休息中' }}</text>
+				<view class="toggle-dot"></view>
+			</view>
+		</view>
+
+		<view class="setup-modal-mask" v-if="showSetupModal" catchtouchmove="true">
+			<view class="setup-modal-content">
+				<image class="modal-bg"
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ac2cb4aa-a7c5-4776-98f4-b77e9c0cfa85.png">
+				</image>
+
+				<view class="modal-header">
+					<text>温馨提示</text>
+				</view>
+
+				<view class="modal-body">
+					<text class="modal-subtitle">发布服务请完善以下资料：</text>
+
+					<view class="missing-list">
+						<view class="missing-item" v-if="!hasBusinessTime">
+							<view class="item-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+								</image>
+								<view class="item-texts">
+									<text class="item-title">营业时间未配置</text>
+									<text class="item-desc">请完善店铺的营业时间</text>
+								</view>
+							</view>
+							<view class="item-right orange" @tap="goToBusinessTime">去配置</view>
+						</view>
+
+						<view class="missing-item" v-if="!hasServiceSkill">
+							<view class="item-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+								</image>
+								<view class="item-texts">
+									<text class="item-title">服务技能未配置</text>
+									<text class="item-desc">请完善服务技能</text>
+								</view>
+							</view>
+							<view class="item-right orange" @tap="goToServiceSkill">去配置</view>
+						</view>
+
+						<view class="missing-item" v-if="!isCertified">
+							<view class="item-left">
+								<image class="item-icon"
+									:src="isUnderReview ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'">
+								</image>
+								<view class="item-texts">
+									<!-- 只有在审核中时赋予蓝色样式 blue-text -->
+									<text class="item-title" :class="{ 'blue-text': isUnderReview }">{{ isUnderReview ?
+										'资质认证中' : '资质未认证' }}</text>
+									<text class="item-desc">请完成资质认证</text>
+								</view>
+							</view>
+							<!-- 只有在审核中时为灰色，其余未认证状态为浅绿色 light-green -->
+							<view class="item-right" :class="isUnderReview ? 'grey' : 'light-green'" @tap="goToAuth">
+								{{ isUnderReview ? '查看进度' : '去认证' }}
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="modal-footer">
+					<view class="btn-know" @tap="closeSetupModal">知道了</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="settlement-guide card-box" v-if="isLogin && isUserInfoLoaded && !isCertified">
+			<view class="guide-header"
+				:style="{ backgroundImage: 'url(' + (isSettled ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c3a6cdd8-0447-4b50-a8cc-7bab1eedb502.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/138ccbc3-486d-4287-b67f-f809de99e408.png') + ')' }">
+				<view class="guide-body">
+					<text class="guide-text">{{ isSettled ? '完成认证，开启您的接单之路' : '入驻美融融，生意更轻松' }}</text>
+					<view class="guide-btn" @tap="goToSettle">{{ isSettled ? '去认证' : '去入驻' }}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="quick-actions card-box" v-if="isLogin && isCertified">
+			<view class="action-item" v-for="(item, index) in quickActions" :key="index" @tap="handleQuickAction(item)">
+				<image class="action-icon" :src="item.icon"></image>
+				<text class="action-text">{{ item.name }}</text>
+			</view>
+		</view>
+
+		<view class="order-stats-basic card-box" v-if="isLogin && isCertified">
+			<view class="card-header">
+				<view class="header-left">
+					<text class="title">接单管理</text>
+					<text class="update-time">更新时间：{{ orderBasic.updateTime }}</text>
+					<image class="refresh-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png"
+						@tap="fetchOrderNum"></image>
+				</view>
+				<view class="header-right" @tap="goToOrderList">更多数据 <image class="more-right-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png">
+					</image>
+				</view>
+			</view>
+			<view class="stats-content">
+				<view class="stat-item">
+					<text class="num">{{ orderBasic.waitStart }}</text>
+					<text class="label">待开始</text>
+				</view>
+				<view class="stat-item">
+					<text class="num">{{ orderBasic.waitFinish }}</text>
+					<text class="label">待完成</text>
+				</view>
+				<view class="stat-item">
+					<text class="num">{{ orderBasic.finished }}</text>
+					<text class="label">已完成</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="order-stats-detail card-box" v-if="isLogin && isCertified">
+			<view class="card-header">
+				<view class="header-left">
+					<text class="title">当日实时数据</text>
+					<text class="update-time">更新时间：{{ orderDetail.updateTime }}</text>
+					<image class="refresh-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/31c6eebc-5538-4c66-9b32-24dced170a99.png"
+						@tap="fetchRealTimeData"></image>
+				</view>
+			</view>
+			<view class="detail-content">
+				<view class="score-dashboard">
+					<view class="ring-track"></view>
+					<view class="ring-progress" :style="{ 'background': progressGradient }"></view>
+					<view class="dot start-dot" v-if="displayScore > 0"></view>
+					<view class="dot end-dot" v-if="displayScore > 0"
+						:style="{ 'transform': `rotate(-${displayScoreDeg}deg) translateY(-67rpx)` }"></view>
+					<text class="score-num">{{ displayScore.toFixed(1) }}</text>
+					<image class="score-tag-img"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/52005bc0-2896-407d-8826-f34539637d20.png"
+						mode="aspectFit"></image>
+				</view>
+
+				<view class="detail-grid">
+					<view class="grid-item">
+						<text class="label">访问人数</text>
+						<view class="val-box"><text class="val">{{ orderDetail.visitors }}</text> <text
+								class="unit">人</text></view>
+						<text class="yesterday">昨日{{ orderDetail.yVisitors }}人</text>
+					</view>
+					<view class="grid-item">
+						<text class="label">下单量</text>
+						<view class="val-box"><text class="val">{{ orderDetail.orders }}</text> <text
+								class="unit">单</text></view>
+						<text class="yesterday">昨日{{ orderDetail.yOrders }}单</text>
+					</view>
+					<view class="grid-item">
+						<text class="label">成交金额</text>
+						<view class="val-box">
+							<text class="val">{{ formattedAmount.val }}</text>
+							<text class="unit">{{ formattedAmount.unit }}</text>
+						</view>
+						<text class="yesterday">昨日{{ formattedYAmount.val }}{{ formattedYAmount.unit }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="notice-bar card-box">
+			<image class="notice-icon"
+				src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/75f624b8-a6ed-4787-9380-1a087062805b.png">
+			</image>
+			<swiper class="notice-swiper" vertical autoplay circular interval="3000">
+				<swiper-item v-for="(msg, index) in noticeList" :key="index" @tap="goToNotice(msg)">
+					<text class="notice-text line-1">{{ msg.title }}</text>
+				</swiper-item>
+			</swiper>
+			<view class="notice-btn" @tap="goToNoticeList">点击查看</view>
+		</view>
+
+		<view class="brands-section card-box">
+			<view class="card-header">
+				<view class="header-left"><text class="title" style="margin-left: 10rpx;">精选品牌</text></view>
+				<view class="header-right" @tap="goToBrandList">更多品牌 <image class="more-right-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png">
+					</image>
+				</view>
+			</view>
+
+			<view class="brand-grid">
+				<brand-card class="brand-card-wrap" v-for="(item, index) in brands" :key="index" :item="item"
+					:tagKeys="item.tagKeys"></brand-card>
+			</view>
+		</view>
+
+		<view class="skills-section card-box">
+			<view class="card-header">
+				<view class="header-left"><text class="title">技能集市</text></view>
+				<view class="header-right" @tap="goToSkillList">更多技能 <image class="more-right-icon"
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png">
+					</image>
+				</view>
+			</view>
+			<view class="skill-list">
+				<skill-card v-for="(item, index) in skills" :key="index" :item="item"></skill-card>
+			</view>
+		</view>
+
+		<view style="height: 120rpx;"></view>
+		<TabBar :selected="0"></TabBar>
+	</view>
+</template>
+
+<script>
+// 全局变量：用于控制每次杀进程启动后，只在首页弹一次弹窗
+let hasShownSetupModal = false;
+
+import TabBar from "@/components/tabbar/tabbar.vue"
+import projectTabs from "./components/project-tabs.vue";
+import request from "@/utils/request";
+import filters from "./components/filters.vue";
+import CustomNavbar from "@/components/custom-navbar/custom-navbar.vue";
+import BrandCard from "./components/brand-card.vue";
+import SkillCard from "./components/skill-card.vue";
+
+export default {
+	components: {
+		filters,
+		projectTabs,
+		CustomNavbar,
+		TabBar,
+		BrandCard,
+		SkillCard
+	},
+	data() {
+		return {
+			isLogin: false,
+			isUserInfoLoaded: false, // 新增：标识用户信息是否已经加载完毕
+			userInfo: {},
+			authDetails: null, // 用于存储获取到的真实入驻详情配置
+			sjId: null,
+
+			showSetupModal: false, //  弹窗开关控制
+
+			displayScore: 0,
+			animationTimer: null,
+
+			noticeList: [{
+				id: 0,
+				title: '',
+				url: ''
+			}],
+
+			quickActions: [{
+				name: '扫码验券',
+				icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b128e423-e4b5-4ad6-bdf5-522de7a9bc68.png',
+				path: '/pages/shop/verify/verify-order'
+			},
+			{
+				name: '服务管理',
+				icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a90f02a2-9d39-440a-ad20-a4337bcd1b38.png',
+				path: '/pages/artisan/service-list'
+			},
+			{
+				name: '工位管理',
+				icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4c503603-6c2f-4a7a-9329-5e54b8ca769e.png',
+				path: '/pages/shop/workSpace/list'
+			},
+			{
+				name: '财务管理',
+				icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/728c659e-e395-4473-b83e-7e04539f7ec6.png',
+				path: '/pages/wallet/wallet'
+			}
+			],
+			orderBasic: {
+				updateTime: '--:--',
+				waitStart: 0,
+				waitFinish: 0,
+				finished: 0
+			},
+			orderDetail: {
+				updateTime: '--:--',
+				score: '0.0',
+				visitors: 0,
+				yVisitors: 0,
+				orders: 0,
+				yOrders: 0,
+				amount: '0.00',
+				yAmount: '0.00'
+			},
+
+			brands: [],
+			skills: []
+		};
+	},
+	computed: {
+		// 格式化今日成交金额
+		formattedAmount() {
+			return this.formatMoney(this.orderDetail.amount);
+		},
+		// 格式化昨日成交金额
+		formattedYAmount() {
+			return this.formatMoney(this.orderDetail.yAmount);
+		},
+		// 依靠后端实际返回的资料详情来判断是否真的提交过申请，而不是无脑信 id_type: -1
+		isUnderReview() {
+			if (!this.isLogin) return false;
+			// 只要拿到了具体的入驻详情数据对象（比如填了各种地址、执照等，内容肯定不为空），就说明填过表了
+			if (this.authDetails && Object.keys(this.authDetails).length > 0) {
+				// 如果后端是用特定的状态值判断，比如 this.authDetails.state === 0，你可以自己加 && 后面
+				return true;
+			}
+			return false; // 啥也没返回，说明只是刚注册没填资料
+		},
+
+		// 判断是否具备接单的大前提条件
+		canOpenStore() {
+			return this.hasBusinessTime && this.hasServiceSkill && this.isCertified;
+		},
+		// 修复：使用 authDetails 里的真实接口返回字段判定服务技能
+		hasServiceSkill() {
+			// 检查 userInfo 中是否有值
+			const fromUser = this.userInfo && Array.isArray(this.userInfo.servers_kill) && this.userInfo.servers_kill
+				.length > 0;
+			// 检查 authDetails 中是否有值
+			const fromAuth = this.authDetails && Array.isArray(this.authDetails.servers_kill) && this.authDetails
+				.servers_kill.length > 0;
+
+			// 只要有一边配了，就算已配置
+			return this.isLogin && (fromUser || fromAuth);
+		},
+
+		// 状态显示完全由计算属性控制，去除了手动修改可能导致的冲突
+		isOpenStore() {
+			// 如果连开门的前提条件都没满足，强制显示“休息中”
+			if (!this.canOpenStore) {
+				return false;
+			}
+			// 满足条件后，听后端的 (使用 == 防止后端返回字符串 "1")
+			return this.userInfo.order_taking == 1;
+		},
+
+		// 状态管理判定
+		// 是否已入驻 (0: 未入驻, -1: 入驻第一步, >0: 已认证) 只要不等于0，说明已经开启了入驻流程
+		isSettled() {
+			// 加上 typeof 判断，防止初始空对象时 undefined !== 0 造成的误判
+			if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+			return this.userInfo.id_type !== 0;
+		},
+		// 是否认证通过 (根据规则，> 0 说明认证通过了)
+		isCertified() {
+			if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+			return this.userInfo.id_type > 0;
+		},
+		// 优化：兼容判定营业时间（userInfo 和 authDetails 里只要有就算配置了）
+		hasBusinessTime() {
+			const timeFromUser = this.userInfo && this.userInfo.business_time;
+			const timeFromAuth = this.authDetails && this.authDetails.business_time;
+			return this.isLogin && !!(timeFromUser || timeFromAuth);
+		},
+
+		// 根据登录状态动态返回头像
+		currentAvatar() {
+			if (!this.isLogin || !this.userInfo.head_photo) {
+				return 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4099a78b-d3bd-4cf5-8599-68dfe751af16.png'; // 默认未登录头像
+			}
+			return this.userInfo.head_photo;
+		},
+		// 根据登录状态动态返回昵称
+		currentName() {
+			if (!this.isLogin) return '未登录';
+			return this.userInfo.name || this.userInfo.nick_name || '手机用户';
+		},
+		displayScoreDeg() {
+			const score = this.displayScore || 0;
+			const percentage = Math.min(Math.max(score, 0), 100);
+			return (percentage / 100) * 360;
+		},
+		progressGradient() {
+			return `conic-gradient(
+        transparent 0deg,
+        transparent calc(360deg - ${this.displayScoreDeg}deg),
+        #FF4D4F calc(360deg - ${this.displayScoreDeg}deg),
+        #FF4D4F 360deg
+      )`;
+		}
+	},
+	onShow() {
+		// 登录判定逻辑
+		this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+		if (this.isLogin) {
+			this.getUserInfo();
+		}
+		// 通知、品牌、技能 这三个接口不强依赖登录，无论登没登录都获取
+		this.fetchNoticeList();
+		this.fetchBrandList();
+		this.fetchSkillList();
+	},
+	onPullDownRefresh() {
+		// 1. 重新请求首页需要的所有数据
+		if (this.isLogin) {
+			this.getUserInfo();
+		}
+		this.fetchNoticeList();
+		this.fetchBrandList();
+		this.fetchSkillList();
+
+		// 2. 停止下拉刷新的动画
+		setTimeout(() => {
+			uni.stopPullDownRefresh();
+		}, 500);
+	},
+	onLoad() {
+		uni.hideTabBar();
+	},
+	watch: {
+		'orderDetail.score'() {
+			this.animateScore();
+		}
+	},
+	methods: {
+		// 金额转换万单位处理
+		formatMoney(amount) {
+			let num = parseFloat(amount);
+			if (isNaN(num)) return {
+				val: '0',
+				unit: '元'
+			};
+
+			if (num >= 10000) {
+				// 达到一万及以上，除以10000，最多保留两位小数（parseFloat会自动去掉末尾的0）
+				let val = parseFloat((num / 10000).toFixed(2));
+				return {
+					val: val,
+					unit: '万元'
+				};
+			}
+			// 小于一万，原样返回，单位为元
+			return {
+				val: num,
+				unit: '元'
+			};
+		},
+		// 处理登录跳转
+		handleLoginRedirect() {
+			// 如果 isLogin 为 false（未登录状态），则跳转到登录页
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+			}
+		},
+		//  弹窗中的快捷跳转功能
+		closeSetupModal() {
+			this.showSetupModal = false;
+		},
+		goToBusinessTime() {
+			this.showSetupModal = false;
+			uni.navigateTo({
+				url: '/pages/shop/business-time'
+			});
+		},
+		goToServiceSkill() {
+			this.showSetupModal = false;
+			uni.navigateTo({
+				url: '/pages/shop/service-skills'
+			});
+		},
+
+		// 专门给【提示弹窗】点击用的 (查看进度 / 去认证)
+		goToAuth() {
+			// 1. 点击后先关闭提示弹窗
+			this.showSetupModal = false;
+
+			// 2. 根据咱们新的严谨判断，决定它是真提交了还是纯没填
+			if (this.isUnderReview) {
+				// === 查看进度 ===
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				// === 去认证 / 被驳回重新认证 ===
+				this.navigateToForm();
+			}
+		},
+
+		// 专门给【横幅】点击用的 (去入驻 / 去认证)
+		goToSettle() {
+			if (!this.isSettled) {
+				// 完全没入驻过（新手），从头开始
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			} else if (this.isUnderReview) {
+				// 如果在横幅里处于审核中，也送去进度页
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				// 已经开启入驻但没完成表单，继续去填表！
+				this.navigateToForm();
+			}
+		},
+
+		// 提取公共的【去填表】路由分发大脑
+		navigateToForm() {
+			if (this.isSettled) {
+				// 已经开启入驻（老手），直接空降到 ruzhu 的最后一个流程（第3步：门店信息）
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?step=3'
+				});
+			} else {
+				// 完全没入驻过（纯新手），老老实实从第 0 步开始
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			}
+		},
+
+		goToBrandList() {
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return
+			}
+			uni.navigateTo({
+				url: '/pages/jingxuan/selected-brands'
+			});
+		},
+		goToSkillList() {
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return
+			}
+			uni.navigateTo({
+				url: '/pages/jingxuan/selected-skills'
+			});
+		},
+		// 处理金刚区点击事件 (包含扫码验券核心逻辑)
+		handleQuickAction(item) {
+			if (item.name === '扫码验券') {
+				uni.navigateTo({
+					url: '/pages/shop/verify/verify-order',
+					fail: (err) => {
+						console.error('跳转失败：', err);
+					}
+				});
+				return;
+			} // 2. 通用跳转逻辑
+			else if (item.path) {
+				uni.navigateTo({
+					url: item.path,
+					fail: () => {
+						uni.showToast({
+							title: '页面开发中...',
+							icon: 'none'
+						});
+					}
+				});
+			}
+		},
+
+		// 格式化时间 (提取 HH:mm)
+		formatTime(dateTimeStr) {
+			if (!dateTimeStr) return '--:--';
+			const arr = dateTimeStr.split(' ');
+			if (arr.length > 1) {
+				return arr[1].substring(0, 5); // 截取 HH:mm
+			}
+			return dateTimeStr;
+		},
+
+		getUserInfo() {
+			request.post("/sj/user/getUser").then((result) => {
+				if (result.code == 200 && result.data) {
+					this.userInfo = result.data;
+					this.isUserInfoLoaded = true; // 数据回来了，允许相关 UI 进行渲染
+					uni.setStorageSync("sjId", result.data.id);
+					this.sjId = result.data.id;
+
+					// 优化 1：只有完全通过认证，才去后台查单量和收益数据
+					if (this.isCertified) {
+						this.fetchOrderNum();
+						this.fetchRealTimeData();
+					}
+
+					// 优化 2：只要开启了入驻流程（哪怕只是在“去认证”阶段），依然需要拉详情来判断有没有补全三大件
+					if (this.isSettled) {
+						this.fetchAuthDetails();
+					}
+				}
+			});
+		},
+
+		// 获取入驻、修改资料审核详情（获取服务技能、营业时间等准确数据）
+		fetchAuthDetails() {
+			request.post("/sj/userSjAuth/details", {
+				type: 1, // 审核类型 1入驻申请
+				id_type: '1' // 平台商家
+			}).then(res => {
+				if (res.code == 200 && res.data) {
+					this.authDetails = res.data;
+				}
+
+				// 只有确保拉到了配置详情后，再来判断三大件有没有配全
+				// 如果没有配全，且是首次大退打开进入首页，拉起弹窗
+				if (!this.canOpenStore && !hasShownSetupModal) {
+					this.showSetupModal = true;
+					hasShownSetupModal = true;
+				}
+			});
+		},
+
+		fetchOrderNum() {
+			request.post("/sj/poster/orderNum").then(res => {
+				if (res.code == 200 && res.data) {
+					this.orderBasic = {
+						updateTime: this.formatTime(res.data.now_date),
+						waitStart: res.data.dfw || 0,
+						waitFinish: res.data.dwc || 0,
+						finished: res.data.yqx || 0
+					};
+				}
+			});
+		},
+
+		// 获取：首页实时数据
+		fetchRealTimeData() {
+			request.post("/sj/poster/realTimeData").then(res => {
+				if (res.code == 200 && res.data) {
+					const today = res.data.today || {};
+					const yesterday = res.data.yesterday || {};
+
+					this.orderDetail = {
+						updateTime: this.formatTime(res.data.now_date),
+						score: today.rating_num || 0,
+						visitors: today.visitor_num || 0,
+						yVisitors: yesterday.visitor_num || 0,
+						orders: today.place_order || 0,
+						yOrders: yesterday.place_order || 0,
+						amount: today.deal_money || 0,
+						yAmount: yesterday.deal_money || 0
+					};
+				}
+			});
+		},
+
+		// 获取：通知公告列表
+		fetchNoticeList() {
+			request.post('/sj/notice/list', {
+				page: 1,
+				limit: 5
+			}).then(res => {
+				if (res.code == 200 && res.data && res.data.list.length > 0) {
+					this.noticeList = res.data.list;
+				}
+			});
+		},
+
+		// 获取：品牌列表
+		fetchBrandList() {
+			request.post('/sj/brand/list', {
+				page: 1,
+				limit: 4
+			}).then(res => {
+				if (res.code == 200 && res.data && res.data.list) {
+					this.brands = res.data.list.map(item => {
+						let tags = [];
+						if (item.franchise_state === 1) tags.push('franchise');
+						if (item.student_state === 1) tags.push('recruit');
+						if (tags.length === 0) tags.push('more');
+
+						return {
+							id: item.id,
+							name: item.name,
+							bgSrc: item.cover_img ||
+								'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d02b2d8b-0e01-4c6d-bbee-c60dccf4867c.jpg',
+							avatar: item.logo_img ||
+								'https://dummyimage.com/100x100/ccc/fff.png&text=Avatar',
+							tagKeys: tags
+						};
+					});
+				}
+			});
+		},
+
+		// 获取：技能集市列表
+		fetchSkillList() {
+			request.post('/sj/skill/list', {
+				page: 1,
+				limit: 4
+			}).then(res => {
+				if (res.code == 200 && res.data && res.data.list) {
+					this.skills = res.data.list.map(item => {
+						return {
+							id: item.id,
+							title: item.name,
+							type: item.link_name || '平台课程',
+							views: item.browse_num || 0,
+							time: item.create_time ? item.create_time.split(' ')[0] : '',
+							coverSrc: item.cover_img ||
+								'https://dummyimage.com/200x150/ccc/fff.png&text=Video',
+							typeIcon: item.link_logo || '',
+							video: item.video || ''
+						};
+					});
+				}
+			});
+		},
+
+
+
+		// 跳转：通知详情页
+		goToNotice(msg) {
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return
+			}
+			if (msg.id) {
+				uni.navigateTo({
+					url: `/pages/notice/detail?id=${msg.id}`
+				});
+			}
+		},
+		// 跳转：通知公告列表页
+		goToNoticeList() {
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return
+			}
+			uni.navigateTo({
+				url: '/pages/notice/notice_list'
+			});
+		},
+		// 跳转：订单列表页
+		goToOrderList() {
+			uni.switchTab({
+				url: '/pages/order/userorder-list'
+			});
+		},
+
+		// 营业中 / 休息中 按钮逻辑判断
+		toggleStatus() {
+			const currentStatus = this.userInfo.order_taking;
+			const isCurrentlyResting = currentStatus != 1; // 当前不是营业中即为休息中
+
+			// 强力拦截：在休息中且三大件没配全，想要营业时拦截弹窗
+			if (isCurrentlyResting && !this.canOpenStore) {
+				this.showSetupModal = true;
+				return;
+			}
+
+			// 准备切换的新状态
+			let newStatus = currentStatus == 1 ? 2 : 1;
+
+			// 加入一个防连点的 Loading
+			uni.showLoading({
+				title: '切换中...',
+				mask: true
+			});
+
+			// 发起请求告诉后端
+			request.post("/sj/sjordertaking", {
+				order_taking: newStatus,
+				sjid: this.sjId
+			}).then((res) => {
+				uni.hideLoading();
+				// 因为上一次的严格判断误伤了你，这里回归你最原始的写法，直接假定成功
+				this.userInfo.order_taking = newStatus; // 强行改一下本地状态让按钮动过去
+				this.getUserInfo(); // 无论如何刷新一下真实数据
+				uni.showToast({
+					title: newStatus == 1 ? '已开启营业' : '已休息',
+					icon: 'none'
+				});
+			}).catch(() => {
+				// 只有在彻底断网报错的情况下，才会弹下面这个
+				uni.hideLoading();
+				uni.showToast({
+					title: '网络异常，切换失败',
+					icon: 'none'
+				});
+			});
+		},
+
+		animateScore() {
+			const target = parseFloat(this.orderDetail.score) || 0;
+			if (this.animationTimer) clearInterval(this.animationTimer);
+
+			const start = this.displayScore;
+			const change = target - start;
+
+			if (Math.abs(change) < 0.05) {
+				this.displayScore = target;
+				return;
+			}
+
+			const frames = 30;
+			const duration = 600;
+			let currentFrame = 0;
+
+			this.animationTimer = setInterval(() => {
+				currentFrame++;
+				const progress = currentFrame / frames;
+				const easeProgress = 1 - Math.pow(1 - progress, 3);
+
+				this.displayScore = start + change * easeProgress;
+
+				if (currentFrame >= frames) {
+					this.displayScore = target;
+					clearInterval(this.animationTimer);
+				}
+			}, duration / frames);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #f5f6f8;
+}
+
+/* ============ 提示弹窗样式 ============ */
+.setup-modal-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 9999;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	.setup-modal-content {
+		width: 630rpx;
+		height: 775rpx;
+		/* 根据要求绝对固定宽高 */
+		background: #FFFFFF;
+		border-radius: 32rpx;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+
+		.modal-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 630rpx;
+			height: 265rpx;
+			z-index: 0;
+		}
+
+		.modal-header {
+			position: relative;
+			z-index: 1;
+			height: 150rpx;
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			padding-bottom: 20rpx;
+
+			text {
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #333333;
+				letter-spacing: 2rpx;
+			}
+		}
+
+		.modal-body {
+			position: relative;
+			z-index: 1;
+			flex: 1;
+			padding: 24rpx 40rpx;
+
+			.modal-subtitle {
+				font-size: 28rpx;
+				color: #333333;
+				margin-bottom: 40rpx;
+				display: block;
+			}
+
+			.missing-list {
+				display: flex;
+				flex-direction: column;
+				gap: 46rpx;
+				/* 间距拉开显得不那么拥挤 */
+
+				.missing-item {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.item-left {
+						display: flex;
+						align-items: flex-start;
+
+						.item-icon {
+							width: 32rpx;
+							height: 32rpx;
+							margin-right: 16rpx;
+							flex-shrink: 0;
+							/* 防止图标被挤压变形 */
+							margin-top: 6rpx;
+						}
+
+						.item-texts {
+							display: flex;
+							flex-direction: column;
+
+							.item-title {
+								font-size: 30rpx;
+								color: #333333;
+								font-weight: 500;
+								margin-bottom: 8rpx;
+
+								/* 增加蓝色字体样式 */
+								&.blue-text {
+									color: #2b85e4;
+								}
+							}
+
+							.item-desc {
+								font-size: 24rpx;
+								color: #999999;
+							}
+						}
+					}
+
+					.item-right {
+						font-size: 26rpx;
+						font-weight: 400;
+						margin-top: -45rpx;
+
+						&.orange {
+							color: #FF7B00;
+						}
+
+						&.grey {
+							color: #999999;
+						}
+
+						/* 增加浅绿色样式 */
+						&.light-green {
+							color: #5CAC81;
+						}
+					}
+				}
+			}
+		}
+
+		.modal-footer {
+			position: relative;
+			z-index: 1;
+			padding: 0 50rpx 50rpx;
+
+			.btn-know {
+				width: 100%;
+				height: 88rpx;
+				background: #FF4767;
+				border-radius: 44rpx;
+				color: #FFFFFF;
+				font-size: 32rpx;
+				font-weight: 500;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+}
+
+/* ==================================== */
+
+.homePage {
+	position: relative;
+	min-height: 100vh;
+	padding: 0 24rpx;
+	padding-top: 100rpx;
+
+	.page-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: 0;
+	}
+
+	.card-box {
+		position: relative;
+		z-index: 1;
+		background: #ffffff;
+		border-radius: 24rpx;
+		margin-bottom: 24rpx;
+		padding: 20rpx 30rpx 30rpx;
+	}
+
+	.more-right-icon {
+		width: 8rpx;
+		height: 14rpx;
+		margin-left: 6rpx;
+	}
+
+	.card-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 24rpx;
+
+		.header-left {
+			display: flex;
+			align-items: center;
+
+			.title {
+				margin-right: 20rpx;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #101010;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.update-time {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #8E694D;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.refresh-icon {
+				width: 18rpx;
+				height: 18rpx;
+				margin-left: 10rpx;
+			}
+		}
+
+		.header-right {
+			font-weight: 400;
+			font-size: 20rpx;
+			color: #666666;
+			line-height: 28rpx;
+		}
+	}
+
+	.header-section {
+		position: relative;
+		z-index: 1;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 40rpx;
+
+		.user-info {
+			display: flex;
+			align-items: center;
+
+			.avatar {
+				width: 76rpx;
+				height: 76rpx;
+				border-radius: 50%;
+				margin-right: 20rpx;
+			}
+
+			.name {
+				height: 42rpx;
+				font-family: PingFangTC, PingFangTC;
+				font-weight: bold;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 42rpx;
+			}
+
+			.desc {
+				height: 28rpx;
+				font-family: PingFangTC, PingFangTC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #858796;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		.status-toggle {
+			position: relative;
+			width: 173rpx;
+			height: 62rpx;
+			display: flex;
+			align-items: center;
+			border-radius: 31rpx;
+			box-sizing: border-box;
+			overflow: hidden;
+
+			background-image: linear-gradient(316deg,
+					rgba(255, 161, 203, 1) 0,
+					rgba(251, 143, 180, 1) 49.381741%,
+					rgba(255, 130, 239, 1) 100%);
+			transition: all 0.3s ease;
+
+			&::before {
+				content: "";
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/269c1024-34ec-42af-8b20-1ce047c9851b.png") no-repeat center;
+				background-size: 100% 100%;
+				opacity: 0;
+				z-index: 1;
+				transition: opacity 0.3s ease;
+			}
+
+			.status-text {
+				position: absolute;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #FFFFFF;
+				line-height: 40rpx;
+				z-index: 3;
+				left: 22rpx;
+				transition: transform 0.3s cubic-bezier(0.25, 1, 0.5, 1);
+			}
+
+			.toggle-dot {
+				position: absolute;
+				top: 5rpx;
+				right: 5rpx;
+				width: 52rpx;
+				height: 52rpx;
+				background: #fff;
+				border-radius: 50%;
+				z-index: 3;
+				transition: transform 0.35s cubic-bezier(0.25, 1, 0.5, 1);
+			}
+
+			&.is-closed {
+				&::before {
+					opacity: 1;
+				}
+
+				.status-text {
+					transform: translateX(46rpx);
+				}
+
+				.toggle-dot {
+					transform: translate(-113rpx, 2rpx);
+				}
+			}
+		}
+	}
+
+	.settlement-guide {
+		padding: 0;
+		overflow: hidden;
+
+		.guide-header {
+			width: 100%;
+			height: 248rpx;
+			background-size: cover;
+		}
+
+		.guide-body {
+			padding: 90rpx 0 50rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.guide-text {
+				margin-bottom: 20rpx;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+				line-height: 40rpx;
+			}
+
+			.guide-btn {
+				width: 534rpx;
+				height: 70rpx;
+				border-radius: 35rpx;
+				border: 1rpx solid #FF4767;
+
+				color: #FF4767;
+				font-weight: 500;
+				font-size: 28rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+
+	.quick-actions {
+		display: flex;
+		justify-content: space-around;
+		padding: 30rpx 10rpx;
+		background: #F3F4FD;
+
+		.action-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.action-icon {
+				width: 60rpx;
+				height: 60rpx;
+				margin-bottom: 13rpx;
+			}
+
+			.action-text {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #101010;
+				line-height: 33rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+	}
+
+	.order-stats-basic {
+		background: linear-gradient(176deg, #F0F4FF 0%, #FFFFFF 100%);
+		border-radius: 20rpx;
+		border: 1rpx solid #FFFFFF;
+
+		.stats-content {
+			display: flex;
+			justify-content: space-around;
+			text-align: center;
+
+			.num {
+				display: block;
+				font-weight: 500;
+				font-size: 40rpx;
+				color: #333333;
+				line-height: 56rpx;
+				font-style: normal;
+			}
+
+			.label {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #666666;
+				line-height: 33rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+	}
+
+	.order-stats-detail {
+		.detail-content {
+			display: flex;
+			align-items: center;
+
+			.score-dashboard {
+				position: relative;
+				width: 140rpx;
+				height: 140rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				margin-right: 40rpx;
+				flex-shrink: 0;
+
+				.ring-track {
+					position: absolute;
+					width: 130rpx;
+					height: 130rpx;
+					top: 5rpx;
+					left: 5rpx;
+					background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4189620a-fd4f-42eb-9977-817e521b4f12.png") no-repeat center;
+					background-size: contain;
+					z-index: 1;
+				}
+
+				.ring-progress {
+					position: absolute;
+					top: 2rpx;
+					left: 0;
+					width: 140rpx;
+					height: 140rpx;
+					border-radius: 50%;
+					mask: radial-gradient(transparent 62rpx, #000 65rpx);
+					-webkit-mask: radial-gradient(transparent 62rpx, #000 65rpx);
+					z-index: 2;
+				}
+
+				.dot {
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					width: 7rpx;
+					height: 7rpx;
+					background: #FF4D4F;
+					border-radius: 50%;
+					z-index: 3;
+					margin-top: -3.5rpx;
+					margin-left: -3.5rpx;
+				}
+
+				.start-dot {
+					transform: translateY(-66rpx);
+				}
+
+				.end-dot {
+					transform-origin: center center;
+					margin-left: -4rpx;
+					margin-top: -2rpx;
+				}
+
+				.score-num {
+					position: absolute;
+					font-family: AlimamaShuHeiTi, sans-serif;
+					font-weight: bold;
+					font-size: 34rpx;
+					color: #333333;
+					z-index: 3;
+				}
+
+				.score-tag-img {
+					position: absolute;
+					bottom: -10rpx;
+					width: 85rpx;
+					height: 35rpx;
+					z-index: 4;
+				}
+			}
+
+			.detail-grid {
+				flex: 1;
+				display: flex;
+				justify-content: space-between;
+
+				.grid-item {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+
+					.label {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #888888;
+						line-height: 33rpx;
+						margin-bottom: 12rpx;
+					}
+
+					.val-box {
+						display: flex;
+						align-items: baseline;
+						margin-bottom: 6rpx;
+
+						.val {
+							font-weight: 500;
+							font-size: 40rpx;
+							color: #333333;
+							line-height: 56rpx;
+						}
+
+						.unit {
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #888888;
+							line-height: 33rpx;
+							margin-left: 6rpx;
+						}
+					}
+
+					.yesterday {
+						margin-top: 6rpx;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #888888;
+						line-height: 33rpx;
+						text-align: center;
+					}
+				}
+			}
+		}
+	}
+
+	.notice-bar {
+		display: flex;
+		align-items: center;
+		padding: 13rpx 30rpx;
+		min-height: 66rpx;
+		box-sizing: border-box;
+		background: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/3d9c6b4b-ef6f-4242-abd4-6194d13e02dc.png");
+		background-size: contain;
+
+		.notice-icon {
+			width: 25rpx;
+			height: 21rpx;
+			margin-right: 16rpx;
+		}
+
+		.notice-swiper {
+			flex: 1;
+			height: 40rpx;
+			line-height: 40rpx;
+
+			.notice-text {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #30353C;
+			}
+		}
+
+		.notice-btn {
+			font-weight: 400;
+			font-size: 18rpx;
+			color: #8D4C1B;
+			padding: 2rpx 15rpx;
+			border-radius: 30rpx;
+			border: 1rpx solid #8d4c1b50;
+			margin-left: 10rpx;
+		}
+	}
+
+	.brands-section {
+		padding: 20rpx 20rpx;
+
+		.brand-grid {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.brand-card-wrap {
+				width: 48.5%;
+				margin-bottom: 14rpx;
+			}
+		}
+	}
+
+	.skills-section {
+		.skill-list {
+			display: flex;
+			flex-direction: column;
+		}
+
+		.skill-item {
+			display: flex;
+			margin-bottom: 30rpx;
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+
+			.cover-box {
+				position: relative;
+				width: 224rpx;
+				height: 126rpx;
+				border-radius: 16rpx;
+				overflow: hidden;
+				margin-right: 24rpx;
+				flex-shrink: 0;
+
+				.cover {
+					width: 100%;
+					height: 100%;
+				}
+
+				.play-icon {
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					transform: translate(-50%, -50%);
+					width: 39rpx;
+					height: 39rpx;
+				}
+			}
+
+			.skill-info {
+				flex: 1;
+				display: flex;
+				min-width: 0;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.skill-title {
+					display: block;
+					font-size: 28rpx;
+					color: #333;
+					font-weight: 400;
+					line-height: 40rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+
+				.skill-type {
+					display: flex;
+					align-items: center;
+					font-size: 22rpx;
+					margin-top: 10rpx;
+
+					.type-icon {
+						width: 26rpx;
+						height: 26rpx;
+						margin-right: 8rpx;
+						border-radius: 50%;
+					}
+
+					.type-text {
+						background: #f9d3d760;
+						border-radius: 7rpx;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #E55463;
+						line-height: 33rpx;
+						padding: 2rpx 10rpx;
+					}
+				}
+
+				.skill-stats {
+					font-size: 22rpx;
+					color: #999;
+					margin-top: 10rpx;
+					display: flex;
+					align-items: center;
+
+					.view-icon {
+						width: 26rpx;
+						height: 22rpx;
+						margin-right: 8rpx;
+						margin-top: -2rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.line-1 {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.line-2 {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages/jingxuan/brand-detail.vue b/pages/jingxuan/brand-detail.vue
index 600d72a..1edc59c 100644
--- a/pages/jingxuan/brand-detail.vue
+++ b/pages/jingxuan/brand-detail.vue
@@ -17,39 +17,25 @@
       <text>{{ useMockData ? '关闭模拟数据' : '开启模拟数据' }}</text>
     </view> -->
 
-    <view class="banner-section" v-if="bannerList && bannerList.length || info.video">
+    <view class="banner-section" v-if="bannerList && bannerList.length">
 
-      <!-- 原生视频组件 (就地播放) -->
-      <video v-if="info.video && isVideoPlaying" id="myVideo" class="banner-video" :src="info.video" autoplay controls
-        object-fit="cover"></video>
-
-      <!-- 轮播图区域 (当视频播放时隐藏) -->
-      <swiper v-else class="banner-swiper" circular @change="onSwiperChange" :autoplay="!info.video">
+      <!-- 轮播图区域 -->
+      <swiper class="banner-swiper" circular @change="onSwiperChange" :autoplay="false" :current="currentBannerIndex">
+        <!-- 视频作为第一项 -->
+        <swiper-item v-if="info.video">
+          <video id="myVideo" class="banner-video" :src="info.video" :autoplay="currentBannerIndex === 0" controls
+            object-fit="cover" :show-center-play-btn="false" :show-play-btn="false" @play="onVideoPlay"
+            @pause="onVideoPause" @ended="onVideoEnded"></video>
+        </swiper-item>
+        <!-- 图片轮播 -->
         <swiper-item v-for="(item, index) in bannerList" :key="index">
           <image class="banner-img" :src="item" mode="aspectFill"></image>
         </swiper-item>
       </swiper>
 
-      <!-- 居中的视频播放大图标 (当视频播放时隐藏) -->
-      <image v-if="info.video && !isVideoPlaying" class="center-play-icon"
-        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb720bb0-4ada-49f6-9ce5-38abfd613d5d.png"
-        @click="playVideoInPlace"></image>
-
-      <!-- 视频/图片 相册切换组件 (当视频播放时隐藏) -->
-      <view class="album" v-if="(info.video || bannerList.length > 0) && !isVideoPlaying">
-        <view class="album-left" @click="info.video ? playVideoInPlace() : goAlbum()">
-          {{ info.video ? "视频" : "图片" }}
-        </view>
-        <view class="album-line"></view>
-        <view class="album-right" @click="goAlbum">
-          <view class="album-right-text">相册</view>
-          <image src="/static/images/icons/right7_13.png" class="album-right-img"></image>
-        </view>
-      </view>
-
-      <!-- 指示器 (当视频播放时隐藏) -->
-      <view class="indicator" v-if="!isVideoPlaying && bannerList.length > 0">
-        <text>{{ currentBannerIndex + 1 }} / {{ bannerList.length }}</text>
+      <!-- 指示器 -->
+      <view class="indicator" v-if="bannerList.length > 0">
+        <text>{{ currentBannerIndex + 1 }} / {{ totalSlides }}</text>
       </view>
     </view>
 
@@ -164,6 +150,27 @@
       </view>
     </view>
 
+    <!-- 拨打电话选择弹窗 -->
+    <view class="phone-popup" :class="{ show: showPhonePopup }">
+      <view class="phone-popup-mask" @click="closePhonePopup"></view>
+      <view class="phone-popup-content">
+        <view class="phone-popup-header">
+          <text class="phone-popup-title">拨打电话</text>
+        </view>
+        <view class="phone-popup-body">
+          <view class="phone-option" v-if="info.contact_phone" @click="selectPhone(info.contact_phone)">
+            <text class="phone-number">{{ info.contact_phone }}</text>
+          </view>
+          <view class="phone-option" v-if="info.alternate_phone" @click="selectPhone(info.alternate_phone)">
+            <text class="phone-number">{{ info.alternate_phone }}</text>
+          </view>
+        </view>
+        <view class="phone-popup-cancel" @click="closePhonePopup">
+          <text class="cancel-text">取消</text>
+        </view>
+      </view>
+    </view>
+
     <tipsPopup2 :show="tipShow" @closePopup="closePopup" sureText="确认" @okBtn="okBtn">
       {{ tipsText }}
     </tipsPopup2>
@@ -196,6 +203,7 @@ export default {
       tipShow: false, // 弹窗控制
       tipsText: "",   // 弹窗提示文本
       tipType: "",    // 弹窗类型判断
+      showPhonePopup: false, // 拨打电话弹窗
 
       isCollected: false, // 是否已收藏
       // 未收藏时的灰色星星
@@ -204,7 +212,6 @@ export default {
       iconCollectOn: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fe2011b0-a34d-46ee-911a-0ea6f099ad77.png',
       // ==================================
 
-      isVideoPlaying: false, // 是否正在就地播放视频
       phoneIconTop: 20,      // 顶部电话图标初始Top
       phoneIconRight: 50,    // 顶部电话图标初始Right
 
@@ -296,6 +303,10 @@ export default {
     showTabSection() {
       return this.availableTabs.length > 0;
     },
+    // 总轮播数（视频+图片）
+    totalSlides() {
+      return this.bannerList.length + (this.info.video ? 1 : 0);
+    },
     canSubmit() {
       const d = this.formData;
       const baseValid = d.contact_name && d.contact_phone && d.province_code && d.city_code && d.area_code && d.intention;
@@ -439,29 +450,69 @@ export default {
 
     // 拨打电话面板
     makeCall() {
-      // 兼容可能存在的多种手机号字段
-      const phone = this.info.contact_phone || '';
-      if (phone) {
-        uni.makePhoneCall({
-          phoneNumber: String(phone),
-          fail: (err) => {
-            console.log('取消拨打或拨打失败', err);
-          }
-        });
+      if (!this.isLogin) {
+        this.tipsText = "您现在还未登录，是否确定登录？";
+        this.tipShow = true;
+        this.tipType = "login";
+        return; // 拦截请求，不再往下执行
+      }
+
+      const contactPhone = this.info.contact_phone || '';
+      const alternatePhone = this.info.alternate_phone || '';
+
+      // 两个号码都存在，弹出自定义弹窗让用户选择
+      if (contactPhone && alternatePhone) {
+        this.showPhonePopup = true;
+      } else if (contactPhone) {
+        // 仅客服电话
+        this.doMakeCall(contactPhone);
+      } else if (alternatePhone) {
+        // 仅备用电话
+        this.doMakeCall(alternatePhone);
       } else {
         uni.showToast({ title: '暂无联系电话', icon: 'none' });
       }
     },
 
+    // 选择电话号码
+    selectPhone(phone) {
+      this.closePhonePopup();
+      this.doMakeCall(phone);
+    },
+
+    // 关闭电话弹窗
+    closePhonePopup() {
+      this.showPhonePopup = false;
+    },
+
+    // 执行拨号
+    doMakeCall(phone) {
+      uni.makePhoneCall({
+        phoneNumber: String(phone),
+        fail: (err) => {
+          console.log('取消拨打或拨打失败', err);
+        }
+      });
+    },
+
     goAlbum() {
       uni.navigateTo({
         url: `/pages/album/index?id=${this.brandId}&user_type=2`
       });
     },
 
-    // 就地播放视频
-    playVideoInPlace() {
-      this.isVideoPlaying = true;
+    // 视频事件处理
+    onVideoPlay() {
+      console.log('视频开始播放');
+    },
+    onVideoPause() {
+      console.log('视频暂停');
+    },
+    onVideoEnded() {
+      // 视频播放结束，切换到下一张图片
+      if (this.bannerList.length > 0) {
+        this.currentBannerIndex = 1;
+      }
     },
 
     // 悬浮按钮切换 Mock 数据
@@ -472,7 +523,6 @@ export default {
     },
 
     getBrandDetails() {
-      this.isVideoPlaying = false; // 每次刷新数据重置播放状态
       if (this.useMockData) {
         this.injectMockData();
         return;
@@ -1132,4 +1182,100 @@ export default {
 .popup-btn.confirm .btn-text {
   color: #FFFFFF;
 }
+
+/* 拨打电话弹窗样式 */
+.phone-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.3s ease;
+}
+
+.phone-popup.show {
+  visibility: visible;
+  opacity: 1;
+}
+
+.phone-popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.phone-popup-content {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #F5F5F5;
+  border-radius: 24rpx 24rpx 0 0;
+  transform: translateY(100%);
+  transition: transform 0.3s ease;
+}
+
+.phone-popup.show .phone-popup-content {
+  transform: translateY(0);
+}
+
+.phone-popup-header {
+  padding: 30rpx;
+  text-align: center;
+  background-color: #FFFFFF;
+  border-radius: 24rpx 24rpx 0 0;
+}
+
+.phone-popup-title {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #333333;
+}
+
+.phone-popup-body {
+  background-color: #FFFFFF;
+  margin-top: 2rpx;
+}
+
+.phone-option {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 30rpx;
+  border-bottom: 1rpx solid #EEEEEE;
+}
+
+.phone-option:last-child {
+  border-bottom: none;
+}
+
+.phone-label {
+  font-size: 26rpx;
+  color: #999999;
+  margin-bottom: 10rpx;
+}
+
+.phone-number {
+  font-size: 34rpx;
+  color: #333333;
+  font-weight: 500;
+}
+
+.phone-popup-cancel {
+  margin-top: 16rpx;
+  padding: 30rpx;
+  text-align: center;
+  background-color: #FFFFFF;
+}
+
+.cancel-text {
+  font-size: 32rpx;
+  color: #333333;
+}
 </style>
\ No newline at end of file
diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index 2542dcf..0bbfe33 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -2,26 +2,19 @@
   <view class="collection-page">
 
     <custom-navbar title="我的收藏" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true" borderBottom="none"
-      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" @onHeadleClick="goToSearch">
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png"
+      @onHeadleClick="goToSearch">
     </custom-navbar>
-    
+
     <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view>
 
     <view class="tab-bar-wrap" :style="{ top: navHeight + 'px' }">
       <view class="tab-bar">
         <view class="tab-items">
-          <view 
-            class="tab-item" 
-            :class="{ active: currentTab === 'brand' }"
-            @tap="switchTab('brand')"
-          >
+          <view class="tab-item" :class="{ active: currentTab === 'brand' }" @tap="switchTab('brand')">
             收藏的品牌
           </view>
-          <view 
-            class="tab-item" 
-            :class="{ active: currentTab === 'course' }"
-            @tap="switchTab('course')"
-          >
+          <view class="tab-item" :class="{ active: currentTab === 'course' }" @tap="switchTab('course')">
             收藏的课程
           </view>
         </view>
@@ -32,21 +25,17 @@
       </view>
     </view>
 
-    <view class="filter-panel" :class="{ 'show': filterVisible }" :style="{ top: filterTop + 'px' }" catchtouchmove="true">
+    <view class="filter-panel" :class="{ 'show': filterVisible }" :style="{ top: filterTop + 'px' }"
+      catchtouchmove="true">
       <view class="filter-mask" @tap="closeFilterPanel"></view>
       <view class="filter-container">
-        
+
         <scroll-view scroll-y class="filter-scroll" v-if="currentTab === 'brand'">
           <view class="filter-group" v-for="group in brandFilterData" :key="group.id">
             <view class="group-title">{{ group.title }}</view>
             <view class="pill-list">
-              <view 
-                class="pill-item" 
-                v-for="sub in group.children" 
-                :key="sub.id"
-                :class="{ active: selectedSecondIds.includes(sub.id) }"
-                @tap="toggleSecondSelect(sub.id)"
-              >
+              <view class="pill-item" v-for="sub in group.children" :key="sub.id"
+                :class="{ active: selectedSecondIds.includes(sub.id) }" @tap="toggleSecondSelect(sub.id)">
                 {{ sub.title }}
               </view>
             </view>
@@ -54,18 +43,12 @@
         </scroll-view>
 
         <view v-else class="course-filter">
-          <view 
-            class="course-type-item"
-            :class="{ active: selectedCourseType === 'platform' }"
-            @tap="selectCourseType('platform')"
-          >
+          <view class="course-type-item" :class="{ active: selectedCourseType === 'platform' }"
+            @tap="selectCourseType('platform')">
             平台课程
           </view>
-          <view 
-            class="course-type-item"
-            :class="{ active: selectedCourseType === 'brand' }"
-            @tap="selectCourseType('brand')"
-          >
+          <view class="course-type-item" :class="{ active: selectedCourseType === 'brand' }"
+            @tap="selectCourseType('brand')">
             品牌课程
           </view>
         </view>
@@ -79,30 +62,24 @@
 
     <view class="collection-content" v-if="currentTab === 'brand'">
       <view class="brand-grid" v-if="filteredBrandList.length > 0">
-        <brand-card 
-          class="brand-card-wrap"
-          v-for="(item, index) in filteredBrandList" 
-          :key="index" 
-          :item="item"
-          :tagKeys="item.tagKeys"
-          @click="goToBrandDetail(item)"
-        ></brand-card>
+        <brand-card class="brand-card-wrap" v-for="(item, index) in filteredBrandList" :key="index" :item="item"
+          :tagKeys="item.tagKeys" @click="goToBrandDetail(item)"></brand-card>
       </view>
       <view class="empty-state" v-else>
-        <image class="empty-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png"></image>
+        <image class="empty-icon"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png">
+        </image>
       </view>
     </view>
 
     <view class="collection-content" v-else>
       <view class="course-list" v-if="filteredCourseList.length > 0">
-        <skill-card 
-          v-for="(item, index) in filteredCourseList" 
-          :key="index" 
-          :item="item"
-        ></skill-card>
+        <skill-card v-for="(item, index) in filteredCourseList" :key="index" :item="item"></skill-card>
       </view>
       <view class="empty-state" v-else>
-        <image class="empty-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png"></image>
+        <image class="empty-icon"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png">
+        </image>
       </view>
     </view>
 
@@ -114,7 +91,7 @@
 <script>
 import TabBar from "@/components/tabbar/tabbar.vue"
 import BrandCard from "@/pages/home/components/brand-card.vue"
-import SkillCard from "@/pages/home/components/skill-card.vue" 
+import SkillCard from "@/pages/home/components/skill-card.vue"
 import request from "@/utils/request"
 
 // 数据模式开关：true=调用真实接口，false=使用模拟数据
@@ -130,15 +107,15 @@ export default {
     return {
       navHeight: 0,    // 动态计算的导航栏高度
       filterTop: 0,    // 动态计算的筛选框顶部起点
-      
+
       currentTab: 'brand',
       // 筛选相关
       filterVisible: false,
-      
+
       // 品牌筛选下拉数据 (合并一级和二级)
       brandFilterData: [],
       selectedSecondIds: [],   // 选中的二级ID数组
-      
+
       // 课程筛选
       selectedCourseType: '',  // 'platform' 或 'brand'
       // 原始数据（收藏的数据）
@@ -159,7 +136,7 @@ export default {
     // 精准计算吸顶高度与下拉框起点，防止蒙版遮挡白色的Tab区
     const sysInfo = uni.getSystemInfoSync()
     const sbh = sysInfo.statusBarHeight || 0
-    this.navHeight = sbh 
+    this.navHeight = sbh
     // Tab栏自身的高度大约为 106rpx，转化为 px 叠加上去
     this.filterTop = this.navHeight + uni.upx2px(106)
 
@@ -170,9 +147,9 @@ export default {
     // 跳转搜索页
     goToSearch() {
       // this.currentTab 的值刚好是 'brand' 或 'course'
-		uni.navigateTo({
-			url: `/pages/search_common/search?type=collection_${this.currentTab}` 
-		});
+      uni.navigateTo({
+        url: `/pages/search_common/search?type=collection_${this.currentTab}`
+      });
     },
     goBack() {
       uni.navigateBack()
@@ -199,14 +176,14 @@ export default {
     closeFilterPanel() {
       this.filterVisible = false
     },
-    
+
     // 加载一级分类并自动组装其对应的二级分类，兼容 state === 1
     async loadFilterCategories() {
       try {
         const res = await request.post('/sj/firstclass', {})
         if ((res.code === 200 || res.state === 1) && res.data) {
           const firstClasses = res.data;
-          
+
           // 并发请求所有的二级分类
           const promises = firstClasses.map(async (first) => {
             try {
@@ -216,11 +193,11 @@ export default {
                 title: first.title,
                 children: ((subRes.code === 200 || subRes.state === 1) && subRes.data) ? subRes.data : []
               }
-            } catch(e) {
+            } catch (e) {
               return { id: first.id, title: first.title, children: [] }
             }
           });
-          
+
           const filterData = await Promise.all(promises);
           // 过滤掉没有子分类的项，避免面板出现光秃秃的标题
           this.brandFilterData = filterData.filter(group => group.children.length > 0);
@@ -243,9 +220,9 @@ export default {
     // 课程筛选
     selectCourseType(type) {
       // 点击已选中的则取消选中
-      if(this.selectedCourseType === type){
+      if (this.selectedCourseType === type) {
         this.selectedCourseType = ''
-      }else{
+      } else {
         this.selectedCourseType = type
       }
     },
@@ -333,15 +310,15 @@ export default {
       try {
         // 1. 接口路径换成真实的品牌收藏列表
         const res = await request.post('/sj/brand/collectList', { page: 1, limit: 100 })
-        
+
         if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
           // 2. 不需要前端再做 filter(item => item.collect_state === 1) 了，直接用！
           this.rawBrandList = res.data.list.map(item => {
             let tags = []
             if (item.franchise_state == 1) tags.push('franchise')
             if (item.student_state == 1) tags.push('recruit')
-            if (tags.length === 0) tags.push('more') 
-            
+            if (tags.length === 0) tags.push('more')
+
             return {
               id: item.id,
               name: item.name,
@@ -364,7 +341,7 @@ export default {
       try {
         // 1. 接口路径换成真实的技能收藏列表
         const res = await request.post('/sj/skill/collectList', { page: 1, limit: 100 })
-        
+
         if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
           // 2. 同样不需要 filter，直接 map 映射数据
           this.rawCourseList = res.data.list.map(item => {
@@ -376,7 +353,7 @@ export default {
               link_type: item.link_type,
               views: item.browse_num || 0,
               // 3. 使用安全的时间格式化
-              time: item.create_time ? this.formatTimeAgo(item.create_time) : '', 
+              time: item.create_time ? this.formatTimeAgo(item.create_time) : '',
               typeIcon: item.link_logo || ''
             }
           })
@@ -445,7 +422,8 @@ export default {
 
 /* 将页面左右 padding 转移到内容区，保证 Tab 背景贯穿全屏 */
 .tab-bar-wrap {
-  position: sticky; /* 吸顶，保证滑动页面时一直显示在最前面 */
+  position: sticky;
+  /* 吸顶，保证滑动页面时一直显示在最前面 */
   background: #fff;
   padding: 10rpx 24rpx;
   z-index: 101;
@@ -457,11 +435,11 @@ export default {
   justify-content: space-between;
   background: transparent;
   padding: 10rpx 0;
-  
+
   .tab-items {
     display: flex;
     align-items: center;
-    
+
     .tab-item {
       font-weight: 400;
       font-size: 26rpx;
@@ -471,31 +449,32 @@ export default {
       margin-right: 40rpx;
       padding: 9rpx 24rpx;
       transition: all 0.3s ease;
-      
+
       &.active {
         color: #FF4767;
         background: #FFECEF;
         border: 1rpx solid #FFB0BD;
-		border-radius: 29rpx;
+        border-radius: 29rpx;
       }
     }
   }
-  
+
   .filter-area {
     display: flex;
     align-items: center;
     padding: 10rpx 0;
-    
+
     .filter-text {
       font-size: 24rpx;
       color: #666666;
       margin-right: 6rpx;
     }
-    
+
     .filter-icon {
       width: 16rpx;
       height: 10rpx;
       transition: transform 0.3s ease;
+
       /* 展开时图标倒转 */
       &.rotate {
         transform: rotate(180deg);
@@ -510,39 +489,52 @@ export default {
   left: 0;
   right: 0;
   bottom: 0;
-  z-index: 100; /* 低于 Tab区的101，保证隐藏时躲在其后 */
-  pointer-events: none; /* 面板关闭时，穿透点击到底部列表 */
-  overflow: hidden; /* 防止抽屉向上滑出时外溢 */
+  z-index: 100;
+  /* 低于 Tab区的101，保证隐藏时躲在其后 */
+  pointer-events: none;
+  /* 面板关闭时，穿透点击到底部列表 */
+  overflow: hidden;
+  /* 防止抽屉向上滑出时外溢 */
 
   &.show {
-    pointer-events: auto; /* 打开时恢复点击拦截 */
+    pointer-events: auto;
+
+    /* 打开时恢复点击拦截 */
     .filter-mask {
       opacity: 1;
     }
+
     .filter-container {
-      transform: translateY(50rpx); /* 滑出 */
+      transform: translateY(50rpx);
+      /* 滑出 */
     }
   }
 
   .filter-mask {
     position: absolute;
-    top: 0; left: 0; right: 0; bottom: 0;
-    background: rgba(0,0,0,0.4);
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.4);
     opacity: 0;
     transition: opacity 0.3s ease-in-out;
   }
-  
+
   .filter-container {
     position: absolute;
-    top: 0; left: 0; right: 0;
+    top: 0;
+    left: 0;
+    right: 0;
     background: #fff;
     border-radius: 0 0 30rpx 30rpx;
     padding: 40rpx 30rpx;
     max-height: 80vh;
     display: flex;
     flex-direction: column;
-    box-shadow: 0 10rpx 20rpx rgba(0,0,0,0.05);
-    transform: translateY(-100%); /* 默认隐藏在上方（即Tab背后） */
+    box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.05);
+    transform: translateY(-100%);
+    /* 默认隐藏在上方（即Tab背后） */
     transition: transform 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
   }
 }
@@ -551,43 +543,46 @@ export default {
 .filter-scroll {
   max-height: 50vh;
 }
+
 .filter-group {
   margin-bottom: 30rpx;
 
   .group-title {
     font-weight: 500;
-	font-size: 28rpx;
-	color: #333333;
-	line-height: 40rpx;
+    font-size: 28rpx;
+    color: #333333;
+    line-height: 40rpx;
     margin-bottom: 20rpx;
   }
 
   .pill-list {
     display: flex;
     flex-wrap: wrap;
-    gap: 20rpx; 
+    gap: 20rpx;
   }
 }
 
 /* 通用胶囊按钮 */
 .pill-item {
-  width: calc(25% - 16rpx); /* 25%是一行四个，减去间距 */
+  width: calc(25% - 16rpx);
+  /* 25%是一行四个，减去间距 */
   height: 58rpx;
   background: #F5F5F5;
   font-weight: 400;
-	font-size: 26rpx;
-	color: #333333;
-	line-height: 37rpx;
-  
+  font-size: 26rpx;
+  color: #333333;
+  line-height: 37rpx;
+
   /* 使用 flex 居中 */
   display: flex;
   align-items: center;
   justify-content: center;
-  
+
   border-radius: 12rpx;
   transition: all 0.3s;
-  box-sizing: border-box; /* 防止 padding 会撑大盒子 */
-  
+  box-sizing: border-box;
+  /* 防止 padding 会撑大盒子 */
+
   &.active {
     background: #FFF0F2;
     color: #FF4767;
@@ -599,14 +594,14 @@ export default {
   display: flex;
   gap: 20rpx;
   /* padding: 20rpx 0 40rpx; */
-  
+
   .course-type-item {
     background: #F5F5F5;
     color: #666666;
     font-size: 26rpx;
     padding: 12rpx 40rpx;
     border-radius: 12rpx;
-    
+
     &.active {
       background: #FFF0F2;
       color: #FF4767;
@@ -620,20 +615,21 @@ export default {
   margin-top: 20rpx;
   padding-top: 20rpx;
   /* border-top: 1rpx solid #F5F5F5; */
-  
-  .reset-btn, .confirm-btn {
+
+  .reset-btn,
+  .confirm-btn {
     width: 47%;
     text-align: center;
     padding: 20rpx 0;
     border-radius: 40rpx;
     font-size: 28rpx;
   }
-  
+
   .reset-btn {
     background: #F5F5F5;
     color: #666;
   }
-  
+
   .confirm-btn {
     background: #FF4767;
     color: #fff;
@@ -650,7 +646,7 @@ export default {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
-  
+
   .brand-card-wrap {
     width: 49.2%;
     margin-bottom: 20rpx;
@@ -668,7 +664,7 @@ export default {
   align-items: center;
   justify-content: center;
   padding: 120rpx 0;
-  
+
   .empty-icon {
     width: 346rpx;
     height: 373rpx;
@@ -676,7 +672,7 @@ export default {
 }
 
 ::v-deep .icon-headle {
-    width: 32rpx !important;
-    height: 32rpx !important;
+  width: 32rpx !important;
+  height: 32rpx !important;
 }
 </style>
\ No newline at end of file

From 2851b8e13b3f450a6723729f09145e0428a66d92 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 4 Jun 2026 11:51:30 +0800
Subject: [PATCH 096/118] =?UTF-8?q?=E6=94=B6=E8=97=8F=E9=A1=B5tabbar?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/myFavorite.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index 2542dcf..194253d 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -105,14 +105,12 @@
         <image class="empty-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/da814ede-1adc-4f90-8cdf-5357a12fab27.png"></image>
       </view>
     </view>
-
     <view style="height: 120rpx;"></view>
-    <TabBar :selected="3"></TabBar>
+
   </view>
 </template>
 
 <script>
-import TabBar from "@/components/tabbar/tabbar.vue"
 import BrandCard from "@/pages/home/components/brand-card.vue"
 import SkillCard from "@/pages/home/components/skill-card.vue" 
 import request from "@/utils/request"
@@ -122,7 +120,6 @@ const USE_REAL_API = true
 
 export default {
   components: {
-    TabBar,
     BrandCard,
     SkillCard
   },

From 6364072991b85d57d5a73c2f88ec572743ccd7dd Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 4 Jun 2026 13:21:36 +0800
Subject: [PATCH 097/118] 1

---
 pages/my/myFavorite.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index f4e3af4..a16a534 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -6,7 +6,7 @@
       @onHeadleClick="goToSearch">
     </custom-navbar>
 
-    <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view>
+    <!-- <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view> -->
 
     <view class="tab-bar-wrap" :style="{ top: navHeight + 'px' }">
       <view class="tab-bar">

From f7755041ad8903b55090fc80f23adba7a4897a0b Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 4 Jun 2026 13:21:49 +0800
Subject: [PATCH 098/118] 1

---
 pages/my/myFavorite.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index a16a534..de0102e 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -6,8 +6,6 @@
       @onHeadleClick="goToSearch">
     </custom-navbar>
 
-    <!-- <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view> -->
-
     <view class="tab-bar-wrap" :style="{ top: navHeight + 'px' }">
       <view class="tab-bar">
         <view class="tab-items">

From 5c42041cbd31e8379b82d48f59cf6d4ae5f548d9 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Thu, 4 Jun 2026 13:54:54 +0800
Subject: [PATCH 099/118] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/selected-skills.vue | 14 ++++++++------
 pages/jingxuan/skill-detail.vue    |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index 26cfbc3..2ba1ab6 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -171,12 +171,11 @@ export default {
       });
     },
 
-    // 【新增】：跳转到品牌详情页面
+    // 跳转到品牌详情页面
     goToBrandDetail() {
       if (this.authorInfo.brandId) {
-        // 注：请核对这里的路径是否与你项目中的品牌详情页路径一致
         uni.navigateTo({
-          url: `/pages/brand/detail?id=${this.authorInfo.brandId}`
+          url: `/pages/jingxuan/brand-detail?id=${this.authorInfo.brandId}`
         });
       } else {
         uni.showToast({ title: '缺少品牌信息', icon: 'none' });
@@ -385,13 +384,16 @@ export default {
     display: flex;
     align-items: center;
     font-size: 24rpx;
-    color: #666666;
+    color: #FF4767 ;
+    border: 2rpx solid #FF4767 ;
+    padding: 8rpx 20rpx;
+    border-radius: 45rpx;
     
     .arrow-right {
       width: 10rpx;
       height: 10rpx;
-      border-top: 2rpx solid #666666;
-      border-right: 2rpx solid #666666;
+      border-top: 2rpx solid #FF4767 ;
+      border-right: 2rpx solid #FF4767 ;
       transform: rotate(45deg);
       margin-left: 6rpx;
     }
diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
index 66e81cb..7e7d5c0 100644
--- a/pages/jingxuan/skill-detail.vue
+++ b/pages/jingxuan/skill-detail.vue
@@ -289,8 +289,8 @@ export default {
             // 【预留接口字段解析】：这里需要后端配合返回以下字段，如果没有的话目前会使用默认值
             linkType: data.link_type || 1,        // 1=官方 2=品牌
             linkId: data.link_id || 0,
-            authorName: data.author_name || '美融融平台',
-            authorAvatar: data.author_avatar || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bbe832bf-aae6-4579-b3cc-246d252488c3',
+            authorName: data.link_name || '美融融平台',
+            authorAvatar: data.link_logo || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bbe832bf-aae6-4579-b3cc-246d252488c3',
             authorVideoCount: data.link_publish_num || 0, // 关联者发布数
 
             date: data.create_time ? data.create_time.substring(0, 10).replace(/-/g, '.') : '',

From adf6cea0b7d66bc6e3cc60525f46dbd9b9e21f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Thu, 4 Jun 2026 15:00:22 +0800
Subject: [PATCH 100/118] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artisan/profile.vue                 |   11 +-
 pages/home/home.vue                       |    4 +-
 pages/my/my.vue                           |  308 ++-
 pages/ruzhu/ruzhu.vue                     | 1458 ++++++-------
 pages/shop/add-service.vue                | 2332 ++++++++++-----------
 pages/shop/qualification_sj_change.vue    |   28 +-
 pages/shop/staff/addStaff.vue             |  702 +++----
 pages/shop/staff/distribution-service.vue |  279 +--
 pages/shop/staff/manage.vue               |  762 +++----
 9 files changed, 3102 insertions(+), 2782 deletions(-)

diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index 06c95e3..da5a7f9 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -165,7 +165,7 @@
 								v-if="userInfo.credentials_state === 0">
 							</image>
 							<text style="margin-right: 16rpx;"
-								:style="{ color: userInfo.credentials_state === 0 ? '#ec5d57' : userInfo.credentials_state === 1 ? '#e59e45' : '#c9c9c9' }">
+								:style="{ color: userInfo.credentials_state === 0 ? '#ec5d57' : userInfo.credentials_state === 1 ? '#e59e45' : '#389930' }">
 								{{ userInfo.credentials_state === 0 ? '待完善' : userInfo.credentials_state === 1 ? '审核中' :
 									'已认证' }}
 							</text>
@@ -640,12 +640,17 @@ export default {
 					url: '/pages/ruzhu/ruzhu'
 				});
 			} else if (idType > 0 && credentialsState === 0) {
-				// 已认证 + 待完善
+				// 已入驻 + 待完善
 				uni.navigateTo({
 					url: '/pages/shop/qualification_sj_change'
 				});
 			} else if (idType > 0 && credentialsState === 1) {
-				// 已认证 + 申请中
+				// 已入驻 + 申请中
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+			} else if (idType > 0 && credentialsState === 2) {
+				// 已入驻 + 已完善
 				uni.navigateTo({
 					url: '/pages/shop/qualification_sj_change'
 				});
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 626fc87..9ae3a7f 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -6,7 +6,7 @@
 
 		<view class="header-section">
 			<view class="user-info" @tap="handleLoginRedirect">
-				<image class="avatar" :src="currentAvatar"></image>
+				<image mode="aspectFill" class="avatar" :src="currentAvatar"></image>
 				<view class="info-text">
 					<view class="name">{{ currentName }}</view>
 					<view class="desc">欢迎登录美融融商家版</view>
@@ -117,7 +117,7 @@
 					</image>
 				</view>
 			</view>
-			<view class="stats-content">
+			<view class="stats-content" @tap="goToOrderList">
 				<view class="stat-item">
 					<text class="num">{{ orderBasic.waitStart }}</text>
 					<text class="label">待开始</text>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 85ed488..6839704 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -133,6 +133,70 @@
 			</template>
 		</view>
 
+		<view class="setup-modal-mask" v-if="showSetupModal" catchtouchmove="true">
+			<view class="setup-modal-content">
+				<image class="modal-bg"
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ac2cb4aa-a7c5-4776-98f4-b77e9c0cfa85.png">
+				</image>
+
+				<view class="modal-header">
+					<text>温馨提示</text>
+				</view>
+
+				<view class="modal-body">
+					<text class="modal-subtitle">发布服务请完善以下资料：</text>
+
+					<view class="missing-list">
+						<view class="missing-item" v-if="!hasBusinessTime">
+							<view class="item-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+								</image>
+								<view class="item-texts">
+									<text class="item-title">营业时间未配置</text>
+									<text class="item-desc">请完善店铺的营业时间</text>
+								</view>
+							</view>
+							<view class="item-right orange" @tap="goToBusinessTime">去配置</view>
+						</view>
+
+						<view class="missing-item" v-if="!hasServiceSkill">
+							<view class="item-left">
+								<image class="item-icon"
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+								</image>
+								<view class="item-texts">
+									<text class="item-title">服务技能未配置</text>
+									<text class="item-desc">请完善服务技能</text>
+								</view>
+							</view>
+							<view class="item-right orange" @tap="goToServiceSkill">去配置</view>
+						</view>
+
+						<view class="missing-item" v-if="!isCertified">
+							<view class="item-left">
+								<image class="item-icon"
+									:src="isUnderReview ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'">
+								</image>
+								<view class="item-texts">
+									<text class="item-title" :class="{ 'blue-text': isUnderReview }">{{ isUnderReview ?
+										'资质认证中' : '资质未认证' }}</text>
+									<text class="item-desc">请完成资质认证</text>
+								</view>
+							</view>
+							<view class="item-right" :class="isUnderReview ? 'grey' : 'light-green'" @tap="goToAuth">
+								{{ isUnderReview ? '查看进度' : '去认证' }}
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="modal-footer">
+					<view class="btn-know" @tap="closeSetupModal">知道了</view>
+				</view>
+			</view>
+		</view>
+
 		<tipsPopup2 :show="tipShow" @closePopup="closePopup" sureText="确认" @okBtn="okBtn">
 			{{ tipsText }}
 		</tipsPopup2>
@@ -325,6 +389,8 @@ export default {
 			inviteList: [],
 			// 账号停用弹窗控制
 			stopUseModal: false,
+			showSetupModal: false,
+			authDetails: null,
 		};
 	},
 	onPageScroll(e) {
@@ -343,6 +409,37 @@ export default {
 			return this.userInfo?.is_ok === 2;
 		},
 
+		// 是否认证通过 (根据规则，> 0 说明认证通过了)
+		isCertified() {
+			if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+			return this.userInfo.id_type > 0;
+		},
+		// 是否已入驻
+		isSettled() {
+			if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+			return this.userInfo.id_type !== 0;
+		},
+		// 是否在审核中
+		isUnderReview() {
+			if (!this.isLogin) return false;
+			if (this.authDetails && Object.keys(this.authDetails).length > 0) {
+				return true;
+			}
+			return false;
+		},
+		// 服务技能是否已配置
+		hasServiceSkill() {
+			const fromUser = this.userInfo && Array.isArray(this.userInfo.servers_kill) && this.userInfo.servers_kill.length > 0;
+			const fromAuth = this.authDetails && Array.isArray(this.authDetails.servers_kill) && this.authDetails.servers_kill.length > 0;
+			return this.isLogin && (fromUser || fromAuth);
+		},
+		// 营业时间是否已配置
+		hasBusinessTime() {
+			const timeFromUser = this.userInfo && this.userInfo.business_time;
+			const timeFromAuth = this.authDetails && this.authDetails.business_time;
+			return this.isLogin && !!(timeFromUser || timeFromAuth);
+		},
+
 		currentCardList() {
 			return this.cardList
 				.filter((card) => this.checkShow(card))
@@ -671,9 +768,24 @@ export default {
 							"https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png";
 					}
 				}
+				// 获取入驻详情用于判断认证状态
+				if (this.isSettled) {
+					this.fetchAuthDetails();
+				}
 			});
 			this.getInviteList();
 		},
+		// 获取入驻详情
+		fetchAuthDetails() {
+			request.post("/sj/userSjAuth/details", {
+				type: 1,
+				id_type: '1'
+			}).then(res => {
+				if (res.code == 200 && res.data) {
+					this.authDetails = res.data;
+				}
+			});
+		},
 		async goLogin() {
 			// 添加访问检查
 			if (this.isAccountDisabled) {
@@ -761,11 +873,8 @@ export default {
 					url: `${item.path}?type=${item.type}`,
 				});
 			} else {
-				if (item.go_id_type == 1 && this.userInfo?.id_type == 0) {
-					uni.showToast({
-						title: `您暂未入驻，无法使用${item.title}！`,
-						icon: "none",
-					});
+				if (item.go_id_type == 1 && (!this.isCertified || !this.hasBusinessTime || !this.hasServiceSkill)) {
+					this.showSetupModal = true;
 					return;
 				}
 				if (!this.isLogin && item.go_id_type) {
@@ -803,12 +912,17 @@ export default {
 					url: '/pages/ruzhu/ruzhu'
 				});
 			} else if (idType > 0 && credentialsState === 0) {
-				// 已认证 + 待完善
+				// 已入驻 + 待完善
 				uni.navigateTo({
 					url: '/pages/shop/qualification_sj_change'
 				});
 			} else if (idType > 0 && credentialsState === 1) {
-				// 已认证 + 申请中
+				// 已入驻 + 申请中
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+			} else if (idType > 0 && credentialsState === 2) {
+				// 已入驻 + 已完善
 				uni.navigateTo({
 					url: '/pages/shop/qualification_sj_change'
 				});
@@ -819,6 +933,39 @@ export default {
 				});
 			}
 		},
+		closeSetupModal() {
+			this.showSetupModal = false;
+		},
+		goToBusinessTime() {
+			this.showSetupModal = false;
+			uni.navigateTo({
+				url: '/pages/shop/business-time'
+			});
+		},
+		goToServiceSkill() {
+			this.showSetupModal = false;
+			uni.navigateTo({
+				url: '/pages/shop/service-skills'
+			});
+		},
+		goToAuth() {
+			this.showSetupModal = false;
+			if (this.isUnderReview) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				if (this.isSettled) {
+					uni.navigateTo({
+						url: '/pages/ruzhu/ruzhu?step=3'
+					});
+				} else {
+					uni.navigateTo({
+						url: '/pages/ruzhu/ruzhu'
+					});
+				}
+			}
+		},
 		goToInviteList() {
 			// 添加访问检查
 			if (this.isAccountDisabled) {
@@ -1562,4 +1709,151 @@ button::after {
 		width: 100%;
 	}
 }
+
+/* ============ 提示弹窗样式 ============ */
+.setup-modal-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 9999;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	.setup-modal-content {
+		width: 630rpx;
+		height: 775rpx;
+		background: #FFFFFF;
+		border-radius: 32rpx;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+
+		.modal-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 630rpx;
+			height: 265rpx;
+			z-index: 0;
+		}
+
+		.modal-header {
+			position: relative;
+			z-index: 1;
+			height: 150rpx;
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			padding-bottom: 20rpx;
+
+			text {
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #333333;
+				letter-spacing: 2rpx;
+			}
+		}
+
+		.modal-body {
+			position: relative;
+			z-index: 1;
+			flex: 1;
+			padding: 24rpx 40rpx;
+
+			.modal-subtitle {
+				font-size: 28rpx;
+				color: #333333;
+				margin-bottom: 40rpx;
+				display: block;
+			}
+
+			.missing-list {
+				display: flex;
+				flex-direction: column;
+				gap: 46rpx;
+
+				.missing-item {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.item-left {
+						display: flex;
+						align-items: flex-start;
+
+						.item-icon {
+							width: 32rpx;
+							height: 32rpx;
+							margin-right: 16rpx;
+							flex-shrink: 0;
+							margin-top: 6rpx;
+						}
+
+						.item-texts {
+							display: flex;
+							flex-direction: column;
+
+							.item-title {
+								font-size: 30rpx;
+								color: #333333;
+								font-weight: 500;
+								margin-bottom: 8rpx;
+
+								&.blue-text {
+									color: #2b85e4;
+								}
+							}
+
+							.item-desc {
+								font-size: 24rpx;
+								color: #999999;
+							}
+						}
+					}
+
+					.item-right {
+						font-size: 26rpx;
+						font-weight: 400;
+						margin-top: -45rpx;
+
+						&.orange {
+							color: #FF7B00;
+						}
+
+						&.grey {
+							color: #999999;
+						}
+
+						&.light-green {
+							color: #5CAC81;
+						}
+					}
+				}
+			}
+		}
+
+		.modal-footer {
+			position: relative;
+			z-index: 1;
+			padding: 0 50rpx 50rpx;
+
+			.btn-know {
+				width: 100%;
+				height: 88rpx;
+				background: #FF4767;
+				border-radius: 44rpx;
+				color: #FFFFFF;
+				font-size: 32rpx;
+				font-weight: 500;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index f11b01a..d898f5c 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -1,821 +1,821 @@
 <template>
-	<view class="ruzhu-page">
-		<!-- 顶部导航栏 - 根据身份动态显示标题 -->
-		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
+    <view class="ruzhu-page">
+        <!-- 顶部导航栏 - 根据身份动态显示标题 -->
+        <custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
 
-		<!-- 步骤切换 -->
-		<step-tab v-if="currentStep !== 2 && currentStep !== 4" :mappedStep="mappedStep"></step-tab>
+        <!-- 步骤切换 -->
+        <step-tab v-if="currentStep !== 2 && currentStep !== 4" :mappedStep="mappedStep"></step-tab>
 
-		<!-- 内容区域根据身份和步骤显示不同内容 -->
-		<view class="content">
-			<view class="xieyi_content" v-if="currentStep === 0">
-				<rich-text :nodes="textData.text"></rich-text>
-			</view>
+        <!-- 内容区域根据身份和步骤显示不同内容 -->
+        <view class="content">
+            <view class="xieyi_content" v-if="currentStep === 0">
+                <rich-text :nodes="textData.text"></rich-text>
+            </view>
 
-			<view v-else-if="currentStep === 1">
-				<qualification-info ref="qualificationInfo"></qualification-info>
-			</view>
+            <view v-else-if="currentStep === 1">
+                <qualification-info ref="qualificationInfo"></qualification-info>
+            </view>
 
-			<view v-else-if="currentStep === 2">
-				<successruzhu :data="successData"></successruzhu>
-			</view>
+            <view v-else-if="currentStep === 2">
+                <successruzhu :data="successData"></successruzhu>
+            </view>
 
-			<view v-else-if="currentStep === 3">
-				<store-info ref="storeInfo"></store-info>
-			</view>
+            <view v-else-if="currentStep === 3">
+                <store-info ref="storeInfo"></store-info>
+            </view>
 
-			<view v-else-if="currentStep === 4">
-				<successruzhu :data="successData"></successruzhu>
-			</view>
-		</view>
-		<view class="kong"></view>
+            <view v-else-if="currentStep === 4">
+                <successruzhu :data="successData"></successruzhu>
+            </view>
+        </view>
+        <view class="kong"></view>
 
-		<!-- 底部按钮区域 -->
-		<view class="bottom-fixed">
-			<!-- 步骤0: 入驻协议 -->
-			<view v-if="currentStep === 0" class="step-0-buttons">
-				<view class="agree">
-					<image v-if="!isAgree" src="/static/images/agree_n.png" class="agree-btn" mode="aspectFit"
-						@click="isAgree = true"></image>
-					<image v-else src="/static/images/agree_y.png" class="agree-btn" mode="aspectFit"
-						@click="isAgree = false"></image>
-					<text class="agree-tip">我已阅读并同意以上协议</text>
-				</view>
-				<view class="next-btn" @click="goNext">
-					<text class="next-text">下一步，填写基本信息</text>
-				</view>
-			</view>
+        <!-- 底部按钮区域 -->
+        <view class="bottom-fixed">
+            <!-- 步骤0: 入驻协议 -->
+            <view v-if="currentStep === 0" class="step-0-buttons">
+                <view class="agree">
+                    <image v-if="!isAgree" src="/static/images/agree_n.png" class="agree-btn" mode="aspectFit"
+                        @click="isAgree = true"></image>
+                    <image v-else src="/static/images/agree_y.png" class="agree-btn" mode="aspectFit"
+                        @click="isAgree = false"></image>
+                    <text class="agree-tip">我已阅读并同意以上协议</text>
+                </view>
+                <view class="next-btn" @click="goNext">
+                    <text class="next-text">下一步，填写基本信息</text>
+                </view>
+            </view>
 
-			<!-- 步骤1: 资质信息 -->
-			<view v-else-if="currentStep === 1" class="step-1-buttons">
-				<view class="button-row">
-					<view class="prev-btn" @click="goPrev">
-						<text class="prev-text">上一步</text>
-					</view>
-					<view class="next-btn" @click="goNext">
-						<text class="next-text">提交入驻</text>
-					</view>
-				</view>
-			</view>
+            <!-- 步骤1: 资质信息 -->
+            <view v-else-if="currentStep === 1" class="step-1-buttons">
+                <view class="button-row">
+                    <view class="prev-btn" @click="goPrev">
+                        <text class="prev-text">上一步</text>
+                    </view>
+                    <view class="next-btn" @click="goNext">
+                        <text class="next-text">提交入驻</text>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 步骤2: 提交成功 -->
-			<view v-else-if="currentStep === 2" class="step-2-buttons">
-				<view class="button-row">
-					<view class="prev-btn" @click="topt">
-						<text class="prev-text">进入平台</text>
-					</view>
-					<view class="submit-btn" @click="goNext">
-						<text class="submit-text">去完成资质认证</text>
-					</view>
-				</view>
-			</view>
+            <!-- 步骤2: 提交成功 -->
+            <view v-else-if="currentStep === 2" class="step-2-buttons">
+                <view class="button-row">
+                    <view class="prev-btn" @click="topt">
+                        <text class="prev-text">进入平台</text>
+                    </view>
+                    <view class="submit-btn" @click="goNext">
+                        <text class="submit-text">去完成资质认证</text>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 步骤3: 门店信息 -->
-			<view v-else-if="currentStep === 3" class="step-2-buttons">
-				<view class="button-row">
-					<view class="prev-btn" @click="goPrev">
-						<text class="prev-text">上一步</text>
-					</view>
-					<view class="submit-btn" @click="submitApplication">
-						<text class="submit-text">提交申请</text>
-					</view>
-				</view>
-			</view>
+            <!-- 步骤3: 门店信息 -->
+            <view v-else-if="currentStep === 3" class="step-2-buttons">
+                <view class="button-row">
+                    <view class="prev-btn" @click="goPrev">
+                        <text class="prev-text">上一步</text>
+                    </view>
+                    <view class="submit-btn" @click="submitApplication">
+                        <text class="submit-text">提交申请</text>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 步骤4: 资质认证成功 -->
-			<view v-else-if="currentStep === 4" class="step-2-buttons">
-				<view class="button-row">
-					<view class="showziliao" @click="topt">
-						<text class="showziliaotext">进入平台</text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
+            <!-- 步骤4: 资质认证成功 -->
+            <view v-else-if="currentStep === 4" class="step-2-buttons">
+                <view class="button-row">
+                    <view class="showziliao" @click="topt">
+                        <text class="showziliaotext">进入平台</text>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
 </template>
 
 <script>
-	import request from '../../utils/request';
-	import StepTab from '@/components/step-tab/step-tab.vue';
-	import QualificationInfo from './qualification_sj.vue';
-	import StoreInfo from './sj-info.vue';
-	import successruzhu from './successruzhu.vue';
+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
+export default {
+    components: {
+        StepTab,
+        QualificationInfo,
+        StoreInfo,
+        successruzhu
+    },
+    data() {
+        return {
+            currentStep: 3, // 当前步骤索引
+            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) {
+        console.log(options, 'options---');
+        if (options.type == 1) {
+            this.currentStep = 4
+        }
+
+        // 如果首页传了 step 参数，就直接空降到对应的流程
+        if (options.step) {
+            this.currentStep = Number(options.step);
+        }
+
+        this.identity = 2;
+        await this.getUserInfoSync()
+        // 确保子组件也能访问到 identity
+        this.getXieyi(1);
+    },
+
+    onShow() {
+        console.log('入驻页面 onShow - 检查地址数据');
+        // 检查商家地址数据
+        this.checkAndPassAddressToSj();
+    },
+
+    methods: {
+        topt() {
+            uni.switchTab({
+                url: '/pages/home/home'
+            })
         },
-        data() {
-            return {
-                currentStep: 0, // 当前步骤索引
-                isAgree: false,
-                identity: null,
-                textData: {},
-                loading: false,
-                error: null,
-                navTitle: '商家入驻', // 默认标题
-                qualificationData: null, // 新增：保存资质信息
-                storeInfoData: null, // 新增：保存门店信息
-                successData: {}, //入驻提示
-                // 新增：缓存手艺人数据
-                artisanDataCache: {
-                    personalInfo: null,
-                    qualificationInfo: null
+        // 获取用户信息（复用不可服务时间页面的方法）
+        async getUserInfoSync() {
+            await request.post('/sj/userSjAuth/details', {
+                type: 1
+            }).then(result => {
+                if (result.code == 200 && result.data) {
+                    let data = result.data
+                    if (getApp().globalData.artisanType == 2) {
+
+                        let qualification_form_data = {
+                            "uscc_type": data.uscc_type || '',
+                            // "contact_identity": 'legal',
+                            // "contact_name": data.legal_name || data.contact_name || '',
+                            "contact_phone": data.legal_phone || data.contact_phone || '',
+                            "backup_phone": data.backup_phone || '',
+                            "invite_code": data.invite_code_other || '',
+                            "dependency": data.dependency || '',
+                            "address": data.address || '',
+                            "dependency_code": data.dependency_code || '',
+                            "dependency_province": data.dependency_province || '',
+                            "dependency_city": data.dependency_city || '',
+                            "longitude": data.longitude || '',
+                            "latitude": data.latitude || '',
+                            "name": data.name || '',
+                            "contact_type": data.contact_type || ''
+                        }
+                        uni.setStorageSync('qualification_form_data', qualification_form_data);
+                        let store_info_form_data = {
+                            "head_photo": data.head_photo,
+                            "name": data.name,
+                            "business_time": data.business_time,
+                            // "servers_kill": data.servers_kill,
+                            "apply_state": data.apply_state,
+                            "invite_code_other": data.invite_code_other,
+                            "major": data.major
+                        }
+                        console.log(111111111, store_info_form_data)
+                        uni.setStorageSync('store_info_form_data', store_info_form_data);
+                    }
+
                 }
+            }).catch(error => {
+                console.error('获取用户信息接口错误:', error);
+            });
+        },
+        // 检查并传递地址给商家组件
+        checkAndPassAddressToSj() {
+            try {
+                const sjAddress = uni.getStorageSync('sj_selected_address');
+                if (sjAddress) {
+                    console.log('找到商家地址数据，准备传递:', sjAddress);
+
+                    setTimeout(() => {
+                        if (this.identity === 2 && this.$refs.qualificationInfo) {
+                            console.log('传递地址给资质组件');
+                            if (typeof this.$refs.qualificationInfo.handleAddressSelected === 'function') {
+                                this.$refs.qualificationInfo.handleAddressSelected(sjAddress);
+                            }
+                        }
+                        uni.removeStorageSync('sj_selected_address');
+                    }, 300);
+                }
+            } catch (e) {
+                console.error('处理商家地址失败:', e);
             }
         },
-        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;
+
+        // 新增方法：检查并传递地址数据
+        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);
             }
         },
-        async onLoad(options) {
-            console.log(options, 'options---');
-            if (options.type == 1) {
-                this.currentStep = 4
-            }
 
-            // 如果首页传了 step 参数，就直接空降到对应的流程
-            if (options.step) {
-                this.currentStep = Number(options.step);
-            }
+        // 检查用户信息
+        checkUserInfo() {
+            console.log('检查用户信息...');
 
-            this.identity = 2;
-            await this.getUserInfoSync()
-            // 确保子组件也能访问到 identity
-            this.getXieyi(1);
-        },
-
-        onShow() {
-            console.log('入驻页面 onShow - 检查地址数据');
-            // 检查商家地址数据
-            this.checkAndPassAddressToSj();
-        },
-
-        methods: {
-            topt() {
-                uni.switchTab({
-                    url: '/pages/home/home'
-                })
+            // 从多种可能的存储位置检查用户信息
+            const sources = [{
+                name: '本地存储-userInfo',
+                data: uni.getStorageSync('userInfo')
             },
-            // 获取用户信息（复用不可服务时间页面的方法）
-            async getUserInfoSync() {
-                await request.post('/sj/userSjAuth/details', {
+            {
+                name: '本地存储-loginInfo',
+                data: uni.getStorageSync('loginInfo')
+            },
+            {
+                name: '本地存储-token',
+                data: uni.getStorageSync('token')
+            }
+            ];
+
+            sources.forEach(source => {
+                console.log(`${source.name}:`, source.data);
+            });
+
+            // 检查是否有token（确认登录状态）
+            const token = uni.getStorageSync('token');
+            if (!token) {
+                console.warn('未检测到登录token');
+                uni.showToast({
+                    title: '请先登录',
+                    icon: 'none'
+                });
+            }
+        },
+
+        // 获取用户信息（复用不可服务时间页面的方法）
+        getUserInfo() {
+            return new Promise((resolve, reject) => {
+                request.post('/sj/User/getUser', {
                     type: 1
                 }).then(result => {
-                    if (result.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);
-                        }
-
+                    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);
                 });
-            },
-            // 检查并传递地址给商家组件
-            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);
+        // 检查并获取用户信息
+        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'
+                        });
                     }
-                } 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;
+            }
+        },
 
-                // 检查是否有token（确认登录状态）
-                const token = uni.getStorageSync('token');
-                if (!token) {
-                    console.warn('未检测到登录token');
+        // 审核提交方法
+        async submitForReview() {
+            const userInfo = await this.checkAndGetUserInfo();
+            if (!userInfo) {
+                return;
+            }
+
+            uni.showLoading({
+                title: '提交中...'
+            });
+
+            try {
+                let formData = this.buildBusinessData(this.qualificationData, {});
+                formData.type = 1;
+                formData.id_type = 1;
+                if (Array.isArray(formData.qualifications_sector)) {
+                    formData.qualifications_sector = JSON.stringify(formData.qualifications_sector);
+                }
+                if (Array.isArray(formData.qualifications_other)) {
+                    formData.qualifications_other = JSON.stringify(formData.qualifications_other);
+                }
+                const res = await request.post('/sj/userSjAuth/applyOne', formData);
+                uni.hideLoading();
+
+                if (res.state == 1 || res.code == 200) {
+                    this.successData = res.data.customer_service
+                    console.log(this.successData,
+                        'this.successDatathis.successDatathis.successDatathis.successData=======');
                     uni.showToast({
-                        title: '请先登录',
+                        title: '提交成功',
+                        icon: 'none',
+                        duration: 1500
+                    });
+                    setTimeout(() => {
+                        this.currentStep = 2;
+                    }, 1500);
+                } else {
+                    uni.showToast({
+                        title: res.msg || '提交失败',
                         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);
-                    });
+            } catch (error) {
+                uni.hideLoading();
+                uni.showToast({
+                    title: '提交失败，请重试',
+                    icon: 'none'
                 });
-            },
+            }
+        },
 
-            // 检查并获取用户信息
-            async checkAndGetUserInfo() {
-                // 先检查是否已有用户信息
-                const existingUserInfo = uni.getStorageSync('userInfo');
-                if (existingUserInfo && existingUserInfo.account) {
-                    console.log('已有用户信息:', existingUserInfo);
-                    return existingUserInfo;
-                }
+        // 构建商家数据
+        buildBusinessData(qualificationData, storeData) {
+            qualificationData = qualificationData || {};
+            storeData = storeData || {};
+            console.log(qualificationData, 'storeDatastoreDatastoreData');
+            const formData = {};
+            Object.assign(formData, storeData);
 
-                // 如果没有，则调用接口获取
-                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'
-                            });
-                        }
+            if (qualificationData.uscc_type) {
+                formData.uscc_type = qualificationData.uscc_type;
+            }
+            // if (qualificationData.contact_identity) {
+            // 	formData.contact_identity = qualificationData.contact_identity;
+            // }
+            // if (qualificationData.contact_name) {
+            // 	formData.contact_name = qualificationData.contact_name;
+            // }
+            if (qualificationData.contact_phone) {
+                formData.contact_phone = qualificationData.contact_phone;
+            }
+            if (qualificationData.backup_phone) {
+                formData.backup_phone = qualificationData.backup_phone;
+            }
+            if (qualificationData.contact_type) {
+                formData.contact_type = qualificationData.contact_type;
+            }
+            if (qualificationData.invite_code_other) {
+                formData.invite_code_other = qualificationData.invite_code_other;
+            }
+            if (qualificationData.contact_name) {
+                formData.contact_name = qualificationData.contact_name;
+            }
+
+            if (qualificationData.dependency) {
+                formData.dependency = qualificationData.dependency;
+            }
+            if (qualificationData.dependency_code) {
+                formData.dependency_code = qualificationData.dependency_code;
+            }
+            if (qualificationData.dependency_province) {
+                formData.dependency_province = qualificationData.dependency_province;
+            }
+            if (qualificationData.dependency_city) {
+                formData.dependency_city = qualificationData.dependency_city;
+            }
+            if (qualificationData.name) {
+                formData.name = qualificationData.name;
+            }
+            if (qualificationData.address) {
+                formData.address = qualificationData.address;
+            }
+            if (qualificationData.longitude) formData.longitude = qualificationData.longitude;
+            if (qualificationData.latitude) formData.latitude = qualificationData.latitude;
+
+            // if (storeData && storeData.servers_kill && storeData.servers_kill.length > 0) {
+            // 	// formData.servers_kill = Array.isArray(storeData.servers_kill) ?
+            // 	// 	storeData.servers_kill : [storeData.servers_kill];
+            // } else {
+            // 	formData.servers_kill = [];
+            // }
+            if (storeData.head_photo) {
+                formData.head_photo = storeData.head_photo;
+            }
+            if (storeData.name) {
+                formData.name = storeData.name;
+            }
+            if (storeData.business_time) {
+                formData.business_time = storeData.business_time;
+            }
+            if (storeData.apply_state) {
+                formData.get_msg_method = storeData.apply_state;
+            }
+            if (storeData.major) {
+                formData.major = storeData.major;
+            }
+
+
+            const userInfo = uni.getStorageSync('userInfo');
+            if (userInfo && userInfo.account) {
+                formData.account = userInfo.account;
+            } else {
+                const loginAccount = uni.getStorageSync('loginAccount');
+                if (loginAccount) {
+                    formData.account = loginAccount;
+                } else if (qualificationData.contact_phone) {
+                    formData.contact_name = qualificationData.contact_name;
+                } else {
+                    console.error('无法获取账号信息');
+                    uni.showToast({
+                        title: '无法获取用户账号',
+                        icon: 'none'
                     });
                     return null;
                 }
-            },
+            }
 
-            // 审核提交方法
-            async submitForReview() {
-                const userInfo = await this.checkAndGetUserInfo();
-                if (!userInfo) {
-                    return;
-                }
+            return formData;
 
-                uni.showLoading({
-                    title: '提交中...'
+        },
+
+        async goNext() {
+            if (this.currentStep === 0 && !this.isAgree) {
+                uni.showToast({
+                    title: '请阅读并同意以上协议',
+                    icon: 'none'
                 });
+                return;
+            }
 
-                try {
-                    let formData = this.buildBusinessData(this.qualificationData, {});
-                    formData.type = 1;
-                    formData.id_type = 1;
-                    if (Array.isArray(formData.qualifications_sector)) {
-                        formData.qualifications_sector = JSON.stringify(formData.qualifications_sector);
-                    }
-                    if (Array.isArray(formData.qualifications_other)) {
-                        formData.qualifications_other = JSON.stringify(formData.qualifications_other);
-                    }
-                    const res = await request.post('/sj/userSjAuth/applyOne', formData);
-                    uni.hideLoading();
-
-                    if (res.state == 1 || res.code == 200) {
-                        this.successData = res.data.customer_service
-                        console.log(this.successData,
-                            'this.successDatathis.successDatathis.successDatathis.successData=======');
-                        uni.showToast({
-                            title: '提交成功',
-                            icon: 'none',
-                            duration: 1500
-                        });
-                        setTimeout(() => {
-                            this.currentStep = 2;
-                        }, 1500);
-                    } else {
-                        uni.showToast({
-                            title: res.msg || '提交失败',
-                            icon: 'none'
-                        });
-                    }
-                } catch (error) {
-                    uni.hideLoading();
-                    uni.showToast({
-                        title: '提交失败，请重试',
-                        icon: 'none'
-                    });
-                }
-            },
-
-            // 构建商家数据
-            buildBusinessData(qualificationData, storeData) {
-                qualificationData = qualificationData || {};
-                storeData = storeData || {};
-                console.log(qualificationData, 'storeDatastoreDatastoreData');
-                const formData = {};
-                Object.assign(formData, storeData);
-
-                if (qualificationData.uscc_type) {
-                    formData.uscc_type = qualificationData.uscc_type;
-                }
-				// if (qualificationData.contact_identity) {
-				// 	formData.contact_identity = qualificationData.contact_identity;
-				// }
-				// if (qualificationData.contact_name) {
-				// 	formData.contact_name = qualificationData.contact_name;
-				// }
-                if (qualificationData.contact_phone) {
-                    formData.contact_phone = qualificationData.contact_phone;
-                }
-                if (qualificationData.backup_phone) {
-                    formData.backup_phone = qualificationData.backup_phone;
-                }
-                if (qualificationData.contact_type) {
-                    formData.contact_type = qualificationData.contact_type;
-                }
-                if (qualificationData.invite_code_other) {
-                    formData.invite_code_other = qualificationData.invite_code_other;
-                }
-                if (qualificationData.contact_name) {
-                    formData.contact_name = qualificationData.contact_name;
-                }
-
-                if (qualificationData.dependency) {
-                    formData.dependency = qualificationData.dependency;
-                }
-                if (qualificationData.dependency_code) {
-                    formData.dependency_code = qualificationData.dependency_code;
-                }
-                if (qualificationData.dependency_province) {
-                    formData.dependency_province = qualificationData.dependency_province;
-                }
-                if (qualificationData.dependency_city) {
-                    formData.dependency_city = qualificationData.dependency_city;
-                }
-                if (qualificationData.name) {
-                    formData.name = qualificationData.name;
-                }
-                if (qualificationData.address) {
-                    formData.address = qualificationData.address;
-                }
-                if (qualificationData.longitude) formData.longitude = qualificationData.longitude;
-                if (qualificationData.latitude) formData.latitude = qualificationData.latitude;
-
-				// if (storeData && storeData.servers_kill && storeData.servers_kill.length > 0) {
-				// 	// formData.servers_kill = Array.isArray(storeData.servers_kill) ?
-				// 	// 	storeData.servers_kill : [storeData.servers_kill];
-				// } else {
-				// 	formData.servers_kill = [];
-				// }
-                if (storeData.head_photo) {
-                    formData.head_photo = storeData.head_photo;
-                }
-                if (storeData.name) {
-                    formData.name = storeData.name;
-                }
-                if (storeData.business_time) {
-                    formData.business_time = storeData.business_time;
-                }
-                if (storeData.apply_state) {
-                    formData.get_msg_method = storeData.apply_state;
-                }
-                if (storeData.major) {
-                    formData.major = storeData.major;
-                }
-
-
-                const userInfo = uni.getStorageSync('userInfo');
-                if (userInfo && userInfo.account) {
-                    formData.account = userInfo.account;
-                } else {
-                    const loginAccount = uni.getStorageSync('loginAccount');
-                    if (loginAccount) {
-                        formData.account = loginAccount;
-                    } else if (qualificationData.contact_phone) {
-                        formData.contact_name = qualificationData.contact_name;
-                    } else {
-                        console.error('无法获取账号信息');
-                        uni.showToast({
-                            title: '无法获取用户账号',
-                            icon: 'none'
-                        });
-                        return null;
-                    }
-                }
-
-                return formData;
-
-            },
-
-            async goNext() {
-                if (this.currentStep === 0 && !this.isAgree) {
-                    uni.showToast({
-                        title: '请阅读并同意以上协议',
-                        icon: 'none'
-                    });
-                    return;
-                }
-
-                if (this.currentStep === 1) {
-                    if (this.$refs.qualificationInfo) {
-                        const isValid = await this.$refs.qualificationInfo.saveFormData();
-                        if (!isValid) {
-                            return;
-                        }
-                        this.qualificationData = this.$refs.qualificationInfo.getFormData();
-                    }
-                    await this.submitForReview();
-                    return;
-                }
-
-                if (this.currentStep < 3) {
-                    this.currentStep++;
-                    setTimeout(() => {
-                        this.scrollToTop();
-                    }, 100);
-                }
-            },
-
-            async submitApplication() {
-                if (this.$refs.storeInfo) {
-                    // 增加了 await 进行异步表单验证，等待弹窗确认结果
-                    const isValid = await this.$refs.storeInfo.saveFormData();
+            if (this.currentStep === 1) {
+                if (this.$refs.qualificationInfo) {
+                    const isValid = await this.$refs.qualificationInfo.saveFormData();
                     if (!isValid) {
                         return;
                     }
-                    this.storeInfoData = this.$refs.storeInfo.getFormData();
+                    this.qualificationData = this.$refs.qualificationInfo.getFormData();
                 }
+                await this.submitForReview();
+                return;
+            }
 
-                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 === '长久有效' ?
+            if (this.currentStep < 3) {
+                this.currentStep++;
+                setTimeout(() => {
+                    this.scrollToTop();
+                }, 100);
+            }
+        },
+
+        async submitApplication() {
+            if (this.$refs.storeInfo) {
+                // 增加了 await 进行异步表单验证，等待弹窗确认结果
+                const isValid = await this.$refs.storeInfo.saveFormData();
+                if (!isValid) {
+                    return;
+                }
+                this.storeInfoData = this.$refs.storeInfo.getFormData();
+            }
+
+            uni.showLoading({
+                title: '提交中...'
+            });
+            try {
+                const formData = this.buildBusinessData(this.qualificationData, this.storeInfoData);
+                if (!formData) {
+                    uni.hideLoading();
+                    return;
+                }
+                formData.type = 1;
+                formData.id_type = 1;
+                console.log(formData, '-----------');
+                if (formData.legal_idcard_expiry_start && formData.legal_idcard_expiry_end) {
+                    formData.legal_idcard_expiry =
+                        formData.legal_idcard_expiry_end === '长久有效' ?
                             `${formData.legal_idcard_expiry_start} —— 长久` :
                             `${formData.legal_idcard_expiry_start} —— ${formData.legal_idcard_expiry_end}`;
-                    }
-                    delete formData.legal_idcard_expiry_start
-                    delete formData.legal_idcard_expiry_end
-                    delete formData.contact_phone
-                    delete formData.contact_type
-                    delete formData.contact_name
-                    delete formData.invite_code_other
-                    if (Array.isArray(formData.qualifications_sector)) {
-                        formData.qualifications_sector = JSON.stringify(formData.qualifications_sector);
-                    }
-                    if (Array.isArray(formData.qualifications_other)) {
-                        formData.qualifications_other = JSON.stringify(formData.qualifications_other);
-                    }
-                    console.log(formData, 'formData请求参数');
-                    const res = await request.post('/sj/userSjAuth/apply', formData);
-                    uni.hideLoading();
-                    if (res.state == 1 || res.code == 200) {
-                        this.successData = res.data ? (res.data.customer_service || {}) : {};
-                        uni.showToast({
-                            title: '提交成功',
-                            icon: 'none'
-                        });
-                        setTimeout(() => {
-                            this.currentStep = 4;
-                        }, 1500);
-                    } else {
-                        uni.showToast({
-                            title: res.msg || '提交失败了',
-                            icon: 'none'
-                        });
-                    }
-                } catch (error) {
-                    console.error('提交失败：', error);
-                    uni.hideLoading();
+                }
+                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: '提交失败，请重试',
+                        title: '提交成功',
+                        icon: 'none'
+                    });
+                    setTimeout(() => {
+                        this.currentStep = 4;
+                    }, 1500);
+                } else {
+                    uni.showToast({
+                        title: res.msg || '提交失败了',
                         icon: 'none'
                     });
                 }
-            },
-
-            goPrev() {
-                if (this.currentStep > 0) {
-                    this.currentStep--;
-                }
-            },
-            scrollToTop() {
-                uni.pageScrollTo({
-                    scrollTop: 0,
-                    duration: 0
+            } catch (error) {
+                console.error('提交失败：', error);
+                uni.hideLoading();
+                uni.showToast({
+                    title: '提交失败，请重试',
+                    icon: 'none'
                 });
-            },
-            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;
-                }
-            },
-        }
+            }
+        },
+
+        goPrev() {
+            if (this.currentStep > 0) {
+                this.currentStep--;
+            }
+        },
+        scrollToTop() {
+            uni.pageScrollTo({
+                scrollTop: 0,
+                duration: 0
+            });
+        },
+        async getXieyi(type) {
+            this.loading = true;
+            this.error = null;
+            try {
+                const res = await request.post('/user/getsystemtext', {
+                    type
+                });
+                this.textData = res.data;
+            } catch (err) {
+                console.error('获取协议失败:', err);
+                this.error = '获取协议内容失败，请重试';
+                uni.showToast({
+                    title: '获取协议内容失败',
+                    icon: 'none'
+                });
+            } finally {
+                this.loading = false;
+            }
+        },
     }
+}
 </script>
 
 <style>
 /* ...与原来一致的代码... */
-    .ruzhu-page {
-        background: #f5f5f5;
-    }
+.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, #ff8e9d 0%, #FF4767 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, #ff8e9d 0%, #FF4767 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: #FF4767;
-        font-size: 36rpx;
-        font-weight: 500;
-    }
+.prev-text {
+    color: #FF4767;
+    font-size: 36rpx;
+    font-weight: 500;
+}
 
-    .button-row {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        width: 702rpx;
-        height: 147rpx;
-        gap: 20rpx;
-    }
+.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;
-    }
+.submit-text {
+    color: #ffffff;
+    font-size: 32rpx;
+    font-weight: 500;
+}
 
-    .showziliao {
-        width: 690rpx;
-        height: 98rpx;
-        background: #FF4767;
-        border-radius: 49rpx;
-    }
+.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;
-    }
+.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/shop/add-service.vue b/pages/shop/add-service.vue
index af35f5b..d3538aa 100644
--- a/pages/shop/add-service.vue
+++ b/pages/shop/add-service.vue
@@ -45,9 +45,9 @@
 				<text class="form-label required">服务分类</text>
 				<view class="form-right" @click="openServiceTypePicker">
 					<text :class="[
-              'form-value',
-              formData.first_class_id ? '' : 'placeholder',
-            ]">
+						'form-value',
+						formData.first_class_id ? '' : 'placeholder',
+					]">
 						{{ serviceType || "选择分类" }}
 					</text>
 					<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/arrow_right.png"
@@ -60,9 +60,9 @@
 				<text class="form-label required">服务子类</text>
 				<view class="form-right" @click="openCategoryPicker">
 					<text :class="[
-              'form-value',
-              formData.second_class_id ? '' : 'placeholder',
-            ]">
+						'form-value',
+						formData.second_class_id ? '' : 'placeholder',
+					]">
 						{{ category || "选择子类" }}
 					</text>
 					<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/arrow_right.png"
@@ -75,13 +75,13 @@
 				<view class="form-label required">
 					是否允许该服务在门店端售卖，以供门店下单购买。
 					{{
-            showShopPrice
-              ? "门店下单购买后，您需到上门至门店进行服务，门店端展示价格为"
-              : ""
-          }}
+						showShopPrice
+							? "门店下单购买后，您需到上门至门店进行服务，门店端展示价格为"
+							: ""
+					}}
 					<text style="color: #FF4767" v-if="showShopPrice">{{
-            shopPrice
-          }}</text>
+						shopPrice
+					}}</text>
 					{{ showShopPrice ? "元。" : "" }}
 				</view>
 				<view class="shopsale-change">
@@ -121,8 +121,8 @@
 					<text class="form-label">图文详情</text>
 					<view class="form-detail">
 						<text @click="goImgAndText">{{
-              formData.graphic_details ? "已设置" : "去设置"
-            }}</text>
+							formData.graphic_details ? "已设置" : "去设置"
+						}}</text>
 					</view>
 				</view>
 			</view>
@@ -138,7 +138,7 @@
 					<view class="detail-textarea-wrap">
 						<textarea class="detail-textarea" v-model="detailForm.effect" placeholder="请输入服务内容"
 							placeholder-class="placeholder" maxlength="200"></textarea>
-						<text class="detail-count">{{(detailForm.effect || '').length}}/200</text>
+						<text class="detail-count">{{ (detailForm.effect || '').length }}/200</text>
 					</view>
 				</view>
 
@@ -148,7 +148,7 @@
 						<textarea class="detail-textarea" v-model="detailForm.crowd"
 							placeholder="请输入不适用人群，例如：未成年人/孕妇不适用" placeholder-class="placeholder"
 							maxlength="200"></textarea>
-						<text class="detail-count">{{(detailForm.crowd || '').length}}/200</text>
+						<text class="detail-count">{{ (detailForm.crowd || '').length }}/200</text>
 					</view>
 				</view>
 
@@ -157,7 +157,7 @@
 					<view class="detail-textarea-wrap">
 						<textarea class="detail-textarea" v-model="detailForm.product" placeholder="请输入产品清单"
 							placeholder-class="placeholder" maxlength="200"></textarea>
-						<text class="detail-count">{{(detailForm.product || '').length}}/200</text>
+						<text class="detail-count">{{ (detailForm.product || '').length }}/200</text>
 					</view>
 				</view>
 
@@ -166,7 +166,7 @@
 					<view class="detail-textarea-wrap">
 						<textarea class="detail-textarea" v-model="detailForm.scope" placeholder="请输入使用时间/适用人数"
 							placeholder-class="placeholder" maxlength="200"></textarea>
-						<text class="detail-count">{{(detailForm.scope || '').length}}/200</text>
+						<text class="detail-count">{{ (detailForm.scope || '').length }}/200</text>
 					</view>
 				</view>
 
@@ -175,7 +175,7 @@
 					<view class="detail-textarea-wrap">
 						<textarea class="detail-textarea" v-model="detailForm.tips" placeholder="请输入其他注意事项"
 							placeholder-class="placeholder" maxlength="200"></textarea>
-						<text class="detail-count">{{(detailForm.tips || '').length}}/200</text>
+						<text class="detail-count">{{ (detailForm.tips || '').length }}/200</text>
 					</view>
 				</view>
 			</view>
@@ -276,1209 +276,1209 @@
 			<view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。</view>
 		</view>
 
-		
+
 
 	</view>
 </template>
 
 <script>
-	import request from "../../utils/request";
-	import PopupPicker from "@/components/popup-picker/popup-picker.vue";
-	import PopupPickerMy from "@/components/popup-picker/PopupPickerMy.vue";
-	import CircleProgress from "@/components/circle-progress/circle-progress.vue";
-	import sparkMD5 from "spark-md5"; // 引入MD5计算库
-	import {
-		debounce
-	} from "@/utils/debounce.js";
-	import AliOssUploader from "../../components/ali-oss-uploader/ali-oss-uploader.vue";
-	import permissionUtils from "../../utils/per";
-	import locationService from "../../utils/locationService";
-	import _public from "../../utils/public";
+import request from "../../utils/request";
+import PopupPicker from "@/components/popup-picker/popup-picker.vue";
+import PopupPickerMy from "@/components/popup-picker/PopupPickerMy.vue";
+import CircleProgress from "@/components/circle-progress/circle-progress.vue";
+import sparkMD5 from "spark-md5"; // 引入MD5计算库
+import {
+	debounce
+} from "@/utils/debounce.js";
+import AliOssUploader from "../../components/ali-oss-uploader/ali-oss-uploader.vue";
+import permissionUtils from "../../utils/per";
+import locationService from "../../utils/locationService";
+import _public from "../../utils/public";
 
-	export default {
-		components: {
-			PopupPicker,
-			CircleProgress,
-			AliOssUploader,
-			PopupPickerMy,
-		},
-		data() {
-			return {
-				artisanType: getApp().globalData.artisanType,
-				nowQer: "xc",
-				progress: 0,
-				isShow: false,
-				state: null,
-				isShowPer: false,
-				formData: {
-					publish_user_id: null,
-					server_kind: getApp().globalData.artisanType,
-					title: "",
-					server_price: "",
-					line_price: '',
-					server_time: "",
-					first_class_id: "",
-					second_class_id: "",
-					detail: [],
-					process: [],
-					video: "",
-					photo: [],
-					graphic_details: "",
-					sj_see: null, // 1代表商家端不可见  2代表商家端可见
-					// 新增的五个独立字段
-					efficacy: "",
-					crowd: "",
-					product: "",
-					scope: "",
-					prompt: "",
-				},
-				ratio: null,
-				// 服务简介部分
-				detailForm: {
-					effect: "",
-					crowd: "",
-					product: "",
-					scope: "",
-					tips: "",
-				},
-				detailOtherList: [],
-
-				serviceTypes: [], // 服务分类
-				categoryAll: [],
-				showServiceTypePicker: false,
-				showCategoryPicker: false,
-				selectedServiceTypeIndex: 0,
-				selectedCategoryIndex: [0],
-				serviceType: "",
-				category: "",
-				imagesList: [], // 临时图片地址
-				addDetailList: [],
-				showCategory: false,
-				showProgress: false,
+export default {
+	components: {
+		PopupPicker,
+		CircleProgress,
+		AliOssUploader,
+		PopupPickerMy,
+	},
+	data() {
+		return {
+			artisanType: getApp().globalData.artisanType,
+			nowQer: "xc",
+			progress: 0,
+			isShow: false,
+			state: null,
+			isShowPer: false,
+			formData: {
 				publish_user_id: null,
-				isAdd: false,
-				isDraft: false,
-			};
-		},
-		onShow() {
-			uni.$on("updateGraphicDetails", (data) => {
-				this.$set(this.formData, "graphic_details", JSON.stringify(data));
-				// 这里可以添加其他处理逻辑
+				server_kind: getApp().globalData.artisanType,
+				title: "",
+				server_price: "",
+				line_price: '',
+				server_time: "",
+				first_class_id: "",
+				second_class_id: "",
+				detail: [],
+				process: [],
+				video: "",
+				photo: [],
+				graphic_details: "",
+				sj_see: null, // 1代表商家端不可见  2代表商家端可见
+				// 新增的五个独立字段
+				efficacy: "",
+				crowd: "",
+				product: "",
+				scope: "",
+				prompt: "",
+			},
+			ratio: null,
+			// 服务简介部分
+			detailForm: {
+				effect: "",
+				crowd: "",
+				product: "",
+				scope: "",
+				tips: "",
+			},
+			detailOtherList: [],
+
+			serviceTypes: [], // 服务分类
+			categoryAll: [],
+			showServiceTypePicker: false,
+			showCategoryPicker: false,
+			selectedServiceTypeIndex: 0,
+			selectedCategoryIndex: [0],
+			serviceType: "",
+			category: "",
+			imagesList: [], // 临时图片地址
+			addDetailList: [],
+			showCategory: false,
+			showProgress: false,
+			publish_user_id: null,
+			isAdd: false,
+			isDraft: false,
+		};
+	},
+	onShow() {
+		uni.$on("updateGraphicDetails", (data) => {
+			this.$set(this.formData, "graphic_details", JSON.stringify(data));
+			// 这里可以添加其他处理逻辑
+		});
+	},
+	onLoad(options) {
+		this.state = options.state || "";
+		if (options.id) {
+			this.formData.id = options.id;
+			this.getInit();
+		} else {
+			request.post("/sj/firstclass", {}).then((res) => {
+				this.serviceTypes = this.serviceTypes.concat(res.data);
 			});
+		}
+		// 判断是否显示上门提醒弹窗
+		const notShow = uni.getStorageSync('addServiceReminderNotShow');
+		this.getUserInfo();
+	},
+	computed: {
+		showShopPrice() {
+			return (
+				this.artisanType == 1 &&
+				this.formData.sj_see == 2 &&
+				this.formData.server_price &&
+				this.formData.first_class_id
+			);
 		},
-		onLoad(options) {
-			this.state = options.state || "";
-			if (options.id) {
-				this.formData.id = options.id;
-				this.getInit();
-			} else {
-				request.post("/sj/firstclass", {}).then((res) => {
-					this.serviceTypes = this.serviceTypes.concat(res.data);
+		shopPrice() {
+			return _public.roundUpToTwoDecimals(
+				this.formData.server_price,
+				this.ratio
+			);
+		},
+	},
+	methods: {
+		inpPrice2(e) {
+			let that = this;
+			let value = e.detail.value;
+
+			// 1. 移除非数字和小数点
+			value = value.replace(/[^\d.]/g, '');
+
+			// 2. 确保只有一个小数点
+			const parts = value.split('.');
+			if (parts.length > 2) {
+				value = parts[0] + '.' + parts.slice(1).join('');
+			}
+
+			// 3. 限制小数点后最多一位
+			if (parts.length > 1) {
+				value = parts[0] + '.' + parts[1].slice(0, 2);
+			}
+			// 4. 如果以小数点开头，前面补0
+			if (value.startsWith('.')) {
+				value = '0' + value;
+			}
+			that.$set(that.formData, 'line_price', value);
+		},
+		// 服务简介部分
+		initDetailForm(detail = []) {
+			// 先重置 detailForm 为空
+			this.detailForm = {
+				effect: "",
+				crowd: "",
+				product: "",
+				scope: "",
+				tips: "",
+			};
+			this.detailOtherList = [];
+
+			// 优先从后端返回的新字段赋值
+			if (this.formData.efficacy) this.detailForm.effect = this.formData.efficacy;
+			if (this.formData.crowd) this.detailForm.crowd = this.formData.crowd;
+			if (this.formData.product) this.detailForm.product = this.formData.product;
+			if (this.formData.scope) this.detailForm.scope = this.formData.scope;
+			if (this.formData.prompt) this.detailForm.tips = this.formData.prompt;
+
+			// 如果新字段都为空，则尝试从旧的 detail 数组中提取（兼容旧数据）
+			if (!this.formData.efficacy && !this.formData.crowd && !this.formData.product) {
+				(detail || []).forEach((item) => {
+					if (item.title === "服务内容" || item.title === "服务功效") {
+						this.detailForm.effect = item.text || "";
+					} else if (item.title === "适用人群") {
+						this.detailForm.crowd = item.text || "";
+					} else if (item.title === "产品清单") {
+						this.detailForm.product = item.text || "";
+					} else if (item.title === "适用范围" || item.title === "使用范围") {
+						this.detailForm.scope = item.text || "";
+					} else if (item.title === "温馨提示") {
+						this.detailForm.tips = item.text || "";
+					} else {
+						this.detailOtherList.push({
+							title: item.title || "",
+							text: item.text || "",
+							photo: item.photo || "",
+						});
+					}
 				});
 			}
-			// 判断是否显示上门提醒弹窗
-			const notShow = uni.getStorageSync('addServiceReminderNotShow');
-			this.getUserInfo();
 		},
-		computed: {
-			showShopPrice() {
-				return (
-					this.artisanType == 1 &&
-					this.formData.sj_see == 2 &&
-					this.formData.server_price &&
-					this.formData.first_class_id
-				);
-			},
-			shopPrice() {
-				return _public.roundUpToTwoDecimals(
-					this.formData.server_price,
-					this.ratio
-				);
-			},
+
+		syncDetailForm() {
+			// 将 detailForm 的值映射到 formData 的新字段
+			this.formData.efficacy = (this.detailForm.effect || "").trim();
+			this.formData.crowd = (this.detailForm.crowd || "").trim();
+			this.formData.product = (this.detailForm.product || "").trim();
+			this.formData.scope = (this.detailForm.scope || "").trim();
+			this.formData.prompt = (this.detailForm.tips || "").trim();
 		},
-		methods: {
-			inpPrice2(e) {
-				let that = this;
-				let value = e.detail.value;
 
-				// 1. 移除非数字和小数点
-				value = value.replace(/[^\d.]/g, '');
-
-				// 2. 确保只有一个小数点
-				const parts = value.split('.');
-				if (parts.length > 2) {
-					value = parts[0] + '.' + parts.slice(1).join('');
-				}
-
-				// 3. 限制小数点后最多一位
-				if (parts.length > 1) {
-					value = parts[0] + '.' + parts[1].slice(0, 2);
-				}
-				// 4. 如果以小数点开头，前面补0
-				if (value.startsWith('.')) {
-					value = '0' + value;
-				}
-				that.$set(that.formData, 'line_price', value);
-			},
-			// 服务简介部分
-			initDetailForm(detail = []) {
-				// 先重置 detailForm 为空
-				this.detailForm = {
-					effect: "",
-					crowd: "",
-					product: "",
-					scope: "",
-					tips: "",
-				};
-				this.detailOtherList = [];
-
-				// 优先从后端返回的新字段赋值
-				if (this.formData.efficacy) this.detailForm.effect = this.formData.efficacy;
-				if (this.formData.crowd) this.detailForm.crowd = this.formData.crowd;
-				if (this.formData.product) this.detailForm.product = this.formData.product;
-				if (this.formData.scope) this.detailForm.scope = this.formData.scope;
-				if (this.formData.prompt) this.detailForm.tips = this.formData.prompt;
-
-				// 如果新字段都为空，则尝试从旧的 detail 数组中提取（兼容旧数据）
-				if (!this.formData.efficacy && !this.formData.crowd && !this.formData.product) {
-					(detail || []).forEach((item) => {
-						if (item.title === "服务内容" || item.title === "服务功效") {
-							this.detailForm.effect = item.text || "";
-						} else if (item.title === "适用人群") {
-							this.detailForm.crowd = item.text || "";
-						} else if (item.title === "产品清单") {
-							this.detailForm.product = item.text || "";
-						} else if (item.title === "适用范围" || item.title === "使用范围") {
-							this.detailForm.scope = item.text || "";
-						} else if (item.title === "温馨提示") {
-							this.detailForm.tips = item.text || "";
-						} else {
-							this.detailOtherList.push({
-								title: item.title || "",
-								text: item.text || "",
-								photo: item.photo || "",
-							});
-						}
-					});
-				}
-			},
-
-			syncDetailForm() {
-				// 将 detailForm 的值映射到 formData 的新字段
-				this.formData.efficacy = (this.detailForm.effect || "").trim();
-				this.formData.crowd = (this.detailForm.crowd || "").trim();
-				this.formData.product = (this.detailForm.product || "").trim();
-				this.formData.scope = (this.detailForm.scope || "").trim();
-				this.formData.prompt = (this.detailForm.tips || "").trim();
-			},
-
-			checkDetailForm() {
-				if (!this.detailForm.effect || !this.detailForm.effect.trim()) {
-					uni.showToast({
-						title: "请输入服务内容",
-						icon: "none",
-					});
-					return false;
-				}
-				if (!this.detailForm.crowd || !this.detailForm.crowd.trim()) {
-					uni.showToast({
-						title: "请输入适用人群",
-						icon: "none",
-					});
-					return false;
-				}
-				// if (!this.detailForm.product || !this.detailForm.product.trim()) {
-				// 	uni.showToast({
-				// 		title: "请输入产品清单",
-				// 		icon: "none",
-				// 	});
-				// 	return false;
-				// }
-				return true;
-			},
-
-			goImgAndText() {
-				uni.navigateTo({
-					url: `/pages/shop/add-img-text?list=${this.formData.graphic_details}`,
-				});
-			},
-			ckeckisShowPer(value) {
-				console.log("ckeckisShowPer==========", value);
-				this.isShowPer = value;
-			},
-			ckecknowQer(value) {
-				this.nowQer = value;
-			},
-			addVideo(value) {
-				this.formData.video = value;
-			},
-			// addImg(arr) {
-			// 	this.formData.photo = this.formData.photo.concat(arr);
-			// },
-			// deleteImage(index) {
-			//   this.formData.photo.splice(index, 1)
-			// },
-			onUploadSuccess(file) {
-				console.log("添加的图片", this.formData.photo);
-			},
-			onUploadError(error) {
-				console.error("上传失败:", error);
+		checkDetailForm() {
+			if (!this.detailForm.effect || !this.detailForm.effect.trim()) {
 				uni.showToast({
-					title: "上传失败",
+					title: "请输入服务内容",
 					icon: "none",
 				});
-			},
-			onFileDelete(file, index) {
-				console.log("删除文件:", this.formData.photo, index);
-			},
-			uploadVideoSuc(file) {
-				this.formData.video = file;
-			},
-			uploadVideoErr() {},
-			uploadVideoDel() {
-				this.formData.video = null;
-			},
-			async getInit() {
-				const firstclass = await request.post("/sj/firstclass");
-				this.serviceTypes = this.serviceTypes.concat(firstclass.data);
+				return false;
+			}
+			if (!this.detailForm.crowd || !this.detailForm.crowd.trim()) {
+				uni.showToast({
+					title: "请输入适用人群",
+					icon: "none",
+				});
+				return false;
+			}
+			// if (!this.detailForm.product || !this.detailForm.product.trim()) {
+			// 	uni.showToast({
+			// 		title: "请输入产品清单",
+			// 		icon: "none",
+			// 	});
+			// 	return false;
+			// }
+			return true;
+		},
 
-				await request
-					.post("/sj/servers/detail", {
-						id: this.formData.id
-					})
-					.then((res) => {
-						// 直接合并所有字段，避免遗漏
-						this.formData = {
-							...this.formData,
-							...res.data
-						};
-						// 确保 detail 数组被保留（可能用于兼容）
-						this.formData.detail = res.data.detail || [];
-						// 调用初始化方法，它会优先使用新字段
-						this.initDetailForm(res.data.detail || []);
-						// 处理分类显示
-						firstclass.data.filter((item, i) => {
-							if (item.id == this.formData.first_class_id) {
-								this.selectedServiceTypeIndex = i;
-								this.serviceType = item.title;
-								this.ratio = item.ratio;
+		goImgAndText() {
+			uni.navigateTo({
+				url: `/pages/shop/add-img-text?list=${this.formData.graphic_details}`,
+			});
+		},
+		ckeckisShowPer(value) {
+			console.log("ckeckisShowPer==========", value);
+			this.isShowPer = value;
+		},
+		ckecknowQer(value) {
+			this.nowQer = value;
+		},
+		addVideo(value) {
+			this.formData.video = value;
+		},
+		// addImg(arr) {
+		// 	this.formData.photo = this.formData.photo.concat(arr);
+		// },
+		// deleteImage(index) {
+		//   this.formData.photo.splice(index, 1)
+		// },
+		onUploadSuccess(file) {
+			console.log("添加的图片", this.formData.photo);
+		},
+		onUploadError(error) {
+			console.error("上传失败:", error);
+			uni.showToast({
+				title: "上传失败",
+				icon: "none",
+			});
+		},
+		onFileDelete(file, index) {
+			console.log("删除文件:", this.formData.photo, index);
+		},
+		uploadVideoSuc(file) {
+			this.formData.video = file;
+		},
+		uploadVideoErr() { },
+		uploadVideoDel() {
+			this.formData.video = null;
+		},
+		async getInit() {
+			const firstclass = await request.post("/sj/firstclass");
+			this.serviceTypes = this.serviceTypes.concat(firstclass.data);
+
+			await request
+				.post("/sj/servers/detail", {
+					id: this.formData.id
+				})
+				.then((res) => {
+					// 直接合并所有字段，避免遗漏
+					this.formData = {
+						...this.formData,
+						...res.data
+					};
+					// 确保 detail 数组被保留（可能用于兼容）
+					this.formData.detail = res.data.detail || [];
+					// 调用初始化方法，它会优先使用新字段
+					this.initDetailForm(res.data.detail || []);
+					// 处理分类显示
+					firstclass.data.filter((item, i) => {
+						if (item.id == this.formData.first_class_id) {
+							this.selectedServiceTypeIndex = i;
+							this.serviceType = item.title;
+							this.ratio = item.ratio;
+						}
+					});
+				});
+			request
+				.post("/user/secondclass", {
+					id: this.formData.first_class_id,
+				})
+				.then((result) => {
+					if (result.data.length == 0 || !result.data) {
+						this.showCategory = false;
+					} else {
+						this.categoryAll = result.data;
+						this.categoryAll.filter((e, i) => {
+							if (e.id == this.formData.second_class_id) {
+								this.selectedCategoryIndex = [i];
+								this.category = e.title;
 							}
 						});
-					});
-				request
-					.post("/user/secondclass", {
-						id: this.formData.first_class_id,
-					})
-					.then((result) => {
-						if (result.data.length == 0 || !result.data) {
-							this.showCategory = false;
-						} else {
-							this.categoryAll = result.data;
-							this.categoryAll.filter((e, i) => {
-								if (e.id == this.formData.second_class_id) {
-									this.selectedCategoryIndex = [i];
-									this.category = e.title;
-								}
-							});
-							this.showCategory = true;
-						}
-					});
-			},
-			getUserInfo() {
-				const type = this.artisanType == 1 ? 2 : this.artisanType == 2 ? 3 : 1;
-				request
-					.post("/user/getuser", {
-						type: type,
-					})
-					.then((result) => {
-						this.formData.publish_user_id = result.data.id;
-					});
-			},
-			// 是否在商家端售卖
-			changeSale(value) {
-				this.formData.sj_see = value;
-			},
-			// 输入价格
-			inpPrice(e) {
-				let that = this;
-				let value = e.detail.value;
-
-				// 1. 移除非数字和小数点
-				value = value.replace(/[^\d.]/g, "");
-
-				// 2. 确保只有一个小数点
-				const parts = value.split(".");
-				if (parts.length > 2) {
-					value = parts[0] + "." + parts.slice(1).join("");
-				}
-
-				// 3. 限制小数点后最多一位
-				if (parts.length > 1) {
-					value = parts[0] + "." + parts[1].slice(0, 2);
-				}
-				// 4. 如果以小数点开头，前面补0
-				if (value.startsWith(".")) {
-					value = "0" + value;
-				}
-				that.$set(that.formData, "server_price", value);
-			},
-			deleteStep(i) {
-				this.formData.process.splice(i, 1);
-			},
-			addStep() {
-				let i = this.formData.process.length + 1;
-				let arr = {
-					title: "第" + i + "步",
-					text: "",
-					photo: "",
-				};
-				this.formData.process.push(arr);
-			},
-
-			// 删除视频
-			deleteVideo() {
-				this.formData.video = "";
-			},
-
-			// 保存草稿
-			saveDraft: debounce(function() {
-				if (this.isDraft) return;
-				this.syncDetailForm();
-				const {
-					title,
-					server_price,
-					line_price,
-					server_time,
-					first_class_id,
-					second_class_id,
-					detail,
-					process,
-					video,
-					photo,
-				} = this.formData;
-				let item = {
-					title,
-					server_price,
-					line_price,
-					server_time,
-					first_class_id,
-					second_class_id,
-					detail,
-					process,
-					video,
-					photo,
-				};
-				// 检查是否所有字段都为空
-				const isEmpty = Object.values(item).every((value) => {
-					if (Array.isArray(value)) {
-						return value.length === 0;
-					}
-					return !value;
-				});
-
-				if (isEmpty) {
-					uni.showToast({
-						title: "请至少填写一项内容",
-						icon: "none",
-					});
-					return;
-				}
-
-				// 实现保存草稿逻辑
-				this.formData.state = 0;
-				let url = null;
-				if (!this.formData.id) {
-					url = "/user/serveradd";
-				} else {
-					url = "/user/serverchange";
-				}
-				request.post(url, this.formData).then((res) => {
-					if (res.state == 1) {
-						this.isDraft = true;
-						const pages = getCurrentPages();
-						const prevPage = pages[pages.length - 2]; // 上一个页面
-						uni.showToast({
-							title: res.msg,
-							icon: "success",
-							duration: 1000,
-						});
-						setTimeout(() => {
-							uni.navigateBack({
-								delta: 1,
-								success: () => {
-									prevPage.$vm.currentTab = 3;
-									prevPage.$vm.state = 0;
-									prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
-								},
-							});
-						}, 500);
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: "none",
-						});
-						this.isDraft = false;
+						this.showCategory = true;
 					}
 				});
-			}, 500),
-
-			// 提交表单
-			submitForm: debounce(function() {
-				if (this.isAdd) return;
-				this.syncDetailForm();
-				// 表单验证
-
-				if (!this.formData.title) {
-					uni.showToast({
-						title: "请输入服务名称",
-						icon: "none",
-					});
-					return;
-				}
-				if (!this.formData.line_price) {
-					uni.showToast({
-						title: '请输入服务定价',
-						icon: 'none'
-					})
-					return
-				}
-				if (!this.formData.server_price) {
-					uni.showToast({
-						title: '请输入服务售价',
-						icon: 'none'
-					})
-					return
-				}
-
-				if (!this.formData.first_class_id) {
-					uni.showToast({
-						title: "请选择服务分类",
-						icon: "none",
-					});
-					return;
-				}
-				if (this.showCategory && !this.formData.second_class_id) {
-					uni.showToast({
-						title: "请选择服务子类",
-						icon: "none",
-					});
-					return;
-				}
-				if (!this.formData.server_time) {
-					uni.showToast({
-						title: "请输入服务时长",
-						icon: "none",
-					});
-					return;
-				}
-				if (this.formData.server_time < 10) {
-					uni.showToast({
-						title: "服务时长最短为10分钟",
-						icon: "none",
-					});
-					return;
-				}
-				if (this.formData.server_time > 240) {
-					uni.showToast({
-						title: "服务时长最长为240分钟",
-						icon: "none",
-					});
-					return;
-				}
-				if (!this.formData.sj_see && this.artisanType == 1) {
-					uni.showToast({
-						title: "请选择是否允许在门店端售卖",
-						icon: "none",
-					});
-					return;
-				}
-
-				// 检查服务简介
-				if (!this.checkDetailForm()) {
-					return;
-				}
-				this.syncDetailForm();
-
-				// 检查服务流程数组
-				if (this.formData.process && this.formData.process.length > 0) {
-					for (let item of this.formData.process) {
-						if (!item.text) {
-							uni.showToast({
-								title: "请完善服务流程内容",
-								icon: "none",
-							});
-							return;
-						}
-					}
-				} else {
-					uni.showToast({
-						title: "请添加服务流程内容",
-						icon: "none",
-					});
-					return;
-				}
-
-				// 检查视频和图片
-				// if (!this.formData.video) {
-				//   uni.showToast({
-				//     title: '请上传服务视频',
-				//     icon: 'none'
-				//   })
-				//   return
-				// }
-				if (!this.formData.photo || this.formData.photo.length === 0) {
-					uni.showToast({
-						title: "请上传服务图片",
-						icon: "none",
-					});
-					return;
-				}
-				if (this.artisanType == 2) {
-					delete this.formData.sj_see;
-				}
-				// 提交表单逻辑
-				delete this.formData.state;
-				let url = null;
-				if (!this.formData.id) {
-					url = "/user/serveradd";
-				} else {
-					url = "/user/serverupdate";
-				}
-				console.log(this.formData, '-0-0-0-0-0-');
-				delete this.formData.shop_business_time
-				delete this.formData.shop_head_photo
-				delete this.formData.shop_address
-				delete this.formData.shop_dependency
-				delete this.formData.shop_class
-				delete this.formData.team_buy
-				
-				
-
-				request.post(url, this.formData).then((res) => {
-					if (res.state == 1) {
-						const pages = getCurrentPages();
-						const prevPage = pages[pages.length - 2]; // 上一个页面
-						uni.showToast({
-							title: res.msg,
-							icon: "success",
-							duration: 600,
-							mask: true,
-						});
-						this.isAdd = true;
-						setTimeout(() => {
-							uni.navigateBack({
-								delta: 1,
-								success: () => {
-									prevPage.$vm.currentTab = 1;
-									prevPage.$vm.state = 1;
-									prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
-								},
-							});
-						}, 500);
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: "none",
-						});
-						this.isAdd = false;
-					}
-				});
-			}, 500),
-
-			// 打开服务分类
-			openServiceTypePicker() {
-				console.log("open");
-				// 实现分类选择逻辑
-				this.showServiceTypePicker = true;
-			},
-
-			// 打开服务子类选择器
-			openCategoryPicker() {
-				// 实现子类选择逻辑
-				if (!this.formData.first_class_id) {
-					uni.showToast({
-						title: "请先选择服务分类",
-						icon: "none",
-					});
-				} else {
-					this.showCategoryPicker = true;
-				}
-			},
-
-			// 处理服务类型选择
-			handleServiceTypeConfirm(e) {
-				console.log("e", e);
-				const selectedType = e.items[0];
-				if (this.formData.first_class_id == selectedType.id) return;
-				this.formData.first_class_id = selectedType.id;
-				this.serviceType = selectedType.title;
-				this.ratio = selectedType.ratio;
-				this.formData.second_class_id = "";
-				this.category = "";
-				let id = selectedType.id;
-				request
-					.post("/user/secondclass", {
-						id,
-					})
-					.then((res) => {
-						if (res.data.length == 0 || !res.data) {
-							this.showCategory = false;
-							this.selectedCategoryIndex = [0];
-						} else {
-							this.categoryAll = res.data;
-							this.showCategory = true;
-							this.selectedCategoryIndex = [0];
-							// this.formData.second_class_id = res.data[0].id;
-							// this.category = res.data[0].title;
-						}
-					});
-			},
-
-			// 处理服务分类选择
-			handleCategoryConfirm(e) {
-				console.log(e, "selectedCategory", this.categoryAll);
-				const selectedCategory = e.item;
-				this.formData.second_class_id = selectedCategory.id;
-				this.category = selectedCategory.title;
-			},
 		},
-	};
+		getUserInfo() {
+			const type = this.artisanType == 1 ? 2 : this.artisanType == 2 ? 3 : 1;
+			request
+				.post("/sj/user/getuser", {
+					type: type,
+				})
+				.then((result) => {
+					this.formData.publish_user_id = result.data.id;
+				});
+		},
+		// 是否在商家端售卖
+		changeSale(value) {
+			this.formData.sj_see = value;
+		},
+		// 输入价格
+		inpPrice(e) {
+			let that = this;
+			let value = e.detail.value;
+
+			// 1. 移除非数字和小数点
+			value = value.replace(/[^\d.]/g, "");
+
+			// 2. 确保只有一个小数点
+			const parts = value.split(".");
+			if (parts.length > 2) {
+				value = parts[0] + "." + parts.slice(1).join("");
+			}
+
+			// 3. 限制小数点后最多一位
+			if (parts.length > 1) {
+				value = parts[0] + "." + parts[1].slice(0, 2);
+			}
+			// 4. 如果以小数点开头，前面补0
+			if (value.startsWith(".")) {
+				value = "0" + value;
+			}
+			that.$set(that.formData, "server_price", value);
+		},
+		deleteStep(i) {
+			this.formData.process.splice(i, 1);
+		},
+		addStep() {
+			let i = this.formData.process.length + 1;
+			let arr = {
+				title: "第" + i + "步",
+				text: "",
+				photo: "",
+			};
+			this.formData.process.push(arr);
+		},
+
+		// 删除视频
+		deleteVideo() {
+			this.formData.video = "";
+		},
+
+		// 保存草稿
+		saveDraft: debounce(function () {
+			if (this.isDraft) return;
+			this.syncDetailForm();
+			const {
+				title,
+				server_price,
+				line_price,
+				server_time,
+				first_class_id,
+				second_class_id,
+				detail,
+				process,
+				video,
+				photo,
+			} = this.formData;
+			let item = {
+				title,
+				server_price,
+				line_price,
+				server_time,
+				first_class_id,
+				second_class_id,
+				detail,
+				process,
+				video,
+				photo,
+			};
+			// 检查是否所有字段都为空
+			const isEmpty = Object.values(item).every((value) => {
+				if (Array.isArray(value)) {
+					return value.length === 0;
+				}
+				return !value;
+			});
+
+			if (isEmpty) {
+				uni.showToast({
+					title: "请至少填写一项内容",
+					icon: "none",
+				});
+				return;
+			}
+
+			// 实现保存草稿逻辑
+			this.formData.state = 0;
+			let url = null;
+			if (!this.formData.id) {
+				url = "/user/serveradd";
+			} else {
+				url = "/user/serverchange";
+			}
+			request.post(url, this.formData).then((res) => {
+				if (res.state == 1) {
+					this.isDraft = true;
+					const pages = getCurrentPages();
+					const prevPage = pages[pages.length - 2]; // 上一个页面
+					uni.showToast({
+						title: res.msg,
+						icon: "success",
+						duration: 1000,
+					});
+					setTimeout(() => {
+						uni.navigateBack({
+							delta: 1,
+							success: () => {
+								prevPage.$vm.currentTab = 3;
+								prevPage.$vm.state = 0;
+								prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
+							},
+						});
+					}, 500);
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: "none",
+					});
+					this.isDraft = false;
+				}
+			});
+		}, 500),
+
+		// 提交表单
+		submitForm: debounce(function () {
+			if (this.isAdd) return;
+			this.syncDetailForm();
+			// 表单验证
+
+			if (!this.formData.title) {
+				uni.showToast({
+					title: "请输入服务名称",
+					icon: "none",
+				});
+				return;
+			}
+			if (!this.formData.line_price) {
+				uni.showToast({
+					title: '请输入服务定价',
+					icon: 'none'
+				})
+				return
+			}
+			if (!this.formData.server_price) {
+				uni.showToast({
+					title: '请输入服务售价',
+					icon: 'none'
+				})
+				return
+			}
+
+			if (!this.formData.first_class_id) {
+				uni.showToast({
+					title: "请选择服务分类",
+					icon: "none",
+				});
+				return;
+			}
+			if (this.showCategory && !this.formData.second_class_id) {
+				uni.showToast({
+					title: "请选择服务子类",
+					icon: "none",
+				});
+				return;
+			}
+			if (!this.formData.server_time) {
+				uni.showToast({
+					title: "请输入服务时长",
+					icon: "none",
+				});
+				return;
+			}
+			if (this.formData.server_time < 10) {
+				uni.showToast({
+					title: "服务时长最短为10分钟",
+					icon: "none",
+				});
+				return;
+			}
+			if (this.formData.server_time > 240) {
+				uni.showToast({
+					title: "服务时长最长为240分钟",
+					icon: "none",
+				});
+				return;
+			}
+			if (!this.formData.sj_see && this.artisanType == 1) {
+				uni.showToast({
+					title: "请选择是否允许在门店端售卖",
+					icon: "none",
+				});
+				return;
+			}
+
+			// 检查服务简介
+			if (!this.checkDetailForm()) {
+				return;
+			}
+			this.syncDetailForm();
+
+			// 检查服务流程数组
+			if (this.formData.process && this.formData.process.length > 0) {
+				for (let item of this.formData.process) {
+					if (!item.text) {
+						uni.showToast({
+							title: "请完善服务流程内容",
+							icon: "none",
+						});
+						return;
+					}
+				}
+			} else {
+				uni.showToast({
+					title: "请添加服务流程内容",
+					icon: "none",
+				});
+				return;
+			}
+
+			// 检查视频和图片
+			// if (!this.formData.video) {
+			//   uni.showToast({
+			//     title: '请上传服务视频',
+			//     icon: 'none'
+			//   })
+			//   return
+			// }
+			if (!this.formData.photo || this.formData.photo.length === 0) {
+				uni.showToast({
+					title: "请上传服务图片",
+					icon: "none",
+				});
+				return;
+			}
+			if (this.artisanType == 2) {
+				delete this.formData.sj_see;
+			}
+			// 提交表单逻辑
+			delete this.formData.state;
+			let url = null;
+			if (!this.formData.id) {
+				url = "/user/serveradd";
+			} else {
+				url = "/user/serverupdate";
+			}
+			console.log(this.formData, '-0-0-0-0-0-');
+			delete this.formData.shop_business_time
+			delete this.formData.shop_head_photo
+			delete this.formData.shop_address
+			delete this.formData.shop_dependency
+			delete this.formData.shop_class
+			delete this.formData.team_buy
+
+
+
+			request.post(url, this.formData).then((res) => {
+				if (res.state == 1) {
+					const pages = getCurrentPages();
+					const prevPage = pages[pages.length - 2]; // 上一个页面
+					uni.showToast({
+						title: res.msg,
+						icon: "success",
+						duration: 600,
+						mask: true,
+					});
+					this.isAdd = true;
+					setTimeout(() => {
+						uni.navigateBack({
+							delta: 1,
+							success: () => {
+								prevPage.$vm.currentTab = 1;
+								prevPage.$vm.state = 1;
+								prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
+							},
+						});
+					}, 500);
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: "none",
+					});
+					this.isAdd = false;
+				}
+			});
+		}, 500),
+
+		// 打开服务分类
+		openServiceTypePicker() {
+			console.log("open");
+			// 实现分类选择逻辑
+			this.showServiceTypePicker = true;
+		},
+
+		// 打开服务子类选择器
+		openCategoryPicker() {
+			// 实现子类选择逻辑
+			if (!this.formData.first_class_id) {
+				uni.showToast({
+					title: "请先选择服务分类",
+					icon: "none",
+				});
+			} else {
+				this.showCategoryPicker = true;
+			}
+		},
+
+		// 处理服务类型选择
+		handleServiceTypeConfirm(e) {
+			console.log("e", e);
+			const selectedType = e.items[0];
+			if (this.formData.first_class_id == selectedType.id) return;
+			this.formData.first_class_id = selectedType.id;
+			this.serviceType = selectedType.title;
+			this.ratio = selectedType.ratio;
+			this.formData.second_class_id = "";
+			this.category = "";
+			let id = selectedType.id;
+			request
+				.post("/user/secondclass", {
+					id,
+				})
+				.then((res) => {
+					if (res.data.length == 0 || !res.data) {
+						this.showCategory = false;
+						this.selectedCategoryIndex = [0];
+					} else {
+						this.categoryAll = res.data;
+						this.showCategory = true;
+						this.selectedCategoryIndex = [0];
+						// this.formData.second_class_id = res.data[0].id;
+						// this.category = res.data[0].title;
+					}
+				});
+		},
+
+		// 处理服务分类选择
+		handleCategoryConfirm(e) {
+			console.log(e, "selectedCategory", this.categoryAll);
+			const selectedCategory = e.item;
+			this.formData.second_class_id = selectedCategory.id;
+			this.category = selectedCategory.title;
+		},
+	},
+};
 </script>
 
 <style lang="less">
-	.add-service {
-		padding: 24rpx 24rpx 0;
-		box-sizing: border-box;
-	}
+.add-service {
+	padding: 24rpx 24rpx 0;
+	box-sizing: border-box;
+}
 
-	.form-container {
-		margin-top: 20rpx;
-	}
+.form-container {
+	margin-top: 20rpx;
+}
 
-	.form-item {
-		background-color: #fff;
-		padding: 24rpx;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-between;
-		align-items: center;
-		box-sizing: border-box;
-		border-radius: 10rpx;
-		margin-bottom: 24rpx;
-	}
+.form-item {
+	background-color: #fff;
+	padding: 24rpx;
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: space-between;
+	align-items: center;
+	box-sizing: border-box;
+	border-radius: 10rpx;
+	margin-bottom: 24rpx;
+}
 
-	.price-tip {
-		width: 100%;
-		margin-top: 40rpx;
+.price-tip {
+	width: 100%;
+	margin-top: 40rpx;
 
-		.price-tip-card {
-			padding: 8rpx 12rpx;
-			background: #FDF0F0;
-			border-radius: 8rpx;
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #EE4853;
-			line-height: 33rpx;
-		}
-	}
-
-	.shopsale-box {
-		flex-flow: column;
-		justify-content: space-between;
-		align-items: space-between;
-	}
-
-	.shopsale-change {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 24rpx;
-	}
-
-	.shopsale-option {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.shopsale-option:last-child {
-		margin-left: 220rpx;
-	}
-
-	.option-text {
-		padding-left: 16rpx;
-	}
-
-	.form-item-up {
-		background-color: #fff;
-		padding: 24rpx;
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: space-between;
-		align-items: flex-start;
-		box-sizing: border-box;
-		border-radius: 10rpx;
-		margin-bottom: 24rpx;
-	}
-
-	.form-label {
-		font-size: 28rpx;
-		color: #333333;
-	}
-
-	.form-input {
-		flex: 1;
-		height: 40rpx;
-		font-size: 28rpx;
-		color: #333333;
-		align-items: center;
-		text-align: center;
-	}
-
-	.form-right {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.form-value {
-		font-size: 28rpx;
-		color: #333333;
-		margin-right: 16rpx;
-	}
-
-	.placeholder {
+	.price-tip-card {
+		padding: 8rpx 12rpx;
+		background: #FDF0F0;
+		border-radius: 8rpx;
 		font-weight: 400;
-		font-size: 28rpx;
-		color: #999999;
-	}
-
-	.textarea-item {
-		padding-bottom: 30rpx;
-	}
-
-	.form-textarea {
-		flex: 1;
-		height: 198rpx;
-		font-size: 28rpx;
-		color: #333333;
-		line-height: 1.5;
-		margin-left: 32rpx;
-	}
-
-	.upload-item {
-		padding-bottom: 30rpx;
-	}
-
-	.upload-tip {
 		font-size: 24rpx;
-		color: #999999;
-		margin-left: 10rpx;
+		color: #EE4853;
+		line-height: 33rpx;
 	}
+}
 
-	.upload-content {
-		margin-top: 20rpx;
-		position: relative;
-	}
+.shopsale-box {
+	flex-flow: column;
+	justify-content: space-between;
+	align-items: space-between;
+}
 
-	.progress-box {
-		width: 204rpx;
-		height: 204rpx;
-		background-color: rgba(0, 0, 0, 0.5);
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		z-index: 99;
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: center;
-		align-items: center;
-	}
+.shopsale-change {
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: 24rpx;
+}
 
-	.progress-text {
-		font-size: 42rpx;
-		color: #ffffff;
-		font-weight: 500;
-	}
+.shopsale-option {
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: center;
+	align-items: center;
+}
 
-	.progress-lable {
-		font-size: 28rpx;
-		color: #ffffff;
-	}
+.shopsale-option:last-child {
+	margin-left: 220rpx;
+}
 
-	.progress-box progress {
-		/* width: 204rpx; */
-		position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 0;
-	}
+.option-text {
+	padding-left: 16rpx;
+}
 
-	.video-preview,
-	.image-preview,
-	.upload-btn {
-		width: 200rpx;
-		height: 200rpx;
-		margin-right: 10rpx;
-		margin-bottom: 20rpx;
-		position: relative;
-	}
+.form-item-up {
+	background-color: #fff;
+	padding: 24rpx;
+	display: flex;
+	flex-flow: column nowrap;
+	justify-content: space-between;
+	align-items: flex-start;
+	box-sizing: border-box;
+	border-radius: 10rpx;
+	margin-bottom: 24rpx;
+}
 
-	.preview-video,
-	.preview-image {
-		width: 200rpx;
-		height: 200rpx;
-		border-radius: 8rpx;
-	}
+.form-label {
+	font-size: 28rpx;
+	color: #333333;
+}
 
-	.upload-btn {
-		border: 2rpx dashed #dddddd;
-		border-radius: 8rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
+.form-input {
+	flex: 1;
+	height: 40rpx;
+	font-size: 28rpx;
+	color: #333333;
+	align-items: center;
+	text-align: center;
+}
 
-	.plus-icon {
-		font-size: 60rpx;
-		color: #999999;
-	}
+.form-right {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
 
-	.delete-btn {
-		position: absolute;
-		top: -20rpx;
-		right: -20rpx;
-		width: 40rpx;
-		height: 40rpx;
-		background-color: rgba(0, 0, 0, 0.5);
-		border-radius: 50%;
-		color: #ffffff;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 32rpx;
-	}
+.form-value {
+	font-size: 28rpx;
+	color: #333333;
+	margin-right: 16rpx;
+}
 
-	.bottom-buttons {
-		/* position: fixed;
+.placeholder {
+	font-weight: 400;
+	font-size: 28rpx;
+	color: #999999;
+}
+
+.textarea-item {
+	padding-bottom: 30rpx;
+}
+
+.form-textarea {
+	flex: 1;
+	height: 198rpx;
+	font-size: 28rpx;
+	color: #333333;
+	line-height: 1.5;
+	margin-left: 32rpx;
+}
+
+.upload-item {
+	padding-bottom: 30rpx;
+}
+
+.upload-tip {
+	font-size: 24rpx;
+	color: #999999;
+	margin-left: 10rpx;
+}
+
+.upload-content {
+	margin-top: 20rpx;
+	position: relative;
+}
+
+.progress-box {
+	width: 204rpx;
+	height: 204rpx;
+	background-color: rgba(0, 0, 0, 0.5);
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 99;
+	display: flex;
+	flex-flow: column nowrap;
+	justify-content: center;
+	align-items: center;
+}
+
+.progress-text {
+	font-size: 42rpx;
+	color: #ffffff;
+	font-weight: 500;
+}
+
+.progress-lable {
+	font-size: 28rpx;
+	color: #ffffff;
+}
+
+.progress-box progress {
+	/* width: 204rpx; */
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+}
+
+.video-preview,
+.image-preview,
+.upload-btn {
+	width: 200rpx;
+	height: 200rpx;
+	margin-right: 10rpx;
+	margin-bottom: 20rpx;
+	position: relative;
+}
+
+.preview-video,
+.preview-image {
+	width: 200rpx;
+	height: 200rpx;
+	border-radius: 8rpx;
+}
+
+.upload-btn {
+	border: 2rpx dashed #dddddd;
+	border-radius: 8rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.plus-icon {
+	font-size: 60rpx;
+	color: #999999;
+}
+
+.delete-btn {
+	position: absolute;
+	top: -20rpx;
+	right: -20rpx;
+	width: 40rpx;
+	height: 40rpx;
+	background-color: rgba(0, 0, 0, 0.5);
+	border-radius: 50%;
+	color: #ffffff;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 32rpx;
+}
+
+.bottom-buttons {
+	/* position: fixed;
   left: 0;
   right: 0;
   bottom: 0; */
-		height: 100rpx;
-		padding: 40rpx 0 64rpx;
-		box-sizing: border-box;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-between;
-		align-items: center;
+	height: 100rpx;
+	padding: 40rpx 0 64rpx;
+	box-sizing: border-box;
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.btn-draft,
+.btn-submit {
+	width: 334rpx;
+	height: 76rpx;
+	line-height: 76rpx;
+	text-align: center;
+	font-size: 28rpx;
+	border-radius: 40rpx;
+	margin: 0 24rpx;
+}
+
+.btn-draft {
+	background-color: #ffffff;
+	color: #FF4767;
+	border: 2rpx solid #FF4767;
+	box-sizing: border-box;
+}
+
+.btn-submit {
+	background-color: #FF4767;
+	color: #ffffff;
+	width: 705rpx;
+	height: 76rpx;
+}
+
+.form-step {
+	background-color: #fff;
+	margin-bottom: 24rpx;
+}
+
+.form-step .form-item {
+	margin-bottom: 0;
+}
+
+.step {
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: space-between;
+	align-items: center;
+	padding: 0 24rpx 24rpx;
+}
+
+.step-inp {
+	flex: 1;
+	font-size: 28rpx;
+	color: #333333;
+	margin-left: 38rpx;
+	padding: 0 24rpx;
+	background-color: rgba(230, 230, 230, 0.5);
+}
+
+.step-textarea {
+	font-size: 24rpx;
+	flex: 1;
+	height: 70rpx;
+	border-radius: 6rpx;
+	margin-left: 38rpx;
+	padding: 24rpx;
+	background-color: rgba(230, 230, 230, 0.5);
+}
+
+/* 选择器触发按钮样式 */
+.picker-trigger {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 24rpx 32rpx;
+	background-color: #ffffff;
+	border-radius: 12rpx;
+	margin-bottom: 24rpx;
+}
+
+.picker-label {
+	font-size: 28rpx;
+	color: #333333;
+}
+
+.picker-value {
+	font-size: 28rpx;
+	color: #666666;
+}
+
+.picker-arrow {
+	width: 32rpx;
+	height: 32rpx;
+	margin-left: 16rpx;
+}
+
+.delete-icon {
+	width: 32rpx;
+	height: 32rpx;
+	margin-left: 24rpx;
+}
+
+.form-detail {
+	position: relative;
+}
+
+.required::before {
+	content: "*";
+	color: #ff0000;
+	margin-right: 4rpx;
+}
+
+.step-inp,
+.form-input {
+	height: 60rpx;
+}
+
+// 服务简介相关
+.detail-card {
+	background: #ffffff;
+	border-radius: 20rpx;
+	padding: 0 24rpx 8rpx;
+	margin-bottom: 24rpx;
+	box-sizing: border-box;
+	overflow: hidden;
+}
+
+.detail-title {
+	padding: 24rpx 0 25rpx;
+}
+
+.detail-title .form-label {
+	font-size: 30rpx;
+	font-weight: 500;
+	color: #333;
+	line-height: 40rpx;
+}
+
+.detail-row {
+	padding: 0 0 36rpx;
+}
+
+.detail-row .form-label {
+	display: block;
+	margin-bottom: 20rpx;
+	line-height: 40rpx;
+}
+
+.detail-textarea-wrap {
+	position: relative;
+	background: #f7f7f7;
+	border-radius: 16rpx;
+	padding: 24rpx 24rpx 52rpx;
+	box-sizing: border-box;
+}
+
+.detail-textarea {
+	width: 100%;
+	height: 108rpx;
+	min-height: 108rpx;
+	margin: 0;
+	padding: 0;
+	background: transparent;
+	border: 0;
+	font-size: 28rpx;
+	line-height: 40rpx;
+	color: #333333;
+	box-sizing: border-box;
+}
+
+.detail-count {
+	position: absolute;
+	right: 24rpx;
+	bottom: 16rpx;
+	font-size: 22rpx;
+	color: #999999;
+	line-height: 32rpx;
+}
+
+/* 平台特定样式 */
+/* #ifdef H5 */
+
+.form-input,
+.form-textarea {
+	outline: none;
+}
+
+.upload-btn {
+	cursor: pointer;
+}
+
+/* #endif */
+
+/* #ifdef APP-PLUS */
+.form-input {
+	height: 90rpx;
+}
+
+.permission.transform {
+	top: calc(var(--status-bar-height) + 88rpx + 30rpx);
+	opacity: 1;
+	visibility: visible;
+}
+
+/* #endif */
+
+/* #ifdef MP-WEIXIN */
+.form-input {
+	height: 80rpx;
+}
+
+.bottom-buttons {
+	padding-bottom: env(safe-area-inset-bottom);
+}
+
+/* #endif */
+.tip {
+	padding: 20rpx 30rpx;
+	background: #feefec;
+	font-weight: 400;
+	font-size: 30rpx;
+	color: #f31d2f;
+	line-height: 42rpx;
+	text-align: left;
+	font-style: normal;
+
+	text-align: center;
+
+	.tip-icon {
+		width: 34rpx;
+		height: 34rpx;
+		margin-right: 10rpx;
+		transform: translateY(6rpx);
 	}
+}
 
-	.btn-draft,
-	.btn-submit {
-		width: 334rpx;
-		height: 76rpx;
-		line-height: 76rpx;
-		text-align: center;
-		font-size: 28rpx;
-		border-radius: 40rpx;
-		margin: 0 24rpx;
-	}
+/* 淡入淡出动画 */
+.fade-enter-active,
+.fade-leave-active {
+	transition: opacity 0.3s;
+}
 
-	.btn-draft {
-		background-color: #ffffff;
-		color: #FF4767;
-		border: 2rpx solid #FF4767;
-		box-sizing: border-box;
-	}
+.fade-enter,
+.fade-leave-to {
+	opacity: 0;
+}
 
-	.btn-submit {
-		background-color: #FF4767;
-		color: #ffffff;
-		width: 705rpx;
-		height: 76rpx;
-	}
+.popup-mask2 {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	// z-index: 1000;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
 
-	.form-step {
-		background-color: #fff;
-		margin-bottom: 24rpx;
-	}
+.popup-content2 {
+	width: 600rpx;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	overflow: hidden;
+	padding: 40rpx 30rpx;
+	box-sizing: border-box;
+}
 
-	.form-step .form-item {
-		margin-bottom: 0;
-	}
+.popup-title {
+	font-size: 36rpx;
+	font-weight: 600;
+	color: #333333;
+	text-align: center;
+	margin-bottom: 20rpx;
+}
 
-	.step {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-between;
-		align-items: center;
-		padding: 0 24rpx 24rpx;
-	}
+.popup-message {
+	font-size: 30rpx;
+	color: #666666;
+	text-align: center;
+	margin-top: 40rpx;
+	margin-bottom: 30rpx;
+	line-height: 1.5;
+}
 
-	.step-inp {
-		flex: 1;
-		font-size: 28rpx;
-		color: #333333;
-		margin-left: 38rpx;
-		padding: 0 24rpx;
-		background-color: rgba(230, 230, 230, 0.5);
-	}
+.popup-buttons {
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: space-between;
+	padding: 20rpx 0 0 0;
+	gap: 60rpx;
+}
 
-	.step-textarea {
-		font-size: 24rpx;
-		flex: 1;
-		height: 70rpx;
-		border-radius: 6rpx;
-		margin-left: 38rpx;
-		padding: 24rpx;
-		background-color: rgba(230, 230, 230, 0.5);
-	}
+.popup-btn {
+	flex: 1;
+	height: 80rpx;
+	line-height: 80rpx;
+	text-align: center;
+	font-size: 26rpx;
+	border-radius: 40rpx;
+}
 
-	/* 选择器触发按钮样式 */
-	.picker-trigger {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 24rpx 32rpx;
-		background-color: #ffffff;
-		border-radius: 12rpx;
-		margin-bottom: 24rpx;
-	}
+.popup-btn-know {
+	background-color: #FF4767;
+	color: #ffffff;
+}
 
-	.picker-label {
-		font-size: 28rpx;
-		color: #333333;
-	}
-
-	.picker-value {
-		font-size: 28rpx;
-		color: #666666;
-	}
-
-	.picker-arrow {
-		width: 32rpx;
-		height: 32rpx;
-		margin-left: 16rpx;
-	}
-
-	.delete-icon {
-		width: 32rpx;
-		height: 32rpx;
-		margin-left: 24rpx;
-	}
-
-	.form-detail {
-		position: relative;
-	}
-
-	.required::before {
-		content: "*";
-		color: #ff0000;
-		margin-right: 4rpx;
-	}
-
-	.step-inp,
-	.form-input {
-		height: 60rpx;
-	}
-
-	// 服务简介相关
-	.detail-card {
-		background: #ffffff;
-		border-radius: 20rpx;
-		padding: 0 24rpx 8rpx;
-		margin-bottom: 24rpx;
-		box-sizing: border-box;
-		overflow: hidden;
-	}
-
-	.detail-title {
-		padding: 24rpx 0 25rpx;
-	}
-
-	.detail-title .form-label {
-		font-size: 30rpx;
-		font-weight: 500;
-		color: #333;
-		line-height: 40rpx;
-	}
-
-	.detail-row {
-		padding: 0 0 36rpx;
-	}
-
-	.detail-row .form-label {
-		display: block;
-		margin-bottom: 20rpx;
-		line-height: 40rpx;
-	}
-
-	.detail-textarea-wrap {
-		position: relative;
-		background: #f7f7f7;
-		border-radius: 16rpx;
-		padding: 24rpx 24rpx 52rpx;
-		box-sizing: border-box;
-	}
-
-	.detail-textarea {
-		width: 100%;
-		height: 108rpx;
-		min-height: 108rpx;
-		margin: 0;
-		padding: 0;
-		background: transparent;
-		border: 0;
-		font-size: 28rpx;
-		line-height: 40rpx;
-		color: #333333;
-		box-sizing: border-box;
-	}
-
-	.detail-count {
-		position: absolute;
-		right: 24rpx;
-		bottom: 16rpx;
-		font-size: 22rpx;
-		color: #999999;
-		line-height: 32rpx;
-	}
-
-	/* 平台特定样式 */
-	/* #ifdef H5 */
-
-	.form-input,
-	.form-textarea {
-		outline: none;
-	}
-
-	.upload-btn {
-		cursor: pointer;
-	}
-
-	/* #endif */
-
-	/* #ifdef APP-PLUS */
-	.form-input {
-		height: 90rpx;
-	}
-
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 30rpx);
-		opacity: 1;
-		visibility: visible;
-	}
-
-	/* #endif */
-
-	/* #ifdef MP-WEIXIN */
-	.form-input {
-		height: 80rpx;
-	}
-
-	.bottom-buttons {
-		padding-bottom: env(safe-area-inset-bottom);
-	}
-
-	/* #endif */
-	.tip {
-		padding: 20rpx 30rpx;
-		background: #feefec;
-		font-weight: 400;
-		font-size: 30rpx;
-		color: #f31d2f;
-		line-height: 42rpx;
-		text-align: left;
-		font-style: normal;
-
-		text-align: center;
-
-		.tip-icon {
-			width: 34rpx;
-			height: 34rpx;
-			margin-right: 10rpx;
-			transform: translateY(6rpx);
-		}
-	}
-
-	/* 淡入淡出动画 */
-	.fade-enter-active,
-	.fade-leave-active {
-		transition: opacity 0.3s;
-	}
-
-	.fade-enter,
-	.fade-leave-to {
-		opacity: 0;
-	}
-
-	.popup-mask2 {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-		// z-index: 1000;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.popup-content2 {
-		width: 600rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		overflow: hidden;
-		padding: 40rpx 30rpx;
-		box-sizing: border-box;
-	}
-
-	.popup-title {
-		font-size: 36rpx;
-		font-weight: 600;
-		color: #333333;
-		text-align: center;
-		margin-bottom: 20rpx;
-	}
-
-	.popup-message {
-		font-size: 30rpx;
-		color: #666666;
-		text-align: center;
-		margin-top: 40rpx;
-		margin-bottom: 30rpx;
-		line-height: 1.5;
-	}
-
-	.popup-buttons {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-between;
-		padding: 20rpx 0 0 0;
-		gap: 60rpx;
-	}
-
-	.popup-btn {
-		flex: 1;
-		height: 80rpx;
-		line-height: 80rpx;
-		text-align: center;
-		font-size: 26rpx;
-		border-radius: 40rpx;
-	}
-
-	.popup-btn-know {
-		background-color: #FF4767;
-		color: #ffffff;
-	}
-
-	.popup-btn-notshow {
-		background-color: #ffffff;
-		color: #FF4767;
-		border: 1rpx #FF4767 solid;
-	}
+.popup-btn-notshow {
+	background-color: #ffffff;
+	color: #FF4767;
+	border: 1rpx #FF4767 solid;
+}
 </style>
\ No newline at end of file
diff --git a/pages/shop/qualification_sj_change.vue b/pages/shop/qualification_sj_change.vue
index f6b6a1d..f8720a8 100644
--- a/pages/shop/qualification_sj_change.vue
+++ b/pages/shop/qualification_sj_change.vue
@@ -169,16 +169,14 @@
           <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="/static/images/agree_y.png"
+                <image v-if="displayData.legal_idcard_expiry_type === 1" src="/static/images/agree_y.png"
                   class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">长久有效</text>
             </view>
             <view class="radio-item" @click="editable && setIdcardValidType('date')">
               <view class="radio" :class="{ checked: displayData.legal_idcard_expiry_type === 2 }">
-                <image v-if="displayData.legal_idcard_expiry_type === 2"
-                  src="/static/images/agree_y.png"
+                <image v-if="displayData.legal_idcard_expiry_type === 2" src="/static/images/agree_y.png"
                   class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">指定日期有效</text>
@@ -313,8 +311,7 @@
             <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="/static/images/agree_y.png"
+                <image v-if="displayData.uscc_type === item.value" src="/static/images/agree_y.png"
                   class="radio-icon-image" mode="aspectFit"></image>
               </view>
               <text class="radio-label">{{ item.label }}</text>
@@ -2724,23 +2721,40 @@ export default {
 
 .popup-footer {
   margin-top: 32rpx;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 28rpx;
 }
 
 .popup-btn {
+  width: 280rpx;
   height: 88rpx;
   border-radius: 44rpx;
   display: flex;
   align-items: center;
   justify-content: center;
+}
+
+.popup-btn.confirm {
   background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
 }
 
-.popup-btn .btn-text {
+.popup-btn.cancel {
+  border: 2rpx solid #FF4767;
+}
+
+.popup-btn.confirm .btn-text {
   font-size: 32rpx;
   font-weight: 500;
   color: #FFFFFF;
 }
 
+.popup-btn.cancel .btn-text {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #FF4767;
+}
+
 .cancel-text,
 .confirm-text {
   font-size: 32rpx;
diff --git a/pages/shop/staff/addStaff.vue b/pages/shop/staff/addStaff.vue
index baec068..6e97247 100644
--- a/pages/shop/staff/addStaff.vue
+++ b/pages/shop/staff/addStaff.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
-		<custom-navbar title="添加员工" :leftImg="'/static/images/back.png'" :showUser="true"
-			backgroundColor="transparent" titleColor="#000" borderBottom="none">
+		<custom-navbar title="添加员工" :leftImg="'/static/images/back.png'" :showUser="true" backgroundColor="transparent"
+			titleColor="#000" borderBottom="none">
 			<template #right>
 				<view class="navbar-right" @click="goRecord">
 					<image class="navbar-right-img" src="/static/images/icons/record.png"></image>
@@ -9,10 +9,10 @@
 				</view>
 			</template>
 		</custom-navbar>
-		<searchBox placeholder="请输入员工手机号" class="searchBox" v-model="queryData.phone" bgClor="transparent" @confirm="search"
-			@search="search">
+		<searchBox placeholder="请输入员工手机号" class="searchBox" v-model="queryData.phone" bgClor="transparent"
+			@confirm="search" @search="search">
 		</searchBox>
-		<scroll-view scroll-y  :style="{ height:`calc(100vh - ${statusBarHeight + 200}rpx)`} ">
+		<scroll-view scroll-y :style="{ height: `calc(100vh - ${statusBarHeight + 200}rpx)` }">
 			<view class="page-container" v-if="sryDetail && sryDetail.id">
 				<!-- 个人信息栏 -->
 				<view class="user-info">
@@ -27,7 +27,7 @@
 						</view>
 					</view>
 				</view>
-			
+
 				<!-- 服务项目列表 -->
 				<view class="service-list">
 					<!-- 营销中心区域 -->
@@ -36,7 +36,7 @@
 							<view class="mc-line"></view>
 							<text class="mc-title">服务项目</text>
 						</view>
-			
+
 						<view class="select-btn" @click="goServiceList">
 							<text>请选服务项目</text>
 							<image src="/static/images/icons/right_20_40.png" class="select-btn-img" />
@@ -72,417 +72,419 @@
 					<text>，再进行添加操作。</text>
 				</view>
 			</view>
-			
+
 			<view class="" style="height: 200rpx;"></view>
-			<view class="agreement-footer" @click="sjinvitesyr" v-if="sryDetail && sryDetail.id && sryDetail.bind_state!=1">
+			<view class="agreement-footer" @click="sjinvitesyr"
+				v-if="sryDetail && sryDetail.id && sryDetail.bind_state != 1">
 				<view class="agreement-btn">邀请员工</view>
 			</view>
 		</scroll-view>
-		
+
 	</view>
 </template>
 
 <script>
-	import request from "@/utils/request";
-	import searchBox from "./components/search-box.vue";
-	export default {
-		name: "addStaff",
-		components: {
-			searchBox,
+import request from "@/utils/request";
+import searchBox from "./components/search-box.vue";
+export default {
+	name: "addStaff",
+	components: {
+		searchBox,
+	},
+	data() {
+		return {
+			queryData: {
+				phone: "",
+			},
+			statusBarHeight: 0,
+			isSubmit: false,
+			sryDetail: {},
+			serversList: {},
+		};
+	},
+	async onLoad(options) {
+		this.statusBarHeight = this.getRpxStatusBarHeight();
+		let type = 3;
+		let result = await request.post("/sj/user/getuser", {
+			type,
+		});
+		this.userInfo = result.data;
+		this.queryData.sjid = this.userInfo.id;
+		await this.sjservers();
+		if (options.phone) {
+			this.queryData.phone = options.phone
+			this.search()
+		}
+	},
+	computed: {
+		mergeServiceList() {
+			// 1. 提取原始对象的所有子数组
+			let allSubArrays = Object.values(this.$store.state.sjServiceList);
+			// 2. 遍历每个子数组，过滤掉server_time>100的元素，再合并
+			return allSubArrays
+				.map((subArr) => {
+					// 过滤
+					return subArr.filter((item) => {
+						// 只保留is_choice为true的项目
+						return item.is_choice;
+					});
+				})
+				.flat(); // 扁平化合并所有过滤后的子数组
 		},
-		data() {
-			return {
-				queryData: {
-					phone: "",
-				},
-				statusBarHeight:0,
-				isSubmit:false,
-				sryDetail: {},
-				serversList: {},
-			};
-		},
-		async onLoad(options) {
-			this.statusBarHeight = this.getRpxStatusBarHeight();
-			let type = 3;
-			let result = await request.post("/user/getuser", {
-				type,
+	},
+	methods: {
+		goServiceList() {
+			uni.navigateTo({
+				url: "/pages/shop/staff/serviceList",
 			});
-			this.userInfo = result.data;
-			this.queryData.sjid = this.userInfo.id;
-			await this.sjservers();
-			if (options.phone) {
-				this.queryData.phone = options.phone
-				this.search()
-			}
 		},
-		computed: {
-			mergeServiceList() {
-				// 1. 提取原始对象的所有子数组
-				let allSubArrays = Object.values(this.$store.state.sjServiceList);
-				// 2. 遍历每个子数组，过滤掉server_time>100的元素，再合并
-				return allSubArrays
-					.map((subArr) => {
-						// 过滤
-						return subArr.filter((item) => {
-							// 只保留is_choice为true的项目
-							return item.is_choice;
-						});
-					})
-					.flat(); // 扁平化合并所有过滤后的子数组
-			},
+		async search() {
+			await request.post("/sj/searchsyr", this.queryData).then((res) => {
+				if (res.code == 200) {
+					this.$store.commit("setSjServiceList", this.serversList);
+					this.sryDetail = res.data;
+					if (this.sryDetail?.servers_kill_arr) {
+						this.sryDetail.servers_kill_arr_text =
+							this.sryDetail.servers_kill_arr.join("、");
+					}
+				} else {
+					uni.showToast({
+						title: res.msg,
+						duration: 2000,
+						icon: 'none'
+					});
+				}
+			});
 		},
-		methods: {
-			goServiceList() {
-				uni.navigateTo({
-					url: "/pages/shop/staff/serviceList",
-				});
-			},
-			async search() {
-				await request.post("/sj/searchsyr", this.queryData).then((res) => {
+		async sjservers() {
+			await request
+				.post("/sj/sjservers", {
+					sjid: this.queryData.sjid
+				})
+				.then((res) => {
 					if (res.code == 200) {
-						this.$store.commit("setSjServiceList", this.serversList);
-						this.sryDetail = res.data;
-						if (this.sryDetail?.servers_kill_arr) {
-							this.sryDetail.servers_kill_arr_text =
-								this.sryDetail.servers_kill_arr.join("、");
-						}
-					}else{
-						uni.showToast({
-							title: res.msg,
-							duration: 2000,
-							icon: 'none'
-						});
+						//将数据存在vuex里作为依据
+						this.serversList = res.data;
+						this.$store.commit("setSjServiceList", res.data);
 					}
 				});
-			},
-			async sjservers() {
-				await request
-					.post("/sj/sjservers", {
-						sjid: this.queryData.sjid
-					})
-					.then((res) => {
-						if (res.code == 200) {
-							//将数据存在vuex里作为依据
-							this.serversList = res.data;
-							this.$store.commit("setSjServiceList", res.data);
+		},
+		sjinvitesyr() {
+			let form = {
+				sj_id: this.queryData.sjid,
+				syr_id: this.sryDetail.id,
+				service_data: this.mergeServiceList.map(item => item.id),
+			}
+			if (this.isSubmit) {
+				return
+			}
+			this.isSubmit = true
+			request.post("/sj/sjinvitesyr", form).then((res) => {
+				if (res.code == 200) {
+					uni.showModal({
+						title: '成功',
+						content: '邀请成功，等待员工同意。',
+						showCancel: false,
+						success: () => {
+							uni.navigateTo({
+								url: `/pages/shop/staff/record`,
+							});
 						}
 					});
-			},
-			sjinvitesyr() {
-				let form = {
-					sj_id: this.queryData.sjid,
-					syr_id: this.sryDetail.id,
-					service_data: this.mergeServiceList.map(item => item.id),
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: "none",
+					});
 				}
-				if(this.isSubmit){
-					return
-				}
-				this.isSubmit = true
-				request.post("/sj/sjinvitesyr", form).then((res) => {
-					if (res.code == 200) {
-						uni.showModal({
-							title: '成功',
-							content: '邀请成功，等待员工同意。',
-							showCancel: false,
-							success: () => {
-								uni.navigateTo({
-									url: `/pages/shop/staff/record`,
-								});
-							}
-						});
-					}else{
-						uni.showToast({
-							title: res.msg,
-							icon: "none",
-						});
-					}
-				}).finally(()=>{
-					this.isSubmit = false
-				});
-			},
-			goDetail() {
-				uni.navigateTo({
-					url: `/pages/shop/staff/staffDetail?syrid=${this.sryDetail.id}`,
-				});
-			},
-			goRecord() {
-				uni.navigateTo({
-					url: "/pages/shop/staff/record",
-				});
-			},
+			}).finally(() => {
+				this.isSubmit = false
+			});
 		},
-	};
+		goDetail() {
+			uni.navigateTo({
+				url: `/pages/shop/staff/staffDetail?syrid=${this.sryDetail.id}`,
+			});
+		},
+		goRecord() {
+			uni.navigateTo({
+				url: "/pages/shop/staff/record",
+			});
+		},
+	},
+};
 </script>
 
 <style lang="less">
-	.container {
-		position: relative;
-		background-image: url("/static/images/background/bj2.png");
-		background-size: 100% auto;
-		background-position: center top;
-		background-repeat: no-repeat;
+.container {
+	position: relative;
+	background-image: url("/static/images/background/bj2.png");
+	background-size: 100% auto;
+	background-position: center top;
+	background-repeat: no-repeat;
 
-		.container-tip {
-			width: 710rpx;
-			height: 311rpx;
-			background: #ffffff;
-			border-radius: 20rpx;
-			margin: 0 auto;
+	.container-tip {
+		width: 710rpx;
+		height: 311rpx;
+		background: #ffffff;
+		border-radius: 20rpx;
+		margin: 0 auto;
 
-			.tip-title {
+		.tip-title {
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #333333;
+			line-height: 40rpx;
+			text-align: left;
+			font-style: normal;
+			padding-top: 46rpx;
+			margin-left: 6rpx;
+
+			.tip-icon {
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 8rpx;
+			}
+		}
+
+		.tip-text {
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #333333;
+			line-height: 40rpx;
+			text-align: left;
+			font-style: normal;
+			padding: 18rpx 24rpx 0 20rpx;
+		}
+	}
+}
+
+.page-container {
+	padding: 0rpx 20rpx 0 20rpx;
+
+	// 个人信息样式
+	.user-info {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+		background-color: #fff;
+		padding: 20rpx;
+		border-radius: 8px;
+
+		.avatar {
+			width: 56px;
+			height: 56px;
+			border-radius: 50%;
+			margin-right: 10px;
+		}
+
+		.user-detail {
+			flex: 1;
+
+			.user-name {
 				font-weight: 500;
-				font-size: 28rpx;
+				font-size: 36rpx;
 				color: #333333;
-				line-height: 40rpx;
+				line-height: 50rpx;
 				text-align: left;
 				font-style: normal;
-				padding-top: 46rpx;
-				margin-left: 6rpx;
-
-				.tip-icon {
-					width: 32rpx;
-					height: 32rpx;
-					margin-right: 8rpx;
-				}
 			}
 
-			.tip-text {
+			.enter-btn {
+				padding: 0 20rpx;
+				height: 50rpx;
+				border-radius: 25rpx;
+				border: 1rpx solid rgba(232, 16, 30, 0.28);
 				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-				line-height: 40rpx;
+				font-size: 24rpx;
+				color: #FF4767;
+				text-align: right;
+				font-style: normal;
+			}
+
+			.tags {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				line-height: 33rpx;
 				text-align: left;
 				font-style: normal;
-				padding: 18rpx 24rpx 0 20rpx;
+				margin-top: 18rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				max-width: 500rpx;
 			}
 		}
 	}
 
-	.page-container {
-		padding: 0rpx 20rpx 0 20rpx;
+	// 服务列表样式
+	.service-list {
+		background-color: #fff;
+		border-radius: 20rpx;
+		padding: 30rpx 20rpx;
+		margin-bottom: 20rpx;
 
-		// 个人信息样式
-		.user-info {
+		// 营销中心样式
+		.marketing-center {
 			display: flex;
+			justify-content: space-between;
 			align-items: center;
-			margin-bottom: 20rpx;
-			background-color: #fff;
-			padding: 20rpx;
-			border-radius: 8px;
+			margin-bottom: 30rpx;
 
-			.avatar {
-				width: 56px;
-				height: 56px;
-				border-radius: 50%;
-				margin-right: 10px;
+			.mc-line {
+				width: 6rpx;
+				height: 22rpx;
+				background: #FF4767;
+				border-radius: 4rpx;
+				margin-right: 10rpx;
 			}
 
-			.user-detail {
+			.mc-title {
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.select-btn {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #666666;
+				line-height: 32rpx;
+				text-align: right;
+				font-style: normal;
+
+				.select-btn-img {
+					width: 9rpx;
+					height: 18rpx;
+					margin-left: 8rpx;
+				}
+			}
+		}
+
+		// 服务项目标题
+		.service-title {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #5b5b5b;
+			line-height: 37rpx;
+			text-align: left;
+			font-style: normal;
+			padding-bottom: 10rpx;
+			border-bottom: 1rpx solid #f1f1f1;
+			margin-bottom: 30rpx;
+		}
+
+		.service-item {
+			display: flex;
+			align-items: center;
+			margin-top: 30rpx;
+
+			.item-index {
+				font-weight: 500;
+				font-size: 18rpx;
+				color: #FF4767;
+				text-align: left;
+				font-style: normal;
+				width: 30rpx;
+				height: 30rpx;
+				background: #fdf0eb;
+				border-radius: 50%;
+				margin-right: 8px;
+			}
+
+			.item-info {
 				flex: 1;
 
-				.user-name {
-					font-weight: 500;
-					font-size: 36rpx;
+				.item-name {
+					font-weight: 400;
+					font-size: 26rpx;
 					color: #333333;
-					line-height: 50rpx;
+					line-height: 37rpx;
 					text-align: left;
 					font-style: normal;
-				}
-
-				.enter-btn {
-					padding: 0 20rpx;
-					height: 50rpx;
-					border-radius: 25rpx;
-					border: 1rpx solid rgba(232, 16, 30, 0.28);
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #FF4767;
-					text-align: right;
-					font-style: normal;
-				}
-
-				.tags {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #999999;
-					line-height: 33rpx;
-					text-align: left;
-					font-style: normal;
-					margin-top: 18rpx;
 					overflow: hidden;
 					white-space: nowrap;
 					text-overflow: ellipsis;
 					max-width: 500rpx;
 				}
 			}
-		}
 
-		// 服务列表样式
-		.service-list {
-			background-color: #fff;
-			border-radius: 20rpx;
-			padding: 30rpx 20rpx;
-			margin-bottom: 20rpx;
-
-			// 营销中心样式
-			.marketing-center {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-bottom: 30rpx;
-
-				.mc-line {
-					width: 6rpx;
-					height: 22rpx;
-					background: #FF4767;
-					border-radius: 4rpx;
-					margin-right: 10rpx;
-				}
-
-				.mc-title {
-					font-weight: 500;
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 42rpx;
-					text-align: left;
-					font-style: normal;
-				}
-
-				.select-btn {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #666666;
-					line-height: 32rpx;
-					text-align: right;
-					font-style: normal;
-
-					.select-btn-img {
-						width: 9rpx;
-						height: 18rpx;
-						margin-left: 8rpx;
-					}
-				}
-			}
-
-			// 服务项目标题
-			.service-title {
+			.item-duration {
 				font-weight: 400;
 				font-size: 26rpx;
-				color: #5b5b5b;
+				color: #8a8a8a;
 				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
-				padding-bottom: 10rpx;
-				border-bottom: 1rpx solid #f1f1f1;
-				margin-bottom: 30rpx;
-			}
-
-			.service-item {
-				display: flex;
-				align-items: center;
-				margin-top: 30rpx;
-
-				.item-index {
-					font-weight: 500;
-					font-size: 18rpx;
-					color: #FF4767;
-					text-align: left;
-					font-style: normal;
-					width: 30rpx;
-					height: 30rpx;
-					background: #fdf0eb;
-					border-radius: 50%;
-					margin-right: 8px;
-				}
-
-				.item-info {
-					flex: 1;
-
-					.item-name {
-						font-weight: 400;
-						font-size: 26rpx;
-						color: #333333;
-						line-height: 37rpx;
-						text-align: left;
-						font-style: normal;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						max-width: 500rpx;
-					}
-				}
-
-				.item-duration {
-					font-weight: 400;
-					font-size: 26rpx;
-					color: #8a8a8a;
-					line-height: 37rpx;
-					text-align: left;
-					font-style: normal;
-				}
 			}
 		}
 	}
+}
 
-	.agreement-footer {
-		padding: 20rpx 20rpx 50rpx 20rpx;
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: #ffffff;
-		.agreement-btn {
-			width: 710rpx;
-			height: 98rpx;
-			background: #FF4767;
-			border-radius: 49rpx;
-			font-weight: 400;
-			font-size: 38rpx;
-			color: #ffffff;
-			line-height: 53rpx;
-			text-align: left;
-			font-style: normal;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-	}
+.agreement-footer {
+	padding: 20rpx 20rpx 50rpx 20rpx;
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: #ffffff;
 
-	::v-deep .right-area {
-		width: 120rpx !important;
-		height: auto !important;
+	.agreement-btn {
+		width: 710rpx;
+		height: 98rpx;
+		background: #FF4767;
+		border-radius: 49rpx;
+		font-weight: 400;
+		font-size: 38rpx;
+		color: #ffffff;
+		line-height: 53rpx;
+		text-align: left;
+		font-style: normal;
 		display: flex;
-		justify-content: flex-end;
+		align-items: center;
+		justify-content: center;
+	}
+}
+
+::v-deep .right-area {
+	width: 120rpx !important;
+	height: auto !important;
+	display: flex;
+	justify-content: flex-end;
+}
+
+.navbar-right {
+	display: flex;
+	flex-wrap: wrap;
+	flex-direction: column;
+	align-content: center;
+
+	.navbar-right-img {
+		width: 32rpx;
+		height: 32rpx;
+		margin: 0 auto 4rpx auto;
 	}
 
-	.navbar-right {
-		display: flex;
-		flex-wrap: wrap;
-		flex-direction: column;
-		align-content: center;
+	.navbar-right-text {
+		font-weight: 400;
+		font-size: 16rpx;
+		color: #333333;
+		line-height: 22rpx;
+		text-align: left;
+		font-style: normal;
+		white-space: nowrap;
+	}
+}
 
-		.navbar-right-img {
-			width: 32rpx;
-			height: 32rpx;
-			margin: 0 auto 4rpx auto;
-		}
+.searchBox {
+	padding: 18rpx 30rpx 30rpx 30rpx;
+}
 
-		.navbar-right-text {
-			font-weight: 400;
-			font-size: 16rpx;
-			color: #333333;
-			line-height: 22rpx;
-			text-align: left;
-			font-style: normal;
-			white-space: nowrap;
-		}
-	}
-	
-	.searchBox{
-		padding: 18rpx 30rpx 30rpx 30rpx;
-	}
-	
-	::v-deep .navbar-content .title{
-		margin-left: 20rpx!important;
-	}
+::v-deep .navbar-content .title {
+	margin-left: 20rpx !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages/shop/staff/distribution-service.vue b/pages/shop/staff/distribution-service.vue
index 706b209..4e56cf1 100644
--- a/pages/shop/staff/distribution-service.vue
+++ b/pages/shop/staff/distribution-service.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="container">
 		<custom-navbar title="给员工分配服务" :leftImg="'/static/images/whiteBack.png'" :showUser="true"
-			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff" borderBottom="none"></custom-navbar>
+			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)" titleColor="#fff"
+			borderBottom="none"></custom-navbar>
 		<searchBox placeholder="服务名称" v-model="queryData.title" :showAdd="false" @confirm="search" @search="search">
 		</searchBox>
 		<view class="container-tip flex-row-center">
@@ -22,8 +23,8 @@
 								</view>
 								<view class="flex-row-center">
 									<text class="item-left-text2" style="color: #FF4767">¥</text>
-									<text class="item-left-text2"
-										style="color: #FF4767; font-size: 28rpx">{{ item.server_price }}</text>
+									<text class="item-left-text2" style="color: #FF4767; font-size: 28rpx">{{
+										item.server_price }}</text>
 								</view>
 							</view>
 						</view>
@@ -43,156 +44,156 @@
 </template>
 
 <script>
-	import request from "@/utils/request";
-	import searchBox from "./components/search-box.vue";
-	import CommonList from "@/components/common/CommonList.vue";
-	export default {
-		components: {
-			searchBox,
-			CommonList,
+import request from "@/utils/request";
+import searchBox from "./components/search-box.vue";
+import CommonList from "@/components/common/CommonList.vue";
+export default {
+	components: {
+		searchBox,
+		CommonList,
+	},
+	data() {
+		return {
+			userInfo: {},
+			queryData: {
+				title: "",
+			},
+			statusBarHeight: 0,
+		};
+	},
+	async onLoad(options) {
+		let type = 3;
+		let result = await request.post("/sj/user/getuser", {
+			type,
+		});
+		this.userInfo = result.data;
+		this.queryData.sjid = this.userInfo.id;
+		this.statusBarHeight = this.getRpxStatusBarHeight();
+		this.$nextTick(() => {
+			this.search();
+		});
+	},
+	methods: {
+		search() {
+			this.$refs.groupRef.manualRefresh(this.queryData);
 		},
-		data() {
-			return {
-				userInfo: {},
-				queryData: {
-					title: "",
-				},
-				statusBarHeight: 0,
-			};
-		},
-		async onLoad(options) {
-			let type = 3;
-			let result = await request.post("/user/getuser", {
-				type,
-			});
-			this.userInfo = result.data;
-			this.queryData.sjid = this.userInfo.id;
-			this.statusBarHeight = this.getRpxStatusBarHeight();
-			this.$nextTick(() => {
-				this.search();
+		goSlectSyr(item) {
+			uni.navigateTo({
+				url: `/pages/shop/staff/selectSyr?server_id=${item.id}`,
 			});
 		},
-		methods: {
-			search() {
-				this.$refs.groupRef.manualRefresh(this.queryData);
-			},
-			goSlectSyr(item) {
-				uni.navigateTo({
-					url: `/pages/shop/staff/selectSyr?server_id=${item.id}`,
-				});
-			},
-		},
-	};
+	},
+};
 </script>
 
 <style lang="less">
-	.container {
-		.container-tip {
-			width: 750rpx;
-			padding: 27rpx 16rpx 22rpx 32rpx;
-			background: #fae7ec;
+.container {
+	.container-tip {
+		width: 750rpx;
+		padding: 27rpx 16rpx 22rpx 32rpx;
+		background: #fae7ec;
 
-			.container-tip-text {
-				font-weight: 400;
-				font-size: 26rpx;
+		.container-tip-text {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #FF4767;
+			line-height: 37rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.tip-icon {
+			width: 46rpx;
+			height: 46rpx;
+			margin-right: 8rpx;
+		}
+	}
+
+	.service-list {
+		// background-color: #fff;
+		// margin: 20rpx 20rpx 26rpx 20rpx;
+		// border-radius: 10rpx;
+
+		.service-item {
+			//   padding-top: 20rpx;
+			//   margin: 0rpx 20rpx 30rpx 20rpx;
+			//   padding-bottom: 30rpx;
+			//   border-bottom: 1rpx solid #f1f1f1;
+			padding: 30rpx 20rpx;
+			margin: 20rpx;
+
+			background: #FFFFFF;
+			border-radius: 10rpx;
+
+			.item-left {
+				.item-left-photo {
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 20rpx;
+					background: #000;
+				}
+
+				.item-left-texts {
+					margin-left: 20rpx;
+
+					.item-left-text1 {
+						font-weight: 500;
+						font-size: 30rpx;
+						color: #333333;
+						line-height: 34rpx;
+						text-align: left;
+						font-style: normal;
+						margin-bottom: 27rpx;
+						margin-top: 6rpx;
+						max-width: 400rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.item-left-text2 {
+						font-weight: 400;
+						font-size: 26rpx;
+						color: #666666;
+						line-height: 34rpx;
+						text-align: left;
+						font-style: normal;
+					}
+
+					.item-left-line {
+						margin: 0 10rpx;
+						width: 2rpx;
+						height: 20rpx;
+						background: #666666;
+					}
+				}
+			}
+
+			.item-right {
+				width: 124rpx;
+				height: 53rpx;
+				border-radius: 27rpx;
+				border: 1rpx solid rgba(232, 16, 30, 0.5);
+				font-size: 24rpx;
 				color: #FF4767;
-				line-height: 37rpx;
 				text-align: left;
 				font-style: normal;
 			}
-
-			.tip-icon {
-				width: 46rpx;
-				height: 46rpx;
-				margin-right: 8rpx;
-			}
-		}
-
-		.service-list {
-			// background-color: #fff;
-			// margin: 20rpx 20rpx 26rpx 20rpx;
-			// border-radius: 10rpx;
-
-			.service-item {
-				//   padding-top: 20rpx;
-				//   margin: 0rpx 20rpx 30rpx 20rpx;
-				//   padding-bottom: 30rpx;
-				//   border-bottom: 1rpx solid #f1f1f1;
-				padding: 30rpx 20rpx;
-				margin: 20rpx;
-
-				background: #FFFFFF;
-				border-radius: 10rpx;
-
-				.item-left {
-					.item-left-photo {
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 20rpx;
-						background: #000;
-					}
-
-					.item-left-texts {
-						margin-left: 20rpx;
-
-						.item-left-text1 {
-							font-weight: 500;
-							font-size: 30rpx;
-							color: #333333;
-							line-height: 34rpx;
-							text-align: left;
-							font-style: normal;
-							margin-bottom: 27rpx;
-							margin-top: 6rpx;
-							max-width: 400rpx;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							white-space: nowrap;
-						}
-
-						.item-left-text2 {
-							font-weight: 400;
-							font-size: 26rpx;
-							color: #666666;
-							line-height: 34rpx;
-							text-align: left;
-							font-style: normal;
-						}
-
-						.item-left-line {
-							margin: 0 10rpx;
-							width: 2rpx;
-							height: 20rpx;
-							background: #666666;
-						}
-					}
-				}
-
-				.item-right {
-					width: 124rpx;
-					height: 53rpx;
-					border-radius: 27rpx;
-					border: 1rpx solid rgba(232, 16, 30, 0.5);
-					font-size: 24rpx;
-					color: #FF4767;
-					text-align: left;
-					font-style: normal;
-				}
-			}
 		}
 	}
+}
 
-	.common-list {
-		background: #f5f5f5 !important;
-		border-radius: 30rpx !important;
-		padding-bottom: 0 !important;
-	}
+.common-list {
+	background: #f5f5f5 !important;
+	border-radius: 30rpx !important;
+	padding-bottom: 0 !important;
+}
 
-	::v-deep .list-container {
-		padding: 0 !important;
-	}
+::v-deep .list-container {
+	padding: 0 !important;
+}
 
-	::v-deep .list-scroll {
-		margin-top: 0 !important;
-	}
+::v-deep .list-scroll {
+	margin-top: 0 !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages/shop/staff/manage.vue b/pages/shop/staff/manage.vue
index aad5e6e..419eab0 100644
--- a/pages/shop/staff/manage.vue
+++ b/pages/shop/staff/manage.vue
@@ -4,8 +4,8 @@
 			backgroundColor="linear-gradient( 134deg, #F52540 0%, #FF4767 100%)"
 			headleSrc="/static/images/recruit/guide.png" :showHeadle="false" titleColor="#fff" borderBottom="none"
 			@onHeadleClick="openPop"></custom-navbar>
-		<searchBox placeholder="手艺人名字/手机号" v-model="queryData.nameorphone" :showAdd="true" @confirm="search" @search="search"
-			@add="goAddStaff">
+		<searchBox placeholder="手艺人名字/手机号" v-model="queryData.nameorphone" :showAdd="true" @confirm="search"
+			@search="search" @add="goAddStaff">
 		</searchBox>
 
 		<!-- Tab 内容区域 -->
@@ -20,20 +20,22 @@
 			:listScrollHeight="`calc(100vh - ${statusBarHeight + 350}rpx)`">
 			<template #listData="{ list }">
 				<view class="scoll-lists">
-					<view class="list-item" v-for="(item, index) in list" :key="index" @click="goDetail(item)" v-if="item.syr">
+					<view class="list-item" v-for="(item, index) in list" :key="index" @click="goDetail(item)"
+						v-if="item.syr">
 						<view class="item-left">
 							<image :src="item.syr.head_photo" class="item-left-img" mode="aspectFill"></image>
-							<view class="item-left-tab flex-row-center-center" :class="{noTab:item.state==2}">{{ typName(item.state) }}</view>
+							<view class="item-left-tab flex-row-center-center" :class="{ noTab: item.state == 2 }">{{
+								typName(item.state) }}</view>
 						</view>
 						<view class="item-right">
 							<view class="item-right-text1 flex-row-center-between">
 								<text>{{ item.syr.name }}</text>
 
 								<view class="switch-box" @click.stop="handleSwitchChange(item)"
-									:class="{ disswitch: item.sj_state!=1 }" v-if="item.state==1">
-									<text class="switch-text" v-if="item.sj_state==1">接单</text>
+									:class="{ disswitch: item.sj_state != 1 }" v-if="item.state == 1">
+									<text class="switch-text" v-if="item.sj_state == 1">接单</text>
 									<view class="switch-yuan"></view>
-									<text class="switch-text" v-if="item.sj_state!=1">不接单</text>
+									<text class="switch-text" v-if="item.sj_state != 1">不接单</text>
 								</view>
 							</view>
 							<view class="item-right-text2">绑定时间: {{ item.bind_time }}</view>
@@ -75,428 +77,430 @@
 </template>
 
 <script>
-	import request from "@/utils/request";
-	import searchBox from "./components/search-box.vue";
-	import CommonList from "@/components/common/CommonList.vue";
-	export default {
-		components: {
-			searchBox,
-			CommonList,
-		},
-		data() {
-			return {
-				isSubmit:false,//调接口防止重复点击参数
-				queryData: {
-					nameorphone: "",
-					sjid: null,
-					state: "", // 1绑定 2解绑
+import request from "@/utils/request";
+import searchBox from "./components/search-box.vue";
+import CommonList from "@/components/common/CommonList.vue";
+export default {
+	components: {
+		searchBox,
+		CommonList,
+	},
+	data() {
+		return {
+			isSubmit: false,//调接口防止重复点击参数
+			queryData: {
+				nameorphone: "",
+				sjid: null,
+				state: "", // 1绑定 2解绑
+			},
+			userInfo: {},
+			artisanType: getApp().globalData.artisanType,
+			info: {
+				1: {
+					list: "/syr/serversSelf/list",
+					name: "手艺人",
+					switch: "/syr/serversSelf/switch",
 				},
-				userInfo: {},
-				artisanType: getApp().globalData.artisanType,
-				info: {
-					1: {
-						list: "/syr/serversSelf/list",
-						name: "手艺人",
-						switch: "/syr/serversSelf/switch",
-					},
-					2: {
-						list: "/sj/serversSelf/list",
-						name: "商家",
-						switch: "/sj/serversSelf/switch",
-					},
+				2: {
+					list: "/sj/serversSelf/list",
+					name: "商家",
+					switch: "/sj/serversSelf/switch",
 				},
-				statusBarHeight: 0,
-				// Tab 数据源，通过修改这个数组可以动态增删 Tab
-				tabs: [{
-						id: "",
-						name: "全部",
-					},
-					{
-						id: 1,
-						name: "服务中",
-					},
-					{
-						id: 2,
-						name: "已解约",
-					},
-				],
-			};
-		},
-		computed: {
+			},
+			statusBarHeight: 0,
+			// Tab 数据源，通过修改这个数组可以动态增删 Tab
+			tabs: [{
+				id: "",
+				name: "全部",
+			},
+			{
+				id: 1,
+				name: "服务中",
+			},
+			{
+				id: 2,
+				name: "已解约",
+			},
+			],
+		};
+	},
+	computed: {
 
-		},
-		async onLoad(options) {
-			let type = 3;
-			let result = await request.post("/user/getuser", {
-				type,
-			});
-			this.userInfo = result.data;
-			this.queryData.sjid = this.userInfo.id
-			this.statusBarHeight = this.getRpxStatusBarHeight();
+	},
+	async onLoad(options) {
+		let type = 3;
+		let result = await request.post("/sj/user/getuser", {
+			type,
+		});
+		this.userInfo = result.data;
+		this.queryData.sjid = this.userInfo.id
+		this.statusBarHeight = this.getRpxStatusBarHeight();
+		this.$nextTick(() => {
+			this.search();
+		});
+	},
+	onShow() {
+		if (this.queryData.sjid) {
 			this.$nextTick(() => {
 				this.search();
 			});
-		},
-		onShow() {
-			if(this.queryData.sjid){
-				this.$nextTick(() => {
-					this.search();
+		}
+	},
+	methods: {
+		goDetail(item) {
+			uni.$uv.throttle(() => {
+				uni.navigateTo({
+					url: `/pages/shop/staff/detail?syrid=${item.syr?.id}`,
 				});
-			}
+			}, 500)
+
 		},
-		methods: {
-			goDetail(item){
-				uni.$uv.throttle(()=>{
-					uni.navigateTo({
-						url: `/pages/shop/staff/detail?syrid=${item.syr?.id}`,
-					});
-				}, 500)
-				
-			},
-			handleSwitchChange(item) {
-				let obj = {
-					sjid:this.userInfo.id,
-					syrid: item.syr_id
-				}
-				request.post("/sj/isaccept", obj).then((res) => {
-					if(res.code==200){
-						item.sj_state ===1?item.sj_state=2:item.sj_state=1;
-					}else{
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch((error)=>{
+		handleSwitchChange(item) {
+			let obj = {
+				sjid: this.userInfo.id,
+				syrid: item.syr_id
+			}
+			request.post("/sj/isaccept", obj).then((res) => {
+				if (res.code == 200) {
+					item.sj_state === 1 ? item.sj_state = 2 : item.sj_state = 1;
+				} else {
 					uni.showToast({
-						title: '网络异常，请稍后重试',
+						title: res.msg,
 						icon: 'none',
 						duration: 2000
 					});
+				}
+			}).catch((error) => {
+				uni.showToast({
+					title: '网络异常，请稍后重试',
+					icon: 'none',
+					duration: 2000
 				});
-			},
-			typName(type) {
-				const textList = {
-					1: "服务中",
-					2: "已解约"
-				};
-				return textList[type];
-			},
-			handleService(item) {
-				uni.showModal({
-					title: "提示",
-					content: `确定要${item.us_state == 1 ? "下架" : "上架"}该服务吗？`,
-					success: (res) => {
-						if (res.confirm) {
-							request
-								.post(this.info[this.artisanType].switch, {
-									id: item.id,
-									us_state: item.us_state == 1 ? 2 : 1,
-								})
-								.then((res) => {
-									if (res.code == 200) {
-										uni.showToast({
-											title: "下架成功",
-											icon: "none",
-										});
-										this.search(); // 刷新列表
-									} else {
-										uni.showToast({
-											title: res.msg,
-											icon: "none",
-										});
-									}
-								});
-						}
-					},
-				});
-			},
-			goAddStaff() {
-				uni.navigateTo({
-					url: `/pages/shop/staff/addStaff`,
-				});
-			},
-			search() {
-				this.$refs.groupRef.manualRefresh(this.queryData);
-			},
-			// 切换 Tab 的方法
-			switchTab(tabId) {
-				this.queryData.state = tabId;
-				this.search();
-			},
-			openPop() {
-				this.$refs.popup.open("center");
-			},
-			closePop() {
-				this.$refs.popup.close();
-			},
+			});
 		},
-	};
+		typName(type) {
+			const textList = {
+				1: "服务中",
+				2: "已解约"
+			};
+			return textList[type];
+		},
+		handleService(item) {
+			uni.showModal({
+				title: "提示",
+				content: `确定要${item.us_state == 1 ? "下架" : "上架"}该服务吗？`,
+				success: (res) => {
+					if (res.confirm) {
+						request
+							.post(this.info[this.artisanType].switch, {
+								id: item.id,
+								us_state: item.us_state == 1 ? 2 : 1,
+							})
+							.then((res) => {
+								if (res.code == 200) {
+									uni.showToast({
+										title: "下架成功",
+										icon: "none",
+									});
+									this.search(); // 刷新列表
+								} else {
+									uni.showToast({
+										title: res.msg,
+										icon: "none",
+									});
+								}
+							});
+					}
+				},
+			});
+		},
+		goAddStaff() {
+			uni.navigateTo({
+				url: `/pages/shop/staff/addStaff`,
+			});
+		},
+		search() {
+			this.$refs.groupRef.manualRefresh(this.queryData);
+		},
+		// 切换 Tab 的方法
+		switchTab(tabId) {
+			this.queryData.state = tabId;
+			this.search();
+		},
+		openPop() {
+			this.$refs.popup.open("center");
+		},
+		closePop() {
+			this.$refs.popup.close();
+		},
+	},
+};
 </script>
 
 <style lang="less">
-	page {
-		background: linear-gradient(to bottom, #ffffff, #f5f5f5) !important;
-	}
+page {
+	background: linear-gradient(to bottom, #ffffff, #f5f5f5) !important;
+}
 
-	.container {
-		.tab-nav {
-			display: flex;
-			justify-content: space-between;
-			padding: 0 91rpx;
-			background: #fff;
+.container {
+	.tab-nav {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 91rpx;
+		background: #fff;
 
-			.tab-item {
-				padding: 30rpx 0rpx 30rpx 0rpx;
-				cursor: pointer;
-				font-weight: 500;
-				font-size: 32rpx;
-				color: #333333;
-				line-height: 45rpx;
-				text-align: left;
-				font-style: normal;
-				/* 预先设置透明边框，防止切换时布局跳动 */
-
-				&.active {
-					color: #FF4767;
-					font-weight: 500;
-					position: relative;
-
-					&:after {
-						content: "";
-						position: absolute;
-						bottom: 17rpx; // 定位在底部边框的下方
-						left: 50%;
-						transform: translateX(-50%); // 水平居中
-
-						/* 激活时显示红色边框 */
-						width: 34rpx;
-						height: 6rpx;
-						background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
-						border-radius: 3rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.pop-content {
-		width: 620rpx;
-		background-image: url("/static/images/background/selfOperatedTip.png");
-		background-position: top;
-		background-repeat: no-repeat;
-		background-size: cover;
-		border-radius: 20rpx;
-
-		.pop-content-title {
-			padding-top: 193rpx;
-			padding-bottom: 40rpx;
-			text-align: center;
+		.tab-item {
+			padding: 30rpx 0rpx 30rpx 0rpx;
+			cursor: pointer;
 			font-weight: 500;
-			font-size: 36rpx;
+			font-size: 32rpx;
 			color: #333333;
-			line-height: 50rpx;
-			font-style: normal;
-			display: block;
-		}
-
-		.pop-content-text {
-			padding: 0 40rpx;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #333333;
-			line-height: 40rpx;
+			line-height: 45rpx;
 			text-align: left;
 			font-style: normal;
-			display: block;
-		}
+			/* 预先设置透明边框，防止切换时布局跳动 */
 
-		.pop-content-btns {
-			display: flex;
-			padding: 0 54rpx;
-			justify-content: space-between;
-			margin-top: 80rpx;
-			padding-bottom: 51rpx;
-
-			.pop-content-close {
-				width: 246rpx;
-				height: 80rpx;
-				border-radius: 40rpx;
-				border: 2rpx solid #FF4767;
-				font-weight: 500;
-				font-size: 28rpx;
+			&.active {
 				color: #FF4767;
-				text-align: left;
-				font-style: normal;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.pop-content-sure {
-				width: 246rpx;
-				height: 80rpx;
-				background: #FF4767;
-				border-radius: 40rpx;
 				font-weight: 500;
-				font-size: 28rpx;
-				color: #ffffff;
-				text-align: left;
-				font-style: normal;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-		}
-	}
-
-	.scoll-lists {
-		padding: 0 20rpx;
-		margin-top: 20rpx;
-
-		.list-item {
-			box-sizing: border-box;
-			padding: 20rpx;
-			height: 200rpx;
-			background: #ffffff;
-			border-radius: 20rpx;
-			margin-bottom: 20rpx;
-			position: relative;
-
-			.item-left {
 				position: relative;
 
-				.item-left-img {
-					width: 131rpx;
-					height: 131rpx;
-					border-radius: 50%;
-				}
-
-				.item-left-tab {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #FFFFFF;
-					text-align: left;
-					font-style: normal;
-					width: 124rpx;
-					height: 34rpx;
-					background: #FF4767;
-					border-radius: 18rpx;
+				&:after {
+					content: "";
 					position: absolute;
-					bottom: 0;
-					left: 4rpx;
-				}
-				.noTab{
-					background: #C1C1C1;
-				}
-			}
+					bottom: 17rpx; // 定位在底部边框的下方
+					left: 50%;
+					transform: translateX(-50%); // 水平居中
 
-			.item-right {
-				margin-left: 20rpx;
-				flex: 1;
-
-				.item-right-text1 {
-					font-weight: 500;
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 42rpx;
-					text-align: left;
-					font-style: normal;
-				}
-
-				.item-right-text2 {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #999999;
-					line-height: 33rpx;
-					text-align: left;
-					font-style: normal;
-					margin-bottom: 20rpx;
-				}
-
-				.item-right-text3 {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #333333;
-					line-height: 33rpx;
-					text-align: left;
-					font-style: normal;
-					.item-right-text3-icon{
-						width: 8rpx;
-						height: 16rpx;
-						margin-left: 6rpx;
-					}
+					/* 激活时显示红色边框 */
+					width: 34rpx;
+					height: 6rpx;
+					background: linear-gradient(306deg, #FF4767 0%, #fc563b 100%);
+					border-radius: 3rpx;
 				}
 			}
 		}
 	}
+}
 
-	::v-deep .right-area {
-		width: 31rpx !important;
-		height: 31rpx !important;
+.pop-content {
+	width: 620rpx;
+	background-image: url("/static/images/background/selfOperatedTip.png");
+	background-position: top;
+	background-repeat: no-repeat;
+	background-size: cover;
+	border-radius: 20rpx;
+
+	.pop-content-title {
+		padding-top: 193rpx;
+		padding-bottom: 40rpx;
+		text-align: center;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #333333;
+		line-height: 50rpx;
+		font-style: normal;
+		display: block;
 	}
 
-	::v-deep .icon-headle {
-		width: 31rpx !important;
-		height: 31rpx !important;
+	.pop-content-text {
+		padding: 0 40rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+		display: block;
 	}
 
-	.common-list {
-		background: #f5f5f5 !important;
-		border-radius: 30rpx !important;
-	}
-
-	::v-deep .list-container {
-		padding: 0 !important;
-	}
-
-	::v-deep .list-scroll {
-		margin-top: 0 !important;
-	}
-
-	.switch-box {
-		/* width: 126rpx; */
-		height: 52rpx;
-		line-height: 52rpx;
-		border-radius: 26rpx;
-		background-color: #FFD4D8;
+	.pop-content-btns {
 		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-		padding: 0 8rpx 0 15rpx;
+		padding: 0 54rpx;
+		justify-content: space-between;
+		margin-top: 80rpx;
+		padding-bottom: 51rpx;
 
-		.switch-yuan {
-			width: 38rpx;
-			height: 38rpx;
-			border-radius: 20rpx;
-			background-color: #fff;
-			margin-left: 9rpx;
-			margin-right: 0rpx;
-		}
-
-		.switch-text {
+		.pop-content-close {
+			width: 246rpx;
+			height: 80rpx;
+			border-radius: 40rpx;
+			border: 2rpx solid #FF4767;
 			font-weight: 500;
-			font-size: 24rpx;
+			font-size: 28rpx;
 			color: #FF4767;
-			line-height: 33rpx;
-			text-align: right;
+			text-align: left;
 			font-style: normal;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
+		.pop-content-sure {
+			width: 246rpx;
+			height: 80rpx;
+			background: #FF4767;
+			border-radius: 40rpx;
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #ffffff;
+			text-align: left;
+			font-style: normal;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 		}
 	}
+}
 
-	.disswitch {
-		padding: 0 12rpx 0 8rpx;
-		background-color: #cecfd5;
+.scoll-lists {
+	padding: 0 20rpx;
+	margin-top: 20rpx;
 
-		.switch-yuan {
-			margin-left: 0;
-			margin-right: 9rpx;
+	.list-item {
+		box-sizing: border-box;
+		padding: 20rpx;
+		height: 200rpx;
+		background: #ffffff;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+		position: relative;
+
+		.item-left {
+			position: relative;
+
+			.item-left-img {
+				width: 131rpx;
+				height: 131rpx;
+				border-radius: 50%;
+			}
+
+			.item-left-tab {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				text-align: left;
+				font-style: normal;
+				width: 124rpx;
+				height: 34rpx;
+				background: #FF4767;
+				border-radius: 18rpx;
+				position: absolute;
+				bottom: 0;
+				left: 4rpx;
+			}
+
+			.noTab {
+				background: #C1C1C1;
+			}
 		}
 
-		.switch-text {
-			color: #A0A0A0;
+		.item-right {
+			margin-left: 20rpx;
+			flex: 1;
+
+			.item-right-text1 {
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.item-right-text2 {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				line-height: 33rpx;
+				text-align: left;
+				font-style: normal;
+				margin-bottom: 20rpx;
+			}
+
+			.item-right-text3 {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+				line-height: 33rpx;
+				text-align: left;
+				font-style: normal;
+
+				.item-right-text3-icon {
+					width: 8rpx;
+					height: 16rpx;
+					margin-left: 6rpx;
+				}
+			}
 		}
 	}
+}
+
+::v-deep .right-area {
+	width: 31rpx !important;
+	height: 31rpx !important;
+}
+
+::v-deep .icon-headle {
+	width: 31rpx !important;
+	height: 31rpx !important;
+}
+
+.common-list {
+	background: #f5f5f5 !important;
+	border-radius: 30rpx !important;
+}
+
+::v-deep .list-container {
+	padding: 0 !important;
+}
+
+::v-deep .list-scroll {
+	margin-top: 0 !important;
+}
+
+.switch-box {
+	/* width: 126rpx; */
+	height: 52rpx;
+	line-height: 52rpx;
+	border-radius: 26rpx;
+	background-color: #FFD4D8;
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: center;
+	align-items: center;
+	padding: 0 8rpx 0 15rpx;
+
+	.switch-yuan {
+		width: 38rpx;
+		height: 38rpx;
+		border-radius: 20rpx;
+		background-color: #fff;
+		margin-left: 9rpx;
+		margin-right: 0rpx;
+	}
+
+	.switch-text {
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #FF4767;
+		line-height: 33rpx;
+		text-align: right;
+		font-style: normal;
+	}
+}
+
+.disswitch {
+	padding: 0 12rpx 0 8rpx;
+	background-color: #cecfd5;
+
+	.switch-yuan {
+		margin-left: 0;
+		margin-right: 9rpx;
+	}
+
+	.switch-text {
+		color: #A0A0A0;
+	}
+}
 </style>
\ No newline at end of file

From 62632e0affa67585ec3c4ed62a2726de8a449e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Thu, 4 Jun 2026 15:58:34 +0800
Subject: [PATCH 101/118] =?UTF-8?q?UI=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/brand-card.vue |  8 +++----
 pages/home/home.vue                  | 13 ++++++-----
 pages/my/my.vue                      | 35 ++++++++++++++--------------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pages/home/components/brand-card.vue b/pages/home/components/brand-card.vue
index 4abd582..e16fc29 100644
--- a/pages/home/components/brand-card.vue
+++ b/pages/home/components/brand-card.vue
@@ -186,7 +186,7 @@ export default {
 }
 
 .brand-name {
-	font-size: 24rpx;
+	font-size: 26rpx;
 	font-weight: 500;
 	color: #333333;
 	line-height: 34rpx;
@@ -212,14 +212,14 @@ export default {
 }
 
 .tag-icon {
-	width: 24rpx;
-	height: 22rpx;
+	width: 26rpx;
+	height: 24rpx;
 	margin-right: 6rpx;
 	flex-shrink: 0;
 }
 
 .tag-text {
-	font-size: 20rpx;
+	font-size: 22rpx;
 	line-height: 28rpx;
 	white-space: nowrap;
 	margin-top: 4rpx;
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 9ae3a7f..ae9ab47 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1049,7 +1049,7 @@ page {
 			.update-time {
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
-				font-size: 20rpx;
+				font-size: 22rpx;
 				color: #8E694D;
 				line-height: 28rpx;
 				text-align: left;
@@ -1065,7 +1065,7 @@ page {
 
 		.header-right {
 			font-weight: 400;
-			font-size: 20rpx;
+			font-size: 22rpx;
 			color: #666666;
 			line-height: 28rpx;
 		}
@@ -1094,7 +1094,7 @@ page {
 				height: 42rpx;
 				font-family: PingFangTC, PingFangTC;
 				font-weight: bold;
-				font-size: 30rpx;
+				font-size: 34rpx;
 				color: #333333;
 				line-height: 42rpx;
 			}
@@ -1103,7 +1103,7 @@ page {
 				height: 28rpx;
 				font-family: PingFangTC, PingFangTC;
 				font-weight: 400;
-				font-size: 20rpx;
+				font-size: 22rpx;
 				color: #858796;
 				line-height: 28rpx;
 				text-align: left;
@@ -1239,7 +1239,7 @@ page {
 
 			.action-text {
 				font-weight: 400;
-				font-size: 24rpx;
+				font-size: 28rpx;
 				color: #101010;
 				line-height: 33rpx;
 				text-align: left;
@@ -1526,6 +1526,7 @@ page {
 					margin-top: 10rpx;
 
 					.type-icon {
+						border: 1rpx solid #D6CAC0;
 						width: 26rpx;
 						height: 26rpx;
 						margin-right: 8rpx;
@@ -1539,7 +1540,7 @@ page {
 						font-size: 24rpx;
 						color: #E55463;
 						line-height: 33rpx;
-						padding: 2rpx 10rpx;
+						padding: 2rpx 10rpx 0 10rpx;
 					}
 				}
 
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 6839704..808fe9f 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -29,7 +29,7 @@
 						<view class="user_detail_tip" @click="toruzhu">
 							<image
 								:src="(userInfo.credentials_state === 2 || (userInfo.id_type > 0 && userInfo.credentials_state === 0)) ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/13cd25db-5b52-4d36-bad2-ee8680eed65f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/711e35a8-a7a1-4eb2-8a76-52ac9795fa7e.png'"
-								mode="widthFix" style="width:26rpx ;"></image>
+								mode="" style="width:30rpx;height:30rpx ;"></image>
 							<view class="user_detail_tip_phone" style="margin-left: -10rpx;">
 								{{ (userInfo.credentials_state === 2 || (userInfo.id_type > 0 &&
 									userInfo.credentials_state === 0)) ? '认证通过' : userInfo.credentials_state === 1 ?
@@ -37,7 +37,7 @@
 							</view>
 							<image mode="widthFix"
 								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/89f929a5-1486-481f-a696-af520a6bb0f2.png"
-								style="width:6rpx ;margin-left: -6rpx;" />
+								style="width:8rpx ;margin-left: -6rpx;" />
 
 						</view>
 					</view>
@@ -843,13 +843,13 @@ export default {
 				return;
 			}
 
-			// if (!this.isLogin) {
-			//   uni.showToast({
-			//     title: "您暂未登录，无法使用此功能！",
-			//     icon: "none",
-			//   });
-			//   return;
-			// }
+			// 未登录直接跳转登录
+			if (!this.isLogin) {
+				uni.navigateTo({
+					url: '/pages/blogPopup/blogPopup'
+				});
+				return;
+			}
 
 			if (item.path == "/pages/ruzhu/ruzhu") {
 				request.post("/sj/userSjAuth/details", {
@@ -1100,9 +1100,9 @@ page {
 			align-items: center;
 
 			.avatar {
-				width: 124rpx;
-				height: 124rpx;
-				border: 4rpx solid #fff;
+				width: 110rpx;
+				height: 110rpx;
+				border: 2rpx solid #fff;
 				box-sizing: border-box;
 				border-radius: 64rpx;
 				margin-right: 20rpx;
@@ -1110,8 +1110,8 @@ page {
 				position: relative;
 
 				.avatar-img {
-					width: 116rpx;
-					height: 116rpx;
+					width: 110rpx;
+					height: 110rpx;
 					border-radius: 64rpx;
 					margin-right: 20rpx;
 				}
@@ -1131,7 +1131,7 @@ page {
 
 				.nickname {
 					font-weight: 500;
-					font-size: 32rpx;
+					font-size: 34rpx;
 					color: #333333;
 					line-height: 45rpx;
 					text-align: left;
@@ -1688,10 +1688,9 @@ button::after {
 		height: 28rpx;
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
-		font-size: 20rpx;
+		font-size: 24rpx;
 		color: #6A574E;
-		line-height: 28rpx;
-		text-align: left;
+		line-height: 30rpx;
 		font-style: normal;
 	}
 

From 5ac5be413b04f2c2c06eae4f101d2b96bd7f7110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Fri, 5 Jun 2026 13:09:01 +0800
Subject: [PATCH 102/118] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                              | 538 ++++++++++++++-------------
 pages/home/components/brand-card.vue |  19 +-
 pages/home/components/skill-card.vue |   1 +
 pages/home/home.vue                  |  12 +-
 pages/jingxuan/selected-skills.vue   | 211 ++++++-----
 pages/my/my.vue                      |  36 +-
 pages/notice/notice_list.vue         |  53 +--
 pages/search_common/search.vue       | 138 ++++---
 8 files changed, 526 insertions(+), 482 deletions(-)

diff --git a/App.vue b/App.vue
index e920460..02d00d3 100644
--- a/App.vue
+++ b/App.vue
@@ -1,276 +1,284 @@
 <script>
-	// #ifdef APP-PLUS
-	import {
-		isNotificationsEnabled,
-		permissions,
-		registPush
-	} from '@/utils/AS-NotifyTheAuthority.js'
-	import {
-		permissionListener
-	} from './utils/permissionTips.js'
-	// import { appUpdateListener } from '@/common/utils/appUpdateTips.js'
-	import locationService from './utils/locationService.js'
-	// import uploadApp from './utils/uploadApp.js'
-	// #endif
-	import request from './utils/request'
-	import {
-		setVersion
-	} from './utils/version.js'
-	//初始化一键登录插件
-	const aLiSDKModule = uni.requireNativePlugin('AliCloud-NirvanaPns');
-	export default {
-		globalData: {
-			artisanType: 2,
-			latitude: '38.366667',
-			longitude: '117.333333',
-			address: '黄骅市',
-			servers_region: `河北省-沧州市-黄骅市`,
-			deviceid: '',
-			addressRes: {
-				"type": "gcj02",
-				"altitude": 0,
-				"latitude": 38.372266,
-				"longitude": 117.332895,
-				"speed": 0,
-				"accuracy": 30,
+// #ifdef APP-PLUS
+import {
+	isNotificationsEnabled,
+	permissions,
+	registPush
+} from '@/utils/AS-NotifyTheAuthority.js'
+import {
+	permissionListener
+} from './utils/permissionTips.js'
+// import { appUpdateListener } from '@/common/utils/appUpdateTips.js'
+import locationService from './utils/locationService.js'
+// import uploadApp from './utils/uploadApp.js'
+// #endif
+import request from './utils/request'
+import {
+	setVersion
+} from './utils/version.js'
+//初始化一键登录插件
+const aLiSDKModule = uni.requireNativePlugin('AliCloud-NirvanaPns');
+export default {
+	globalData: {
+		artisanType: 2,
+		latitude: '38.366667',
+		longitude: '117.333333',
+		address: '黄骅市',
+		servers_region: `河北省-沧州市-黄骅市`,
+		deviceid: '',
+		addressRes: {
+			"type": "gcj02",
+			"altitude": 0,
+			"latitude": 38.372266,
+			"longitude": 117.332895,
+			"speed": 0,
+			"accuracy": 30,
+			"adcode": "130983",
+			"cCode": "130900",
+			"pcode": "130000",
+			"address": {
+				"country": "中国",
+				"province": "河北省",
+				"city": "沧州市",
+				"district": "黄骅市",
+				"street": "渤海西路",
+				"streetNum": "35号",
+				// "poiName": "请开启位置权限",
+				"poiName": "黄骅市人民政府",
+				"cityCode": "0317",
 				"adcode": "130983",
 				"cCode": "130900",
 				"pcode": "130000",
-				"address": {
-					"country": "中国",
-					"province": "河北省",
-					"city": "沧州市",
-					"district": "黄骅市",
-					"street": "渤海西路",
-					"streetNum": "35号",
-					// "poiName": "请开启位置权限",
-					"poiName": "黄骅市人民政府",
-					"cityCode": "0317",
-					"adcode": "130983",
-					"cCode": "130900",
-					"pcode": "130000",
-				}
 			}
-		},
-		onLaunch: async function() {
-			// #ifdef APP-PLUS
-			uni.hideTabBar();
-			if (uni.getStorageSync('accessToken')) {
-				registPush()
-				//跟新底部消息数量
-				this.messageUpudateNum()
-			}
-			// #endif
-			
-			//缓存手机版本号
-			// await setVersion()
-
-			//获取访问路由
-			// 发起 GET 请求
-			let version = uni.getStorageSync('setVersion')
-			let baseUrl
-			await uni.request({
-				url: 'https://api.mrrwlkj.top/api/openPuc/getSjApiUrl', // 接口地址
-				method: 'GET', // 请求方法（默认 GET）
-				header: {
-					'Content-Type': 'application/json', // 请求头
-					'VersionCode': version.VersionCode,
-					'DeviceBrand': version.DeviceBrand,
-					'DeviceType': version.DeviceType
-				},
-				success: (res) => {
-
-					if (res.data.code == 200) {
-						// #ifndef MP-WEIXIN
-						uni.setStorageSync('baseUrl', res.data.data.url)
-						// #endif
-						// #ifdef MP-WEIXIN
-						wx.setStorageSync('baseUrl', res.data.data.url)
-						// #endif
-						this.$store.commit("setLocation", true)
-					}
-					console.log('请求成功', res.data);
-				},
-				fail: (err) => {
-					console.log('请求失败', err);
-				},
-				complete: () => {
-					console.log('请求完成（无论成功失败都会执行）');
-				}
-			});
-
-			// #ifdef APP-PLUS
-			//禁止手机横屏
-			plus.screen.lockOrientation("portrait-primary")
-			// #endif
-			// #ifdef APP-PLUS
-			//权限提示监听
-			let systemInfo = uni.getSystemInfoSync();
-			let platform = systemInfo.platform;
-			if (platform === 'android') {
-				// console.log('安卓用户')
-				permissionListener()
-			} else if (platform === 'ios') {
-				// console.log('苹果用户')
-			} else {
-				// console.log('平台未知')
-			}
-
-			//一键登录密钥设置
-			let sdkInfo = '';
-			//设置秘钥
-			if (platform == 'android') {
-				//开启SDK日志打印
-				aLiSDKModule.setLoggerEnable(true);
-				aLiSDKModule.expandAuthPageCheckedScope(true);
-				//禁用物理返回键
-				//aLiSDKModule.closeAuthPageReturnBack(true);
-				//开启区分界面返回及物理返回功能，自动控制后续返回事件
-				aLiSDKModule.userControlAuthPageCancel();
-				//是否跟随系统深色模式
-				aLiSDKModule.setAuthPageUseDayLight(false);
-				sdkInfo =
-					'cvJWYFO9s7xgJrzD+Ok2m2kCh3x0kdRkfJzGI0oxnyUXGlNAwAzvj87Yd6y030BWposVHUT84av2adBG9SdHl5CJpL0mGi+BRtachnyADJjfdpkJC0e0Uqb45pO7h7ZZvT+sNWQs1sa4JpL0U7hYKkgCP1iVXHoA1zKfzZynON6eKyvkzL1xpoPPag4O50slww4+6XuRVplCOSNCcsLRtot4CYnfsdcMvlV34MY5qB/rV+HNb1velpx4rg5atk3iTEiSLjla69c6pOT6vpjkK1qFVpNMxrEY';
-			} else if (platform == 'ios') {
-				sdkInfo =
-					'BONXQSabNMt1a8Cru1TjeW94aXen5rQHeAxzLGgpFzIUicDYeb9SD0l35MkKvjq7gQemE2HDp6B7adKZ8nrdUk4wgg1LIYSGDYVSc/Q1CwrJ9A3lMUeBfS1UUu3nBBg58bDvG1bl3j6tS4h6FjnYmP5+dDsyqb0YNmIhlSmia5Et7cfBMv2OT85N9WLJc/tOMQ9ZQCnuizKVlofkmDGFgjsBN/Bf2gLq6lTQyVqsgPJE5yEPd4riNg=='
-			}
-			aLiSDKModule.setAuthSDKInfo(sdkInfo)
-
-
-
-			// await uploadApp.uploadApp('onLaunch');
-			// #endif
-
-
-			console.log('App Launch')
-			this.globalData.deviceId = uni.getDeviceInfo().deviceId;
-			// this.globalData.deviceid = 'AC6F605124DFA87DCE40D5C062C94C3B';
-
-			// #ifndef MP-WEIXIN
-			if (uni.getStorageSync('refreshToken')) {
-				let endTime = uni.getStorageSync('refresh_token_expries');
-				endTime = new Date(endTime)
-				// 当前系统时间
-				var nowTime = new Date();
-				var residueTime = (endTime.getTime() - nowTime.getTime() / 1000);
-				// 4小时 14400
-				if (residueTime < 4 * 60 * 60) {
-					console.log('----------------------------')
-
-					uni.removeStorageSync('accessToken')
-					uni.removeStorageSync('refreshToken')
-				}
-			}
-			// #endif
-			// #ifdef MP-WEIXIN
-			if (wx.getStorageSync('refreshToken')) {
-				let endTime = wx.getStorageSync('refresh_token_expries');
-				endTime = new Date(endTime)
-				// 当前系统时间
-				var nowTime = new Date();
-				var residueTime = (endTime.getTime() - nowTime.getTime() / 1000);
-				// 4小时 14400
-				if (residueTime < 4 * 60 * 60) {
-					console.log('----------------------------')
-
-					wx.removeStorageSync('accessToken')
-					wx.removeStorageSync('refreshToken')
-				}
-			}
-			// #endif
-		},
-		onShow: function() {
-			uni.hideTabBar();
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		},
-		methods: {
-			// 验证登陆的全局方法
-			verifyLogin() {
-				if (!vuex.state.userInfo.token) {
-					uni.showModal({
-						title: '提示',
-						content: '您需要登陆后才能进行此操作',
-						confirmColor: '#F1AC66',
-						success(e) {
-							if (e.confirm) {
-								// uni.oprPresentLogin()
-								uni.navigateTo({
-									url: '/pages/blogPopup/blogPopup'
-								});
-							}
-						}
-					})
-				} else {
-					return true
-				}
-			},
-			/**
-			 * 区/县adcode转换为6位市adcode（后两位补0）
-			 * @param {string|number} districtAdcode - 6位区/县编码（字符串或数字类型）
-			 * @returns {string|null} 6位市编码，无效编码返回null
-			 */
-			districtAdcodeTo6DigitCityAdcode(districtAdcode) {
-				// 1. 统一转换为字符串并去除空格
-				const adcodeStr = String(districtAdcode).trim();
-
-				// 2. 验证编码有效性（6位数字）
-				const adcodeReg = /^\d{6}$/;
-				if (!adcodeReg.test(adcodeStr)) {
-					console.warn('无效的区/县编码，必须是6位数字');
-					return null;
-				}
-
-				// 3. 截取前4位 + 拼接"00" → 6位市编码
-				const cityAdcode4Digit = adcodeStr.slice(0, 4);
-				const cityAdcode6Digit = cityAdcode4Digit + '00';
-
-				// 4. 可选验证：确保结果为6位数字
-				if (!/^\d{6}$/.test(cityAdcode6Digit)) {
-					console.warn('编码转换异常');
-					return null;
-				}
-
-				return cityAdcode6Digit;
-			},
-			// 更新全局定位
-			updateAddress(item) {
-				console.log('item', item)
-				let location = item.location.split(',');
-				this.globalData.latitude = location[1];
-				this.globalData.longitude = location[0];
-				this.globalData.address = item.name;
-				this.globalData.servers_region = `${item.pname}-${item.cityname}-${item.adname}`;
-				this.globalData.pcode = item.pcode;
-				this.globalData.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
-				this.globalData.adcode = item.adcode;
-				//存储用户定位
-				this.globalData.addressRes.latitude = location[1];
-				this.globalData.addressRes.longitude = location[0];
-				this.globalData.addressRes.address.province = item.pname;
-				this.globalData.addressRes.address.city = item.cityname;
-				this.globalData.addressRes.address.district = item.adname;
-				this.globalData.addressRes.address.street = item.address;
-				this.globalData.addressRes.address.poiName = item.name;
-				this.globalData.addressRes.address.streetNum = '';
-				this.globalData.addressRes.address.cityCode = '';
-				this.globalData.addressRes.address.pcode = item.pcode;
-				this.globalData.addressRes.address.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
-				this.globalData.addressRes.address.adcode = item.adcode;
-				this.globalData.addressRes.pcode = item.pcode;
-				this.globalData.addressRes.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
-				this.globalData.addressRes.adcode = item.adcode;
-				console.log('globalData', this.globalData)
-				uni.setStorageSync('userAdrees', this.globalData)
-			},
 		}
+	},
+	onLaunch: async function () {
+		// #ifdef APP-PLUS
+		uni.hideTabBar();
+		if (uni.getStorageSync('accessToken')) {
+			registPush()
+			//跟新底部消息数量
+			this.messageUpudateNum()
+		}
+		// #endif
+
+		//缓存手机版本号
+		// await setVersion()
+
+		//获取访问路由
+		// 发起 GET 请求
+		let version = uni.getStorageSync('setVersion')
+		let baseUrl
+		await uni.request({
+			url: 'https://api.mrrwlkj.top/api/openPuc/getSjApiUrl', // 接口地址
+			method: 'GET', // 请求方法（默认 GET）
+			header: {
+				'Content-Type': 'application/json', // 请求头
+				'VersionCode': version.VersionCode,
+				'DeviceBrand': version.DeviceBrand,
+				'DeviceType': version.DeviceType
+			},
+			success: (res) => {
+
+				if (res.data.code == 200) {
+					// #ifndef MP-WEIXIN
+					uni.setStorageSync('baseUrl', res.data.data.url)
+					// #endif
+					// #ifdef MP-WEIXIN
+					wx.setStorageSync('baseUrl', res.data.data.url)
+					// #endif
+					this.$store.commit("setLocation", true)
+				}
+				console.log('请求成功', res.data);
+			},
+			fail: (err) => {
+				console.log('请求失败', err);
+			},
+			complete: () => {
+				console.log('请求完成（无论成功失败都会执行）');
+			}
+		});
+
+		// #ifdef APP-PLUS
+		//禁止手机横屏
+		plus.screen.lockOrientation("portrait-primary")
+		// #endif
+		// #ifdef APP-PLUS
+		//权限提示监听
+		let systemInfo = uni.getSystemInfoSync();
+		let platform = systemInfo.platform;
+		if (platform === 'android') {
+			// console.log('安卓用户')
+			permissionListener()
+		} else if (platform === 'ios') {
+			// console.log('苹果用户')
+		} else {
+			// console.log('平台未知')
+		}
+
+		//一键登录密钥设置
+		let sdkInfo = '';
+		//设置秘钥
+		if (platform == 'android') {
+			//开启SDK日志打印
+			aLiSDKModule.setLoggerEnable(true);
+			aLiSDKModule.expandAuthPageCheckedScope(true);
+			//禁用物理返回键
+			//aLiSDKModule.closeAuthPageReturnBack(true);
+			//开启区分界面返回及物理返回功能，自动控制后续返回事件
+			aLiSDKModule.userControlAuthPageCancel();
+			//是否跟随系统深色模式
+			aLiSDKModule.setAuthPageUseDayLight(false);
+			sdkInfo =
+				'cvJWYFO9s7xgJrzD+Ok2m2kCh3x0kdRkfJzGI0oxnyUXGlNAwAzvj87Yd6y030BWposVHUT84av2adBG9SdHl5CJpL0mGi+BRtachnyADJjfdpkJC0e0Uqb45pO7h7ZZvT+sNWQs1sa4JpL0U7hYKkgCP1iVXHoA1zKfzZynON6eKyvkzL1xpoPPag4O50slww4+6XuRVplCOSNCcsLRtot4CYnfsdcMvlV34MY5qB/rV+HNb1velpx4rg5atk3iTEiSLjla69c6pOT6vpjkK1qFVpNMxrEY';
+		} else if (platform == 'ios') {
+			sdkInfo =
+				'BONXQSabNMt1a8Cru1TjeW94aXen5rQHeAxzLGgpFzIUicDYeb9SD0l35MkKvjq7gQemE2HDp6B7adKZ8nrdUk4wgg1LIYSGDYVSc/Q1CwrJ9A3lMUeBfS1UUu3nBBg58bDvG1bl3j6tS4h6FjnYmP5+dDsyqb0YNmIhlSmia5Et7cfBMv2OT85N9WLJc/tOMQ9ZQCnuizKVlofkmDGFgjsBN/Bf2gLq6lTQyVqsgPJE5yEPd4riNg=='
+		}
+		aLiSDKModule.setAuthSDKInfo(sdkInfo)
+
+
+
+		// await uploadApp.uploadApp('onLaunch');
+		// #endif
+
+
+		console.log('App Launch')
+		this.globalData.deviceId = uni.getDeviceInfo().deviceId;
+		// this.globalData.deviceid = 'AC6F605124DFA87DCE40D5C062C94C3B';
+
+		// #ifndef MP-WEIXIN
+		if (uni.getStorageSync('refreshToken')) {
+			let endTime = uni.getStorageSync('refresh_token_expries');
+			endTime = new Date(endTime)
+			// 当前系统时间
+			var nowTime = new Date();
+			var residueTime = (endTime.getTime() - nowTime.getTime() / 1000);
+			// 4小时 14400
+			if (residueTime < 4 * 60 * 60) {
+				console.log('----------------------------')
+
+				uni.removeStorageSync('accessToken')
+				uni.removeStorageSync('refreshToken')
+			}
+		}
+		// #endif
+		// #ifdef MP-WEIXIN
+		if (wx.getStorageSync('refreshToken')) {
+			let endTime = wx.getStorageSync('refresh_token_expries');
+			endTime = new Date(endTime)
+			// 当前系统时间
+			var nowTime = new Date();
+			var residueTime = (endTime.getTime() - nowTime.getTime() / 1000);
+			// 4小时 14400
+			if (residueTime < 4 * 60 * 60) {
+				console.log('----------------------------')
+
+				wx.removeStorageSync('accessToken')
+				wx.removeStorageSync('refreshToken')
+			}
+		}
+		// #endif
+	},
+	onShow: function () {
+		uni.hideTabBar();
+		console.log('App Show')
+	},
+	onHide: function () {
+		console.log('App Hide')
+	},
+	methods: {
+		// 验证登陆的全局方法
+		verifyLogin() {
+			if (!vuex.state.userInfo.token) {
+				uni.showModal({
+					title: '提示',
+					content: '您需要登陆后才能进行此操作',
+					confirmColor: '#F1AC66',
+					success(e) {
+						if (e.confirm) {
+							// uni.oprPresentLogin()
+							uni.navigateTo({
+								url: '/pages/blogPopup/blogPopup'
+							});
+						}
+					}
+				})
+			} else {
+				return true
+			}
+		},
+		/**
+		 * 区/县adcode转换为6位市adcode（后两位补0）
+		 * @param {string|number} districtAdcode - 6位区/县编码（字符串或数字类型）
+		 * @returns {string|null} 6位市编码，无效编码返回null
+		 */
+		districtAdcodeTo6DigitCityAdcode(districtAdcode) {
+			// 1. 统一转换为字符串并去除空格
+			const adcodeStr = String(districtAdcode).trim();
+
+			// 2. 验证编码有效性（6位数字）
+			const adcodeReg = /^\d{6}$/;
+			if (!adcodeReg.test(adcodeStr)) {
+				console.warn('无效的区/县编码，必须是6位数字');
+				return null;
+			}
+
+			// 3. 截取前4位 + 拼接"00" → 6位市编码
+			const cityAdcode4Digit = adcodeStr.slice(0, 4);
+			const cityAdcode6Digit = cityAdcode4Digit + '00';
+
+			// 4. 可选验证：确保结果为6位数字
+			if (!/^\d{6}$/.test(cityAdcode6Digit)) {
+				console.warn('编码转换异常');
+				return null;
+			}
+
+			return cityAdcode6Digit;
+		},
+		// 更新全局定位
+		updateAddress(item) {
+			console.log('item', item)
+			let location = item.location.split(',');
+			this.globalData.latitude = location[1];
+			this.globalData.longitude = location[0];
+			this.globalData.address = item.name;
+			this.globalData.servers_region = `${item.pname}-${item.cityname}-${item.adname}`;
+			this.globalData.pcode = item.pcode;
+			this.globalData.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
+			this.globalData.adcode = item.adcode;
+			//存储用户定位
+			this.globalData.addressRes.latitude = location[1];
+			this.globalData.addressRes.longitude = location[0];
+			this.globalData.addressRes.address.province = item.pname;
+			this.globalData.addressRes.address.city = item.cityname;
+			this.globalData.addressRes.address.district = item.adname;
+			this.globalData.addressRes.address.street = item.address;
+			this.globalData.addressRes.address.poiName = item.name;
+			this.globalData.addressRes.address.streetNum = '';
+			this.globalData.addressRes.address.cityCode = '';
+			this.globalData.addressRes.address.pcode = item.pcode;
+			this.globalData.addressRes.address.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
+			this.globalData.addressRes.address.adcode = item.adcode;
+			this.globalData.addressRes.pcode = item.pcode;
+			this.globalData.addressRes.cCode = this.districtAdcodeTo6DigitCityAdcode(item.adcode);
+			this.globalData.addressRes.adcode = item.adcode;
+			console.log('globalData', this.globalData)
+			uni.setStorageSync('userAdrees', this.globalData)
+		},
 	}
+}
 </script>
 
 <style>
-	/*每个页面公共css */
-	@import '@/static/css/common.css';
+/*每个页面公共css */
+@import '@/static/css/common.css';
+
+/* App.vue全局style */
+page,
+html,
+body {
+	-webkit-text-size-adjust: 100% !important;
+	text-size-adjust: 100% !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages/home/components/brand-card.vue b/pages/home/components/brand-card.vue
index e16fc29..067acab 100644
--- a/pages/home/components/brand-card.vue
+++ b/pages/home/components/brand-card.vue
@@ -15,8 +15,9 @@
 
 			<view class="tags-container">
 				<view class="tag-item" v-for="(tag, idx) in displayTags" :key="idx" :style="getTagStyle(tag)">
-					<image class="tag-icon" v-if="tag.icon" :src="tag.icon"></image>
-					<text class="tag-text">{{ tag.text }}</text>
+					<!-- <image class="tag-icon" v-if="tag.icon" :src="tag.icon"></image> -->
+					<text class="tag-text">{{ tag.text }} </text>
+					<text class="tag-text1">›</text>
 				</view>
 			</view>
 		</view>
@@ -109,7 +110,7 @@ export default {
 				}
 			} else if (len === 2) {
 				sizeStyle = {
-					width: '134rpx',
+					width: '142rpx',
 					height: '42rpx',
 					padding: '0 12rpx',
 					boxSizing: 'border-box'
@@ -219,10 +220,20 @@ export default {
 }
 
 .tag-text {
-	font-size: 22rpx;
+	font-size: 24rpx;
 	line-height: 28rpx;
 	white-space: nowrap;
 	margin-top: 4rpx;
 	padding-right: 2rpx;
 }
+
+.tag-text1 {
+	font-size: 40rpx;
+	line-height: 28rpx;
+	white-space: nowrap;
+	margin-top: 4rpx;
+	padding-right: 2rpx;
+	margin-bottom: 6rpx;
+	font-weight: 200;
+}
 </style>
\ No newline at end of file
diff --git a/pages/home/components/skill-card.vue b/pages/home/components/skill-card.vue
index cff9da6..2ec1994 100644
--- a/pages/home/components/skill-card.vue
+++ b/pages/home/components/skill-card.vue
@@ -144,6 +144,7 @@ export default {
       margin-top: 10rpx;
 
       .type-icon {
+        border: 1rpx solid #D6CAC0;
         width: 26rpx;
         height: 26rpx;
         margin-right: 8rpx;
diff --git a/pages/home/home.vue b/pages/home/home.vue
index ae9ab47..37235e8 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -452,7 +452,7 @@ export default {
 			}
 			// 小于一万，原样返回，单位为元
 			return {
-				val: num,
+				val: parseFloat(num.toFixed(2)),
 				unit: '元'
 			};
 		},
@@ -1432,19 +1432,21 @@ page {
 
 			.notice-text {
 				font-weight: 400;
-				font-size: 24rpx;
+				font-size: 26rpx;
 				color: #30353C;
 			}
 		}
 
 		.notice-btn {
-			font-weight: 400;
-			font-size: 18rpx;
+			// font-weight: 400;
+			font-size: 20rpx;
 			color: #8D4C1B;
-			padding: 2rpx 15rpx;
+			padding: 6rpx 18rpx;
 			border-radius: 30rpx;
 			border: 1rpx solid #8d4c1b50;
 			margin-left: 10rpx;
+			margin-bottom: 4rpx;
+			margin-top: 4rpx;
 		}
 	}
 
diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index 2ba1ab6..802f559 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -1,20 +1,12 @@
 <template>
   <view class="skill-market-page">
-    
-    <custom-navbar 
-      title="技能集市" 
-      :showBack="true" 
-      backgroundColor="#FFFFFF" 
-      :show-headle="true" 
-      borderBottom="none"
-      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" 
-      @onHeadleClick="goToSearch">
-    </custom-navbar>
-    
-    <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view>
 
+    <custom-navbar title="技能集市" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true" borderBottom="none"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png"
+      @onHeadleClick="goToSearch" class="nav-img-size">
+    </custom-navbar>
     <view class="sticky-header-container" :style="{ top: navHeight + 'px' }">
-      
+
       <view class="official-author-block" v-if="authorInfo.show">
         <view class="author-left">
           <image class="author-avatar" :src="authorInfo.avatar" mode="aspectFill"></image>
@@ -23,7 +15,7 @@
             <text class="author-desc">发布了{{ authorInfo.videoCount }}条技能</text>
           </view>
         </view>
-        
+
         <view class="view-more-btn" v-if="!authorInfo.isOfficial" @click="goToBrandDetail">
           <text>查看更多</text>
           <view class="arrow-right"></view>
@@ -40,7 +32,7 @@
                 <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
               </view>
             </view>
-            
+
             <view class="sort-item" @tap="toggleSort('view')">
               <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
               <view class="arrows">
@@ -67,30 +59,27 @@
             </view>
           </view>
         </view>
-      </view> 
-    </view> <view class="list-container">
-      <view v-if="skillList.length > 0">
-        <skill-card 
-          v-for="(item, index) in skillList" 
-          :key="item.id || index" 
-          :item="item"
-          @click="goToDetail(item)"
-        ></skill-card>
       </view>
-      
+    </view>
+    <view class="list-container">
+      <view v-if="skillList.length > 0">
+        <skill-card v-for="(item, index) in skillList" :key="item.id || index" :item="item"
+          @click="goToDetail(item)"></skill-card>
+      </view>
+
       <view v-else>
         <noData></noData>
       </view>
     </view>
-    
+
     <view style="height: 60rpx;"></view>
-    
+
   </view>
 </template>
 
 <script>
 import request from "@/utils/request"
-import SkillCard from "@/pages/home/components/skill-card.vue" 
+import SkillCard from "@/pages/home/components/skill-card.vue"
 import noData from "@/components/noData/noData.vue";
 
 const USE_REAL_API = true
@@ -100,10 +89,10 @@ export default {
   data() {
     return {
       navHeight: 0,
-      
-      orderType: 0, 
-      linkType: '', 
-      
+
+      orderType: 0,
+      linkType: '',
+
       // 【新增】：统一管理作者/官方/品牌信息
       authorInfo: {
         show: false,       // 控制是否显示作者头部
@@ -113,25 +102,27 @@ export default {
         avatar: '',        // 头像
         videoCount: 0      // 视频数量
       },
-      
+
       filterVisible: false,
-      
+
       skillList: [],
       page: 1,
       limit: 10,
       isFinished: false,
-      
+
       iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
       iconGreyDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfffb601-6877-4608-a3eb-88695b05c6c2.png',
       iconPinkUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bc84dff-e120-4d4b-a33e-25d68e065654.png',
       iconPinkDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ff2c2c9d-694a-4adf-b737-66b07f4a63ae.png',
-      
+
       mockDatabase: []
     }
   },
   computed: {
     filterIcon() {
-      return 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png'
+      return this.filterVisible
+        ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png'
+        : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bfe7a104-bef8-4432-9487-42f05e3e9035.png'
     }
   },
   // 接收页面跳转传过来的作者参数
@@ -139,23 +130,23 @@ export default {
     if (options && options.showAuthor === '1') {
       this.authorInfo.show = true;
       this.authorInfo.isOfficial = options.isOfficial === '1';
-      this.authorInfo.brandId = options.linkId || null; 
-      
+      this.authorInfo.brandId = options.linkId || null;
+
       // 用 decodeURIComponent 把转义的字符解析回正常的中文和链接
       this.authorInfo.name = options.authorName ? decodeURIComponent(options.authorName) : '未知作者';
       this.authorInfo.avatar = options.authorAvatar ? decodeURIComponent(options.authorAvatar) : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bbe832bf-aae6-4579-b3cc-246d252488c3';
       this.authorInfo.videoCount = options.videoCount || 0;
 
       // 强制设置筛选类型
-      this.linkType = this.authorInfo.isOfficial ? 1 : 2; 
+      this.linkType = this.authorInfo.isOfficial ? 1 : 2;
     } else if (options && options.linkType !== undefined) {
       this.linkType = Number(options.linkType);
     }
 
     const sysInfo = uni.getSystemInfoSync()
     const sbh = sysInfo.statusBarHeight || 0
-    this.navHeight = sbh 
-    
+    this.navHeight = sbh
+
     this.initMockData()
     this.fetchData(true)
   },
@@ -181,7 +172,7 @@ export default {
         uni.showToast({ title: '缺少品牌信息', icon: 'none' });
       }
     },
-    
+
     toggleSort(type) {
       if (type === 'time') {
         if (this.orderType === 1) this.orderType = 2
@@ -192,29 +183,29 @@ export default {
       }
       this.fetchData(true)
     },
-    
+
     toggleFilterPanel() {
       this.filterVisible = !this.filterVisible
     },
     closeFilterPanel() {
       this.filterVisible = false
     },
-    
+
     selectAndApply(typeVal) {
       this.linkType = typeVal;
       // 当通过本地筛选器切换时，关闭“专属展示区”，确保纯净筛选
-      this.authorInfo.show = false; 
+      this.authorInfo.show = false;
       this.closeFilterPanel();
       this.fetchData(true);
     },
-    
+
     async fetchData(isReset = false) {
       if (isReset) {
         this.page = 1
         this.isFinished = false
         this.skillList = []
       }
-      
+
       if (USE_REAL_API) {
         uni.showLoading({ title: '加载中...' })
         try {
@@ -224,12 +215,12 @@ export default {
           }
           if (this.orderType !== 0) params.order_type = this.orderType;
           if (this.linkType !== '') params.link_type = this.linkType;
-          
+
           // 【核心接口预留】：如果当前在看某个品牌的专属页，需要传link_id给后端过滤
           if (this.authorInfo.show && !this.authorInfo.isOfficial && this.authorInfo.brandId) {
             params.link_id = this.authorInfo.brandId;
           }
-          
+
           const res = await request.post('/sj/skill/list', params)
           if ((res.code === 200 || res.state === 1) && res.data && res.data.list) {
             const list = res.data.list.map(item => this.formatApiData(item))
@@ -248,30 +239,30 @@ export default {
         uni.showLoading({ title: '模拟加载中...' })
         setTimeout(() => {
           let list = [...this.mockDatabase]
-          
+
           if (this.linkType !== '') {
             list = list.filter(item => item.link_type === this.linkType)
           }
 
           // 模拟品牌过滤
           if (this.authorInfo.show && !this.authorInfo.isOfficial && this.authorInfo.brandId) {
-             list = list.filter(item => item.brand_id == this.authorInfo.brandId)
+            list = list.filter(item => item.brand_id == this.authorInfo.brandId)
           }
-          
+
           if (this.orderType !== 0) {
             list.sort((a, b) => {
-              if (this.orderType === 1) return b.timestamp - a.timestamp 
-              if (this.orderType === 2) return a.timestamp - b.timestamp 
-              if (this.orderType === 3) return b.views - a.views         
-              if (this.orderType === 4) return a.views - b.views         
+              if (this.orderType === 1) return b.timestamp - a.timestamp
+              if (this.orderType === 2) return a.timestamp - b.timestamp
+              if (this.orderType === 3) return b.views - a.views
+              if (this.orderType === 4) return a.views - b.views
               return 0
             })
           }
-          
+
           const start = (this.page - 1) * this.limit
           const end = start + this.limit
           const pageData = list.slice(start, end)
-          
+
           if (pageData.length < this.limit) this.isFinished = true
           this.skillList = isReset ? pageData : this.skillList.concat(pageData)
           this.page++
@@ -279,7 +270,7 @@ export default {
         }, 500)
       }
     },
-    
+
     formatApiData(item) {
       return {
         id: item.id,
@@ -288,7 +279,7 @@ export default {
         type: item.link_name || (item.link_type === 1 ? '平台课程' : '品牌课程'),
         link_type: item.link_type,
         views: item.browse_num || 0,
-        time: item.create_time ? this.formatTimeAgo(item.create_time) : '', 
+        time: item.create_time ? this.formatTimeAgo(item.create_time) : '',
         typeIcon: item.link_logo || ''
       }
     },
@@ -313,11 +304,11 @@ export default {
 
     initMockData() {
       this.mockDatabase = [
-        { id: 1, title: '穿戴甲的操作视频扫码验券操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 836000, time: '7小时前', timestamp: Date.now() - 7*3600000 },
-        { id: 2, title: '脸部按摩操作步骤详情', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, brand_id: 101, views: 8334, time: '1天前', timestamp: Date.now() - 24*3600000 },
-        { id: 3, title: '全身SPA的操作视频操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 2344, time: '3天前', timestamp: Date.now() - 3*24*3600000 },
-        { id: 4, title: '高级面部护理手法详解最新版', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 836, time: '4月26日', timestamp: Date.now() - 30*24*3600000 },
-        { id: 5, title: '光疗美甲进阶全方位解析', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, brand_id: 101, views: 12000, time: '2小时前', timestamp: Date.now() - 2*3600000 }
+        { id: 1, title: '穿戴甲的操作视频扫码验券操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 836000, time: '7小时前', timestamp: Date.now() - 7 * 3600000 },
+        { id: 2, title: '脸部按摩操作步骤详情', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, brand_id: 101, views: 8334, time: '1天前', timestamp: Date.now() - 24 * 3600000 },
+        { id: 3, title: '全身SPA的操作视频操作教程', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 2344, time: '3天前', timestamp: Date.now() - 3 * 24 * 3600000 },
+        { id: 4, title: '高级面部护理手法详解最新版', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '平台课程', link_type: 1, views: 836, time: '4月26日', timestamp: Date.now() - 30 * 24 * 3600000 },
+        { id: 5, title: '光疗美甲进阶全方位解析', coverSrc: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e2220528-fdf6-4cad-a25d-ec6cbee1501e.jpg', type: '品牌课程', link_type: 2, brand_id: 101, views: 12000, time: '2小时前', timestamp: Date.now() - 2 * 3600000 }
       ]
     }
   }
@@ -351,7 +342,7 @@ export default {
   .author-left {
     display: flex;
     align-items: center;
-    
+
     .author-avatar {
       width: 70rpx;
       height: 70rpx;
@@ -384,16 +375,16 @@ export default {
     display: flex;
     align-items: center;
     font-size: 24rpx;
-    color: #FF4767 ;
-    border: 2rpx solid #FF4767 ;
+    color: #FF4767;
+    border: 2rpx solid #FF4767;
     padding: 8rpx 20rpx;
     border-radius: 45rpx;
-    
+
     .arrow-right {
       width: 10rpx;
       height: 10rpx;
-      border-top: 2rpx solid #FF4767 ;
-      border-right: 2rpx solid #FF4767 ;
+      border-top: 2rpx solid #FF4767;
+      border-right: 2rpx solid #FF4767;
       transform: rotate(45deg);
       margin-left: 6rpx;
     }
@@ -403,7 +394,7 @@ export default {
 .sort-bar-wrap {
   /* 移除单独的 sticky，由外层 container 统一控制 */
   background: #fff;
-  position: relative; 
+  position: relative;
 }
 
 .sort-bar {
@@ -411,34 +402,34 @@ export default {
   align-items: center;
   justify-content: space-between;
   padding: 24rpx 30rpx;
-  
+
   .left-sorts {
     display: flex;
     align-items: center;
     gap: 100rpx;
-    
+
     .sort-item {
       display: flex;
       align-items: center;
-      
+
       .sort-text {
         font-size: 28rpx;
         color: #333333;
         margin-right: 6rpx;
         font-weight: 400;
-        
+
         &.active {
           color: #FF4767;
           font-weight: 500;
         }
       }
-      
+
       .arrows {
         display: flex;
         flex-direction: column;
         justify-content: center;
         align-items: center;
-        
+
         .arrow-icon {
           width: 14rpx;
           height: 8rpx;
@@ -451,19 +442,22 @@ export default {
   .right-filter {
     display: flex;
     align-items: center;
-    
+
     .filter-text {
       font-size: 26rpx;
       color: #666666;
       margin-right: 8rpx;
     }
-    
+
     .filter-icon {
-      width: 18rpx;
-      height: 12rpx;
+      width: 24rpx;
+      height: 24rpx;
       transition: transform 0.3s ease;
+
       &.rotate {
         transform: rotate(180deg);
+        width: 18rpx;
+        height: 12rpx;
       }
     }
   }
@@ -475,8 +469,9 @@ export default {
 
 .filter-panel {
   position: absolute;
-  top: 100%; 
-  left: 0; right: 0;
+  top: 100%;
+  left: 0;
+  right: 0;
   height: 100vh;
   z-index: 100;
   pointer-events: none;
@@ -484,21 +479,32 @@ export default {
 
   &.show {
     pointer-events: auto;
-    .filter-mask { opacity: 1; }
-    .filter-container { transform: translateY(0); }
+
+    .filter-mask {
+      opacity: 1;
+    }
+
+    .filter-container {
+      transform: translateY(0);
+    }
   }
 
   .filter-mask {
     position: absolute;
-    top: 0; left: 0; right: 0; bottom: 0;
-    background: rgba(0,0,0,0.4);
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.4);
     opacity: 0;
     transition: opacity 0.3s ease-in-out;
   }
-  
+
   .filter-container {
     position: absolute;
-    top: 0; left: 0; right: 0;
+    top: 0;
+    left: 0;
+    right: 0;
     background: #fff;
     border-radius: 0 0 24rpx 24rpx;
     padding: 30rpx 30rpx 40rpx;
@@ -520,7 +526,7 @@ export default {
 .course-filter {
   display: flex;
   gap: 20rpx;
-  
+
   .course-type-item {
     background: #F5F5F5;
     color: #333333;
@@ -529,11 +535,11 @@ export default {
     border-radius: 12rpx;
     border: 1rpx solid transparent;
     transition: all 0.2s;
-    
+
     display: flex;
     align-items: center;
     justify-content: center;
-    
+
     &.active {
       background: #FFF0F2;
       color: #FF4767;
@@ -547,18 +553,25 @@ export default {
   flex-direction: column;
   align-items: center;
   padding: 120rpx 0;
-  
+
   .empty-icon {
     width: 346rpx;
     height: 373rpx;
   }
 }
+
 ::v-deep .icon-headle {
-    width: 32rpx !important;
-    height: 32rpx !important;
+  width: 32rpx !important;
+  height: 32rpx !important;
 }
+
 ::v-deep .back-icon {
-    width: 28rpx !important;
-    height: 36rpx !important;
+  width: 28rpx !important;
+  height: 36rpx !important;
+}
+
+.nav-img-size::v-deep .icon-headle {
+  width: 36rpx !important;
+  height: 36rpx !important;
 }
 </style>
\ No newline at end of file
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 808fe9f..a2043bd 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -86,7 +86,7 @@
 
 		<view class="order-card">
 			<template v-for="card in currentCardList">
-				<view class="function-list" v-if="card.type == 'line'">
+				<view class="function-list" v-if="card.type == 'line'" :key="card.title">
 					<view class="function-title">{{ card.title }}</view>
 					<view class="function-grid">
 						<view class="grid-item" v-for="(item, index) in card.list" :key="index"
@@ -98,22 +98,22 @@
 						</view>
 					</view>
 				</view>
-				<view class="function-list" style="padding: 24rpx; padding-bottom: 28rpx"
-					v-if="card.type == 'lineCard'">
+				<view class="function-list" style="padding: 24rpx; padding-bottom: 28rpx" v-if="card.type == 'lineCard'"
+					:key="card.title">
 					<view class="lineCard-title">{{ card.title }}</view>
 					<view class="lineCard-grid">
 						<image v-for="(item, index) in card.list" :src="item.url" mode="widthFix"
-							@click="handleFunction(item)"></image>
+							@click="handleFunction(item)" :key="index"></image>
 					</view>
 				</view>
-				<view class="imagePure" v-if="card.type == 'imagePure'">
+				<view class="imagePure" v-if="card.type == 'imagePure'" :key="card.title">
 					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
 				</view>
-				<view class="image-list" v-if="card.type == 'image'">
+				<view class="image-list" v-if="card.type == 'image'" :key="card.title">
 					<view class="image-title">{{ card.title }}</view>
 					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
 				</view>
-				<view class="listcard-list" v-if="card.type == 'listcard'">
+				<view class="listcard-list" v-if="card.type == 'listcard'" :key="card.title">
 					<view class="function-title">{{ card.title }}</view>
 					<view class="listcard-item" v-for="(item, index) in card.list" :key="index">
 						<image @click="handleFunction(item)" :src="item.url" mode="widthFix"></image>
@@ -121,7 +121,7 @@
 						<view class="listcard-text">{{ item.text }}</view>
 					</view>
 				</view>
-				<view class="imageText-list" v-if="card.type == 'imageText'">
+				<view class="imageText-list" v-if="card.type == 'imageText'" :key="card.title">
 					<view class="lineCard-title">{{ card.title }}</view>
 					<view class="imageText-content">
 						<image :src="card.url" mode="widthFix"></image>
@@ -160,6 +160,8 @@
 							<view class="item-right orange" @tap="goToBusinessTime">去配置</view>
 						</view>
 
+						<view class="divider-line"></view>
+
 						<view class="missing-item" v-if="!hasServiceSkill">
 							<view class="item-left">
 								<image class="item-icon"
@@ -173,6 +175,8 @@
 							<view class="item-right orange" @tap="goToServiceSkill">去配置</view>
 						</view>
 
+						<view class="divider-line"></view>
+
 						<view class="missing-item" v-if="!isCertified">
 							<view class="item-left">
 								<image class="item-icon"
@@ -1682,6 +1686,13 @@ button::after {
 	align-items: center;
 	gap: 12rpx;
 	margin-top: 10rpx;
+	width: auto;
+	height: 36rpx;
+	padding: 0 8rpx 0 8rpx;
+	background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/378a6936-a543-4ff5-9aa0-cfcb4d4e14b3.png');
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+	margin-left: -6rpx;
 
 	.user_detail_tip_phone {
 		// width: 100rpx;
@@ -1743,7 +1754,7 @@ button::after {
 		.modal-header {
 			position: relative;
 			z-index: 1;
-			height: 150rpx;
+			height: 100rpx;
 			display: flex;
 			align-items: flex-end;
 			justify-content: center;
@@ -1832,6 +1843,13 @@ button::after {
 						}
 					}
 				}
+
+				.divider-line {
+					width: 100%;
+					height: 1rpx;
+					background-color: #f2f2f2;
+					margin: -26rpx 0;
+				}
 			}
 		}
 
diff --git a/pages/notice/notice_list.vue b/pages/notice/notice_list.vue
index 11402a3..bc6c0b9 100644
--- a/pages/notice/notice_list.vue
+++ b/pages/notice/notice_list.vue
@@ -1,14 +1,9 @@
 <template>
   <view class="notice-page">
     <!-- 自定义顶部导航组件 -->
-    <custom-navbar 
-      title="公告通知" 
-      :showBack="true" 
-      backgroundColor="#FFFFFF" 
-      :show-headle="true"
-      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png" 
-      @onHeadleClick="goToSearch"
-    />
+    <custom-navbar title="公告通知" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true"
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png"
+      @onHeadleClick="goToSearch" class="nav-img-size" />
 
     <view class="page-content">
       <!-- 加载状态 -->
@@ -19,13 +14,8 @@
 
       <!-- 公告列表 -->
       <view v-else-if="noticeList.length > 0" class="notice-list">
-        <NoticeCard 
-          v-for="item in noticeList" 
-          :key="item.id"
-          :item="item" 
-          @click="goToDetail"
-        />
-        
+        <NoticeCard v-for="item in noticeList" :key="item.id" :item="item" @click="goToDetail" />
+
         <!-- 加载更多状态 -->
         <view v-if="loadingMore" class="load-more">
           <text>加载更多...</text>
@@ -36,7 +26,9 @@
       </view>
       <!-- 空状态 -->
       <view v-else class="empty-container">
-        <image class="empty-img" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c5e7b2a-3d4f-4b1e-9a7c-6e8f2d1b4a5c.png" mode="aspectFit"></image>
+        <image class="empty-img"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c5e7b2a-3d4f-4b1e-9a7c-6e8f2d1b4a5c.png"
+          mode="aspectFit"></image>
         <text class="empty-text">暂无公告通知</text>
       </view>
     </view>
@@ -82,7 +74,7 @@ export default {
         url: '/pages/search_common/search?type=notice'
       });
     },
-    
+
     // 获取公告列表
     fetchNoticeList(reset = true) {
       if (reset) {
@@ -104,13 +96,13 @@ export default {
           const list = res.data.list || [];
           const total = res.data.total || 0;
           this.total = total;
-          
+
           if (reset) {
             this.noticeList = list;
           } else {
             this.noticeList = [...this.noticeList, ...list];
           }
-          
+
           // 判断是否还有更多数据
           this.hasMore = this.noticeList.length < total;
         } else {
@@ -134,7 +126,7 @@ export default {
         }
       });
     },
-    
+
     // 跳转到详情页（接收 NoticeCard 组件 $emit 传递的 item）
     goToDetail(item) {
       if (item.id) {
@@ -163,7 +155,7 @@ export default {
   align-items: center;
   justify-content: center;
   padding: 120rpx 0;
-  
+
   .loading-icon {
     width: 60rpx;
     height: 60rpx;
@@ -173,7 +165,7 @@ export default {
     animation: spin 0.8s linear infinite;
     margin-bottom: 20rpx;
   }
-  
+
   .loading-text {
     font-size: 26rpx;
     color: #999;
@@ -181,9 +173,13 @@ export default {
 }
 
 @keyframes spin {
-  to { transform: rotate(360deg); }
+  to {
+    transform: rotate(360deg);
+  }
 }
-.load-more, .no-more {
+
+.load-more,
+.no-more {
   text-align: center;
   padding: 30rpx 0;
   font-size: 24rpx;
@@ -196,17 +192,22 @@ export default {
   align-items: center;
   justify-content: center;
   padding: 150rpx 0;
-  
+
   .empty-img {
     width: 200rpx;
     height: 200rpx;
     margin-bottom: 30rpx;
     opacity: 0.6;
   }
-  
+
   .empty-text {
     font-size: 28rpx;
     color: #999;
   }
 }
+
+.nav-img-size::v-deep .icon-headle {
+  width: 36rpx !important;
+  height: 36rpx !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages/search_common/search.vue b/pages/search_common/search.vue
index 5499326..28ab06c 100644
--- a/pages/search_common/search.vue
+++ b/pages/search_common/search.vue
@@ -3,17 +3,10 @@
     <view class="search-header" :style="{ paddingTop: statusBarHeight + 'px' }">
       <view class="header-content">
         <image class="back-icon" src="/static/images/back.png" @tap="goBack"></image>
-        
+
         <view class="search-box">
-          <input 
-            class="search-input" 
-            v-model="keyword" 
-            :placeholder="placeholderText" 
-            placeholder-class="search-placeholder"
-            focus 
-            confirm-type="search" 
-            @confirm="handleSearch"
-          />
+          <input class="search-input" v-model="keyword" :placeholder="placeholderText"
+            placeholder-class="search-placeholder" focus confirm-type="search" @confirm="handleSearch" />
           <text class="search-btn" @tap="handleSearch">搜索</text>
         </view>
       </view>
@@ -22,8 +15,9 @@
     <view class="nav-placeholder" :style="{ height: navHeight + 'px' }"></view>
 
     <view class="result-container">
-      
-      <view class="sort-bar" v-if="hasSearched && ['brand', 'skill', 'collection_brand', 'collection_course'].includes(searchType)">
+
+      <view class="sort-bar"
+        v-if="hasSearched && ['brand', 'skill', 'collection_brand', 'collection_course'].includes(searchType)">
         <view class="sort-item" @tap="toggleSort('time')">
           <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
           <view class="arrows">
@@ -31,7 +25,7 @@
             <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
           </view>
         </view>
-        
+
         <view class="sort-item" @tap="toggleSort('view')">
           <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
           <view class="arrows">
@@ -42,38 +36,26 @@
       </view>
 
       <view v-if="loading && page === 1" class="loading-tips">加载中...</view>
-      
+
       <view v-else-if="searchType === 'notice' && resultList.length > 0">
-        <notice-card 
-          v-for="item in resultList" 
-          :key="item.id" 
-          :item="item"
-          @click="goToDetail(item)"
-        />
+        <notice-card v-for="item in resultList" :key="item.id" :item="item" @click="goToDetail(item)" />
       </view>
 
-      <view v-else-if="(searchType === 'brand' || searchType === 'collection_brand') && resultList.length > 0" class="brand-grid">
-        <brand-card 
-          class="brand-card-wrap"
-          v-for="item in resultList" 
-          :key="item.id" 
-          :item="item"
-          :tagKeys="item.tagKeys || []"
-          @click="goToDetail(item)"
-        />
+      <view v-else-if="(searchType === 'brand' || searchType === 'collection_brand') && resultList.length > 0"
+        class="brand-grid">
+        <brand-card class="brand-card-wrap" v-for="item in resultList" :key="item.id" :item="item"
+          :tagKeys="item.tagKeys || []" @click="goToDetail(item)" />
       </view>
 
-      <view v-else-if="(searchType === 'skill' || searchType === 'collection_course') && resultList.length > 0" class="course-list">
-        <skill-card 
-          v-for="item in resultList" 
-          :key="item.id" 
-          :item="item"
-          @click="goToDetail(item)"
-        />
+      <view v-else-if="(searchType === 'skill' || searchType === 'collection_course') && resultList.length > 0"
+        class="course-list">
+        <skill-card v-for="item in resultList" :key="item.id" :item="item" @click="goToDetail(item)" />
       </view>
 
       <view v-else-if="!loading && hasSearched && resultList.length === 0" class="empty-state">
-        <image class="empty-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4e4320d1-cc5c-4312-890c-f1eb8381fdd2.png"></image>
+        <image class="empty-icon"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4e4320d1-cc5c-4312-890c-f1eb8381fdd2.png">
+        </image>
         <text>未搜索到相关内容哦~</text>
       </view>
 
@@ -81,7 +63,7 @@
         <text v-if="loading && page > 1">正在加载更多...</text>
         <text v-else-if="!hasMore">没有更多了</text>
       </view>
-      
+
     </view>
   </view>
 </template>
@@ -102,21 +84,21 @@ export default {
     return {
       statusBarHeight: 0,
       navHeight: 0,
-      searchType: '', 
+      searchType: '',
       keyword: '',
       resultList: [],
-      
-      loading: false, 
-      hasSearched: false, 
-      
+
+      loading: false,
+      hasSearched: false,
+
       // 分页相关
       page: 1,
       limit: 10,
       hasMore: true,
 
       // 排序参数：0代表无排序(全灰)，1/2发布时间，3/4浏览量
-      orderType: 0, 
-      
+      orderType: 0,
+
       // 排序图标资源
       iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
       iconGreyDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfffb601-6877-4608-a3eb-88695b05c6c2.png',
@@ -139,8 +121,8 @@ export default {
   onLoad(options) {
     const systemInfo = uni.getSystemInfoSync();
     this.statusBarHeight = systemInfo.statusBarHeight;
-    this.navHeight = this.statusBarHeight + 44; 
-    
+    this.navHeight = this.statusBarHeight + 44;
+
     if (options.type) {
       this.searchType = options.type;
     }
@@ -155,7 +137,7 @@ export default {
     goBack() {
       uni.navigateBack();
     },
-    
+
     clearSearch() {
       this.keyword = '';
       this.resultList = [];
@@ -172,7 +154,7 @@ export default {
       } else if (type === 'view') {
         this.orderType = this.orderType === 3 ? 4 : 3;
       }
-      
+
       // 切换排序直接重新加载当前结果
       if (this.hasSearched) {
         this.page = 1;
@@ -185,15 +167,15 @@ export default {
       if (!this.keyword.trim()) {
         return uni.showToast({ title: '请输入搜索内容', icon: 'none' });
       }
-      
+
       // 每次发起新的关键字搜索时，重置为全灰无排序状态
-      this.orderType = 0; 
+      this.orderType = 0;
       this.hasSearched = true;
       this.page = 1;
       this.hasMore = true;
       this.loadData(true);
     },
-    
+
     async loadData(isReset) {
       this.loading = true;
 
@@ -234,13 +216,13 @@ export default {
         }
 
         const res = await request.post(apiUrl, params);
-        
+
         if (res.code === 200 && res.data) {
           const list = res.data.list || [];
-          const totalCount = res.data.count || 0; 
-          
+          const totalCount = res.data.count || 0;
+
           let formattedList = list;
-          
+
           if (this.searchType === 'brand' || this.searchType === 'collection_brand') {
             formattedList = list.map(item => {
               let tags = [];
@@ -262,7 +244,9 @@ export default {
               coverSrc: item.cover_img || 'https://dummyimage.com/300x200/ccc/fff.png',
               type: item.link_name || (item.link_type === 1 ? '平台课程' : '品牌课程'),
               views: item.browse_num || 0,
-              typeIcon: item.link_logo || ''
+              typeIcon: item.link_logo || '',
+              time: item.create_time ? item.create_time.split(' ')[0] : '',
+              video: item.video || ''
             }));
           }
 
@@ -271,9 +255,9 @@ export default {
           } else {
             this.resultList = [...this.resultList, ...formattedList];
           }
-          
+
           this.hasMore = this.resultList.length < totalCount;
-          
+
         } else {
           if (isReset) this.resultList = [];
           this.hasMore = false;
@@ -288,7 +272,7 @@ export default {
 
     goToDetail(item) {
       if (!item.id) return;
-      
+
       if (this.searchType === 'notice') {
         uni.navigateTo({ url: `/pages/notice/detail?id=${item.id}` });
       } else if (this.searchType === 'brand' || this.searchType === 'collection_brand') {
@@ -314,19 +298,19 @@ export default {
   right: 0;
   background-color: #fff;
   z-index: 999;
-  
+
   .header-content {
     height: 44px;
     display: flex;
     align-items: center;
     padding: 0 24rpx;
-    
+
     .back-icon {
       width: 28rpx;
       height: 28rpx;
       padding-right: 20rpx;
     }
-    
+
     .search-box {
       flex: 1;
       height: 74rpx;
@@ -335,22 +319,23 @@ export default {
       display: flex;
       align-items: center;
       padding: 0 6rpx 0 24rpx;
-      
+
       .search-input {
         flex: 1;
         font-size: 28rpx;
       }
+
       .search-placeholder {
         color: #CCCCCC;
       }
-      
+
       .clear-icon {
         font-size: 28rpx;
         color: #999;
         padding: 10rpx 20rpx;
       }
     }
-    
+
     .search-btn {
       width: 110rpx;
       height: 62rpx;
@@ -371,32 +356,32 @@ export default {
 .sort-bar {
   display: flex;
   align-items: center;
-  padding: 10rpx 0 24rpx; 
+  padding: 10rpx 0 24rpx;
   gap: 100rpx;
-  
+
   .sort-item {
     display: flex;
     align-items: center;
-    
+
     .sort-text {
       font-weight: 400;
       font-size: 26rpx;
       color: #666666;
       line-height: 37rpx;
       margin-right: 6rpx;
-      
+
       &.active {
         color: #FF4767;
         font-weight: 500;
       }
     }
-    
+
     .arrows {
       display: flex;
       flex-direction: column;
       justify-content: center;
       align-items: center;
-      
+
       .arrow-icon {
         width: 13rpx;
         height: 8rpx;
@@ -417,7 +402,11 @@ export default {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
-  .brand-card-wrap { width: 48.5%; margin-bottom: 24rpx; }
+
+  .brand-card-wrap {
+    width: 48.5%;
+    margin-bottom: 24rpx;
+  }
 }
 
 .course-list {
@@ -431,12 +420,13 @@ export default {
   align-items: center;
   justify-content: center;
   padding: 200rpx 0;
-  
+
   .empty-icon {
     width: 300rpx;
     height: 300rpx;
     margin-bottom: 20rpx;
   }
+
   text {
     font-size: 28rpx;
     color: #999;

From 181a93e314260115e95a3cf06f6aae2800fbbc7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Fri, 5 Jun 2026 15:27:42 +0800
Subject: [PATCH 103/118] =?UTF-8?q?=E5=88=9D=E6=AC=A1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E8=A2=AB=E9=A9=B3=E5=9B=9E=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service-code-input/service-code-input.vue |  386 +++--
 pages/jingxuan/skill-detail.vue               |   64 +-
 pages/my/my.vue                               |    4 +-
 pages/my/myFavorite.vue                       |   16 +-
 pages/order/userorder-list.vue                | 1296 ++++++++---------
 pages/ruzhu/ruzhu.vue                         |   52 +-
 pages/ruzhu/sj-info.vue                       |   62 +
 pages/ruzhu/successruzhu.vue                  |   26 +-
 8 files changed, 1018 insertions(+), 888 deletions(-)

diff --git a/components/service-code-input/service-code-input.vue b/components/service-code-input/service-code-input.vue
index 37cb524..80985ca 100644
--- a/components/service-code-input/service-code-input.vue
+++ b/components/service-code-input/service-code-input.vue
@@ -1,29 +1,18 @@
 <template>
-	<view class="service-code-modal" v-if="show" :style="{bottom:`${popBotom}px`}">
+	<view class="service-code-modal" v-if="show" :style="{ bottom: `${popBotom}px` }">
 		<view class="modal-mask" @touchmove.stop.prevent></view>
 		<view class="modal-content">
 			<view class="modal-title">开始服务</view>
 			<view class="modal-subtitle">请输入服务码</view>
 			<view class="code-box">
-				<view
-					v-for="(item, idx) in codeLength"
-					:key="idx"
+				<view v-for="(item, idx) in codeLength" :key="idx"
 					:class="['code-cell', idx === currentIndex ? 'active' : '', code[idx] ? 'filled' : '']">
 					<text v-if="code[idx]">{{ code[idx] }}</text>
 				</view>
 				<!-- 隐藏真实输入框 -->
-				<input
-					:adjust-position="false"
-					class="real-input"
-					type="number"
-					:maxlength="codeLength"
-					v-model="inputValue"
-					:focus="true"
-					@input="onInput"
-					@focus="onFocus"
-					@keyboardheightchange="onkeyboardheightchange"
-					@blur="onBlur"
-					cursor-spacing="100"
+				<input :adjust-position="false" class="real-input" type="number" :maxlength="codeLength"
+					v-model="inputValue" :focus="true" @input="onInput" @focus="onFocus"
+					@keyboardheightchange="onkeyboardheightchange" @blur="onBlur" cursor-spacing="100"
 					ref="realInput" />
 			</view>
 			<button class="confirm-btn" :disabled="code.length < codeLength" @click="onConfirm">确定</button>
@@ -33,210 +22,211 @@
 </template>
 
 <script>
-	export default {
-		name: 'serviceCodeInput',
-		props: {
-			show: {
-				type: Boolean,
-				default: false
-			},
-			codeLength: {
-				type: Number,
-				default: 6
+export default {
+	name: 'serviceCodeInput',
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		codeLength: {
+			type: Number,
+			default: 6
+		}
+	},
+	data() {
+		return {
+			inputValue: '',
+			isFocus: true,
+			keyboardHeight: 0,
+			popBotom: 0,
+		}
+	},
+	computed: {
+		code() {
+			return this.inputValue.split('').slice(0, this.codeLength)
+		},
+		currentIndex() {
+			return this.inputValue.length
+		}
+	},
+	watch: {
+		// show(val) {
+		// 	if (val) {
+		// 		this.$refs.realInput && this.$refs.realInput.focus
+		// 	} else {
+		// 		this.inputValue = ''
+		// 	}
+		// }
+	},
+	mounted() {
+		// uni.onKeyboardHeightChange((res)=>{
+		// 	this.keyboardHeight = res.height;
+		// })
+	},
+	methods: {
+		onInput(e) {
+			let val = e.detail.value.replace(/[^0-9]/g, '').slice(0, this.codeLength)
+			this.inputValue = val
+			this.$emit('input', val)
+			if (val.length === this.codeLength) {
+				this.$emit('finish', val)
 			}
 		},
-		data() {
-			return {
-				inputValue: '',
-				isFocus: true,
-				keyboardHeight: 0,
-				popBotom:0,
+		onFocus(e) {
+			this.isFocus = true
+			this.inputValue = ''
+		},
+		onkeyboardheightchange(e) {
+			this.popBotom = e.target.height || 0
+		},
+		onBlur() {
+			this.isFocus = false
+		},
+		onConfirm() {
+			if (this.inputValue.length === this.codeLength) {
+				this.$emit('confirm', this.inputValue);
 			}
+
 		},
-		computed: {
-			code() {
-				return this.inputValue.split('').slice(0, this.codeLength)
-			},
-			currentIndex() {
-				return this.inputValue.length
-			}
-		},
-		watch: {
-			// show(val) {
-			// 	if (val) {
-			// 		this.$refs.realInput && this.$refs.realInput.focus
-			// 	} else {
-			// 		this.inputValue = ''
-			// 	}
-			// }
-		},
-		mounted() {
-			// uni.onKeyboardHeightChange((res)=>{
-			// 	this.keyboardHeight = res.height;
-			// })
-		},
-		methods: {
-			onInput(e) {
-				let val = e.detail.value.replace(/[^0-9]/g, '').slice(0, this.codeLength)
-				this.inputValue = val
-				this.$emit('input', val)
-				if (val.length === this.codeLength) {
-					this.$emit('finish', val)
-				}
-			},
-			onFocus(e) {
-				this.isFocus = true
-				this.inputValue = ''
-			},
-			onkeyboardheightchange(e){
-				this.popBotom = e.target.height || 0
-			},
-			onBlur() {
-				this.isFocus = false
-			},
-			onConfirm() {
-				if (this.inputValue.length === this.codeLength) {
-					this.$emit('confirm', this.inputValue);
-				}
-				
-			},
-			close() {
-				this.$emit('close')
-			}
+		close() {
+			this.$emit('close')
 		}
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.service-code-modal {
+.service-code-modal {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 999999;
+
+	.modal-mask {
 		position: fixed;
 		left: 0;
 		top: 0;
 		right: 0;
 		bottom: 0;
-		z-index: 999999;
+		background: rgba(0, 0, 0, 0.5);
+		z-index: -1;
+	}
 
-		.modal-mask {
+	.modal-content {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: #fff;
+		border-radius: 32rpx 32rpx 0 0;
+		padding: 56rpx 40rpx 40rpx 40rpx;
+		box-shadow: 0 -8rpx 32rpx rgba(0, 0, 0, 0.08);
+		min-height: 340rpx;
+		align-items: center;
+		display: flex;
+		flex-direction: column;
+		animation: modalUp 0.25s;
+	}
+
+	.modal-title {
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #222;
+		text-align: center;
+	}
+
+	.modal-subtitle {
+		font-size: 28rpx;
+		color: #888;
+		margin: 24rpx 0 40rpx 0;
+		text-align: center;
+	}
+
+	.code-box {
+		flex-direction: row;
+		display: flex;
+		justify-content: center;
+		margin-bottom: 48rpx;
+		position: relative;
+
+		.code-cell {
+			width: 72rpx;
+			height: 72rpx;
+			border: 2rpx solid #eee;
+			border-radius: 16rpx;
+			margin-right: 24rpx;
+			font-size: 40rpx;
+			color: #ff4d8d;
+			background: #fff;
+			text-align: center;
+			line-height: 72rpx;
+			box-sizing: border-box;
+			transition: border-color 0.2s;
+
+			&.active {
+				border-color: #ff4d8d;
+			}
+
+			&.filled {
+				border-color: #ff4d8d;
+			}
+
+			&:last-child {
+				margin-right: 0;
+			}
+		}
+
+		.real-input {
 			position: absolute;
 			left: 0;
 			top: 0;
-			right: 0;
-			bottom: 0;
-			background: rgba(0, 0, 0, 0.15);
-		}
-
-		.modal-content {
-			position: absolute;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			background: #fff;
-			border-radius: 32rpx 32rpx 0 0;
-			padding: 56rpx 40rpx 40rpx 40rpx;
-			box-shadow: 0 -8rpx 32rpx rgba(0, 0, 0, 0.08);
-			min-height: 340rpx;
-			align-items: center;
-			display: flex;
-			flex-direction: column;
-			animation: modalUp 0.25s;
-		}
-
-		.modal-title {
-			font-size: 36rpx;
-			font-weight: bold;
-			color: #222;
-			text-align: center;
-		}
-
-		.modal-subtitle {
-			font-size: 28rpx;
-			color: #888;
-			margin: 24rpx 0 40rpx 0;
-			text-align: center;
-		}
-
-		.code-box {
-			flex-direction: row;
-			display: flex;
-			justify-content: center;
-			margin-bottom: 48rpx;
-			position: relative;
-
-			.code-cell {
-				width: 72rpx;
-				height: 72rpx;
-				border: 2rpx solid #eee;
-				border-radius: 16rpx;
-				margin-right: 24rpx;
-				font-size: 40rpx;
-				color: #ff4d8d;
-				background: #fff;
-				text-align: center;
-				line-height: 72rpx;
-				box-sizing: border-box;
-				transition: border-color 0.2s;
-
-				&.active {
-					border-color: #ff4d8d;
-				}
-
-				&.filled {
-					border-color: #ff4d8d;
-				}
-
-				&:last-child {
-					margin-right: 0;
-				}
-			}
-
-			.real-input {
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 100%;
-				height: 100%;
-				opacity: 0;
-				z-index: 2;
-			}
-		}
-
-		.confirm-btn {
 			width: 100%;
-			height: 88rpx;
-			background: #ff4d8d;
+			height: 100%;
+			opacity: 0;
+			z-index: 2;
+		}
+	}
+
+	.confirm-btn {
+		width: 100%;
+		height: 88rpx;
+		background: #ff4d8d;
+		color: #fff;
+		font-size: 32rpx;
+		border-radius: 16rpx;
+		margin-top: 16rpx;
+		text-align: center;
+		line-height: 88rpx;
+		border: none;
+
+		&:disabled {
+			background: #ffd1e3;
 			color: #fff;
-			font-size: 32rpx;
-			border-radius: 16rpx;
-			margin-top: 16rpx;
-			text-align: center;
-			line-height: 88rpx;
-			border: none;
-
-			&:disabled {
-				background: #ffd1e3;
-				color: #fff;
-			}
-		}
-
-		.close-btn {
-			position: absolute;
-			right: 32rpx;
-			top: 32rpx;
-			font-size: 48rpx;
-			color: #bbb;
-			z-index: 10;
-			font-weight: bold;
-			line-height: 1;
 		}
 	}
 
-	@keyframes modalUp {
-		from {
-			transform: translateY(100%);
-		}
-
-		to {
-			transform: translateY(0);
-		}
+	.close-btn {
+		position: absolute;
+		right: 32rpx;
+		top: 32rpx;
+		font-size: 48rpx;
+		color: #bbb;
+		z-index: 10;
+		font-weight: bold;
+		line-height: 1;
 	}
+}
+
+@keyframes modalUp {
+	from {
+		transform: translateY(100%);
+	}
+
+	to {
+		transform: translateY(0);
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
index 7e7d5c0..57b2e34 100644
--- a/pages/jingxuan/skill-detail.vue
+++ b/pages/jingxuan/skill-detail.vue
@@ -32,7 +32,7 @@
               <cover-view class="slider-track">
                 <cover-view class="slider-bg"></cover-view>
                 <cover-view class="slider-active" :style="activeStyle"></cover-view>
-                <cover-view class="slider-thumb" :style="thumbStyle"></cover-view>
+                <cover-view class="slider-thumb" v-if="currentTime > 0" :style="thumbStyle"></cover-view>
               </cover-view>
 
               <cover-view class="time-text">{{ formatTime(duration) }}</cover-view>
@@ -143,7 +143,8 @@ export default {
       iconFullscreen: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4286ef33-6849-4851-8866-4230d2523a33.png',
 
       article: {},
-      recommendList: []
+      recommendList: [],
+      recommendPage: 1
     }
   },
   computed: {
@@ -301,9 +302,7 @@ export default {
           this.isFavorite = data.collect_state === 1;
           request.post("/sj/skill/list", {
             page: 1,
-            limit: 10,
-            link_type: data.link_type,
-            link_id: data.link_id,
+            limit: 3,
             skill_id: data.id
           }).then((listRes) => {
             if (listRes.code == 200 && listRes.data && listRes.data.list) {
@@ -318,7 +317,7 @@ export default {
                   // 浏览量优先取总浏览量，如果没有则取实际/初始浏览量
                   views: item.total_browse_num || item.real_browse_num || item.browse_num || 0,
                   // 截取时间并格式化
-                  time: item.create_time ? item.create_time.substring(0, 10).replace(/-/g, '-') : '' 
+                  time: item.create_time ? item.create_time.substring(0, 10).replace(/-/g, '-') : ''
                 };
               });
             }
@@ -376,11 +375,58 @@ export default {
       if (this.isRefreshing) return;
       this.isRefreshing = true;
       uni.showLoading({ title: '加载中' });
-      setTimeout(() => {
-        this.recommendList = this.recommendList.sort(() => Math.random() - 0.5);
+
+      // 页码逻辑：到达10重置为1，否则+1
+      if (this.recommendPage >= 10) {
+        this.recommendPage = 1;
+      } else {
+        this.recommendPage++;
+      }
+
+      request.post("/sj/skill/list", {
+        page: this.recommendPage,
+        limit: 3,
+        skill_id: this.article.id
+      }).then((res) => {
+        if (res.code == 200 && res.data && res.data.list && res.data.list.length > 0) {
+          this.recommendList = res.data.list.map(item => ({
+            id: item.id,
+            title: item.name || '暂无标题',
+            coverSrc: item.cover_img || '',
+            type: item.link_name || '平台课程',
+            views: item.browse_num || 0,
+            time: item.create_time ? item.create_time.split(' ')[0] : '',
+            typeIcon: item.link_logo || '',
+            video: item.video || ''
+          }));
+        } else {
+          // 下一页没有数据，重置为1重新请求
+          this.recommendPage = 1;
+          request.post("/sj/skill/list", {
+            page: 1,
+            limit: 3,
+            skill_id: this.article.id
+          }).then((res2) => {
+            if (res2.code == 200 && res2.data && res2.data.list) {
+              this.recommendList = res2.data.list.map(item => ({
+                id: item.id,
+                title: item.name || '暂无标题',
+                coverSrc: item.cover_img || '',
+                type: item.link_name || '平台课程',
+                views: item.browse_num || 0,
+                time: item.create_time ? item.create_time.split(' ')[0] : '',
+                typeIcon: item.link_logo || '',
+                video: item.video || ''
+              }));
+            }
+          });
+        }
         this.isRefreshing = false;
         uni.hideLoading();
-      }, 600);
+      }).catch(() => {
+        this.isRefreshing = false;
+        uni.hideLoading();
+      });
     },
 
     injectMockData() {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index a2043bd..5f20129 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -909,8 +909,8 @@ export default {
 		toruzhu() {
 			const idType = this.userInfo.id_type;
 			const credentialsState = this.userInfo.credentials_state;
-
-			if (idType === 0 && credentialsState === 0) {
+			console.log(idType, credentialsState)
+			if (idType <= 0 && credentialsState === 0) {
 				// 从未入驻
 				uni.navigateTo({
 					url: '/pages/ruzhu/ruzhu'
diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index de0102e..10a1417 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -123,8 +123,9 @@ export default {
   },
   computed: {
     filterIcon() {
-      // 这里的图标链接可以统一成一个，配合CSS的旋转动画更好看
-      return 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png'
+      return this.filterVisible
+        ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png'
+        : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bfe7a104-bef8-4432-9487-42f05e3e9035.png'
     }
   },
   onLoad() {
@@ -466,13 +467,13 @@ export default {
     }
 
     .filter-icon {
-      width: 16rpx;
-      height: 10rpx;
-      transition: transform 0.3s ease;
+      width: 24rpx;
+      height: 24rpx;
 
-      /* 展开时图标倒转 */
+      /* 展开时切换为上下箭头图标，调整大小 */
       &.rotate {
-        transform: rotate(180deg);
+        width: 18rpx;
+        height: 12rpx;
       }
     }
   }
@@ -574,7 +575,6 @@ export default {
   justify-content: center;
 
   border-radius: 12rpx;
-  transition: all 0.3s;
   box-sizing: border-box;
   /* 防止 padding 会撑大盒子 */
 
diff --git a/pages/order/userorder-list.vue b/pages/order/userorder-list.vue
index ada4742..53ead25 100644
--- a/pages/order/userorder-list.vue
+++ b/pages/order/userorder-list.vue
@@ -1,16 +1,11 @@
 <template>
     <view class="order-list-page" style="background-color: #fafafa">
-        
+
         <view class="status" v-if="isLogin">
             <scroll-view scroll-x class="status-tabs" :show-scrollbar="false">
                 <view style="padding-left: 20rpx">
-                    <view 
-                        class="tab-item"
-                        v-for="(item, index) in firstTabs" 
-                        :key="index"
-                        :class="{ active: activeFirstId === item.id }" 
-                        @click="handleFirstTabClick(item)"
-                    >
+                    <view class="tab-item" v-for="(item, index) in firstTabs" :key="index"
+                        :class="{ active: activeFirstId === item.id }" @click="handleFirstTabClick(item)">
                         {{ item.title }}
                     </view>
                 </view>
@@ -18,51 +13,26 @@
 
             <scroll-view scroll-x class="status-tabs2" :show-scrollbar="false">
                 <view style="padding-left: 20rpx; white-space: nowrap; padding-bottom: 20rpx;">
-                    <view 
-                        class="tab-item2"
-                        v-for="(item, index) in secondTabs" 
-                        :key="index"
-                        :class="{ active: activeSecondId === item.id }" 
-                        @click="handleSecondTabClick(item.id, item.title)"
-                    >
+                    <view class="tab-item2" v-for="(item, index) in secondTabs" :key="index"
+                        :class="{ active: activeSecondId === item.id }"
+                        @click="handleSecondTabClick(item.id, item.title)">
                         {{ item.title }}
                     </view>
                 </view>
             </scroll-view>
         </view>
 
-        <CommonList 
-            ref="groupRef" 
-            :isLogin="isLogin" 
-            :apiUrl="apiUrl" 
-            :listScrollHeight="`calc(100vh - 280rpx - 100rpx)`"
-            @load-success="loadSuccess"
-        >
+        <CommonList ref="groupRef" :isLogin="isLogin" :apiUrl="apiUrl"
+            :listScrollHeight="`calc(100vh - 280rpx - 100rpx)`" @load-success="loadSuccess">
             <template #listData="{ list }">
                 <view class="order-item-wrap" v-for="item in popList" :key="item.id">
-                    <OrderCard 
-                        v-if="activeFirstId != 3" 
-                        :haveButton="haveButton" 
-                        :showState="false" 
-                        :dataItem="item"
-                        :typeId="activeFirstId" 
-                        @cancel="cancelOrder($event, item)" 
-                        @start="startOrder($event, item)"
-                        @done="endOrder($event, item)" 
-                        @goOrderDetail="goOrderDetail" 
-                    />
-                    
-                    <WorkHourOrderCard 
-                        v-else 
-                        :showState="false" 
-                        :dataItem="item" 
-                        :typeId="activeFirstId"
-                        @cancel="cancelOrder($event, item)" 
-                        @accept="confirmOrder($event, item)"
-                        @start="startOrder($event, item)" 
-                        @done="endOrder($event, item)" 
-                        @goOrderDetail="goOrderDetail"
-                    >
+                    <OrderCard v-if="activeFirstId != 3" :haveButton="haveButton" :dataItem="item"
+                        :typeId="activeFirstId" @cancel="cancelOrder($event, item)" @start="startOrder($event, item)"
+                        @done="endOrder($event, item)" @goOrderDetail="goOrderDetail" />
+
+                    <WorkHourOrderCard v-else :dataItem="item" :typeId="activeFirstId"
+                        @cancel="cancelOrder($event, item)" @accept="confirmOrder($event, item)"
+                        @start="startOrder($event, item)" @done="endOrder($event, item)" @goOrderDetail="goOrderDetail">
                     </WorkHourOrderCard>
                 </view>
             </template>
@@ -87,651 +57,651 @@
 </template>
 
 <script>
-    import OrderCard from "@/pages/home/components/orderCard2.vue";
-    import WorkHourOrderCard from "@/pages/home/components/workOrderCard.vue";
-    import CommonList from "@/components/common/CommonList.vue";
-    import noLogin from "@/components/noData/noLogin.vue";
-    import request from "@/utils/request";
-    import serviceCodeInput from "@/components/service-code-input/service-code-input.vue";
-    import TabBar from "@/components/tabbar/tabbar.vue";
+import OrderCard from "@/pages/shop/components/orderCard.vue";
+import WorkHourOrderCard from "@/pages/home/components/workOrderCard.vue";
+import CommonList from "@/components/common/CommonList.vue";
+import noLogin from "@/components/noData/noLogin.vue";
+import request from "@/utils/request";
+import serviceCodeInput from "@/components/service-code-input/service-code-input.vue";
+import TabBar from "@/components/tabbar/tabbar.vue";
 
-    export default {
-        name: "filters",
-        props: {
-            title: {
-                type: String,
-                default: "",
-            },
-            userInfo: {
-                type: Object,
-                default: () => ({}),
-            },
-            // 自营状态 0未加入 1加入 2停用
-            selfState: {
-                type: Number,
-                default: 0,
-            },
+export default {
+    name: "filters",
+    props: {
+        title: {
+            type: String,
+            default: "",
         },
-        components: {
-            CommonList,
-            noLogin,
-            serviceCodeInput,
-            OrderCard,
-            WorkHourOrderCard,
-            TabBar
+        userInfo: {
+            type: Object,
+            default: () => ({}),
         },
-        data() {
-            return {
-                isLogin: false, // 将isLogin移至data内管理
-                popList:[],
-                haveButton: true,
-                statusBarHeight: 0,
-                tabs: [{
-                        title: "到店订单",
-                        id: 1
-                    },
-                    {
-                        title: "自营到店订单",
-                        id: 2,
-                        isNeedLogin: true,
-                        isRuzHu: true,
-                        isSelfOrder: true
-                    },
-                    {
-                        title: "工位订单",
-                        id: 3,
-                        isNeedLogin: true,
-                        id_type: 1
-                    },
-                    {
-                        title: "上门订单",
-                        id: 4,
-                        isNeedLogin: true,
-                        id_type: 1
-                    },
-                    {
-                        title: "自营上门订单",
-                        id: 5,
-                        isNeedLogin: true,
-                        id_type: 1
-                    },
-                ], // 1级类目
-                activeFirstId: 1, // 记录选中的1级tab id
-                activeSecondId: 3, // 记录选中的2级tab id（null表示"全部"）
-                numInfo: {
-                    djd: 0,
-                    dfw: 0,
-                    dwc: 0,
-                    nocompletednum: 0,
-                    noconfirmnum: 0,
-                    noservernum: 0,
+        // 自营状态 0未加入 1加入 2停用
+        selfState: {
+            type: Number,
+            default: 0,
+        },
+    },
+    components: {
+        CommonList,
+        noLogin,
+        serviceCodeInput,
+        OrderCard,
+        WorkHourOrderCard,
+        TabBar
+    },
+    data() {
+        return {
+            isLogin: false, // 将isLogin移至data内管理
+            popList: [],
+            haveButton: true,
+            statusBarHeight: 0,
+            tabs: [{
+                title: "到店订单",
+                id: 1
+            },
+            {
+                title: "自营到店订单",
+                id: 2,
+                isNeedLogin: true,
+                isRuzHu: true,
+                isSelfOrder: true
+            },
+            {
+                title: "工位订单",
+                id: 3,
+                isNeedLogin: true,
+                id_type: 1
+            },
+            {
+                title: "上门订单",
+                id: 4,
+                isNeedLogin: true,
+                id_type: 1
+            },
+            {
+                title: "自营上门订单",
+                id: 5,
+                isNeedLogin: true,
+                id_type: 1
+            },
+            ], // 1级类目
+            activeFirstId: 1, // 记录选中的1级tab id
+            activeSecondId: 3, // 记录选中的2级tab id（null表示"全部"）
+            numInfo: {
+                djd: 0,
+                dfw: 0,
+                dwc: 0,
+                nocompletednum: 0,
+                noconfirmnum: 0,
+                noservernum: 0,
+            },
+            sjId: undefined,
+            idType: undefined,
+            showInput: false,
+            orderInfo: {},
+            urls: {
+                1: {
+                    weChatRefund: "/sj/yhwechatrefund",
+                    aliRefund: "/sj/yhalirefund",
+                    startOrder: "/sj/startserver",
+                    endOrder: "/sj/endserver",
+                    ordernum: "/sj/ordernum",
+                    list: "/sj/sjgetyhorder",
                 },
-                sjId: undefined,
-                idType: undefined,
-                showInput: false,
-                orderInfo: {},
-                urls: {
-                    1: {
-                        weChatRefund: "/sj/yhwechatrefund",
-                        aliRefund: "/sj/yhalirefund",
-                        startOrder: "/sj/startserver",
-                        endOrder: "/sj/endserver",
-                        ordernum: "/sj/ordernum",
-                        list: "/sj/sjgetyhorder",
-                    },
-                    2: {
-                        weChatRefund: "/sj/orderSelf/weChatRefund",
-                        aliRefund: "/sj/orderSelf/aliRefund",
-                        startOrder: "/sj/orderSelf/start",
-                        endOrder: "/sj/orderSelf/end",
-                        ordernum: "/sj/orderSelf/orderNum",
-                        list: "/sj/orderSelf/list",
-                    },
-                    3: {
-                        weChatRefund: "/sj/workSeatOrder/weChatRefund",
-                        aliRefund: "/sj/workSeatOrder/aliRefund",
-                        startOrder: "/sj/workSeatOrder/start",
-                        sureOrder:"/sj/workSeatOrder/sure",
-                        endOrder: "/sj/workSeatOrder/end",
-                        ordernum: "/sj/workSeatOrder/orderNum",
-                        list: "/sj/workSeatOrder/list",
-                    },
-                    4: {
-                        ordernum: "/sj/sjonsiteordernum",
-                        list: "/sj/sjonsiteorder",
-                    },
-                    5: {
-                        ordernum: "/sj/sjonsiteordernumself",
-                        list: "/sj/sjonsiteorderself",
-                    }
+                2: {
+                    weChatRefund: "/sj/orderSelf/weChatRefund",
+                    aliRefund: "/sj/orderSelf/aliRefund",
+                    startOrder: "/sj/orderSelf/start",
+                    endOrder: "/sj/orderSelf/end",
+                    ordernum: "/sj/orderSelf/orderNum",
+                    list: "/sj/orderSelf/list",
                 },
-            };
-        },
-        computed: {
-            apiUrl() {
-                if(!this.urls[this.activeFirstId]){
-                    return ""
-                } 
-                const urls = this.urls[this.activeFirstId];
-                return urls.list;
-            },
-            getNumUrl() {
-                const urls = this.urls[this.activeFirstId];
-                return urls.ordernum;
-            },
-            // 计算是否显示自营订单tab
-            showSelfOrderTab() {
-                // 只有当self_state为1或2时才显示自营订单tab
-                return this.selfState == 1 || this.selfState == 2;
-            },
-            firstTabs() {
-                return this.tabs
-                    .filter((tab) => !tab.isNeedLogin || this.isLogin)
-                    .filter((tab) => {
-                        if (tab.id_type) {
-                            return this.idType == tab.id_type;
-                        }
-                        return true;
-                    })
-                    .filter((tab) => !tab.isRuzHu || this.idType != 0)
-                    // 自营订单tab显示条件
-                    .filter((tab) => {
-                        if (tab.isSelfOrder) {
-                            return this.showSelfOrderTab;
-                        }
-                        return true;
-                    });
-            },
-            secondTabs() {
-                if (this.activeFirstId == 1 || this.activeFirstId == 2) {
-                    return [{
-                            title: `待开始(${this.numInfo.noservernum})`,
-                            id: 3
-                        },
-                        {
-                            title: `待完成(${this.numInfo.nocompletednum})`,
-                            id: 4
-                        },
-                    ];
-                } else if (this.activeFirstId == 4 || this.activeFirstId == 5) {
-                    return [{
-                            title: `待接单(${this.numInfo.noconfirmnum})`,
-                            id: 2
-                        },
-                        {
-                            title: `待开始(${this.numInfo.noservernum})`,
-                            id: 3
-                        },
-                        {
-                            title: `待完成(${this.numInfo.nocompletednum})`,
-                            id: 4
-                        },
-                    ];
-                } else {
-                    return [{
-                            title: `待接单(${this.numInfo.djd})`,
-                            id: 2
-                        },
-                        {
-                            title: `待服务(${this.numInfo.dfw})`,
-                            id: 3
-                        },
-                        {
-                            title: `待完成(${this.numInfo.dwc})`,
-                            id: 4
-                        },
-                    ];
+                3: {
+                    weChatRefund: "/sj/workSeatOrder/weChatRefund",
+                    aliRefund: "/sj/workSeatOrder/aliRefund",
+                    startOrder: "/sj/workSeatOrder/start",
+                    sureOrder: "/sj/workSeatOrder/sure",
+                    endOrder: "/sj/workSeatOrder/end",
+                    ordernum: "/sj/workSeatOrder/orderNum",
+                    list: "/sj/workSeatOrder/list",
+                },
+                4: {
+                    ordernum: "/sj/sjonsiteordernum",
+                    list: "/sj/sjonsiteorder",
+                },
+                5: {
+                    ordernum: "/sj/sjonsiteordernumself",
+                    list: "/sj/sjonsiteorderself",
                 }
-
             },
+        };
+    },
+    computed: {
+        apiUrl() {
+            if (!this.urls[this.activeFirstId]) {
+                return ""
+            }
+            const urls = this.urls[this.activeFirstId];
+            return urls.list;
         },
-        onLoad() {
-            uni.hideTabBar(); // 隐藏原生TabBar
+        getNumUrl() {
+            const urls = this.urls[this.activeFirstId];
+            return urls.ordernum;
         },
-        onShow() {
-			this.isLogin = uni.getStorageSync("accessToken") ? true : false;
-			if (this.isLogin) {
-				// 确保默认选中项正确
-				if(!this.activeFirstId) this.activeFirstId = 1;
-				if(!this.activeSecondId) this.activeSecondId = 3; // 或者你想默认 2 (待接单)，这里统一就行
-				
-				// 使用 $nextTick 确保 CommonList 组件已经渲染完毕再调用刷新
-				this.$nextTick(() => {
-					this.searchList();
-				});
-			} else {
-				this.activeFirstId = null;
-				this.activeSecondId = null; 
-				this.popList = []; // 没登录清空数据
-			}
-		},
-        // watch: {
-        //     isLogin(newVal) {
-        //         if (newVal) {
-        //             this.activeFirstId = 1;
-        //             this.activeSecondId = 2; // 默认选中"待接单"
-        //             this.searchList();
-        //         }
-        //     },
-        // },
-        methods: {
-            searchList() {
-                if (this.syrId && this.idType) {
+        // 计算是否显示自营订单tab
+        showSelfOrderTab() {
+            // 只有当self_state为1或2时才显示自营订单tab
+            return this.selfState == 1 || this.selfState == 2;
+        },
+        firstTabs() {
+            return this.tabs
+                .filter((tab) => !tab.isNeedLogin || this.isLogin)
+                .filter((tab) => {
+                    if (tab.id_type) {
+                        return this.idType == tab.id_type;
+                    }
+                    return true;
+                })
+                .filter((tab) => !tab.isRuzHu || this.idType != 0)
+                // 自营订单tab显示条件
+                .filter((tab) => {
+                    if (tab.isSelfOrder) {
+                        return this.showSelfOrderTab;
+                    }
+                    return true;
+                });
+        },
+        secondTabs() {
+            if (this.activeFirstId == 1 || this.activeFirstId == 2) {
+                return [{
+                    title: `待开始(${this.numInfo.noservernum})`,
+                    id: 3
+                },
+                {
+                    title: `待完成(${this.numInfo.nocompletednum})`,
+                    id: 4
+                },
+                ];
+            } else if (this.activeFirstId == 4 || this.activeFirstId == 5) {
+                return [{
+                    title: `待接单(${this.numInfo.noconfirmnum})`,
+                    id: 2
+                },
+                {
+                    title: `待开始(${this.numInfo.noservernum})`,
+                    id: 3
+                },
+                {
+                    title: `待完成(${this.numInfo.nocompletednum})`,
+                    id: 4
+                },
+                ];
+            } else {
+                return [{
+                    title: `待接单(${this.numInfo.djd})`,
+                    id: 2
+                },
+                {
+                    title: `待服务(${this.numInfo.dfw})`,
+                    id: 3
+                },
+                {
+                    title: `待完成(${this.numInfo.dwc})`,
+                    id: 4
+                },
+                ];
+            }
+
+        },
+    },
+    onLoad() {
+        uni.hideTabBar(); // 隐藏原生TabBar
+    },
+    onShow() {
+        this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+        if (this.isLogin) {
+            // 确保默认选中项正确
+            if (!this.activeFirstId) this.activeFirstId = 1;
+            if (!this.activeSecondId) this.activeSecondId = 3; // 或者你想默认 2 (待接单)，这里统一就行
+
+            // 使用 $nextTick 确保 CommonList 组件已经渲染完毕再调用刷新
+            this.$nextTick(() => {
+                this.searchList();
+            });
+        } else {
+            this.activeFirstId = null;
+            this.activeSecondId = null;
+            this.popList = []; // 没登录清空数据
+        }
+    },
+    // watch: {
+    //     isLogin(newVal) {
+    //         if (newVal) {
+    //             this.activeFirstId = 1;
+    //             this.activeSecondId = 2; // 默认选中"待接单"
+    //             this.searchList();
+    //         }
+    //     },
+    // },
+    methods: {
+        searchList() {
+            if (this.syrId && this.idType) {
+                this.$refs.groupRef.manualRefresh({
+                    sjid: this.sjId,
+                    state: this.activeSecondId || undefined,
+
+                });
+            } else {
+                request.post("/sj/user/getUser").then((result) => {
+                    this.sjId = result.data.id;
+                    this.idType = result.data.id_type;
                     this.$refs.groupRef.manualRefresh({
                         sjid: this.sjId,
-                        state: this.activeSecondId || undefined,
-
+                        state: this.activeSecondId,
                     });
-                } else {
-                    request.post("/sj/user/getUser").then((result) => {
-                        this.sjId = result.data.id;
-                        this.idType = result.data.id_type;
-                        this.$refs.groupRef.manualRefresh({
-                            sjid: this.sjId,
-                            state: this.activeSecondId,
-                        });
-                    });
-                }
-            },
-            loadSuccess(res) {
-                this.popList = res.list
-                request
-                    .post(this.getNumUrl, {
-                        sjid: this.sjId,
-                    })
-                    .then((result) => {
-                        for (let key in result.data) {
-                            this.numInfo[key] = result.data[key];
-                        }
-                    });
-            },
-            // 一级tab点击事件
-            handleFirstTabClick(item) {
-				if (!this.isLogin) return;
-				// 避免重复点击 (一定要在最前面！)
-				if (this.activeFirstId === item.id) return;
-				
-				// 【修改点】：判断完不是重复点击后，再清空旧数据
-				this.popList = []; 
-				
-				// 更新1级选中状态
-				this.activeFirstId = item.id;
-
-				this.haveButton = true;
-				if (this.activeFirstId == 4 || this.activeFirstId == 5) {
-					this.haveButton = false;
-				}
-
-				// 重置2级选中状态
-				if (this.activeFirstId == 1 || this.activeFirstId == 2) {
-					this.activeSecondId = 3;
-				} else {
-					this.activeSecondId = 2;
-				}
-
-				this.$emit("tabChange", {
-					firstId: this.activeFirstId,
-					secondId: this.activeSecondId,
-				});
-				
-				this.$nextTick(() => {
-					this.searchList();
-				});
-			},
-            // 二级tab点击事件
-            handleSecondTabClick(id, title) {
-				if (!this.isLogin) return;
-				// 避免重复点击！
-				if (this.activeSecondId === id) return;	
-				// 判断完不是重复点击后，再清空旧数据
-				this.popList = []; 		
-				// 更新2级选中状态
-				this.activeSecondId = id;			
-				this.$emit("tabChange", {
-					firstId: this.activeFirstId,
-					secondId: this.activeSecondId,
-				});
-				
-				this.$nextTick(() => {
-					this.searchList();
-				});
-			},
-            cancelOrder(e, order) {
-                uni.showModal({
-                    title: "取消订单",
-                    content: "确定要取消该订单吗？（订单取消后，支付金额将原路退回）",
-                    success: (res) => {
-                        if (res.confirm) {
-                            // TODO: 取消订单
-                            let data = {
-                                orderNo: order.number,
-                                amount: order.pay_money,
-                                syrid: this.syrId,
-                            };
-                            let url = "";
-                            if (order.pay_kind == 1) {
-                                url = "";
-                            } else if (order.pay_kind == 2) {
-                                url = this.urls[this.activeFirstId].weChatRefund;
-                            } else if (order.pay_kind == 3) {
-                                url = this.urls[this.activeFirstId].aliRefund;
-                            }
-                            console.log(data, url);
-                            if (this.clickType) {
-                                return;
-                            }
-                            this.clickType = true;
-                            request
-                                .post(url, data)
-                                .then((res) => {
-                                    if (res.state == 1 || res.code == 200 || res.code == 1) {
-                                        uni.showToast({
-                                            title: "取消成功！",
-                                            icon: "none",
-                                        });
-                                        this.searchList();
-                                    } else {
-                                        uni.showToast({
-                                            title: res.msg,
-                                            icon: "none",
-                                        });
-                                    }
-                                })
-                                .catch((err) => {
-                                    console.log(err);
-                                })
-                                .finally(() => {
-                                    this.clickType = false;
-                                });
-                        }
-                    },
                 });
-            },
-            // 确认接单
-            confirmOrder(e, order) {
-                if (this.clickType) {
-                    return;
-                }
-                this.clickType = true;
-                console.log(111,this.activeFirstId,this.urls)
-                request
-                    .post(this.urls[this.activeFirstId].sureOrder, {
-                        id: order.id,
-                        syrid: this.syrId,
-                        order_kind: this.idType == 2 ? 3 : 1,
-                    })
-                    .then((res) => {
-                        if (res.state != 1 || res.code != 200) {
-                            uni.showToast({
-                                title: "开始服务",
-                                icon: "none",
-                            });
-                        } else {
-                            uni.showToast({
-                                title: "已接单",
-                                icon: "none",
-                            });
-                        }
-                        this.searchList();
-                    })
-                    .finally(() => {
-                        this.clickType = false;
-                    });
-            },
-            // 开始服务
-            startOrder(e, order) {
-                if (order.team_buy_order_state == 1) {
-                    uni.showToast({
-                        title: "订单当前处于拼团中，服务将在拼团完成后才开启~",
-                        icon: "none",
-                    });
-                    return
-                }
-                this.showInput = true;
-                this.orderInfo = order;
-            },
-            // 输入完成
-            onConfirm(code) {
-                this.showInput = false;
-                if (this.clickType) {
-                    return;
-                }
-                this.clickType = true;
-                console.log(this.orderInfo, "this.urls[this.activeFirstId].startOrder");
-                request
-                    .post(this.urls[this.activeFirstId].startOrder, {
-                        id: this.orderInfo.id,
-                        server_code: code,
-                        sjid: this.sjId,
-                    })
-                    .then((res) => {
-                        console.log(res);
-                        if (res.state == 1 || res.code == 200) {
-                            uni.showToast({
-                                title: "开始服务",
-                                icon: "none",
-                            });
-                            this.searchList();
-                        } else {
-                            uni.showToast({
-                                title: res.msg,
-                                icon: "none",
-                            });
-                        }
-                        this.orderInfo = {};
-                    })
-                    .finally(() => {
-                        this.clickType = false;
-                    });
-            },
-            // 完成服务
-            endOrder(e, order) {
-                // app阻止事件冒泡
-                // #ifdef APP-PLUS
-                // e.preventDefault();
-                // e.stopPropagation();
-                // #endif
-                if (this.clickType) {
-                    return;
-                }
-                this.clickType = true;
-                request
-                    .post(this.urls[this.activeFirstId].endOrder, {
-                        id: order.id,
-                        sjid: this.sjId,
-                    })
-                    .then((res) => {
-                        if (res.state == 1 || res.code == 200) {
-                            uni.showToast({
-                                title: res.msg,
-                                icon: "none",
-                            });
-                            this.searchList();
-                        } else {
-                            uni.showToast({
-                                title: res.msg,
-                                icon: "none",
-                            });
-                        }
-                    })
-                    .finally(() => {
-                        this.clickType = false;
-                    });
-            },
-            goOrderDetail(order) {
-                if (this.idType == 1) {
-                    if (this.activeFirstId == 1) {
-                        uni.navigateTo({
-                            url:  `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
-                        });
-                    }
-                    if (this.activeFirstId == 2) {
-                        uni.navigateTo({
-                            url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2&haveButton=${this.haveButton}`,
-                        });
-                    }
-                    if (this.activeFirstId == 3) {
-                        uni.navigateTo({
-                            url: `/pages/shop/SellerDetail?order_id=${order.id}&haveButton=${this.haveButton}`,
-                        });
-                    }
-                    if (this.activeFirstId == 4) {
-                        uni.navigateTo({
-                            url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
-                        });
-                    }
-                    if (this.activeFirstId == 5) {
-                        uni.navigateTo({
-                            url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2&haveButton=${this.haveButton}`,
-                        });
-                    }
-                }
-            },
-            // 去登录
-            goLogin() {
-                uni.navigateTo({ url: '/pages/blogPopup/blogPopup' });
             }
         },
-    };
+        loadSuccess(res) {
+            this.popList = res.list
+            request
+                .post(this.getNumUrl, {
+                    sjid: this.sjId,
+                })
+                .then((result) => {
+                    for (let key in result.data) {
+                        this.numInfo[key] = result.data[key];
+                    }
+                });
+        },
+        // 一级tab点击事件
+        handleFirstTabClick(item) {
+            if (!this.isLogin) return;
+            // 避免重复点击 (一定要在最前面！)
+            if (this.activeFirstId === item.id) return;
+
+            // 【修改点】：判断完不是重复点击后，再清空旧数据
+            this.popList = [];
+
+            // 更新1级选中状态
+            this.activeFirstId = item.id;
+
+            this.haveButton = true;
+            if (this.activeFirstId == 4 || this.activeFirstId == 5) {
+                this.haveButton = false;
+            }
+
+            // 重置2级选中状态
+            if (this.activeFirstId == 1 || this.activeFirstId == 2) {
+                this.activeSecondId = 3;
+            } else {
+                this.activeSecondId = 2;
+            }
+
+            this.$emit("tabChange", {
+                firstId: this.activeFirstId,
+                secondId: this.activeSecondId,
+            });
+
+            this.$nextTick(() => {
+                this.searchList();
+            });
+        },
+        // 二级tab点击事件
+        handleSecondTabClick(id, title) {
+            if (!this.isLogin) return;
+            // 避免重复点击！
+            if (this.activeSecondId === id) return;
+            // 判断完不是重复点击后，再清空旧数据
+            this.popList = [];
+            // 更新2级选中状态
+            this.activeSecondId = id;
+            this.$emit("tabChange", {
+                firstId: this.activeFirstId,
+                secondId: this.activeSecondId,
+            });
+
+            this.$nextTick(() => {
+                this.searchList();
+            });
+        },
+        cancelOrder(e, order) {
+            uni.showModal({
+                title: "取消订单",
+                content: "确定要取消该订单吗？（订单取消后，支付金额将原路退回）",
+                success: (res) => {
+                    if (res.confirm) {
+                        // TODO: 取消订单
+                        let data = {
+                            orderNo: order.number,
+                            amount: order.pay_money,
+                            syrid: this.syrId,
+                        };
+                        let url = "";
+                        if (order.pay_kind == 1) {
+                            url = "";
+                        } else if (order.pay_kind == 2) {
+                            url = this.urls[this.activeFirstId].weChatRefund;
+                        } else if (order.pay_kind == 3) {
+                            url = this.urls[this.activeFirstId].aliRefund;
+                        }
+                        console.log(data, url);
+                        if (this.clickType) {
+                            return;
+                        }
+                        this.clickType = true;
+                        request
+                            .post(url, data)
+                            .then((res) => {
+                                if (res.state == 1 || res.code == 200 || res.code == 1) {
+                                    uni.showToast({
+                                        title: "取消成功！",
+                                        icon: "none",
+                                    });
+                                    this.searchList();
+                                } else {
+                                    uni.showToast({
+                                        title: res.msg,
+                                        icon: "none",
+                                    });
+                                }
+                            })
+                            .catch((err) => {
+                                console.log(err);
+                            })
+                            .finally(() => {
+                                this.clickType = false;
+                            });
+                    }
+                },
+            });
+        },
+        // 确认接单
+        confirmOrder(e, order) {
+            if (this.clickType) {
+                return;
+            }
+            this.clickType = true;
+            console.log(111, this.activeFirstId, this.urls)
+            request
+                .post(this.urls[this.activeFirstId].sureOrder, {
+                    id: order.id,
+                    syrid: this.syrId,
+                    order_kind: this.idType == 2 ? 3 : 1,
+                })
+                .then((res) => {
+                    if (res.state != 1 || res.code != 200) {
+                        uni.showToast({
+                            title: "开始服务",
+                            icon: "none",
+                        });
+                    } else {
+                        uni.showToast({
+                            title: "已接单",
+                            icon: "none",
+                        });
+                    }
+                    this.searchList();
+                })
+                .finally(() => {
+                    this.clickType = false;
+                });
+        },
+        // 开始服务
+        startOrder(e, order) {
+            if (order.team_buy_order_state == 1) {
+                uni.showToast({
+                    title: "订单当前处于拼团中，服务将在拼团完成后才开启~",
+                    icon: "none",
+                });
+                return
+            }
+            this.showInput = true;
+            this.orderInfo = order;
+        },
+        // 输入完成
+        onConfirm(code) {
+            this.showInput = false;
+            if (this.clickType) {
+                return;
+            }
+            this.clickType = true;
+            console.log(this.orderInfo, "this.urls[this.activeFirstId].startOrder");
+            request
+                .post(this.urls[this.activeFirstId].startOrder, {
+                    id: this.orderInfo.id,
+                    server_code: code,
+                    sjid: this.sjId,
+                })
+                .then((res) => {
+                    console.log(res);
+                    if (res.state == 1 || res.code == 200) {
+                        uni.showToast({
+                            title: "开始服务",
+                            icon: "none",
+                        });
+                        this.searchList();
+                    } else {
+                        uni.showToast({
+                            title: res.msg,
+                            icon: "none",
+                        });
+                    }
+                    this.orderInfo = {};
+                })
+                .finally(() => {
+                    this.clickType = false;
+                });
+        },
+        // 完成服务
+        endOrder(e, order) {
+            // app阻止事件冒泡
+            // #ifdef APP-PLUS
+            // e.preventDefault();
+            // e.stopPropagation();
+            // #endif
+            if (this.clickType) {
+                return;
+            }
+            this.clickType = true;
+            request
+                .post(this.urls[this.activeFirstId].endOrder, {
+                    id: order.id,
+                    sjid: this.sjId,
+                })
+                .then((res) => {
+                    if (res.state == 1 || res.code == 200) {
+                        uni.showToast({
+                            title: res.msg,
+                            icon: "none",
+                        });
+                        this.searchList();
+                    } else {
+                        uni.showToast({
+                            title: res.msg,
+                            icon: "none",
+                        });
+                    }
+                })
+                .finally(() => {
+                    this.clickType = false;
+                });
+        },
+        goOrderDetail(order) {
+            if (this.idType == 1) {
+                if (this.activeFirstId == 1) {
+                    uni.navigateTo({
+                        url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
+                    });
+                }
+                if (this.activeFirstId == 2) {
+                    uni.navigateTo({
+                        url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2&haveButton=${this.haveButton}`,
+                    });
+                }
+                if (this.activeFirstId == 3) {
+                    uni.navigateTo({
+                        url: `/pages/shop/SellerDetail?order_id=${order.id}&haveButton=${this.haveButton}`,
+                    });
+                }
+                if (this.activeFirstId == 4) {
+                    uni.navigateTo({
+                        url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
+                    });
+                }
+                if (this.activeFirstId == 5) {
+                    uni.navigateTo({
+                        url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2&haveButton=${this.haveButton}`,
+                    });
+                }
+            }
+        },
+        // 去登录
+        goLogin() {
+            uni.navigateTo({ url: '/pages/blogPopup/blogPopup' });
+        }
+    },
+};
 </script>
 
 <style scoped lang="less">
-    .order-list-page {
-        min-height: 100vh;
-        display: flex;
-        flex-direction: column;
-    }
+.order-list-page {
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+}
 
-    /* 状态标签栏 (移植自用户端示例) */
-    .status {
-        position: sticky;
-        top: 0;
-        /* #ifdef H5 */
-        top: 88rpx;
-        /* H5端顶部适配 */
-        /* #endif */
-        left: 0;
-        right: 0;
-        background: #fff;
-        z-index: 99;
-    }
+/* 状态标签栏 (移植自用户端示例) */
+.status {
+    position: sticky;
+    top: 0;
+    /* #ifdef H5 */
+    top: 88rpx;
+    /* H5端顶部适配 */
+    /* #endif */
+    left: 0;
+    right: 0;
+    background: #fff;
+    z-index: 99;
+}
 
-    .status-tabs {
-        height: 94rpx;
-        background-color: #ffffff;
-        white-space: nowrap;
-    }
+.status-tabs {
+    height: 94rpx;
+    background-color: #ffffff;
+    white-space: nowrap;
+}
 
-    .tab-item {
-        display: inline-block;
-        height: 48rpx;
-        position: relative;
+.tab-item {
+    display: inline-block;
+    height: 48rpx;
+    position: relative;
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+    line-height: 42rpx;
+    text-align: left;
+    font-style: normal;
+    margin: 20rpx 50rpx 26rpx 0rpx;
+
+    &.active {
+        color: #ff4767;
         font-weight: 500;
-        font-size: 30rpx;
-        color: #333333;
-        line-height: 42rpx;
-        text-align: left;
-        font-style: normal;
-        margin: 20rpx 50rpx 26rpx 0rpx;
-        
-        &.active {
-            color: #ff4767;
-            font-weight: 500;
-        }
-
-        &.active::after {
-            content: "";
-            position: absolute;
-            width: 34rpx;
-            height: 6rpx;
-            left: 50%;
-            bottom: -16rpx;
-            transform: translateX(-50%);
-            background-color: #ff4767;
-            border-radius: 3rpx;
-        }
     }
 
-    .status-tabs2 {
-        height: 56rpx;
-        background-color: #ffffff;
-        white-space: nowrap;
-        padding-bottom: 30rpx;
-        padding-top: 10rpx;
-    }
-
-    .tab-item2 {
-        display: inline-block;
-        height: 56rpx;
-        padding: 0 20rpx;
-        background: #f3f5f6;
-        border-radius: 10rpx;
-        position: relative;
-        margin: 0 18rpx 0 0;
-        font-weight: 400;
-        font-size: 28rpx;
-        color: #333333;
-        line-height: 56rpx;
-        text-align: left;
-        font-style: normal;
-        
-        &.active {
-            color: #ff4767;
-            font-weight: 500;
-            background: #fee5e7;
-        }
-    }
-
-    /* 数据列表及卡片外框样式 */
-    .order-item-wrap {
-        margin: 0 0 24rpx 0;
-        border-radius: 20rpx;
-        overflow: hidden;
-    }
-
-    .noDataBox {
-        background-color: transparent;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
-
-    /* 未登录状态的样式 */
-    .nologin_part {
-        display: flex;
-        flex-flow: column nowrap;
-        justify-content: center;
-        align-items: center;
-    }
-
-    .nologin_icon {
-        width: 360rpx;
-        height: 360rpx;
-        margin-top: 100rpx;
-        margin-bottom: 40rpx;
-    }
-
-    .btn-login {
-        width: 200rpx;
-        height: 68rpx;
+    &.active::after {
+        content: "";
+        position: absolute;
+        width: 34rpx;
+        height: 6rpx;
+        left: 50%;
+        bottom: -16rpx;
+        transform: translateX(-50%);
         background-color: #ff4767;
-        border-radius: 34rpx;
-        display: flex;
-        flex-flow: row nowrap;
-        justify-content: center;
-        align-items: center;
-        box-shadow: 0 4rpx 10rpx rgba(255, 71, 103, 0.3);
+        border-radius: 3rpx;
     }
+}
 
-    .login-text {
-        font-size: 30rpx;
-        color: #fff;
-    }
+.status-tabs2 {
+    height: 56rpx;
+    background-color: #ffffff;
+    white-space: nowrap;
+    padding-bottom: 30rpx;
+    padding-top: 10rpx;
+}
 
-    ::v-deep .list-scroll {
-        margin-top: 0 !important;
-        box-sizing: border-box;
-        /* padding-top: 24rpx; */
+.tab-item2 {
+    display: inline-block;
+    height: 56rpx;
+    padding: 0 20rpx;
+    background: #f3f5f6;
+    border-radius: 10rpx;
+    position: relative;
+    margin: 0 18rpx 0 0;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #333333;
+    line-height: 56rpx;
+    text-align: left;
+    font-style: normal;
+
+    &.active {
+        color: #ff4767;
+        font-weight: 500;
+        background: #fee5e7;
     }
+}
+
+/* 数据列表及卡片外框样式 */
+.order-item-wrap {
+    background-color: #fff;
+    border-radius: 12px;
+    overflow: hidden;
+}
+
+.noDataBox {
+    background-color: transparent;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+/* 未登录状态的样式 */
+.nologin_part {
+    display: flex;
+    flex-flow: column nowrap;
+    justify-content: center;
+    align-items: center;
+}
+
+.nologin_icon {
+    width: 360rpx;
+    height: 360rpx;
+    margin-top: 100rpx;
+    margin-bottom: 40rpx;
+}
+
+.btn-login {
+    width: 200rpx;
+    height: 68rpx;
+    background-color: #ff4767;
+    border-radius: 34rpx;
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: center;
+    align-items: center;
+    box-shadow: 0 4rpx 10rpx rgba(255, 71, 103, 0.3);
+}
+
+.login-text {
+    font-size: 30rpx;
+    color: #fff;
+}
+
+::v-deep .list-scroll {
+    margin-top: 0 !important;
+    box-sizing: border-box;
+    /* padding-top: 24rpx; */
+}
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index d898f5c..d9d54e5 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -17,7 +17,7 @@
             </view>
 
             <view v-else-if="currentStep === 2">
-                <successruzhu :data="successData"></successruzhu>
+                <successruzhu :data="successData" @stateChange="onStateChange"></successruzhu>
             </view>
 
             <view v-else-if="currentStep === 3">
@@ -25,7 +25,7 @@
             </view>
 
             <view v-else-if="currentStep === 4">
-                <successruzhu :data="successData"></successruzhu>
+                <successruzhu :data="successData" @stateChange="onStateChange"></successruzhu>
             </view>
         </view>
         <view class="kong"></view>
@@ -73,7 +73,7 @@
             <!-- 步骤3: 门店信息 -->
             <view v-else-if="currentStep === 3" class="step-2-buttons">
                 <view class="button-row">
-                    <view class="prev-btn" @click="goPrev">
+                    <view v-if="!isRejected" class="prev-btn" @click="goPrev">
                         <text class="prev-text">上一步</text>
                     </view>
                     <view class="submit-btn" @click="submitApplication">
@@ -84,7 +84,15 @@
 
             <!-- 步骤4: 资质认证成功 -->
             <view v-else-if="currentStep === 4" class="step-2-buttons">
-                <view class="button-row">
+                <view v-if="isRejected" class="button-row">
+                    <view class="prev-btn" @click="resubmit">
+                        <text class="prev-text">重新提交</text>
+                    </view>
+                    <view class="showziliao1" @click="topt">
+                        <text class="showziliaotext1">进入平台</text>
+                    </view>
+                </view>
+                <view v-else class="button-row">
                     <view class="showziliao" @click="topt">
                         <text class="showziliaotext">进入平台</text>
                     </view>
@@ -110,7 +118,7 @@ export default {
     },
     data() {
         return {
-            currentStep: 3, // 当前步骤索引
+            currentStep: 0, // 当前步骤索引
             isAgree: false,
             identity: null,
             textData: {},
@@ -120,6 +128,7 @@ export default {
             qualificationData: null, // 新增：保存资质信息
             storeInfoData: null, // 新增：保存门店信息
             successData: {}, //入驻提示
+            isRejected: false, // 是否审核失败
             // 新增：缓存手艺人数据
             artisanDataCache: {
                 personalInfo: null,
@@ -138,6 +147,10 @@ export default {
     },
     async onLoad(options) {
         console.log(options, 'options---');
+        if (options.type == 0 && options.step == 3) {
+            this.currentStep = 3
+            this.isRejected = true
+        }
         if (options.type == 1) {
             this.currentStep = 4
         }
@@ -165,6 +178,16 @@ export default {
                 url: '/pages/home/home'
             })
         },
+        onStateChange(state) {
+            if (state === 3) {
+                this.isRejected = true;
+            }
+        },
+        resubmit() {
+            uni.navigateTo({
+                url: '/pages/ruzhu/ruzhu?type=0&step=3'
+            });
+        },
         // 获取用户信息（复用不可服务时间页面的方法）
         async getUserInfoSync() {
             await request.post('/sj/userSjAuth/details', {
@@ -807,6 +830,13 @@ export default {
     border-radius: 49rpx;
 }
 
+.showziliao1 {
+    width: 400rpx;
+    height: 98rpx;
+    background: #FF4767;
+    border-radius: 49rpx;
+}
+
 .showziliaotext {
     height: 40rpx;
     font-family: PingFangSC, PingFang SC;
@@ -818,4 +848,16 @@ export default {
     margin: 0 0 0 281rpx;
     align-items: center;
 }
+
+.showziliaotext1 {
+    height: 40rpx;
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #FFFFFF;
+    line-height: 96rpx;
+    font-style: normal;
+    margin: 0 0 0 140rpx;
+    align-items: center;
+}
 </style>
\ No newline at end of file
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 63aafa5..417ba2e 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -391,6 +391,7 @@ export default {
     this.regionCitys = this.ChinaCitys[0].citys;
     this.regionAreas = this.regionCitys[0].areas;
     this.setupAddressListener();
+    await this.loadDetailsData();
   },
   beforeDestroy() {
     this.removeAddressListener();
@@ -405,6 +406,67 @@ export default {
       });
     },
 
+    async loadDetailsData() {
+      try {
+        const res = await request.post('/sj/userSjAuth/details', {
+          type: 1
+        });
+        if (res.code === 200 && res.data) {
+          const data = res.data;
+          this.$set(this.formData, 'uscc_photo', data.uscc_photo || '');
+          this.$set(this.formData, 'uscc_type', data.uscc_type || '');
+          this.$set(this.formData, 'uscc_num', data.uscc_num || '');
+          this.$set(this.formData, 'uscc_name', data.uscc_name || '');
+          this.$set(this.formData, 'uscc_dependency', data.uscc_dependency || '');
+          this.$set(this.formData, 'uscc_address', data.uscc_address || '');
+          this.$set(this.formData, 'uscc_province', data.uscc_province || '');
+          this.$set(this.formData, 'uscc_city', data.uscc_city || '');
+          this.$set(this.formData, 'uscc_area', data.uscc_area || '');
+          this.$set(this.formData, 'longitude', data.longitude || '');
+          this.$set(this.formData, 'latitude', data.latitude || '');
+          this.$set(this.formData, 'legal_idcard_positive', data.legal_idcard_positive || '');
+          this.$set(this.formData, 'legal_idcard_negative', data.legal_idcard_negative || '');
+          this.$set(this.formData, 'legal_name', data.legal_name || '');
+          this.$set(this.formData, 'legal_phone', data.legal_phone || '');
+          this.$set(this.formData, 'legal_idcard_num', data.legal_idcard_num || '');
+          // 处理身份证有效期：legal_idcard_expiry 拆分为 type、start、end
+          if (data.legal_idcard_expiry) {
+            const expiry = data.legal_idcard_expiry;
+            if (expiry === '长久' || expiry === '长久有效') {
+              this.$set(this.formData, 'legal_idcard_expiry_type', '1');
+              this.$set(this.formData, 'legal_idcard_expiry_end', '长久有效');
+            } else if (expiry.includes('——') || expiry.includes('--') || expiry.includes('-')) {
+              const separator = expiry.includes('——') ? '——' : (expiry.includes('--') ? '--' : '-');
+              const [startStr, endStr] = expiry.split(separator);
+              const startDate = startStr.trim();
+              const endDate = endStr.trim();
+              this.$set(this.formData, 'legal_idcard_expiry_start', startDate);
+              if (endDate === '长久' || !endDate) {
+                this.$set(this.formData, 'legal_idcard_expiry_type', '1');
+                this.$set(this.formData, 'legal_idcard_expiry_end', '长久有效');
+              } else {
+                this.$set(this.formData, 'legal_idcard_expiry_type', '2');
+                this.$set(this.formData, 'legal_idcard_expiry_end', endDate);
+              }
+            }
+          } else {
+            this.$set(this.formData, 'legal_idcard_expiry_type', data.legal_idcard_expiry_type || '1');
+            this.$set(this.formData, 'legal_idcard_expiry_start', data.legal_idcard_expiry_start || '');
+            this.$set(this.formData, 'legal_idcard_expiry_end', data.legal_idcard_expiry_end || '');
+          }
+          if (data.qualifications_sector) {
+            this.$set(this.formData, 'qualifications_sector', typeof data.qualifications_sector === 'string' ? JSON.parse(data.qualifications_sector) : data.qualifications_sector);
+          }
+          if (data.qualifications_other) {
+            this.$set(this.formData, 'qualifications_other', typeof data.qualifications_other === 'string' ? JSON.parse(data.qualifications_other) : data.qualifications_other);
+          }
+          console.log('sj-info 数据回显完成:', this.formData);
+        }
+      } catch (error) {
+        console.error('获取详情数据失败:', error);
+      }
+    },
+
     chooseImage(type) {
       uni.chooseImage({
         count: 1,
diff --git a/pages/ruzhu/successruzhu.vue b/pages/ruzhu/successruzhu.vue
index e450ebc..d162d0c 100644
--- a/pages/ruzhu/successruzhu.vue
+++ b/pages/ruzhu/successruzhu.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="pages">
 		<custom-navbar :title="infoData.top" :showBack="true"></custom-navbar>
-		<view class="title-icon">{{infoData.title}}</view>
-		<view class="title-content">{{infoData.notice}}</view>
+		<view class="title-icon">{{ infoData.title }}</view>
+		<view class="title-content">{{ infoData.notice }}</view>
 		<view class="erweimabox">
 			<view class="erweimab">
 				<image :src="infoData.photo" mode="widthFix"
@@ -37,7 +37,27 @@ export default {
 				const res = await request.post('/sj/userSjAuth/getCustomerService');
 				console.log('客服接口返回：', res);
 				if (res && (res.state == 1 || res.code == 200)) {
-					this.infoData = res.data || {};
+					if (res.data.state != 3) {
+						this.infoData = res.data || {};
+					} else {
+						this.infoData = {
+							top: '审核结果',
+							title: '审核失败',
+							photo: res.data.photo
+						};
+						this.$emit('stateChange', 3);
+						request.post('/sj/userSjAuth/details', {
+							type: 1
+						}).then(res => {
+							if (res && (res.state == 1 || res.code == 200)) {
+								console.log(res.data.back_text, '驳回res')
+								this.infoData = {
+									...this.infoData,
+									notice: res.data.back_text || '您的入驻申请未通过，请重新提交申请'
+								};
+							}
+						})
+					}
 				}
 			} catch (e) {
 				console.error('获取客服信息失败：', e);

From a28cc75da8ca4d7b129f361fe6dd7a15d074b93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Fri, 5 Jun 2026 18:20:19 +0800
Subject: [PATCH 104/118] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/brand-detail.vue           | 119 ++++++++++++++++------
 pages/my/myFavorite.vue                   |   1 -
 pages/shop/verify/manual-verify.vue       |  49 +++++----
 pages/shop/verify/verify-order-detail.vue |  32 ++++--
 pages/shop/verify/verify-order.nvue       |  11 +-
 5 files changed, 143 insertions(+), 69 deletions(-)

diff --git a/pages/jingxuan/brand-detail.vue b/pages/jingxuan/brand-detail.vue
index 1edc59c..96d01d6 100644
--- a/pages/jingxuan/brand-detail.vue
+++ b/pages/jingxuan/brand-detail.vue
@@ -20,22 +20,32 @@
     <view class="banner-section" v-if="bannerList && bannerList.length">
 
       <!-- 轮播图区域 -->
-      <swiper class="banner-swiper" circular @change="onSwiperChange" :autoplay="false" :current="currentBannerIndex">
-        <!-- 视频作为第一项 -->
-        <swiper-item v-if="info.video">
-          <video id="myVideo" class="banner-video" :src="info.video" :autoplay="currentBannerIndex === 0" controls
-            object-fit="cover" :show-center-play-btn="false" :show-play-btn="false" @play="onVideoPlay"
-            @pause="onVideoPause" @ended="onVideoEnded"></video>
-        </swiper-item>
-        <!-- 图片轮播 -->
+      <swiper class="banner-swiper" circular @change="onSwiperChange" :autoplay="true" :current="currentBannerIndex">
         <swiper-item v-for="(item, index) in bannerList" :key="index">
           <image class="banner-img" :src="item" mode="aspectFill"></image>
+          <!-- 第一张图上显示视频播放按钮 -->
+          <view v-if="index === 0 && info.video" class="video-play-overlay" @click="playVideo">
+            <image class="video-play-icon"
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/107eb3d6-cb8f-4857-aaf0-8654203c1c52.png"
+              mode="aspectFit"></image>
+          </view>
         </swiper-item>
       </swiper>
 
       <!-- 指示器 -->
       <view class="indicator" v-if="bannerList.length > 0">
-        <text>{{ currentBannerIndex + 1 }} / {{ totalSlides }}</text>
+        <text>{{ currentBannerIndex + 1 }} / {{ bannerList.length }}</text>
+      </view>
+
+      <!-- 视频播放层 -->
+      <view v-if="showVideo" class="video-fullscreen-mask">
+        <video id="myVideo" class="fullscreen-video" :src="info.video" :autoplay="true" :controls="true"
+          object-fit="contain" :show-center-play-btn="true" :show-play-btn="true" @play="onVideoPlay"
+          @pause="onVideoPause" @ended="onVideoEnded">
+          <cover-view class="video-close-btn" @click.stop="closeVideo">
+            <cover-view class="video-close-icon" @click.stop="closeVideo">关闭</cover-view>
+          </cover-view>
+        </video>
       </view>
     </view>
 
@@ -216,6 +226,8 @@ export default {
       phoneIconRight: 50,    // 顶部电话图标初始Right
 
       currentBannerIndex: 0,
+      showVideo: false,
+      isVideoPlaying: false,
       isExpanded: false,
       activeTab: 0,
 
@@ -303,10 +315,7 @@ export default {
     showTabSection() {
       return this.availableTabs.length > 0;
     },
-    // 总轮播数（视频+图片）
-    totalSlides() {
-      return this.bannerList.length + (this.info.video ? 1 : 0);
-    },
+
     canSubmit() {
       const d = this.formData;
       const baseValid = d.contact_name && d.contact_phone && d.province_code && d.city_code && d.area_code && d.intention;
@@ -336,6 +345,13 @@ export default {
     // 每次进入页面时，根据 accessToken 刷新登录状态，就像 my-page 里面写的一样
     this.isLogin = uni.getStorageSync("accessToken") ? true : false;
   },
+  onBackPress() {
+    if (this.showVideo) {
+      this.closeVideo();
+      return true;
+    }
+    return false;
+  },
   methods: {
     //  弹窗组件相关方法 
     closePopup() {
@@ -502,17 +518,24 @@ export default {
     },
 
     // 视频事件处理
+    playVideo() {
+      this.showVideo = true;
+    },
+    closeVideo() {
+      const videoContext = uni.createVideoContext('myVideo', this);
+      videoContext.stop();
+      this.showVideo = false;
+      this.isVideoPlaying = false;
+    },
     onVideoPlay() {
-      console.log('视频开始播放');
+      this.isVideoPlaying = true;
     },
     onVideoPause() {
-      console.log('视频暂停');
+      this.isVideoPlaying = false;
     },
     onVideoEnded() {
-      // 视频播放结束，切换到下一张图片
-      if (this.bannerList.length > 0) {
-        this.currentBannerIndex = 1;
-      }
+      // 视频播放结束，关闭视频层
+      this.closeVideo();
     },
 
     // 悬浮按钮切换 Mock 数据
@@ -749,6 +772,10 @@ export default {
   .banner-swiper {
     width: 100%;
     height: 100%;
+
+    swiper-item {
+      position: relative;
+    }
   }
 
   .banner-img {
@@ -756,19 +783,51 @@ export default {
     height: 100%;
   }
 
-  .center-play-icon {
+  .video-play-overlay {
     position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: 120rpx;
-    height: 120rpx;
-    z-index: 20;
-    transition: opacity 0.3s;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10;
+  }
 
-    &:active {
-      opacity: 0.8;
-    }
+  .video-play-icon {
+    width: 100rpx;
+    height: 100rpx;
+  }
+
+  .video-fullscreen-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: #000;
+    z-index: 9999;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .video-close-btn {
+    position: absolute;
+    top: 140rpx;
+    right: 60rpx;
+    z-index: 10000;
+  }
+
+  .video-close-icon {
+    color: #fff;
+    font-size: 40rpx;
+  }
+
+  .fullscreen-video {
+    width: 100%;
+    height: 100%;
   }
 
   .album {
diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index 10a1417..439c663 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -444,7 +444,6 @@ export default {
       border-radius: 27rpx;
       margin-right: 40rpx;
       padding: 9rpx 24rpx;
-      transition: all 0.3s ease;
 
       &.active {
         color: #FF4767;
diff --git a/pages/shop/verify/manual-verify.vue b/pages/shop/verify/manual-verify.vue
index 5ccb819..2e6aabd 100644
--- a/pages/shop/verify/manual-verify.vue
+++ b/pages/shop/verify/manual-verify.vue
@@ -6,26 +6,13 @@
       <view class="tip">请输入6位核销码</view>
 
       <view class="code-inputs" @tap="focusInput">
-        <view
-          class="input-box"
-          :class="{ filled: code[i-1] }"
-          v-for="i in 6"
-          :key="i"
-        >
-          {{ code[i-1] || '' }}
+        <view class="input-box" :class="{ filled: code[i - 1] }" v-for="i in 6" :key="i">
+          {{ code[i - 1] || '' }}
         </view>
       </view>
 
-      <input
-        class="hidden-input"
-        type="number"
-        maxlength="6"
-        :value="code"
-        :focus="inputFocus"
-        @input="onInput"
-        @blur="resetFocus"
-        confirm-type="done"
-      />
+      <input class="hidden-input" type="text" maxlength="6" :value="code" :focus="inputFocus"
+        :selection-start="cursorPos" :selection-end="cursorPos" @input="onInput" @blur="onBlur" confirm-type="done" />
 
       <button class="confirm-btn" :class="{ active: code.length === 6 }" @tap="submitCode">
         确认
@@ -43,18 +30,32 @@ export default {
   data() {
     return {
       code: '',
-      inputFocus: false
+      inputFocus: true,
+      isBlurred: false
     };
   },
+  computed: {
+    // 光标永远定位在最后一位
+    cursorPos() {
+      return this.code.length;
+    }
+  },
+  onReady() {
+    this.$nextTick(() => {
+      this.inputFocus = true;
+    });
+  },
   methods: {
     focusInput() {
+      // 核心修复：无论如何，重新聚焦时强制光标在最后
       this.inputFocus = false;
       this.$nextTick(() => {
         this.inputFocus = true;
+        this.isBlurred = false;
       });
     },
-    resetFocus() {
-      this.inputFocus = false;
+    onBlur() {
+      this.isBlurred = true;
     },
     onInput(e) {
       let value = e.detail.value;
@@ -65,25 +66,23 @@ export default {
     submitCode() {
       if (this.code.length !== 6) {
         uni.showToast({ title: '请输入6位核销码', icon: 'none' });
+        this.focusInput();
         return;
       }
-      
+
       uni.showLoading({ title: '查询订单中...', mask: true });
-      
-      // 统一调用查询接口，不要在这里调用核销接口
+
       request.post('/sj/poster/getOrderByCode', {
         server_code: this.code
       }).then(res => {
         uni.hideLoading();
         if (res.code === 200 && res.data) {
           res.data.server_code = this.code;
-          // 查询成功，带上数据跳 detail 页
           const orderDataStr = encodeURIComponent(JSON.stringify(res.data));
           uni.navigateTo({
             url: `/pages/shop/verify/verify-order-detail?data=${orderDataStr}`
           });
         } else {
-          // 查询不到，跳 fail 页
           uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });
         }
       }).catch(() => {
diff --git a/pages/shop/verify/verify-order-detail.vue b/pages/shop/verify/verify-order-detail.vue
index 9a5e610..7cfa055 100644
--- a/pages/shop/verify/verify-order-detail.vue
+++ b/pages/shop/verify/verify-order-detail.vue
@@ -5,7 +5,9 @@
 
     <scroll-view class="scroll-content" scroll-y="true">
       <view class="page-header">
-        <image class="header-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/be13b4f4-c0db-4f39-b9fc-0e69c13b72ee.png" mode="aspectFit"></image>
+        <image class="header-icon"
+          src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/be13b4f4-c0db-4f39-b9fc-0e69c13b72ee.png"
+          mode="aspectFit"></image>
         <view class="header-text-box">
           <view class="header-title">工时订单</view>
           <view class="header-sub">请确认核销订单信息～</view>
@@ -165,9 +167,9 @@ export default {
         uni.hideLoading();
         if (res.code === 200) {
           uni.showToast({ title: '核销成功', icon: 'success' });
-          setTimeout(() => {
-            uni.navigateBack();
-          }, 1500);
+		  uni.navigateTo({
+		  	url:'/pages/order/userorder-detail?order_id='+this.orderData.orderId
+		  })
         } else {
           uni.showToast({ title: res.msg || '核销失败，请重试', icon: 'none' });
           this.isVerifying = false;
@@ -233,7 +235,7 @@ export default {
 
 /* 可滚动内容区域 */
 .scroll-content {
-  padding-top: 40rpx; 
+  padding-top: 40rpx;
   flex: 1;
   padding-bottom: 20rpx;
   box-sizing: border-box;
@@ -251,9 +253,11 @@ export default {
     height: 95rpx;
     margin-right: 20rpx;
   }
+
   .header-text-box {
     display: flex;
     flex-direction: column;
+
     .header-title {
       font-weight: 500;
       font-size: 36rpx;
@@ -261,6 +265,7 @@ export default {
       line-height: 50rpx;
       margin-bottom: 12rpx;
     }
+
     .header-sub {
       font-weight: 400;
       font-size: 24rpx;
@@ -277,7 +282,7 @@ export default {
   margin: 24rpx 30rpx;
   padding: 20rpx;
   box-shadow: none;
-  
+
   .card-title {
     font-weight: 500;
     font-size: 30rpx;
@@ -293,6 +298,7 @@ export default {
   font-size: 28rpx;
   color: #666666;
   line-height: 40rpx;
+
   .ml-10 {
     margin-left: 6rpx;
   }
@@ -332,6 +338,7 @@ export default {
         line-height: 42rpx;
         max-width: 380rpx;
       }
+
       .goods-quantity {
         font-weight: 400;
         font-size: 28rpx;
@@ -346,6 +353,7 @@ export default {
       color: #333333;
       line-height: 50rpx;
     }
+
     .money-symbol1 {
       font-size: 24rpx;
     }
@@ -358,9 +366,14 @@ export default {
   flex-direction: row;
   justify-content: space-between;
   align-items: baseline;
-  
-  &.mt-10 { margin-top: 20rpx; }
-  &.mt-15 { margin-top: 30rpx; }
+
+  &.mt-10 {
+    margin-top: 20rpx;
+  }
+
+  &.mt-15 {
+    margin-top: 30rpx;
+  }
 
   .label {
     font-weight: 400;
@@ -421,6 +434,7 @@ export default {
     color: #FF4767;
     line-height: 56rpx;
   }
+
   .money-symbol2 {
     font-size: 26rpx;
     margin-right: 5rpx;
diff --git a/pages/shop/verify/verify-order.nvue b/pages/shop/verify/verify-order.nvue
index a21a35b..4c80495 100644
--- a/pages/shop/verify/verify-order.nvue
+++ b/pages/shop/verify/verify-order.nvue
@@ -80,13 +80,13 @@ export default {
         this.isProcessing = false;
         return;
       }
-      
+      console.log('扫码结果：-----------', code)
       uni.showLoading({ title: '查询订单中...' });
       
-      request.post('/sj/poster/getOrderByCode', { server_code: code }).then(result => {
+      request.post('/sj/poster/getOrderByCode', { encrypted: code }).then(result => {
+        console.log(result,'resultresultresultresult0.0.0.0.0.0')
         uni.hideLoading();
-        
-        if (result.code === 200 && result.data) {
+        if (result.code == 200) {
           result.data.server_code = code;
           uni.showToast({ title: '扫码成功！', icon: 'none' });
           const orderDataStr = encodeURIComponent(JSON.stringify(result.data));
@@ -96,11 +96,14 @@ export default {
           // 延迟重置防抖，避免重复扫码跳转
           setTimeout(() => { this.isProcessing = false; }, 1000);
         } else {
+          console.log('失败1')
           // 失败直接跳 fail 页
           this.isProcessing = false; // 必须马上重置，保证退回该页时能继续扫
           uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });
         }
       }).catch((err) => {
+          console.log('失败2')
+
         uni.hideLoading();
         this.isProcessing = false;
         uni.navigateTo({ url: '/pages/shop/verify/verify-fail' });

From e96c468c3885d21a97939bf6eda38473273a92ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Mon, 8 Jun 2026 11:12:16 +0800
Subject: [PATCH 105/118] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=9B=BF=E6=8D=A2=EF=BC=8C=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=AD=9B=E9=80=89=E6=8C=89=E9=92=AE=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=85=A5=E4=BD=8F=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E6=AD=A5=E5=BC=B9=E7=AA=97=E6=8C=89=E9=92=AE=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/my.vue                  |   2 +-
 pages/my/myFavorite.vue          |   3 +-
 pages/ruzhu/qualification_sj.vue | 500 +++++++++++++++----------------
 3 files changed, 253 insertions(+), 252 deletions(-)

diff --git a/pages/my/my.vue b/pages/my/my.vue
index 5f20129..1e15690 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -317,7 +317,7 @@ export default {
 					title: "购买工时",
 					path: "/pages/shop/manHour/saleList",
 					go_id_type: 1,
-					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/72520b2a-804c-4987-84ca-25e5247e65a2.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/742bd9c9-0f38-4c10-b0fb-9b1ecebfc18c.png",
 				},
 				],
 			},
diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index 439c663..3ff07ed 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -16,7 +16,8 @@
             收藏的课程
           </view>
         </view>
-        <view class="filter-area" @tap="toggleFilterPanel">
+        <view class="filter-area" @tap="toggleFilterPanel"
+          v-if="currentTab === 'brand' ? rawBrandList.length > 0 : rawCourseList.length > 0">
           <text class="filter-text">筛选</text>
           <image class="filter-icon" :src="filterIcon" mode="aspectFit" :class="{ 'rotate': filterVisible }"></image>
         </view>
diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue
index c0e8734..b00858f 100644
--- a/pages/ruzhu/qualification_sj.vue
+++ b/pages/ruzhu/qualification_sj.vue
@@ -1,202 +1,200 @@
 <template>
-	<view class="qualification-page">
-		<view class="section">
-			<view class="section-title">
-				<view class="title-bar"></view>
-				<text class="title-text">门店信息</text>
-			</view>
+    <view class="qualification-page">
+        <view class="section">
+            <view class="section-title">
+                <view class="title-bar"></view>
+                <text class="title-text">门店信息</text>
+            </view>
 
-			<view class="form-item-one box-cont">
-				<view class="label-wrapper">
-					<text class="label required">店铺名称</text>
-					<image class="label-icon"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
-						mode="aspectFit" @click="showTipPopup('name')"></image>
-				</view>
-				<input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" placeholder-class="placeholder"
-					class="input" @input="saveFormDataToLocalDebounce" />
-			</view>
-			<view class="form-item-two box-cont" @click="showLocationPopup">
-				<text class="label required">门店所在地</text>
-				<view class="picker-content">
-					<text :class="formData.dependency ? 'picker-value' : 'placeholder'">
-						{{ formData.dependency || '请选择' }}
-					</text>
-					<image
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
-						class="arrow-right" mode="aspectFit"></image>
-				</view>
-			</view>
-			<view class="form-item-two box-cont" @click="getAddressInfo">
-				<text class="label required">门店详细地址</text>
-				<view class="picker-content">
-					<text :class="formData.address ? 'picker-value' : 'placeholder'">
-						{{ formData.address || '请选择' }}
-					</text>
-					<image
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
-						class="arrow-right" mode="aspectFit"></image>
-				</view>
-			</view>
-		</view>
+            <view class="form-item-one box-cont">
+                <view class="label-wrapper">
+                    <text class="label required">店铺名称</text>
+                    <image class="label-icon"
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25bd7f38-1a3e-4282-84ea-190d7f820108"
+                        mode="aspectFit" @click="showTipPopup('name')"></image>
+                </view>
+                <input type="text" v-model="formData.name" placeholder="请输入营业执照的店铺名称" placeholder-class="placeholder"
+                    class="input" @input="saveFormDataToLocalDebounce" />
+            </view>
+            <view class="form-item-two box-cont" @click="showLocationPopup">
+                <text class="label required">门店所在地</text>
+                <view class="picker-content">
+                    <text :class="formData.dependency ? 'picker-value' : 'placeholder'">
+                        {{ formData.dependency || '请选择' }}
+                    </text>
+                    <image
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+                        class="arrow-right" mode="aspectFit"></image>
+                </view>
+            </view>
+            <view class="form-item-two box-cont" @click="getAddressInfo">
+                <text class="label required">门店详细地址</text>
+                <view class="picker-content">
+                    <text :class="formData.address ? 'picker-value' : 'placeholder'">
+                        {{ formData.address || '请选择' }}
+                    </text>
+                    <image
+                        src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dccc4513-377c-4bfa-9fd2-a5cfdb9798f3"
+                        class="arrow-right" mode="aspectFit"></image>
+                </view>
+            </view>
+        </view>
 
-		<view class="section">
-			<view class="section-title">
-				<view class="title-bar"></view>
-				<text class="title-text">联系人信息</text>
-			</view>
+        <view class="section">
+            <view class="section-title">
+                <view class="title-bar"></view>
+                <text class="title-text">联系人信息</text>
+            </view>
 
-			<view class="form-item box-cont">
-				<text class="label required">您的身份</text>
-				<view class="radio-group">
-					<view class="radio-item" @click="setContactType('1')">
-						<view class="radio" :class="{ checked: formData.contact_type === '1' }">
-							<image v-if="formData.contact_type === '1'"
-								src="/static/images/agree_y.png"
-								class="radio-icon-image" mode="aspectFit"></image>
-						</view>
-						<text class="radio-label">法人</text>
-					</view>
-					<view class="radio-item" @click="setContactType('2')">
-						<view class="radio" :class="{ checked: formData.contact_type === '2' }">
-							<image v-if="formData.contact_type === '2'"
-								src="/static/images/agree_y.png"
-								class="radio-icon-image" mode="aspectFit"></image>
-						</view>
-						<text class="radio-label">其他</text>
-					</view>
-				</view>
-			</view>
+            <view class="form-item box-cont">
+                <text class="label required">您的身份</text>
+                <view class="radio-group">
+                    <view class="radio-item" @click="setContactType('1')">
+                        <view class="radio" :class="{ checked: formData.contact_type === '1' }">
+                            <image v-if="formData.contact_type === '1'" src="/static/images/agree_y.png"
+                                class="radio-icon-image" mode="aspectFit"></image>
+                        </view>
+                        <text class="radio-label">法人</text>
+                    </view>
+                    <view class="radio-item" @click="setContactType('2')">
+                        <view class="radio" :class="{ checked: formData.contact_type === '2' }">
+                            <image v-if="formData.contact_type === '2'" src="/static/images/agree_y.png"
+                                class="radio-icon-image" mode="aspectFit"></image>
+                        </view>
+                        <text class="radio-label">其他</text>
+                    </view>
+                </view>
+            </view>
 
-			<view class="form-item-one box-cont">
-				<text class="label required">联系人</text>
-				<input type="text" v-model="formData.contact_name" placeholder="请输入" placeholder-class="placeholder"
-					class="input" @input="saveFormDataToLocalDebounce" />
-			</view>
+            <view class="form-item-one box-cont">
+                <text class="label required">联系人</text>
+                <input type="text" v-model="formData.contact_name" placeholder="请输入" placeholder-class="placeholder"
+                    class="input" @input="saveFormDataToLocalDebounce" />
+            </view>
 
-			<view class="form-item-one box-cont">
-				<text class="label required">联系人电话</text>
-				<input type="number" v-model="formData.contact_phone" placeholder="请输入联系电话"
-					placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
-			</view>
+            <view class="form-item-one box-cont">
+                <text class="label required">联系人电话</text>
+                <input type="number" v-model="formData.contact_phone" placeholder="请输入联系电话"
+                    placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
+            </view>
 
-			<view class="form-item-one box-cont">
-				<text class="label">备用联系人电话</text>
-				<input type="number" v-model="formData.backup_phone" placeholder="请输入备用联系电话"
-					placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
-			</view>
-		</view>
+            <view class="form-item-one box-cont">
+                <text class="label">备用联系人电话</text>
+                <input type="number" v-model="formData.backup_phone" placeholder="请输入备用联系电话"
+                    placeholder-class="placeholder" class="input" @input="saveFormDataToLocalDebounce" />
+            </view>
+        </view>
 
-		<view class="form-item-one-yqr box-cont invite-code-container">
-			<view class="invite-code-top">
-				<view class="label-wrapper">
-					<text class="label required">邀请码</text>
-				</view>
-				<input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码"
-					placeholder-class="placeholder" class="input" @input="handleInviteCodeInput" />
-			</view>
+        <view class="form-item-one-yqr box-cont invite-code-container">
+            <view class="invite-code-top">
+                <view class="label-wrapper">
+                    <text class="label required">邀请码</text>
+                </view>
+                <input type="text" v-model="formData.invite_code_other" placeholder="请输入邀请码"
+                    placeholder-class="placeholder" class="input" @input="handleInviteCodeInput" />
+            </view>
 
-			<!-- 分割线 -->
-			<view class="divider"></view>
+            <!-- 分割线 -->
+            <view class="divider"></view>
 
-			<!-- 邀请人信息 -->
-			<view class="invite-info-container">
-				<!-- 默认提示 -->
-				<text v-if="!formData.invite_code_other" class="invite-tip">
-					请填写邀请人的邀请码，若没有邀请人请填写13131313
-				</text>
+            <!-- 邀请人信息 -->
+            <view class="invite-info-container">
+                <!-- 默认提示 -->
+                <text v-if="!formData.invite_code_other" class="invite-tip">
+                    请填写邀请人的邀请码，若没有邀请人请填写13131313
+                </text>
 
-				<!-- 验证中 -->
-				<view v-else-if="inviteCodeValidating" class="invite-validating">
-					<text>验证中...</text>
-				</view>
+                <!-- 验证中 -->
+                <view v-else-if="inviteCodeValidating" class="invite-validating">
+                    <text>验证中...</text>
+                </view>
 
-				<!-- 验证失败 -->
-				<view v-else-if="inviteCodeError" class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
-					<text>邀请码无效</text>
-				</view>
+                <!-- 验证失败 -->
+                <view v-else-if="inviteCodeError" class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
+                    <text>邀请码无效</text>
+                </view>
 
-				<!-- 特殊邀请码13131313 -->
-				<view v-else-if="formData.invite_code_other === '13131313' && !inviterInfo" class="invite-tip">
-					请填写邀请人的邀请码，若没有邀请人请填写13131313
-				</view>
+                <!-- 特殊邀请码13131313 -->
+                <view v-else-if="formData.invite_code_other === '13131313' && !inviterInfo" class="invite-tip">
+                    请填写邀请人的邀请码，若没有邀请人请填写13131313
+                </view>
 
-				<!-- 显示邀请人信息 -->
-				<view v-else-if="inviterInfo" class="inviter-info">
-					<text class="inviter-label">邀请人：</text>
-					<text class="inviter-name">{{ inviterInfo.name || inviterInfo.nick_name }}</text>
-					<text class="inviter-divider">/</text>
-					<text class="inviter-phone">{{ inviterInfo.account }}</text>
-				</view>
+                <!-- 显示邀请人信息 -->
+                <view v-else-if="inviterInfo" class="inviter-info">
+                    <text class="inviter-label">邀请人：</text>
+                    <text class="inviter-name">{{ inviterInfo.name || inviterInfo.nick_name }}</text>
+                    <text class="inviter-divider">/</text>
+                    <text class="inviter-phone">{{ inviterInfo.account }}</text>
+                </view>
 
-				<!-- 其他情况（接口返回成功但没有认证铁军的邀请码） -->
-				<view v-else class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
-					<text>邀请码无效</text>
-				</view>
-			</view>
-		</view>
+                <!-- 其他情况（接口返回成功但没有认证铁军的邀请码） -->
+                <view v-else class="invite-error" :class="{ 'shake-animation': shakeInviteError }">
+                    <text>邀请码无效</text>
+                </view>
+            </view>
+        </view>
 
-		<view class="popup" :class="{ show: showLocationPopupFlag }">
-			<view class="popup-mask" @click="hideLocationPopup"></view>
-			<view class="popup-content">
-				<view class="popup-header">
-					<text class="popup-title">选择所在地</text>
-					<text class="popup-close" @click="hideLocationPopup">×</text>
-				</view>
-				<view class="region-body">
-					<picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
-						:value="locationValue">
-						<picker-view-column>
-							<view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
-								{{ item.province }}
-							</view>
-						</picker-view-column>
-						<picker-view-column>
-							<view class="picker-item" v-for="(item, index) in locatinCitys" :key="index">
-								{{ item.city }}
-							</view>
-						</picker-view-column>
-						<picker-view-column>
-							<view class="picker-item" v-for="(item, index) in locationAreas" :key="index">
-								{{ item.area }}
-							</view>
-						</picker-view-column>
-					</picker-view>
-				</view>
-				<view class="popup-footer">
-					<view class="popup-btn cancel" @click="hideLocationPopup">
-						<text class="btn-text">取消</text>
-					</view>
-					<view class="popup-btn confirm" @click="confirmLocationSelect">
-						<text class="btn-text">确定</text>
-					</view>
-				</view>
-			</view>
-		</view>
+        <view class="popup" :class="{ show: showLocationPopupFlag }">
+            <view class="popup-mask" @click="hideLocationPopup"></view>
+            <view class="popup-content">
+                <view class="popup-header">
+                    <text class="popup-title">选择所在地</text>
+                    <text class="popup-close" @click="hideLocationPopup">×</text>
+                </view>
+                <view class="region-body">
+                    <picker-view @change="bindChangeLocation" class="picker-scroll" :indicator-style="indicatorStyle"
+                        :value="locationValue">
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item, index) in ChinaCitys" :key="index">
+                                {{ item.province }}
+                            </view>
+                        </picker-view-column>
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item, index) in locatinCitys" :key="index">
+                                {{ item.city }}
+                            </view>
+                        </picker-view-column>
+                        <picker-view-column>
+                            <view class="picker-item" v-for="(item, index) in locationAreas" :key="index">
+                                {{ item.area }}
+                            </view>
+                        </picker-view-column>
+                    </picker-view>
+                </view>
+                <view class="popup-footer">
+                    <view class="popup-btn confirm" @click="hideLocationPopup">
+                        <text class="btn-text">取消</text>
+                    </view>
+                    <view class="popup-btn confirm" @click="confirmLocationSelect">
+                        <text class="btn-text">确定</text>
+                    </view>
+                </view>
+            </view>
+        </view>
 
-		<view class="tip-popup" :class="{ show: showTipPopupFlag }">
-			<view class="tip-popup-mask" @click="hideTipPopup"></view>
-			<view class="tip-popup-content">
-				<image class="tip-popup-bg"
-					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
-					mode="aspectFit"></image>
+        <view class="tip-popup" :class="{ show: showTipPopupFlag }">
+            <view class="tip-popup-mask" @click="hideTipPopup"></view>
+            <view class="tip-popup-content">
+                <image class="tip-popup-bg"
+                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ab410a5d-5819-47f2-a0fc-3fd6b90d6770"
+                    mode="aspectFit"></image>
 
-				<view class="tip-popup-body">
-					<view class="tip-title">{{ tipTitle }}</view>
-					<view class="tip-image-container">
-						<image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
-					</view>
-					<view class="tip-buttons">
-						<view class="tip-btn cancel" @click="hideTipPopup">
-							<text class="btn-text">取消</text>
-						</view>
-						<view class="tip-btn confirm" @click="hideTipPopup">
-							<text class="btn-text">我已了解</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
+                <view class="tip-popup-body">
+                    <view class="tip-title">{{ tipTitle }}</view>
+                    <view class="tip-image-container">
+                        <image class="tip-image" :class="currentTipType" :src="tipImage" mode="widthFix"></image>
+                    </view>
+                    <view class="tip-buttons">
+                        <view class="tip-btn cancel" @click="hideTipPopup">
+                            <text class="btn-text">取消</text>
+                        </view>
+                        <view class="tip-btn confirm" @click="hideTipPopup">
+                            <text class="btn-text">我已了解</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
 
         <uni-popup ref="existingInvitePopup" type="center" :mask-click="false">
             <view class="invite-popup-content">
@@ -206,11 +204,13 @@
                 <view class="invite-popup-body">
                     <view class="invite-item">
                         <text class="invite-label">邀请码</text>
-                        <text class="invite-value">{{ existingInviterInfo && (existingInviterInfo.invite_code || existingInviterInfo.invite_code_other) }}</text>
+                        <text class="invite-value">{{ existingInviterInfo && (existingInviterInfo.invite_code ||
+                            existingInviterInfo.invite_code_other) }}</text>
                     </view>
                     <view class="invite-item">
                         <text class="invite-label">邀请人</text>
-                        <text class="invite-value">{{ (existingInviterInfo && (existingInviterInfo.name || existingInviterInfo.nick_name)) || '' }}</text>
+                        <text class="invite-value">{{ (existingInviterInfo && (existingInviterInfo.name ||
+                            existingInviterInfo.nick_name)) || '' }}</text>
                     </view>
                 </view>
                 <view class="invite-popup-footer">
@@ -274,7 +274,7 @@ export default {
             inviterInfo: null,
             currentValidatingCode: '',
             inviteValidationTimer: null,
-            
+
             // 新增邀请码弹窗和替换逻辑需要的状态变量
             existingInviterInfo: null,
             hasExistingInviter: false,
@@ -378,7 +378,7 @@ export default {
         // 强制使用已绑定的邀请人
         async forceUseExistingInviter() {
             if (this.hasAutoReplacedInvite) return false;
-            
+
             // 确保我们有手机号，如果没有则再获取一次
             if (!this.userMobile) {
                 await this.getUserInfo();
@@ -387,28 +387,28 @@ export default {
                 console.log('用户手机号未获取，跳过强制替换');
                 return false;
             }
-            
+
             try {
                 // 1. 调用查询已绑定的邀请码
                 const res = await request.post('/sj/User/getBInviteCode', {
                     account: this.userMobile,
                     type: 2 // 商家端类型
                 });
-                
+
                 if (res && (res.code === 200 || res.state === 1) && res.data) {
                     const oldInviteCode = res.data.invite_code || res.data.invite_code_other;
-                    
+
                     if (oldInviteCode) {
                         console.log('检测到已绑定邀请码:', oldInviteCode);
-                        
+
                         // 2. 用邀请码获取完整的邀请人信息
                         const inviteRes = await request.post('/sj/user/getInvite', {
                             invite_code: oldInviteCode
                         });
-                        
+
                         if (inviteRes && (inviteRes.code === 200 || inviteRes.state === 1) && inviteRes.data && inviteRes.data.account) {
                             const fullInviterInfo = inviteRes.data;
-                            
+
                             // 强制填充
                             this.formData.invite_code_other = oldInviteCode;
                             this.hasExistingInviter = true;
@@ -417,11 +417,11 @@ export default {
                             this.inviterInfo = fullInviterInfo;
                             this.currentValidatingCode = oldInviteCode;
                             this.existingInviterInfo = fullInviterInfo;
-                            
+
                             // 保存状态
                             this.saveInviteStateToLocal();
                             this.saveFormDataToLocal();
-                            
+
                             return true;
                         }
                     }
@@ -475,7 +475,7 @@ export default {
                 this.saveFormDataToLocal();
             }
             this.hideExistingInviteTipPopup();
-            
+
             // 触发 Promise 解决，以继续表单提交流程
             if (this.confirmResolve) {
                 this.confirmResolve(true);
@@ -614,7 +614,7 @@ export default {
                 this.formData.invite_code_other = this.inviterInfo ? (this.inviterInfo.invite_code || this.inviterInfo.invite_code_other) : '';
                 return;
             }
-            
+
             const code = e.detail ? e.detail.value : this.formData.invite_code_other;
 
             console.log('邀请码输入:', code);
@@ -944,7 +944,7 @@ export default {
                     });
                     return resolve(false);
                 }
-                
+
                 // 验证邀请码的有效性状态
                 if (this.inviteCodeValidating) {
                     uni.showToast({ title: '邀请码验证中，请稍候', icon: 'none' });
@@ -1659,93 +1659,93 @@ export default {
 /* 邀请码和禁用样式 */
 /* 输入框禁用样式 */
 .input:disabled {
-  color: #999999;
-  background-color: #F5F5F5;
+    color: #999999;
+    background-color: #F5F5F5;
 }
 
 /* 邀请码确认弹窗样式 */
 .invite-popup-content {
-  width: 571rpx;
-  height: 535rpx;
-  background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6f130301-f3df-467c-8a1c-dc49f85e5295.png');
-  background-size: cover;
-  background-position: center;
-  border-radius: 30rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 40rpx;
-  box-sizing: border-box;
+    width: 571rpx;
+    height: 535rpx;
+    background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6f130301-f3df-467c-8a1c-dc49f85e5295.png');
+    background-size: cover;
+    background-position: center;
+    border-radius: 30rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 40rpx;
+    box-sizing: border-box;
 }
 
 .invite-popup-header {
-  width: 100%;
-  text-align: center;
-  margin-bottom: 40rpx;
+    width: 100%;
+    text-align: center;
+    margin-bottom: 40rpx;
 }
 
 .invite-popup-title {
-  font-size: 36rpx;
-  font-weight: 500;
-  color: #333333;
+    font-size: 36rpx;
+    font-weight: 500;
+    color: #333333;
 }
 
 .invite-popup-body {
-  flex: 1;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  gap: 24rpx;
-  margin-top: 20rpx;
+    flex: 1;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    gap: 24rpx;
+    margin-top: 20rpx;
 }
 
 .invite-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 20rpx;
-  background-color: rgba(255, 255, 255, 0.9);
-  border-radius: 16rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    background-color: rgba(255, 255, 255, 0.9);
+    border-radius: 16rpx;
 }
 
 .invite-label {
-  font-size: 28rpx;
-  color: #666666;
+    font-size: 28rpx;
+    color: #666666;
 }
 
 .invite-value {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
 }
 
 .invite-popup-footer {
-  width: 100%;
-  display: flex;
-  gap: 20rpx;
-  margin-top: 40rpx;
+    width: 100%;
+    display: flex;
+    gap: 20rpx;
+    margin-top: 40rpx;
 }
 
 .invite-btn {
-  flex: 1;
-  height: 88rpx;
-  border-radius: 44rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 32rpx;
-  font-weight: 500;
-  margin: 0 5rpx;
+    flex: 1;
+    height: 88rpx;
+    border-radius: 44rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    font-weight: 500;
+    margin: 0 5rpx;
 }
 
 .invite-btn.cancel {
-  background-color: #FFFFFF;
-  color: #FC437C;
-  border: 2rpx solid #FC437C;
+    background-color: #FFFFFF;
+    color: #FC437C;
+    border: 2rpx solid #FC437C;
 }
 
 .invite-btn.confirm {
-  background: linear-gradient(90deg, #FC437C 0%, #FF618F 100%);
-  color: #FFFFFF;
+    background: linear-gradient(90deg, #FC437C 0%, #FF618F 100%);
+    color: #FFFFFF;
 }
 </style>
\ No newline at end of file

From f72f164fd835d4b2447b61c69f61e17383bf5aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Mon, 8 Jun 2026 11:47:07 +0800
Subject: [PATCH 106/118] =?UTF-8?q?=E4=BD=9C=E8=80=85=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/jingxuan/selected-skills.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index 802f559..798e80f 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -42,7 +42,7 @@
             </view>
           </view>
 
-          <view class="right-filter" @tap="toggleFilterPanel">
+          <view class="right-filter" @tap="toggleFilterPanel" v-if="!authorInfo.show">
             <text class="filter-text">筛选</text>
             <image class="filter-icon" :src="filterIcon" :class="{ 'rotate': filterVisible }"></image>
           </view>

From 2fcfba42ea2929856e7324678327bf5496147455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Mon, 8 Jun 2026 17:53:00 +0800
Subject: [PATCH 107/118] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service-code-input/service-code-input.vue |    3 +-
 pages.json                                    |    6 +-
 pages/home/home.vue                           |    8 +-
 pages/jingxuan/selected-brands.vue            |  202 +-
 pages/my/my.vue                               |    8 +-
 pages/my/myFavorite.vue                       |   19 +-
 pages/order/userorder-list.vue                |   21 +-
 pages/shop/business-time.vue                  |  269 +--
 pages/shop/service-skills.vue                 | 1654 +++++++++--------
 pages/shop/verify/manual-verify.vue           |    8 +-
 pages/shop/verify/verify-order-detail.vue     |   33 +-
 pages/shop/verify/verify-order.nvue           |    1 -
 12 files changed, 1175 insertions(+), 1057 deletions(-)

diff --git a/components/service-code-input/service-code-input.vue b/components/service-code-input/service-code-input.vue
index 80985ca..9c49111 100644
--- a/components/service-code-input/service-code-input.vue
+++ b/components/service-code-input/service-code-input.vue
@@ -13,7 +13,7 @@
 				<input :adjust-position="false" class="real-input" type="number" :maxlength="codeLength"
 					v-model="inputValue" :focus="true" @input="onInput" @focus="onFocus"
 					@keyboardheightchange="onkeyboardheightchange" @blur="onBlur" cursor-spacing="100"
-					ref="realInput" />
+					cursor-color="transparent" ref="realInput" />
 			</view>
 			<button class="confirm-btn" :disabled="code.length < codeLength" @click="onConfirm">确定</button>
 			<view class="close-btn" @click="close">×</view>
@@ -187,6 +187,7 @@ export default {
 			height: 100%;
 			opacity: 0;
 			z-index: 2;
+			caret-color: transparent;
 		}
 	}
 
diff --git a/pages.json b/pages.json
index 9f3daa3..785abdc 100644
--- a/pages.json
+++ b/pages.json
@@ -89,8 +89,12 @@
 			"path": "pages/order/userorder-list",
 			"style": {
 				"navigationBarTitleText": "订单",
-				"navigationBarBackgroundColor": "#FFFFFF"
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"app-plus": {
+				      "softinputNavBar": "none"
+				    }
 			}
+			
 		},
 		{
 			"path": "pages/order/userorder-detail",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 37235e8..268ce72 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -679,7 +679,8 @@ export default {
 		fetchBrandList() {
 			request.post('/sj/brand/list', {
 				page: 1,
-				limit: 4
+				limit: 4,
+				poster_recommend: 1
 			}).then(res => {
 				if (res.code == 200 && res.data && res.data.list) {
 					this.brands = res.data.list.map(item => {
@@ -706,7 +707,8 @@ export default {
 		fetchSkillList() {
 			request.post('/sj/skill/list', {
 				page: 1,
-				limit: 4
+				limit: 4,
+				poster_recommend: 1
 			}).then(res => {
 				if (res.code == 200 && res.data && res.data.list) {
 					this.skills = res.data.list.map(item => {
@@ -1093,7 +1095,7 @@ page {
 			.name {
 				height: 42rpx;
 				font-family: PingFangTC, PingFangTC;
-				font-weight: bold;
+				font-weight: 500;
 				font-size: 34rpx;
 				color: #333333;
 				line-height: 42rpx;
diff --git a/pages/jingxuan/selected-brands.vue b/pages/jingxuan/selected-brands.vue
index 988a1dc..fc1f677 100644
--- a/pages/jingxuan/selected-brands.vue
+++ b/pages/jingxuan/selected-brands.vue
@@ -1,40 +1,24 @@
 <template>
   <view>
-    <custom-navbar 
-      title="精选品牌" 
-      :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60ae3383-6ff6-4f42-818b-d9b09a9bd0e0.png'" 
+    <custom-navbar title="精选品牌"
+      :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60ae3383-6ff6-4f42-818b-d9b09a9bd0e0.png'"
       :showUser="true"
-      backgroundColor="url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce2e62e1-c26a-45c8-a49d-7ed00b2ce02c.png') center 20%/cover no-repeat" 
-      titleColor="#333" 
-      borderBottom="none"
-      :show-headle="true"
+      backgroundColor="url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ce2e62e1-c26a-45c8-a49d-7ed00b2ce02c.png') center 20%/cover no-repeat"
+      titleColor="#333" borderBottom="none" :show-headle="true"
       headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png"
-      @onHeadleClick="goToSearch">
+      @onHeadleClick="goToSearch" class="nav-img-size">
     </custom-navbar>
 
-    <serviecFirstTab 
-      :tabs="tabs" 
-      :activeId="activeId" 
-      activeColor="#FF4767" 
-      @tab-click="tabClick" 
-      bgColor="#fff">
+    <serviecFirstTab :tabs="tabs" :activeId="activeId" activeColor="#FF4767" @tab-click="tabClick" bgColor="#fff">
     </serviecFirstTab>
 
-    <CommonList 
-      ref="brandListRef" 
-      :apiUrl="'/sj/brand/list'" 
-      :initialQuery="{}"
-      :listScrollHeight="`calc(100vh - ${statusBarHeight * 2 + 250}rpx)`"
-      @data-loaded="handleDataLoaded">
-      
+    <CommonList ref="brandListRef" :apiUrl="'/sj/brand/list'" :initialQuery="{}"
+      :listScrollHeight="`calc(100vh - ${statusBarHeight * 2 + 250}rpx)`" @data-loaded="handleDataLoaded">
+
       <template #headerScroll>
         <view class="icon-tabs">
-          <view 
-            v-for="item in iconTabs" 
-            :key="item.id" 
-            class="icon-tab"
-            :class="{active: currentSecondClass == item.id}" 
-            @click="selectSecondClass(item.id)">
+          <view v-for="item in iconTabs" :key="item.id" class="icon-tab"
+            :class="{ active: currentSecondClass == item.id }" @click="selectSecondClass(item.id)">
             <image :src="item.photo" class="icon-img" mode="aspectFill"></image>
             <text class="icon-text">{{ item.title }}</text>
           </view>
@@ -48,7 +32,7 @@
               <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
             </view>
           </view>
-          
+
           <view class="sort-item" @tap="toggleSort('view')">
             <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
             <view class="arrows">
@@ -61,16 +45,10 @@
 
       <template #listData="{ list }">
         <view class="zhanwei">
-        <view class="brand-grid">
-          <brand-card
-            class="brand-card-wrap"
-            v-for="(brand, idx) in enrichedBrandList(list)"
-            :key="brand.id || idx"
-            :item="brand"
-            :tagKeys="brand._tagKeys"
-            @click="handleBrandClick(brand)"
-          />
-        </view>
+          <view class="brand-grid">
+            <brand-card class="brand-card-wrap" v-for="(brand, idx) in enrichedBrandList(list)" :key="brand.id || idx"
+              :item="brand" :tagKeys="brand._tagKeys" @click="handleBrandClick(brand)" />
+          </view>
         </view>
       </template>
 
@@ -98,19 +76,19 @@ export default {
   data() {
     return {
       statusBarHeight: 0,
-      navHeight: 0, 
-      
+      navHeight: 0,
+
       // 当前选中的一级/二级分类ID（页面顶部点击用）
-      activeId: "",            
-      currentSecondClass: "", 
-      tabs: [],               
-      iconTabs: [],           
-      
+      activeId: "",
+      currentSecondClass: "",
+      tabs: [],
+      iconTabs: [],
+
       selectedSecondIds: [],  // 抽屉里选中的分类ID
-      
+
       // 额外筛选参数
-      orderType: 0,           
-      
+      orderType: 0,
+
       // 排序图标资源
       iconGreyUp: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e00ab2ac-bccf-42d8-820c-65727327e279.png',
       iconGreyDown: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfffb601-6877-4608-a3eb-88695b05c6c2.png',
@@ -121,13 +99,13 @@ export default {
   onLoad(options) {
     const systemInfo = uni.getSystemInfoSync();
     this.statusBarHeight = systemInfo.statusBarHeight;
-    this.navHeight = this.statusBarHeight + 44; 
+    this.navHeight = this.statusBarHeight + 44;
 
     if (options.id) {
       this.activeId = options.id;
     }
     this.getFirstClass();
-    
+
     // 初始化时一并获取抽屉内的级联字典数据
     this.loadFilterCategories();
   },
@@ -142,11 +120,11 @@ export default {
     // 加载一级分类并自动组装其对应的二级分类，兼容 state === 1
     async loadFilterCategories() {
       try {
-        const syrId = uni.getStorageSync('syrId') || 1; 
+        const syrId = uni.getStorageSync('syrId') || 1;
         const res = await request.post('/sj/firstclass', { id: syrId })
         if ((res.code === 200 || res.state === 1) && res.data) {
           const firstClasses = res.data;
-          
+
           // 并发请求所有的二级分类
           const promises = firstClasses.map(async (first) => {
             try {
@@ -156,11 +134,11 @@ export default {
                 title: first.title,
                 children: ((subRes.code === 200 || subRes.state === 1) && subRes.data) ? subRes.data : []
               }
-            } catch(e) {
+            } catch (e) {
               return { id: first.id, title: first.title, children: [] }
             }
           });
-          
+
           const filterData = await Promise.all(promises);
           // 过滤掉没有子分类的项，避免面板出现光秃秃的标题
           this.brandFilterData = filterData.filter(group => group.children.length > 0);
@@ -171,7 +149,7 @@ export default {
         console.error('获取分类字典失败', error)
       }
     },
-    
+
     // ============ 排序逻辑 ============
     toggleSort(type) {
       if (type === 'time') {
@@ -202,29 +180,29 @@ export default {
     },
 
     selectSecondClass(id) {
-      if(this.currentSecondClass === id){
+      if (this.currentSecondClass === id) {
         this.currentSecondClass = "";
       } else {
         this.currentSecondClass = id;
       }
       // 页面上点击了圆形图标，则清空抽屉里的选择
-      this.selectedSecondIds = []; 
+      this.selectedSecondIds = [];
       this.refreshBrandList();
     },
 
     tabClick(id) {
       if (this.activeId === id) return;
       this.activeId = id;
-      this.currentSecondClass = ""; 
-      this.getSecondClassList();    
+      this.currentSecondClass = "";
+      this.getSecondClassList();
       this.refreshBrandList();
     },
 
     // ============ 刷新列表核心 ============
     refreshBrandList() {
       // 如果抽屉里选了分类，优先传抽屉的参数；否则传圆形图标选中的分类
-      const targetSecondClass = this.selectedSecondIds.length > 0 
-        ? this.selectedSecondIds.join(',') 
+      const targetSecondClass = this.selectedSecondIds.length > 0
+        ? this.selectedSecondIds.join(',')
         : this.currentSecondClass;
 
       const params = {
@@ -238,7 +216,7 @@ export default {
         if (params[key] === undefined) delete params[key];
       });
 
-      if(this.$refs.brandListRef) {
+      if (this.$refs.brandListRef) {
         this.$refs.brandListRef.manualRefresh(params);
       }
     },
@@ -250,7 +228,7 @@ export default {
         if (brand.franchise_state === 1) tagKeys.push('franchise');
         if (brand.student_state === 1) tagKeys.push('recruit');
         if (tagKeys.length === 0) tagKeys.push('more');
-        
+
         return {
           ...brand,
           name: brand.name,
@@ -289,41 +267,54 @@ export default {
   z-index: 101;
 }
 
-::v-deep .service-first-tab{
-    box-shadow: none !important;
+::v-deep .service-first-tab {
+  box-shadow: none !important;
 }
 
 /* ================= 抽屉下拉样式 ================= */
 .filter-panel {
   position: fixed;
-  left: 0; right: 0; bottom: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   z-index: 100;
   pointer-events: none;
   overflow: hidden;
 
   &.show {
     pointer-events: auto;
-    .filter-mask { opacity: 1; }
-    .filter-container { transform: translateY(0); }
+
+    .filter-mask {
+      opacity: 1;
+    }
+
+    .filter-container {
+      transform: translateY(0);
+    }
   }
 
   .filter-mask {
     position: absolute;
-    top: 0; left: 0; right: 0; bottom: 0;
-    background: rgba(0,0,0,0.4);
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.4);
     opacity: 0;
     transition: opacity 0.3s ease-in-out;
   }
-  
+
   .filter-container {
     position: absolute;
-    top: 0; left: 0; right: 0;
+    top: 0;
+    left: 0;
+    right: 0;
     background: #fff;
     border-radius: 0 0 30rpx 30rpx;
     padding: 140rpx 30rpx 40rpx;
     display: flex;
     flex-direction: column;
-    box-shadow: 0 10rpx 20rpx rgba(0,0,0,0.05);
+    box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.05);
     transform: translateY(-100%);
     transition: transform 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
   }
@@ -332,6 +323,7 @@ export default {
 .filter-scroll {
   max-height: 50vh;
 }
+
 .filter-group {
   margin-bottom: 30rpx;
 
@@ -346,30 +338,33 @@ export default {
   .pill-list {
     display: flex;
     flex-wrap: wrap;
-    gap: 20rpx 10rpx; /* 控制行间距和列间距 */
+    gap: 20rpx 10rpx;
+    /* 控制行间距和列间距 */
   }
 }
 
 /* 通用胶囊按钮 (一行四个) */
 .pill-item {
-  width: calc(25% - 8rpx); /* 精确计算一行四个 */
+  width: calc(25% - 8rpx);
+  /* 精确计算一行四个 */
   height: 58rpx;
   background: #F5F5F5;
   font-weight: 400;
-  font-size: 24rpx; /* 字号略小以防溢出 */
+  font-size: 24rpx;
+  /* 字号略小以防溢出 */
   color: #333333;
   line-height: 37rpx;
-  
+
   /* flex 居中文字 */
   display: flex;
   align-items: center;
   justify-content: center;
-  
+
   border-radius: 12rpx;
   transition: all 0.3s;
-  box-sizing: border-box; 
+  box-sizing: border-box;
   white-space: nowrap;
-  
+
   &.active {
     background: #FFF0F2;
     color: #FF4767;
@@ -381,15 +376,25 @@ export default {
   display: flex;
   justify-content: space-between;
   margin-top: 40rpx;
-  .reset-btn, .confirm-btn {
+
+  .reset-btn,
+  .confirm-btn {
     width: 47%;
     text-align: center;
     padding: 22rpx 0;
     border-radius: 40rpx;
     font-size: 28rpx;
   }
-  .reset-btn { background: #F5F5F5; color: #666; }
-  .confirm-btn { background: #FF4767; color: #fff; }
+
+  .reset-btn {
+    background: #F5F5F5;
+    color: #666;
+  }
+
+  .confirm-btn {
+    background: #FF4767;
+    color: #fff;
+  }
 }
 
 /* ================= 其他页面样式 ================= */
@@ -402,7 +407,7 @@ export default {
   column-gap: 36rpx;
   row-gap: 30rpx;
   background: transparent;
-  padding: 0 0 0 30rpx;                      
+  padding: 0 0 0 30rpx;
   margin-bottom: 30rpx;
 }
 
@@ -416,7 +421,7 @@ export default {
   width: 100rpx;
   height: 100rpx;
   border-radius: 50%;
-  border: 2rpx solid transparent; 
+  border: 2rpx solid transparent;
 }
 
 .icon-text {
@@ -444,30 +449,30 @@ export default {
   padding: 0 30rpx;
   margin-bottom: 24rpx;
   gap: 100rpx;
-  
+
   .sort-item {
     display: flex;
     align-items: center;
-    
+
     .sort-text {
       font-weight: 400;
       font-size: 26rpx;
       color: #666666;
       line-height: 37rpx;
       margin-right: 6rpx;
-      
+
       &.active {
         color: #FF4767;
         font-weight: 500;
       }
     }
-    
+
     .arrows {
       display: flex;
       flex-direction: column;
       justify-content: center;
       align-items: center;
-      
+
       .arrow-icon {
         width: 13rpx;
         height: 8rpx;
@@ -479,10 +484,11 @@ export default {
 
 // 品牌卡片网格
 .zhanwei {
-    background-color: #f5f5f5;
-    padding: 20rpx 0 0 0 ;
-    border-radius: 20rpx 20rpx 0rpx 0rpx;
+  background-color: #f5f5f5;
+  padding: 20rpx 0 0 0;
+  border-radius: 20rpx 20rpx 0rpx 0rpx;
 }
+
 .brand-grid {
   background-color: #ffffff;
   display: flex;
@@ -491,9 +497,9 @@ export default {
   padding: 20rpx 24rpx;
   row-gap: 24rpx;
   border-radius: 20rpx 20rpx 0rpx 0rpx;
-  
+
   .brand-card-wrap {
-    width: 48.5%; 
+    width: 48.5%;
   }
 }
 
@@ -501,6 +507,7 @@ export default {
   ::v-deep .list-container {
     padding: 0;
   }
+
   ::v-deep .list-scroll {
     margin-top: 0rpx;
   }
@@ -510,4 +517,9 @@ export default {
   background-color: #f5f5f5;
   border-radius: 20rpx 20rpx 0 0;
 }
+
+.nav-img-size::v-deep .icon-headle {
+  width: 36rpx !important;
+  height: 36rpx !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 1e15690..a97ae9e 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -909,8 +909,12 @@ export default {
 		toruzhu() {
 			const idType = this.userInfo.id_type;
 			const credentialsState = this.userInfo.credentials_state;
-			console.log(idType, credentialsState)
-			if (idType <= 0 && credentialsState === 0) {
+			if (idType < 0 && credentialsState <= 1) {
+				// 驳回状态
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else if (idType <= 0 && credentialsState === 0) {
 				// 从未入驻
 				uni.navigateTo({
 					url: '/pages/ruzhu/ruzhu'
diff --git a/pages/my/myFavorite.vue b/pages/my/myFavorite.vue
index 3ff07ed..011c506 100644
--- a/pages/my/myFavorite.vue
+++ b/pages/my/myFavorite.vue
@@ -2,8 +2,8 @@
   <view class="collection-page">
 
     <custom-navbar title="我的收藏" :showBack="true" backgroundColor="#FFFFFF" :show-headle="true" borderBottom="none"
-      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/51ebca5d-95c5-4fb8-8aa3-560a79100d25.png"
-      @onHeadleClick="goToSearch">
+      headleSrc="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b18bac2f-3e4c-4586-9d45-0f088629c9d1.png"
+      @onHeadleClick="goToSearch" class="serch-tap">
     </custom-navbar>
 
     <view class="tab-bar-wrap" :style="{ top: navHeight + 'px' }">
@@ -16,11 +16,7 @@
             收藏的课程
           </view>
         </view>
-        <view class="filter-area" @tap="toggleFilterPanel"
-          v-if="currentTab === 'brand' ? rawBrandList.length > 0 : rawCourseList.length > 0">
-          <text class="filter-text">筛选</text>
-          <image class="filter-icon" :src="filterIcon" mode="aspectFit" :class="{ 'rotate': filterVisible }"></image>
-        </view>
+
       </view>
     </view>
 
@@ -449,7 +445,7 @@ export default {
       &.active {
         color: #FF4767;
         background: #FFECEF;
-        border: 1rpx solid #FFB0BD;
+        border: 2rpx solid #FFB0BD;
         border-radius: 29rpx;
       }
     }
@@ -633,8 +629,9 @@ export default {
 
 /* 内容区缩进补充 */
 .collection-content {
-  padding: 0 24rpx;
+  padding: 0 24rpx 24rpx;
   margin-top: 20rpx;
+  overflow: hidden;
 }
 
 .brand-grid {
@@ -667,7 +664,7 @@ export default {
 }
 
 ::v-deep .icon-headle {
-  width: 32rpx !important;
-  height: 32rpx !important;
+  width: 36rpx !important;
+  height: 36rpx !important;
 }
 </style>
\ No newline at end of file
diff --git a/pages/order/userorder-list.vue b/pages/order/userorder-list.vue
index 53ead25..df927e1 100644
--- a/pages/order/userorder-list.vue
+++ b/pages/order/userorder-list.vue
@@ -21,10 +21,10 @@
                 </view>
             </scroll-view>
         </view>
-
-        <CommonList ref="groupRef" :isLogin="isLogin" :apiUrl="apiUrl"
-            :listScrollHeight="`calc(100vh - 280rpx - 100rpx)`" @load-success="loadSuccess">
-            <template #listData="{ list }">
+        <view style="background-color: #f5f5f5; height: 20rpx"></view>
+        <CommonList nList ref="groupRef" :isLogin="isLogin" :apiUrl="apiUrl"
+            :listScrollHeight="`calc(100vh - 280rpx - 20rpx)`" @load-success="loadSuccess" class="nodatamit">
+            <template #listData="{ list }" class="commit">
                 <view class="order-item-wrap" v-for="item in popList" :key="item.id">
                     <OrderCard v-if="activeFirstId != 3" :haveButton="haveButton" :dataItem="item"
                         :typeId="activeFirstId" @cancel="cancelOrder($event, item)" @start="startOrder($event, item)"
@@ -582,13 +582,13 @@ export default {
     /* #endif */
     left: 0;
     right: 0;
-    background: #fff;
+    background: #fafafa;
     z-index: 99;
 }
 
 .status-tabs {
     height: 94rpx;
-    background-color: #ffffff;
+    background-color: #fafafa;
     white-space: nowrap;
 }
 
@@ -624,7 +624,7 @@ export default {
 
 .status-tabs2 {
     height: 56rpx;
-    background-color: #ffffff;
+    background-color: #fafafa;
     white-space: nowrap;
     padding-bottom: 30rpx;
     padding-top: 10rpx;
@@ -654,8 +654,7 @@ export default {
 
 /* 数据列表及卡片外框样式 */
 .order-item-wrap {
-    background-color: #fff;
-    border-radius: 12px;
+    background-color: #f5f5f5;
     overflow: hidden;
 }
 
@@ -704,4 +703,8 @@ export default {
     box-sizing: border-box;
     /* padding-top: 24rpx; */
 }
+
+.nodatamit {
+    background-color: #f5f5f5;
+}
 </style>
\ No newline at end of file
diff --git a/pages/shop/business-time.vue b/pages/shop/business-time.vue
index 905b550..b21e396 100644
--- a/pages/shop/business-time.vue
+++ b/pages/shop/business-time.vue
@@ -1,9 +1,9 @@
 <template>
   <view class="service-time-page">
     <custom-navbar title="营业设置" :showBack="true"></custom-navbar>
-    
+
     <view class="content">
-      
+
       <view class="setting-row">
         <text class="setting-label">当前接单状态</text>
         <view class="custom-switch" :class="{ 'is-on': isOpenStore }" @click="toggleStatus">
@@ -13,13 +13,8 @@
         </view>
       </view>
 
-      <view class="service-time-card">
-        <view class="card-header-flex" @click="isExpandTime = !isExpandTime">
-          <text class="header-title">{{ isExpandTime ? '服务时间' : '设置服务时间' }}</text>
-          <image class="arrow-icon" :class="{ 'rotated': isExpandTime }" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6cfe4592-e9c6-45b6-ac45-625bc361aded.png"></image>
-        </view>
-        
-        <view class="time-content" v-if="isExpandTime">
+      <view class="service-time-card" v-if="hasBusinessTime">
+        <view class="time-content">
           <view class="time-blocks-container">
             <view class="t-block">
               <text class="t-time">{{ formatTime(startTime) }}</text>
@@ -31,29 +26,45 @@
               <text class="t-label">结束时间</text>
             </view>
           </view>
-          
+
           <view class="modify-btn-outline" @click="showTimePicker" v-if="!showBottomActions && !showTimePickerFlag">
-            <image class="edit-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d67adcda-d334-440f-87d4-d709983b0101.png"></image>
+            <image class="edit-icon"
+              src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d67adcda-d334-440f-87d4-d709983b0101.png">
+            </image>
             <text>修改服务时间</text>
           </view>
         </view>
       </view>
 
+      <view class="service-time-card1" v-if="!hasBusinessTime">
+
+        <view class="modify-btn-outline1" @click="showTimePicker">
+          <image class="edit-icon"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/176a8b35-14bd-4cd1-a187-4165d07c0dcb.png">
+          </image>
+          <text>设置服务时间</text>
+        </view>
+      </view>
+
       <view class="setup-modal-mask" v-if="showSetupModal" catchtouchmove="true">
         <view class="setup-modal-content">
-          <image class="modal-bg" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ac2cb4aa-a7c5-4776-98f4-b77e9c0cfa85.png"></image>
-          
+          <image class="modal-bg"
+            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ac2cb4aa-a7c5-4776-98f4-b77e9c0cfa85.png">
+          </image>
+
           <view class="modal-header">
             <text>温馨提示</text>
           </view>
 
           <view class="modal-body">
             <text class="modal-subtitle">发布服务请完善以下资料：</text>
-            
+
             <view class="missing-list">
               <view class="missing-item" v-if="!hasBusinessTime">
                 <view class="item-left">
-                  <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png"></image>
+                  <image class="item-icon"
+                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+                  </image>
                   <view class="item-texts">
                     <text class="item-title">营业时间未配置</text>
                     <text class="item-desc">请完善店铺的营业时间</text>
@@ -64,7 +75,9 @@
 
               <view class="missing-item" v-if="!hasServiceSkill">
                 <view class="item-left">
-                  <image class="item-icon" src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png"></image>
+                  <image class="item-icon"
+                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png">
+                  </image>
                   <view class="item-texts">
                     <text class="item-title">服务技能未配置</text>
                     <text class="item-desc">请完善服务技能</text>
@@ -75,9 +88,13 @@
 
               <view class="missing-item" v-if="!isCertified">
                 <view class="item-left">
-                  <image class="item-icon" :src="isUnderReview ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'"></image>
+                  <image class="item-icon"
+                    :src="isUnderReview ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/25c444be-a66e-45d6-b50d-922149ff059f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/21b26b44-5e36-4291-8900-705a3d5bfa90.png'">
+                  </image>
                   <view class="item-texts">
-                    <text class="item-title" :class="{'blue-text': isUnderReview}">{{ isUnderReview ? '资质认证中' : '资质未认证' }}</text>
+                    <text class="item-title" :class="{ 'blue-text': isUnderReview }">{{ isUnderReview ? '资质认证中' :
+                      '资质未认证'
+                    }}</text>
                     <text class="item-desc">请完成资质认证</text>
                   </view>
                 </view>
@@ -103,29 +120,27 @@
             <text class="confirm-text" @click="confirmTime">确定</text>
           </view>
           <view class="time-range">
-            <view class="time-block" :class="{ active: timeType === 'start' }"
-                  @click="switchTimeType('start')">
-              <text class="time-value-picker">{{formatTime(startTime)}}</text>
+            <view class="time-block" :class="{ active: timeType === 'start' }" @click="switchTimeType('start')">
+              <text class="time-value-picker">{{ formatTime(startTime) }}</text>
               <text class="time-label">开始时间</text>
             </view>
             <text class="time-separator">至</text>
-            <view class="time-block" :class="{ active: timeType === 'end' }"
-                  @click="switchTimeType('end')">
-              <text class="time-value-picker">{{formatTime(endTime)}}</text>
+            <view class="time-block" :class="{ active: timeType === 'end' }" @click="switchTimeType('end')">
+              <text class="time-value-picker">{{ formatTime(endTime) }}</text>
               <text class="time-label">结束时间</text>
             </view>
           </view>
           <view class="region-body">
             <picker-view :value="pickerValue" @change="handleTimeChange" class="picker-scroll"
-                        :indicator-style="indicatorStyle">
+              :indicator-style="indicatorStyle">
               <picker-view-column>
                 <view class="picker-item" v-for="(hour, index) in hours" :key="index">
-                  {{hour}}
+                  {{ hour }}
                 </view>
               </picker-view-column>
               <picker-view-column>
                 <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
-                  {{minute}}
+                  {{ minute }}
                 </view>
               </picker-view-column>
               <picker-view-column>
@@ -133,12 +148,12 @@
               </picker-view-column>
               <picker-view-column>
                 <view class="picker-item" v-for="(hour, index) in hours" :key="index">
-                  {{hour}}
+                  {{ hour }}
                 </view>
               </picker-view-column>
               <picker-view-column>
                 <view class="picker-item" v-for="(minute, index) in minutes" :key="index">
-                  {{minute}}
+                  {{ minute }}
                 </view>
               </picker-view-column>
             </picker-view>
@@ -167,14 +182,14 @@ export default {
       tempTime: '', // 临时存储选择的时间
       showTimePickerFlag: false,
       showBottomActions: false, // 控制底部按钮显示
-      
+
       // 五列选择器相关数据
       pickerValue: [8, 0, 0, 18, 0],
       hours: Array.from({ length: 24 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
       minutes: Array.from({ length: 60 }, (_, i) => i < 10 ? `0${i}` : `${i}`),
       timeType: 'start',
       indicatorStyle: 'height: 68rpx;',
-      
+
       startTime: {
         hour: '09',
         minute: '00'
@@ -189,7 +204,7 @@ export default {
       authDetails: null,
       sjId: null,
       showSetupModal: false,
-      isExpandTime: false, // 控制服务时间卡片的折叠（false）与展开（true）
+      isExpandTime: true, // 默认展开服务时间
       isLogin: true // 默认已登录
     }
   },
@@ -198,9 +213,9 @@ export default {
     isUnderReview() {
       if (!this.isLogin) return false;
       if (this.authDetails && Object.keys(this.authDetails).length > 0) {
-        return true; 
+        return true;
       }
-      return false; 
+      return false;
     },
     // 判断是否具备接单的大前提条件
     canOpenStore() {
@@ -215,13 +230,13 @@ export default {
     // 当前开关状态显示
     isOpenStore() {
       if (!this.canOpenStore) {
-        return false; 
+        return false;
       }
-      return this.userInfo.order_taking == 1; 
+      return this.userInfo.order_taking == 1;
     },
     isSettled() {
       if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
-      return this.userInfo.id_type !== 0; 
+      return this.userInfo.id_type !== 0;
     },
     isCertified() {
       if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
@@ -249,7 +264,7 @@ export default {
           // 同步给页面 userInfo 对象，以驱动计算属性与弹窗开关
           this.userInfo = res.data;
           this.sjId = res.data.id;
-          
+
           // 检查营业时间字段
           if (res.data.business_time) {
             this.currentTime = res.data.business_time
@@ -277,7 +292,7 @@ export default {
         this.currentTime = '09:00-21:00'
         this.originalTime = '09:00-21:00'
         this.parseTimeString('09:00-21:00')
-        
+
         // uni.showToast({
         //   title: '加载营业时间失败，使用默认时间',
         //   icon: 'none'
@@ -288,8 +303,8 @@ export default {
     // 弹窗路由：获取入驻详情
     fetchAuthDetails() {
       request.post("/sj/userSjAuth/details", {
-        type: 1, 
-        id_type: '1' 
+        type: 1,
+        id_type: '1'
       }).then(res => {
         if (res.code == 200 && res.data) {
           this.authDetails = res.data;
@@ -334,20 +349,20 @@ export default {
       const currentStatus = this.userInfo.order_taking;
       const isCurrentlyResting = currentStatus != 1; // 当前不是营业中即为休息中
 
-      // 强力拦截：在休息中且三大件没配全，想要接单时直接拦截弹窗
-      if (isCurrentlyResting && !this.canOpenStore) {
-        this.showSetupModal = true;
+      // 准备切换的新状态
+      let newStatus = currentStatus == 1 ? 2 : 1;
+
+      // 想要开始接单时，检查是否配置了营业时间
+      if (newStatus === 1 && !this.hasBusinessTime) {
+        uni.showToast({ title: '请配置营业时间', icon: 'none' });
         return;
       }
 
-      // 准备切换的新状态
-      let newStatus = currentStatus == 1 ? 2 : 1;
-      
       uni.showLoading({ title: '切换中...', mask: true });
 
       request.post("/sj/sjordertaking", {
         order_taking: newStatus,
-        sjid: this.sjId 
+        sjid: this.sjId
       }).then((res) => {
         uni.hideLoading();
         this.userInfo.order_taking = newStatus; // 本地状态切换
@@ -365,7 +380,7 @@ export default {
       if (times.length === 2) {
         const startParts = times[0].split(':')
         const endParts = times[1].split(':')
-        
+
         if (startParts.length === 2) {
           this.startTime.hour = startParts[0]
           this.startTime.minute = startParts[1]
@@ -374,7 +389,7 @@ export default {
           this.endTime.hour = endParts[0]
           this.endTime.minute = endParts[1]
         }
-        
+
         this.updatePickerValue()
       }
     },
@@ -385,7 +400,7 @@ export default {
       const startMinuteIndex = this.minutes.indexOf(this.startTime.minute)
       const endHourIndex = this.hours.indexOf(this.endTime.hour)
       const endMinuteIndex = this.minutes.indexOf(this.endTime.minute)
-      
+
       this.pickerValue = [
         startHourIndex >= 0 ? startHourIndex : 8,
         startMinuteIndex >= 0 ? startMinuteIndex : 0,
@@ -416,11 +431,11 @@ export default {
     handleTimeChange(e) {
       const values = e.detail.value;
       this.pickerValue = values;
-      
+
       // 更新开始时间
       this.startTime.hour = this.hours[values[0]]
       this.startTime.minute = this.minutes[values[1]]
-      
+
       // 更新结束时间
       this.endTime.hour = this.hours[values[3]]
       this.endTime.minute = this.minutes[values[4]]
@@ -431,12 +446,10 @@ export default {
       return `${time.hour}:${time.minute}`
     },
 
-    // 确认时间选择
+    // 确认时间选择 - 直接提交
     confirmTime() {
       const newTime = `${this.formatTime(this.startTime)}-${this.formatTime(this.endTime)}`
 
-      console.log('选择的时间:', newTime) // 调试日志
-      
       // 验证时间合理性
       if (!this.validateTime(this.startTime, this.endTime)) {
         uni.showToast({
@@ -445,14 +458,11 @@ export default {
         })
         return
       }
-      
+
       this.tempTime = newTime
-      this.showBottomActions = true
-      this.hideTimePicker()
-      
-      // 立即更新页面显示
       this.currentTime = newTime
-      console.log('临时存储的时间:', this.tempTime) // 调试日志
+      this.hideTimePicker()
+      this.submitChange()
     },
 
     // 取消变更
@@ -473,7 +483,7 @@ export default {
         })
         return
       }
-      
+
       try {
         // uni.showLoading({
         //   title: '提交中...'
@@ -487,24 +497,20 @@ export default {
         console.log('请求URL:', '/sj/userSjAuth/apply')
 
         const res = await request.post('/sj/userSjAuth/apply', params)
-        
+
         uni.hideLoading()
         console.log('提交接口响应:', res)
-        
+
         // 根据接口文档，使用 code 判断成功
         if (res.code === 200) {
           this.showBottomActions = false
           this.tempTime = ''
           this.originalTime = this.currentTime // 更新原始时间
-          
+
           uni.showToast({
             title: '营业时间更新成功',
             icon: 'none'
           })
-          
-          setTimeout(() => {
-            uni.navigateBack()
-          }, 1500)
         } else {
           uni.showToast({
             title: res.msg || '提交失败',
@@ -551,11 +557,13 @@ export default {
   padding: 18rpx 24rpx;
   margin-bottom: 34rpx;
 }
+
 .setting-label {
   font-size: 30rpx;
   color: #333;
   font-weight: 500;
 }
+
 .custom-switch {
   width: 140rpx;
   height: 56rpx;
@@ -566,11 +574,11 @@ export default {
   align-items: center;
   transition: background-color 0.3s;
   box-sizing: border-box;
-  
+
   &.is-on {
     background-color: #FF4767;
   }
-  
+
   .switch-text {
     font-size: 24rpx;
     color: #FFFFFF;
@@ -578,17 +586,25 @@ export default {
     transition: opacity 0.3s;
     font-weight: 500;
   }
+
   .text-on {
     left: 12rpx;
     opacity: 0;
   }
+
   .text-off {
     right: 12rpx;
     opacity: 1;
   }
-  &.is-on .text-on { opacity: 1; }
-  &.is-on .text-off { opacity: 0; }
-  
+
+  &.is-on .text-on {
+    opacity: 1;
+  }
+
+  &.is-on .text-off {
+    opacity: 0;
+  }
+
   .switch-dot {
     width: 48rpx;
     height: 48rpx;
@@ -597,8 +613,9 @@ export default {
     position: absolute;
     left: 4rpx;
     transition: transform 0.3s cubic-bezier(0.25, 1, 0.5, 1);
-    box-shadow: 0 2rpx 6rpx rgba(0,0,0,0.15);
+    box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.15);
   }
+
   &.is-on .switch-dot {
     transform: translateX(84rpx);
   }
@@ -610,62 +627,81 @@ export default {
   border-radius: 20rpx;
   padding: 24rpx 24rpx;
 }
+
+.service-time-card1 {
+  width: 710rpx;
+  height: 80rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+}
+
 .card-header-flex {
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
+
 .header-title {
   font-size: 30rpx;
   color: #333;
   font-weight: 500;
   transition: all 0.3s ease-in-out;
 }
+
 .arrow-icon {
   width: 16rpx;
   height: 9rpx;
   transition: transform 0.3s;
-  transform: rotate(-360deg); /* 默认朝下 */
+  transform: rotate(-360deg);
+  /* 默认朝下 */
 }
+
 .arrow-icon.rotated {
-  transform: rotate(180deg); /* 展开朝上 */
+  transform: rotate(180deg);
+  /* 展开朝上 */
 }
+
 .time-blocks-container {
   margin-top: 40rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
+
 .t-block {
   width: 280rpx;
   height: 150rpx;
-  background: #F5F5F5 ;
+  background: #F5F5F5;
   border-radius: 16rpx;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
 }
+
 .t-time {
   font-size: 42rpx;
   color: #333;
   font-weight: 500;
 }
+
 .t-label {
   font-size: 24rpx;
   color: #999;
   margin-top: 12rpx;
 }
+
 .t-separator {
   font-weight: 400;
   font-size: 28rpx;
   color: #999999;
   line-height: 40rpx;
 }
+
 .modify-btn-outline {
   margin-top: 50rpx;
   height: 78rpx;
-  border-radius: 43rpx;
+  border-radius: 50rpx;
   border: 1rpx solid #FF4767;
   display: flex;
   align-items: center;
@@ -674,6 +710,18 @@ export default {
   font-size: 28rpx;
   margin-bottom: 10rpx;
 }
+
+.modify-btn-outline1 {
+  margin-top: 50rpx;
+  height: 78rpx;
+  border-radius: 50rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  margin-bottom: 10rpx;
+}
+
 .edit-icon {
   width: 30rpx;
   height: 30rpx;
@@ -683,13 +731,16 @@ export default {
 /* ============ 提示弹窗样式 (完全一致) ============ */
 .setup-modal-mask {
   position: fixed;
-  top: 0; left: 0; right: 0; bottom: 0;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   background: rgba(0, 0, 0, 0.5);
   z-index: 9999;
   display: flex;
   align-items: center;
   justify-content: center;
-  
+
   .setup-modal-content {
     width: 630rpx;
     height: 775rpx;
@@ -698,15 +749,16 @@ export default {
     position: relative;
     display: flex;
     flex-direction: column;
-    
+
     .modal-bg {
       position: absolute;
-      top: 0; left: 0;
+      top: 0;
+      left: 0;
       width: 630rpx;
       height: 265rpx;
       z-index: 0;
     }
-    
+
     .modal-header {
       position: relative;
       z-index: 1;
@@ -715,7 +767,7 @@ export default {
       align-items: flex-end;
       justify-content: center;
       padding-bottom: 20rpx;
-      
+
       text {
         font-size: 36rpx;
         font-weight: bold;
@@ -723,34 +775,34 @@ export default {
         letter-spacing: 2rpx;
       }
     }
-    
+
     .modal-body {
       position: relative;
       z-index: 1;
       flex: 1;
       padding: 24rpx 40rpx;
-      
+
       .modal-subtitle {
         font-size: 28rpx;
         color: #333333;
         margin-bottom: 40rpx;
         display: block;
       }
-      
+
       .missing-list {
         display: flex;
         flex-direction: column;
         gap: 46rpx;
-        
+
         .missing-item {
           display: flex;
           justify-content: space-between;
           align-items: center;
-          
+
           .item-left {
             display: flex;
             align-items: flex-start;
-            
+
             .item-icon {
               width: 32rpx;
               height: 32rpx;
@@ -758,47 +810,55 @@ export default {
               flex-shrink: 0;
               margin-top: 6rpx;
             }
-            
+
             .item-texts {
               display: flex;
               flex-direction: column;
-              
+
               .item-title {
                 font-size: 30rpx;
                 color: #333333;
                 font-weight: 500;
                 margin-bottom: 8rpx;
-                
+
                 &.blue-text {
                   color: #2b85e4;
                 }
               }
-              
+
               .item-desc {
                 font-size: 24rpx;
                 color: #999999;
               }
             }
           }
-          
+
           .item-right {
             font-size: 26rpx;
             font-weight: 400;
             margin-top: -45rpx;
-            
-            &.orange { color: #FF7B00; }
-            &.grey { color: #999999; }
-            &.light-green { color: #18b566; }
+
+            &.orange {
+              color: #FF7B00;
+            }
+
+            &.grey {
+              color: #999999;
+            }
+
+            &.light-green {
+              color: #18b566;
+            }
           }
         }
       }
     }
-    
+
     .modal-footer {
       position: relative;
       z-index: 1;
       padding: 0 50rpx 50rpx;
-      
+
       .btn-know {
         width: 100%;
         height: 88rpx;
@@ -957,7 +1017,8 @@ export default {
   gap: 50rpx;
 }
 
-.btn-cancel-large, .btn-confirm-large {
+.btn-cancel-large,
+.btn-confirm-large {
   font-size: 34rpx;
   flex: 1;
   font-weight: 400;
diff --git a/pages/shop/service-skills.vue b/pages/shop/service-skills.vue
index 0007c80..a035d38 100644
--- a/pages/shop/service-skills.vue
+++ b/pages/shop/service-skills.vue
@@ -1,50 +1,50 @@
 <template>
-	<view class="service-skills-page">
-		<!-- 顶部导航栏 -->
-		<custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
+    <view class="service-skills-page">
+        <!-- 顶部导航栏 -->
+        <custom-navbar :title="navTitle" :showBack="true"></custom-navbar>
 
-		<!-- 页面内容容器 -->
-		<view class="page-content" :style="{ paddingBottom: buttonAreaHeight + 'px' }">
-			<!-- 服务技能选择区域 -->
-			<view class="skills-container box-cont">
-				<view class="skills-header">
-					<view class="title-bar"></view>
-					<text class="skills-title">服务技能（多选）</text>
-				</view>
-				<view class="skills-subtitle" v-if="editable">请选择服务技能</view>
+        <!-- 页面内容容器 -->
+        <view class="page-content" :style="{ paddingBottom: buttonAreaHeight + 'px' }">
+            <!-- 服务技能选择区域 -->
+            <view class="skills-container box-cont">
+                <view class="skills-header">
+                    <view class="title-bar"></view>
+                    <text class="skills-title">服务技能（多选）</text>
+                </view>
+                <view class="skills-subtitle" v-if="editable">请选择服务技能</view>
 
-				<!-- 显示当前生效的服务技能 -->
-				<view class="skills-list" v-if="!showPendingSkills">
-					<view class="skill-item" v-for="(skill, index) in serviceList" :key="skill.id"
-						:class="{ disabled: true }"  v-if="isCurrentSkillSelected(skill.id)">
-						<view class="checkbox-wrapper">
-							<view class="checkbox" :class="{ checked: isCurrentSkillSelected(skill.id) }">
-								<image class="check-icon"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png"
-									mode="aspectFit">
-								</image>
-							</view>
-						</view>
-						<text class="skill-name">{{ skill.title }}</text>
-					</view>
-				</view>
+                <!-- 显示当前生效的服务技能 -->
+                <view class="skills-list" v-if="!showPendingSkills">
+                    <view class="skill-item" v-for="(skill, index) in serviceList" :key="skill.id"
+                        :class="{ disabled: true }" v-if="isCurrentSkillSelected(skill.id)">
+                        <view class="checkbox-wrapper">
+                            <view class="checkbox" :class="{ checked: isCurrentSkillSelected(skill.id) }">
+                                <image class="check-icon"
+                                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png"
+                                    mode="aspectFit">
+                                </image>
+                            </view>
+                        </view>
+                        <text class="skill-name">{{ skill.title }}</text>
+                    </view>
+                </view>
 
-				<!-- 显示待审核的服务技能 -->
-				<view class="skills-list" v-else>
-					<view class="skill-item" v-for="(skill, index) in serviceList" :key="skill.id"
-						@click="toggleSkillSelect(index)" :class="{ disabled: !editable }">
-						<view class="checkbox-wrapper">
-							<view class="checkbox" :class="{ checked: skill.checked }">
-								<image v-if="skill.checked" class="check-icon"
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png"
-									mode="aspectFit">
-								</image>
-							</view>
-						</view>
-						<text class="skill-name">{{ skill.title }}</text>
-					</view>
-				</view>
-			</view>
+                <!-- 显示待审核的服务技能 -->
+                <view class="skills-list" v-else>
+                    <view class="skill-item" v-for="(skill, index) in serviceList" :key="skill.id"
+                        @click="toggleSkillSelect(index)" :class="{ disabled: !editable }">
+                        <view class="checkbox-wrapper">
+                            <view class="checkbox" :class="{ checked: skill.checked }">
+                                <image v-if="skill.checked" class="check-icon"
+                                    src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6948baf3-aad9-4d87-9483-9db0e462a3f7.png"
+                                    mode="aspectFit">
+                                </image>
+                            </view>
+                        </view>
+                        <text class="skill-name">{{ skill.title }}</text>
+                    </view>
+                </view>
+            </view>
 
             <view class="box-cont" style="padding: 0;">
                 <view class="form-item-two" @click="editable ? openExperiencePicker() : null">
@@ -59,889 +59,893 @@
                     </view>
                 </view>
             </view>
-		</view>
+        </view>
 
-		<!-- 底部按钮 -->
-		<view class="bottom-actions" ref="buttonArea">
-			<!-- 驳回原因提示 -->
-			<view class="reject-reason" v-if="shouldShowRejectReason">
-				<view class="reject-title">您的提交已驳回</view>
-				<view class="reject-detail">驳回原因：{{ backText }}</view>
-			</view>
-			<!-- 审核中提示 -->
-			<view class="audit-tip" v-if="showAuditTip && !showPendingSkills">
-				<text class="audit-text">您的提交变更正在审核中...</text>
-			</view>
+        <!-- 底部按钮 -->
+        <view class="bottom-actions" ref="buttonArea">
+            <!-- 驳回原因提示 -->
+            <view class="reject-reason" v-if="shouldShowRejectReason">
+                <view class="reject-title">您的提交已驳回</view>
+                <view class="reject-detail">驳回原因：{{ backText }}</view>
+            </view>
+            <!-- 审核中提示 -->
+            <view class="audit-tip" v-if="showAuditTip && !showPendingSkills">
+                <text class="audit-text">您的提交变更正在审核中...</text>
+            </view>
 
-			<!-- 去变更信息按钮 -->
-			<view class="action-btn change-info-btn" v-if="buttonType === 'change'" @click="startChange">
-				<text class="btn-text">去变更信息</text>
-			</view>
+            <!-- 去变更信息按钮 -->
+            <view class="action-btn change-info-btn" v-if="buttonType === 'change'" @click="startChange">
+                <text class="btn-text">去变更信息</text>
+            </view>
 
-			<!-- 取消和提交按钮 -->
-			<view class="action-buttons-row" v-if="buttonType === 'edit'">
-				<view class="action-btn cancel-btn" @click="cancelChange">
-					<text class="btn-text cancel-text">取消</text>
-				</view>
-				<view class="action-btn submit-btn" @click="submitChange">
-					<text class="btn-text">提交</text>
-				</view>
-			</view>
+            <!-- 取消和提交按钮 -->
+            <view class="action-buttons-row" v-if="buttonType === 'edit'">
+                <view class="action-btn cancel-btn" @click="cancelChange">
+                    <text class="btn-text cancel-text">取消</text>
+                </view>
+                <view class="action-btn submit-btn" @click="submitChange">
+                    <text class="btn-text">提交</text>
+                </view>
+            </view>
 
 
-			<!-- 查看我的变更按钮 -->
-			<view class="action-btn view-change-btn" v-if="buttonType === 'view'" @click="togglePendingSkills">
-				<text class="btn-text">{{ showPendingSkills ? '返回' : '查看我的变更' }}</text>
-			</view>
-		</view>
-	</view>
+            <!-- 查看我的变更按钮 -->
+            <view class="action-btn view-change-btn" v-if="buttonType === 'view'" @click="togglePendingSkills">
+                <text class="btn-text">{{ showPendingSkills ? '返回' : '查看我的变更' }}</text>
+            </view>
+        </view>
+    </view>
 </template>
 
 <script>
-    import request from '../../utils/request';
+import request from '../../utils/request';
 
-    export default {
-        data() {
-            return {
-                sjInformation: {},
-                serviceList: [], // 服务技能列表
-                selectedSkills: [], // 已选中的技能ID（待审核的）
-                originalSkills: [], // 原始选中的技能ID（当前生效的）
+export default {
+    data() {
+        return {
+            sjInformation: {},
+            serviceList: [], // 服务技能列表
+            selectedSkills: [], // 已选中的技能ID（待审核的）
+            originalSkills: [], // 原始选中的技能ID（当前生效的）
 
-                // 新增：专业经验数据流
-                originalMajor: null, // 当前生效的经验
-                pendingMajor: null,  // 待审核的经验
-                displayMajor: null,  // 页面展示的经验
+            // 新增：专业经验数据流
+            originalMajor: null, // 当前生效的经验
+            pendingMajor: null,  // 待审核的经验
+            displayMajor: null,  // 页面展示的经验
 
-                editable: false, // 是否可编辑
-                buttonType: 'change', // 按钮类型: change-去变更信息, edit-取消/提交, view-查看我的变更
-                showAuditTip: false, // 是否显示审核中提示
-                auditStatus: null, // 审核状态
-                applyId: null, // 申请ID
-                isLoading: true, // 添加加载状态
-                showPendingSkills: false, // 是否显示待审核的技能
-                currentSkills: [], // 当前生效的技能ID
-                navTitle: '服务技能', // 导航栏标题
-                buttonAreaHeight: 120, // 按钮区域高度，用于计算底部padding
-                backText: '', // 驳回原因
-                identity: '', // 用户身份
-                lastApplyTime: null, //记录最后申请时间
-            }
+            editable: false, // 是否可编辑
+            buttonType: 'change', // 按钮类型: change-去变更信息, edit-取消/提交, view-查看我的变更
+            showAuditTip: false, // 是否显示审核中提示
+            auditStatus: null, // 审核状态
+            applyId: null, // 申请ID
+            isLoading: true, // 添加加载状态
+            showPendingSkills: false, // 是否显示待审核的技能
+            currentSkills: [], // 当前生效的技能ID
+            navTitle: '服务技能', // 导航栏标题
+            buttonAreaHeight: 120, // 按钮区域高度，用于计算底部padding
+            backText: '', // 驳回原因
+            identity: '', // 用户身份
+            lastApplyTime: null, //记录最后申请时间
+        }
+    },
+    computed: {
+        selectedSkillsText() {
+            const selectedTitles = this.serviceList
+                .filter(item => item.checked)
+                .map(item => item.title);
+            return selectedTitles.join('、');
         },
-        computed: {
-            selectedSkillsText() {
-                const selectedTitles = this.serviceList
-                    .filter(item => item.checked)
-                    .map(item => item.title);
-                return selectedTitles.join('、');
-            },
-            // 新增：将 major 数值转换为文字
-            displayExperienceText() {
-                return this.getExperienceText(this.displayMajor);
-            },
-            hasChanges() {
-                // 检查是否有变更 (合并技能和经验检查)
-                const currentSorted = [...this.currentSkills].sort().join(',');
-                const selectedSorted = [...this.selectedSkills].sort().join(',');
-                const skillsChanged = currentSorted !== selectedSorted;
-                const majorChanged = String(this.displayMajor || '') !== String(this.originalMajor || '');
-                return skillsChanged || majorChanged;
-            },
-            // 控制驳回提示是否显示
-            shouldShowRejectReason() {
-                // 只有在审核驳回状态、不显示待审核技能、且技能未变更时才显示驳回提示
-                return this.auditStatus === 3 &&
-                    !this.showPendingSkills &&
-                    !this.hasChanges &&
-                    this.backText;
-                // 检查是否有待处理的申请（基于时间）
-                !this.hasPendingApply();
-            },
+        // 新增：将 major 数值转换为文字
+        displayExperienceText() {
+            return this.getExperienceText(this.displayMajor);
+        },
+        hasChanges() {
+            // 检查是否有变更 (合并技能和经验检查)
+            const currentSorted = [...this.currentSkills].sort().join(',');
+            const selectedSorted = [...this.selectedSkills].sort().join(',');
+            const skillsChanged = currentSorted !== selectedSorted;
+            const majorChanged = String(this.displayMajor || '') !== String(this.originalMajor || '');
+            return skillsChanged || majorChanged;
+        },
+        // 控制驳回提示是否显示
+        shouldShowRejectReason() {
+            // 只有在审核驳回状态、不显示待审核技能、且技能未变更时才显示驳回提示
+            return this.auditStatus === 3 &&
+                !this.showPendingSkills &&
+                !this.hasChanges &&
+                this.backText;
             // 检查是否有待处理的申请（基于时间）
-            hasPendingApply() {
-                if (!this.lastApplyTime) return false;
-                // 如果最后申请时间在驳回时间之后，说明有新的申请
-                return true;
+            !this.hasPendingApply();
+        },
+        // 检查是否有待处理的申请（基于时间）
+        hasPendingApply() {
+            if (!this.lastApplyTime) return false;
+            // 如果最后申请时间在驳回时间之后，说明有新的申请
+            return true;
+        }
+    },
+    async onLoad() {
+        this.sjInformation = await request.post('/sj/user/getUser');
+        await this.initPage();
+        // 如果没有技能和经验信息，直接进入编辑模式
+        if (this.currentSkills.length === 0 && !this.originalMajor) {
+            this.startChange();
+        }
+    },
+    onReady() {
+        // 获取按钮区域高度，用于设置页面内容padding
+        this.getButtonAreaHeight();
+    },
+    methods: {
+        // 初始化页面
+        async initPage() {
+            this.isLoading = true;
+            try {
+                this.originalMajor = this.sjInformation?.data?.major ? Number(this.sjInformation.data.major) : null;
+                this.displayMajor = this.originalMajor;
+
+                // 先加载服务技能列表
+                await this.loadServiceSkills();
+                // 然后加载申请详情
+                await this.loadApplyDetails();
+            } catch (error) {
+                console.error('初始化页面失败:', error);
+            } finally {
+                this.isLoading = false;
             }
         },
-        async onLoad() {
-            this.sjInformation = await request.post('/sj/user/getUser');
-            await this.initPage();
+
+        // 转换专业经验为文字
+        getExperienceText(major) {
+            const experiences = ['', '实习', '1-3年', '3-5年', '5-10年', '10年以上'];
+            return experiences[major] || '';
         },
-        onReady() {
-            // 获取按钮区域高度，用于设置页面内容padding
-            this.getButtonAreaHeight();
+
+        // 打开专业经验选择器
+        openExperiencePicker() {
+            if (!this.editable) return;
+            uni.showActionSheet({
+                itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
+                success: (res) => {
+                    this.displayMajor = res.tapIndex + 1;
+                }
+            });
         },
-        methods: {
-            // 初始化页面
-            async initPage() {
-                this.isLoading = true;
-                try {
-                    this.originalMajor = this.sjInformation?.data?.major || null;
-                    this.displayMajor = this.originalMajor;
 
-                    // 先加载服务技能列表
-                    await this.loadServiceSkills();
-                    // 然后加载申请详情
-                    await this.loadApplyDetails();
-                } catch (error) {
-                    console.error('初始化页面失败:', error);
-                } finally {
-                    this.isLoading = false;
-                }
-            },
+        // 清理驳回技能存储的逻辑
+        async cleanupRejectedSkillsIfNeeded() {
+            try {
+                const rejectedSkills = uni.getStorageSync('rejectedSkills');
+                const rejectedMajor = uni.getStorageSync('rejectedMajor');
+                const lastApplyTime = uni.getStorageSync('lastApplyTime');
 
-            // 转换专业经验为文字
-            getExperienceText(major) {
-                const experiences = ['', '实习', '1-3年', '3-5年', '5-10年', '10年以上'];
-                return experiences[major] || '';
-            },
-
-            // 打开专业经验选择器
-            openExperiencePicker() {
-                if (!this.editable) return;
-                uni.showActionSheet({
-                    itemList: ['实习', '1-3年', '3-5年', '5-10年', '10年以上'],
-                    success: (res) => {
-                        this.displayMajor = res.tapIndex + 1;
-                    }
-                });
-            },
-
-            // 清理驳回技能存储的逻辑
-            async cleanupRejectedSkillsIfNeeded() {
-                try {
-                    const rejectedSkills = uni.getStorageSync('rejectedSkills');
-                    const rejectedMajor = uni.getStorageSync('rejectedMajor');
-                    const lastApplyTime = uni.getStorageSync('lastApplyTime');
-
-                    if (rejectedSkills && rejectedSkills.length > 0) {
-                        // 获取当前生效技能
-                        const params = {
-                            type: 3
-                        };
-                        const res = this.sjInformation;
-
-                        if (res.state === 1 && res.data && res.data.servers_kill) {
-                            let currentSkillIds = [];
-                            if (Array.isArray(res.data.servers_kill)) {
-                                currentSkillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(
-                                    id));
-                            } else if (typeof res.data.servers_kill === 'string') {
-                                currentSkillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim()))
-                                    .filter(id => !isNaN(id));
-                            }
-
-                            const currentSorted = [...currentSkillIds].sort().join(',');
-                            const rejectedSorted = [...rejectedSkills].sort().join(',');
-                            const currentMajor = res.data.major;
-
-                            // 如果当前生效技能与被驳回技能不一致，说明有新的申请已生效
-                            if (currentSorted !== rejectedSorted || String(currentMajor) !== String(rejectedMajor)) {
-                                console.log('检测到技能已变更，清理驳回相关存储');
-                                uni.removeStorageSync('rejectedSkills');
-                                uni.removeStorageSync('rejectedMajor');
-                                uni.removeStorageSync('lastRejectTime');
-                            }
-                        }
-                    }
-                } catch (error) {
-                    console.error('清理驳回技能存储失败:', error);
-                }
-            },
-
-            // 获取按钮区域高度
-            getButtonAreaHeight() {
-                // 使用setTimeout确保DOM已渲染
-                setTimeout(() => {
-                    const query = uni.createSelectorQuery().in(this);
-                    query.select('.bottom-actions').boundingClientRect(data => {
-                        if (data) {
-                            this.buttonAreaHeight = data.height + 20; // 增加一些边距
-                        }
-                    }).exec();
-                }, 100);
-            },
-
-            // 更新导航栏标题
-            updateNavTitle() {
-                if (this.editable || this.showPendingSkills) {
-                    this.navTitle = '服务技能变更';
-                } else {
-                    this.navTitle = '服务技能';
-                }
-            },
-
-            // 加载服务技能列表
-            async loadServiceSkills() {
-                try {
-                    const res = await request.post('/sj/firstclass');
-                    this.serviceList = res.data.map(item => ({
-                        ...item,
-                        checked: false
-                    }));
-                    console.log('服务技能列表:', this.serviceList);
-                } catch (error) {
-                    console.error('加载服务技能失败:', error);
-                    uni.showToast({
-                        title: '加载服务技能失败',
-                        icon: 'none'
-                    });
-                }
-            },
-
-            // 加载申请详情
-            async loadApplyDetails() {
-                try {
-                    console.log('开始加载申请详情...');
-                    const res = await request.post('/sj/userSjAuth/details', {
-                        apply_type: 2 // 服务技能变更
-                    });
-
-                    console.log('申请详情接口返回:', res);
-
-                    if (res.code === 200 && res.data) {
-                        const detail = res.data;
-                        this.applyId = detail.id;
-                        this.auditStatus = detail.apply_state;
-                        this.backText = detail.back_text || ''; // 获取驳回原因
-
-                        console.log('审核状态:', this.auditStatus);
-                        console.log('原始servers_kill数据:', detail.servers_kill);
-
-                        // 处理服务技能数据
-                        if (detail.servers_kill) {
-                            let skillIds = [];
-
-                            if (Array.isArray(detail.servers_kill)) {
-                                skillIds = detail.servers_kill.map(id => {
-                                    const num = parseInt(id);
-                                    return isNaN(num) ? null : num;
-                                }).filter(id => id !== null);
-                            } else if (typeof detail.servers_kill === 'string') {
-                                skillIds = detail.servers_kill.split(',').map(id => {
-                                    const num = parseInt(id.trim());
-                                    return isNaN(num) ? null : num;
-                                }).filter(id => id !== null);
-                            }
-
-                            console.log('解析后的技能ID:', skillIds);
-                            
-                            this.pendingMajor = detail.major || this.originalMajor;
-
-                            // 根据审核状态正确处理数据
-                            if (this.auditStatus === 1) { // 审核中
-                                this.selectedSkills = [...skillIds];
-                                this.displayMajor = this.pendingMajor;
-                                console.log('审核中，待审核技能:', this.selectedSkills);
-                                // 记录申请时间
-                                uni.setStorageSync('lastApplyTime', new Date().getTime());
-                            } else if (this.auditStatus === 3) { // 审核驳回
-                                // 检查驳回数据是否是最新的
-                                await this.handleRejectedData(skillIds, detail.major);
-                            }
-
-                            this.updateCheckedStatus();
-                        }
-
-                        // 无论审核状态如何，都加载当前生效的技能
-                        await this.loadCurrentEffectiveSkills();
-
-                    } else {
-                        console.log('申请详情返回数据为空或code不为200:', res);
-                        // 清理可能的驳回存储
-                        uni.removeStorageSync('rejectedSkills');
-                        uni.removeStorageSync('rejectedMajor');
-                        uni.removeStorageSync('lastRejectTime');
-                        await this.loadCurrentEffectiveSkills();
-                    }
-
-                } catch (error) {
-                    console.error('加载申请详情失败:', error);
-                    // 出错时也尝试加载当前生效的技能
-                    await this.loadCurrentEffectiveSkills();
-                }
-            },
-
-            // 处理驳回技能逻辑
-            async handleRejectedData(rejectedSkillIds, rejectedMajor) {
-                const storedRejectedSkills = uni.getStorageSync('rejectedSkills');
-                const storedRejectedMajor = uni.getStorageSync('rejectedMajor');
-                const lastRejectTime = uni.getStorageSync('lastRejectTime');
-
-                // 获取当前生效技能进行比较
-                const currentSkills = await this.getCurrentEffectiveSkillIds();
-                const currentMajor = this.sjInformation?.data?.major || null;
-
-                const rejectedSorted = [...rejectedSkillIds].sort().join(',');
-                const storedSorted = storedRejectedSkills ? [...storedRejectedSkills].sort().join(',') : '';
-                const currentSorted = [...currentSkills].sort().join(',');
-
-                // 如果驳回的技能与当前生效技能相同，说明驳回数据过时
-                if (rejectedSorted === currentSorted && String(rejectedMajor||'') === String(currentMajor||'')) {
-                    console.log('驳回数据与当前生效技能相同，可能数据过时，忽略本次驳回数据');
-                    this.selectedSkills = [...currentSkills];
-                    this.displayMajor = currentMajor;
-                    // 清理驳回存储
-                    uni.removeStorageSync('rejectedSkills');
-                    uni.removeStorageSync('rejectedMajor');
-                    uni.removeStorageSync('lastRejectTime');
-                    this.backText = ''; // 清空驳回原因
-                    return;
-                }
-
-                // 如果驳回技能与存储的驳回技能不同，更新存储
-                if (rejectedSorted !== storedSorted || String(rejectedMajor) !== String(storedRejectedMajor)) {
-                    console.log('发现新的驳回数据，更新存储:', rejectedSkillIds);
-                    uni.setStorageSync('rejectedSkills', rejectedSkillIds);
-                    uni.setStorageSync('rejectedMajor', rejectedMajor);
-                    uni.setStorageSync('lastRejectTime', new Date().getTime());
-                }
-
-                this.selectedSkills = [...rejectedSkillIds];
-                this.displayMajor = rejectedMajor || currentMajor;
-                console.log('审核驳回，被驳回技能:', this.selectedSkills);
-            },
-
-            // 获取当前生效技能ID
-            async getCurrentEffectiveSkillIds() {
-                try {
+                if (rejectedSkills && rejectedSkills.length > 0) {
+                    // 获取当前生效技能
                     const params = {
                         type: 3
                     };
                     const res = this.sjInformation;
 
                     if (res.state === 1 && res.data && res.data.servers_kill) {
-                        let skillIds = [];
+                        let currentSkillIds = [];
                         if (Array.isArray(res.data.servers_kill)) {
-                            skillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(id));
+                            currentSkillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(
+                                id));
                         } else if (typeof res.data.servers_kill === 'string') {
-                            skillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim())).filter(id => !
-                                isNaN(id));
+                            currentSkillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim()))
+                                .filter(id => !isNaN(id));
+                        }
+
+                        const currentSorted = [...currentSkillIds].sort().join(',');
+                        const rejectedSorted = [...rejectedSkills].sort().join(',');
+                        const currentMajor = res.data.major;
+
+                        // 如果当前生效技能与被驳回技能不一致，说明有新的申请已生效
+                        if (currentSorted !== rejectedSorted || String(currentMajor) !== String(rejectedMajor)) {
+                            console.log('检测到技能已变更，清理驳回相关存储');
+                            uni.removeStorageSync('rejectedSkills');
+                            uni.removeStorageSync('rejectedMajor');
+                            uni.removeStorageSync('lastRejectTime');
                         }
-                        return skillIds;
                     }
-                    return [];
-                } catch (error) {
-                    console.error('获取当前生效技能失败:', error);
-                    return [];
                 }
-            },
+            } catch (error) {
+                console.error('清理驳回技能存储失败:', error);
+            }
+        },
 
-
-            // 加载当前生效的服务技能
-            async loadCurrentEffectiveSkills() {
-                try {
-                    console.log('开始加载当前生效的服务技能...');
-                    const currentSkills = await this.getCurrentEffectiveSkillIds();
-
-                    this.currentSkills = [...currentSkills];
-                    this.originalSkills = [...currentSkills];
-                    
-                    this.originalMajor = this.sjInformation?.data?.major || null;
-
-                    console.log('当前生效的技能ID:', this.currentSkills);
-
-                    // 只有在无申请状态或审核通过状态时，才用当前技能更新选中技能
-                    if (this.auditStatus === null || this.auditStatus === 2) {
-                        this.selectedSkills = [...currentSkills];
-                        this.displayMajor = this.originalMajor;
+        // 获取按钮区域高度
+        getButtonAreaHeight() {
+            // 使用setTimeout确保DOM已渲染
+            setTimeout(() => {
+                const query = uni.createSelectorQuery().in(this);
+                query.select('.bottom-actions').boundingClientRect(data => {
+                    if (data) {
+                        this.buttonAreaHeight = data.height + 20; // 增加一些边距
                     }
-                    // 审核中状态保持原有的selectedSkills不变
-                    // 审核驳回状态已经在handleRejectedSkills中处理
+                }).exec();
+            }, 100);
+        },
 
-                    this.updateCheckedStatus();
-                    this.updatePageStatus();
+        // 更新导航栏标题
+        updateNavTitle() {
+            if (this.editable || this.showPendingSkills) {
+                this.navTitle = '服务技能变更';
+            } else {
+                this.navTitle = '服务技能';
+            }
+        },
 
-                } catch (error) {
-                    console.error('加载当前生效技能失败:', error);
-                    this.currentSkills = [];
-                    this.originalSkills = [];
-                    if (this.auditStatus !== 1) {
-                        this.selectedSkills = [];
-                    }
-                    this.updateCheckedStatus();
-                    this.updatePageStatus();
-                }
-            },
-
-
-
-            // 检查技能是否在当前生效的技能中
-            isCurrentSkillSelected(skillId) {
-                return this.currentSkills.includes(skillId);
-            },
-
-            // 更新选中状态（用于待审核的技能）
-            updateCheckedStatus() {
-                console.log('更新选中状态，当前服务技能列表:', this.serviceList);
-                console.log('要选中的技能ID:', this.selectedSkills);
-                this.serviceList.forEach(item => {
-                    item.checked = this.selectedSkills.includes(item.id);
+        // 加载服务技能列表
+        async loadServiceSkills() {
+            try {
+                const res = await request.post('/sj/firstclass');
+                this.serviceList = res.data.map(item => ({
+                    ...item,
+                    checked: false
+                }));
+                console.log('服务技能列表:', this.serviceList);
+            } catch (error) {
+                console.error('加载服务技能失败:', error);
+                uni.showToast({
+                    title: '加载服务技能失败',
+                    icon: 'none'
                 });
-            },
+            }
+        },
 
-            // 根据审核状态更新页面状态
-            updatePageStatus() {
-                console.log('更新页面状态，审核状态:', this.auditStatus);
+        // 加载申请详情
+        async loadApplyDetails() {
+            try {
+                console.log('开始加载申请详情...');
+                const res = await request.post('/sj/userSjAuth/details', {
+                    apply_type: 2 // 服务技能变更
+                });
 
-                // 检查是否有变更
+                console.log('申请详情接口返回:', res);
+
+                if (res.code === 200 && res.data) {
+                    const detail = res.data;
+                    this.applyId = detail.id;
+                    this.auditStatus = detail.apply_state;
+                    this.backText = detail.back_text || ''; // 获取驳回原因
+
+                    console.log('审核状态:', this.auditStatus);
+                    console.log('原始servers_kill数据:', detail.servers_kill);
+
+                    // 处理服务技能数据
+                    if (detail.servers_kill) {
+                        let skillIds = [];
+
+                        if (Array.isArray(detail.servers_kill)) {
+                            skillIds = detail.servers_kill.map(id => {
+                                const num = parseInt(id);
+                                return isNaN(num) ? null : num;
+                            }).filter(id => id !== null);
+                        } else if (typeof detail.servers_kill === 'string') {
+                            skillIds = detail.servers_kill.split(',').map(id => {
+                                const num = parseInt(id.trim());
+                                return isNaN(num) ? null : num;
+                            }).filter(id => id !== null);
+                        }
+
+                        console.log('解析后的技能ID:', skillIds);
+
+                        this.pendingMajor = detail.major || this.originalMajor;
+
+                        // 根据审核状态正确处理数据
+                        if (this.auditStatus === 1) { // 审核中
+                            this.selectedSkills = [...skillIds];
+                            this.displayMajor = this.pendingMajor;
+                            console.log('审核中，待审核技能:', this.selectedSkills);
+                            // 记录申请时间
+                            uni.setStorageSync('lastApplyTime', new Date().getTime());
+                        } else if (this.auditStatus === 3) { // 审核驳回
+                            // 检查驳回数据是否是最新的
+                            await this.handleRejectedData(skillIds, detail.major);
+                        }
+
+                        this.updateCheckedStatus();
+                    }
+
+                    // 无论审核状态如何，都加载当前生效的技能
+                    await this.loadCurrentEffectiveSkills();
+
+                } else {
+                    console.log('申请详情返回数据为空或code不为200:', res);
+                    // 清理可能的驳回存储
+                    uni.removeStorageSync('rejectedSkills');
+                    uni.removeStorageSync('rejectedMajor');
+                    uni.removeStorageSync('lastRejectTime');
+                    await this.loadCurrentEffectiveSkills();
+                }
+
+            } catch (error) {
+                console.error('加载申请详情失败:', error);
+                // 出错时也尝试加载当前生效的技能
+                await this.loadCurrentEffectiveSkills();
+            }
+        },
+
+        // 处理驳回技能逻辑
+        async handleRejectedData(rejectedSkillIds, rejectedMajor) {
+            const storedRejectedSkills = uni.getStorageSync('rejectedSkills');
+            const storedRejectedMajor = uni.getStorageSync('rejectedMajor');
+            const lastRejectTime = uni.getStorageSync('lastRejectTime');
+
+            // 获取当前生效技能进行比较
+            const currentSkills = await this.getCurrentEffectiveSkillIds();
+            const currentMajor = this.sjInformation?.data?.major || null;
+
+            const rejectedSorted = [...rejectedSkillIds].sort().join(',');
+            const storedSorted = storedRejectedSkills ? [...storedRejectedSkills].sort().join(',') : '';
+            const currentSorted = [...currentSkills].sort().join(',');
+
+            // 如果驳回的技能与当前生效技能相同，说明驳回数据过时
+            if (rejectedSorted === currentSorted && String(rejectedMajor || '') === String(currentMajor || '')) {
+                console.log('驳回数据与当前生效技能相同，可能数据过时，忽略本次驳回数据');
+                this.selectedSkills = [...currentSkills];
+                this.displayMajor = currentMajor;
+                // 清理驳回存储
+                uni.removeStorageSync('rejectedSkills');
+                uni.removeStorageSync('rejectedMajor');
+                uni.removeStorageSync('lastRejectTime');
+                this.backText = ''; // 清空驳回原因
+                return;
+            }
+
+            // 如果驳回技能与存储的驳回技能不同，更新存储
+            if (rejectedSorted !== storedSorted || String(rejectedMajor) !== String(storedRejectedMajor)) {
+                console.log('发现新的驳回数据，更新存储:', rejectedSkillIds);
+                uni.setStorageSync('rejectedSkills', rejectedSkillIds);
+                uni.setStorageSync('rejectedMajor', rejectedMajor);
+                uni.setStorageSync('lastRejectTime', new Date().getTime());
+            }
+
+            this.selectedSkills = [...rejectedSkillIds];
+            this.displayMajor = rejectedMajor || currentMajor;
+            console.log('审核驳回，被驳回技能:', this.selectedSkills);
+        },
+
+        // 获取当前生效技能ID
+        async getCurrentEffectiveSkillIds() {
+            try {
+                const params = {
+                    type: 3
+                };
+                const res = this.sjInformation;
+
+                if (res.state === 1 && res.data && res.data.servers_kill) {
+                    let skillIds = [];
+                    if (Array.isArray(res.data.servers_kill)) {
+                        skillIds = res.data.servers_kill.map(id => parseInt(id)).filter(id => !isNaN(id));
+                    } else if (typeof res.data.servers_kill === 'string') {
+                        skillIds = res.data.servers_kill.split(',').map(id => parseInt(id.trim())).filter(id => !
+                            isNaN(id));
+                    }
+                    return skillIds;
+                }
+                return [];
+            } catch (error) {
+                console.error('获取当前生效技能失败:', error);
+                return [];
+            }
+        },
+
+
+        // 加载当前生效的服务技能
+        async loadCurrentEffectiveSkills() {
+            try {
+                console.log('开始加载当前生效的服务技能...');
+                const currentSkills = await this.getCurrentEffectiveSkillIds();
+
+                this.currentSkills = [...currentSkills];
+                this.originalSkills = [...currentSkills];
+
+                this.originalMajor = this.sjInformation?.data?.major || null;
+
+                console.log('当前生效的技能ID:', this.currentSkills);
+
+                // 只有在无申请状态或审核通过状态时，才用当前技能更新选中技能
+                if (this.auditStatus === null || this.auditStatus === 2) {
+                    this.selectedSkills = [...currentSkills];
+                    this.displayMajor = this.originalMajor;
+                }
+                // 审核中状态保持原有的selectedSkills不变
+                // 审核驳回状态已经在handleRejectedSkills中处理
+
+                this.updateCheckedStatus();
+                this.updatePageStatus();
+
+            } catch (error) {
+                console.error('加载当前生效技能失败:', error);
+                this.currentSkills = [];
+                this.originalSkills = [];
+                if (this.auditStatus !== 1) {
+                    this.selectedSkills = [];
+                }
+                this.updateCheckedStatus();
+                this.updatePageStatus();
+            }
+        },
+
+
+
+        // 检查技能是否在当前生效的技能中
+        isCurrentSkillSelected(skillId) {
+            return this.currentSkills.includes(skillId);
+        },
+
+        // 更新选中状态（用于待审核的技能）
+        updateCheckedStatus() {
+            console.log('更新选中状态，当前服务技能列表:', this.serviceList);
+            console.log('要选中的技能ID:', this.selectedSkills);
+            this.serviceList.forEach(item => {
+                item.checked = this.selectedSkills.includes(item.id);
+            });
+        },
+
+        // 根据审核状态更新页面状态
+        updatePageStatus() {
+            console.log('更新页面状态，审核状态:', this.auditStatus);
+
+            // 检查是否有变更
+            const currentSorted = [...this.currentSkills].sort().join(',');
+            const selectedSorted = [...this.selectedSkills].sort().join(',');
+            const hasChanges = currentSorted !== selectedSorted;
+
+            console.log('技能变更检查 - 当前生效:', this.currentSkills, '选中:', this.selectedSkills, '是否变更:', hasChanges);
+
+            if (this.auditStatus === 1) { // 审核中
+                this.showAuditTip = true;
+                this.buttonType = 'view';
+                this.editable = false;
+                this.showPendingSkills = false;
+            } else if (this.auditStatus === 3) { // 审核驳回
+                // 检查驳回数据是否无效
+                const rejectedSkills = uni.getStorageSync('rejectedSkills');
+                const rejectedMajor = uni.getStorageSync('rejectedMajor');
+                const rejectedSorted = rejectedSkills ? [...rejectedSkills].sort().join(',') : '';
                 const currentSorted = [...this.currentSkills].sort().join(',');
-                const selectedSorted = [...this.selectedSkills].sort().join(',');
-                const hasChanges = currentSorted !== selectedSorted;
 
-                console.log('技能变更检查 - 当前生效:', this.currentSkills, '选中:', this.selectedSkills, '是否变更:', hasChanges);
-
-                if (this.auditStatus === 1) { // 审核中
-                    this.showAuditTip = true;
-                    this.buttonType = 'view';
+                // 如果驳回技能与当前技能相同，说明驳回数据无效
+                if (rejectedSorted === currentSorted && String(rejectedMajor || '') === String(this.originalMajor || '')) {
+                    console.log('驳回数据无效，按无申请状态处理');
+                    this.showAuditTip = false;
+                    this.buttonType = 'change';
                     this.editable = false;
                     this.showPendingSkills = false;
-                } else if (this.auditStatus === 3) { // 审核驳回
-                    // 检查驳回数据是否无效
-                    const rejectedSkills = uni.getStorageSync('rejectedSkills');
-                    const rejectedMajor = uni.getStorageSync('rejectedMajor');
-                    const rejectedSorted = rejectedSkills ? [...rejectedSkills].sort().join(',') : '';
-                    const currentSorted = [...this.currentSkills].sort().join(',');
-
-                    // 如果驳回技能与当前技能相同，说明驳回数据无效
-                    if (rejectedSorted === currentSorted && String(rejectedMajor||'') === String(this.originalMajor||'')) {
-                        console.log('驳回数据无效，按无申请状态处理');
-                        this.showAuditTip = false;
-                        this.buttonType = 'change';
-                        this.editable = false;
-                        this.showPendingSkills = false;
-                        this.backText = ''; // 清空驳回原因
-                    } else {
-                        this.showAuditTip = false;
-                        this.buttonType = 'change';
-                        this.editable = false;
-                        this.showPendingSkills = false;
-                    }
-                } else { // 无申请或审核通过
+                    this.backText = ''; // 清空驳回原因
+                } else {
                     this.showAuditTip = false;
                     this.buttonType = 'change';
                     this.editable = false;
                     this.showPendingSkills = false;
                 }
-
-                this.updateNavTitle();
-
-                console.log('最终页面状态:', {
-                    showAuditTip: this.showAuditTip,
-                    buttonType: this.buttonType,
-                    editable: this.editable,
-                    showPendingSkills: this.showPendingSkills,
-                    currentSkills: this.currentSkills,
-                    selectedSkills: this.selectedSkills,
-                    backText: this.backText
-                });
-            },
-
-            // 切换技能选择状态（仅用于编辑模式）
-            toggleSkillSelect(index) {
-                if (!this.editable) return;
-
-                this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
-
-                // 更新选中的技能ID数组
-                this.selectedSkills = this.serviceList
-                    .filter(item => item.checked)
-                    .map(item => item.id);
-
-                console.log('当前选中的技能ID:', this.selectedSkills);
-            },
-
-            // 切换显示待审核的技能
-            togglePendingSkills() {
-                this.showPendingSkills = !this.showPendingSkills;
-                if (this.showPendingSkills) {
-                    this.displayMajor = this.pendingMajor;
-                } else {
-                    this.displayMajor = this.originalMajor;
-                }
-                // 更新导航栏标题
-                this.updateNavTitle();
-            },
-
-            // 开始变更
-            startChange() {
-                this.editable = true;
-                this.buttonType = 'edit';
-                // 进入编辑模式时，显示待审核的技能
-                this.showPendingSkills = true;
-                this.displayMajor = this.pendingMajor || this.originalMajor;
-                // 更新导航栏标题
-                this.updateNavTitle();
-            },
-
-            // 取消变更
-            cancelChange() {
-                // 恢复原始选择
-                this.selectedSkills = [...this.originalSkills];
-                this.displayMajor = this.originalMajor;
-                this.updateCheckedStatus();
-
-                this.editable = false;
+            } else { // 无申请或审核通过
+                this.showAuditTip = false;
                 this.buttonType = 'change';
-                this.showPendingSkills = false; // 取消后显示当前生效的技能
-                // 更新导航栏标题
-                this.updateNavTitle();
-            },
+                this.editable = false;
+                this.showPendingSkills = false;
+            }
 
-            // 提交变更 - 修改为传递数组格式
-            async submitChange() {
-                if (this.selectedSkills.length === 0) {
+            this.updateNavTitle();
+
+            console.log('最终页面状态:', {
+                showAuditTip: this.showAuditTip,
+                buttonType: this.buttonType,
+                editable: this.editable,
+                showPendingSkills: this.showPendingSkills,
+                currentSkills: this.currentSkills,
+                selectedSkills: this.selectedSkills,
+                backText: this.backText
+            });
+        },
+
+        // 切换技能选择状态（仅用于编辑模式）
+        toggleSkillSelect(index) {
+            if (!this.editable) return;
+
+            this.$set(this.serviceList[index], 'checked', !this.serviceList[index].checked);
+
+            // 更新选中的技能ID数组
+            this.selectedSkills = this.serviceList
+                .filter(item => item.checked)
+                .map(item => item.id);
+
+            console.log('当前选中的技能ID:', this.selectedSkills);
+        },
+
+        // 切换显示待审核的技能
+        togglePendingSkills() {
+            this.showPendingSkills = !this.showPendingSkills;
+            if (this.showPendingSkills) {
+                this.displayMajor = this.pendingMajor;
+            } else {
+                this.displayMajor = this.originalMajor;
+            }
+            // 更新导航栏标题
+            this.updateNavTitle();
+        },
+
+        // 开始变更
+        startChange() {
+            this.editable = true;
+            this.buttonType = 'edit';
+            // 进入编辑模式时，显示待审核的技能
+            this.showPendingSkills = true;
+            this.displayMajor = this.pendingMajor || this.originalMajor;
+            // 更新导航栏标题
+            this.updateNavTitle();
+        },
+
+        // 取消变更
+        cancelChange() {
+            // 恢复原始选择
+            this.selectedSkills = [...this.originalSkills];
+            this.displayMajor = this.originalMajor;
+            this.updateCheckedStatus();
+
+            this.editable = false;
+            this.buttonType = 'change';
+            this.showPendingSkills = false; // 取消后显示当前生效的技能
+            // 更新导航栏标题
+            this.updateNavTitle();
+        },
+
+        // 提交变更 - 修改为传递数组格式
+        async submitChange() {
+            if (this.selectedSkills.length === 0) {
+                uni.showToast({
+                    title: '请至少选择一个服务技能',
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!this.displayMajor) {
+                uni.showToast({ title: '请选择专业经验', icon: 'none' });
+                return;
+            }
+
+            if (!this.hasChanges) {
+                uni.showToast({
+                    title: '未检测到变更',
+                    icon: 'none'
+                });
+                return;
+            }
+
+            try {
+                uni.showLoading({
+                    title: '提交中...'
+                });
+                const params = {
+                    apply_type: 2, // 服务技能变更
+                    servers_kill: this.selectedSkills, // 直接传递数组
+                    major: this.displayMajor
+                };
+
+                console.log('提交的数据:', params);
+
+                const res = await request.post('/sj/userSjAuth/apply', params);
+
+                uni.hideLoading();
+
+                if (res.code === 200) {
                     uni.showToast({
-                        title: '请至少选择一个服务技能',
+                        title: '提交成功',
                         icon: 'none'
+                        // icon: 'success'
                     });
-                    return;
-                }
-                if (!this.displayMajor) {
-                    uni.showToast({ title: '请选择专业经验', icon: 'none' });
-                    return;
-                }
 
-                if (!this.hasChanges) {
+                    // 清理驳回相关存储
+                    uni.removeStorageSync('rejectedSkills');
+                    uni.removeStorageSync('rejectedMajor');
+                    uni.removeStorageSync('lastRejectTime');
+
+                    // 记录申请时间
+                    uni.setStorageSync('lastApplyTime', new Date().getTime());
+                    this.pendingMajor = this.displayMajor;
+
+                    // 更新页面状态为审核中
+                    this.showAuditTip = true;
+                    this.editable = false;
+                    this.buttonType = 'view';
+                    this.auditStatus = 1; // 审核中
+                    this.showPendingSkills = false; // 提交后默认显示当前生效的技能
+                    // 更新导航栏标题
+                    this.updateNavTitle();
+
+                    // 重新加载申请详情获取最新状态
+                    setTimeout(() => {
+                        this.loadApplyDetails();
+                    }, 1000);
+                } else {
                     uni.showToast({
-                        title: '未检测到变更',
-                        icon: 'none'
-                    });
-                    return;
-                }
-
-                try {
-                    uni.showLoading({
-                        title: '提交中...'
-                    });
-                    const params = {
-                        apply_type: 2, // 服务技能变更
-                        servers_kill: this.selectedSkills, // 直接传递数组
-                        major: this.displayMajor
-                    };
-
-                    console.log('提交的数据:', params);
-
-                    const res = await request.post('/sj/userSjAuth/apply', params);
-
-                    uni.hideLoading();
-
-                    if (res.code === 200) {
-                        uni.showToast({
-                            title: '提交成功',
-                            icon: 'none'
-                            // icon: 'success'
-                        });
-
-                        // 清理驳回相关存储
-                        uni.removeStorageSync('rejectedSkills');
-                        uni.removeStorageSync('rejectedMajor');
-                        uni.removeStorageSync('lastRejectTime');
-
-                        // 记录申请时间
-                        uni.setStorageSync('lastApplyTime', new Date().getTime());
-                        this.pendingMajor = this.displayMajor;
-
-                        // 更新页面状态为审核中
-                        this.showAuditTip = true;
-                        this.editable = false;
-                        this.buttonType = 'view';
-                        this.auditStatus = 1; // 审核中
-                        this.showPendingSkills = false; // 提交后默认显示当前生效的技能
-                        // 更新导航栏标题
-                        this.updateNavTitle();
-
-                        // 重新加载申请详情获取最新状态
-                        setTimeout(() => {
-                            this.loadApplyDetails();
-                        }, 1000);
-                    } else {
-                        uni.showToast({
-                            title: res.msg || '提交失败',
-                            icon: 'none'
-                        });
-                    }
-                } catch (error) {
-                    uni.hideLoading();
-                    console.error('提交变更失败:', error);
-                    uni.showToast({
-                        title: '提交失败',
+                        title: res.msg || '提交失败',
                         icon: 'none'
                     });
                 }
+            } catch (error) {
+                uni.hideLoading();
+                console.error('提交变更失败:', error);
+                uni.showToast({
+                    title: '提交失败',
+                    icon: 'none'
+                });
             }
         }
     }
+}
 </script>
 
 <style scoped>
-    .service-skills-page {
-        background-color: #f5f5f5;
-        min-height: 100vh;
-        box-sizing: border-box;
-        display: flex;
-        flex-direction: column;
-    }
+.service-skills-page {
+    background-color: #f5f5f5;
+    min-height: 100vh;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+}
 
-    /* 页面内容区域 */
-    .page-content {
-        flex: 1;
-        overflow-y: auto;
-        padding: 20rpx 0;
-        box-sizing: border-box;
-    }
+/* 页面内容区域 */
+.page-content {
+    flex: 1;
+    overflow-y: auto;
+    padding: 20rpx 0;
+    box-sizing: border-box;
+}
 
-    /* 审核中提示 */
-    .audit-tip {
-        margin: 20rpx 24rpx 20rpx 24rpx;
-        border-radius: 12rpx;
-    }
+/* 审核中提示 */
+.audit-tip {
+    margin: 20rpx 24rpx 20rpx 24rpx;
+    border-radius: 12rpx;
+}
 
-    .audit-text {
-        font-weight: 400;
-        font-size: 32rpx;
-        color: #333333;
-        text-align: center;
-        display: block;
-    }
+.audit-text {
+    font-weight: 400;
+    font-size: 32rpx;
+    color: #333333;
+    text-align: center;
+    display: block;
+}
 
-    /* 驳回原因样式 */
-    .reject-reason {
-        background: transparent;
-        padding: 24rpx;
-    }
+/* 驳回原因样式 */
+.reject-reason {
+    background: transparent;
+    padding: 24rpx;
+}
 
-    .reject-title {
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 500;
-        font-size: 32rpx;
-        color: #333333;
-        line-height: 45rpx;
-        text-align: center;
-        font-style: normal;
-    }
+.reject-title {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #333333;
+    line-height: 45rpx;
+    text-align: center;
+    font-style: normal;
+}
 
-    .reject-detail {
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 400;
-        font-size: 28rpx;
-        color: #999999;
-        line-height: 40rpx;
-        text-align: center;
-        font-style: normal;
-        margin-top: 12rpx;
+.reject-detail {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #999999;
+    line-height: 40rpx;
+    text-align: center;
+    font-style: normal;
+    margin-top: 12rpx;
 
-    }
+}
 
-    .skills-header {
-        display: flex;
-        align-items: center;
-        margin-bottom: 20rpx;
-    }
+.skills-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20rpx;
+}
 
-    .title-bar {
-        width: 6rpx;
-        height: 30rpx;
-        background-color: #FF4767;
-        margin-right: 10rpx;
-        border-radius: 5rpx;
-    }
+.title-bar {
+    width: 6rpx;
+    height: 30rpx;
+    background-color: #FF4767;
+    margin-right: 10rpx;
+    border-radius: 5rpx;
+}
 
-    .skills-title {
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 500;
-        font-size: 32rpx;
-        color: #1D2129;
-        line-height: 48rpx;
-        text-align: left;
-        font-style: normal;
-    }
+.skills-title {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #1D2129;
+    line-height: 48rpx;
+    text-align: left;
+    font-style: normal;
+}
 
-    .skills-subtitle {
-        margin-left: 20rpx;
-        margin-bottom: 20rpx;
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 400;
-        font-size: 28rpx;
-        color: #333333;
-        line-height: 40rpx;
-        text-align: left;
-        font-style: normal;
-    }
+.skills-subtitle {
+    margin-left: 20rpx;
+    margin-bottom: 20rpx;
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #333333;
+    line-height: 40rpx;
+    text-align: left;
+    font-style: normal;
+}
 
-    .box-cont {
-        background: #ffffff;
-        border-radius: 20rpx;
-        margin: 0 24rpx 24rpx 24rpx;
-        box-shadow: none;
-    }
+.box-cont {
+    background: #ffffff;
+    border-radius: 20rpx;
+    margin: 0 24rpx 24rpx 24rpx;
+    box-shadow: none;
+}
 
-    .skills-container {
-        padding: 32rpx;
-    }
+.skills-container {
+    padding: 32rpx;
+}
 
-    .skills-list {
-        display: flex;
-        flex-wrap: wrap;
-        margin: 0 -16rpx;
-    }
+.skills-list {
+    display: flex;
+    flex-wrap: wrap;
+    margin: 0 -16rpx;
+}
 
-    .skill-item {
-        width: 100%;
-        display: flex;
-        align-items: center;
-        padding: 20rpx 16rpx;
-        box-sizing: border-box;
-    }
+.skill-item {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    padding: 20rpx 16rpx;
+    box-sizing: border-box;
+}
 
-    .checkbox-wrapper {
-        margin-right: 20rpx;
-    }
+.checkbox-wrapper {
+    margin-right: 20rpx;
+}
 
-    .checkbox {
-        width: 40rpx;
-        height: 40rpx;
-        border: 2rpx solid #DDDDDD;
-        border-radius: 8rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
+.checkbox {
+    width: 40rpx;
+    height: 40rpx;
+    border: 2rpx solid #DDDDDD;
+    border-radius: 8rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
 
-    .checkbox.checked {
-        background-color: #FF4767;
-        border-color: #FF4767;
-    }
+.checkbox.checked {
+    background-color: #FF4767;
+    border-color: #FF4767;
+}
 
-    .check-icon {
-        width: 42rpx;
-        height: 42rpx;
-    }
+.check-icon {
+    width: 42rpx;
+    height: 42rpx;
+}
 
-    .skill-name {
-        font-size: 28rpx;
-        color: #333333;
-    }
+.skill-name {
+    font-size: 28rpx;
+    color: #333333;
+}
 
-    /* 迁移的专业经验表单样式 */
-    .form-item-two {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 24rpx 24rpx;
-    }
+/* 迁移的专业经验表单样式 */
+.form-item-two {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24rpx 24rpx;
+}
 
-    .form-item-two > text.label {
-        flex-shrink: 0;
-        font-size: 28rpx;
-        color: #333333;
-        font-weight: 500;
-    }
+.form-item-two>text.label {
+    flex-shrink: 0;
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+}
 
-    .required::before {
-        content: '*';
-        color: #FF0000;
-        margin-right: 4rpx;
-    }
+.required::before {
+    content: '*';
+    color: #FF0000;
+    margin-right: 4rpx;
+}
 
-    .picker-content {
-        flex: 1;
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-        gap: 16rpx;
-    }
+.picker-content {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    gap: 16rpx;
+}
 
-    .picker-value,
-    .placeholder {
-        font-size: 28rpx;
-        text-align: right;
-    }
+.picker-value,
+.placeholder {
+    font-size: 28rpx;
+    text-align: right;
+}
 
-    .picker-value {
-        color: #333333;
-    }
+.picker-value {
+    color: #333333;
+}
 
-    .placeholder {
-        color: #999999;
-    }
+.placeholder {
+    color: #999999;
+}
 
-    .arrow-right {
-        width: 9rpx;
-        height: 16rpx;
-        flex-shrink: 0;
-    }
+.arrow-right {
+    width: 9rpx;
+    height: 16rpx;
+    flex-shrink: 0;
+}
 
-    .bottom-actions {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        padding: 0rpx 24rpx 40rpx 24rpx;
-        background: #ffffff;
-        z-index: 100;
-    }
+.bottom-actions {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 0rpx 24rpx 40rpx 24rpx;
+    background: #ffffff;
+    z-index: 100;
+}
 
-    /* 单个按钮样式 */
-    .action-btn {
-        height: 88rpx;
-        border-radius: 43rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 32rpx;
-        font-weight: 400;
-        margin-top: 20rpx;
-    }
+/* 单个按钮样式 */
+.action-btn {
+    height: 88rpx;
+    border-radius: 43rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    font-weight: 400;
+    margin-top: 20rpx;
+}
 
-    .change-info-btn {
-        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
-    }
+.change-info-btn {
+    background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+}
 
-    .view-change-btn {
-        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
-    }
+.view-change-btn {
+    background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+}
 
-    /* 双按钮行样式 */
-    .action-buttons-row {
-        display: flex;
-        justify-content: space-between;
-        margin: 0 30rpx;
-    }
+/* 双按钮行样式 */
+.action-buttons-row {
+    display: flex;
+    justify-content: space-between;
+    margin: 0 30rpx;
+}
 
-    .action-buttons-row .action-btn {
-        width: 270rpx;
-    }
+.action-buttons-row .action-btn {
+    width: 270rpx;
+}
 
-    .cancel-btn {
-        background: #E5E5E5;
-        border-radius: 43rpx;
-        padding: 0 15rpx;
-    }
+.cancel-btn {
+    background: #E5E5E5;
+    border-radius: 43rpx;
+    padding: 0 15rpx;
+}
 
-    .submit-btn {
-        background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
-        border-radius: 43rpx;
-        padding: 0 15rpx;
-    }
+.submit-btn {
+    background: linear-gradient(180deg, #ff8e9d 0%, #FF4767 100%);
+    border-radius: 43rpx;
+    padding: 0 15rpx;
+}
 
-    .btn-text {
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 400;
-        font-size: 36rpx;
-        color: #FFFFFF;
-        line-height: 50rpx;
-        text-align: left;
-        font-style: normal;
-    }
+.btn-text {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 36rpx;
+    color: #FFFFFF;
+    line-height: 50rpx;
+    text-align: left;
+    font-style: normal;
+}
 
-    .cancel-text {
-        color: #666666;
-    }
+.cancel-text {
+    color: #666666;
+}
 
-    /* 响应式适配 */
-    /* @media (max-width: 375px) {
+/* 响应式适配 */
+/* @media (max-width: 375px) {
   .skill-item {
     width: 100%;
   }
diff --git a/pages/shop/verify/manual-verify.vue b/pages/shop/verify/manual-verify.vue
index 2e6aabd..9a5be51 100644
--- a/pages/shop/verify/manual-verify.vue
+++ b/pages/shop/verify/manual-verify.vue
@@ -14,7 +14,7 @@
       <input class="hidden-input" type="text" maxlength="6" :value="code" :focus="inputFocus"
         :selection-start="cursorPos" :selection-end="cursorPos" @input="onInput" @blur="onBlur" confirm-type="done" />
 
-      <button class="confirm-btn" :class="{ active: code.length === 6 }" @tap="submitCode">
+      <button class="confirm-btn" :class="{ active: code.length === 6 }" :disabled="code.length < 6" @tap="submitCode">
         确认
       </button>
     </view>
@@ -146,6 +146,12 @@ export default {
     &.active {
       background: #FF4767;
     }
+
+    &[disabled] {
+      opacity: 1;
+      background: #ff476685;
+      color: #fff;
+    }
   }
 
   .hidden-input {
diff --git a/pages/shop/verify/verify-order-detail.vue b/pages/shop/verify/verify-order-detail.vue
index 7cfa055..fc05140 100644
--- a/pages/shop/verify/verify-order-detail.vue
+++ b/pages/shop/verify/verify-order-detail.vue
@@ -9,7 +9,7 @@
           src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/be13b4f4-c0db-4f39-b9fc-0e69c13b72ee.png"
           mode="aspectFit"></image>
         <view class="header-text-box">
-          <view class="header-title">工时订单</view>
+          <view class="header-title">{{ orderTypeText }}</view>
           <view class="header-sub">请确认核销订单信息～</view>
         </view>
       </view>
@@ -70,6 +70,19 @@
 import request from "@/utils/request";
 
 export default {
+  computed: {
+    orderTypeText() {
+      const map = {
+        1: '用户订单',
+        2: '商家订单',
+        3: '工时订单',
+        4: '工位订单',
+        5: '铁军线上缴费订单',
+        6: '自营订单'
+      };
+      return map[this.orderData.orderType] || '工时订单';
+    }
+  },
   data() {
     return {
       statusBarHeight: 44,
@@ -101,6 +114,7 @@ export default {
       try {
         const parsedData = JSON.parse(decodeURIComponent(options.data));
         this.mapOrderData(parsedData);
+        console.log(parsedData, '-==-=-=-=-=-=parsedData=-=-=-=-=parsedData')
       } catch (e) {
         console.error('解析订单数据失败', e);
         uni.showToast({ title: '订单数据异常', icon: 'none' });
@@ -157,6 +171,7 @@ export default {
     doVerify() {
       this.isVerifying = true;
       uni.showLoading({ title: '核销中...', mask: true });
+      console.log(this.orderData, '------------------parsedData')
 
       // 调用核销接口
       request.post('/sj/poster/useOrderServerCode', {
@@ -167,9 +182,19 @@ export default {
         uni.hideLoading();
         if (res.code === 200) {
           uni.showToast({ title: '核销成功', icon: 'success' });
-		  uni.navigateTo({
-		  	url:'/pages/order/userorder-detail?order_id='+this.orderData.orderId
-		  })
+          const orderId = this.orderData.orderId;
+          const orderType = this.orderData.orderType;
+          let url = '';
+          if (orderType == 3) {
+            url = `/pages/shop/SellerDetail?order_id=${orderId}`;
+          } else if (orderType == 2 || orderType == 5) {
+            url = `/pages/shop/userorder-detail?order_id=${orderId}&serviceType=2`;
+          } else {
+            url = `/pages/shop/userorder-detail?order_id=${orderId}`;
+          }
+          setTimeout(() => {
+            uni.navigateTo({ url });
+          }, 1500);
         } else {
           uni.showToast({ title: res.msg || '核销失败，请重试', icon: 'none' });
           this.isVerifying = false;
diff --git a/pages/shop/verify/verify-order.nvue b/pages/shop/verify/verify-order.nvue
index 4c80495..38c8286 100644
--- a/pages/shop/verify/verify-order.nvue
+++ b/pages/shop/verify/verify-order.nvue
@@ -87,7 +87,6 @@ export default {
         console.log(result,'resultresultresultresult0.0.0.0.0.0')
         uni.hideLoading();
         if (result.code == 200) {
-          result.data.server_code = code;
           uni.showToast({ title: '扫码成功！', icon: 'none' });
           const orderDataStr = encodeURIComponent(JSON.stringify(result.data));
           uni.navigateTo({

From 128ebf0124938ea42224c90b9a6d7d168c938b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Tue, 9 Jun 2026 10:38:49 +0800
Subject: [PATCH 108/118] =?UTF-8?q?=E4=BF=AE=E5=A4=8D+=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/my.vue                | 68 ++++++++++++++++++++--------------
 pages/order/userorder-list.vue |  6 +--
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/pages/my/my.vue b/pages/my/my.vue
index a97ae9e..3e3b3f7 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -252,12 +252,14 @@ export default {
 					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png",
 					path: "/pages/artisan/profile",
 					go_id_type: 1,
+					directAccess: true,
 				},
 				{
 					title: "财务管理",
 					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/edafae37-8258-4e1c-9dcc-019484117047.png",
 					path: "/pages/wallet/wallet",
 					go_id_type: 1,
+					directAccess: true,
 				},
 				],
 			},
@@ -834,27 +836,21 @@ export default {
 			});
 		},
 		async handleFunction(item) {
-			// 如果是退出登录，直接处理，不检查账号状态
-			if (this.isLogin && item.type === "setting") {
-				uni.navigateTo({
-					url: `/pages/settings/index`,
-				});
-				return;
-			}
-
-			// 检查账号状态，如果不允许访问，直接返回
+			// 1. 账号停用检查
 			if (!this.checkAccess(item)) {
 				return;
 			}
 
-			// 未登录直接跳转登录
+			// 2. 未登录 → 提示
 			if (!this.isLogin) {
-				uni.navigateTo({
-					url: '/pages/blogPopup/blogPopup'
+				uni.showToast({
+					title: `您暂未登录，无法使用${item.title || item.text || ''}！`,
+					icon: "none",
 				});
 				return;
 			}
 
+			// 3. 入驻页面特殊处理
 			if (item.path == "/pages/ruzhu/ruzhu") {
 				request.post("/sj/userSjAuth/details", {
 					type: 1
@@ -869,29 +865,47 @@ export default {
 						});
 					}
 				});
-
 				return;
 			}
-			if (item.type) {
-				uni.navigateTo({
-					url: `${item.path}?type=${item.type}`,
-				});
-			} else {
-				if (item.go_id_type == 1 && (!this.isCertified || !this.hasBusinessTime || !this.hasServiceSkill)) {
-					this.showSetupModal = true;
-					return;
-				}
-				if (!this.isLogin && item.go_id_type) {
+
+			// 4. 需要入驻身份的模块 (go_id_type == 1)
+			if (item.go_id_type == 1) {
+				// 4a. 未入驻 → 提示
+				if (!this.isSettled) {
 					uni.showToast({
-						title: `您暂未登录，无法使用${item.title}！`,
+						title: `您暂未入驻，无法使用${item.title || item.text || ''}！`,
 						icon: "none",
 					});
 					return;
 				}
-				uni.navigateTo({
-					url: `${item.path}`,
-				});
+
+				// 4b. 直接进入的模块（店铺装修、财务管理）
+				if (item.directAccess) {
+					uni.navigateTo({ url: item.path });
+					return;
+				}
+
+				// 4c. 未认证或前置条件不完整 → 弹出温馨提示
+				if (!this.isCertified || !this.hasBusinessTime || !this.hasServiceSkill) {
+					this.showSetupModal = true;
+					return;
+				}
+
+				// 4d. 前置条件完整 → 直接进入
+				uni.navigateTo({ url: item.path });
+				return;
 			}
+
+			// 5. 有 type 参数的模块
+			if (item.type) {
+				uni.navigateTo({
+					url: `${item.path}?type=${item.type}`,
+				});
+				return;
+			}
+
+			// 6. 其他模块直接进入
+			uni.navigateTo({ url: item.path });
 		},
 		goToProfile() {
 			// 添加访问检查
diff --git a/pages/order/userorder-list.vue b/pages/order/userorder-list.vue
index df927e1..1e70faa 100644
--- a/pages/order/userorder-list.vue
+++ b/pages/order/userorder-list.vue
@@ -582,13 +582,13 @@ export default {
     /* #endif */
     left: 0;
     right: 0;
-    background: #fafafa;
+    background: white;
     z-index: 99;
 }
 
 .status-tabs {
     height: 94rpx;
-    background-color: #fafafa;
+    background-color: white;
     white-space: nowrap;
 }
 
@@ -624,7 +624,7 @@ export default {
 
 .status-tabs2 {
     height: 56rpx;
-    background-color: #fafafa;
+    background-color: white;
     white-space: nowrap;
     padding-bottom: 30rpx;
     padding-top: 10rpx;

From b542e8562441c0f0d1b84c25420c8d46910ece0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Tue, 9 Jun 2026 11:34:52 +0800
Subject: [PATCH 109/118] 1

---
 pages/shop/components/orderCard.vue | 700 ++++++++++++++--------------
 1 file changed, 347 insertions(+), 353 deletions(-)

diff --git a/pages/shop/components/orderCard.vue b/pages/shop/components/orderCard.vue
index 3013f58..3abeb1b 100644
--- a/pages/shop/components/orderCard.vue
+++ b/pages/shop/components/orderCard.vue
@@ -3,38 +3,32 @@
 		<!-- 订单编号 -->
 		<view class="orderNumBox">
 			<view class="order-id white-space-nowrap">订单编号：{{ dataItem.number }}</view>
-			<view class="stateText" :class="{
-			stateText2: dataItem.state > 4 && dataItem.state !== 7,  // 排除已取消
-			stateText3: dataItem.state === 7  // 已取消状态单独处理
-			}" v-if="showState">
-				{{ stateText }}
-			</view>
-			<image class="rightArrow" src="/static/images/shop/pintuan/rightArrow.png" v-else
-				@click="$emit('goOrderDetail', dataItem)"></image>
+
+
 		</view>
 
 		<!-- 服务信息区域 -->
 		<view class="service-container" @click="$emit('goOrderDetail', dataItem)"
-			:class="{noFotter:(!dataItem.reservation_time && !dataItem.reserve_end_time) || haveButton }">
-			<image class="service-img" :src=" dataItem.order_photo ? dataItem.order_photo[0] : JSON.parse(dataItem.photo)[0]
-        " mode="aspectFill"></image>
+			:class="{ noFotter: (!dataItem.reservation_time && !dataItem.reserve_end_time) || haveButton }">
+			<image class="service-img" :src="dataItem.order_photo ? dataItem.order_photo[0] : JSON.parse(dataItem.photo)[0]
+				" mode="aspectFill"></image>
 			<view class="service-info">
 				<view>
 					<view class="service-type">
 						<view class="service-name-type" v-if="dataItem.team_buy_id">
-							{{getGroupType}}
+							{{ getGroupType }}
 						</view>
 						<text class="service-name-text">
 							{{ dataItem.server_title }}
 						</text>
 
 					</view>
-					<view class="service-time" v-if="dataItem.add_time && dataItem.state!=7">下单时间:
+					<view class="service-time" v-if="dataItem.add_time && dataItem.state != 7">下单时间:
 						{{ dataItem.add_time }}</view>
 				</view>
 				<view class="service-price">
-					<text v-if="dataItem.team_buy_id">{{`团购价: `}}</text>¥<text
-						style="font-size: 34rpx;">{{ dataItem.order_money }}</text>
+					<text v-if="dataItem.team_buy_id">{{ `团购价: ` }}</text>¥<text style="font-size: 34rpx;">{{
+						dataItem.order_money }}</text>
 					<text class="service-price-line">{{ dataItem.line_money }}</text>
 				</view>
 
@@ -61,378 +55,378 @@
 </template>
 
 <script>
-	export default {
-		name: "OrderCard",
-		props: {
-			dataItem: {
-				type: Object,
-			},
-			typeId: {
-				type: Number,
-			},
-			showState: {
-				type: Boolean,
-				default: true,
-			},
-			haveButton: {
-				type: Boolean,
-				default: true,
-			},
+export default {
+	name: "OrderCard",
+	props: {
+		dataItem: {
+			type: Object,
 		},
-		computed: {
-			useTime() {
-				const start = this.dataItem.reservation_time;
-				const server_time = this.dataItem.server_time || 0;
+		typeId: {
+			type: Number,
+		},
+		showState: {
+			type: Boolean,
+			default: true,
+		},
+		haveButton: {
+			type: Boolean,
+			default: true,
+		},
+	},
+	computed: {
+		useTime() {
+			const start = this.dataItem.reservation_time;
+			const server_time = this.dataItem.server_time || 0;
 
-				// 格式化时间范围：输出 2025年05月29 12:30-13:30 格式
-				function formatTimeRange(startTimeStr, serviceMinutes) {
-					// 1. 空值兜底：避免无开始时间时报错
-					if (!startTimeStr) return "";
+			// 格式化时间范围：输出 2025年05月29 12:30-13:30 格式
+			function formatTimeRange(startTimeStr, serviceMinutes) {
+				// 1. 空值兜底：避免无开始时间时报错
+				if (!startTimeStr) return "";
 
-					// 2. 兼容低版本iOS：iOS不识别 "-" 分隔的日期，必须替换为 "/"
-					const iosSafeTimeStr = startTimeStr.replace(/-/g, "/");
-					const startTime = new Date(iosSafeTimeStr);
+				// 2. 兼容低版本iOS：iOS不识别 "-" 分隔的日期，必须替换为 "/"
+				const iosSafeTimeStr = startTimeStr.replace(/-/g, "/");
+				const startTime = new Date(iosSafeTimeStr);
 
-					// 校验时间有效性
-					if (isNaN(startTime.getTime())) {
-						console.error("无效的开始时间格式:", startTimeStr);
-						return "";
-					}
-
-					// 3. 计算结束时间（开始时间 + 服务分钟数）
-					const endTime = new Date(startTime.getTime() + serviceMinutes * 60 * 1000);
-
-					// 格式化年份：YYYY年
-					const formatYear = (date) => {
-						return date.getFullYear() + '年';
-					};
-
-					// 格式化月份和日期：MM月DD（补零）
-					const formatMonthDay = (date) => {
-						const month = String(date.getMonth() + 1).padStart(2, "0");
-						const day = String(date.getDate()).padStart(2, "0");
-						return `${month}月${day}`;
-					};
-
-					// 格式化时间部分：HH:MM（补零）
-					const formatTimePart = (date) => {
-						const hours = String(date.getHours()).padStart(2, "0");
-						const minutes = String(date.getMinutes()).padStart(2, "0");
-						return `${hours}:${minutes}`;
-					};
-
-					// 4. 判断是否同一天
-					const isSameDay = startTime.getFullYear() === endTime.getFullYear() &&
-						startTime.getMonth() === endTime.getMonth() &&
-						startTime.getDate() === endTime.getDate();
-
-					// 5. 拼接最终格式
-					if (isSameDay) {
-						// 同一天：2025年05月29 12:30-13:30
-						return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatTimePart(endTime)}`;
-					} else {
-						// 跨天：2025年05月29 12:30-2025年05月30 13:30
-						return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatYear(endTime)}${formatMonthDay(endTime)} ${formatTimePart(endTime)}`;
-					}
+				// 校验时间有效性
+				if (isNaN(startTime.getTime())) {
+					console.error("无效的开始时间格式:", startTimeStr);
+					return "";
 				}
 
-				// 兜底：如果start为空，返回空字符串避免报错
-				return start ? formatTimeRange(start, server_time) : "";
-			},
-			stateText() {
-				const textList = [
-					"",
-					"待支付",
-					"待接单",
-					"待开始",
-					"待完成",
-					"已完成",
-					"已评价",
-					"已取消",
-				];
-				return textList[this.dataItem.state];
-			},
-			//获取拼团状态文字
-			getGroupType() {
-				let list = [{
-						id: 1,
-						text: "团购中",
-					},
-					{
-						id: 2,
-						text: "已成团",
-					},
-					{
-						id: 3,
-						text: "拼团失败",
-					},
-				];
-				let name = list.find((it) => it.id == this.dataItem.team_buy_order_state)?.text;
-				return name;
-			},
-		},
-		methods: {
+				// 3. 计算结束时间（开始时间 + 服务分钟数）
+				const endTime = new Date(startTime.getTime() + serviceMinutes * 60 * 1000);
 
-			// 触发取消事件
-			emitCancel() {
-				this.$emit("cancel");
-			},
-			// 触发接单事件
-			emitAccept() {
-				this.$emit("accept");
-			},
-			emitStart() {
-				this.$emit("start");
-			},
-			emitDone() {
-				this.$emit("done");
-			},
+				// 格式化年份：YYYY年
+				const formatYear = (date) => {
+					return date.getFullYear() + '年';
+				};
+
+				// 格式化月份和日期：MM月DD（补零）
+				const formatMonthDay = (date) => {
+					const month = String(date.getMonth() + 1).padStart(2, "0");
+					const day = String(date.getDate()).padStart(2, "0");
+					return `${month}月${day}`;
+				};
+
+				// 格式化时间部分：HH:MM（补零）
+				const formatTimePart = (date) => {
+					const hours = String(date.getHours()).padStart(2, "0");
+					const minutes = String(date.getMinutes()).padStart(2, "0");
+					return `${hours}:${minutes}`;
+				};
+
+				// 4. 判断是否同一天
+				const isSameDay = startTime.getFullYear() === endTime.getFullYear() &&
+					startTime.getMonth() === endTime.getMonth() &&
+					startTime.getDate() === endTime.getDate();
+
+				// 5. 拼接最终格式
+				if (isSameDay) {
+					// 同一天：2025年05月29 12:30-13:30
+					return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatTimePart(endTime)}`;
+				} else {
+					// 跨天：2025年05月29 12:30-2025年05月30 13:30
+					return `${formatYear(startTime)}${formatMonthDay(startTime)} ${formatTimePart(startTime)}-${formatYear(endTime)}${formatMonthDay(endTime)} ${formatTimePart(endTime)}`;
+				}
+			}
+
+			// 兜底：如果start为空，返回空字符串避免报错
+			return start ? formatTimeRange(start, server_time) : "";
 		},
-	};
+		stateText() {
+			const textList = [
+				"",
+				"待支付",
+				"待接单",
+				"待开始",
+				"待完成",
+				"已完成",
+				"已评价",
+				"已取消",
+			];
+			return textList[this.dataItem.state];
+		},
+		//获取拼团状态文字
+		getGroupType() {
+			let list = [{
+				id: 1,
+				text: "团购中",
+			},
+			{
+				id: 2,
+				text: "已成团",
+			},
+			{
+				id: 3,
+				text: "拼团失败",
+			},
+			];
+			let name = list.find((it) => it.id == this.dataItem.team_buy_order_state)?.text;
+			return name;
+		},
+	},
+	methods: {
+
+		// 触发取消事件
+		emitCancel() {
+			this.$emit("cancel");
+		},
+		// 触发接单事件
+		emitAccept() {
+			this.$emit("accept");
+		},
+		emitStart() {
+			this.$emit("start");
+		},
+		emitDone() {
+			this.$emit("done");
+		},
+	},
+};
 </script>
 
 <style scoped lang="less">
-	.order-card {
-		padding: 20rpx 30rpx 10rpx 30rpx;
-		margin: 0rpx 30rpx 20rpx 30rpx;
-		background-color: #fff;
-		border-radius: 12px;
-		/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
-		position: relative;
-	}
+.order-card {
+	padding: 20rpx 30rpx 10rpx 30rpx;
+	margin: 0rpx 30rpx 20rpx 30rpx;
+	background-color: #fff;
+	border-radius: 12px;
+	/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
+	position: relative;
+}
 
-	/* 订单编号 */
-	.order-id {
-		width: 530rpx;
-		font-size: 28rpx;
-		color: #333333;
-	}
+/* 订单编号 */
+.order-id {
+	width: 630rpx;
+	font-size: 28rpx;
+	color: #333333;
+}
 
-	.orderNumBox {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 40rpx;
+.orderNumBox {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 40rpx;
 
-		.stateText {
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #FF4767;
-			text-align: left;
-			font-style: normal;
-			position: absolute;
-			right: 0;
-			top: 0;
-			background-image: url("/static/images/icons/tabBj.png");
-			background-size: 100% auto;
-			background-position: center top;
-			background-repeat: no-repeat;
-			width: 128rpx;
-			height: 49rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-
-		.stateText2 {
-			background-image: url("/static/images/icons/tabBj2.png");
-			color: #333;
-		}
-
-		.stateText3 {
-			background-image: url("/static/images/icons/tabBj2.png");
-			color: #999999 !important;
-		}
-
-		.rightArrow {
-			width: 12rpx;
-			height: 24rpx;
-		}
-	}
-
-
-	/* 服务信息容器 */
-	.service-container {
-		display: flex;
-		padding-bottom: 24rpx;
-		border-bottom: 1px solid #f6f5f5;
-	}
-
-	.noFotter {
-		border-bottom: none;
-		padding-bottom: 0rpx;
-	}
-
-	/* 服务图片 */
-	.service-img {
-		width: 172rpx;
-		height: 168rpx;
-		border-radius: 24rpx;
-		margin-right: 30rpx;
-		flex-shrink: 0;
-	}
-
-	/* 服务信息 */
-	.service-info {
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-	}
-
-	.service-price {
-		font-family: DINPro, DINPro;
-		font-weight: 500;
-		font-size: 24rpx;
+	.stateText {
+		font-weight: 400;
+		font-size: 26rpx;
 		color: #FF4767;
-		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
-
-		.service-price-line {
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #999999;
-			line-height: 34rpx;
-			margin-left: 10rpx;
-			text-decoration: line-through;
-		}
+		position: absolute;
+		right: 0;
+		top: 0;
+		background-image: url("/static/images/icons/tabBj.png");
+		background-size: 100% auto;
+		background-position: center top;
+		background-repeat: no-repeat;
+		width: 128rpx;
+		height: 49rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 
-	.service-type {
-		width: 400rpx;
-		font-weight: 500;
-		font-size: 30rpx;
+	.stateText2 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #333;
+	}
+
+	.stateText3 {
+		background-image: url("/static/images/icons/tabBj2.png");
+		color: #999999 !important;
+	}
+
+	.rightArrow {
+		width: 12rpx;
+		height: 24rpx;
+	}
+}
+
+
+/* 服务信息容器 */
+.service-container {
+	display: flex;
+	padding-bottom: 24rpx;
+	border-bottom: 1px solid #f6f5f5;
+}
+
+.noFotter {
+	border-bottom: none;
+	padding-bottom: 0rpx;
+}
+
+/* 服务图片 */
+.service-img {
+	width: 172rpx;
+	height: 168rpx;
+	border-radius: 24rpx;
+	margin-right: 30rpx;
+	flex-shrink: 0;
+}
+
+/* 服务信息 */
+.service-info {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.service-price {
+	font-family: DINPro, DINPro;
+	font-weight: 500;
+	font-size: 24rpx;
+	color: #FF4767;
+	line-height: 34rpx;
+	text-align: left;
+	font-style: normal;
+
+	.service-price-line {
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #999999;
+		line-height: 34rpx;
+		margin-left: 10rpx;
+		text-decoration: line-through;
+	}
+}
+
+.service-type {
+	width: 400rpx;
+	font-weight: 500;
+	font-size: 30rpx;
+	color: #333333;
+	line-height: 34rpx;
+	text-align: left;
+	font-style: normal;
+	display: flex;
+	align-items: center;
+	margin-bottom: 22rpx;
+
+	.service-name-type {
+		/* #ifdef APP-PLUS */
+		font-family: 'shuHeiTi';
+		/* #endif */
+		font-size: 24rpx;
+		color: #FFFFFF;
+		line-height: 27rpx;
+		letter-spacing: 2px;
+		text-align: left;
+		font-style: normal;
+		background: linear-gradient(166deg, #FC5E72 0%, #FF4767 100%);
+		border-radius: 6rpx;
+		padding: 4rpx 4rpx 4rpx 8rpx;
+		margin-right: 13rpx;
+		letter-spacing: 2rpx;
+	}
+
+	.service-name-text {
+		flex: 1;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+}
+
+.service-time {
+
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #999999;
+	line-height: 33rpx;
+	text-align: left;
+	font-style: normal;
+}
+
+/* 时间信息 */
+.time-info {
+	font-size: 30rpx;
+	color: #333;
+	margin-bottom: 10rpx;
+	margin-top: 28rpx;
+	display: flex;
+	align-items: center;
+
+	.time-info-img {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 10rpx;
+		border-radius: 50%;
+	}
+
+	.time-info-name {
+		font-weight: 400;
+		font-size: 26rpx;
 		color: #333333;
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
-		display: flex;
-		align-items: center;
-		margin-bottom: 22rpx;
+		margin-right: 20rpx;
+		max-width: 110rpx;
+		overflow: hidden;
+		word-break: break-all;
+		/* break-all(允许在单词内换行。) */
+		text-overflow: ellipsis;
+		/* 超出部分省略号 */
+		display: -webkit-box;
+		/** 对象作为伸缩盒子模型显示 **/
+		-webkit-box-orient: vertical;
+		/** 设置或检索伸缩盒对象的子元素的排列方式 **/
+		-webkit-line-clamp: 1;
+		/** 显示的行数 **/
 
-		.service-name-type {
-			/* #ifdef APP-PLUS */
-			font-family: 'shuHeiTi';
-			/* #endif */
-			font-size: 24rpx;
-			color: #FFFFFF;
-			line-height: 27rpx;
-			letter-spacing: 2px;
-			text-align: left;
-			font-style: normal;
-			background: linear-gradient(166deg, #FC5E72 0%, #FF4767 100%);
-			border-radius: 6rpx;
-			padding: 4rpx 4rpx 4rpx 8rpx;
-			margin-right: 13rpx;
-			letter-spacing: 2rpx;
-		}
-
-		.service-name-text {
-			flex: 1;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
 	}
 
-	.service-time {
-
+	.time-info-text1 {
 		font-weight: 400;
 		font-size: 26rpx;
 		color: #999999;
-		line-height: 33rpx;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+		// margin-right: 20rpx;
+		white-space: nowrap;
+	}
+
+	.time-info-text2 {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #333333;
+		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
 	}
+}
 
-	/* 时间信息 */
-	.time-info {
-		font-size: 30rpx;
-		color: #333;
-		margin-bottom: 10rpx;
-		margin-top: 28rpx;
-		display: flex;
-		align-items: center;
+/* 按钮组 */
+.button-group {
+	display: flex;
+	justify-content: flex-end;
+	gap: 30rpx;
+	margin-bottom: 20rpx;
+}
 
-		.time-info-img {
-			width: 40rpx;
-			height: 40rpx;
-			margin-right: 10rpx;
-			border-radius: 50%;
-		}
+/* 通用按钮样式 */
+.btn {
+	// width: 80rpx;
+	height: 32rpx;
+	border-radius: 64rpx;
+	font-size: 26rpx;
+	background-color: #fff;
+	white-space: nowrap;
+	margin-top: 40rpx;
+}
 
-		.time-info-name {
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #333333;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-			margin-right: 20rpx;
-			max-width: 110rpx;
-			overflow: hidden;
-			word-break: break-all;
-			/* break-all(允许在单词内换行。) */
-			text-overflow: ellipsis;
-			/* 超出部分省略号 */
-			display: -webkit-box;
-			/** 对象作为伸缩盒子模型显示 **/
-			-webkit-box-orient: vertical;
-			/** 设置或检索伸缩盒对象的子元素的排列方式 **/
-			-webkit-line-clamp: 1;
-			/** 显示的行数 **/
+/* 取消按钮 */
+.cancel-btn {
+	border: 2rpx solid #979797;
+	color: #333333;
+}
 
-		}
-
-		.time-info-text1 {
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #999999;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-			// margin-right: 20rpx;
-			white-space: nowrap;
-		}
-
-		.time-info-text2 {
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #333333;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-		}
-	}
-
-	/* 按钮组 */
-	.button-group {
-		display: flex;
-		justify-content: flex-end;
-		gap: 30rpx;
-		margin-bottom: 20rpx;
-	}
-
-	/* 通用按钮样式 */
-	.btn {
-		// width: 80rpx;
-		height: 32rpx;
-		border-radius: 64rpx;
-		font-size: 26rpx;
-		background-color: #fff;
-		white-space: nowrap;
-		margin-top: 40rpx;
-	}
-
-	/* 取消按钮 */
-	.cancel-btn {
-		border: 2rpx solid #979797;
-		color: #333333;
-	}
-
-	/* 接单按钮 */
-	.accept-btn {
-		border: 2rpx solid #FF4767;
-		color: #FF4767;
-	}
+/* 接单按钮 */
+.accept-btn {
+	border: 2rpx solid #FF4767;
+	color: #FF4767;
+}
 </style>
\ No newline at end of file

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

---
 pages/artisan/profile.vue | 17 +++++++++++------
 pages/my/my.vue           | 16 ++++++++--------
 pages/ruzhu/ruzhu.vue     |  7 ++++++-
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index da5a7f9..ba700bb 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -634,7 +634,17 @@ export default {
 			const idType = this.userInfo.id_type;
 			const credentialsState = this.userInfo.credentials_state;
 
-			if (idType === 0 && credentialsState === 0) {
+			if (idType < 0 && credentialsState === 0) {
+				// 驳回 + 仅填写基础信息 → 去完成资质认证
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=2'
+				});
+			} else if (idType < 0 && credentialsState === 1) {
+				// 驳回 + 审核中 → 客服页面
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else if (idType === 0 && credentialsState === 0) {
 				// 从未入驻
 				uni.navigateTo({
 					url: '/pages/ruzhu/ruzhu'
@@ -654,11 +664,6 @@ export default {
 				uni.navigateTo({
 					url: '/pages/shop/qualification_sj_change'
 				});
-			} else if (idType < 0 && credentialsState === 1) {
-				// 未入驻 + 申请中
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu?type=1'
-				});
 			}
 		},
 
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 3e3b3f7..8cf6a29 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -923,12 +923,17 @@ export default {
 		toruzhu() {
 			const idType = this.userInfo.id_type;
 			const credentialsState = this.userInfo.credentials_state;
-			if (idType < 0 && credentialsState <= 1) {
-				// 驳回状态
+			if (idType < 0 && credentialsState === 0) {
+				// 驳回 + 仅填写基础信息 → 去完成资质认证
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=2'
+				});
+			} else if (idType < 0 && credentialsState === 1) {
+				// 驳回 + 审核中 → 客服页面
 				uni.navigateTo({
 					url: '/pages/ruzhu/ruzhu?type=1'
 				});
-			} else if (idType <= 0 && credentialsState === 0) {
+			} else if (idType === 0 && credentialsState === 0) {
 				// 从未入驻
 				uni.navigateTo({
 					url: '/pages/ruzhu/ruzhu'
@@ -948,11 +953,6 @@ export default {
 				uni.navigateTo({
 					url: '/pages/shop/qualification_sj_change'
 				});
-			} else if (idType < 0 && credentialsState === 1) {
-				// 未入驻 + 申请中
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu?type=1'
-				});
 			}
 		},
 		closeSetupModal() {
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index d9d54e5..f8ef887 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -124,7 +124,6 @@ export default {
             textData: {},
             loading: false,
             error: null,
-            navTitle: '商家入驻', // 默认标题
             qualificationData: null, // 新增：保存资质信息
             storeInfoData: null, // 新增：保存门店信息
             successData: {}, //入驻提示
@@ -143,6 +142,9 @@ export default {
             if (this.currentStep === 3) return 2;
             if (this.currentStep === 4) return 2;
             return 0;
+        },
+        navTitle() {
+            return this.currentStep === 3 ? '资质认证' : '商家入驻';
         }
     },
     async onLoad(options) {
@@ -154,6 +156,9 @@ export default {
         if (options.type == 1) {
             this.currentStep = 4
         }
+        if (options.type == 2) {
+            this.currentStep = 2
+        }
 
         // 如果首页传了 step 参数，就直接空降到对应的流程
         if (options.step) {

From b38847ada896ae0c42f440671802226ad369dc81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 10 Jun 2026 10:38:39 +0800
Subject: [PATCH 111/118] =?UTF-8?q?=E8=87=AA=E8=90=A5=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=90=8E=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/verify/verify-order-detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/shop/verify/verify-order-detail.vue b/pages/shop/verify/verify-order-detail.vue
index fc05140..c2c8c0a 100644
--- a/pages/shop/verify/verify-order-detail.vue
+++ b/pages/shop/verify/verify-order-detail.vue
@@ -187,7 +187,7 @@ export default {
           let url = '';
           if (orderType == 3) {
             url = `/pages/shop/SellerDetail?order_id=${orderId}`;
-          } else if (orderType == 2 || orderType == 5) {
+          } else if (orderType == 2 || orderType == 5 || orderType == 6) {
             url = `/pages/shop/userorder-detail?order_id=${orderId}&serviceType=2`;
           } else {
             url = `/pages/shop/userorder-detail?order_id=${orderId}`;

From 0eb6237e416e87416d6fe772a766f1183077257e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 10 Jun 2026 11:21:43 +0800
Subject: [PATCH 112/118] =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/verify/verify-order-detail.vue | 71 ++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 3 deletions(-)

diff --git a/pages/shop/verify/verify-order-detail.vue b/pages/shop/verify/verify-order-detail.vue
index c2c8c0a..522ecba 100644
--- a/pages/shop/verify/verify-order-detail.vue
+++ b/pages/shop/verify/verify-order-detail.vue
@@ -59,8 +59,9 @@
     </scroll-view>
 
     <view class="bottom-btn-wrapper">
-      <view class="confirm-btn" @tap="confirmVerify" :class="{ 'btn-disabled': isVerifying }">
-        <text class="btn-text">{{ isVerifying ? '核销中...' : '确认核销' }}</text>
+      <view class="confirm-btn" @tap="isVerified ? goHomePage() : confirmVerify()"
+        :class="{ 'btn-disabled': isVerifying }">
+        <text class="btn-text">{{ isVerified ? '核销成功，返回首页' : (isVerifying ? '核销中...' : '确认核销') }}</text>
       </view>
     </view>
   </view>
@@ -101,7 +102,9 @@ export default {
         payPrice: 0,
         settlePrice: 0
       },
-      isVerifying: false
+      isVerifying: false,
+      isVerified: false,  // 订单是否已被核销
+      userInfo: {}  // 用户信息，用于获取sjid
     };
   },
   onLoad(options) {
@@ -124,6 +127,23 @@ export default {
       console.log('未获取到订单信息');
     }
   },
+  async onShow() {
+    // 每次页面显示时刷新订单核销状态
+    if (this.orderData.orderId) {
+      // 获取用户信息（sjid）
+      if (!this.userInfo.id) {
+        try {
+          const res = await request.post('/user/getuser', { type: 3 });
+          if (res.data) {
+            this.userInfo = res.data;
+          }
+        } catch (e) {
+          console.error('获取用户信息失败', e);
+        }
+      }
+      this.checkVerifyStatus();
+    }
+  },
   methods: {
     // 精准映射 /sj/poster/getOrderByCode 接口返回的 data 字段
     mapOrderData(data) {
@@ -152,6 +172,48 @@ export default {
     goBack() {
       uni.navigateBack();
     },
+    // 检查订单核销状态
+    checkVerifyStatus() {
+      if (!this.orderData.orderId) return;
+      // 根据订单类型选择对应的详情接口
+      const orderType = this.orderData.orderType;
+      let detailUrl = '';
+      let params = { id: this.orderData.orderId };
+
+      if (orderType == 3) {
+        // 工时订单
+        detailUrl = '/syr/workHourOrder/details';
+      } else if (orderType == 4) {
+        // 工位订单
+        detailUrl = '/sj/workSeatOrder/details';
+      } else if (orderType == 6) {
+        // 自营订单
+        detailUrl = '/sj/orderSelf/details';
+        params.sjid = this.userInfo.id || '';  // 自营订单需要sjid
+      } else {
+        // 普通订单 (orderType 1, 2, 5)
+        detailUrl = '/sj/yhorderdetail';
+        params.sjid = this.userInfo.id || '';
+      }
+
+      request.post(detailUrl, params).then(res => {
+        if (res.code === 200 && res.data) {
+          const orderState = res.data.state;
+          // 状态 1/2/3 为待核销，状态 4/5/6/7 为已核销
+          if (orderState >= 4) {
+            this.isVerified = true;
+          }
+        }
+      }).catch(err => {
+        console.error('检查核销状态失败', err);
+      });
+    },
+    // 返回首页
+    goHomePage() {
+      uni.switchTab({
+        url: '/pages/home/home'
+      });
+    },
     confirmVerify() {
       if (this.isVerifying) return;
       if (!this.orderData.orderId) {
@@ -182,6 +244,9 @@ export default {
         uni.hideLoading();
         if (res.code === 200) {
           uni.showToast({ title: '核销成功', icon: 'success' });
+          this.isVerified = true;
+          this.isVerifying = false;
+          // 核销成功后跳转到订单详情
           const orderId = this.orderData.orderId;
           const orderType = this.orderData.orderType;
           let url = '';

From bb183e89fcbe43526c7b2e38f354e75e6d6966a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Fri, 12 Jun 2026 10:45:45 +0800
Subject: [PATCH 113/118] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=9B=91=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue             |  3 ++-
 CHANGE_RECORD.md    | 50 +++++++++++++++++++++++++++++++++++++++++++
 pages/home/home.vue | 52 ++++++++++++++++++++++++++++++---------------
 utils/request.js    | 17 +++++++++++----
 4 files changed, 100 insertions(+), 22 deletions(-)
 create mode 100644 CHANGE_RECORD.md

diff --git a/App.vue b/App.vue
index 02d00d3..af33f22 100644
--- a/App.vue
+++ b/App.vue
@@ -183,6 +183,7 @@ export default {
 	onShow: function () {
 		uni.hideTabBar();
 		console.log('App Show')
+		uni.$emit('appShowRefresh')
 	},
 	onHide: function () {
 		console.log('App Hide')
@@ -281,4 +282,4 @@ body {
 	-webkit-text-size-adjust: 100% !important;
 	text-size-adjust: 100% !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/CHANGE_RECORD.md b/CHANGE_RECORD.md
new file mode 100644
index 0000000..abf7453
--- /dev/null
+++ b/CHANGE_RECORD.md
@@ -0,0 +1,50 @@
+# 改动记录
+
+## 2026-06-12
+
+### 后台长时间运行后首页登录态不同步
+
+问题现象：
+
+- APP 后台运行较长时间后再次进入。
+- 商家首页显示未登录或无法及时获取商家信息。
+- “我的”页面仍显示已登录。
+- 从“我的”页面切回首页后，首页才能正常获取商家信息。
+
+涉及文件：
+
+- `App.vue`
+- `pages/home/home.vue`
+- `utils/request.js`
+
+改动内容：
+
+- `App.vue`
+  - 在全局 `onShow` 中新增 `uni.$emit('appShowRefresh')`。
+  - APP 从后台恢复前台时主动通知页面刷新状态，避免只依赖页面级 `onShow`。
+
+- `pages/home/home.vue`
+  - 新增 `refreshPageState` 方法，统一处理首页登录态刷新。
+  - `onShow`、下拉刷新、APP 前台恢复事件都调用同一套刷新逻辑。
+  - `onLoad` 注册 `appShowRefresh` 事件。
+  - `onUnload` 解除 `appShowRefresh` 事件，避免重复监听。
+  - 有 token 时主动重新请求 `/sj/user/getUser`。
+  - 无 token 时清空 `userInfo`、`authDetails`、`sjId`，并重置 `isUserInfoLoaded`。
+  - `getUserInfo` 请求成功后显式设置 `isLogin = true` 和 `isUserInfoLoaded = true`。
+  - `getUserInfo` 请求失败时，如果本地 token 已被清理，则同步首页为未登录状态。
+
+- `utils/request.js`
+  - `refreshToken` 兼容后端返回结构：
+    - 支持 token 在 `res.access_token`。
+    - 支持 token 在 `res.data.access_token`。
+  - 刷新 token 成功后同步更新：
+    - `accessToken`
+    - `refreshToken`
+    - `refresh_token_expries`
+  - 如果刷新接口成功但没有返回 `access_token`，主动抛错，避免写入 `undefined` token。
+
+验证情况：
+
+- 已检查相关 diff，未做全文件重构。
+- `pages/home/home.vue` 原文件为 CRLF 行尾；为避免整文件行尾改造造成大面积 diff，本次保留原行尾。
+- 项目 `package.json` 未配置 build/lint 脚本，未执行完整构建校验。
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 268ce72..bdb1deb 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -401,24 +401,11 @@ export default {
 		}
 	},
 	onShow() {
-		// 登录判定逻辑
-		this.isLogin = uni.getStorageSync("accessToken") ? true : false;
-		if (this.isLogin) {
-			this.getUserInfo();
-		}
-		// 通知、品牌、技能 这三个接口不强依赖登录，无论登没登录都获取
-		this.fetchNoticeList();
-		this.fetchBrandList();
-		this.fetchSkillList();
+		this.refreshPageState();
 	},
 	onPullDownRefresh() {
 		// 1. 重新请求首页需要的所有数据
-		if (this.isLogin) {
-			this.getUserInfo();
-		}
-		this.fetchNoticeList();
-		this.fetchBrandList();
-		this.fetchSkillList();
+		this.refreshPageState();
 
 		// 2. 停止下拉刷新的动画
 		setTimeout(() => {
@@ -427,6 +414,10 @@ export default {
 	},
 	onLoad() {
 		uni.hideTabBar();
+		uni.$on('appShowRefresh', this.refreshPageState);
+	},
+	onUnload() {
+		uni.$off('appShowRefresh', this.refreshPageState);
 	},
 	watch: {
 		'orderDetail.score'() {
@@ -434,6 +425,22 @@ export default {
 		}
 	},
 	methods: {
+		refreshPageState() {
+			const hasToken = !!uni.getStorageSync("accessToken");
+			this.isLogin = hasToken;
+			if (hasToken) {
+				this.getUserInfo();
+			} else {
+				this.userInfo = {};
+				this.authDetails = null;
+				this.isUserInfoLoaded = false;
+				this.sjId = null;
+			}
+			// 通知、品牌、技能 这三个接口不强依赖登录，无论登没登录都获取
+			this.fetchNoticeList();
+			this.fetchBrandList();
+			this.fetchSkillList();
+		},
 		// 金额转换万单位处理
 		formatMoney(amount) {
 			let num = parseFloat(amount);
@@ -589,9 +596,11 @@ export default {
 		},
 
 		getUserInfo() {
-			request.post("/sj/user/getUser").then((result) => {
+			this.isUserInfoLoaded = false;
+			return request.post("/sj/user/getUser").then((result) => {
 				if (result.code == 200 && result.data) {
 					this.userInfo = result.data;
+					this.isLogin = true;
 					this.isUserInfoLoaded = true; // 数据回来了，允许相关 UI 进行渲染
 					uni.setStorageSync("sjId", result.data.id);
 					this.sjId = result.data.id;
@@ -607,6 +616,15 @@ export default {
 						this.fetchAuthDetails();
 					}
 				}
+			}).catch((err) => {
+				if (!uni.getStorageSync("accessToken")) {
+					this.isLogin = false;
+					this.userInfo = {};
+					this.authDetails = null;
+					this.sjId = null;
+				}
+				this.isUserInfoLoaded = false;
+				console.error("首页获取商家信息失败:", err);
 			});
 		},
 
@@ -1579,4 +1597,4 @@ page {
 		overflow: hidden;
 	}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/utils/request.js b/utils/request.js
index de82905..cfa905c 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -279,9 +279,18 @@ async function refreshToken() {
 	})
 
 	if (res.state == 1 || res.code == 200) {
-		uni.setStorageSync('accessToken', res.access_token)
-		uni.setStorageSync('refreshToken', res.refresh_token)
-		return res.access_token
+		const tokenData = res.data || res
+		if (!tokenData.access_token) {
+			throw new Error('Refresh token response missing access_token')
+		}
+		uni.setStorageSync('accessToken', tokenData.access_token)
+		if (tokenData.refresh_token) {
+			uni.setStorageSync('refreshToken', tokenData.refresh_token)
+		}
+		if (tokenData.refresh_token_expries) {
+			uni.setStorageSync('refresh_token_expries', tokenData.refresh_token_expries)
+		}
+		return tokenData.access_token
 	}
 
 	throw new Error('Refresh token failed')
@@ -340,4 +349,4 @@ export default {
 			...options
 		})
 	}
-}
\ No newline at end of file
+}

From 7fe55a5c6fe7369d3798f4dfd94df6c9cff74c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Fri, 12 Jun 2026 11:33:33 +0800
Subject: [PATCH 114/118] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=8E=8B=E7=BC=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGE_RECORD.md                          | 42 +++++++++++++++++++++++
 manifest.json                             |  4 +--
 pages/shop/SellerDetail.vue               |  6 ++--
 pages/shop/verify/verify-order-detail.vue | 28 +++++++++------
 4 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/CHANGE_RECORD.md b/CHANGE_RECORD.md
index abf7453..58c3eda 100644
--- a/CHANGE_RECORD.md
+++ b/CHANGE_RECORD.md
@@ -48,3 +48,45 @@
 - 已检查相关 diff，未做全文件重构。
 - `pages/home/home.vue` 原文件为 CRLF 行尾；为避免整文件行尾改造造成大面积 diff，本次保留原行尾。
 - 项目 `package.json` 未配置 build/lint 脚本，未执行完整构建校验。
+
+### 订单详情顾客头像被挤压
+
+问题现象：
+
+- `pages/shop/SellerDetail` 页面“顾客信息”一栏中，客户头像在部分图片比例下显示被拉伸或挤压。
+
+涉及文件：
+
+- `pages/shop/SellerDetail.vue`
+
+改动内容：
+
+- 给顾客头像 `<image>` 增加 `mode="aspectFill"`，按头像容器比例裁剪填充，避免原图比例不一致时被拉伸。
+- 为 `.shop_photo` 增加 `min-width` 和 `min-height`，在 flex 布局中进一步锁定头像为固定正方形尺寸。
+
+验证情况：
+
+- 已执行 `pages/shop/SellerDetail.vue` 与 `CHANGE_RECORD.md` 的空白格式检查。
+
+### 核销成功后工时/工位订单详情跳转错误
+
+问题现象：
+
+- 商家扫码核销或输入核销码核销成功后，工时订单和工位订单跳转到详情页时参数或页面类型不正确。
+- 工时订单会进入工位详情链路，工位订单会落到普通订单详情链路。
+
+涉及文件：
+
+- `pages/shop/verify/verify-order-detail.vue`
+
+改动内容：
+
+- 新增 `getOrderDetailUrl`，统一按 `order_type` 生成核销成功后的详情页地址。
+- `order_type=3` 工时订单跳转到 `/pages/shop/SellerDetail?order_id=...&identity=1`，使用手艺人工时订单详情链路。
+- `order_type=4` 工位订单跳转到 `/pages/shop/SellerDetail?order_id=...`，使用商家工位订单详情链路。
+- `order_type=6` 自营订单跳转普通订单详情并携带 `serviceType=2`。
+- 其他普通订单跳转普通订单详情，不再误携带自营参数。
+
+验证情况：
+
+- 已执行 `pages/shop/verify/verify-order-detail.vue` 与 `CHANGE_RECORD.md` 的空白格式检查。
diff --git a/manifest.json b/manifest.json
index 32e4a62..ea94134 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "美融融商家",
     "appid" : "__UNI__BBE6285",
     "description" : "同城便捷到家美业“技术外卖”服务、同城预约到店服务平台美融融为同城爱美人群提供更优质的更全面的服务。",
-    "versionName" : "1.0.16",
-    "versionCode" : 1016,
+    "versionName" : "1.0.17",
+    "versionCode" : 1017,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/shop/SellerDetail.vue b/pages/shop/SellerDetail.vue
index de3970f..50a056e 100644
--- a/pages/shop/SellerDetail.vue
+++ b/pages/shop/SellerDetail.vue
@@ -74,7 +74,7 @@
 				<view class="card_title" v-if="identity==0">顾客信息</view>
 				<view class="card_title" v-if="identity==1">店铺信息</view>
 				<view class="shop_title_box">
-					<image class="shop_photo" :src="orderInfo.head_photo" />
+					<image class="shop_photo" :src="orderInfo.head_photo" mode="aspectFill" />
 					<view class="left-section">
 						<view class="shop_title">{{ orderInfo.name }}</view>
 						<text class="shop_phone" @click="contactService(orderInfo.phone)">
@@ -906,6 +906,8 @@
 			.shop_photo {
 				width: 70rpx;
 				height: 70rpx;
+				min-width: 70rpx;
+				min-height: 70rpx;
 				border-radius: 50%;
 				flex-shrink: 0;
 			}
@@ -1073,4 +1075,4 @@
 	.mt_10 {
 		margin-top: 10rpx;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/shop/verify/verify-order-detail.vue b/pages/shop/verify/verify-order-detail.vue
index 522ecba..a25db76 100644
--- a/pages/shop/verify/verify-order-detail.vue
+++ b/pages/shop/verify/verify-order-detail.vue
@@ -214,6 +214,21 @@ export default {
         url: '/pages/home/home'
       });
     },
+    getOrderDetailUrl() {
+      const orderId = this.orderData.orderId;
+      const orderType = this.orderData.orderType;
+
+      if (orderType == 3) {
+        return `/pages/shop/SellerDetail?order_id=${orderId}&identity=1`;
+      }
+      if (orderType == 4) {
+        return `/pages/shop/SellerDetail?order_id=${orderId}`;
+      }
+      if (orderType == 6) {
+        return `/pages/shop/userorder-detail?order_id=${orderId}&serviceType=2`;
+      }
+      return `/pages/shop/userorder-detail?order_id=${orderId}`;
+    },
     confirmVerify() {
       if (this.isVerifying) return;
       if (!this.orderData.orderId) {
@@ -247,16 +262,7 @@ export default {
           this.isVerified = true;
           this.isVerifying = false;
           // 核销成功后跳转到订单详情
-          const orderId = this.orderData.orderId;
-          const orderType = this.orderData.orderType;
-          let url = '';
-          if (orderType == 3) {
-            url = `/pages/shop/SellerDetail?order_id=${orderId}`;
-          } else if (orderType == 2 || orderType == 5 || orderType == 6) {
-            url = `/pages/shop/userorder-detail?order_id=${orderId}&serviceType=2`;
-          } else {
-            url = `/pages/shop/userorder-detail?order_id=${orderId}`;
-          }
+          const url = this.getOrderDetailUrl();
           setTimeout(() => {
             uni.navigateTo({ url });
           }, 1500);
@@ -564,4 +570,4 @@ export default {
 .btn-disabled {
   opacity: 0.6;
 }
-</style>
\ No newline at end of file
+</style>

From d01b04bce0441f993d1b69e938400e1889a35a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Mon, 15 Jun 2026 14:01:12 +0800
Subject: [PATCH 115/118] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=AD=89=E4=B8=80=E7=B3=BB=E5=88=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artisan/profile.vue            | 206 +++++++++++++++++----------
 pages/home/components/brand-card.vue |   2 +-
 pages/home/components/skill-card.vue |   4 +-
 pages/home/home.vue                  |  17 ++-
 pages/jingxuan/brand-detail.vue      |   4 +-
 pages/jingxuan/selected-brands.vue   |  26 +++-
 pages/jingxuan/selected-skills.vue   |  12 +-
 pages/my/my.vue                      | 140 +++++++++---------
 pages/order/userorder-list.vue       |  52 +++----
 pages/ruzhu/successruzhu.vue         |   3 +-
 pages/search_common/search.vue       |  26 +++-
 pages/shop/business-time.vue         |  27 +++-
 pages/shop/service-skills.vue        |   8 +-
 pages/shop/staff/addStaff.vue        |   7 +-
 14 files changed, 317 insertions(+), 217 deletions(-)

diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index ba700bb..8e4e9f4 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -158,17 +158,16 @@
 							<text class="item-label">资质信息</text>
 						</view>
 						<view>
-							<image
-								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
-								mode="widthFix"
-								style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
-								v-if="userInfo.credentials_state === 0">
-							</image>
-							<text style="margin-right: 16rpx;"
-								:style="{ color: userInfo.credentials_state === 0 ? '#ec5d57' : userInfo.credentials_state === 1 ? '#e59e45' : '#389930' }">
-								{{ userInfo.credentials_state === 0 ? '待完善' : userInfo.credentials_state === 1 ? '审核中' :
-									'已认证' }}
-							</text>
+							<image
+								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+								mode="widthFix"
+								style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
+								v-if="userInfo.credentials_state === 0 || userInfo.id_type < 0 || qualificationAuditStatus == 3">
+							</image>
+							<text style="margin-right: 16rpx;"
+								:style="{ color: qualificationStatusColor() }">
+								{{ qualificationStatusText() }}
+							</text>
 							<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
 							</image>
 						</view>
@@ -199,12 +198,15 @@ import request from "../../utils/request";
 export default {
 	data() {
 		return {
-			identity: '',
-			currentUserId: '', // 当前用户ID
-			userInfo: {}, // 用户信息
-			sharing: false // 添加分享状态标记
-		}
-	},
+			identity: '',
+			currentUserId: '', // 当前用户ID
+			userInfo: {}, // 用户信息
+			authDetails: null,
+			qualificationAuditStatus: null,
+			isQualificationAuditLoaded: false,
+			sharing: false // 添加分享状态标记
+		}
+	},
 	onLoad() {
 		// 页面显示时重新加载身份信息，确保数据最新
 		this.loadIdentity()
@@ -492,12 +494,18 @@ export default {
 					type
 				})
 
-				if (result.data && result.data.id) {
-					this.userInfo = result.data
-					this.currentUserId = result.data.id
-
-					// 存储到本地，避免重复调用
-					uni.setStorageSync('userInfo', result.data)
+				if (result.data && result.data.id) {
+					this.userInfo = result.data
+					this.currentUserId = result.data.id
+					this.fetchQualificationApplyDetails()
+					if (this.isSettled()) {
+						this.fetchAuthDetails()
+					} else {
+						this.authDetails = null
+					}
+
+					// 存储到本地，避免重复调用
+					uni.setStorageSync('userInfo', result.data)
 					console.log('从接口获取用户信息成功:', this.userInfo)
 				} else {
 					console.log('接口返回数据异常:', result)
@@ -512,8 +520,8 @@ export default {
 		},
 
 		// 备用方案：从其他位置获取用户信息
-		tryAlternativeUserInfo() {
-			try {
+		tryAlternativeUserInfo() {
+			try {
 				const app = getApp()
 
 				// 方法1: 从全局数据获取用户ID
@@ -544,10 +552,60 @@ export default {
 				console.log('所有获取用户信息的方法都失败了')
 			} catch (e) {
 				console.log('备用方案获取用户信息失败:', e)
-			}
-		},
-
-		loadIdentity() {
+			}
+		},
+
+		fetchAuthDetails() {
+			return request.post("/sj/userSjAuth/details", {
+				type: 1,
+				id_type: '1'
+			}).then(res => {
+				if (res.code == 200 && res.data) {
+					this.authDetails = res.data;
+				}
+				return res;
+			});
+		},
+
+		fetchQualificationApplyDetails() {
+			this.isQualificationAuditLoaded = false;
+			return request.post('/sj/userSjAuth/details', {
+				apply_type: 4
+			}).then(res => {
+				if ((res.code == 200 || res.state == 1) && res.data) {
+					this.qualificationAuditStatus = Number(res.data.apply_state);
+				} else {
+					this.qualificationAuditStatus = null;
+				}
+				this.isQualificationAuditLoaded = true;
+				return res;
+			}).catch(error => {
+				console.log('获取资质信息申请详情失败:', error);
+				this.qualificationAuditStatus = null;
+				this.isQualificationAuditLoaded = true;
+			});
+		},
+
+		isSettled() {
+			return typeof this.userInfo.id_type !== 'undefined' && this.userInfo.id_type !== 0;
+		},
+
+		isCertified() {
+			return typeof this.userInfo.id_type !== 'undefined' && this.userInfo.id_type > 0;
+		},
+
+		isUnderReview() {
+			return this.authDetails && Object.keys(this.authDetails).length > 0;
+		},
+
+		async ensureAuthDetails() {
+			if (this.identity != '2' || !this.isSettled() || this.isUnderReview()) {
+				return;
+			}
+			await this.fetchAuthDetails();
+		},
+
+		loadIdentity() {
 			// 从全局数据获取身份
 			const app = getApp()
 			const globalIdentity = app.globalData.artisanType
@@ -630,50 +688,50 @@ export default {
 			})
 		},
 
-		navigateToQualification() {
-			const idType = this.userInfo.id_type;
-			const credentialsState = this.userInfo.credentials_state;
-
-			if (idType < 0 && credentialsState === 0) {
-				// 驳回 + 仅填写基础信息 → 去完成资质认证
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu?type=2'
-				});
-			} else if (idType < 0 && credentialsState === 1) {
-				// 驳回 + 审核中 → 客服页面
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu?type=1'
-				});
-			} else if (idType === 0 && credentialsState === 0) {
-				// 从未入驻
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu'
-				});
-			} else if (idType > 0 && credentialsState === 0) {
-				// 已入驻 + 待完善
-				uni.navigateTo({
-					url: '/pages/shop/qualification_sj_change'
-				});
-			} else if (idType > 0 && credentialsState === 1) {
-				// 已入驻 + 申请中
-				uni.navigateTo({
-					url: '/pages/shop/qualification_sj_change'
-				});
-			} else if (idType > 0 && credentialsState === 2) {
-				// 已入驻 + 已完善
-				uni.navigateTo({
-					url: '/pages/shop/qualification_sj_change'
-				});
-			}
-		},
-
-		navigateToBelongShop() { // 手艺人：所属门店
-			uni.navigateTo({
-				url: '/pages/artisan/belong_shop'
-			})
-		}
-	}
-}
+		async navigateToQualification() {
+			if (this.identity != '2' || this.isCertified()) {
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+				return;
+			}
+
+			await this.ensureAuthDetails();
+			if (!this.isSettled()) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			} else if (this.isUnderReview()) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?step=3'
+				});
+			}
+		},
+		navigateToBelongShop() { // 手艺人：所属门店
+			uni.navigateTo({
+				url: '/pages/artisan/belong_shop'
+			})
+		},
+		qualificationStatusText() {
+			if (this.qualificationAuditStatus == 3) return '审核未通过';
+			if (this.userInfo.id_type < 0) return '审核未通过';
+			if (this.qualificationAuditStatus == 1) return '审核中';
+			if (!this.isQualificationAuditLoaded) return '';
+			if (this.userInfo.credentials_state === 0) return '待完善';
+			if (this.userInfo.credentials_state === 1) return '审核中';
+			return '已认证';
+		},
+		qualificationStatusColor() {
+			if (this.qualificationAuditStatus == 3 || this.userInfo.id_type < 0 || this.userInfo.credentials_state === 0) return '#ec5d57';
+			if (this.qualificationAuditStatus == 1 || this.userInfo.credentials_state === 1) return '#e59e45';
+			return '#389930';
+		}
+	}
+}
 </script>
 
 <style>
@@ -855,4 +913,4 @@ export default {
 	width: 11rpx;
 	height: 22rpx;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/home/components/brand-card.vue b/pages/home/components/brand-card.vue
index 067acab..0a73cfd 100644
--- a/pages/home/components/brand-card.vue
+++ b/pages/home/components/brand-card.vue
@@ -187,7 +187,7 @@ export default {
 }
 
 .brand-name {
-	font-size: 26rpx;
+	font-size: 28rpx;
 	font-weight: 500;
 	color: #333333;
 	line-height: 34rpx;
diff --git a/pages/home/components/skill-card.vue b/pages/home/components/skill-card.vue
index 2ec1994..fce4095 100644
--- a/pages/home/components/skill-card.vue
+++ b/pages/home/components/skill-card.vue
@@ -88,7 +88,7 @@ export default {
 <style lang="scss" scoped>
 .skill-item {
   display: flex;
-  margin-bottom: 20rpx;
+  margin-bottom: 30rpx;
 
   &:last-child {
     margin-bottom: 0;
@@ -133,7 +133,7 @@ export default {
       overflow: hidden;
       font-size: 28rpx;
       color: #333;
-      font-weight: 400;
+      font-weight: 500;
       line-height: 40rpx;
     }
 
diff --git a/pages/home/home.vue b/pages/home/home.vue
index bdb1deb..af3614d 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -128,7 +128,7 @@
 				</view>
 				<view class="stat-item">
 					<text class="num">{{ orderBasic.finished }}</text>
-					<text class="label">已完成</text>
+					<text class="label">已取消</text>
 				</view>
 			</view>
 		</view>
@@ -196,7 +196,7 @@
 		<view class="brands-section card-box">
 			<view class="card-header">
 				<view class="header-left"><text class="title" style="margin-left: 10rpx;">精选品牌</text></view>
-				<view class="header-right" @tap="goToBrandList">更多品牌 <image class="more-right-icon"
+				<view class="header-right brand-more" @tap="goToBrandList">更多品牌 <image class="more-right-icon"
 						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/ee119e24-1cb2-43df-86e6-61af8e9fd0ad.png">
 					</image>
 				</view>
@@ -783,8 +783,7 @@ export default {
 
 		// 营业中 / 休息中 按钮逻辑判断
 		toggleStatus() {
-			const currentStatus = this.userInfo.order_taking;
-			const isCurrentlyResting = currentStatus != 1; // 当前不是营业中即为休息中
+			const isCurrentlyResting = !this.isOpenStore; // 以页面实际展示状态为准
 
 			// 强力拦截：在休息中且三大件没配全，想要营业时拦截弹窗
 			if (isCurrentlyResting && !this.canOpenStore) {
@@ -793,7 +792,7 @@ export default {
 			}
 
 			// 准备切换的新状态
-			let newStatus = currentStatus == 1 ? 2 : 1;
+			let newStatus = this.isOpenStore ? 2 : 1;
 
 			// 加入一个防连点的 Loading
 			uni.showLoading({
@@ -1085,10 +1084,14 @@ page {
 
 		.header-right {
 			font-weight: 400;
-			font-size: 22rpx;
+			font-size: 24rpx;
 			color: #666666;
 			line-height: 28rpx;
 		}
+
+		.brand-more {
+			font-size: 24rpx;
+		}
 	}
 
 	.header-section {
@@ -1459,7 +1462,7 @@ page {
 
 		.notice-btn {
 			// font-weight: 400;
-			font-size: 20rpx;
+			font-size: 22rpx;
 			color: #8D4C1B;
 			padding: 6rpx 18rpx;
 			border-radius: 30rpx;
diff --git a/pages/jingxuan/brand-detail.vue b/pages/jingxuan/brand-detail.vue
index 96d01d6..1910932 100644
--- a/pages/jingxuan/brand-detail.vue
+++ b/pages/jingxuan/brand-detail.vue
@@ -917,7 +917,7 @@ export default {
     line-height: 37rpx;
     display: -webkit-box;
     -webkit-box-orient: vertical;
-    -webkit-line-clamp: 19;
+    -webkit-line-clamp: 10;
     overflow: hidden;
     white-space: pre-line;
 
@@ -1337,4 +1337,4 @@ export default {
   font-size: 32rpx;
   color: #333333;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/jingxuan/selected-brands.vue b/pages/jingxuan/selected-brands.vue
index fc1f677..3a2d46c 100644
--- a/pages/jingxuan/selected-brands.vue
+++ b/pages/jingxuan/selected-brands.vue
@@ -28,16 +28,16 @@
           <view class="sort-item" @tap="toggleSort('time')">
             <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
             <view class="arrows">
-              <image class="arrow-icon" :src="orderType === 1 ? iconPinkUp : iconGreyUp"></image>
-              <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
+              <image class="arrow-icon" :src="orderType === 2 ? iconPinkUp : iconGreyUp"></image>
+              <image class="arrow-icon" :src="orderType === 1 ? iconPinkDown : iconGreyDown"></image>
             </view>
           </view>
 
           <view class="sort-item" @tap="toggleSort('view')">
             <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
             <view class="arrows">
-              <image class="arrow-icon" :src="orderType === 3 ? iconPinkUp : iconGreyUp"></image>
-              <image class="arrow-icon" :src="orderType === 4 ? iconPinkDown : iconGreyDown"></image>
+              <image class="arrow-icon" :src="orderType === 4 ? iconPinkUp : iconGreyUp"></image>
+              <image class="arrow-icon" :src="orderType === 3 ? iconPinkDown : iconGreyDown"></image>
             </view>
           </view>
         </view>
@@ -153,9 +153,21 @@ export default {
     // ============ 排序逻辑 ============
     toggleSort(type) {
       if (type === 'time') {
-        this.orderType = this.orderType === 1 ? 2 : 1;
+        if (this.orderType === 1) {
+          this.orderType = 2;
+        } else if (this.orderType === 2) {
+          this.orderType = 0;
+        } else {
+          this.orderType = 1;
+        }
       } else if (type === 'view') {
-        this.orderType = this.orderType === 3 ? 4 : 3;
+        if (this.orderType === 3) {
+          this.orderType = 4;
+        } else if (this.orderType === 4) {
+          this.orderType = 0;
+        } else {
+          this.orderType = 3;
+        }
       }
       this.refreshBrandList();
     },
@@ -522,4 +534,4 @@ export default {
   width: 36rpx !important;
   height: 36rpx !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index 798e80f..444aa73 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -28,16 +28,16 @@
             <view class="sort-item" @tap="toggleSort('time')">
               <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
               <view class="arrows">
-                <image class="arrow-icon" :src="orderType === 1 ? iconPinkUp : iconGreyUp"></image>
-                <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
+                <image class="arrow-icon" :src="orderType === 2 ? iconPinkUp : iconGreyUp"></image>
+                <image class="arrow-icon" :src="orderType === 1 ? iconPinkDown : iconGreyDown"></image>
               </view>
             </view>
 
             <view class="sort-item" @tap="toggleSort('view')">
               <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
               <view class="arrows">
-                <image class="arrow-icon" :src="orderType === 3 ? iconPinkUp : iconGreyUp"></image>
-                <image class="arrow-icon" :src="orderType === 4 ? iconPinkDown : iconGreyDown"></image>
+                <image class="arrow-icon" :src="orderType === 4 ? iconPinkUp : iconGreyUp"></image>
+                <image class="arrow-icon" :src="orderType === 3 ? iconPinkDown : iconGreyDown"></image>
               </view>
             </view>
           </view>
@@ -176,9 +176,11 @@ export default {
     toggleSort(type) {
       if (type === 'time') {
         if (this.orderType === 1) this.orderType = 2
+        else if (this.orderType === 2) this.orderType = 0
         else this.orderType = 1
       } else if (type === 'view') {
         if (this.orderType === 3) this.orderType = 4
+        else if (this.orderType === 4) this.orderType = 0
         else this.orderType = 3
       }
       this.fetchData(true)
@@ -574,4 +576,4 @@ export default {
   width: 36rpx !important;
   height: 36rpx !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 8cf6a29..d3cceaf 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -781,17 +781,55 @@ export default {
 			});
 			this.getInviteList();
 		},
-		// 获取入驻详情
-		fetchAuthDetails() {
-			request.post("/sj/userSjAuth/details", {
-				type: 1,
-				id_type: '1'
-			}).then(res => {
-				if (res.code == 200 && res.data) {
-					this.authDetails = res.data;
-				}
-			});
-		},
+		// 获取入驻详情
+		fetchAuthDetails() {
+			return request.post("/sj/userSjAuth/details", {
+				type: 1,
+				id_type: '1'
+			}).then(res => {
+				if (res.code == 200 && res.data) {
+					this.authDetails = res.data;
+				}
+				return res;
+			});
+		},
+		async ensureAuthDetails() {
+			if (!this.isSettled || (this.authDetails && Object.keys(this.authDetails).length > 0)) {
+				return;
+			}
+			await this.fetchAuthDetails();
+		},
+		navigateToCertificationForm() {
+			if (this.isSettled) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?step=3'
+				});
+			} else {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			}
+		},
+		async navigateToCertificationProcess() {
+			if (this.isCertified) {
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+				return;
+			}
+			await this.ensureAuthDetails();
+			if (!this.isSettled) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			} else if (this.isUnderReview) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				this.navigateToCertificationForm();
+			}
+		},
 		async goLogin() {
 			// 添加访问检查
 			if (this.isAccountDisabled) {
@@ -841,11 +879,17 @@ export default {
 				return;
 			}
 
-			// 2. 未登录 → 提示
-			if (!this.isLogin) {
-				uni.showToast({
-					title: `您暂未登录，无法使用${item.title || item.text || ''}！`,
-					icon: "none",
+			// 2. 未登录 → 提示
+			if (!this.isLogin) {
+				if (item.path == "/pages/ruzhu/ruzhu") {
+					uni.navigateTo({
+						url: "/pages/blogPopup/blogPopup",
+					});
+					return;
+				}
+				uni.showToast({
+					title: `您暂未登录，无法使用${item.title || item.text || ''}！`,
+					icon: "none",
 				});
 				return;
 			}
@@ -920,41 +964,9 @@ export default {
 				url: "/pages/artisan/profile",
 			});
 		},
-		toruzhu() {
-			const idType = this.userInfo.id_type;
-			const credentialsState = this.userInfo.credentials_state;
-			if (idType < 0 && credentialsState === 0) {
-				// 驳回 + 仅填写基础信息 → 去完成资质认证
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu?type=2'
-				});
-			} else if (idType < 0 && credentialsState === 1) {
-				// 驳回 + 审核中 → 客服页面
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu?type=1'
-				});
-			} else if (idType === 0 && credentialsState === 0) {
-				// 从未入驻
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu'
-				});
-			} else if (idType > 0 && credentialsState === 0) {
-				// 已入驻 + 待完善
-				uni.navigateTo({
-					url: '/pages/shop/qualification_sj_change'
-				});
-			} else if (idType > 0 && credentialsState === 1) {
-				// 已入驻 + 申请中
-				uni.navigateTo({
-					url: '/pages/shop/qualification_sj_change'
-				});
-			} else if (idType > 0 && credentialsState === 2) {
-				// 已入驻 + 已完善
-				uni.navigateTo({
-					url: '/pages/shop/qualification_sj_change'
-				});
-			}
-		},
+		toruzhu() {
+			this.navigateToCertificationProcess();
+		},
 		closeSetupModal() {
 			this.showSetupModal = false;
 		},
@@ -970,24 +982,10 @@ export default {
 				url: '/pages/shop/service-skills'
 			});
 		},
-		goToAuth() {
-			this.showSetupModal = false;
-			if (this.isUnderReview) {
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu?type=1'
-				});
-			} else {
-				if (this.isSettled) {
-					uni.navigateTo({
-						url: '/pages/ruzhu/ruzhu?step=3'
-					});
-				} else {
-					uni.navigateTo({
-						url: '/pages/ruzhu/ruzhu'
-					});
-				}
-			}
-		},
+		goToAuth() {
+			this.showSetupModal = false;
+			this.navigateToCertificationProcess();
+		},
 		goToInviteList() {
 			// 添加访问检查
 			if (this.isAccountDisabled) {
@@ -1705,7 +1703,7 @@ button::after {
 	gap: 12rpx;
 	margin-top: 10rpx;
 	width: auto;
-	height: 36rpx;
+	height: 46rpx;
 	padding: 0 8rpx 0 8rpx;
 	background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/378a6936-a543-4ff5-9aa0-cfcb4d4e14b3.png');
 	background-size: 100% 100%;
@@ -1891,4 +1889,4 @@ button::after {
 		}
 	}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/order/userorder-list.vue b/pages/order/userorder-list.vue
index 1e70faa..53f36d7 100644
--- a/pages/order/userorder-list.vue
+++ b/pages/order/userorder-list.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="order-list-page" style="background-color: #fafafa">
+    <view class="order-list-page">
 
         <view class="status" v-if="isLogin">
             <scroll-view scroll-x class="status-tabs" :show-scrollbar="false">
@@ -21,7 +21,7 @@
                 </view>
             </scroll-view>
         </view>
-        <view style="background-color: #f5f5f5; height: 20rpx"></view>
+        <view class="status-gap"></view>
         <CommonList nList ref="groupRef" :isLogin="isLogin" :apiUrl="apiUrl"
             :listScrollHeight="`calc(100vh - 280rpx - 20rpx)`" @load-success="loadSuccess" class="nodatamit">
             <template #listData="{ list }" class="commit">
@@ -41,10 +41,12 @@
                 <view class="noDataBox">
                     <noData tipText="暂无服务订单哟～" v-if="isLogin"></noData>
                     <view class="nologin_part" v-else>
-                        <image src="/static/images/no_login.png" class="nologin_icon" mode="aspectFit"></image>
-                        <view class="btn-login" @click="goLogin">
-                            <text class="login-text">前去登录</text>
-                        </view>
+                        <image
+                            src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/15e33bab-8868-40bf-935b-a9ee9ca3c0d2.png"
+                            class="nologin_icon"
+                            mode="aspectFit"
+                            @click="goLogin"
+                        ></image>
                     </view>
                 </view>
             </template>
@@ -570,6 +572,7 @@ export default {
     min-height: 100vh;
     display: flex;
     flex-direction: column;
+    background-color: #FAFAFA;
 }
 
 /* 状态标签栏 (移植自用户端示例) */
@@ -654,7 +657,7 @@ export default {
 
 /* 数据列表及卡片外框样式 */
 .order-item-wrap {
-    background-color: #f5f5f5;
+    background-color: #FAFAFA;
     overflow: hidden;
 }
 
@@ -669,33 +672,15 @@ export default {
 /* 未登录状态的样式 */
 .nologin_part {
     display: flex;
-    flex-flow: column nowrap;
     justify-content: center;
     align-items: center;
+    width: 100%;
+    height: 100%;
 }
 
 .nologin_icon {
-    width: 360rpx;
-    height: 360rpx;
-    margin-top: 100rpx;
-    margin-bottom: 40rpx;
-}
-
-.btn-login {
-    width: 200rpx;
-    height: 68rpx;
-    background-color: #ff4767;
-    border-radius: 34rpx;
-    display: flex;
-    flex-flow: row nowrap;
-    justify-content: center;
-    align-items: center;
-    box-shadow: 0 4rpx 10rpx rgba(255, 71, 103, 0.3);
-}
-
-.login-text {
-    font-size: 30rpx;
-    color: #fff;
+    width: 422rpx;
+    height: 378rpx;
 }
 
 ::v-deep .list-scroll {
@@ -705,6 +690,11 @@ export default {
 }
 
 .nodatamit {
-    background-color: #f5f5f5;
+    background-color: #FAFAFA;
 }
-</style>
\ No newline at end of file
+
+.status-gap {
+    background-color: #FAFAFA;
+    height: 20rpx;
+}
+</style>
diff --git a/pages/ruzhu/successruzhu.vue b/pages/ruzhu/successruzhu.vue
index d162d0c..901b8f6 100644
--- a/pages/ruzhu/successruzhu.vue
+++ b/pages/ruzhu/successruzhu.vue
@@ -42,7 +42,7 @@ export default {
 					} else {
 						this.infoData = {
 							top: '审核结果',
-							title: '审核失败',
+							title: '审核未通过',
 							photo: res.data.photo
 						};
 						this.$emit('stateChange', 3);
@@ -114,6 +114,7 @@ export default {
 	line-height: 67rpx;
 	text-align: center;
 	font-style: normal;
+	margin-top: -40rpx;
 }
 
 .title-content {
diff --git a/pages/search_common/search.vue b/pages/search_common/search.vue
index 28ab06c..d4e3393 100644
--- a/pages/search_common/search.vue
+++ b/pages/search_common/search.vue
@@ -21,16 +21,16 @@
         <view class="sort-item" @tap="toggleSort('time')">
           <text class="sort-text" :class="{ active: orderType === 1 || orderType === 2 }">发布时间</text>
           <view class="arrows">
-            <image class="arrow-icon" :src="orderType === 1 ? iconPinkUp : iconGreyUp"></image>
-            <image class="arrow-icon" :src="orderType === 2 ? iconPinkDown : iconGreyDown"></image>
+            <image class="arrow-icon" :src="orderType === 2 ? iconPinkUp : iconGreyUp"></image>
+            <image class="arrow-icon" :src="orderType === 1 ? iconPinkDown : iconGreyDown"></image>
           </view>
         </view>
 
         <view class="sort-item" @tap="toggleSort('view')">
           <text class="sort-text" :class="{ active: orderType === 3 || orderType === 4 }">浏览量</text>
           <view class="arrows">
-            <image class="arrow-icon" :src="orderType === 3 ? iconPinkUp : iconGreyUp"></image>
-            <image class="arrow-icon" :src="orderType === 4 ? iconPinkDown : iconGreyDown"></image>
+            <image class="arrow-icon" :src="orderType === 4 ? iconPinkUp : iconGreyUp"></image>
+            <image class="arrow-icon" :src="orderType === 3 ? iconPinkDown : iconGreyDown"></image>
           </view>
         </view>
       </view>
@@ -150,9 +150,21 @@ export default {
     // 切换排序
     toggleSort(type) {
       if (type === 'time') {
-        this.orderType = this.orderType === 1 ? 2 : 1;
+        if (this.orderType === 1) {
+          this.orderType = 2;
+        } else if (this.orderType === 2) {
+          this.orderType = 0;
+        } else {
+          this.orderType = 1;
+        }
       } else if (type === 'view') {
-        this.orderType = this.orderType === 3 ? 4 : 3;
+        if (this.orderType === 3) {
+          this.orderType = 4;
+        } else if (this.orderType === 4) {
+          this.orderType = 0;
+        } else {
+          this.orderType = 3;
+        }
       }
 
       // 切换排序直接重新加载当前结果
@@ -439,4 +451,4 @@ export default {
   font-size: 24rpx;
   color: #999;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/shop/business-time.vue b/pages/shop/business-time.vue
index b21e396..a70c4c2 100644
--- a/pages/shop/business-time.vue
+++ b/pages/shop/business-time.vue
@@ -308,6 +308,11 @@ export default {
       }).then(res => {
         if (res.code == 200 && res.data) {
           this.authDetails = res.data;
+          if (!this.userInfo.business_time && res.data.business_time) {
+            this.currentTime = res.data.business_time;
+            this.originalTime = res.data.business_time;
+            this.parseTimeString(res.data.business_time);
+          }
         }
       });
     },
@@ -352,9 +357,9 @@ export default {
       // 准备切换的新状态
       let newStatus = currentStatus == 1 ? 2 : 1;
 
-      // 想要开始接单时，检查是否配置了营业时间
-      if (newStatus === 1 && !this.hasBusinessTime) {
-        uni.showToast({ title: '请配置营业时间', icon: 'none' });
+      // 想要开始接单时，检查资料是否完善
+      if (newStatus === 1 && !this.canOpenStore) {
+        uni.showToast({ title: '当前资料不完善，无法开启接单', icon: 'none' });
         return;
       }
 
@@ -503,9 +508,21 @@ export default {
 
         // 根据接口文档，使用 code 判断成功
         if (res.code === 200) {
+          const savedTime = this.currentTime;
           this.showBottomActions = false
           this.tempTime = ''
-          this.originalTime = this.currentTime // 更新原始时间
+          this.originalTime = savedTime // 更新原始时间
+          this.userInfo = {
+            ...(this.userInfo || {}),
+            business_time: savedTime
+          }
+          if (this.authDetails) {
+            this.authDetails = {
+              ...this.authDetails,
+              business_time: savedTime
+            }
+          }
+          this.parseTimeString(savedTime)
 
           uni.showToast({
             title: '营业时间更新成功',
@@ -1051,4 +1068,4 @@ export default {
   background: linear-gradient(135deg, #FF4767, #FF6B8A);
   color: white;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/shop/service-skills.vue b/pages/shop/service-skills.vue
index a035d38..833a182 100644
--- a/pages/shop/service-skills.vue
+++ b/pages/shop/service-skills.vue
@@ -162,13 +162,17 @@ export default {
             if (!this.lastApplyTime) return false;
             // 如果最后申请时间在驳回时间之后，说明有新的申请
             return true;
+        },
+        // 处于服务技能变更审核中时，不自动进入添加/编辑步骤
+        isChangeUnderReview() {
+            return this.auditStatus === 1 || this.showAuditTip || this.buttonType === 'view';
         }
     },
     async onLoad() {
         this.sjInformation = await request.post('/sj/user/getUser');
         await this.initPage();
         // 如果没有技能和经验信息，直接进入编辑模式
-        if (this.currentSkills.length === 0 && !this.originalMajor) {
+        if (this.currentSkills.length === 0 && !this.originalMajor && !this.isChangeUnderReview) {
             this.startChange();
         }
     },
@@ -960,4 +964,4 @@ export default {
     width: 33.333%;
   }
 } */
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/shop/staff/addStaff.vue b/pages/shop/staff/addStaff.vue
index 6e97247..140607d 100644
--- a/pages/shop/staff/addStaff.vue
+++ b/pages/shop/staff/addStaff.vue
@@ -19,7 +19,7 @@
 					<image class="avatar" :src="sryDetail.head_photo" mode="aspectFill"></image>
 					<view class="user-detail">
 						<view class="flex-row-center-between">
-							<text class="user-name">{{ sryDetail.name }}</text>
+							<text class="user-name">{{ sryDisplayName }}</text>
 							<view class="enter-btn flex-row-center" @click="goDetail">进入详情</view>
 						</view>
 						<view class="tags">
@@ -117,6 +117,9 @@ export default {
 		}
 	},
 	computed: {
+		sryDisplayName() {
+			return this.sryDetail.nick_name || this.sryDetail.name || "";
+		},
 		mergeServiceList() {
 			// 1. 提取原始对象的所有子数组
 			let allSubArrays = Object.values(this.$store.state.sjServiceList);
@@ -487,4 +490,4 @@ export default {
 ::v-deep .navbar-content .title {
 	margin-left: 20rpx !important;
 }
-</style>
\ No newline at end of file
+</style>

From 7a071227e72fcb97b0679f3d3fc25cba1eafdb0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Mon, 15 Jun 2026 16:01:57 +0800
Subject: [PATCH 116/118] =?UTF-8?q?=E7=B2=BE=E9=80=89=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=EF=BC=8C=E6=8A=80=E8=83=BD=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=B8=AD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artisan/profile.vue          | 120 +++++++++++++++++++++++------
 pages/jingxuan/selected-brands.vue |   7 ++
 pages/shop/service-skills.vue      |  17 ++--
 3 files changed, 113 insertions(+), 31 deletions(-)

diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index 8e4e9f4..46ca4a2 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -66,20 +66,19 @@
 								<text class="item-label">服务技能</text>
 							</view>
 							<view>
-								<image
-									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
-									mode="widthFix"
-									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
-									v-if="!userInfo.servers_kill_arr || userInfo.servers_kill_arr.length === 0">
-								</image>
-								<text style="margin-right: 16rpx;"
-									:style="{ color: (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '#c9c9c9' : '#ec5d57' }">
-									{{ (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '已设置' :
-										'待完善' }}
-								</text>
-								<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
-								</image>
-							</view>
+								<image
+									src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
+									mode="widthFix"
+									style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
+									v-if="shouldShowServiceSkillWarningIcon()">
+								</image>
+								<text style="margin-right: 16rpx;"
+									:style="{ color: serviceSkillStatusColor() }">
+									{{ serviceSkillStatusText() }}
+								</text>
+								<image class="arrow-right" src="/static/images/arrow_right.png" mode="aspectFit">
+								</image>
+							</view>
 						</view>
 
 						<!-- 门店信息 -->
@@ -162,7 +161,7 @@
 								src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/338d957b-cbb6-409b-9e7a-ef5faa0f9b70.png"
 								mode="widthFix"
 								style="width:26rpx;margin-top: 26rpx;position: relative;top: 4rpx;left: -10rpx;"
-								v-if="userInfo.credentials_state === 0 || userInfo.id_type < 0 || qualificationAuditStatus == 3">
+								v-if="shouldShowQualificationWarningIcon()">
 							</image>
 							<text style="margin-right: 16rpx;"
 								:style="{ color: qualificationStatusColor() }">
@@ -202,6 +201,8 @@ export default {
 			currentUserId: '', // 当前用户ID
 			userInfo: {}, // 用户信息
 			authDetails: null,
+			serviceSkillAuditStatus: null,
+			isServiceSkillAuditLoaded: false,
 			qualificationAuditStatus: null,
 			isQualificationAuditLoaded: false,
 			sharing: false // 添加分享状态标记
@@ -497,6 +498,7 @@ export default {
 				if (result.data && result.data.id) {
 					this.userInfo = result.data
 					this.currentUserId = result.data.id
+					this.fetchServiceSkillApplyDetails()
 					this.fetchQualificationApplyDetails()
 					if (this.isSettled()) {
 						this.fetchAuthDetails()
@@ -567,13 +569,34 @@ export default {
 			});
 		},
 
+		fetchServiceSkillApplyDetails() {
+			this.isServiceSkillAuditLoaded = false;
+			return request.post('/sj/userSjAuth/details', {
+				apply_type: 2
+			}).then(res => {
+				if ((res.code == 200 || res.state == 1) && res.data) {
+					const status = Number(res.data.apply_state);
+					this.serviceSkillAuditStatus = Number.isNaN(status) ? null : status;
+				} else {
+					this.serviceSkillAuditStatus = null;
+				}
+				this.isServiceSkillAuditLoaded = true;
+				return res;
+			}).catch(error => {
+				console.log('获取服务技能申请详情失败:', error);
+				this.serviceSkillAuditStatus = null;
+				this.isServiceSkillAuditLoaded = true;
+			});
+		},
+
 		fetchQualificationApplyDetails() {
 			this.isQualificationAuditLoaded = false;
 			return request.post('/sj/userSjAuth/details', {
 				apply_type: 4
 			}).then(res => {
 				if ((res.code == 200 || res.state == 1) && res.data) {
-					this.qualificationAuditStatus = Number(res.data.apply_state);
+					const statusCheck = this.getQualificationApplyStatus(res.data);
+					this.qualificationAuditStatus = statusCheck.isValid ? statusCheck.status : null;
 				} else {
 					this.qualificationAuditStatus = null;
 				}
@@ -604,6 +627,27 @@ export default {
 			}
 			await this.fetchAuthDetails();
 		},
+		getQualificationApplyStatus(detail) {
+			const status = Number(detail.apply_state);
+			if (Number.isNaN(status)) {
+				return {
+					isValid: false,
+					status: null
+				};
+			}
+
+			if (status === 2) {
+				return {
+					isValid: true,
+					status
+				};
+			}
+
+			return {
+				isValid: true,
+				status
+			};
+		},
 
 		loadIdentity() {
 			// 从全局数据获取身份
@@ -716,19 +760,49 @@ export default {
 				url: '/pages/artisan/belong_shop'
 			})
 		},
+		hasServiceSkills() {
+			return this.userInfo.servers_kill_arr && this.userInfo.servers_kill_arr.length > 0;
+		},
+		serviceSkillStatusText() {
+			if (this.serviceSkillAuditStatus === 1) return '审核中';
+			if (this.serviceSkillAuditStatus === 3) return '审核未通过';
+			return this.hasServiceSkills() ? '已设置' : '待完善';
+		},
+		serviceSkillStatusColor() {
+			const statusText = this.serviceSkillStatusText();
+			if (statusText === '审核未通过' || statusText === '待完善') return '#ec5d57';
+			if (statusText === '审核中') return '#e59e45';
+			return '#c9c9c9';
+		},
+		shouldShowServiceSkillWarningIcon() {
+			const statusText = this.serviceSkillStatusText();
+			return statusText === '审核未通过' || statusText === '待完善';
+		},
+		getCredentialsState() {
+			const state = Number(this.userInfo.credentials_state);
+			return Number.isNaN(state) ? null : state;
+		},
 		qualificationStatusText() {
-			if (this.qualificationAuditStatus == 3) return '审核未通过';
-			if (this.userInfo.id_type < 0) return '审核未通过';
-			if (this.qualificationAuditStatus == 1) return '审核中';
 			if (!this.isQualificationAuditLoaded) return '';
-			if (this.userInfo.credentials_state === 0) return '待完善';
-			if (this.userInfo.credentials_state === 1) return '审核中';
+			if (this.qualificationAuditStatus === 1) return '审核中';
+			if (this.qualificationAuditStatus === 2) return '已认证';
+			if (this.qualificationAuditStatus === 3) return '审核未通过';
+
+			const credentialsState = this.getCredentialsState();
+			if (credentialsState === 0) return '待完善';
+			if (credentialsState === 1) return '审核中';
+			if (this.userInfo.id_type < 0) return '审核未通过';
 			return '已认证';
 		},
 		qualificationStatusColor() {
-			if (this.qualificationAuditStatus == 3 || this.userInfo.id_type < 0 || this.userInfo.credentials_state === 0) return '#ec5d57';
-			if (this.qualificationAuditStatus == 1 || this.userInfo.credentials_state === 1) return '#e59e45';
+			const statusText = this.qualificationStatusText();
+			if (statusText === '审核未通过' || statusText === '待完善') return '#ec5d57';
+			if (statusText === '审核中') return '#e59e45';
 			return '#389930';
+		},
+		shouldShowQualificationWarningIcon() {
+			const statusText = this.qualificationStatusText();
+			return statusText === '审核未通过' || statusText === '待完善';
 		}
 	}
 }
diff --git a/pages/jingxuan/selected-brands.vue b/pages/jingxuan/selected-brands.vue
index 3a2d46c..5065c9a 100644
--- a/pages/jingxuan/selected-brands.vue
+++ b/pages/jingxuan/selected-brands.vue
@@ -206,6 +206,7 @@ export default {
       if (this.activeId === id) return;
       this.activeId = id;
       this.currentSecondClass = "";
+      this.selectedSecondIds = [];
       this.getSecondClassList();
       this.refreshBrandList();
     },
@@ -229,6 +230,12 @@ export default {
       });
 
       if (this.$refs.brandListRef) {
+        // CommonList 会合并旧 queryData，清空筛选时需要同步移除旧字段。
+        ['first_class', 'second_class', 'order_type'].forEach(key => {
+          if (!Object.prototype.hasOwnProperty.call(params, key) && this.$refs.brandListRef.queryData) {
+            this.$delete(this.$refs.brandListRef.queryData, key);
+          }
+        });
         this.$refs.brandListRef.manualRefresh(params);
       }
     },
diff --git a/pages/shop/service-skills.vue b/pages/shop/service-skills.vue
index 833a182..2075f04 100644
--- a/pages/shop/service-skills.vue
+++ b/pages/shop/service-skills.vue
@@ -149,13 +149,10 @@ export default {
         },
         // 控制驳回提示是否显示
         shouldShowRejectReason() {
-            // 只有在审核驳回状态、不显示待审核技能、且技能未变更时才显示驳回提示
-            return this.auditStatus === 3 &&
+            // 审核驳回时直接显示驳回原因，避免自动进入填写页面后隐藏原因
+            return Number(this.auditStatus) === 3 &&
                 !this.showPendingSkills &&
-                !this.hasChanges &&
                 this.backText;
-            // 检查是否有待处理的申请（基于时间）
-            !this.hasPendingApply();
         },
         // 检查是否有待处理的申请（基于时间）
         hasPendingApply() {
@@ -163,9 +160,12 @@ export default {
             // 如果最后申请时间在驳回时间之后，说明有新的申请
             return true;
         },
-        // 处于服务技能变更审核中时，不自动进入添加/编辑步骤
+        // 处于服务技能变更审核中或驳回时，不自动进入添加/编辑步骤
         isChangeUnderReview() {
-            return this.auditStatus === 1 || this.showAuditTip || this.buttonType === 'view';
+            return Number(this.auditStatus) === 1 ||
+                Number(this.auditStatus) === 3 ||
+                this.showAuditTip ||
+                this.buttonType === 'view';
         }
     },
     async onLoad() {
@@ -311,7 +311,8 @@ export default {
                 if (res.code === 200 && res.data) {
                     const detail = res.data;
                     this.applyId = detail.id;
-                    this.auditStatus = detail.apply_state;
+                    const auditStatus = Number(detail.apply_state);
+                    this.auditStatus = Number.isNaN(auditStatus) ? null : auditStatus;
                     this.backText = detail.back_text || ''; // 获取驳回原因
 
                     console.log('审核状态:', this.auditStatus);

From 177fbb35f9b6921a40506acf6cf05844b16e0101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Mon, 15 Jun 2026 20:48:58 +0800
Subject: [PATCH 117/118] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E5=8D=87=E7=BA=A7=E3=80=82=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                        |   4 +-
 pages/home/components/skill-card.vue |   2 +-
 pages/jingxuan/brand-detail.vue      |  33 +-
 pages/jingxuan/selected-skills.vue   |   2 +-
 pages/jingxuan/skill-detail.vue      |   5 +-
 pages/my/my.vue                      | 140 +++----
 pages/shop/business-time.vue         |  23 +-
 utils/request.js                     | 540 +++++++++++++--------------
 8 files changed, 387 insertions(+), 362 deletions(-)

diff --git a/manifest.json b/manifest.json
index ea94134..9a538a2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "美融融商家",
     "appid" : "__UNI__BBE6285",
     "description" : "同城便捷到家美业“技术外卖”服务、同城预约到店服务平台美融融为同城爱美人群提供更优质的更全面的服务。",
-    "versionName" : "1.0.17",
-    "versionCode" : 1017,
+    "versionName" : "1.0.20",
+    "versionCode" : 1020,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/home/components/skill-card.vue b/pages/home/components/skill-card.vue
index fce4095..0e0e9ba 100644
--- a/pages/home/components/skill-card.vue
+++ b/pages/home/components/skill-card.vue
@@ -193,4 +193,4 @@ export default {
   -webkit-line-clamp: 2;
   overflow: hidden;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/jingxuan/brand-detail.vue b/pages/jingxuan/brand-detail.vue
index 1910932..826ee7a 100644
--- a/pages/jingxuan/brand-detail.vue
+++ b/pages/jingxuan/brand-detail.vue
@@ -3,8 +3,12 @@
 
     <custom-navbar :title="info.name || '品牌详情'"
       :leftImg="'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60ae3383-6ff6-4f42-818b-d9b09a9bd0e0.png'"
-      :showUser="true" backgroundColor="#ffffff" titleColor="#333" borderBottom="none" :show-headle="true"
-      :headleSrc="isCollected ? iconCollectOn : iconCollectOff" @onHeadleClick="toggleCollectStatus">
+      :showUser="true" backgroundColor="#ffffff" titleColor="#333" borderBottom="none">
+      <template #right>
+        <view class="collect-btn" @click="toggleCollectStatus">
+          <text class="collect-icon" :class="{ active: isCollected }">★</text>
+        </view>
+      </template>
     </custom-navbar>
 
     <!-- 顶部导航栏扩展：动态计算位置的拨号图标 -->
@@ -721,6 +725,31 @@ export default {
   position: relative;
 }
 
+.brand-detail-page ::v-deep .right-area {
+  border: none;
+  border-radius: 0;
+  background: transparent;
+}
+
+.collect-btn {
+  width: 46rpx;
+  height: 46rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: transparent;
+}
+
+.collect-icon {
+  font-size: 42rpx;
+  line-height: 46rpx;
+  color: #C9CDD4;
+
+  &.active {
+    color: #FF4767;
+  }
+}
+
 /* 导航栏左侧新增动态拨号图标 */
 .nav-phone-wrap {
   position: fixed;
diff --git a/pages/jingxuan/selected-skills.vue b/pages/jingxuan/selected-skills.vue
index 444aa73..f01ed2a 100644
--- a/pages/jingxuan/selected-skills.vue
+++ b/pages/jingxuan/selected-skills.vue
@@ -466,7 +466,7 @@ export default {
 }
 
 .list-container {
-  padding: 30rpx 24rpx;
+  padding: 0 24rpx 30rpx;
 }
 
 .filter-panel {
diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
index 57b2e34..3b810f2 100644
--- a/pages/jingxuan/skill-detail.vue
+++ b/pages/jingxuan/skill-detail.vue
@@ -70,12 +70,9 @@
     </view>
 
     <view class="article-content-wrapper">
-      <view class="article-content" v-if="article.htmlContent">
+      <view class="article-content">
         <rich-text :nodes="formattedHtmlContent"></rich-text>
       </view>
-      <view class="empty-content" v-else>
-        <text class="empty-text">暂无图文介绍</text>
-      </view>
     </view>
 
     <view class="recommend-section" v-if="recommendList.length > 0">
diff --git a/pages/my/my.vue b/pages/my/my.vue
index d3cceaf..a81af22 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -363,7 +363,7 @@ export default {
 				title: "",
 				id_type: 1,
 				self_state: false,
-				url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/30b42fe6-21f9-443f-a091-5439d57e3593.png",
+				url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/545f2db0-d66a-41ca-b1f5-6a28469e65ba.png",
 				path: "/pages/selfOperated/agreement?title=平台自营项目介绍&type=18",
 			},
 			{
@@ -781,55 +781,55 @@ export default {
 			});
 			this.getInviteList();
 		},
-		// 获取入驻详情
-		fetchAuthDetails() {
-			return request.post("/sj/userSjAuth/details", {
-				type: 1,
-				id_type: '1'
-			}).then(res => {
-				if (res.code == 200 && res.data) {
-					this.authDetails = res.data;
-				}
-				return res;
-			});
-		},
-		async ensureAuthDetails() {
-			if (!this.isSettled || (this.authDetails && Object.keys(this.authDetails).length > 0)) {
-				return;
-			}
-			await this.fetchAuthDetails();
-		},
-		navigateToCertificationForm() {
-			if (this.isSettled) {
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu?step=3'
-				});
-			} else {
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu'
-				});
-			}
-		},
-		async navigateToCertificationProcess() {
-			if (this.isCertified) {
-				uni.navigateTo({
-					url: '/pages/shop/qualification_sj_change'
-				});
-				return;
-			}
-			await this.ensureAuthDetails();
-			if (!this.isSettled) {
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu'
-				});
-			} else if (this.isUnderReview) {
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu?type=1'
-				});
-			} else {
-				this.navigateToCertificationForm();
-			}
-		},
+		// 获取入驻详情
+		fetchAuthDetails() {
+			return request.post("/sj/userSjAuth/details", {
+				type: 1,
+				id_type: '1'
+			}).then(res => {
+				if (res.code == 200 && res.data) {
+					this.authDetails = res.data;
+				}
+				return res;
+			});
+		},
+		async ensureAuthDetails() {
+			if (!this.isSettled || (this.authDetails && Object.keys(this.authDetails).length > 0)) {
+				return;
+			}
+			await this.fetchAuthDetails();
+		},
+		navigateToCertificationForm() {
+			if (this.isSettled) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?step=3'
+				});
+			} else {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			}
+		},
+		async navigateToCertificationProcess() {
+			if (this.isCertified) {
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+				return;
+			}
+			await this.ensureAuthDetails();
+			if (!this.isSettled) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			} else if (this.isUnderReview) {
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu?type=1'
+				});
+			} else {
+				this.navigateToCertificationForm();
+			}
+		},
 		async goLogin() {
 			// 添加访问检查
 			if (this.isAccountDisabled) {
@@ -879,17 +879,17 @@ export default {
 				return;
 			}
 
-			// 2. 未登录 → 提示
-			if (!this.isLogin) {
-				if (item.path == "/pages/ruzhu/ruzhu") {
-					uni.navigateTo({
-						url: "/pages/blogPopup/blogPopup",
-					});
-					return;
-				}
-				uni.showToast({
-					title: `您暂未登录，无法使用${item.title || item.text || ''}！`,
-					icon: "none",
+			// 2. 未登录 → 提示
+			if (!this.isLogin) {
+				if (item.path == "/pages/ruzhu/ruzhu") {
+					uni.navigateTo({
+						url: "/pages/blogPopup/blogPopup",
+					});
+					return;
+				}
+				uni.showToast({
+					title: `您暂未登录，无法使用${item.title || item.text || ''}！`,
+					icon: "none",
 				});
 				return;
 			}
@@ -964,9 +964,9 @@ export default {
 				url: "/pages/artisan/profile",
 			});
 		},
-		toruzhu() {
-			this.navigateToCertificationProcess();
-		},
+		toruzhu() {
+			this.navigateToCertificationProcess();
+		},
 		closeSetupModal() {
 			this.showSetupModal = false;
 		},
@@ -982,10 +982,10 @@ export default {
 				url: '/pages/shop/service-skills'
 			});
 		},
-		goToAuth() {
-			this.showSetupModal = false;
-			this.navigateToCertificationProcess();
-		},
+		goToAuth() {
+			this.showSetupModal = false;
+			this.navigateToCertificationProcess();
+		},
 		goToInviteList() {
 			// 添加访问检查
 			if (this.isAccountDisabled) {
@@ -1703,7 +1703,7 @@ button::after {
 	gap: 12rpx;
 	margin-top: 10rpx;
 	width: auto;
-	height: 46rpx;
+	height: 46rpx;
 	padding: 0 8rpx 0 8rpx;
 	background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/378a6936-a543-4ff5-9aa0-cfcb4d4e14b3.png');
 	background-size: 100% 100%;
@@ -1889,4 +1889,4 @@ button::after {
 		}
 	}
 }
-</style>
+</style>
diff --git a/pages/shop/business-time.vue b/pages/shop/business-time.vue
index a70c4c2..a1563e1 100644
--- a/pages/shop/business-time.vue
+++ b/pages/shop/business-time.vue
@@ -240,6 +240,12 @@ export default {
     },
     isCertified() {
       if (!this.isLogin || typeof this.userInfo.id_type === 'undefined') return false;
+      if (typeof this.userInfo.credentials_state !== 'undefined' && this.userInfo.credentials_state !== null) {
+        const credentialsState = Number(this.userInfo.credentials_state);
+        if (!Number.isNaN(credentialsState)) {
+          return credentialsState === 2 || (this.userInfo.id_type > 0 && credentialsState === 0);
+        }
+      }
       return this.userInfo.id_type > 0;
     },
     hasBusinessTime() {
@@ -351,13 +357,20 @@ export default {
 
     // 核心切换逻辑：营业中 / 休息中
     toggleStatus() {
-      const currentStatus = this.userInfo.order_taking;
-      const isCurrentlyResting = currentStatus != 1; // 当前不是营业中即为休息中
+      if (!this.isCertified) {
+        uni.showToast({ title: '请完成资质认证', icon: 'none' });
+        return;
+      }
 
-      // 准备切换的新状态
-      let newStatus = currentStatus == 1 ? 2 : 1;
+      // 未入驻状态不允许切换接单状态
+      if (!this.isSettled) {
+        uni.showToast({ title: '请先完成入驻', icon: 'none' });
+        return;
+      }
+
+      // 以页面展示状态为准，避免资料未完成时后端仍为接单中导致首次点击变成停止接单
+      let newStatus = this.isOpenStore ? 2 : 1;
 
-      // 想要开始接单时，检查资料是否完善
       if (newStatus === 1 && !this.canOpenStore) {
         uni.showToast({ title: '当前资料不完善，无法开启接单', icon: 'none' });
         return;
diff --git a/utils/request.js b/utils/request.js
index cfa905c..1db7033 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,78 +1,66 @@
-import {
-	getToken,
-	setToken,
-	removeToken
-} from './auth'
-import {
-	setVersion
-} from '../utils/version.js'
-import {
-	getBaseUrl
-} from '../utils/version.js'
+import { getToken, setToken, removeToken } from "./auth";
+import { setVersion } from "../utils/version.js";
+import { getBaseUrl } from "../utils/version.js";
 
 let baseURL;
-setVersion()
+setVersion();
 
-let isRefreshing = false
-let subscribers = []
+let isRefreshing = false;
+let subscribers = [];
 
 // 订阅 Token 刷新
 function subscribeTokenRefresh(cb) {
-	subscribers.push(cb)
+  subscribers.push(cb);
 }
 
 // 发布 Token 刷新完成
 function onRrefreshed(token) {
-	subscribers.forEach(cb => cb(token))
-	subscribers = []
+  subscribers.forEach((cb) => cb(token));
+  subscribers = [];
 }
 
 // 请求拦截器
 const requestInterceptor = (options) => {
-	// 获取token
-	const token = uni.getStorageSync('accessToken')
-	if (token) {
-		options.header = {
-			...options.header,
-			'Authorization': `Bearer ${token}`
-		}
-	}
+  // 获取token
+  const token = uni.getStorageSync("accessToken");
+  if (token) {
+    options.header = {
+      ...options.header,
+      Authorization: `Bearer ${token}`,
+    };
+  }
 
-	// #ifdef H5
-	// H5端跨域处理
-	options.header = {
-		...options.header,
-		'Access-Control-Allow-Origin': '*'
-	}
-	// #endif
+  // #ifdef H5
+  // H5端跨域处理
+  options.header = {
+    ...options.header,
+    "Access-Control-Allow-Origin": "*",
+  };
+  // #endif
 
-	return options
-}
+  return options;
+};
 
-// 响应拦截器 
+// 响应拦截器
 const responseInterceptor = async (options, response, resolve, reject) => {
-	const {
-		statusCode,
-		data
-	} = response
-	// 请求成功
-	if (statusCode >= 200 && statusCode < 300) {
-		return data
-	}
+  const { statusCode, data } = response;
+  // 请求成功
+  if (statusCode >= 200 && statusCode < 300) {
+    return data;
+  }
 
-	// 处理错误
-	if (statusCode === 401) {
+  // 处理错误
+  if (statusCode === 401) {
+    return await handleUnauthorized(options, resolve, reject);
+  }
 
-		return await handleUnauthorized(options, resolve, reject)
-	}
-
-	// 其他错误
-	uni.showToast({
-		title: data.message || '请求失败',
-		icon: 'none'
-	})
-	return Promise.reject(data)
-}
+  // 其他错误
+  uni.showToast({
+    title: data.message || "请求失败",
+    icon: "none",
+  });
+  return Promise.reject(data);
+};
 // 创建 uni.request 的封装
 // const request = (options) => {
 //   return new Promise((resolve, reject) => {
@@ -95,258 +83,256 @@ const responseInterceptor = async (options, response, resolve, reject) => {
 
 // 请求方法
 const request = async (options, isUpdate) => {
-	// 合并配置
-	let url = uni.getStorageSync('baseUrl')
-	if (uni.getStorageSync('setVersion').VersionCode == '') {
-		setVersion()
-	}
+  // 合并配置
+  let url = uni.getStorageSync("baseUrl");
+  if (uni.getStorageSync("setVersion").VersionCode == "") {
+    setVersion();
+  }
 
-	if (!url) {
-		await new Promise((resolve, reject) => {
-			uni.request({
-				url: 'https://api.mrrwlkj.top/api/openPuc/getSjApiUrl', // 接口地址
-				method: 'GET', // 请求方法（默认 GET）
-				header: {
-					'Content-Type': 'application/json', // 请求头
-					'VersionCode': uni.getStorageSync('setVersion').VersionCode,
-					'DeviceBrand': uni.getStorageSync('setVersion').DeviceBrand,
-					'DeviceType': uni.getStorageSync('setVersion').DeviceType
-				},
-				success: (res) => {
-					if (res.data.code == 200) {
-						uni.setStorageSync('baseUrl', res.data.data.url)
-						url = res.data.data.url
-						resolve(url)
-					}
-					console.log('请求成功', res.data);
-				},
-				fail: (err) => {
-					console.log('请求失败', err);
-				},
-				complete: () => {
-					console.log('请求完成（无论成功失败都会执行）');
-				}
-			});
-		})
+  if (!url) {
+    await new Promise((resolve, reject) => {
+      uni.request({
+        url: "https://api.mrrwlkj.top/api/openPuc/getSjApiUrl", // 接口地址
+        method: "GET", // 请求方法（默认 GET）
+        header: {
+          "Content-Type": "application/json", // 请求头
+          VersionCode: uni.getStorageSync("setVersion").VersionCode,
+          DeviceBrand: uni.getStorageSync("setVersion").DeviceBrand,
+          DeviceType: uni.getStorageSync("setVersion").DeviceType,
+        },
+        success: (res) => {
+          if (res.data.code == 200) {
+            uni.setStorageSync("baseUrl", res.data.data.url);
+            url = res.data.data.url;
+            resolve(url);
+          }
+          console.log("请求成功", res.data);
+        },
+        fail: (err) => {
+          console.log("请求失败", err);
+        },
+        complete: () => {
+          console.log("请求完成（无论成功失败都会执行）");
+        },
+      });
+    });
+  }
 
-	}
+  if (process.env.NODE_ENV === "development") {
+    baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
+    baseURL = "http://test.mrrwlkj.top"; // 发布到生产环境时，此处代码会被摇树移除掉。
+    //baseURL = 'http://dev.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。
+    // baseURL = "https://app.mrrweb.com.cn";
+  } else {
+    baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
+    baseURL = "http://test.mrrwlkj.top"; // 发布到生产环境时，此处代码会被摇树移除掉。
+    //baseURL = 'http://dev.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。
+    // baseURL = "https://app.mrrweb.com.cn";
 
+    console.log("生产环境");
+  }
 
+  // 基础配置
+  const config = {
+    baseURL: baseURL, // APP和H5的开发URL
+    baseURL: baseURL, // APP和H5的开发URL
+    // baseURL: 'https://app.mrrweb.com.cn', // APP和H5的生产URL
 
-	if (process.env.NODE_ENV === 'development') {
-		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。	
-		baseURL = 'http://test.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。
-		//baseURL = 'http://dev.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。
-		//baseURL = 'https://app.mrrweb.com.cn';
-	} else {
-		baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
-		baseURL = 'http://test.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。	
-			//baseURL = 'http://dev.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。
-		//baseURL = 'https://app.mrrweb.com.cn';
+    header: {
+      "content-type": "application/json",
+      VersionCode: uni.getStorageSync("setVersion").VersionCode,
+      DeviceBrand: uni.getStorageSync("setVersion").DeviceBrand,
+      DeviceType: uni.getStorageSync("setVersion").DeviceType,
+    },
+    timeout: 60000, // 超时时间
+  };
 
-		console.log('生产环境');
-	}
+  options = {
+    ...config,
+    ...options,
+    url: !isUpdate ? `${config.baseURL}${options.url}` : options.url,
+  };
 
-	// 基础配置
-	const config = {
-		baseURL: baseURL, // APP和H5的开发URL
-		baseURL: baseURL, // APP和H5的开发URL
-		// baseURL: 'https://app.mrrweb.com.cn', // APP和H5的生产URL
+  // 请求拦截
+  options = requestInterceptor(options);
 
-		header: {
-			'content-type': 'application/json',
-			'VersionCode': uni.getStorageSync('setVersion').VersionCode,
-			'DeviceBrand': uni.getStorageSync('setVersion').DeviceBrand,
-			'DeviceType': uni.getStorageSync('setVersion').DeviceType
-		},
-		timeout: 60000 // 超时时间
-	}
+  // 发起请求
+  return new Promise((resolve, reject) => {
+    // #ifdef H5
+    // H5端添加loading
+    if (!options.hideLoading) {
+      uni.showLoading({
+        title: "加载中...",
+      });
+    }
+    // #endif
 
+    uni.request({
+      ...options,
+      success: (res) => {
+        // #ifdef H5
+        if (!options.hideLoading) {
+          uni.hideLoading();
+        }
+        // #endif
+        try {
+          const result = responseInterceptor(options, res, resolve, reject);
+          if (result && typeof result.then === "function") {
+            result.then((data) => resolve(data)).catch((err) => reject(err));
+          } else {
+            resolve(result);
+          }
+        } catch (err) {
+          reject(err);
+        }
+      },
+      fail: (err) => {
+        // #ifdef H5
+        if (!options.hideLoading) {
+          uni.hideLoading();
+        }
+        // #endif
 
-	options = {
-		...config,
-		...options,
-		url: !isUpdate ? `${config.baseURL}${options.url}` : options.url
-	}
+        // 网络错误处理
+        let errorMsg = "网络错误，请稍后重试";
+        // #ifdef H5
+        if (err.errMsg.includes("timeout")) {
+          errorMsg = "请求超时，请检查网络";
+        }
+        // #endif
 
-
-	// 请求拦截
-	options = requestInterceptor(options)
-
-	// 发起请求
-	return new Promise((resolve, reject) => {
-		// #ifdef H5
-		// H5端添加loading
-		if (!options.hideLoading) {
-			uni.showLoading({
-				title: '加载中...'
-			})
-		}
-		// #endif
-
-		uni.request({
-			...options,
-			success: (res) => {
-			// #ifdef H5
-			if (!options.hideLoading) {
-				uni.hideLoading()
-			}
-			// #endif
-			try {
-				const result = responseInterceptor(options, res, resolve, reject)
-				if (result && typeof result.then === 'function') {
-					result.then(data => resolve(data)).catch(err => reject(err))
-				} else {
-					resolve(result)
-				}
-			} catch (err) {
-				reject(err)
-			}
-		},
-			fail: (err) => {
-				// #ifdef H5
-				if (!options.hideLoading) {
-					uni.hideLoading()
-				}
-				// #endif
-
-				// 网络错误处理
-				let errorMsg = '网络错误，请稍后重试'
-				// #ifdef H5
-				if (err.errMsg.includes('timeout')) {
-					errorMsg = '请求超时，请检查网络'
-				}
-				// #endif
-
-				uni.showToast({
-					title: errorMsg,
-					icon: 'none'
-				})
-				reject(err)
-			}
-		})
-	})
-}
+        uni.showToast({
+          title: errorMsg,
+          icon: "none",
+        });
+        reject(err);
+      },
+    });
+  });
+};
 // 处理 401 未授权
 async function handleUnauthorized(originalRequest, resolve, reject) {
-	if (!getToken()) {
-		reject(new Error('未登录'))
-		return redirectToLogin()
-	}
-	// 如果正在刷新 Token，将请求加入队列
-	if (isRefreshing) {
-		return subscribeTokenRefresh(token => {
-			originalRequest.header['Authorization'] = `Bearer ${token}`
-			request(originalRequest, true).then(resolve).catch(reject)
-		})
-	}
+  if (!getToken()) {
+    reject(new Error("未登录"));
+    return redirectToLogin();
+  }
+  // 如果正在刷新 Token，将请求加入队列
+  if (isRefreshing) {
+    return subscribeTokenRefresh((token) => {
+      originalRequest.header["Authorization"] = `Bearer ${token}`;
+      request(originalRequest, true).then(resolve).catch(reject);
+    });
+  }
 
-	isRefreshing = true
+  isRefreshing = true;
 
-	try {
-		const newToken = await refreshToken()
-		setToken(newToken)
-		onRrefreshed(newToken)
+  try {
+    const newToken = await refreshToken();
+    setToken(newToken);
+    onRrefreshed(newToken);
 
-		// 用新 Token 重试原始请求
-		originalRequest.header['Authorization'] = `Bearer ${newToken}`
-		const response = await request(originalRequest, true)
-		// resolve(response)
-		return response
-	} catch (error) {
-		removeToken()
-		redirectToLogin()
-		reject(error)
-		return error
-	} finally {
-		isRefreshing = false
-	}
+    // 用新 Token 重试原始请求
+    originalRequest.header["Authorization"] = `Bearer ${newToken}`;
+    const response = await request(originalRequest, true);
+    // resolve(response)
+    return response;
+  } catch (error) {
+    removeToken();
+    redirectToLogin();
+    reject(error);
+    return error;
+  } finally {
+    isRefreshing = false;
+  }
 }
 
 // 刷新 Token
 async function refreshToken() {
-	const refreshToken = uni.getStorageSync('refreshToken')
-	if (!refreshToken) {
-		throw new Error('No refresh token')
-	}
-	const res = await request({
-		url: '/sj/refreshtoken',
-		data: {
-			refresh_token: uni.getStorageSync('refreshToken'),
-			deviceid: getApp().globalData.deviceid
-		},
-		method: 'POST'
-	})
+  const refreshToken = uni.getStorageSync("refreshToken");
+  if (!refreshToken) {
+    throw new Error("No refresh token");
+  }
+  const res = await request({
+    url: "/sj/refreshtoken",
+    data: {
+      refresh_token: uni.getStorageSync("refreshToken"),
+      deviceid: getApp().globalData.deviceid,
+    },
+    method: "POST",
+  });
 
-	if (res.state == 1 || res.code == 200) {
-		const tokenData = res.data || res
-		if (!tokenData.access_token) {
-			throw new Error('Refresh token response missing access_token')
-		}
-		uni.setStorageSync('accessToken', tokenData.access_token)
-		if (tokenData.refresh_token) {
-			uni.setStorageSync('refreshToken', tokenData.refresh_token)
-		}
-		if (tokenData.refresh_token_expries) {
-			uni.setStorageSync('refresh_token_expries', tokenData.refresh_token_expries)
-		}
-		return tokenData.access_token
-	}
+  if (res.state == 1 || res.code == 200) {
+    const tokenData = res.data || res;
+    if (!tokenData.access_token) {
+      throw new Error("Refresh token response missing access_token");
+    }
+    uni.setStorageSync("accessToken", tokenData.access_token);
+    if (tokenData.refresh_token) {
+      uni.setStorageSync("refreshToken", tokenData.refresh_token);
+    }
+    if (tokenData.refresh_token_expries) {
+      uni.setStorageSync(
+        "refresh_token_expries",
+        tokenData.refresh_token_expries,
+      );
+    }
+    return tokenData.access_token;
+  }
 
-	throw new Error('Refresh token failed')
+  throw new Error("Refresh token failed");
 }
 
 // 跳转到登录页
 function redirectToLogin() {
-	// uni.reLaunch({
-	// 	url: '/pages/login/login'
-	// })
-	//一键登录测试
-	// uni.oprPresentLogin()
-	uni.navigateTo({
-		url: '/pages/blogPopup/blogPopup'
-	});
+  // uni.reLaunch({
+  // 	url: '/pages/login/login'
+  // })
+  //一键登录测试
+  // uni.oprPresentLogin()
+  uni.navigateTo({
+    url: "/pages/blogPopup/blogPopup",
+  });
 }
 
 // 导出请求方法
 export default {
-	// GET请求
-	get(url, data = {}, options = {}) {
-		return request({
-			url,
-			data,
-			method: 'GET',
-			...options
-		})
-	},
+  // GET请求
+  get(url, data = {}, options = {}) {
+    return request({
+      url,
+      data,
+      method: "GET",
+      ...options,
+    });
+  },
 
-	// POST请求
-	post(url, data = {}, options = {}) {
-		return request({
-			url,
-			data,
-			method: 'POST',
-			...options
-		})
-	},
+  // POST请求
+  post(url, data = {}, options = {}) {
+    return request({
+      url,
+      data,
+      method: "POST",
+      ...options,
+    });
+  },
 
-	// PUT请求
-	put(url, data = {}, options = {}) {
-		return request({
-			url,
-			data,
-			method: 'PUT',
-			...options
-		})
-	},
+  // PUT请求
+  put(url, data = {}, options = {}) {
+    return request({
+      url,
+      data,
+      method: "PUT",
+      ...options,
+    });
+  },
 
-	// DELETE请求
-	delete(url, data = {}, options = {}) {
-		return request({
-			url,
-			data,
-			method: 'DELETE',
-			...options
-		})
-	}
-}
+  // DELETE请求
+  delete(url, data = {}, options = {}) {
+    return request({
+      url,
+      data,
+      method: "DELETE",
+      ...options,
+    });
+  },
+};

From cc5f8248588c18d71c8e9c511660389b667cc7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Mon, 15 Jun 2026 21:33:34 +0800
Subject: [PATCH 118/118] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json    | 4 ++--
 pages/my/my.vue  | 5 ++++-
 utils/request.js | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index 9a538a2..28786b9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "美融融商家",
     "appid" : "__UNI__BBE6285",
     "description" : "同城便捷到家美业“技术外卖”服务、同城预约到店服务平台美融融为同城爱美人群提供更优质的更全面的服务。",
-    "versionName" : "1.0.20",
-    "versionCode" : 1020,
+    "versionName" : "1.0.21",
+    "versionCode" : 1021,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index a81af22..dd29df4 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -761,10 +761,13 @@ export default {
 			request.post("/sj/user/getUser").then((result) => {
 				this.userInfo = result.data;
 				uni.setStorageSync("syrId", result.data.id);
+				// 认证通过的判断逻辑与模板一致
+				const isCertified = result.data.credentials_state === 2 ||
+					(result.data.id_type > 0 && result.data.credentials_state === 0);
 				const allReady = result.data.business_time &&
 					result.data.servers_kill_arr &&
 					result.data.servers_kill_arr.length > 0 &&
-					result.data.credentials_state === 2;
+					isCertified;
 				const mgmtCard = this.cardList.find(c => c.title === "管理中心");
 				if (mgmtCard) {
 					const shopItem = mgmtCard.list.find(i => i.title === "店铺装修");
diff --git a/utils/request.js b/utils/request.js
index 1db7033..25c4346 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -120,14 +120,14 @@ const request = async (options, isUpdate) => {
 
   if (process.env.NODE_ENV === "development") {
     baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
-    baseURL = "http://test.mrrwlkj.top"; // 发布到生产环境时，此处代码会被摇树移除掉。
+    // baseURL = "http://test.mrrwlkj.top"; // 发布到生产环境时，此处代码会被摇树移除掉。
     //baseURL = 'http://dev.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。
-    // baseURL = "https://app.mrrweb.com.cn";
+    baseURL = "https://app.mrrweb.com.cn";
   } else {
     baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
-    baseURL = "http://test.mrrwlkj.top"; // 发布到生产环境时，此处代码会被摇树移除掉。
+    // baseURL = "http://test.mrrwlkj.top"; // 发布到生产环境时，此处代码会被摇树移除掉。
     //baseURL = 'http://dev.mrrwlkj.top'; // 发布到生产环境时，此处代码会被摇树移除掉。
-    // baseURL = "https://app.mrrweb.com.cn";
+    baseURL = "https://app.mrrweb.com.cn";
 
     console.log("生产环境");
   }