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