Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service

pages/careerfair/careerfair.vue

@@ -143,13 +143,59 @@
 		//     startDate: currentDate,
 		// });
 		// weekList.value = result;
-		getHeart();
+		if(thirdLogin()){
+			getHeart();
+		}
 	});
 
 	onShow(() => {
 		// 更新自定义tabbar选中状态
 		tabbarManager.updateSelected(1);
-	});
+	});//
+	
+	
+	
+	async function thirdLogin(){
+		let form={}
+		if (uni.getStorageSync('userInfo').isCompanyUser=='1') {
+			form={
+				usertype: '1',
+				idno: uni.getStorageSync('userInfo').idCard,
+				name: uni.getStorageSync('userInfo').name,
+				enterprisecode:"",
+				enterprisename: "",
+				contactperson: "",
+				contactphone: "",
+			}
+		}else if (uni.getStorageSync('userInfo').isCompanyUser=='0') {
+			form={
+				usertype: "2",
+				enterprisecode: uni.getStorageSync('userInfo').idCard,
+				enterprisename: uni.getStorageSync('userInfo').name,
+				contactperson: "",
+				contactphone: "",
+				idno: "",
+				name: ""
+			}
+		}else{
+			uni.showToast({
+				icon: 'none',
+				title: '请先登录'
+			})
+			return false;
+		}
+		var resLogin = await $api.myRequest('/auth/login2/ks',form,'post',10100);
+		if (resLogin.code=='200') {
+			uni.setStorageSync('Padmin-Token', resLogin.data.access_token)
+			return true;
+		}else{
+			uni.showToast({
+				icon: 'none',
+				title: '单点异常'
+			})
+			return false;
+		}
+	}
 
 	onMounted(() => {
 		// 监听退出登录事件，显示微信登录弹窗
@@ -168,19 +214,22 @@
 		// 可以在这里添加登录成功后的处理逻辑
 	};
 
-	function goDetail(jobFairId){
-		if(state.current != 3){
-			navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId)
-		}else{
-			console.log(userInfo.value, 'userInfo');
-			if(userInfo.value){
-				if(userInfo.value.userType=='ent'){
-					navTo('/packageB/jobFair/detailCom?jobFairId=' + jobFairId)
-				}else{
-					navTo('/packageB/jobFair/detailPerson?jobFairId=' + jobFairId)
+	async function goDetail(jobFairId){
+		if(await thirdLogin()){
+			debugger
+			if(state.current != 3){
+				navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId)
+			}else{
+				console.log(userInfo.value, 'userInfo');
+				if(userInfo.value){
+					if(userInfo.value.userType=='ent'){
+						navTo('/packageB/jobFair/detailCom?jobFairId=' + jobFairId)
+					}else{
+						navTo('/packageB/jobFair/detailPerson?jobFairId=' + jobFairId)
+					}
 				}
 			}
-		}
+		}	
 	}
 
 	function toSelectDate() {

pages/index/components/index-one.vue

@@ -106,7 +106,7 @@
                     <view class="service-icon service-icon-4">
                         <IconfontIcon name="zhengce" :size="48" color="#FFFFFF" />
                     </view>
-                    <view class="service-title">劳动政策指引</view>
+                    <view class="service-title">政策指引</view>
                 </view>
                 <view class="service-item press-button" @click="handleServiceClick('skill-training')">
                     <view class="service-icon service-icon-5">
@@ -856,7 +856,7 @@ function navToService(serviceType) {
         'service-guidance': '/pages/service/guidance',
         'public-recruitment': '/pages/service/public-recruitment', 
         'resume-creation': '/pages/resume-guide/resume-guide',
-        'labor-policy': '/pages/service/labor-policy',
+        'labor-policy': '/packageRc/pages/policy/policyList',
         'skill-training': '/packageB/train/video/videoList',
         'skill-evaluation': '/packageB/train/index',
         // 'skill-evaluation': '/pages/service/skill-evaluation',
@@ -1065,7 +1065,6 @@ import storeRc from '@/utilsRc/store/index.js';
 function goRc(){
     if (checkLogin()) {
         let userInfo = uni.getStorageSync('userInfo')
-        console.log(uni.getStorageSync('userInfo'), "uni.getStorageSync('userInfo')");
         storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
             // console.log(res, "'res");
             navTo('/packageRc/pages/index/index');

pages/service/career-planning.vue

@@ -143,6 +143,11 @@ function openRemindPopup() {
 
 // 检查用户是否完善了个人信息（调用接口获取）
 let hasCheckedRemindInfo = false;
+// 保存缺失信息的标识
+const missingInfo = ref({
+    hasJobInfo: false,
+    hasSkills: false
+});
 
 async function getRemindInfo() {
     if (hasCheckedRemindInfo) {
@@ -186,6 +191,10 @@ async function getRemindInfo() {
             return skillName && skillName.trim() !== '';
         });
         
+        // 保存缺失信息标识（只保存职位信息和技能标签，身份证信息跳转到个人信息页面）
+        missingInfo.value.hasJobInfo = hasJobInfo;
+        missingInfo.value.hasSkills = hasSkills;
+        
         // 判断信息是否完整（idCard、职位信息、技能标签都必须有）
         const isComplete = hasIdCard && hasJobInfo && hasSkills;
         
@@ -250,6 +259,10 @@ async function getRemindInfo() {
             return skillName && skillName.trim() !== '';
         });
         
+        // 保存缺失信息标识
+        missingInfo.value.hasJobInfo = hasJobInfo;
+        missingInfo.value.hasSkills = hasSkills;
+        
         // 判断信息是否完整（idCard、职位信息、技能标签都必须有）
         const isComplete = hasIdCard && hasJobInfo && hasSkills;
         
@@ -299,8 +312,25 @@ function handleCancel() {
 async function handleConfirm() {
     remindPopup.value?.close();
     
-    // 跳转到完善信息页面
-    navTo('/packageA/pages/personalInfo/personalInfo');
+    const { hasJobInfo, hasSkills } = missingInfo.value;
+    
+    // 如果同时缺少职位信息和技能标签：先跳转到职位信息页面，并传递参数表示完成后需要继续跳转到技能页面
+    if (!hasJobInfo && !hasSkills) {
+        // 跳转到职位信息页面，传递参数表示完成后需要继续跳转到技能页面
+        navTo('/packageA/pages/jobExpect/jobExpect?needSkill=true');
+    } 
+    // 如果只缺少技能标签：直接跳转到技能页面（个人信息页面的技能部分）
+    else if (!hasSkills) {
+        navTo('/packageA/pages/personalInfo/personalInfo');
+    } 
+    // 如果只缺少职位信息：直接跳转到职位信息页面
+    else if (!hasJobInfo) {
+        navTo('/packageA/pages/jobExpect/jobExpect');
+    }
+    // 如果只缺少身份证信息：跳转到个人信息页面
+    else {
+        navTo('/packageA/pages/personalInfo/personalInfo');
+    }
 }
 
 // 切换tab