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

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>

packageA/pages/post/post.vue

@@ -60,6 +60,14 @@
                     <view class="explain-right button-click" @click="seeExplain">点击查看</view>
                 </view>
             </view>
+            <view class="content-card">
+                <view class="card-title">
+                    <text class="title">工作地点</text>
+                </view>
+                <view class="description">
+                    {{ jobInfo.jobAddress || jobInfo.jobLocation || '暂无地址信息' }}
+                </view>
+            </view>
             <view class="content-card">
                 <view class="card-title">
                     <text class="title">职位描述</text>
@@ -90,7 +98,7 @@
                             <view class="contact-label">联系人：</view>
                             <view class="contact-value">{{ contact.contactPerson }}</view>
                         </view>
-                        <view class="contact-info">
+                        <view class="contact-info" v-if="contact.position">
                             <view class="contact-label">职位：</view>
                             <view class="contact-value">{{ contact.position }}</view>
                         </view>
@@ -127,6 +135,7 @@
                             <span v-if="jobInfo.company?.industry">&nbsp;</span>
                             <dict-Label dictType="scale" :value="jobInfo.company?.scale"></dict-Label>
                         </view>
+
                         <view class="row2">
                             <text>在招</text>
                             <text style="color: #256bfa">{{ companyCount }}</text>
@@ -143,7 +152,7 @@
                     ></map>
                 </view>
             </view>
-            <view class="content-card" v-if="currentUserType !== 0">
+            <view class="content-card jzlfx-card" v-if="currentUserType !== 0">
                 <view class="card-title">
                     <text class="title">竞争力分析</text>
                 </view>
@@ -284,7 +293,7 @@ const showConfirmDialog = ref(false);
 
 onLoad((option) => {
 	console.log(option, 'option');
-    if (option.jobId) {
+    if (option.encryptJobId) {
         initLoad(option);
     }
 });
@@ -294,7 +303,7 @@ onShow(() => {
     // #ifdef H5
     try {
         const option = parseQueryParams(); // 兼容微信内置浏览器
-        if (option.jobId) {
+        if (option.encryptJobId) {
             initLoad(option);
         }
     } catch (e) {
@@ -303,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);
     }
 }
 
@@ -318,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 = [
                     {
@@ -370,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 字段存在，如果不存在则使用默认值
@@ -446,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;
         });
     }
@@ -466,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);
@@ -477,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;
     });
@@ -486,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('收藏成功');
         });
     }
@@ -774,9 +783,9 @@ for i in 0..100
     }
 }
 .content{
-    padding: 0 28rpx
     height: 100%
     padding-top: 28rpx
+    padding-bottom: 28rpx
     .content-top{
         box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
         border-radius: 20rpx 20rpx 20rpx 20rpx;
@@ -825,7 +834,19 @@ for i in 0..100
             color: #64779F;
             border-bottom-left-radius: 20rpx
         }
+        .publish-time{
+            margin-top: 20rpx
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #999999;
+            text-align: right
+        }
     }
