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

packageA/pages/UnitDetails/UnitDetails.vue

@@ -66,7 +66,7 @@
 									{{ job.jobDescription }}
 								</view>
 								<view class="deliver-box">
-									<view class="deliver-btn" @click="deliverResume">
+									<view class="deliver-btn" @click="deliverResume(job)">
 										简历投递
 									</view>
 								</view>
@@ -137,7 +137,7 @@
 		isExpanded.value = !isExpanded.value;
 	}
 
-	function deliverResume() {
+	function deliverResume(job) {
 		const raw = uni.getStorageSync("Padmin-Token");
 		const token = typeof raw === "string" ? raw.trim() : "";
 		const headers = token ? {
@@ -147,7 +147,13 @@
 		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData1) => {
 			if (resData1.code == 200) {
 				$api.myRequest("/system/user/login/user/info", {}, "GET", 10100, headers).then((resData) => {
-					$api.myRequest("/jobfair/public/job-fair-person-job/insert", {}, "GET", 9100, {
+					$api.myRequest("/jobfair/public/job-fair-person-job/insert", {
+						jobFairId: companyInfo.value.jobFairId, // 招聘会id
+						personId: resData.info.userId, // 当前登录用户id
+						enterpriseId: companyInfo.value.companyId, // 企业id
+						jobId: job.jobId, // 岗位id
+						idCard:resData.info.personCardNo
+					}, "post", 9100, {
 						"Content-Type": "application/json"
 					}).then((data) => {
 						if (data && data.code === 200) {

packageB/jobFair/detailCom.vue

@@ -301,7 +301,6 @@
 		const data = {
 			jobFairId: jobFairId.value,
 			enterpriseId: userInfo.value.info.userId,
-			code: userInfo.value.info.entCreditCode,
 		};
 		$api.myRequest("/jobfair/public/jobfair/detail", data).then((resData) => {
 			// 直接将数据合并到fair对象

pages.json

@@ -315,12 +315,21 @@
             "root": "packageB",
             "pages": [
                 {
+					// 企业参与的招聘会详情
                     "path": "jobFair/detailCom",
                     "style": {
                         "navigationBarTitleText": "招聘会详情",
                         "navigationBarTitleTextSize": "30rpx"
                     }
                 },
+                {
+					// 个人参与的招聘会详情
+                    "path": "jobFair/detailPerson",
+                    "style": {
+                        "navigationBarTitleText": "招聘会详情",
+                        "navigationBarTitleTextSize": "30rpx"
+                    }
+                },
                 {
                     "path": "login",
                     "style": {

pages/careerfair/careerfair.vue

@@ -172,7 +172,14 @@
 		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)
+				}
+			}
 		}
 	}