Merge branch 'mrr_sj_develop_hjy_20260520_商家改版' of https://gitee.com/qtvbidt/mrr.sj.front into mrr_sj_develop_hjy_20260520_商家改版

manifest.json

@@ -41,7 +41,8 @@
             "Payment" : {},
             "VideoPlayer" : {},
             "OAuth" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "Barcode" : {}
         },
         /* 应用发布信息 */
         "distribute" : {

pages/home/components/brand-card.vue

@@ -34,8 +34,8 @@ const TAG_LIBRARY = {
     borderColor: '#D6CAC0 ',
     icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60816ae2-92ee-4473-9eca-562e1200dbca.png'
   },
-  recruit: {     // 学院招募
+  recruit: {     // 学员招募
-    text: '学院招募',
+    text: '学员招募',
     color: '#E5505F',
     borderColor: '#EFCFD2 ',
     icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fd0699b9-9f3c-4b1e-8693-d0c9ec7eabc3.png'

pages/my/my.vue

@@ -28,10 +28,11 @@
 						</view>
 						<view class="user_detail_tip" @click="toruzhu">
 							<image
-								:src="userInfo.credentials_state === 2 ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/13cd25db-5b52-4d36-bad2-ee8680eed65f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/711e35a8-a7a1-4eb2-8a76-52ac9795fa7e.png'"
+								:src="(userInfo.credentials_state === 2 || (userInfo.id_type > 0 && userInfo.credentials_state === 0)) ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/13cd25db-5b52-4d36-bad2-ee8680eed65f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/711e35a8-a7a1-4eb2-8a76-52ac9795fa7e.png'"
 								mode="widthFix" style="width:26rpx ;"></image>
 							<view class="user_detail_tip_phone" style="margin-left: -10rpx;">
-								{{ userInfo.credentials_state === 2 ? '认证通过' : userInfo.credentials_state === 1 ?
+								{{ (userInfo.credentials_state === 2 || (userInfo.id_type > 0 &&
+									userInfo.credentials_state === 0)) ? '认证通过' : userInfo.credentials_state === 1 ?
 									'资质审核中' : '资质待认证' }}
 							</view>
 							<image mode="widthFix"
@@ -793,18 +794,29 @@ export default {
 			});
 		},
 		toruzhu() {
-			if (this.userInfo.credentials_state === 2) {
+			const idType = this.userInfo.id_type;
+			const credentialsState = this.userInfo.credentials_state;
+
+			if (idType === 0 && credentialsState === 0) {
+				// 从未入驻
+				uni.navigateTo({
+					url: '/pages/ruzhu/ruzhu'
+				});
+			} else if (idType > 0 && credentialsState === 0) {
+				// 已认证 + 待完善
 				uni.navigateTo({
 					url: '/pages/shop/qualification_sj_change'
 				});
-			} else if (this.userInfo.credentials_state === 1) {
+			} else if (idType > 0 && credentialsState === 1) {
+				// 已认证 + 申请中
+				uni.navigateTo({
+					url: '/pages/shop/qualification_sj_change'
+				});
+			} else if (idType < 0 && credentialsState === 1) {
+				// 未入驻 + 申请中
 				uni.navigateTo({
 					url: '/pages/ruzhu/ruzhu?type=1'
 				});
-			} else {
-				uni.navigateTo({
-					url: '/pages/ruzhu/ruzhu'
-				});
 			}
 		},
 		goToInviteList() {
@@ -867,7 +879,7 @@ page {
 	position: relative;
 	padding-bottom: 50rpx;
 	padding-top: var(--status-bar-height);
-	background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/825812de-54b3-486a-a3a0-2c4a1fb9fd28.png");
+	background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c7c4d24-9a21-4d21-b1ed-1aa985d188e6.png");
 	background-position: 0 0;
 	background-size: 100%;
 	background-repeat: no-repeat;