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

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

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