From 708f135ec39343a3601a4864c3ada0904f3722da Mon Sep 17 00:00:00 2001
From: FengHui <francis_fh@163.com>
Date: Wed, 22 Apr 2026 20:53:29 +0800
Subject: [PATCH] 111

---
 packageA/pages/post/component/radarMap.vue | 63 +++++-------------
 packageA/pages/post/post.vue               | 52 +++++++--------
 pages/index/components/index-one.vue       | 76 +++++++++++++++++-----
 3 files changed, 101 insertions(+), 90 deletions(-)

diff --git a/packageA/pages/post/component/radarMap.vue b/packageA/pages/post/component/radarMap.vue
index 012a53f..2cfa317 100644
--- a/packageA/pages/post/component/radarMap.vue
+++ b/packageA/pages/post/component/radarMap.vue
@@ -1,13 +1,12 @@
 <template>
     <view style="display: flex; justify-content: center; padding: 0px 0">
-        <canvas canvas-id="radarCanvas" id="radarCanvas" style="width: 300px; height: 250px"></canvas>
+        <canvas canvas-id="radarCanvas" style="width: 600rpx; height: 500rpx"></canvas>
     </view>
 </template>
 
 <script setup>
 import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
-import { onLoad, onShow } from '@dcloudio/uni-app';
-// const src = ref('');
+import { onReady } from '@dcloudio/uni-app';
 
 const props = defineProps({
     value: {
@@ -41,7 +40,7 @@ function getRadarData() {
 }
 
 // 监听页面初始化
-onMounted(() => {
+onReady(() => {
     // 延迟执行，确保 canvas 已经渲染
     setTimeout(() => {
         const { labels, data } = getRadarData();
@@ -66,12 +65,10 @@ watch(
 
 function rawRadarChart(labels, data) {
     const ctx = uni.createCanvasContext('radarCanvas');
-    const width = 80;
-    const height = 80;
-    const centerX = 150;
-    const centerY = 125;
-    // const data = [2, 3.5, 5, 3.5, 5, 3.5]; // 示例数据
-    // const labels = ['火烧', '泡水', '事故', '外观', '部件', '火烧'];
+    const width = 150;
+    const height = 125;
+    const centerX = 300;
+    const centerY = 250;
     const colors = ['#F5F5F5', '#F5F5F5', '#F5F5F5', '#F5F5F5', '#F5F5F5'];
     const maxScore = 5; // 数据最大值
 
@@ -89,7 +86,6 @@ function rawRadarChart(labels, data) {
     ctx.fill();
 
     //多边形圈
-    // 多边形圈
     for (let i = 5; i > 0; i--) {
         ctx.setStrokeStyle(colors[i - 1]); // 设置边框颜色
         ctx.beginPath();
@@ -106,20 +102,14 @@ function rawRadarChart(labels, data) {
         ctx.stroke(); // 只描边，不填充
     }
 
-    // //竖线
+    // 绘制连接线
     labels.forEach((label, index) => {
         ctx.setStrokeStyle('#F5F5F5');
-        ctx.setFillStyle('#F5F5F5');
         ctx.beginPath();
-
-        const x1 = centerX + width * 0.6 * Math.sin(angleStep * index);
-        const y1 = centerY + height * 0.6 * Math.cos(angleStep * index);
-        const x = centerX + width * Math.sin(angleStep * index);
-        const y = centerY + height * Math.cos(angleStep * index);
-
-        ctx.moveTo(x1, y1);
+        ctx.moveTo(centerX, centerY);
+        const x = centerX + width * Math.cos(angleStep * index - Math.PI / 2);
+        const y = centerY + height * Math.sin(angleStep * index - Math.PI / 2);
         ctx.lineTo(x, y);
-
         ctx.closePath();
         ctx.stroke();
     });
@@ -145,15 +135,16 @@ function rawRadarChart(labels, data) {
     ctx.stroke();
 
     // 绘制每个小圆点
-    ctx.setFillStyle('#256BFA'); // 小圆点颜色（你可以改）
+    ctx.setFillStyle('#256BFA'); // 小圆点颜色
     pointList.forEach((point) => {
         ctx.beginPath();
-        ctx.arc(point.x, point.y, 4, 0, 2 * Math.PI); // 半径 4，可以自己调大小
+        ctx.arc(point.x, point.y, 4, 0, 2 * Math.PI); // 半径 4
         ctx.fill();
     });
 
     // 绘制标签
     ctx.setTextAlign('center');
+    ctx.setTextBaseline('middle');
 
     labels.forEach((label, index) => {
         const x = centerX + (width + 30) * Math.cos(angleStep * index - Math.PI / 2);
@@ -162,33 +153,13 @@ function rawRadarChart(labels, data) {
         //标题
         ctx.setFillStyle('#000');
         ctx.setFontSize(12);
-        ctx.font = 'bold 12px sans-serif';
         ctx.fillText(label, x, y);
-
-        // ctx.setFillStyle('#A2A4A2');
-        // ctx.font = '12px sans-serif';
-        // ctx.setFontSize(12);
-        // ctx.fillText(data[index], x, y + 16);
     });
 
     ctx.draw();
-
-    //转图片
-
-    // uni.canvasToTempFilePath({
-    //     x: 0,
-    //     y: 0,
-    //     width: 320,
-    //     height: 320,
-    //     destWidth: 840,
-    //     destHeight: 840,
-    //     canvasId: 'radarCanvas',
-    //     success: (res) => {
-    //         // 在H5平台下，tempFilePath 为 base64
-    //         src = res.tempFilePath;
-    //     },
-    // });
 }
 </script>
 
-<style></style>
+<style>
+/* 确保canvas容器有足够的空间 */
+</style>
diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue
index 82d3f5e..b9dcd90 100644
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -293,7 +293,7 @@ const showConfirmDialog = ref(false);
 
 onLoad((option) => {
 	console.log(option, 'option');
-    if (option.jobId) {
+    if (option.encryptJobId) {
         initLoad(option);
     }
 });
@@ -303,7 +303,7 @@ onShow(() => {
     // #ifdef H5
     try {
         const option = parseQueryParams(); // 兼容微信内置浏览器
-        if (option.jobId) {
+        if (option.encryptJobId) {
             initLoad(option);
         }
     } catch (e) {
@@ -312,10 +312,10 @@ onShow(() => {
     // #endif
 });
 function initLoad(option) {
-    const jobId = decodeURIComponent(option.jobId);
-    if (jobId !== jobIdRef.value) {
-        jobIdRef.value = jobId;
-        getDetail(jobId);
+    const encryptJobId = decodeURIComponent(option.encryptJobId);
+    if (encryptJobId !== jobIdRef.value) {
+        jobIdRef.value = encryptJobId;
+        getDetail(encryptJobId);
     }
 }
 
@@ -327,17 +327,17 @@ function seeExplain() {
     }
 }
 
-function getDetail(jobId) {
+function getDetail(encryptJobId) {
     return new Promise((reslove, reject) => {
-        $api.createRequest(`/app/job/${jobId}`).then((resData) => {
+        $api.createRequest(`/app/job/${encryptJobId}`).then((resData) => {
             const { latitude, longitude, companyName, companyId } = resData.data;
             jobInfo.value = resData.data;
             reslove(resData.data);
             getCompanyIsAJobs(companyId);
             if (currentUserType.value !== 0) {
-                getCompetivetuveness(jobId);
+                getCompetivetuveness(encryptJobId);
             }
-            // getCompetivetuveness(jobId);
+            // getCompetivetuveness(encryptJobId);
             if (latitude && longitude) {
                 mapCovers.value = [
                     {
@@ -379,8 +379,8 @@ function getTextWidth(text, size = 12) {
     return -(estimatedWidth / 2) - 20; // 计算文字中心点
 }
 
-function getCompetivetuveness(jobId) {
-    $api.createRequest(`/app/job/competitiveness/${jobId}`, {}, 'GET').then((resData) => {
+function getCompetivetuveness(encryptJobId) {
+    $api.createRequest(`/app/job/competitiveness/${encryptJobId}`, {}, 'GET').then((resData) => {
         // 如果接口返回的数据为 null 或空，使用默认值0
         if (resData && resData.data) {
             // 确保 radarChart 字段存在，如果不存在则使用默认值
@@ -455,19 +455,19 @@ function hideDialog() {
 
 // 确认操作
 function confirmAction() {
-    const jobId = jobInfo.value.jobId;
+    const encryptJobId = jobIdRef.value;
     if (jobInfo.value.isApply === 1) {
         // 取消投递
-        $api.createRequest(`/app/job/applyJobCencal`, { jobId }, 'DELETE').then((resData) => {
+        $api.createRequest(`/app/job/applyJobCencal`, { encryptJobId }, 'DELETE').then((resData) => {
             $api.msg('取消投递成功');
-            getDetail(jobId); // 刷新职位信息
+            getDetail(encryptJobId); // 刷新职位信息
             showConfirmDialog.value = false;
         });
     } else {
         // 确认投递
-        $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
+        $api.createRequest(`/app/job/apply/${encryptJobId}`, {}, 'GET').then((resData) => {
             $api.msg('申请成功');
-            getDetail(jobId); // 刷新职位信息
+            getDetail(encryptJobId); // 刷新职位信息
             showConfirmDialog.value = false;
         });
     }
@@ -475,8 +475,8 @@ function confirmAction() {
 
 // 确认投递
 function confirmApply() {
-    const jobId = jobInfo.value.jobId;
-    $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
+    const encryptJobId = jobIdRef.value;
+    $api.createRequest(`/app/job/apply/${encryptJobId}`, {}, 'GET').then((resData) => {
         $api.msg('申请成功');
         const jobUrl = jobInfo.value.jobUrl;
         // return window.open(jobUrl);
@@ -486,8 +486,8 @@ function confirmApply() {
 
 // 取消投递
 function cancelApply() {
-    const jobId = jobInfo.value.jobId;
-    $api.createRequest(`/app/job/applyJobCencal`, { jobId }, 'DELETE').then((resData) => {
+    const encryptJobId = jobIdRef.value;
+    $api.createRequest(`/app/job/applyJobCencal`, { encryptJobId }, 'DELETE').then((resData) => {
         $api.msg('取消投递成功');
         showConfirmDialog.value = false;
     });
@@ -495,15 +495,15 @@ function cancelApply() {
 
 // 取消/收藏岗位
 function jobCollection() {
-    const jobId = jobInfo.value.jobId;
+    const encryptJobId = jobIdRef.value;
     if (jobInfo.value.isCollection) {
-        $api.createRequest(`/app/job/collection/${jobId}`, {}, 'DELETE').then((resData) => {
-            getDetail(jobId);
+        $api.createRequest(`/app/job/collection/${encryptJobId}`, {}, 'DELETE').then((resData) => {
+            getDetail(encryptJobId);
             $api.msg('取消收藏成功');
         });
     } else {
-        $api.createRequest(`/app/job/collection/${jobId}`, {}, 'POST').then((resData) => {
-            getDetail(jobId);
+        $api.createRequest(`/app/job/collection/${encryptJobId}`, {}, 'POST').then((resData) => {
+            getDetail(encryptJobId);
             $api.msg('收藏成功');
         });
     }
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index cdf4c13..cc9cf77 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -304,8 +304,14 @@
                         :value="list"
                     >
                         <view v-for="(job, index) in list" :key="index" :slot="`slot${index}`">
-                            <view class="item btn-feel" v-if="!job.recommend">
-                                <view class="falls-card" :class="{ 'disabled-card': Number(job.jobStatus) === 1 }" @click="nextDetail(job)">
+                            <view class="item" v-if="!job.recommend">
+                                <view 
+                                    class="falls-card" 
+                                    :class="{ 
+                                        'disabled-card': Number(job.isPublish) === 0
+                                    }" 
+                                    @click="Number(job.isPublish) === 1 ? nextDetail(job) : null"
+                                >
                                     <view class="falls-card-pay">
                                         <view class="fl_1 falls-card-title">{{ job.jobTitle }}</view>
                                         <view class="fr_1 pay-text">
@@ -357,10 +363,13 @@
                                         <view class="fr-1" v-if="job.regionName">
                                             地区：{{ job.regionName }}
                                         </view>
-                                            
+                                    </view>
+                                    <!-- 未通过审核状态显示 -->
+                                    <view class="unpublished-badge" v-if="Number(job.isPublish) === 0">
+                                        未通过审核
                                     </view>
                                     <!-- 招聘者显示上下架开关 -->
-                                    <view class="falls-card-actions" v-if="isRecruiter">
+                                    <view class="falls-card-actions" v-if="isRecruiter && Number(job.isPublish) === 1">
                                         <view class="job-status-switch" @click.stop="toggleJobStatus(job)">
                                             <view class="switch-track" :class="{ 'active': Number(job.jobStatus) === 0 }">
                                                 <view class="switch-thumb" :class="{ 'active': Number(job.jobStatus) === 0 }"></view>
@@ -401,8 +410,14 @@
                         :value="list"
                     >
                         <template v-slot:default="job">
-                            <view class="item btn-feel" v-if="!job.recommend">
-                                <view class="falls-card" :class="{ 'disabled-card': Number(job.jobStatus) === 1 }" @click="nextDetail(job)">
+                            <view class="item" v-if="!job.recommend">
+                                <view 
+                                    class="falls-card" 
+                                    :class="{ 
+                                        'disabled-card': (Number(job.jobStatus) === 1 || Number(job.isPublish) === 0) && currentUserType !== 0 
+                                    }" 
+                                    @click="Number(job.isPublish) === 1 ? nextDetail(job) : null"
+                                >
                                     <view class="falls-card-pay">
                                         <view class="fl_1 falls-card-title">{{ job.jobTitle }}</view>
                                         <view class="fr_1 pay-text">
@@ -450,10 +465,13 @@
                                         <view class="fr-1" v-if="job.regionName">
                                             地区：{{ job.regionName }}
                                         </view>
-                                            
+                                    </view>
+                                    <!-- 未通过审核状态显示 -->
+                                    <view class="unpublished-badge" v-if="Number(job.isPublish) === 0">
+                                        未通过审核
                                     </view>
                                     <!-- 招聘者显示上下架开关 -->
-                                    <view class="falls-card-actions" v-if="isRecruiter">
+                                    <view class="falls-card-actions" v-if="isRecruiter && Number(job.isPublish) === 1">
                                         <view class="job-status-switch" @click.stop="toggleJobStatus(job)">
                                             <view class="switch-track" :class="{ 'active': Number(job.jobStatus) === 0 }">
                                                 <view class="switch-thumb" :class="{ 'active': Number(job.jobStatus) === 0 }"></view>
@@ -578,6 +596,15 @@ const shouldShowCompanyCard = computed(() => {
     return companyInfo.name && companyInfo.name.trim() !== '';
 });
 
+// 计算当前用户类型
+const currentUserType = computed(() => {
+    // 优先从store获取，如果为空则从缓存获取
+    const storeIsCompanyUser = userInfo.value?.isCompanyUser;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedIsCompanyUser = cachedUserInfo.isCompanyUser;
+    return storeIsCompanyUser !== undefined ? Number(storeIsCompanyUser) : Number(cachedIsCompanyUser);
+});
+
 // 计算是否显示企业用户内容
 const shouldShowCompanyContent = computed(() => {
     // 未登录时不显示企业内容
@@ -1065,7 +1092,7 @@ function clearfindJob(job) {
 }
 
 function nextDetail(job) {
-    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`);
+    navTo(`/packageA/pages/post/post?encryptJobId=${encodeURIComponent(job.encryptJobId)}`);
 }
 
 function navToService(serviceType) {
@@ -1216,7 +1243,6 @@ function getJobRecommend(type = 'add') {
         sessionId: useUserStore().seesionId,
         ...pageState.search,
         ...conditionSearch.value,
-        isPublish: 1,
     };
     // 当选中零工市场(4)或疆外(3)时，order参数传递0
     if (pageState.search.order === 3 || pageState.search.order === 4) {
@@ -1231,9 +1257,11 @@ function getJobRecommend(type = 'add') {
     // 只有企业用户(isCompanyUser=0)才添加current字段
     if (userType === 0) {
         params.current = pageNull.value;
+        // 企业用户不传递isPublish字段
     } else {
-        // 求职者只显示已上架的岗位（jobStatus=0）
+        // 求职者只显示已上架且通过审核的岗位（jobStatus=0, isPublish=1）
         params.jobStatus = 0;
+        params.isPublish = 1;
     }
     let comd = { recommend: true, jobCategory: '', tip: '确认你的兴趣，为您推荐更多合适的岗位' };
     $api.createRequest('/app/job/recommend', params).then((resData) => {
@@ -1315,9 +1343,10 @@ function getJobList(type = 'add') {
     const cachedIsCompanyUser = cachedUserInfo.isCompanyUser;
     const userType = storeIsCompanyUser !== undefined ? Number(storeIsCompanyUser) : Number(cachedIsCompanyUser);
     
-    // 如果不是企业用户（求职者），只显示已上架的岗位
+    // 如果不是企业用户（求职者），只显示已上架且通过审核的岗位
     if (userType !== 0) {
         params.jobStatus = 0;
+        params.isPublish = 1;
     }
 
     $api.createRequest('/app/job/list', params).then((resData) => {
@@ -1344,7 +1373,7 @@ function getJobList(type = 'add') {
 }
 
 // 上架岗位
-const jobUp = (jobId) => {
+const jobUp = (encryptJobId) => {
     if (!checkLogin()) return;
     
     uni.showLoading({
@@ -1352,7 +1381,7 @@ const jobUp = (jobId) => {
         mask: true
     });
     
-    $api.createRequest(`/app/job/jobUp/${jobId}`, {}, 'PUT', true).then((res) => {
+    $api.createRequest(`/app/job/jobUp/${encryptJobId}`, {}, 'PUT', true).then((res) => {
         uni.hideLoading();
         $api.msg('上架成功');
         // 刷新数据
@@ -1369,7 +1398,7 @@ const jobUp = (jobId) => {
 };
 
 // 下架岗位
-const jobDown = (jobId) => {
+const jobDown = (encryptJobId) => {
     if (!checkLogin()) return;
     
     uni.showLoading({
@@ -1377,7 +1406,7 @@ const jobDown = (jobId) => {
         mask: true
     });
     
-    $api.createRequest(`/app/job/jobDown/${jobId}`, {}, 'PUT', true).then((res) => {
+    $api.createRequest(`/app/job/jobDown/${encryptJobId}`, {}, 'PUT', true).then((res) => {
         uni.hideLoading();
         $api.msg('下架成功');
         // 刷新数据
@@ -1404,14 +1433,14 @@ const toggleJobStatus = (job) => {
     
     // 根据当前状态决定调用哪个接口
     const isCurrentlyUp = Number(job.jobStatus) === 0; // 0: 已上架, 1: 已下架
-    const apiUrl = isCurrentlyUp ? `/app/job/jobDown/${job.jobId}` : `/app/job/jobUp/${job.jobId}`;
+    const apiUrl = isCurrentlyUp ? `/app/job/jobDown/${job.encryptJobId}` : `/app/job/jobUp/${job.encryptJobId}`;
     
     $api.createRequest(apiUrl, {}, 'PUT', true).then((res) => {
         uni.hideLoading();
         $api.msg(isCurrentlyUp ? '下架成功' : '上架成功');
         
         // 更新本地数据状态，避免立即刷新整个列表
-        const jobIndex = list.value.findIndex(item => item.jobId === job.jobId);
+        const jobIndex = list.value.findIndex(item => item.encryptJobId === job.encryptJobId);
         if (jobIndex !== -1) {
             // 更新状态
             list.value[jobIndex].jobStatus = isCurrentlyUp ? 1 : 0;
@@ -2133,6 +2162,17 @@ defineExpose({ loadData });
                             margin: 4rpx 4rpx 0 0
                             height: 26rpx
                             width: 26rpx
+                    // 未通过审核状态样式
+                    .unpublished-badge
+                        position: absolute
+                        top: 0
+                        right: 0
+                        background-color: #FF4D4F
+                        color: #FFFFFF
+                        font-size: 20rpx
+                        padding: 6rpx 12rpx
+                        border-bottom-left-radius: 16rpx
+                        z-index: 10
 // 推荐卡片
 .recommend-card::before
     position: absolute