+    /* #ifdef H5 */
+    .jzlfx-card{
+        padding-bottom: 90rpx!important;
+    }
+    /* #endif */
     .content-card{
         padding: 24rpx
         margin-top: 28rpx

packageB/notice/index.vue

@@ -42,7 +42,7 @@ import { inject, ref, reactive, onMounted } from "vue";
 const { $api, navTo, navBack, vacanciesTo } = inject("globalFunction");
 import config from "@/config.js";
 import AppLayout from "@/components/AppLayout/AppLayout.vue";
-import CryptoJS from 'crypto-js'
+// import CryptoJS from 'crypto-js'
 
 
 const title = ref("");

packageB/priority/index.vue

@@ -47,7 +47,7 @@ import { onLoad, onShow } from '@dcloudio/uni-app';
 const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction');
 import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
-import CryptoJS from 'crypto-js'
+// import CryptoJS from 'crypto-js'
 
 onLoad(() => {
     // thirdLogin()

packageB/train/index.vue

@@ -57,7 +57,7 @@ import { onLoad, onShow } from '@dcloudio/uni-app';
 const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction');
 import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
-import CryptoJS from 'crypto-js'
+// import CryptoJS from 'crypto-js'
 
 onLoad(() => {
     thirdLogin()

packageB/train/practice/startPracticingList.vue

@@ -66,7 +66,7 @@ import { inject, ref, reactive } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 const { $api, navTo, navBack } = inject('globalFunction');
 import config from "@/config.js"
-import CryptoJS from 'crypto-js'
+// import CryptoJS from 'crypto-js'
 
 // state
 const title = ref('');

packageB/train/video/videoList.vue

@@ -63,7 +63,7 @@ import { inject, ref, reactive } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 const { $api, navTo, navBack } = inject('globalFunction');
 import config from "@/config.js"
-import CryptoJS from 'crypto-js'
+// import CryptoJS from 'crypto-js'
 
 // state
 const title = ref('');

pages/careerfair/careerfair.vue

@@ -163,7 +163,7 @@
 	} from "@/utils/tabbarManager";
 
 	import config from "@/config.js";
-	import CryptoJS from 'crypto-js'
+	// import CryptoJS from 'crypto-js'
 	const {
 		longitudeVal,
 		latitudeVal

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">
@@ -354,13 +360,16 @@
                                         <view class="fl_1">
                                             {{ job.companyName }}
                                         </view>
-                                        <view class="fr-1">
-                                            地区：{{ config.appInfo.areaName }}
+                                        <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">
@@ -447,13 +462,16 @@
                                         <view class="fl_1">
                                             {{ job.companyName }}
                                         </view>
-                                        <view class="fr-1">
-                                            地区：{{ config.appInfo.areaName }}
+                                        <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

pages/mine/company-mine.vue

@@ -43,12 +43,23 @@
                     <uni-icons type="right" size="14" color="#909090"></uni-icons>
                 </view>
             </view>
-            <view class="service-item btn-feel">
+            <view class="service-item btn-feel" @click="openReminderSettings">
                 <view class="service-left">
                     <uni-icons type="notification" size="20" color="#256BFA"></uni-icons>
                     <text class="service-text">通知与提醒</text>
                 </view>
-                <view class="service-status">已开启</view>
+                <view class="service-status">
+                    <switch class="reminder-switch" :checked="reminderEnabled" @change="toggleReminder"></switch>
+                </view>
+            </view>
+            <view class="service-item btn-feel" @click="openFeedbackPopup">
+                <view class="service-left">
+                    <uni-icons type="chat" size="20" color="#256BFA"></uni-icons>
+                    <text class="service-text">评论与反馈</text>
+                </view>
+                <view class="service-status">
+                    <uni-icons type="right" size="14" color="#909090"></uni-icons>
+                </view>
             </view>
 			<view class="service-item btn-feel" @click="handleInstitutionClick(1)">
 			    <view class="service-left">
@@ -97,6 +108,39 @@
                 @close="close"
             ></uni-popup-dialog>
         </uni-popup>
+        <!-- 提醒设置弹窗 -->
+        <uni-popup ref="reminderPopup" type="center">
+            <view class="reminder-popup">
+                <view class="reminder-popup-title">提醒设置</view>
+                <view class="reminder-popup-content">
+                    <view class="reminder-item" v-for="(item, index) in reminderOptions" :key="index">
+                        <view class="reminder-item-label">{{ item.label }}</view>
+                        <radio :value="item.value" :checked="reminderFrequency === item.value" @change="handleFrequencyChange"></radio>
+                    </view>
+                </view>
+                <view class="reminder-popup-footer">
+                    <button class="reminder-popup-btn" @click="closeReminderPopup">确定</button>
+                </view>
+            </view>
+        </uni-popup>
+        <!-- 评论与反馈弹窗 -->
+        <uni-popup ref="feedbackPopup" type="center">
+            <view class="feedback-popup">
+                <view class="feedback-popup-title">评论与反馈</view>
+                <view class="feedback-popup-content">
+                    <textarea class="feedback-textarea" v-model="feedbackContent" placeholder="请输入您的评论或反馈..."></textarea>
+                    <view class="feedback-rating">
+                        <text class="feedback-rating-label">满意度评分：</text>
+                        <view class="feedback-stars">
+                            <text class="feedback-star" v-for="i in 5" :key="i" @click="setRating(i)" :class="{ 'active': rating >= i }">★</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="feedback-popup-footer">
+                    <button class="feedback-popup-btn" @click="submitFeedback">提交</button>
+                </view>
+            </view>
+        </uni-popup>
     </AppLayout>
 </template>
 
@@ -107,6 +151,21 @@ import useUserStore from '@/stores/useUserStore';
 
 const { $api, navTo } = inject('globalFunction');
 const popup = ref(null);
+const reminderPopup = ref(null);
+const feedbackPopup = ref(null);
+
+// 提醒设置
+const reminderEnabled = ref(true);
+const reminderFrequency = ref('realtime');
+const reminderOptions = ref([
+    { label: '实时提醒', value: 'realtime' },
+    { label: '每小时提醒', value: 'hourly' },
+    { label: '每天提醒', value: 'daily' }
+]);
+
+// 评论与反馈
+const feedbackContent = ref('');
+const rating = ref(0);
 
 // 企业信息数据
 const companyInfo = reactive({
@@ -196,6 +255,57 @@ function getCompanyInfo() {
         companyInfo.isVerified = false;
     }
 }
+
+// 切换提醒开启/关闭状态
+function toggleReminder(e) {
+    reminderEnabled.value = e.detail.value;
+}
+
+// 打开提醒设置弹窗
+function openReminderSettings() {
+    reminderPopup.value.open();
+}
+
+// 关闭提醒设置弹窗
+function closeReminderPopup() {
+    reminderPopup.value.close();
+}
+
+// 处理提醒频率变化
+function handleFrequencyChange(e) {
+    reminderFrequency.value = e.detail.value;
+}
+
+// 打开评论与反馈弹窗
+function openFeedbackPopup() {
+    feedbackPopup.value.open();
+}
+
+// 关闭评论与反馈弹窗
+function closeFeedbackPopup() {
+    feedbackPopup.value.close();
+}
+
+// 设置评分
+function setRating(score) {
+    rating.value = score;
+}
+
+// 提交反馈
+function submitFeedback() {
+    // 模拟提交成功
+    uni.showToast({
+        title: '反馈提交成功',
+        icon: 'success'
+    });
+    // 清空表单
+    feedbackContent.value = '';
+    rating.value = 0;
+    // 延迟关闭弹窗，确保用户能看到成功提示
+    setTimeout(() => {
+        closeFeedbackPopup();
+    }, 1000);
+}
 </script>
 
 <style lang="stylus" scoped>
@@ -331,4 +441,137 @@ function getCompanyInfo() {
         transform: scale(0.98);
     }
 }
+
+// 提醒开关样式
+.reminder-switch {
+    transform: scale(0.8);
+}
+
+// 提醒设置弹窗样式
+.reminder-popup {
+    width: 600rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    padding: 32rpx;
+    
+    .reminder-popup-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333333;
+        text-align: center;
+        margin-bottom: 32rpx;
+    }
+    
+    .reminder-popup-content {
+        margin-bottom: 40rpx;
+        
+        .reminder-item {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 24rpx 0;
+            border-bottom: 1rpx solid #F0F0F0;
+            
+            &:last-child {
+                border-bottom: none;
+            }
+            
+            .reminder-item-label {
+                font-size: 28rpx;
+                color: #333333;
+            }
+        }
+    }
+    
+    .reminder-popup-footer {
+        display: flex;
+        justify-content: center;
+        
+        .reminder-popup-btn {
+            width: 100%;
+            height: 80rpx;
+            background: #256BFA;
+            color: #FFFFFF;
+            font-size: 28rpx;
+            font-weight: 500;
+            border-radius: 10rpx;
+            border: none;
+        }
+    }
+}
+
+// 评论与反馈弹窗样式
+.feedback-popup {
+    width: 600rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    padding: 32rpx;
+    
+    .feedback-popup-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333333;
+        text-align: center;
+        margin-bottom: 32rpx;
+    }
+    
+    .feedback-popup-content {
+        margin-bottom: 40rpx;
+        
+        .feedback-textarea {
+            width: 100%;
+            height: 200rpx;
+            border: 1rpx solid #E5E5E5;
+            border-radius: 10rpx;
+            padding: 20rpx;
+            font-size: 28rpx;
+            color: #333333;
+            resize: none;
+            margin-bottom: 32rpx;
+            box-sizing: border-box;
+        }
+        
+        .feedback-rating {
+            display: flex;
+            align-items: center;
+            
+            .feedback-rating-label {
+                font-size: 28rpx;
+                color: #333333;
+                margin-right: 20rpx;
+            }
+            
+            .feedback-stars {
+                display: flex;
+                
+                .feedback-star {
+                    font-size: 40rpx;
+                    color: #E5E5E5;
+                    margin-right: 16rpx;
+                    cursor: pointer;
+                    
+                    &.active {
+                        color: #FFD700;
+                    }
+                }
+            }
+        }
+    }
+    
+    .feedback-popup-footer {
+        display: flex;
+        justify-content: center;
+        
+        .feedback-popup-btn {
+            width: 100%;
+            height: 80rpx;
+            background: #256BFA;
+            color: #FFFFFF;
+            font-size: 28rpx;
+            font-weight: 500;
+            border-radius: 10rpx;
+            border: none;
+        }
+    }
+}
 </style>

pages/mine/mine.vue

@@ -105,12 +105,23 @@
                         <uni-icons color="#909090" type="right" size="14"></uni-icons>
                     </view>
                 </view>
-                <view class="main-row btn-feel">
+                <view class="main-row btn-feel" @click="openReminderSettings">
                     <view class="row-left">
                         <image class="left-img" src="@/static/icon/server4.png"></image>
                         <text class="left-text">通知与提醒</text>
                     </view>
-                    <view class="row-right">已开启</view>
+                    <view class="row-right">
+                        <switch class="reminder-switch" :checked="reminderEnabled" @change="toggleReminder"></switch>
+                    </view>
+                </view>
+                <view class="main-row btn-feel" @click="openFeedbackPopup">
+                    <view class="row-left">
+                        <image class="left-img" src="@/static/icon/feedback.png"></image>
+                        <text class="left-text">评论与反馈</text>
+                    </view>
+                    <view class="row-right">
+                        <uni-icons color="#909090" type="right" size="14"></uni-icons>
+                    </view>
                 </view>
             </view>
             <view v-if="userType === 2" class="card-help button-click" @click="goToJobHelper">求职帮</view>
@@ -126,6 +137,39 @@
                     @close="close"
                 ></uni-popup-dialog>
             </uni-popup>
+            <!-- 提醒设置弹窗 -->
+            <uni-popup ref="reminderPopup" type="center">
+                <view class="reminder-popup">
+                    <view class="reminder-popup-title">提醒设置</view>
+                    <view class="reminder-popup-content">
+                        <view class="reminder-item" v-for="(item, index) in reminderOptions" :key="index">
+                            <view class="reminder-item-label">{{ item.label }}</view>
+                            <radio :value="item.value" :checked="reminderFrequency === item.value" @change="handleFrequencyChange"></radio>
+                        </view>
+                    </view>
+                    <view class="reminder-popup-footer">
+                        <button class="reminder-popup-btn" @click="closeReminderPopup">确定</button>
+                    </view>
+                </view>
+            </uni-popup>
+            <!-- 评论与反馈弹窗 -->
+            <uni-popup ref="feedbackPopup" type="center">
+                <view class="feedback-popup">
+                    <view class="feedback-popup-title">评论与反馈</view>
+                    <view class="feedback-popup-content">
+                        <textarea class="feedback-textarea" v-model="feedbackContent" placeholder="请输入您的评论或反馈..."></textarea>
+                        <view class="feedback-rating">
+                            <text class="feedback-rating-label">满意度评分：</text>
+                            <view class="feedback-stars">
+                                <text class="feedback-star" v-for="i in 5" :key="i" @click="setRating(i)" :class="{ 'active': rating >= i }">★</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="feedback-popup-footer">
+                        <button class="feedback-popup-btn" @click="submitFeedback">提交</button>
+                    </view>
+                </view>
+            </uni-popup>
         </view>
         <template #footer>
             <!-- 统一使用系统tabBar -->
@@ -141,9 +185,24 @@ const { $api, navTo } = inject('globalFunction');
 import useUserStore from '@/stores/useUserStore';
 import { tabbarManager } from '@/utils/tabbarManager';
 const popup = ref(null);
+const reminderPopup = ref(null);
+const feedbackPopup = ref(null);
 const { userInfo, Completion } = storeToRefs(useUserStore());
 const counts = ref({});
 
+// 提醒设置
+const reminderEnabled = ref(true);
+const reminderFrequency = ref('realtime');
+const reminderOptions = ref([
+    { label: '实时提醒', value: 'realtime' },
+    { label: '每小时提醒', value: 'hourly' },
+    { label: '每天提醒', value: 'daily' }
+]);
+
+// 评论与反馈
+const feedbackContent = ref('');
+const rating = ref(0);
+
 // 获取用户类型，参考首页的实现方式
 const userType = computed(() => {
     // 优先从store获取，如果为空则从缓存获取
@@ -236,6 +295,57 @@ function goToMessage(){
 	navTo('/pages/msglog/msglog');
 }
 
+// 切换提醒开启/关闭状态
+function toggleReminder(e) {
+    reminderEnabled.value = e.detail.value;
+}
+
+// 打开提醒设置弹窗
+function openReminderSettings() {
+    reminderPopup.value.open();
+}
+
+// 关闭提醒设置弹窗
+function closeReminderPopup() {
+    reminderPopup.value.close();
+}
+
+// 处理提醒频率变化
+function handleFrequencyChange(e) {
+    reminderFrequency.value = e.detail.value;
+}
+
+// 打开评论与反馈弹窗
+function openFeedbackPopup() {
+    feedbackPopup.value.open();
+}
+
+// 关闭评论与反馈弹窗
+function closeFeedbackPopup() {
+    feedbackPopup.value.close();
+}
+
+// 设置评分
+function setRating(score) {
+    rating.value = score;
+}
+
+// 提交反馈
+function submitFeedback() {
+    // 模拟提交成功
+    uni.showToast({
+        title: '反馈提交成功',
+        icon: 'success'
+    });
+    // 清空表单
+    feedbackContent.value = '';
+    rating.value = 0;
+    // 延迟关闭弹窗，确保用户能看到成功提示
+    setTimeout(() => {
+        closeFeedbackPopup();
+    }, 1000);
+}
+
 </script>
 
 <style lang="stylus" scoped>
@@ -470,4 +580,137 @@ function goToMessage(){
         margin-left: 20rpx;
     }
 }
+
+// 提醒设置弹窗样式
+.reminder-popup {
+    width: 600rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    padding: 32rpx;
+    
+    .reminder-popup-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333333;
+        text-align: center;
+        margin-bottom: 32rpx;
+    }
+    
+    .reminder-popup-content {
+        margin-bottom: 40rpx;
+        
+        .reminder-item {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 24rpx 0;
+            border-bottom: 1rpx solid #F0F0F0;
+            
+            &:last-child {
+                border-bottom: none;
+            }
+            
+            .reminder-item-label {
+                font-size: 28rpx;
+                color: #333333;
+            }
+        }
+    }
+    
+    .reminder-popup-footer {
+        display: flex;
+        justify-content: center;
+        
+        .reminder-popup-btn {
+            width: 100%;
+            height: 80rpx;
+            background: #256BFA;
+            color: #FFFFFF;
+            font-size: 28rpx;
+            font-weight: 500;
+            border-radius: 10rpx;
+            border: none;
+        }
+    }
+}
+
+// 提醒开关样式
+.reminder-switch {
+    transform: scale(0.8);
+}
+
+// 评论与反馈弹窗样式
+.feedback-popup {
+    width: 600rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    padding: 32rpx;
+    
+    .feedback-popup-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333333;
+        text-align: center;
+        margin-bottom: 32rpx;
+    }
+    
+    .feedback-popup-content {
+        margin-bottom: 40rpx;
+        
+        .feedback-textarea {
+            width: 100%;
+            height: 200rpx;
+            border: 1rpx solid #E5E5E5;
+            border-radius: 10rpx;
+            padding: 20rpx;
+            font-size: 28rpx;
+            color: #333333;
+            resize: none;
+            margin-bottom: 32rpx;
+            box-sizing: border-box;
+        }
+        
+        .feedback-rating {
+            display: flex;
+            align-items: center;
+            
+            .feedback-rating-label {
+                font-size: 28rpx;
+                color: #333333;
+                margin-right: 20rpx;
+            }
+            
+            .feedback-stars {
+                display: flex;
+                
+                .feedback-star {
+                    font-size: 40rpx;
+                    color: #E5E5E5;
+                    margin-right: 16rpx;
+                    cursor: pointer;
+                    
+                    &.active {
+                        color: #FFD700;
+                    }
+                }
+            }
+        }
+    }
+    
+    .feedback-popup-footer {
+        display: flex;
+        justify-content: center;
+        
+        .feedback-popup-btn {
+            width: 100%;
+            height: 80rpx;
+            background: #256BFA;
+            color: #FFFFFF;
+            font-size: 28rpx;
+            font-weight: 500;
+            border-radius: 10rpx;
+            border: none;
+        }
+    }
+}
 </style>

stores/useCareerPathStore.js

@@ -1,33 +1,43 @@
 import { computed, ref, watch } from 'vue';
-import { defineStore } from 'pinia';
+import { defineStore, storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
 import { getCurrentPosition, getPath, getPathDetail } from '@/apiRc/service/careerPath';
 
 
 export const useCareerPathStore = defineStore('career-path', () => {
+    const { userInfo: ui } = storeToRefs(useUserStore());
     const userInfo = ref({
         userName: '',
         professions: [],
         skills: []
     });
 
-    try {
-        const data = uni.getStorageSync('userInfo');
+    watch(() => ui.value, () => {
+        if (!ui.value) {
+            return;
+        }
+        try {
+            const { jobTitle, appSkillsList } = ui.value;
 
-        userInfo.value.professions = data.jobTitle.map((d) => {
-            return {
-                label: d,
-                value: d
-            };
-        });
-        userInfo.value.skills = data.appSkillsList.map((d) => {
-            return {
-                label: d.name,
-                value: d.name
-            };
-        });
-    } catch (e) {
-        console.warn(e);
-    }
+            userInfo.value.professions = jobTitle.map((d) => {
+                return {
+                    label: d,
+                    value: d
+                };
+            });
+            userInfo.value.skills = appSkillsList.map((d) => {
+                return {
+                    label: d.name,
+                    value: d.name
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    }, {
+        immediate: true,
+        deep: true
+    });
 
     const professionIndex = ref(0);
     const profession = ref('');

stores/useCareerRecommendationStore.js

@@ -1,33 +1,43 @@
 import { computed, ref, watch } from 'vue';
-import { defineStore } from 'pinia';
+import { defineStore, storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
 import { getProfessions, getRecommend, getSkillTags } from '@/apiRc/service/careerRecommendation';
 
 
 export const useCareerRecommendationStore = defineStore('career-recommendation', () => {
+    const { userInfo: ui } = storeToRefs(useUserStore());
     const userInfo = ref({
         userName: '',
         professions: [],
         skills: []
     });
 
-    try {
-        const data = uni.getStorageSync('userInfo');
+    watch(() => ui.value, () => {
+        if (!ui.value) {
+            return;
+        }
+        try {
+            const { jobTitle, appSkillsList } = ui.value;
 
-        userInfo.value.professions = data.jobTitle.map((d) => {
-            return {
-                label: d,
-                value: d
-            };
-        });
-        userInfo.value.skills = data.appSkillsList.map((d) => {
-            return {
-                label: d.name,
-                value: d.name
-            };
-        });
-    } catch (e) {
-        console.warn(e);
-    }
+            userInfo.value.professions = jobTitle.map((d) => {
+                return {
+                    label: d,
+                    value: d
+                };
+            });
+            userInfo.value.skills = appSkillsList.map((d) => {
+                return {
+                    label: d.name,
+                    value: d.name
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    }, {
+        immediate: true,
+        deep: true
+    });
 
     const professionIndex = ref(0);
     const profession = ref('');
@@ -144,7 +154,7 @@ export const useCareerRecommendationStore = defineStore('career-recommendation',
 
     const eventProfession = (e) => {
         professionIndex.value = Number(e.detail.value);
-        const item = professionsRef.value[e.detail.value]
+        const item = professionsRef.value[ e.detail.value ];
         profession.value = item.value;
         professionLabel.value = item.label;
     };

stores/useSkillDevelopmentStore.js

@@ -1,34 +1,44 @@
 import { computed, ref, watch } from 'vue';
-import { defineStore } from 'pinia';
+import { defineStore, storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
 import { getCurrentPosition, getPath } from '@/apiRc/service/careerPath';
 import { getCareerPath, getSkillResult } from '@/apiRc/service/skillDevelopment';
 
 
 export const useSkillDevelopmentStore = defineStore('skill-development', () => {
+    const { userInfo: ui } = storeToRefs(useUserStore());
     const userInfo = ref({
         userName: '',
         professions: [],
         skills: []
     });
 
-    try {
-        const data = uni.getStorageSync('userInfo');
+    watch(() => ui.value, () => {
+        if (!ui.value) {
+            return;
+        }
+        try {
+            const { jobTitle, appSkillsList } = ui.value;
 
-        userInfo.value.professions = data.jobTitle.map((d) => {
-            return {
-                label: d,
-                value: d
-            };
-        });
-        userInfo.value.skills = data.appSkillsList.map((d) => {
-            return {
-                label: d.name,
-                value: d.name
-            };
-        });
-    } catch (e) {
-        console.warn(e);
-    }
+            userInfo.value.professions = jobTitle.map((d) => {
+                return {
+                    label: d,
+                    value: d
+                };
+            });
+            userInfo.value.skills = appSkillsList.map((d) => {
+                return {
+                    label: d.name,
+                    value: d.name
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    }, {
+        immediate: true,
+        deep: true
+    });
 
     const professionIndex = ref(0);
     const profession = ref('');