Merge remote-tracking branch 'origin/main'

This reverts commit 34cad2543d.

apiRc/jobRecommend.js

@@ -1,33 +0,0 @@
-/*
- * @Date: 2025-11-12
- * @Description: 职业推荐相关接口
- */
-import request from '@/utilsRc/request'
-
-function createFormData(payload = {}) {
-  if (typeof FormData !== 'undefined') {
-    const formData = new FormData()
-    Object.keys(payload).forEach(key => {
-      const value = payload[key]
-      if (value !== undefined && value !== null && value !== '') {
-        formData.append(key, value)
-      }
-    })
-    return formData
-  }
-  return payload
-}
-
-export function recommendJob(data) {
-  const params = {};
-  if (data?.jobName !== undefined && data?.jobName !== null && data?.jobName !== '') {
-    params.jobName = String(data.jobName);
-  }
-
-  return request({
-    url: '/job/recommendJobByJobName',
-    method: 'get',
-    params: params,
-    baseUrlType: 'zytp'
-  })
-}

apiRc/jobSkill.js

@@ -1,45 +0,0 @@
-/*
- * @Date: 2025-11-12
- * @Description: 职业技能相关接口
- */
-import request from '@/utilsRc/request'
-
-export function getJobSkillDetail(params) {
-  return request({
-    url: '/jobSkillDet/getJobSkillDet',
-    method: 'get',
-    params,
-    baseUrlType: 'zytp'
-  })
-}
-
-// 暂未使用 - 如果需要在 CareerPath.vue 中点击路径职位查看详细技能信息时使用
-// 使用场景：获取职业路径中某个职位的详细技能信息（包含技能分数、类型等）
-// export function getJobPathSkill(data) {
-//   let formData
-//   if (typeof FormData !== 'undefined') {
-//     formData = new FormData()
-//     if (data?.pathId !== undefined && data?.pathId !== null) {
-//       formData.append('pathId', data.pathId)
-//     }
-//     if (data?.currentJobName !== undefined && data?.currentJobName !== null) {
-//       formData.append('currentJobName', data.currentJobName)
-//     }
-//   } else {
-//     formData = {
-//       pathId: data?.pathId ?? '',
-//       currentJobName: data?.currentJobName ?? ''
-//     }
-//   }
-
-//   return request({
-//     url: '/jobSkillDet/getJobPathSkill',
-//     method: 'post',
-//     data: formData,
-//     baseUrlType: 'zytp',
-//     header: {
-//       'content-type': 'multipart/form-data'
-//     }
-//   })
-// }
-

apiRc/login.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2025-10-31 11:06:15
  * @LastEditors: shirlwang
- * @LastEditTime: 2025-11-03 15:51:28
+ * @LastEditTime: 2025-12-16 16:29:33
  */
 import request from '@/utilsRc/request'
 
@@ -13,6 +13,14 @@ export function login(data) {
     params: data,
   })
 }
+// 登录方法
+export function loginByUserId(data) {
+  return request({
+    method: 'get',
+    url: '/ksSso/getTjmhTokenById?userId='+data,
+    // params: data,
+  })
+}
 export function smsLogin(data) {
   return request({
     method: 'post',

apiRc/service/careerPath.js

@@ -0,0 +1,37 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-12-23 17:40:11
+ * @Description: 职业路径相关接口
+ */
+import request from '@/utilsRc/request'
+
+// 获取当前职位
+export function getCurrentPosition(query) {
+  return request({
+    url: '/jobPath/getJob',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取路径列表
+export function getPath(query) {
+  return request({
+    url: '/jobPath/getJobPathList',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取路径详情
+export function getPathDetail(query) {
+  return request({
+    url: '/jobPath/getJobPathById',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}

apiRc/service/careerRecommendation.js

@@ -0,0 +1,37 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-12-23 17:40:11
+ * @Description: 职业推荐相关接口
+ */
+import request from '@/utilsRc/request'
+
+// 获取职业列表
+export function getProfessions(query) {
+  return request({
+    url: '/jobSimilarity/getJob',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取技能标签
+export function getSkillTags(query) {
+  return request({
+    url: '/jobSkillDet/getJobSkill',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取推荐职业
+export function getRecommend(query) {
+  return request({
+    url: '/jobSimilarity/recommendJobByJobName',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}

apiRc/service/jobPath.js

@@ -16,17 +16,19 @@ export function getJobPathPage(params) {
 
 // 根据职业路径ID获取详情
 export function getJobPathDetail(params) {
+    const {startJobId, endJobId} = params;
   const requestParams = {};
-  if (params?.jobPathId !== undefined && params?.jobPathId !== null && params?.jobPathId !== '') {
-    requestParams.id = params.jobPathId;
-  } else if (params?.id !== undefined && params?.id !== null && params?.id !== '') {
-    requestParams.id = params.id;
+  if (startJobId !== undefined && startJobId !== null && startJobId !== '') {
+    requestParams.startJobId = startJobId;
   }
-  
-  if (!requestParams.id) {
-    return Promise.reject('缺少必需的 id 参数');
+  if (endJobId !== undefined && endJobId !== null && endJobId !== '') {
+    requestParams.endJobId = endJobId;
   }
-  
+
+  if (!startJobId || !endJobId) {
+    return Promise.reject('缺少必需的 startJobId 和 endJobId 参数');
+  }
+
   return request({
     url: '/jobPath/getJobPathById',
     method: 'get',

apiRc/service/jobRecommend.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2024-09-25 11:14:29
  * @LastEditors: shirlwang
- * @LastEditTime: 2025-11-04 08:56:59
+ * @LastEditTime: 2025-12-23 17:40:11
  */
 import request from '@/utilsRc/request'
 
@@ -17,7 +17,7 @@ export function listJobRecommend(query) {
 export function getWorkListReq(query) {
   return request({
     // url: '/personnel/personBaseInfo/postRecommend',
-    url: '/company/unitPostInfo/postElectedList',
+    url: '/manage/info/postElectedList',
     method: 'get',
     params: query
   })
@@ -43,7 +43,7 @@ export function addJobRecommend(data) {
 //岗位推荐保存和办结
 export function saveJobRecommend(data) {
   return request({
-    url: '/process/processJobRecommend/create',
+    url: '/process/processJobRecommend/createJob',
     method: 'post',
     data: data
   })
@@ -70,17 +70,22 @@ export function delJobRecommend(ids) {
 export function getAddedJobs(params) {
   return request({
     // url: '/company/postDeliverInfo/list',
-    url: '/company/unitPostInfo/no/permission/list',
+    url: '/manage/info/no/permission/list',
     method: 'get',
     params,
   })
 }
 
-// // 获取推荐岗位
-// export function getAddedJobs(params) {
-//   return request({
-//     url: '/personnel/personBaseInfo/postRecommend',
-//     method: 'get',
-//     params,
-//   })
-// }
+export function recommendJob(data) {
+    const params = {};
+    if (data?.jobName !== undefined && data?.jobName !== null && data?.jobName !== '') {
+        params.jobName = String(data.jobName);
+    }
+
+    return request({
+        url: '/job/recommendJobByJobName',
+        method: 'get',
+        params: params,
+        baseUrlType: 'zytp'
+    })
+}

apiRc/service/jobSkill.js

@@ -0,0 +1,24 @@
+/*
+ * @Date: 2025-11-12
+ * @Description: 职业技能相关接口
+ */
+import request from '@/utilsRc/request'
+
+export function getJobSkillDetail(params) {
+  return request({
+    url: '/jobSkillDet/getJobSkillDet',
+    method: 'get',
+    params,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取技能权重
+export function getJobSkillWeight(params) {
+  return request({
+    url: '/jobSkillDet/getJobSkillWeight',
+    method: 'get',
+    params,
+    baseUrlType: 'zytp'
+  })
+}

apiRc/service/skillDevelopment.js

@@ -0,0 +1,27 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-12-23 17:40:11
+ * @Description: 技能发展相关接口
+ */
+import request from '@/utilsRc/request'
+
+// 获取技能信息
+export function getCareerPath(query) {
+  return request({
+    url: '/jobPath/getJobPathJobList',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取技能信息
+export function getSkillResult(query) {
+  return request({
+    url: '/jobDimScore/getJobDimScoreList',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}

apiRc/user/user.js

@@ -1,15 +1,14 @@
 /*
  * @Date: 2025-01-XX
- * @LastEditors: 
- * @LastEditTime: 
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-12-16 16:35:06
  */
 import request from '@/utilsRc/request'
 
 // 获取用户信息（职业规划推荐用）
 export function appUserInfo() {
   return request({
-    url: '/app/user/appUserInfo',
-    method: 'get',
-    baseUrlType: 'user' // 使用用户接口专用baseUrl
+    fullUrl: 'https://www.xjksly.cn/api/ks/app/user/appUserInfo',
+    method: 'get'
   })
 }

common/globalFunction.js

@@ -50,7 +50,8 @@ const prePage = () => {
     return prePage.$vm;
 }
 
-export const urls ='http://10.110.145.145/images/train/'
+// export const urls ='http://10.110.145.145/images/train/'
+export const urls ='https://www.xjksly.cn/images/train/'
 
 /**
  * 页面跳转封装，支持 query 参数传递和返回回调
@@ -68,9 +69,28 @@ export const navTo = function(url, {
     const userStore = useUserStore();
 
     if (needLogin && !userStore.hasLogin) {
-        uni.navigateTo({
-            url: '/pages/complete-info/complete-info'
-        });
+        const pages = getCurrentPages();
+        if (pages.length >= 10) {
+            uni.redirectTo({
+                url: '/packageA/pages/complete-info/complete-info',
+                fail: (err) => {
+                    console.error('页面跳转失败:', err);
+                }
+            });
+        } else {
+            uni.navigateTo({
+                url: '/packageA/pages/complete-info/complete-info',
+                fail: (err) => {
+                    console.error('页面跳转失败:', err);
+                    uni.redirectTo({
+                        url: '/packageA/pages/complete-info/complete-info',
+                        fail: (err2) => {
+                            console.error('redirectTo也失败:', err2);
+                        }
+                    });
+                }
+            });
+        }
         return;
     }
 
@@ -85,9 +105,30 @@ export const navTo = function(url, {
         currentPage.__onBackCallback__ = onBack;
     }
 
-    uni.navigateTo({
-        url: finalUrl
-    });
+    const pages = getCurrentPages();
+    if (pages.length >= 10) {
+        // 页面栈已满，使用redirectTo替代
+        uni.redirectTo({
+            url: finalUrl,
+            fail: (err) => {
+                console.error('页面跳转失败:', err);
+            }
+        });
+    } else {
+        uni.navigateTo({
+            url: finalUrl,
+            fail: (err) => {
+                console.error('页面跳转失败:', err);
+                // 失败后尝试redirectTo
+                uni.redirectTo({
+                    url: finalUrl,
+                    fail: (err2) => {
+                        console.error('redirectTo也失败:', err2);
+                    }
+                });
+            }
+        });
+    }
 };
 
 export const navBack = function({

components/CustomTabBar/CustomTabBar.vue

@@ -59,7 +59,7 @@ const generateTabbarList = () => {
         },
         {
             id: 2,
-            text: 'AI+',
+            text: '智能客服',
             path: '/pages/chat/chat',
             iconPath: '/static/tabbar/logo3.png',
             selectedIconPath: '/static/tabbar/logo3.png',
@@ -104,7 +104,7 @@ const generateTabbarList = () => {
         baseItems.splice(1, 0, {
             id: 1,
             text: '发布岗位',
-            path: '/pages/job/publishJob',
+            path: '/packageA/pages/job/publishJob',
             iconPath: '/static/tabbar/post.png',
             selectedIconPath: '/static/tabbar/posted.png',
             centerItem: false,
@@ -114,18 +114,28 @@ const generateTabbarList = () => {
         // 求职者用户（包括未登录状态）：显示招聘会
         // H5端隐藏招聘会
         // #ifndef H5
-        baseItems.splice(1, 0, {
-            id: 1,
-            text: '招聘会',
-            path: '/pages/careerfair/careerfair',
-            iconPath: '/static/tabbar/post.png',
-            selectedIconPath: '/static/tabbar/posted.png',
-            centerItem: false,
-            badge: readMsg.badges[1]?.count || 0,
-        });
+        // baseItems.splice(1, 0, {
+        //     id: 1,
+        //     text: '招聘会',
+        //     path: '/pages/careerfair/careerfair',
+        //     iconPath: '/static/tabbar/post.png',
+        //     selectedIconPath: '/static/tabbar/posted.png',
+        //     centerItem: false,
+        //     badge: readMsg.badges[1]?.count || 0,
+        // });
         // #endif
     }
-
+    if (userType === 0) {
+        baseItems.splice(2, 0, {
+            id: 5,
+            text: '招聘会',
+            path: '/pages/careerfair/careerfair',
+            iconPath: '/static/tabbar/careerfair.png',
+            selectedIconPath: '/static/tabbar/careerfaired.png',
+            centerItem: false,
+            badge: 0,
+        });
+    }
     return baseItems;
 };
 
@@ -163,9 +173,10 @@ const switchTab = (item, index) => {
     
     // 检查是否为需要登录的页面
     const loginRequiredPages = [
-        '/pages/job/publishJob',
+        '/packageA/pages/job/publishJob',
         '/pages/mine/mine',
-        '/pages/mine/company-mine'
+        '/pages/mine/company-mine',
+        '/pages/msglog/msglog'
     ];
     
     if (loginRequiredPages.includes(item.path)) {
@@ -180,7 +191,7 @@ const switchTab = (item, index) => {
         }
         
         // 已登录，处理特定页面的逻辑
-        if (item.path === '/pages/job/publishJob') {
+        if (item.path === '/packageA/pages/job/publishJob') {
             // 检查企业信息是否完整
             const cachedUserInfo = uni.getStorageSync('userInfo') || {};
             const storeUserInfo = userInfo.value || {};
@@ -190,12 +201,12 @@ const switchTab = (item, index) => {
             if (!currentUserInfo.company || currentUserInfo.company === null) {
                 // 企业信息为空，跳转到企业信息补全页面
                 uni.navigateTo({
-                    url: '/pages/complete-info/company-info',
+                    url: '/packageA/pages/complete-info/company-info',
                 });
             } else {
                 // 企业信息完整，跳转到发布岗位页面
                 uni.navigateTo({
-                    url: '/pages/job/publishJob',
+                    url: '/packageA/pages/job/publishJob',
                 });
             }
             
@@ -269,7 +280,7 @@ onMounted(() => {
     bottom: 0;
     left: 0;
     right: 0;
-    height: 88rpx;
+    height: 100rpx;
     background-color: #ffffff;
     border-top: 1rpx solid #e5e5e5;
     display: flex;
@@ -296,8 +307,8 @@ onMounted(() => {
 }
 
 .tabbar-icon {
-    width: 44rpx;
-    height: 44rpx;
+    width: 50rpx;
+    height: 50rpx;
     margin-bottom: 4rpx;
     position: relative;
 }
@@ -308,7 +319,7 @@ onMounted(() => {
 }
 
 .tabbar-text {
-    font-size: 20rpx;
+    font-size: 22rpx;
     line-height: 1;
     transition: color 0.3s ease;
 }
@@ -322,14 +333,14 @@ onMounted(() => {
     position: absolute;
     top: 4rpx;
     right: 20rpx;
-    min-width: 30rpx;
-    height: 30rpx;
+    min-width: 32rpx;
+    height: 32rpx;
     background-color: #ff4444;
     color: #fff;
-    font-size: 18rpx;
-    border-radius: 15rpx;
+    font-size: 19rpx;
+    border-radius: 16rpx;
     text-align: center;
-    line-height: 30rpx;
+    line-height: 32rpx;
     padding: 0 10rpx;
     transform: scale(0.8);
 }
@@ -337,8 +348,8 @@ onMounted(() => {
 /* 中间按钮特殊样式 */
 .tabbar-item:has(.center-item) {
     .tabbar-icon {
-        width: 60rpx;
-        height: 60rpx;
+        width: 68rpx;
+        height: 68rpx;
         margin-bottom: 0;
     }
 }

components/jobfair/signDialog.vue

@@ -54,7 +54,7 @@
 								</view>
 								<view class="job-info">
 									<view class="job-name">{{ item.jobTitle }}</view>
-									<view class="salary">{{ item.salaryRange }}元/月</view>
+									<view class="salary">{{ item.minSalary }} - {{ item.maxSalary }}元/月</view>
 								</view>
 							</view>
 						</view>
@@ -274,7 +274,22 @@
 			$api.myRequest("/jobfair/public/job-info/list", data, "GET", 9100, {
 				Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
 			}).then((resData) => {
-				jobList.value = resData.data.list || [];
+				if(resData.code == 200){
+					jobList.value = resData.data.list || [];
+					// let isPublishJobList = resData.data.list || [];
+          			// jobList.value = isPublishJobList.filter(job => job.isPublish === "1");
+					// if (isPublishJobList.length > 0 && jobList.value.length === 0) {
+					// 	uni.showToast({
+					// 		title: '请等待岗位审核通过后，再进行报名',
+					// 		icon: 'none'
+					// 	});
+          			// }
+				}else{
+					uni.showToast({
+						title: '请前往基本信息中完善企业信息和岗位信息',
+						icon: 'none'
+					});
+				}
 			});
 		});
 	};

components/md-render/md-render.vue

@@ -1,13 +1,45 @@
 <template>
     <view class="markdown-body">
-        <rich-text class="markdownRich" id="markdown-content" :nodes="renderedHtml" @itemclick="handleItemClick" />
-        <!-- <view class="markdown-body" v-html="renderedHtml"></view> -->
+        <!-- 根据不同平台使用不同的渲染方式 -->
+        <!-- #ifdef MP-WEIXIN -->
+        <!-- 微信小程序端：使用v-for遍历岗位卡片列表，每个卡片单独渲染，支持点击事件 -->
+        <scroll-view class="markdownRich" id="markdown-content">
+            <!-- 渲染普通markdown内容 -->
+            <rich-text :nodes="renderedHtml" />
+            
+            <!-- 单独渲染岗位卡片，支持点击事件 -->
+            <view v-if="localJobCardsList.length > 0" class="job-cards-container">
+                <view 
+                    v-for="(card, index) in localJobCardsList" 
+                    :key="index"
+                    class="custom-card"
+                    @tap="navigateToJobDetail(card.jobId)"
+                >
+                    <view class="card-title">
+                        <text class="title-text">{{ card.jobTitle }}</text>
+                        <view class="card-salary">{{ card.salary }}</view>
+                    </view>
+                    <view class="card-company">{{ card.location }}·{{ card.companyName }}</view>
+                    <view class="card-info">
+                        <view class="info-item">
+                            <view class="card-tag">{{ card.education }}</view>
+                            <view class="card-tag">{{ card.experience }}</view>
+                        </view>
+                        <view class="info-item">查看详情<view class="position-nav"></view></view>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+        <!-- #endif -->
+        <!-- #ifndef MP-WEIXIN -->
+        <view class="markdown-body" v-html="renderedHtml" @click="handleH5Click"></view>
+        <!-- #endif -->
     </view>
 </template>
 
 <script setup>
-import { computed, onMounted, inject } from 'vue';
-import { parseMarkdown, codeDataList } from '@/utils/markdownParser';
+import { computed, onMounted, inject, ref, watch, nextTick } from 'vue';
+import { parseMarkdown, codeDataList, jobCardsList } from '@/utils/markdownParser';
 const { navTo } = inject('globalFunction');
 const props = defineProps({
     content: {
@@ -21,30 +53,191 @@ const props = defineProps({
 });
 
 const renderedHtml = computed(() => parseMarkdown(props.content));
+const markdownContainer = ref(null);
+// 响应式岗位卡片列表，用于微信小程序端单独渲染
+const localJobCardsList = ref([]);
 
-const handleItemClick = (e) => {
-    let { attrs } = e.detail.node;
-    console.log(attrs);
-    let { 'data-copy-index': codeDataIndex, 'data-job-id': jobId, class: className } = attrs;
-    switch (className) {
-        case 'custom-card':
-            return navTo('/packageA/pages/post/post?jobId=' + jobId);
-        case 'custom-more':
-            return navTo('/packageA/pages/moreJobs/moreJobs?jobId=' + jobId);
-        case 'copy-btn':
-            uni.setClipboardData({
-                data: codeDataList[codeDataIndex],
-                showToast: false,
-                success() {
-                    uni.showToast({
-                        title: '复制成功',
-                        icon: 'none',
-                    });
-                },
-            });
-            break;
+// 监听content的变化，当内容更新时，解析岗位卡片
+watch(() => props.content, (newContent) => {
+    if (newContent) {
+        // 直接调用parseMarkdown来触发jobCardsList的更新
+        parseMarkdown(newContent);
+        // 将解析器生成的岗位卡片列表赋值给响应式数据
+        localJobCardsList.value = [...jobCardsList];
+        console.log('Content changed, jobCardsList updated:', localJobCardsList.value);
+    }
+}, { immediate: true });
+
+// 同时监听renderedHtml的变化作为备份
+watch(() => renderedHtml.value, (newVal) => {
+    console.log('renderedHtml changed, jobCardsList from parser:', jobCardsList);
+    // 将解析器生成的岗位卡片列表赋值给响应式数据
+    localJobCardsList.value = [...jobCardsList];
+});
+
+// 微信小程序端导航到岗位详情页面
+const navigateToJobDetail = (jobId) => {
+    console.log('navigateToJobDetail called with jobId:', jobId);
+    if (jobId && jobId !== 'undefined' && jobId !== 'null') {
+        // 跳转到岗位详情页面
+        uni.navigateTo({
+            url: `/packageA/pages/post/post?jobId=${jobId}`,
+            success: (res) => {
+                console.log('navigateTo success:', res);
+            },
+            fail: (err) => {
+                console.error('navigateTo failed:', err);
+                // 如果navigateTo失败，尝试redirectTo
+                uni.redirectTo({
+                    url: `/packageA/pages/post/post?jobId=${jobId}`,
+                    success: (res2) => {
+                        console.log('redirectTo success:', res2);
+                    },
+                    fail: (err2) => {
+                        console.error('redirectTo also failed:', err2);
+                        // 如果还是失败，显示错误提示
+                        uni.showToast({
+                            title: '跳转失败，请稍后重试',
+                            icon: 'none'
+                        });
+                    }
+                });
+            }
+        });
+    } else {
+        console.error('Invalid jobId:', jobId);
+        uni.showToast({
+            title: '岗位信息不完整',
+            icon: 'none'
+        });
     }
 };
+
+// 微信小程序端点击事件处理已移除，改用v-for遍历岗位卡片列表，每个卡片单独渲染，支持点击事件
+// 微信小程序端和H5端的jobId取值方式一致，都是从JSON数据的appJobUrl字段提取
+// 不同的是，微信小程序端现在使用v-for遍历渲染，而H5端使用v-html渲染
+
+// H5平台点击事件处理
+// 微信小程序端和H5端的jobId取值方式一致，都是从JSON数据的appJobUrl字段提取
+// 不同的是，H5端可以直接从DOM属性获取，而微信小程序端使用v-for遍历渲染
+const handleH5Click = (e) => {
+    console.log('H5 click event triggered:', e.target);
+    let target = e.target;
+    // 查找最接近的带有class的元素
+    while (target && target.tagName !== 'BODY') {
+        console.log('Checking target:', target, 'className:', target.className, 'tagName:', target.tagName);
+        
+        // 直接使用closest方法查找，不依赖className
+        const cardElement = target.closest('.custom-card');
+        const moreElement = target.closest('.custom-more');
+        
+        console.log('Found elements:', { cardElement, moreElement });
+        
+        if (cardElement) {
+            // 尝试多种方式获取jobId
+            let jobId = cardElement.getAttribute('data-job-id');
+            console.log('Found custom-card, data-job-id attribute:', jobId);
+            
+            // 如果data-job-id为空，尝试从onclick事件中提取jobId
+            if (!jobId) {
+                const onclick = cardElement.getAttribute('onclick');
+                if (onclick) {
+                    const match = onclick.match(/jobId=(\w+)/);
+                    if (match && match[1]) {
+                        jobId = match[1];
+                        console.log('Extracted jobId from onclick:', jobId);
+                    }
+                }
+            }
+            
+            if (jobId) {
+                console.log('Final jobId for navigation:', jobId);
+                try {
+                    // 直接使用uni.navigateTo，避免navTo函数的潜在问题
+                    uni.navigateTo({
+                        url: `/packageA/pages/post/post?jobId=${jobId}`,
+                        success: (res) => {
+                            console.log('navigateTo success:', res);
+                        },
+                        fail: (err) => {
+                            console.error('navigateTo failed:', err);
+                            // 如果navigateTo失败，尝试redirectTo
+                            uni.redirectTo({
+                                url: `/packageA/pages/post/post?jobId=${jobId}`,
+                                success: (res2) => {
+                                    console.log('redirectTo success:', res2);
+                                },
+                                fail: (err2) => {
+                                    console.error('redirectTo also failed:', err2);
+                                }
+                            });
+                        }
+                    });
+                } catch (error) {
+                    console.error('Navigation error:', error);
+                }
+                return;
+            } else {
+                console.error('No jobId found for custom-card');
+            }
+        } else if (moreElement) {
+            // 尝试多种方式获取jobId
+            let jobId = moreElement.getAttribute('data-job-id');
+            console.log('Found custom-more, data-job-id attribute:', jobId);
+            
+            // 如果data-job-id为空，尝试从onclick事件中提取jobId
+            if (!jobId) {
+                const onclick = moreElement.getAttribute('onclick');
+                if (onclick) {
+                    const match = onclick.match(/jobId=(\w+)/);
+                    if (match && match[1]) {
+                        jobId = match[1];
+                        console.log('Extracted jobId from onclick:', jobId);
+                    }
+                }
+            }
+            
+            if (jobId) {
+                console.log('Final jobId for more jobs:', jobId);
+                try {
+                    // 直接使用uni.navigateTo，避免navTo函数的潜在问题
+                    uni.navigateTo({
+                        url: `/packageA/pages/moreJobs/moreJobs?jobId=${jobId}`,
+                        success: (res) => {
+                            console.log('navigateTo success:', res);
+                        },
+                        fail: (err) => {
+                            console.error('navigateTo failed:', err);
+                            // 如果navigateTo失败，尝试redirectTo
+                            uni.redirectTo({
+                                url: `/packageA/pages/moreJobs/moreJobs?jobId=${jobId}`,
+                                success: (res2) => {
+                                    console.log('redirectTo success:', res2);
+                                },
+                                fail: (err2) => {
+                                    console.error('redirectTo also failed:', err2);
+                                }
+                            });
+                        }
+                    });
+                } catch (error) {
+                    console.error('Navigation error:', error);
+                }
+                return;
+            } else {
+                console.error('No jobId found for custom-more');
+            }
+        }
+        
+        target = target.parentElement;
+    }
+};
+
+// 移除旧的事件监听逻辑，改用全局点击处理
+
+onMounted(() => {
+    console.log('onMounted called');
+});
 </script>
 
 <style lang="scss">
@@ -267,7 +460,7 @@ ol {
 </style>
 
 <style lang="stylus">
-.custom-more{
+.custom-more
     display: flex
     justify-content: center
     align-items: center
@@ -282,15 +475,16 @@ ol {
     transition: all 0.3s ease
     position: relative
     overflow: hidden
-    .more-icon{
-        width: 32rpx;
-        height: 32rpx;
-        background: url('@/static/svg/seemore.svg') center center no-repeat;
+    
+    .more-icon
+        width: 32rpx
+        height: 32rpx
+        background: url('@/static/svg/seemore.svg') center center no-repeat
         background-size: 100% 100%
         margin-left: 12rpx
         filter: brightness(0) invert(1)
-    }
-    &::before {
+    
+    &::before
         content: ''
         position: absolute
         top: 0
@@ -299,93 +493,492 @@ ol {
         height: 100%
         background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent)
         transition: left 0.5s ease
-    }
-    &:active {
+    
+    &:active
         transform: translateY(2rpx)
         box-shadow: 0rpx 4rpx 16rpx rgba(37, 107, 250, 0.4)
-    }
-    &:active::before {
+    
+    &:active::before
         left: 100%
+
+/* 为小程序专门优化的样式 */
+/* #ifdef MP-WEIXIN */
+.rich-text-container
+    padding: 0 20rpx
+
+.markdownRich
+    padding: 0
+/* #endif */
+
+/* H5端和小程序端样式优化 */
+.custom-card
+    background: #FFFFFF !important
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04) !important
+    border-radius: 20rpx !important
+    padding: 28rpx 24rpx !important
+    font-weight: 400 !important
+    font-size: 28rpx !important
+    color: #333333 !important
+    margin-bottom: 22rpx !important
+    position: relative !important
+    display: block !important
+    flex-direction: column !important
+    /* 确保在所有平台中边距正确应用 */
+    margin-left: auto !important
+    margin-right: auto !important
+    width: 100% !important
+    box-sizing: border-box !important
+    text-decoration: none !important
+    overflow: hidden !important
+
+.custom-card .card-title
+    font-weight: 600 !important
+    display: flex !important
+    align-items: center !important
+    justify-content: space-between !important
+    margin-bottom: 16rpx !important
+
+.custom-card .card-title .title-text
+    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif !important
+    max-width: calc(100% - 160rpx) !important
+    overflow: hidden !important
+    text-overflow: ellipsis !important
+    font-size: 32rpx !important
+    line-height: 1.4 !important
+    white-space: nowrap !important
+    margin-bottom: 0 !important
+
+.custom-card .card-title .card-salary
+    font-family: DIN-Medium !important
+    font-size: 32rpx !important
+    color: #4C6EFB !important
+    line-height: 1.4 !important
+    font-weight: 500 !important
+    margin-bottom: 0 !important
+
+.custom-card .card-company
+    margin-bottom: 18rpx !important
+    max-width: 100% !important
+    overflow: hidden !important
+    text-overflow: ellipsis !important
+    color: #6C7282 !important
+    line-height: 1.4 !important
+    white-space: nowrap !important
+    font-size: 28rpx !important
+    margin-top: 0 !important
+    display: block !important
+
+.custom-card .card-tags
+    display: flex !important
+    flex-wrap: wrap !important
+    margin-bottom: 24rpx !important
+
+.custom-card .card-tag
+    font-weight: 400 !important
+    font-size: 24rpx !important
+    color: #6C7282 !important
+    width: fit-content !important
+    background: #F4F4F4 !important
+    border-radius: 4rpx !important
+    padding: 6rpx 20rpx !important
+    margin-right: 20rpx !important
+    margin-bottom: 14rpx !important
+    display: inline-flex !important
+    align-items: center !important
+    justify-content: center !important
+    height: 30rpx !important
+    line-height: 30rpx !important
+
+.custom-card .card-bottom
+    display: flex !important
+    justify-content: space-between !important
+    font-size: 24rpx !important
+    color: #6C7282 !important
+    margin-top: 0 !important
+    margin-bottom: 0 !important
+
+.custom-card .card-bottom .info-item
+    display: flex !important
+    align-items: center !important
+    justify-content: center !important
+    margin-bottom: 0 !important
+
+.custom-card .card-info
+    display: flex !important
+    align-items: center !important
+    justify-content: space-between !important
+    padding-right: 40rpx !important
+
+.custom-card .card-info .info-item
+    display: flex !important
+    position: relative !important
+    align-items: center !important
+
+.custom-card .card-info .info-item:last-child
+    color: #256BFA !important
+    font-size: 28rpx !important
+    padding-right: 10rpx !important
+
+.custom-card .position-nav
+    position: absolute !important
+    right: -10rpx !important
+    top: 50% !important
+    transform: translateY(-50%) !important
+
+.custom-card .position-nav::before
+    position: absolute !important
+    left: 0 !important
+    top: -4rpx !important
+    content: '' !important
+    width: 4rpx !important
+    height: 16rpx !important
+    border-radius: 2rpx !important
+    background: #256BFA !important
+    transform: translate(0, -50%) rotate(-45deg) !important
+
+.custom-card .position-nav::after
+    position: absolute !important
+    left: 0 !important
+    top: -4rpx !important
+    content: '' !important
+    width: 4rpx !important
+    height: 16rpx !important
+    border-radius: 2rpx !important
+    background: #256BFA !important
+    transform: rotate(45deg) !important
+
+/* 为微信小程序专门优化的样式选择器 */
+/* #ifdef MP-WEIXIN */
+.job-cards-container .custom-card
+    background: #FFFFFF !important
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04) !important
+    border-radius: 20rpx !important
+    padding: 28rpx 24rpx !important
+    font-weight: 400 !important
+    font-size: 28rpx !important
+    color: #333333 !important
+    margin-bottom: 22rpx !important
+    position: relative !important
+    display: block !important
+    flex-direction: column !important
+    margin-left: auto !important
+    margin-right: auto !important
+    width: 100% !important
+    box-sizing: border-box !important
+    text-decoration: none !important
+    overflow: hidden !important
+
+.job-cards-container .custom-card .card-title
+    font-weight: 600 !important
+    display: flex !important
+    align-items: center !important
+    justify-content: space-between !important
+    margin-bottom: 16rpx !important
+
+.job-cards-container .custom-card .card-title .title-text
+    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif !important
+    max-width: calc(100% - 160rpx) !important
+    overflow: hidden !important
+    text-overflow: ellipsis !important
+    font-size: 32rpx !important
+    line-height: 1.4 !important
+    white-space: nowrap !important
+    margin-bottom: 0 !important
+
+.job-cards-container .custom-card .card-title .card-salary
+    font-family: DIN-Medium !important
+    font-size: 32rpx !important
+    color: #4C6EFB !important
+    line-height: 1.4 !important
+    font-weight: 500 !important
+    margin-bottom: 0 !important
+
+.job-cards-container .custom-card .card-company
+    margin-bottom: 18rpx !important
+    max-width: 100% !important
+    overflow: hidden !important
+    text-overflow: ellipsis !important
+    color: #6C7282 !important
+    line-height: 1.4 !important
+    white-space: nowrap !important
+    font-size: 28rpx !important
+    margin-top: 0 !important
+    display: block !important
+
+.job-cards-container .custom-card .card-info
+    display: flex !important
+    align-items: center !important
+    justify-content: space-between !important
+    padding-right: 40rpx !important
+
+.job-cards-container .custom-card .card-info .info-item
+    display: flex !important
+    position: relative !important
+    align-items: center !important
+
+.job-cards-container .custom-card .card-info .info-item:last-child
+    color: #256BFA !important
+    font-size: 28rpx !important
+    padding-right: 10rpx !important
+
+.job-cards-container .custom-card .card-info .info-item .card-tag
+    font-weight: 400 !important
+    font-size: 24rpx !important
+    color: #6C7282 !important
+    width: fit-content !important
+    background: #F4F4F4 !important
+    border-radius: 4rpx !important
+    padding: 6rpx 20rpx !important
+    margin-right: 20rpx !important
+    margin-bottom: 14rpx !important
+    display: inline-flex !important
+    align-items: center !important
+    justify-content: center !important
+    height: 30rpx !important
+    line-height: 30rpx !important
+
+.job-cards-container .custom-card .position-nav
+    position: absolute !important
+    right: -10rpx !important
+    top: 50% !important
+    transform: translateY(-50%) !important
+
+.job-cards-container .custom-card .position-nav::before
+    position: absolute !important
+    left: 0 !important
+    top: -4rpx !important
+    content: '' !important
+    width: 4rpx !important
+    height: 16rpx !important
+    border-radius: 2rpx !important
+    background: #256BFA !important
+    transform: translate(0, -50%) rotate(-45deg) !important
+
+.job-cards-container .custom-card .position-nav::after
+    position: absolute !important
+    left: 0 !important
+    top: -4rpx !important
+    content: '' !important
+    width: 4rpx !important
+    height: 16rpx !important
+    border-radius: 2rpx !important
+    background: #256BFA !important
+    transform: rotate(45deg) !important
+/* #endif */
+
+/* 额外的H5端样式优化 */
+/* #ifndef MP-WEIXIN */
+/* 确保样式能正确应用到v-html生成的内容 */
+.markdown-body {
+    /* 重置v-html容器样式 */
+    display: block !important;
+    
+    /* 为v-html生成的a.custom-card标签添加基础样式 */
+    a.custom-card {
+        display: flex !important;
+        flex-direction: column !important;
+        margin-bottom: 22rpx !important;
+        background: #FFFFFF !important;
+        box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04) !important;
+        border-radius: 20rpx !important;
+        padding: 28rpx 24rpx !important;
+        font-weight: 400 !important;
+        font-size: 28rpx !important;
+        color: #333333 !important;
+        text-decoration: none !important;
+        overflow: hidden !important;
+        box-sizing: border-box !important;
+        width: calc(100% - 0rpx) !important;
+        max-width: 100% !important;
+    }
+    
+    /* 卡片标题样式 */
+    a.custom-card .card-title {
+        font-weight: 600 !important;
+        display: flex !important;
+        align-items: center !important;
+        justify-content: space-between !important;
+        margin-bottom: 16rpx !important;
+    }
+    
+    a.custom-card .card-title .title-text {
+        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif !important;
+        font-size: 32rpx !important;
+        line-height: 1.4 !important;
+        color: #333333 !important;
+        max-width: calc(100% - 160rpx) !important;
+        overflow: hidden !important;
+        text-overflow: ellipsis !important;
+        white-space: nowrap !important;
+        margin-bottom: 0 !important;
+    }
+    
+    a.custom-card .card-title .card-salary {
+        font-family: DIN-Medium !important;
+        font-size: 32rpx !important;
+        color: #4C6EFB !important;
+        line-height: 1.4 !important;
+        font-weight: 500 !important;
+        margin-bottom: 0 !important;
+    }
+    
+    /* 公司信息样式 */
+    a.custom-card .card-company {
+        margin-bottom: 18rpx !important;
+        font-size: 28rpx !important;
+        color: #6C7282 !important;
+        line-height: 1.4 !important;
+        max-width: 100% !important;
+        overflow: hidden !important;
+        text-overflow: ellipsis !important;
+        white-space: nowrap !important;
+        margin-top: 0 !important;
+        display: block !important;
+    }
+    
+    /* 标签容器样式 */
+    a.custom-card .card-tags {
+        display: flex !important;
+        flex-wrap: wrap !important;
+        margin-bottom: 24rpx !important;
+    }
+    
+    /* 单个标签样式 */
+    a.custom-card .card-tag {
+        font-weight: 400 !important;
+        font-size: 24rpx !important;
+        color: #6C7282 !important;
+        width: fit-content !important;
+        background: #F4F4F4 !important;
+        border-radius: 4rpx !important;
+        padding: 6rpx 20rpx !important;
+        margin-right: 20rpx !important;
+        margin-bottom: 14rpx !important;
+        display: inline-flex !important;
+        align-items: center !important;
+        justify-content: center !important;
+        height: 30rpx !important;
+        line-height: 30rpx !important;
+    }
+    
+    /* 卡片底部样式 */
+    a.custom-card .card-bottom {
+        display: flex !important;
+        justify-content: space-between !important;
+        font-size: 24rpx !important;
+        color: #6C7282 !important;
+        margin-top: 0 !important;
+        margin-bottom: 0 !important;
+    }
+    
+    a.custom-card .card-bottom .info-item {
+        display: flex !important;
+        align-items: center !important;
+        justify-content: center !important;
+        margin-bottom: 0 !important;
+    }
+    
+    /* 卡片信息区域样式 */
+    a.custom-card .card-info {
+        display: flex !important;
+        align-items: center !important;
+        justify-content: space-between !important;
+        padding-right: 40rpx !important;
+    }
+    
+    a.custom-card .card-info .info-item {
+        display: flex !important;
+        align-items: center !important;
+    }
+    
+    a.custom-card .card-info .info-item:last-child {
+        color: #256BFA !important;
+        font-size: 28rpx !important;
+        padding-right: 10rpx !important;
+        position: relative !important;
+    }
+    
+    /* 查看详情箭头样式 */
+    a.custom-card .position-nav {
+        position: absolute !important;
+        right: -10rpx !important;
+        top: 50% !important;
+        transform: translateY(-50%) !important;
+    }
+    
+    a.custom-card .position-nav::before {
+        position: absolute !important;
+        left: 0 !important;
+        top: -4rpx !important;
+        content: '' !important;
+        width: 4rpx !important;
+        height: 16rpx !important;
+        border-radius: 2rpx !important;
+        background: #256BFA !important;
+        transform: translate(0, -50%) rotate(-45deg) !important;
+    }
+    
+    a.custom-card .position-nav::after {
+        position: absolute !important;
+        left: 0 !important;
+        top: -4rpx !important;
+        content: '' !important;
+        width: 4rpx !important;
+        height: 16rpx !important;
+        border-radius: 2rpx !important;
+        background: #256BFA !important;
+        transform: rotate(45deg) !important;
+    }
+    
+    /* 查看更多按钮样式 */
+    a.custom-more {
+        display: flex !important;
+        justify-content: center !important;
+        align-items: center !important;
+        color: #FFFFFF !important;
+        background: linear-gradient(135deg, #256BFA 0%, #9E74FD 100%) !important;
+        border-radius: 50rpx !important;
+        padding: 20rpx 32rpx !important;
+        margin: 20rpx 0 !important;
+        font-size: 28rpx !important;
+        font-weight: 600 !important;
+        box-shadow: 0rpx 8rpx 24rpx rgba(37, 107, 250, 0.3) !important;
+        transition: all 0.3s ease !important;
+        position: relative !important;
+        overflow: hidden !important;
+        text-decoration: none !important;
+        box-sizing: border-box !important;
+        width: 100% !important;
+    }
+    
+    a.custom-more .more-icon {
+        width: 32rpx !important;
+        height: 32rpx !important;
+        background: url('@/static/svg/seemore.svg') center center no-repeat !important;
+        background-size: 100% 100% !important;
+        margin-left: 12rpx !important;
+        filter: brightness(0) invert(1) !important;
+    }
+    
+    a.custom-more::before {
+        content: '' !important;
+        position: absolute !important;
+        top: 0 !important;
+        left: -100% !important;
+        width: 100% !important;
+        height: 100% !important;
+        background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent) !important;
+        transition: left 0.5s ease !important;
+    }
+    
+    a.custom-more:active {
+        transform: translateY(2rpx) !important;
+        box-shadow: 0rpx 4rpx 16rpx rgba(37, 107, 250, 0.4) !important;
+    }
+    
+    a.custom-more:active::before {
+        left: 100% !important;
     }
 }
-.custom-card
-    background: #FFFFFF;
-    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
-    border-radius: 20rpx 20rpx 20rpx 20rpx;
-    padding: 28rpx 24rpx;
-    font-weight: 400;
-    font-size: 28rpx;
-    color: #333333;
-    margin-bottom: 20rpx;
-    position: relative;
-    display: flex;
-    flex-direction: column
-    .card-title
-        font-weight: 600;
-        display: flex;
-        align-items: center;
-        justify-content: space-between
-        .title-text
-            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-            max-width: calc(100% - 160rpx);
-            overflow: hidden
-            text-overflow: ellipsis
-            font-size: 30rpx
-        .card-salary
-            font-family: DIN-Medium;
-            font-size: 28rpx;
-            color: #FF6E1C;
-
-    .card-company
-        margin-top: 16rpx;
-        max-width: calc(100%);
-        overflow: hidden;
-        text-overflow: ellipsis
-        color: #6C7282;
-    .card-info
-        margin-top: 22rpx;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding-right: 40rpx;
-        .info-item
-            display: flex;
-            position: relative;
-            align-items: center;
-            color: #256BFA;
-            font-size: 28rpx;
-            padding-right: 10rpx
-    .position-nav
-        position: absolute;
-        right: -10rpx;
-        top: 50%;
-    .position-nav::before
-        position: absolute;
-        left: 0;
-        top: -4rpx;
-        content: '';
-        width: 4rpx;
-        height: 16rpx;
-        border-radius: 2rpx
-        background: #256BFA;
-        transform: translate(0, -50%) rotate(-45deg) ;
-    .position-nav::after
-        position: absolute;
-        left: 0;
-        top: -4rpx;
-        content: '';
-        width: 4rpx;
-        height: 16rpx;
-        border-radius: 2rpx
-        background: #256BFA;
-        transform: rotate(45deg)
-    .card-tag
-        font-weight: 500;
-        font-size: 24rpx;
-        color: #333333;
-        width: fit-content;
-        background: #F4F4F4;
-        border-radius: 4rpx 4rpx 4rpx 4rpx;
-        padding: 4rpx 20rpx;
-        margin-right: 16rpx;
+/* #endif */
 </style>

components/selectJobs/selectJobs.vue

@@ -195,7 +195,8 @@ defineExpose({
 <style lang="scss" scoped>
 .popup-content {
     color: #000000;
-    height: 80vh;
+    height: 84vh;
+    position: relative;
 }
 .popup-bottom {
     padding: 40rpx 28rpx 20rpx 28rpx;

components/tabbar/midell-box.vue

@@ -110,7 +110,7 @@ const generateTabbarList = () => {
         baseItems.splice(1, 0, {
             id: 1,
             text: '发布岗位',
-            path: '/pages/job/publishJob',
+            path: '/packageA/pages/job/publishJob',
             iconPath: '../../static/tabbar/post.png',
             selectedIconPath: '../../static/tabbar/posted.png',
             centerItem: false,

components/wxAuthLogin/WxAuthLogin.vue

@@ -11,7 +11,6 @@
                 <view class="auth-header">
                     <image class="auth-logo" src="@/static/logo2-S.png" mode="aspectFit"></image>
                     <view class="auth-title">欢迎使用就业服务</view>
-                    <view class="auth-subtitle">需要您授权手机号登录</view>
                 </view>
                 
                 <!-- 角色选择 -->
@@ -26,7 +25,7 @@
                             <view class="role-icon">
                                 <uni-icons type="person" size="32" :color="userType === 1 ? '#256BFA' : '#999'"></uni-icons>
                             </view>
-                            <view class="role-text">我是求职者</view>
+                            <view class="role-text">个人</view>
                         </view>
                         <view 
                             class="role-item" 
@@ -36,7 +35,23 @@
                             <view class="role-icon">
                                 <uni-icons type="shop" size="32" :color="userType === 0 ? '#256BFA' : '#999'"></uni-icons>
                             </view>
-                            <view class="role-text">我是招聘者</view>
+                            <view class="role-text">单位</view>
+                        </view>
+                    </view>
+                </view>
+                
+                <!-- 机构类型选择（仅单位角色显示） -->
+                <view v-if="userType === 0" class="org-type-select">
+                    <view class="org-type-title">请选择机构类型</view>
+                    <view class="org-type-options">
+                        <view 
+                            v-for="option in orgTypeOptions" 
+                            :key="option.value"
+                            class="org-type-item"
+                            :class="{ active: orgType === option.value }"
+                            @click="selectOrgType(option.value)"
+                        >
+                            <view class="org-type-text">{{ option.label }}</view>
                         </view>
                     </view>
                 </view>
@@ -67,7 +82,7 @@
                         @getphonenumber="getPhoneNumber"
                     >
                         <uni-icons type="phone" size="20" color="#FFFFFF"></uni-icons>
-                        <text>微信授权登录</text>
+                        <text>手机号快捷登录</text>
                     </button>
                     <!-- #endif -->
                     
@@ -75,7 +90,7 @@
                     <!-- #ifndef MP-WEIXIN -->
                     <button class="auth-btn primary" @click="wxLogin">
                         <uni-icons type="phone" size="20" color="#FFFFFF"></uni-icons>
-                        <text>微信授权登录</text>
+                        <text>手机号快捷登录</text>
                     </button>
                     <!-- #endif -->
                     
@@ -88,33 +103,62 @@
                 </view>
                 
                 <!-- 用户协议 -->
-                <view class="auth-agreement">
+                <!-- <view class="auth-agreement">
                     <text>登录即表示同意</text>
                     <text class="link" @click="openAgreement('user')">《用户协议》</text>
                     <text>和</text>
                     <text class="link" @click="openAgreement('privacy')">《隐私政策》</text>
-                </view>
+                </view> -->
             </view>
         </view>
     </uni-popup>
 </template>
 
 <script setup>
-import { ref, inject } from 'vue';
+import { ref, inject, onMounted } from 'vue';
 import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
 import { tabbarManager } from '@/utils/tabbarManager';
 
 const { $api } = inject('globalFunction');
 const { loginSetToken } = useUserStore();
+const dictStore = useDictStore();
 
 const popup = ref(null);
 const userType = ref(null); // 用户角色：1-求职者，0-企业
+const orgType = ref(null); // 机构类型
+const orgTypeOptions = ref([]); // 机构类型选项
 const emit = defineEmits(['success', 'cancel']);
 
+// 获取机构类型字典
+const getOrgTypeDict = async () => {
+    try {
+        const options = await dictStore.getDictSelectOption('org_type');
+        orgTypeOptions.value = options;
+    } catch (error) {
+        console.error('获取机构类型字典失败：', error);
+        // 使用备用数据
+        orgTypeOptions.value = [
+            { label: '有限责任公司', value: '1' },
+            { label: '股份有限公司', value: '2' },
+            { label: '个人独资企业', value: '3' },
+            { label: '合伙企业', value: '4' },
+            { label: '外商投资企业', value: '5' },
+            { label: '其他', value: '6' }
+        ];
+    }
+};
+
+// 组件挂载时获取字典数据
+onMounted(() => {
+    getOrgTypeDict();
+});
+
 // 打开弹窗
 const open = () => {
     popup.value?.open();
     userType.value = null; // 重置角色选择
+    orgType.value = null; // 重置机构类型选择
 };
 
 // 关闭弹窗
@@ -126,6 +170,12 @@ const close = () => {
 // 选择角色
 const selectRole = (type) => {
     userType.value = type;
+    orgType.value = null; // 切换角色时重置机构类型选择
+};
+
+// 选择机构类型
+const selectOrgType = (type) => {
+    orgType.value = type;
 };
 
 // 验证角色是否已选择
@@ -134,18 +184,33 @@ const validateRole = () => {
         $api.msg('请先选择您的角色');
         return false;
     }
+    
+    // 验证机构类型是否已选择（仅单位角色）
+    if (userType.value === 0 && orgType.value === null) {
+        $api.msg('请选择机构类型');
+        return false;
+    }
+    
     return true;
 };
 
 const getPhoneNumber = (e) => {
     console.log('获取手机号：', e);
-    
+    console.log('userType.value', userType.value)
     // 验证角色是否已选择
-    if (!validateRole()) {
-        return;
-    }
+    
     
     if (e.detail.errMsg === 'getPhoneNumber:ok') {
+        if (userType.value === null) {
+            $api.msg('请先选择您的角色');
+            return true;
+        }
+        
+        // 验证机构类型是否已选择（仅单位角色）
+        if (userType.value === 0 && orgType.value === null) {
+            $api.msg('请选择机构类型');
+            return true;
+        }
         uni.login({
 			provider: 'weixin',
 			success: (loginRes) => {
@@ -160,7 +225,8 @@ const getPhoneNumber = (e) => {
 					code,
 					encryptedData,
 					iv,
-					userType: userType.value
+					userType: userType.value,
+					orgType: orgType.value
 				}, 'post').then((resData) => {
 					uni.hideLoading();
 					console.log(resData, 'resume.idCard');
@@ -187,12 +253,12 @@ const getPhoneNumber = (e) => {
 								if (userType.value === 1 && !resData.idCard) {
 									// 求职者跳转到个人信息补全页面
 									uni.navigateTo({
-										url: '/pages/complete-info/complete-info?step=1'
+										url: '/packageA/pages/complete-info/complete-info?step=1'
 									});
 								} else if (userType.value === 0 && !resData.idCard) {
 									// 招聘者跳转到企业信息补全页面
 									uni.navigateTo({
-										url: '/pages/complete-info/company-info'
+										url: '/packageA/pages/complete-info/company-info'
 									});
 								}
 							}
@@ -249,7 +315,8 @@ const wxLogin = () => {
                         // 调用后端接口进行登录
                         $api.createRequest('/app/appLogin', {
                             code: loginRes.code,
-                            userType: userType.value
+                            userType: userType.value,
+                            orgType: orgType.value
                         }, 'post').then((resData) => {
                             if (resData.token) {
                                 loginSetToken(resData.token).then((resume) => {
@@ -270,12 +337,12 @@ const wxLogin = () => {
                                         if (userType.value === 1) {
                                             // 求职者跳转到个人信息补全页面
                                             uni.navigateTo({
-                                                url: '/pages/complete-info/complete-info?step=1'
+                                                url: '/packageA/pages/complete-info/complete-info?step=1'
                                             });
                                         } else if (userType.value === 0) {
                                             // 招聘者跳转到企业信息补全页面
                                             uni.navigateTo({
-                                                url: '/pages/complete-info/company-info'
+                                                url: '/packageA/pages/complete-info/company-info'
                                             });
                                         }
                                     }
@@ -324,12 +391,12 @@ const testLogin = () => {
                 if (userType.value === 1) {
                     // 求职者跳转到个人信息补全页面
                     uni.navigateTo({
-                        url: '/pages/complete-info/complete-info?step=1'
+                        url: '/packageA/pages/complete-info/complete-info?step=1'
                     });
                 } else if (userType.value === 0) {
                     // 招聘者跳转到企业信息补全页面
                     uni.navigateTo({
-                        url: '/pages/complete-info/company-info'
+                        url: '/packageA/pages/complete-info/company-info'
                     });
                 }
             }
@@ -371,7 +438,7 @@ defineExpose({
     overflow: hidden
     
     .modal-content
-        padding: 60rpx 40rpx 40rpx
+        padding: 40rpx 40rpx 40rpx
         position: relative
         
         .close-btn
@@ -387,11 +454,11 @@ defineExpose({
         
         .auth-header
             text-align: center
-            margin-bottom: 40rpx
+            margin-bottom: 20rpx
             
             .auth-logo
-                width: 120rpx
-                height: 120rpx
+                width: 90rpx
+                height: 90rpx
                 margin: 0 auto 24rpx
             
             .auth-title
@@ -406,7 +473,6 @@ defineExpose({
         
         .role-select
             margin-bottom: 32rpx
-            
             .role-title
                 font-size: 28rpx
                 font-weight: 500
@@ -445,6 +511,41 @@ defineExpose({
                         color: #333333
                         font-weight: 500
         
+        .org-type-select
+            margin-bottom: 22rpx
+            
+            .org-type-title
+                font-size: 28rpx
+                font-weight: 500
+                color: #333333
+                margin-bottom: 20rpx
+                text-align: center
+            
+            .org-type-options
+                display: flex
+                flex-wrap: wrap
+                gap: 16rpx
+                
+                .org-type-item
+                    display:inline-block
+                    background: #F7F8FA
+                    border: 2rpx solid #E5E5E5
+                    border-radius: 10rpx
+                    padding: 10rpx 10rpx
+                    transition: all 0.3s ease
+                    cursor: pointer
+                    text-align: center
+                    
+                    &.active
+                        background: #F0F5FF
+                        border-color: #256BFA
+                        box-shadow: 0 4rpx 12rpx rgba(37, 107, 250, 0.15)
+                    
+                    .org-type-text
+                        font-size: 22rpx
+                        color: #333333
+                        font-weight: 500
+        
         .auth-tips
             background: #F7F8FA
             border-radius: 16rpx

config.js

@@ -1,31 +1,42 @@
+/*
+ * @Descripttion:
+ * @Author: lip
+ * @Date: 2025-12-04 13:40:08
+ * @LastEditors: lip
+ */
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
-    baseUrl: 'http://222.80.110.161:11111/api/ks', // 测试
+    baseUrl: 'https://www.xjksly.cn/api/ks', // 正式环境
     // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
 
-	LCBaseUrl:'http://10.110.145.145:9100',//招聘、培训、帮扶
-	LCBaseUrlInner:'http://10.110.145.145:10100',//内网端口
-	imgBaseUrl:'http://10.110.145.145/images', //图片基础url
-	trainVideoImgUrl:'http://10.110.145.145:9100/file/file/minio',
+	// LCBaseUrl:'http://10.110.145.145:9100',//内网端口
+	// LCBaseUrlInner:'http://10.110.145.145:10100',//招聘、培训、帮扶
+	// imgBaseUrl:'http://10.110.145.145/images', //图片基础url
+	// trainVideoImgUrl:'http://10.110.145.145:9100/file/file/minio',
+	LCBaseUrl:'https://www.xjksly.cn/prod-api',//内网端口
+	LCBaseUrlInner:'https://www.xjksly.cn/prod-psout-api',//招聘、培训、帮扶
+	imgBaseUrl:'https://www.xjksly.cn/images', //图片基础url
+	trainVideoImgUrl:'https://www.xjksly.cn/prod-api/file/file/minio',
     // sseAI+
     // StreamBaseURl: 'http://39.98.44.136:8000',
-    StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai',
+    StreamBaseURl: 'https://www.xjksly.cn/api/ks/app/chat',
     // StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai/test',
     // 语音转文字
-    // vioceBaseURl: 'ws://39.98.44.136:8080/speech-recognition',
-    vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/speech-recognition',
+    vioceBaseURl: 'https://www.xjksly.cn/api/ks/app/speech/asr',
+    // vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/speech-recognition',
     // 语音合成
-    speechSynthesis: 'wss://qd.zhaopinzao8dian.com/api/speech-synthesis',
+    speechSynthesis: 'https://www.xjksly.cn/api/ks/app/speech/tts',
+    // speechSynthesis: 'wss://qd.zhaopinzao8dian.com/api/speech-synthesis',
     // indexedDB
     DBversion: 2,
     // 只使用本地缓寸的数据
     OnlyUseCachedDB: true,
     // 使用模拟定位
-    UsingSimulatedPositioning: true,
+    UsingSimulatedPositioning: false,
     // 应用信息
     appInfo: {
         // 应用名称
-        name: "青岛市就业服务",
+        name: "喀什市就业服务",
         // 地区名
         areaName: '喀什',
         // AI名称

docs/职业图谱接口说明.md

@@ -45,7 +45,7 @@
 
 ---
 
-### 2. ``getJobPathById`- 根据职业路径ID获取详情
+### 2. `getJobPathById`- 根据职业路径ID获取详情
 - **接口路径**: `/jobPath/getJobPathById`
 - **请求方法**: `GET`
 - **接口类型**: `zytp`

hook/useColumnCount.js

@@ -19,37 +19,47 @@ export function useColumnCount(onChange = () => {}) {
     //         columnCount.value = count < 2 ? 2 : count
     //     }
     // }
-    const calcColumn = () => {
-        // 使用新的API替代已废弃的getSystemInfoSync
-        let width
-        // #ifdef MP-WEIXIN
-        const mpSystemInfo = uni.getWindowInfo()
-        width = mpSystemInfo.windowWidth
-        // #endif
-        // #ifndef MP-WEIXIN
-        const otherSystemInfo = uni.getSystemInfoSync()
-        width = otherSystemInfo.windowWidth
-        // #endif
-
-        let count = 2
-        if (width >= 1000) {
-            count = 5
-        } else if (width >= 750) {
-            count = 4
-        } else if (width >= 500) {
-            count = 3
-        } else {
-            count = 2
-        }
-
-        if (count !== columnCount.value) {
-            columnCount.value = count
-        }
-
-        // 计算间距：count=2 => 1，count=5 => 2，中间线性插值
-        const spacing = 2 - (count - 2) * (1 / 3)
-        // console.log('列数:', count, '间距:', spacing.toFixed(2))
-        columnSpace.value = spacing
+    const calcColumn = () => {
+        // 使用新的API替代已废弃的getSystemInfoSync
+        let width
+        // #ifdef MP-WEIXIN
+        const mpSystemInfo = uni.getWindowInfo()
+        width = mpSystemInfo.windowWidth
+        // #endif
+        // #ifndef MP-WEIXIN
+        const otherSystemInfo = uni.getSystemInfoSync()
+        width = otherSystemInfo.windowWidth
+        // #endif
+
+        let count = 2
+        if (width >= 1000) {
+            // #ifdef H5
+            count = 3 // H5端最多显示3列
+            // #endif
+            // #ifndef H5
+            count = 5
+            // #endif
+        } else if (width >= 750) {
+            // #ifdef H5
+            count = 3 // H5端最多显示3列
+            // #endif
+            // #ifndef H5
+            count = 4
+            // #endif
+        } else if (width >= 500) {
+            count = 3
+        } else {
+            count = 2
+        }
+
+        if (count !== columnCount.value) {
+            columnCount.value = count
+        }
+
+        // 计算间距：count=2 => 1，count=5 => 2，中间线性插值
+        const spacing = 2 - (count - 2) * (1 / 3)
+        // console.log('列数:', count, '间距:', spacing.toFixed(2))
+        columnSpace.value = spacing
     }
 
     onMounted(() => {

hook/useRealtimeRecorder.js

@@ -20,6 +20,7 @@ export function useAudioRecorder() {
 
     const recognizedText = ref('')
     const lastFinalText = ref('')
+    const isRecognizing = ref(false) // 识别状态，暴露给外部
 
     let audioStream = null
     let audioContext = null
@@ -132,11 +133,15 @@ export function useAudioRecorder() {
                     }
                     case 'TranscriptionCompleted': {
                         lastFinalText.value = ''
+                        isRecognizing.value = false // 识别完成，重置状态
                         // console.log('识别全部完成')
+                        cleanup()
                         break
                     }
                     case 'TaskFailed': {
                         console.error('识别失败:', msg?.header?.status_text)
+                        isRecognizing.value = false // 识别失败，重置状态
+                        cleanup()
                         break
                     }
                     default:
@@ -151,7 +156,104 @@ export function useAudioRecorder() {
         if (isRecording.value) return
         
         // #ifdef MP-WEIXIN
-        $api.msg('小程序暂不支持语音识别功能');
+        try {
+            recognizedText.value = ''
+            lastFinalText.value = ''
+            // 开始录音时不设置isRecognizing为true，只有在停止录音后才保持isRecognizing为true
+            
+            const recorderManager = uni.getRecorderManager()
+            
+            // 监听录音完成事件
+            recorderManager.onStop(async (res) => {
+                console.log('小程序录音完成:', res)
+                try {
+                    // 停止录音后设置isRecognizing为true，显示loading
+                    isRecognizing.value = true
+                    
+                    // 打印请求配置，便于调试
+                    console.log('准备上传语音识别请求配置:', {
+                        url: config.vioceBaseURl,
+                        name: 'file',
+                        method: 'POST',
+                        fileType: 'audio',
+                        filePath: res.tempFilePath
+                    })
+                    
+                    // 上传录音文件到服务器进行语音识别
+                    const uploadResult = await uni.uploadFile({
+                        url: config.vioceBaseURl,
+                        filePath: res.tempFilePath,
+                        name: 'file',
+                        fileType: 'audio',
+                        method: 'POST' // 显式设置为POST请求
+                    })
+                    
+                    console.log('语音识别上传结果:', uploadResult)
+                    
+                    if (uploadResult.statusCode === 200) {
+                        try {
+                            const result = JSON.parse(uploadResult.data)
+                            console.log('语音识别结果:', result)
+                            if (result.code === 200 && result.data) {
+                                recognizedText.value = result.data
+                                console.log('语音识别成功，识别结果:', recognizedText.value)
+                                // 语音识别成功后，自动发送消息
+                                // 这里需要触发一个事件，让父组件知道识别成功
+                                // 或者直接调用发送消息的方法
+                                isRecognizing.value = false // 识别成功，重置状态
+                            } else {
+                                console.error('语音识别返回错误:', result.message || '未知错误')
+                                $api.msg('语音识别失败，请重试')
+                                isRecognizing.value = false // 识别失败，重置状态
+                            }
+                        } catch (parseErr) {
+                            console.error('语音识别结果解析失败:', parseErr)
+                            $api.msg('语音识别失败，请重试')
+                            isRecognizing.value = false // 解析失败，重置状态
+                        }
+                    } else {
+                        console.error('语音识别请求失败，状态码:', uploadResult.statusCode)
+                        $api.msg('语音识别失败，请重试')
+                        isRecognizing.value = false // 请求失败，重置状态
+                    }
+                } catch (err) {
+                    console.error('语音识别上传失败:', err)
+                    $api.msg('语音识别失败，请重试')
+                    isRecognizing.value = false // 上传失败，重置状态
+                }
+            })
+            
+            // 监听录音错误事件
+            recorderManager.onError((err) => {
+                console.error('小程序录音错误:', err)
+                $api.msg('录音失败，请重试');
+                cleanup()
+            })
+            
+            // 微信小程序录音API
+            await recorderManager.start({
+                duration: 60000, // 最长录音60秒
+                sampleRate: 16000,
+                numberOfChannels: 1,
+                encodeBitRate: 96000,
+                format: 'mp3'
+            })
+            
+            isRecording.value = true
+            recordingDuration.value = 0
+            durationTimer = setInterval(() => recordingDuration.value++, 1000)
+            
+            // 监听录音事件（可选）
+            recorderManager.onFrameRecorded((res) => {
+                // 更新音量显示
+                volumeLevel.value = res.volume || 0
+                audioDataForDisplay.value = Array(16).fill(volumeLevel.value)
+            })
+        } catch (err) {
+            console.error('小程序录音启动失败:', err)
+            $api.msg('录音启动失败，请重试');
+            cleanup()
+        }
         return;
         // #endif
         
@@ -164,6 +266,7 @@ export function useAudioRecorder() {
             
             recognizedText.value = ''
             lastFinalText.value = ''
+            // 开始录音时不设置isRecognizing为true，只有在停止录音后才保持isRecognizing为true
             await connectWebSocket()
 
             audioStream = await navigator.mediaDevices.getUserMedia({
@@ -201,6 +304,7 @@ export function useAudioRecorder() {
             durationTimer = setInterval(() => recordingDuration.value++, 1000)
         } catch (err) {
             console.error('启动失败:', err)
+            isRecognizing.value = false // 启动失败，重置状态
             cleanup()
         }
         // #endif
@@ -210,6 +314,12 @@ export function useAudioRecorder() {
         if (!isRecording.value || isStopping.value) return
         isStopping.value = true
 
+        // #ifdef MP-WEIXIN
+        uni.getRecorderManager().stop()
+        // 小程序中录音停止后会触发onStop事件，在onStop事件中处理识别结果和状态重置
+        // #endif
+        
+        // #ifdef H5
         if (websocket?.readyState === WebSocket.OPEN) {
             websocket.send(JSON.stringify({
                 header: {
@@ -218,18 +328,39 @@ export function useAudioRecorder() {
                     message_id: generateUUID()
                 }
             }))
-            websocket.close()
+            // H5中不立即调用cleanup，等待识别完成
         }
+        // #endif
 
-        cleanup()
+        // 只清理录音相关资源，不重置识别状态
+        clearInterval(durationTimer)
+        audioStream?.getTracks().forEach(track => track.stop())
+        audioContext?.close()
+        audioStream = null
+        audioContext = null
+        audioInput = null
+        scriptProcessor = null
+        
+        isRecording.value = false
+        isSocketConnected.value = false
         isStopping.value = false
     }
 
     const cancelRecording = () => {
         if (!isRecording.value || isStopping.value) return
         isStopping.value = true
+        
+        // #ifdef MP-WEIXIN
+        uni.getRecorderManager().stop()
+        // #endif
+        
+        // #ifdef H5
         websocket?.close()
+        // #endif
+        
+        // 取消录音时重置所有状态
         cleanup()
+        isRecognizing.value = false
         isStopping.value = false
     }
 
@@ -249,16 +380,22 @@ export function useAudioRecorder() {
 
         isRecording.value = false
         isSocketConnected.value = false
+        isRecognizing.value = false // 停止录音，重置识别状态
     }
 
     onUnmounted(() => {
         if (isRecording.value) stopRecording()
     })
 
+    const reset = () => {
+        cleanup()
+    }
+
     return {
         isRecording,
         isStopping,
         isSocketConnected,
+        isRecognizing,
         recordingDuration,
         audioDataForDisplay,
         volumeLevel,
@@ -266,6 +403,7 @@ export function useAudioRecorder() {
         lastFinalText,
         startRecording,
         stopRecording,
-        cancelRecording
+        cancelRecording,
+        reset
     }
 }

main.js

@@ -9,20 +9,13 @@ import globalFunction from '@/common/globalFunction'
 import '@/lib/string-similarity.min.js'
 import similarityJobs from '@/utils/similarity_Job.js';
 import config from '@/config.js';
+import shareMixin from './mixins/share.js';
 // 组件
 import AppLayout from './components/AppLayout/AppLayout.vue';
 import Empty from './components/empty/empty.vue';
 import NoBouncePage from '@/components/NoBouncePage/NoBouncePage.vue'
 import MsgTips from '@/components/MsgTips/MsgTips.vue'
-import SelectPopup from '@/components/selectPopup/selectPopup.vue'
 import SelectPopupPlugin from '@/components/selectPopup/selectPopupPlugin';
-import RenderJobs from '@/components/renderJobs/renderJobs.vue';
-import RenderCompanys from '@/components/renderCompanys/renderCompanys.vue';
-import uniIcons from './uni_modules/uni-icons/components/uni-icons/uni-icons.vue'
-import uniPopup from './uni_modules/uni-popup/components/uni-popup/uni-popup.vue'
-import uniDataSelect from './uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue'
-import uniSwipeAction from './uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue'
-import uniSwipeActionItem from './uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue'
 import storeRc from './utilsRc/store/index.js'
 import {processFileUrl,} from '@/utilsRc/common.js'
 // iconfont.css 已在 App.vue 中通过 @import 引入，无需在此处重复引入
@@ -44,20 +37,15 @@ import { getDict } from '@/apiRc/system/dict.js';
 export function createApp() {
     const app = createSSRApp(App)
 
+    // 注册全局分享混入
+    app.mixin(shareMixin)
+
     app.component('AppLayout', AppLayout)
     app.component('Empty', Empty)
     app.component('NoBouncePage', NoBouncePage)
     app.component('MsgTips', MsgTips)
-    app.component('SelectPopup', SelectPopup)
-    app.component('RenderJobs', RenderJobs)
-    app.component('RenderCompanys', RenderCompanys)
-    app.component('uni-icons', uniIcons)
-    app.component('uni-popup', uniPopup)
-    app.component('uni-data-select', uniDataSelect)
-    app.component('uni-swipe-action', uniSwipeAction)
-    app.component('uni-swipe-action-item', uniSwipeActionItem)
-    
-    
+
+
     app.config.globalProperties.$processFileUrl = processFileUrl;
     app.config.globalProperties.$getDict = getDict;
     app.config.globalProperties.$store = storeRc;
@@ -94,4 +82,4 @@ export function createApp() {
         app,
         Pinia
     }
-}
+}

mixins/share.js

@@ -0,0 +1,16 @@
+export default {
+  onShareAppMessage() {
+    return {
+      title: '喀什智慧就业平台',
+      path: '/pages/index/index',
+      imageUrl: ''
+    };
+  },
+  onShareTimeline() {
+    return {
+      title: '喀什智慧就业平台',
+      path: '/pages/index/index',
+      imageUrl: ''
+    };
+  }
+};

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "ks-app",
+  "name": "ks-app-employment-service",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

packageA/pages/UnitDetails/UnitDetails.vue

@@ -25,9 +25,7 @@
 			</view>
 			<view class="conetent-info" :class="{ expanded: isExpanded }">
 				<view class="info-title">公司介绍</view>
-				<view class="info-desirption">{{
-          companyInfo?.description || '暂无公司介绍'
-        }}</view>
+				<view class="info-desirption" v-html="companyInfo?.description"></view>
 				<!-- <view class="info-title title2">公司地址</view>
                 <view class="locationCompany"></view> -->
 			</view>
@@ -39,8 +37,8 @@
 			<scroll-view scroll-y class="Detailscroll-view">
 				<view class="views">
 				<view class="Detail-title"><text class="title">在招职位</text></view>
-				<template v-if="companyInfo.jobList && companyInfo.jobList.length != 0">
-					<view v-for="job in companyInfo.jobList" :key="job.jobId">
+				<template v-if="jobInfoList && jobInfoList.length != 0">
+					<view v-for="job in jobInfoList" :key="job.jobId">
 						<view class="cards" @click="navToJobDetail(job.jobId)">
 							<view class="card-company">
 								<text class="company">{{ job.jobTitle }}</text>
@@ -116,6 +114,7 @@
 	const companyInfo = ref({
 		jobList: [],
 	});
+	const jobInfoList = ref([]);
 	const baseUrl = config.imgBaseUrl;
 	const getItemBackgroundStyle = (imageName) => ({
 		backgroundImage: `url(${baseUrl}/jobfair/${imageName})`,
@@ -141,6 +140,8 @@
 					isCollection: resData.data.isCollection || 0,
 					jobList: resData.data.jobList || [] // 使用正确的jobList字段
 				};
+				// 将职位列表数据赋值给jobInfoList，用于页面渲染
+				jobInfoList.value = resData.data.jobList || [];
 				console.log('Company details loaded successfully');
 			} else {
 				console.error('Failed to load company details:', resData?.msg || 'Unknown error');
@@ -152,6 +153,7 @@
 					isCollection: 0,
 					jobList: []
 				};
+				jobInfoList.value = [];
 			}
 		}).catch((error) => {
 			console.error('API error when fetching company details:', error);
@@ -163,6 +165,7 @@
 				isCollection: 0,
 				jobList: []
 			};
+			jobInfoList.value = [];
 		});
 	}
 
@@ -212,6 +215,10 @@
 	    
 	    if (options.job && typeof options.job === 'string') {
 	        try {
+				const job=JSON.parse(options.job)
+				if(job.jobInfoList.length > 0){
+					jobInfoList.value = job.jobInfoList
+				}
 	            companyInfo.value = JSON.parse(options.job);
 	        } catch (error) {
 	            console.error('Error parsing job data:', error);
@@ -360,6 +367,7 @@
 
 	// 跳转到职位详情页面
 	function navToJobDetail(jobId) {
+		return
 		if (jobId) {
 			navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(jobId)}`);
 		}
@@ -437,8 +445,13 @@
 				font-size: 28rpx;
 				color: #495265;
 				text-align: justified;
+				:deep(span) {
+					background-color: transparent !important;
+				}
+				:deep(p > span) {
+					background-color: transparent !important;
+				}
 			}
-
 			.title2 {
 				margin-top: 48rpx;
 			}

packageA/pages/cancelApplication/cancelApplication.vue

@@ -0,0 +1,99 @@
+<template>
+    <AppLayout :show-bg-image="false" :use-scroll-view="false">
+        <view class="collection-content">
+            <scroll-view scroll-y class="main-scroll" @scrolltolower="getJobList('add')">
+                <view class="one-cards">
+                    <view class="mian">
+                        <renderJobs
+                            seeDate="shareTime"
+                            v-if="pageState.list.length"
+                            :list="pageState.list"
+                            :longitude="longitudeVal"
+                            :latitude="latitudeVal"
+                        ></renderJobs>
+                        <empty v-else pdTop="200"></empty>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import dictLabel from '@/components/dict-Label/dict-Label.vue';
+import AppLayout from '@/components/AppLayout/AppLayout.vue';
+import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { onLoad, onShow, onReachBottom } from '@dcloudio/uni-app';
+import useUserStore from '@/stores/useUserStore';
+const { $api, navTo, vacanciesTo } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useLocationStore from '@/stores/useLocationStore';
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+const userStore = useUserStore();
+const state = reactive({});
+const pageState = reactive({
+    page: 0,
+    list: [],
+    total: 0,
+    maxPage: 1,
+    pageSize: 10,
+});
+onLoad(() => {
+    console.log('onLoad');
+    getJobList('refresh');
+});
+
+onReachBottom(() => {
+    getJobList();
+});
+
+function navToPost(jobId) {
+    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(jobId)}`);
+}
+
+function getJobList(type = 'add') {
+    if (type === 'refresh') {
+        pageState.page = 1;
+        pageState.maxPage = 1;
+    }
+    if (type === 'add' && pageState.page < pageState.maxPage) {
+        pageState.page += 1;
+    }
+    let params = {
+        current: pageState.page,
+        pageSize: pageState.pageSize,
+    };
+    $api.createRequest('/app/job/selectCencalList', params, 'GET').then((resData) => {
+        const { rows, total } = resData;
+        if (type === 'add') {
+            const str = pageState.pageSize * (pageState.page - 1);
+            const end = pageState.list.length;
+            const reslist = rows;
+            pageState.list.splice(str, end, ...reslist);
+        } else {
+            pageState.list = rows;
+        }
+        pageState.total = resData.total;
+        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+        console.log(pageState.list);
+    });
+}
+</script>
+
+<style lang="stylus" scoped>
+.collection-content
+    height: 100%
+    display: flex
+    flex-direction: column
+
+.main-scroll{
+    flex: 1
+    overflow: hidden
+}
+
+.one-cards{
+    padding: 0 28rpx 20rpx 28rpx;
+    background: #f4f4f4
+
+}
+</style>

packageA/pages/collection/compare.vue

@@ -2,82 +2,83 @@
     <view class="job-comparison-container">
         <scroll-view class="horizontal-scroll" scroll-x="true">
             <view class="comparison-table">
-                <view class="table-row table-header">
-                    <view class="table-cell fixed-column"></view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell job-title-cell">
-                        <text>{{ job.jobTitle }}</text>
-                        <text class="company">{{ job.company }}</text>
-                    </view>
+            <view class="table-row table-header">
+                <view class="table-cell fixed-column"></view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell job-title-cell">
+                    <text>{{ job?.jobTitle || '' }}</text>
+                    <text class="company">{{ job?.company || '' }}</text>
                 </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>薪资</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>
-                            <Salary-Expectation
-                                :max-salary="job.maxSalary"
-                                :min-salary="job.minSalary"
-                                :is-month="true"
-                            ></Salary-Expectation>
-                        </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>薪资</text>
+                </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view>
+                        <Salary-Expectation
+                            v-if="job"
+                            :max-salary="job.maxSalary"
+                            :min-salary="job.minSalary"
+                            :is-month="true"
+                        ></Salary-Expectation>
                     </view>
                 </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>公司名称</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.companyName }}</view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>公司名称</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view>{{ job?.companyName || '' }}</view>
+                </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>学历</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view><dict-Label dictType="education" :value="job.education"></dict-Label></view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>学历</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view><dict-Label dictType="education" :value="job?.education"></dict-Label></view>
+                </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>经验</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view><dict-Label dictType="experience" :value="job.experience"></dict-Label></view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>经验</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view><dict-Label dictType="experience" :value="job?.experience"></dict-Label></view>
+                </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>工作地点</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.jobLocation }}</view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>工作地点</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view>{{ job?.jobLocation || '' }}</view>
+                </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>来源</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.dataSource }}</view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>来源</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view>{{ job?.dataSource || '' }}</view>
+                </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>职位描述</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.description }}</view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>职位描述</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view>{{ job?.description || '' }}</view>
+                </view>
+            </view>
                 <view class="table-row">
                     <view class="table-cell fixed-column detail-label">
                         <text>工业</text>
@@ -85,9 +86,9 @@
                     <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
                         <view>
                             <dict-tree-Label
-                                v-if="jobInfo.company && jobInfo.company.industry"
+                                v-if="job.company && job.company.industry"
                                 dictType="industry"
-                                :value="jobInfo.company.industry"
+                                :value="job.company.industry"
                             ></dict-tree-Label>
                         </view>
                     </view>
@@ -98,7 +99,7 @@
                     </view>
                     <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
                         <view>
-                            <dict-Label dictType="scale" :value="jobInfo.company?.scale"></dict-Label>
+                            <dict-Label dictType="scale" :value="job.company?.scale"></dict-Label>
                         </view>
                     </view>
                 </view>
@@ -108,7 +109,7 @@
                     </view>
                     <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
                         <view>
-                            {{ job.isHot ? '是' : '否' }}
+                            {{ job?.isHot ? '是' : '否' }}
                         </view>
                     </view>
                 </view>
@@ -125,7 +126,7 @@ const jobs = ref([]);
 
 onLoad(() => {
     let compareData = uni.getStorageSync('compare');
-    jobs.value = compareData;
+    jobs.value = Array.isArray(compareData) ? compareData : [];
 });
 </script>
 

packageA/pages/complete-info/complete-info.vue

@@ -268,11 +268,11 @@ const openSelectPopup = (config) => {
     // #endif
 };
 const tabCurrent = ref(1);
-const salay = [2, 5, 10, 15, 20, 25, 30, 50, 80, 100];
+const salay = [2000, 5000, 10000, 15000, 20000, 25000, 30000, 50000, 80000, 100000];
 const state = reactive({
     station: [],
     stationCateLog: 1,
-    lfsalay: [2, 5, 10, 15, 20, 25, 30, 50],
+    lfsalay: [2000, 5000, 10000, 15000, 20000, 25000, 30000, 50000],
     risalay: JSON.parse(JSON.stringify(salay)),
     areaText: '',
     educationText: '',
@@ -364,7 +364,7 @@ const changeSkillName = (index) => {
     state.currentEditingSkillIndex = index;
     // 跳转到技能查询页面
     uni.navigateTo({
-        url: `/pages/complete-info/skill-search?selected=${encodeURIComponent(JSON.stringify([]))}`
+        url: `/packageA/pages/complete-info/skill-search?selected=${encodeURIComponent(JSON.stringify([]))}`
     });
 };
 
@@ -614,10 +614,10 @@ function changeSalay() {
         title: '薪资',
         maskClick: true,
         data: [state.lfsalay, state.risalay],
-        unit: 'k',
+        unit: '元',
         success: (_, [min, max]) => {
-            fromValue.salaryMin = min.value * 1000;
-            fromValue.salaryMax = max.value * 1000;
+            fromValue.salaryMin = min.value;
+            fromValue.salaryMax = max.value;
             state.salayText = `${fromValue.salaryMin}-${fromValue.salaryMax}`;
         },
         change(e) {

packageA/pages/exhibitors/exhibitors.vue

@@ -14,12 +14,12 @@
 					<view class="row1 line_2">{{ fairInfo?.jobFairTitle }}</view>
 					<view class="row2">
 						<text>{{ fairInfo?.jobFairAddress }}</text>
-						<convert-distance :alat="fairInfo?.latitude" :along="fairInfo?.longitude" :blat="latitudeVal"
-							:blong="longitudeVal"></convert-distance>
+						<!-- <convert-distance :alat="fairInfo?.latitude" :along="fairInfo?.longitude" :blat="latitudeVal"
+							:blong="longitudeVal"></convert-distance> -->
 					</view>
 				</view>
 			</view>
-			<view class="locations">
+			<!-- <view class="locations">
 				<image class="location-img" src="/static/icon/mapLine.png"></image>
 				<view class="location-info">
 					<view class="info">
@@ -27,14 +27,14 @@
 						<text class="info-text">位置</text>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="conetent-info" :class="{ expanded: isExpanded }">
 				<view class="info-title">内容描述</view>
 				<view class="info-desirption">{{ fairInfo?.jobFairIntroduction }}</view>
 				<!-- <view class="info-title title2">公司地址</view>
                 <view class="locationCompany"></view> -->
 				<view class="company-times">
-					<view class="info-title">内容描述</view>
+					<view class="info-title">招聘会时间</view>
 					<view class="card-times">
 						<view class="time-left">
 							<view class="left-date">{{ parseDateTime(fairInfo.jobFairStartTime).time }}</view>
@@ -105,9 +105,9 @@
 		</view>
 		<template #footer>
 			<view class="footer" v-if="hasnext">
-				<view class="btn-wq button-click" :class="{ 'btn-desbel': fairInfo.isSignUp==1 }"
-					@click="applyExhibitors">
-					{{ fairInfo.isSignUp==1 ? '已报名' : '报名招聘会' }}
+				<view class="btn-wq button-click" :class="{ 'btn-desbel': fairInfo.isSignUp==1 || isLoading }"
+					@click="applyExhibitors" :disabled="isLoading">
+					{{ isLoading ? '报名中...' : fairInfo.isSignUp==1 ? '已报名' : '报名招聘会' }}
 				</view>
 			</view>
 		</template>
@@ -161,6 +161,8 @@
 	// person个人   ent企业
 	const signRole = ref('ent');
 	const CompanySignPopup = ref(null)
+	// 报名loading状态
+	const isLoading = ref(false)
 
 	const jobFairId = ref(null)
 
@@ -253,6 +255,7 @@
 
 	// 报名招聘会
 	function applyExhibitors() {
+		if (isLoading.value) return
 		if (fairInfo.value.isSignUp == 1) {
 			$api.msg('请勿重复报名');
 			return
@@ -262,6 +265,7 @@
 		const headers = token ? {
 			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
 		} : {};
+		isLoading.value = true
 
 		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => {
 			if (resData.code == 200) {
@@ -271,6 +275,7 @@
 					signRole.value = userInfo.userType;
 					signDialogisshow.value = true
 					CompanySignPopup.value.open()
+					isLoading.value = false
 				}else{
 					$api.myRequest("/jobfair/public/job-fair-sign-up-person/sign-up", {
 						personId: userInfo.value.info.userId,
@@ -282,24 +287,29 @@
 								title: '报名成功',
 								icon: 'success'
 							});
-							getCompanyInfo(userInfo.value.info.userId, jobFairId.value)
+							fairInfo.value.isSignUp = 1;
+							getCompanyInfo(userInfo.value.info.userId, jobFairId.value);
 						} else {
 							uni.showToast({
 								title: res.msg || '报名失败',
 								icon: 'none'
 							});
 						}
+						isLoading.value = false
 					})
 					
 				}
 			} else {
 				$api.msg('请先登录');
-				setTimeout(() => {
-					uni.redirectTo({
-						url: '/packageB/login'
-					})
-				}, 1000)
+				// setTimeout(() => {
+				// 	uni.redirectTo({
+				// 		url: '/packageB/login'
+				// 	})
+				// }, 1000)
+				isLoading.value = false
 			}
+		}).catch(() => {
+			isLoading.value = false
 		});
 	}
 

packageA/pages/job/publishJob.vue

@@ -76,6 +76,18 @@
                         <view class="picker-text" data-placeholder="请选择学历要求">{{ selectedEducation || '请选择学历要求' }}</view>
                     </picker>
                 </view>
+                <view class="form-group">
+                    <view class="label">人员类型</view>
+                    <picker 
+                        mode="selector" 
+                        :range="staffTypes" 
+                        range-key="label"
+                        @change="onStaffTypeChange"
+                        class="picker"
+                    >
+                        <view class="picker-text" data-placeholder="请选择人员类型">{{ selectedStaffType || '请选择人员类型' }}</view>
+                    </picker>
+                </view>
                 <view class="form-group">
                     <view class="label">工作经验</view>
                     <picker 
@@ -111,15 +123,13 @@
                 </view>
                 <view class="form-group">
                     <view class="label">工作地点</view>
-                    <view class="location-input-container">
-                        <input 
-                            class="input location-input" 
-                            placeholder="请输入具体工作地址" 
-                            v-model="formData.jobLocation"
-                        />
-                        <view class="location-icon-btn" @click="chooseLocation">
-                            <uni-icons type="location" size="20" color="#333"></uni-icons>
-                        </view>
+                    <input 
+                        class="input" 
+                        placeholder="请输入具体工作地址" 
+                        v-model="formData.jobLocation"
+                    />
+                    <view class="location-text-btn" @click="chooseLocation">
+                        <text class="location-btn-text">获取定位</text>
                     </view>
                 </view>
                 <view class="form-group">
@@ -134,9 +144,53 @@
                         <view class="picker-text" data-placeholder="请选择岗位分类">{{ selectedJobCategory || '请选择岗位分类' }}</view>
                     </picker>
                 </view>
+                
+                <!-- 新增：岗位类型 -->
+                <view class="form-group">
+                    <view class="label">岗位标签</view>
+                    <view 
+                        class="picker"
+                        @click="openJobTypeSelector"
+                    >
+                        <view class="picker-text" :class="{ 'placeholder': !selectedJobTypeLabel }">
+                            {{ selectedJobTypeLabel || '请选择岗位标签' }}
+                        </view>
+                    </view>
+                </view>
             </view>
 
-            <!-- 岗位描述区块 -->
+            <!-- 图片上传区块 -->
+            <view class="form-block">
+                <view class="section-title">岗位图片</view>
+                <view class="form-group">
+                    <view class="upload-container">
+                        <view 
+                            class="upload-item upload-btn" 
+                            v-if="formData.images.length < 3"
+                            @click="chooseImage"
+                        >
+                            <view class="upload-icon">+</view>
+                            <view class="upload-text">上传图片</view>
+                        </view>
+                        <view 
+                            class="upload-item preview-item" 
+                            v-for="(image, index) in formData.images" 
+                            :key="index"
+                        >
+                            <image 
+                                :src="image.filePath" 
+                                class="preview-img"
+                                @click="previewImage(index)"
+                            ></image>
+                            <view class="delete-img-btn" @click="deleteImage(index)">
+                                <view class="delete-icon">×</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+        <!-- 岗位描述区块 -->
             <view class="form-block">
                 <view class="section-title">岗位描述</view>
                 <view class="form-group">
@@ -187,6 +241,14 @@
                                 v-model="contact.name"
                             />
                         </view>
+                        <view class="form-group">
+                            <view class="label">职位</view>
+                            <input 
+                                class="input" 
+                                placeholder="请输入职位" 
+                                v-model="contact.position"
+                            />
+                        </view>
                         <view class="form-group">
                             <view class="label">联系电话</view>
                             <input 
@@ -216,6 +278,9 @@
         
         <!-- 自定义tabbar -->
         <CustomTabBar :currentPage="1" />
+        
+        <!-- 岗位类型选择器 -->
+        <selectJobs ref="jobTypeSelector" />
     </view>
 </template>
 
@@ -224,9 +289,11 @@ import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import { onShow } from '@dcloudio/uni-app';
 import { storeToRefs } from 'pinia';
 import { createRequest } from '@/utils/request';
+import config from '@/config.js';
 import useDictStore from '@/stores/useDictStore';
 import useUserStore from '@/stores/useUserStore';
 import UniIcons from '@/uni_modules/uni-icons/components/uni-icons/uni-icons.vue';
+import selectJobs from '@/components/selectJobs/selectJobs.vue';
 const userStore = useUserStore();
 const cachedUserInfo = uni.getStorageSync('userInfo') || {};
 // 表单数据
@@ -238,7 +305,8 @@ const formData = reactive({
     vacancies: '', // 招聘人数
     description: '', // 对应接口字段 description
     jobRequirements: '',
-    jobCategory: '', // 新增：岗位分类
+    type: '', // 岗位分类（用户指示使用type字段）
+    jobCategory: '', // 岗位类型
     companyId: '', // 新增：企业id
     latitude: '', // 新增：纬度
     longitude: '', // 新增：经度
@@ -246,9 +314,12 @@ const formData = reactive({
     jobLocationAreaCode: '', // 新增：工作地点区县字典代码
     education: '', // 新增：学历要求字典值
     experience: '', // 新增：工作经验字典值
+    staffType: '', // 新增：人员类型
+    images: [], // 新增：岗位图片
     contacts: [
         {
             name: '',
+            position: '',
             phone: ''
         }
     ]
@@ -266,6 +337,7 @@ const experienceLevels = ref([]);
 const workDistricts = ref([]);
 const workLocations = ref([]);
 const jobCategories = ref([]); // 新增：岗位分类选项
+const staffTypes = ref([]); // 新增：人员类型选项
 
 // 选中的值
 const selectedEducation = ref('');
@@ -273,10 +345,16 @@ const selectedExperience = ref('');
 const selectedWorkDistrict = ref('');
 const selectedWorkLocation = ref('');
 const selectedJobCategory = ref('');
+const selectedJobTypeLabel = ref(''); // 新增：岗位类型显示文本
+const selectedJobTypeIds = ref(''); // 新增：岗位类型ID（多个用逗号分隔）
+const selectedStaffType = ref(''); // 新增：人员类型显示文本
 
 // 滚动视图高度
 const scrollViewHeight = ref('calc(100vh - 200rpx)');
 
+// 岗位类型选择器引用
+const jobTypeSelector = ref(null);
+
 // 计算滚动视图高度
 const calculateScrollViewHeight = () => {
     const systemInfo = uni.getSystemInfoSync();
@@ -373,22 +451,26 @@ const initFormData = async () => {
         // 设置区县选项（从字典获取）
         workDistricts.value = dictStore.state.area;
         
-        // 设置岗位分类选项
-        // 只有就业见习基地才能选择"实习实训"选项
+        // 设置岗位分类选项 - 从字典获取 position_type
+        const positionTypeDict = await dictStore.getDictSelectOption('position_type');
+        console.log('从字典获取的岗位类型数据:', positionTypeDict);
+        
+        // 过滤岗位类型选项：只有就业见习基地才能选择"实习实训"选项
+        // 假设实习实训的 value 为 '3'
         if (isInternshipBase.value) {
-            jobCategories.value = [
-                { label: '普通', value: '1' },
-                { label: '零工', value: '2' },
-                { label: '实习实训', value: '3' }
-            ];
+            // 如果是就业见习基地，显示所有选项
+            jobCategories.value = positionTypeDict;
         } else {
-            jobCategories.value = [
-                { label: '普通', value: '1' },
-                { label: '零工', value: '2' }
-            ];
+            // 如果不是就业见习基地，过滤掉实习实训选项
+            jobCategories.value = positionTypeDict.filter(item => item.dictSort !== 2);
         }
         console.log('岗位分类选项:', jobCategories.value);
         
+        // 设置人员类型选项 - 从字典获取 staffType
+        const staffTypeDict = await dictStore.getDictSelectOption('staff_type');
+        console.log('从字典获取的人员类型数据:', staffTypeDict);
+        staffTypes.value = staffTypeDict;
+        
         // 设置企业ID（从用户信息获取）
         if (userStore.userInfo && userStore.userInfo.id) {
             formData.companyId = userStore.userInfo.id;
@@ -447,7 +529,35 @@ const onJobCategoryChange = (e) => {
     const index = e.detail.value;
     const selectedItem = jobCategories.value[index];
     selectedJobCategory.value = selectedItem.label;
-    formData.jobCategory = selectedItem.value;
+    formData.type = selectedItem.value; // 岗位分类保存到type字段
+};
+
+// 新增：人员类型选择器change事件
+const onStaffTypeChange = (e) => {
+    const index = e.detail.value;
+    const selectedItem = staffTypes.value[index];
+    selectedStaffType.value = selectedItem.label;
+    formData.staffType = selectedItem.value; // 人员类型保存到staffType字段
+};
+
+// 打开岗位类型选择器
+const openJobTypeSelector = () => {
+    if (!jobTypeSelector.value) return;
+    
+    jobTypeSelector.value.open({
+        title: '选择岗位类型',
+        success: (ids, labels) => {
+            // 保存选中的岗位类型
+            selectedJobTypeIds.value = ids;
+            selectedJobTypeLabel.value = labels;
+            // 将岗位类型文字保存到formData.jobCategory字段
+            formData.jobCategory = labels;
+            console.log('选择的岗位类型ID:', ids, '标签:', labels);
+        },
+        cancel: () => {
+            console.log('取消选择岗位类型');
+        }
+    });
 };
 
 // 选择位置
@@ -473,6 +583,7 @@ const addContact = () => {
     if (formData.contacts.length < 3) {
         formData.contacts.push({
             name: '',
+            position: '',
             phone: ''
         });
     }
@@ -492,6 +603,101 @@ const goToCompanySearch = () => {
     });
 };
 
+// 图片选择
+const chooseImage = () => {
+    uni.chooseImage({
+        count: 3 - formData.images.length, // 最多可选择的图片数量
+        success: async (res) => {
+            uni.showLoading({
+                title: '上传中...'
+            });
+            
+            try {
+                for (const tempFilePath of res.tempFilePaths) {
+                    const uploadResult = await uploadImage(tempFilePath);
+                    formData.images.push(uploadResult);
+                }
+            } catch (error) {
+                console.error('上传失败:', error);
+                uni.showToast({
+                    title: '上传失败，请重试',
+                    icon: 'none'
+                });
+            } finally {
+                uni.hideLoading();
+            }
+        },
+        fail: (err) => {
+            console.error('选择图片失败:', err);
+        }
+    });
+};
+
+// 图片上传
+const uploadImage = (tempFilePath) => {
+    return new Promise((resolve, reject) => {
+        let Authorization = '';
+        if (useUserStore().token) {
+            Authorization = `${useUserStore().token}`;
+        }
+        
+        uni.uploadFile({
+            url: config.baseUrl + '/app/file/uploadFile',
+            filePath: tempFilePath,
+            name: 'file',
+            header: {
+                'Authorization': encodeURIComponent(Authorization)
+            },
+            success: (uploadFileRes) => {
+                if (uploadFileRes.statusCode === 200) {
+                    try {
+                        const result = JSON.parse(uploadFileRes.data);
+                        if (result.code === 200) {
+                            resolve(result);
+                        } else {
+                            reject(new Error(result.msg || '上传失败'));
+                        }
+                    } catch (e) {
+                        reject(new Error('解析上传结果失败'));
+                    }
+                } else {
+                    reject(new Error('网络请求失败'));
+                }
+            },
+            fail: (err) => {
+                reject(err);
+            }
+        });
+    });
+};
+
+// 删除图片
+const deleteImage = async (index) => {
+    const image = formData.images[index];
+    if (image.id) {
+        try {
+            await createRequest(`/app/file/${image.id}`, {}, 'DELETE', true);
+        } catch (error) {
+            console.error('删除图片失败:', error);
+            uni.showToast({
+                title: '删除图片失败',
+                icon: 'none'
+            });
+            return;
+        }
+    }
+    formData.images.splice(index, 1);
+};
+
+// 预览图片
+const previewImage = (index) => {
+    const urls = formData.images.map(image => image.filePath);
+    uni.previewImage({
+        current: index,
+        urls: urls
+    });
+};
+
 // 处理企业选择
 const handleCompanySelected = (company) => {
     formData.companyName = company.name;
@@ -501,10 +707,10 @@ const handleCompanySelected = (company) => {
 
 // 发布岗位
 const publishJob = async () => {
-    // 表单验证
-    if (!validateForm()) {
-        return;
-    }
+        // 表单验证
+        if (!validateForm()) {
+            return;
+        }
 
     try {
         uni.showLoading({
@@ -524,10 +730,17 @@ const publishJob = async () => {
             latitude: formData.latitude,
             longitude: formData.longitude,
             description: formData.description,
-            jobCategory: formData.jobCategory,
+            type: formData.type, // 岗位分类
+            jobCategory: formData.jobCategory, // 岗位类型
             companyId: formData.companyId,
             companyName: formData.companyName,
-            jobContactList: formData.contacts.filter(contact => contact.name.trim() && contact.phone.trim())
+            staffType: formData.staffType, // 新增：人员类型
+            jobContactList: formData.contacts.filter(contact => contact.name.trim() && contact.phone.trim()).map(contact => ({
+                contactPerson: contact.name,
+                contactPersonPhone: contact.phone,
+                position: contact.position
+            })),
+            filesList: formData.images.map(image => ({ bussinessid: image.bussinessid })) // 新增：岗位图片列表，使用bussinessid
         };
         
         // 调试信息：打印companyId
@@ -576,16 +789,20 @@ const validateForm = () => {
         { field: 'minSalary', message: '请输入最小薪资' },
         { field: 'maxSalary', message: '请输入最大薪资' },
         { field: 'education', message: '请选择学历要求' },
+        { field: 'staffType', message: '请选择人员类型' },
         { field: 'experience', message: '请选择工作经验' },
         { field: 'jobLocation', message: '请选择工作地点' },
         { field: 'jobLocationAreaCode', message: '请选择工作区县' },
         { field: 'vacancies', message: '请输入招聘人数' },
         { field: 'description', message: '请输入岗位描述' },
-        { field: 'jobCategory', message: '请选择岗位分类' }
+        { field: 'type', message: '请选择岗位分类' },
+        { field: 'jobCategory', message: '请选择岗位类型' }
     ];
 
     for (const { field, message } of requiredFields) {
-        if (!formData[field] || formData[field].toString().trim() === '') {
+        const value = formData[field];
+        // 特殊处理：0 应该被视为有效值
+        if (value === undefined || value === null || value === '' || value.toString().trim() === '') {
             uni.showToast({
                 title: message,
                 icon: 'none'
@@ -594,6 +811,15 @@ const validateForm = () => {
         }
     }
 
+    // 验证定位信息
+    if (!formData.latitude || !formData.longitude) {
+        uni.showToast({
+            title: '请点击"获取定位"按钮获取工作地点位置',
+            icon: 'none'
+        });
+        return false;
+    }
+
     // 薪资验证
     const minSalary = parseFloat(formData.minSalary);
     const maxSalary = parseFloat(formData.maxSalary);
@@ -792,36 +1018,28 @@ const validateForm = () => {
         }
     }
     
-    // 工作地点输入容器样式
-    .location-input-container {
+    // 工作地点文字按钮样式
+    .location-text-btn {
+        width: 100%;
+        height: 80rpx;
+        background: #256BFA;
+        border: none;
+        border-radius: 12rpx;
         display: flex;
         align-items: center;
-        position: relative;
+        justify-content: center;
+        margin-top: 20rpx;
+        transition: all 0.3s ease;
         
-        .location-input {
-            flex: 1;
-            padding-right: 100rpx;
+        .location-btn-text {
+            font-size: 28rpx;
+            color: #fff;
+            font-weight: 500;
         }
         
-        .location-icon-btn {
-            position: absolute;
-            right: 0;
-            top: 44%;
-            transform: translateY(-50%);
-            width: 80rpx;
-            height: 60rpx;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            background: #f0f0f0;
-            border: none;
-            border-radius: 12rpx;
-            transition: all 0.3s ease;
-            z-index: 99;
-            
-            &:active {
-                transform: translateY(-50%) scale(0.95);
-            }
+        &:active {
+            background: #1a5cd9;
+            transform: scale(0.98);
         }
     }
 }
@@ -1035,6 +1253,85 @@ const validateForm = () => {
 }
 /* #endif */
 
+/* 图片上传样式 */
+.upload-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20rpx;
+    padding: 20rpx 0;
+}
+
+.upload-item {
+    width: 200rpx;
+    height: 200rpx;
+    border-radius: 12rpx;
+    position: relative;
+    box-sizing: border-box;
+}
+
+.upload-btn {
+    background-color: #f5f5f5;
+    border: 2rpx dashed #ddd;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    
+    &:active {
+        background-color: #e8e8e8;
+    }
+}
+
+.upload-icon {
+    font-size: 60rpx;
+    color: #999;
+    margin-bottom: 10rpx;
+    font-weight: 500;
+}
+
+.upload-text {
+    font-size: 24rpx;
+    color: #999;
+}
+
+.preview-item {
+    overflow: hidden;
+    background-color: #f5f5f5;
+}
+
+.preview-img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.delete-img-btn {
+    position: absolute;
+    top: 10rpx;
+    right: 10rpx;
+    width: 40rpx;
+    height: 40rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    
+    &:active {
+        background-color: rgba(0, 0, 0, 0.8);
+    }
+}
+
+.delete-icon {
+    font-size: 32rpx;
+    color: #fff;
+    font-weight: bold;
+}
+
 /* #ifdef MP-WEIXIN */
 .publish-job-page {
     position: fixed;

packageA/pages/jobExpect/jobExpect.vue

@@ -67,9 +67,9 @@ const { dictLabel, oneDictData, getDictData } = useDictStore();
 const selectJobsModel = ref();
 const selectPopupRef = ref();
 const percent = ref('0%');
-const salay = [2, 5, 10, 15, 20, 25, 30, 50, 80, 100];
+const salay = [2000, 5000, 10000, 15000, 20000, 25000, 30000, 50000, 80000, 100000];
 const state = reactive({
-    lfsalay: [2, 5, 10, 15, 20, 25, 30, 50],
+    lfsalay: [2000, 5000, 10000, 15000, 20000, 25000, 30000, 50000],
     risalay: JSON.parse(JSON.stringify(salay)),
     salayText: '',
     areaText: '',
@@ -81,10 +81,16 @@ const fromValue = reactive({
     area: '',
     jobTitleId: [],
 });
-onLoad(async () => {
+const needSkill = ref(false);
+
+onLoad(async (options) => {
     // 初始化字典数据
     await getDictData();
     initLoad();
+    // 检查是否需要继续跳转到技能页面
+    if (options && options.needSkill === 'true') {
+        needSkill.value = true;
+    }
 });
 const confirm = () => {
     if (!fromValue.jobTitleId) {
@@ -94,7 +100,12 @@ const confirm = () => {
         $api.msg('完成');
         state.disbleDate = true;
         getUserResume().then(() => {
-            navBack();
+            // 如果需要继续跳转到技能页面，则跳转到个人信息页面（携带 needSkill 标记，便于返回两级）
+            if (needSkill.value) {
+                navTo('/packageA/pages/personalInfo/personalInfo?needSkill=true');
+            } else {
+                navBack();
+            }
         });
     });
 };
@@ -126,10 +137,10 @@ const changeSalary = () => {
         title: '薪资',
         maskClick: true,
         data: [state.lfsalay, state.risalay],
-        unit: 'k',
+        unit: '元',
         success: (_, [min, max]) => {
-            fromValue.salaryMin = min.value * 1000;
-            fromValue.salaryMax = max.value * 1000;
+            fromValue.salaryMin = min.value;
+            fromValue.salaryMax = max.value;
             state.salayText = `${fromValue.salaryMin}-${fromValue.salaryMax}`;
         },
         change(e) {

packageA/pages/myResume/myResume.vue

@@ -51,7 +51,7 @@
             </view>
             <view class="mys-text">
                 <text>期望薪资：</text>
-                <text>{{ userInfo.salaryMin / 1000 }}k-{{ userInfo.salaryMax / 1000 }}k</text>
+                <text>{{ userInfo.salaryMin }}元-{{ userInfo.salaryMax }}元</text>
             </view>
             <view class="mys-text">
                 <text>期望工作地：</text>

packageA/pages/nearby/components/four.vue

@@ -1,5 +1,5 @@
 <template>
-    <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
+    <view class="nearby-container">
         <view class="two-head">
             <view
                 class="head-item"
@@ -11,66 +11,68 @@
                 {{ item.commercialAreaName }}
             </view>
         </view>
-        <view class="nearby-list">
-            <view class="nav-filter" @touchmove.stop.prevent>
-                <view class="filter-top">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-                        <view class="jobs-left">
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === 'all' }"
-                                @click="choosePosition('all')"
-                            >
-                                全部
+        <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+            <view class="nearby-list">
+                <view class="nav-filter" @touchmove.stop.prevent>
+                    <view class="filter-top">
+                        <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                            <view class="jobs-left">
+                                <view
+                                    class="job button-click"
+                                    :class="{ active: state.tabIndex === 'all' }"
+                                    @click="choosePosition('all')"
+                                >
+                                    全部
+                                </view>
+                                <view
+                                    class="job button-click"
+                                    :class="{ active: state.tabIndex === index }"
+                                    v-for="(item, index) in userInfo.jobTitle"
+                                    :key="index"
+                                    @click="choosePosition(index)"
+                                >
+                                    {{ item }}
+                                </view>
                             </view>
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === index }"
-                                v-for="(item, index) in userInfo.jobTitle"
-                                :key="index"
-                                @click="choosePosition(index)"
-                            >
-                                {{ item }}
-                            </view>
-                        </view>
-                    </scroll-view>
-                    <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
-                        <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
-                        <text>添加</text>
-                    </view>
-                </view>
-                <view class="filter-bottom">
-                    <view class="btm-left">
-                        <view
-                            class="button-click filterbtm"
-                            :class="{ active: pageState.search.order === item.value }"
-                            v-for="item in rangeOptions"
-                            @click="handelHostestSearch(item)"
-                            :key="item.value"
-                        >
-                            {{ item.text }}
+                        </scroll-view>
+                        <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
+                            <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
+                            <text>添加</text>
                         </view>
                     </view>
-                    <view class="btm-right button-click" @click="openFilter">
-                        筛选
-                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                    <view class="filter-bottom">
+                        <view class="btm-left">
+                            <view
+                                class="button-click filterbtm"
+                                :class="{ active: pageState.search.order === item.value }"
+                                v-for="item in rangeOptions"
+                                @click="handelHostestSearch(item)"
+                                :key="item.value"
+                            >
+                                {{ item.text }}
+                            </view>
+                        </view>
+                        <view class="btm-right button-click" @click="openFilter">
+                            筛选
+                            <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                        </view>
                     </view>
                 </view>
+                <view class="one-cards">
+                    <renderJobs
+                        v-if="list.length"
+                        :list="list"
+                        :longitude="longitudeVal"
+                        :latitude="latitudeVal"
+                    ></renderJobs>
+                    <empty v-else pdTop="60"></empty>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
             </view>
-            <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
-            </view>
-        </view>
+        </scroll-view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
-    </scroll-view>
+    </view>
 </template>
 
 <script setup>
@@ -273,9 +275,20 @@ defineExpose({ loadData, handleFilterConfirm });
 <style lang="stylus" scoped>
 .tabchecked
     color:  #4778EC !important
-.nearby-scroll
+
+.nearby-container
+    // 确保容器占据整个可用视口高度，包括安全区域
+    height: calc(100vh - var(--window-top));
+    display: flex;
+    flex-direction: column;
     overflow: hidden;
-    .two-head
+    
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+    flex: 1;
+    overflow: hidden;
+    
+.two-head
         margin: 22rpx;
         display: flex;
         flex-wrap: wrap
@@ -303,7 +316,6 @@ defineExpose({ loadData, handleFilterConfirm });
             border-radius: 12rpx 12rpx 12rpx 12rpx;
 .nearby-list
     border-top: 2rpx solid #EBEBEB;
-    height: 100%
     .one-cards{
         display: flex;
         flex-direction: column;

packageA/pages/nearby/components/one.vue

@@ -1,6 +1,11 @@
 <template>
-    <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
-        <view class="nearby-map" @touchmove.stop.prevent>
+    <view class="nearby-container">
+        <!-- 地图区域 - 可折叠 -->
+        <view 
+            class="nearby-map" 
+            @touchmove.stop.prevent
+            :class="{ 'map-collapsed': isMapCollapsed }"
+        >
             <map
                 style="width: 100%; height: 400px"
                 :latitude="latitudeVal"
@@ -22,71 +27,79 @@
                         </view>
                     </view>
                 </transition>
-                <!-- <view class="select-list" v-show="!rangeShow">
-                    <view class="list-item" v-for="(item, index) in range">{{ item }}km</view>
-                </view> -->
             </view>
         </view>
-        <view class="nearby-list">
-            <view class="nav-filter" @touchmove.stop.prevent>
-                <view class="filter-top">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-                        <view class="jobs-left">
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === 'all' }"
-                                @click="choosePosition('all')"
-                            >
-                                全部
-                            </view>
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === index }"
-                                v-for="(item, index) in userInfo.jobTitle"
-                                :key="index"
-                                @click="choosePosition(index)"
-                            >
-                                {{ item }}
-                            </view>
-                        </view>
-                    </scroll-view>
-                    <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
-                        <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
-                        <text>添加</text>
-                    </view>
-                </view>
-                <view class="filter-bottom">
-                    <view class="btm-left">
+        <!-- 筛选条件 - 固定显示 -->
+        <view class="nav-filter" @touchmove.stop.prevent>
+            <view class="filter-top">
+                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                    <view class="jobs-left">
                         <view
-                            class="button-click filterbtm"
-                            :class="{ active: pageState.search.order === item.value }"
-                            v-for="item in rangeOptions"
-                            @click="handelHostestSearch(item)"
-                            :key="item.value"
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === 'all' }"
+                            @click="choosePosition('all')"
                         >
-                            {{ item.text }}
+                            全部
+                        </view>
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === index }"
+                            v-for="(item, index) in userInfo.jobTitle"
+                            :key="index"
+                            @click="choosePosition(index)"
+                        >
+                            {{ item }}
                         </view>
                     </view>
-                    <view class="btm-right button-click" @click="openFilter">
-                        筛选
-                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
-                    </view>
+                </scroll-view>
+                <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
+                    <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
+                    <text>添加</text>
                 </view>
             </view>
-            <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
+            <view class="filter-bottom">
+                <view class="btm-left">
+                    <view
+                        class="button-click filterbtm"
+                        :class="{ active: pageState.search.order === item.value }"
+                        v-for="item in rangeOptions"
+                        @click="handelHostestSearch(item)"
+                        :key="item.value"
+                    >
+                        {{ item.text }}
+                    </view>
+                </view>
+                <view class="btm-right button-click" @click="openFilter">
+                    筛选
+                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                </view>
             </view>
         </view>
+        <!-- 列表滚动区域 -->
+        <scroll-view 
+            :scroll-y="true" 
+            class="nearby-scroll" 
+            @scrolltolower="scrollBottom" 
+            lower-threshold="50"
+            ref="scrollViewRef"
+            @scroll="handleScroll"
+        >
+            <view class="nearby-list">
+                <view class="one-cards">
+                    <renderJobs
+                        v-if="list.length"
+                        :list="list"
+                        :longitude="longitudeVal"
+                        :latitude="latitudeVal"
+                    ></renderJobs>
+                    <empty v-else pdTop="60"></empty>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
+            </view>
+        </scroll-view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
-    </scroll-view>
+    </view>
 </template>
 
 <script setup>
@@ -107,6 +120,8 @@ const range = ref([1, 2, 4, 6, 8, 10]);
 const rangeShow = ref(false);
 
 const selectFilterModel = ref(null);
+const scrollViewRef = ref(null);
+const isMapCollapsed = ref(false);
 const tMap = ref();
 const progress = ref();
 const mapCovers = ref([]);
@@ -264,6 +279,13 @@ function progressChange(value) {
     debounceAjax('refresh');
 }
 
+// 处理滚动事件，实现地图折叠
+function handleScroll(e) {
+    const scrollTop = e.detail.scrollTop;
+    // 当滚动超过100rpx时，折叠地图
+    isMapCollapsed.value = scrollTop > 100;
+}
+
 let debounceAjax = debounce(getJobList, 500);
 function getJobList(type = 'add') {
     if (type === 'add' && pageState.page < pageState.maxPage) {
@@ -363,78 +385,97 @@ defineExpose({ loadData, handleFilterConfirm });
         }
     }
 }
-.nearby-scroll
+.nearby-container
+    // 确保容器占据整个可用视口高度，包括安全区域
+    height: calc(100vh - var(--window-top));
+    display: flex;
+    flex-direction: column;
     overflow: hidden;
-    .nearby-map
-        height: 767rpx;
-        background: #e8e8e8;
-        overflow: hidden
+    
+.nearby-map
+    height: 767rpx;
+    background: #e8e8e8;
+    overflow: hidden
+    transition: height 0.3s ease;
+    
+    &.map-collapsed {
+        height: 0;
+        overflow: hidden;
+    }
+    
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+    flex: 1;
+    overflow: hidden;
+    transition: flex 0.3s ease;
 .nearby-list
     .one-cards{
         display: flex;
         flex-direction: column;
         padding: 0 20rpx 20rpx 20rpx;
         background: #f4f4f4
-        height: 100%
     }
-    .nav-filter
-        padding: 16rpx 28rpx 0 28rpx
-        .filter-top
-            display: flex
-            justify-content: space-between;
-            .tab-scroll
-                flex: 1;
-                overflow: hidden;
-                margin-right: 20rpx
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: clip;
-                -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
-                mask-image: linear-gradient(to right, black 60%, transparent);
-                .jobs-left
-                    display: flex
-                    flex-wrap: nowrap
-                    .job
-                        font-weight: 400;
-                        font-size: 36rpx;
-                        color: #666D7F;
-                        margin-right: 32rpx;
-                        white-space: nowrap
-                    .active
-                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-                        font-weight: 500;
-                        font-size: 36rpx;
-                        color: #000000;
-            .jobs-add
+
+// 筛选条件样式 - 顶级选择器
+.nav-filter
+    padding: 16rpx 28rpx 0 28rpx
+    background: #ffffff
+    .filter-top
+        display: flex
+        justify-content: space-between;
+        .tab-scroll
+            flex: 1;
+            overflow: hidden;
+            margin-right: 20rpx
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: clip;
+            -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+            mask-image: linear-gradient(to right, black 60%, transparent);
+            .jobs-left
                 display: flex
-                align-items: center;
-                justify-content: center;
+                flex-wrap: nowrap
+                .job
+                    font-weight: 400;
+                    font-size: 36rpx;
+                    color: #666D7F;
+                    margin-right: 32rpx;
+                    white-space: nowrap
+                .active
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                    font-weight: 500;
+                    font-size: 36rpx;
+                    color: #000000;
+        .jobs-add
+            display: flex
+            align-items: center;
+            justify-content: center;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #666D7F;
+            line-height: 38rpx;
+    .filter-bottom
+        display: flex
+        justify-content: space-between
+        padding: 24rpx 0
+        .btm-left
+            display: flex
+            .filterbtm
                 font-weight: 400;
                 font-size: 32rpx;
                 color: #666D7F;
-                line-height: 38rpx;
-        .filter-bottom
-            display: flex
-            justify-content: space-between
-            padding: 24rpx 0
-            .btm-left
-                display: flex
-                .filterbtm
-                    font-weight: 400;
-                    font-size: 32rpx;
-                    color: #666D7F;
-                    margin-right: 40rpx
-                .active
-                    font-weight: 500;
-                    font-size: 32rpx;
-                    color: #256BFA;
-            .btm-right
-                font-weight: 400;
+                margin-right: 40rpx
+            .active
+                font-weight: 500;
                 font-size: 32rpx;
-                color: #6C7282;
-                .right-sx
-                    width: 26rpx;
-                    height: 26rpx;
-                .active
-                    transform: rotate(180deg)
+                color: #256BFA;
+        .btm-right
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #6C7282;
+            .right-sx
+                width: 26rpx;
+                height: 26rpx;
+            .active
+                transform: rotate(180deg)
 </style>

packageA/pages/nearby/components/three.vue

@@ -1,5 +1,5 @@
 <template>
-    <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
+    <view class="nearby-container">
         <view class="three-head" @touchmove.stop.prevent>
             <view class="one-picker">
                 <view class="oneleft button-click" @click="openFilterSubway">
@@ -48,66 +48,69 @@
                 </view>
             </scroll-view>
         </view>
-        <view class="nearby-list">
-            <view class="nav-filter" @touchmove.stop.prevent>
-                <view class="filter-top">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-                        <view class="jobs-left">
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === 'all' }"
-                                @click="choosePosition('all')"
-                            >
-                                全部
-                            </view>
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === index }"
-                                v-for="(item, index) in userInfo.jobTitle"
-                                :key="index"
-                                @click="choosePosition(index)"
-                            >
-                                {{ item }}
-                            </view>
-                        </view>
-                    </scroll-view>
-                    <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
-                        <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
-                        <text>添加</text>
-                    </view>
-                </view>
-                <view class="filter-bottom">
-                    <view class="btm-left">
+        <!-- 筛选项移到scroll-view外面 -->
+        <view class="nav-filter" @touchmove.stop.prevent>
+            <view class="filter-top">
+                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                    <view class="jobs-left">
                         <view
-                            class="button-click filterbtm"
-                            :class="{ active: pageState.search.order === item.value }"
-                            v-for="item in rangeOptions"
-                            @click="handelHostestSearch(item)"
-                            :key="item.value"
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === 'all' }"
+                            @click="choosePosition('all')"
                         >
-                            {{ item.text }}
+                            全部
+                        </view>
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === index }"
+                            v-for="(item, index) in userInfo.jobTitle"
+                            :key="index"
+                            @click="choosePosition(index)"
+                        >
+                            {{ item }}
                         </view>
                     </view>
-                    <view class="btm-right button-click" @click="openFilter">
-                        筛选
-                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
-                    </view>
+                </scroll-view>
+                <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
+                    <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
+                    <text>添加</text>
                 </view>
             </view>
-            <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
+            <view class="filter-bottom">
+                <view class="btm-left">
+                    <view
+                        class="button-click filterbtm"
+                        :class="{ active: pageState.search.order === item.value }"
+                        v-for="item in rangeOptions"
+                        @click="handelHostestSearch(item)"
+                        :key="item.value"
+                    >
+                        {{ item.text }}
+                    </view>
+                </view>
+                <view class="btm-right button-click" @click="openFilter">
+                    筛选
+                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                </view>
             </view>
         </view>
+        <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+            <view class="nearby-list">
+                <view class="one-cards">
+                    <renderJobs
+                        v-if="list.length"
+                        :list="list"
+                        :longitude="longitudeVal"
+                        :latitude="latitudeVal"
+                    ></renderJobs>
+                    <empty v-else pdTop="60"></empty>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
+            </view>
+        </scroll-view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
-    </scroll-view>
+    </view>
 </template>
 
 <script setup>
@@ -358,9 +361,18 @@ defineExpose({ loadData, handleFilterConfirm });
         transform: rotate(180deg)
 .tabchecked
     color:  #4778EC !important;
+
+.nearby-container
+    // 确保容器占据整个可用高度
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    
 .nearby-scroll
-    overflow: hidden;
-    .three-head
+    // 为scroll-view设置明确高度，减去nav-filter的高度
+    height: calc(100vh - var(--window-top) - var(--status-bar-height) - 63rpx - 200rpx - 120rpx);
+    
+.three-head
         margin: 24rpx 0 0 0;
         padding: 26rpx 0 0 0;
         border-radius: 17rpx 17rpx 17rpx 17rpx;
@@ -482,71 +494,72 @@ defineExpose({ loadData, handleFilterConfirm });
                     border-radius: 17rpx 17rpx 17rpx 17rpx;
                     z-index: 1;
 .nearby-list
-    border-top: 2rpx solid #EBEBEB;
     .one-cards{
         display: flex;
         flex-direction: column;
         padding: 0 20rpx 20rpx 20rpx;
         background: #f4f4f4
     }
-    .nav-filter
-        padding: 16rpx 28rpx 0 28rpx
-        .filter-top
-            display: flex
-            justify-content: space-between;
-            .tab-scroll
-                flex: 1;
-                overflow: hidden;
-                margin-right: 20rpx
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: clip;
-                -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
-                mask-image: linear-gradient(to right, black 60%, transparent);
-                .jobs-left
-                    display: flex
-                    flex-wrap: nowrap
-                    .job
-                        font-weight: 400;
-                        font-size: 36rpx;
-                        color: #666D7F;
-                        margin-right: 32rpx;
-                        white-space: nowrap
-                    .active
-                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-                        font-weight: 500;
-                        font-size: 36rpx;
-                        color: #000000;
-            .jobs-add
+.nav-filter
+    border-top: 2rpx solid #EBEBEB;
+    padding: 16rpx 28rpx 0 28rpx;
+    margin-top: 125rpx;
+    .filter-top
+        display: flex
+        justify-content: space-between;
+        .tab-scroll
+            flex: 1;
+            overflow: hidden;
+            margin-right: 20rpx
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: clip;
+            -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+            mask-image: linear-gradient(to right, black 60%, transparent);
+            .jobs-left
                 display: flex
-                align-items: center;
-                justify-content: center;
+                flex-wrap: nowrap
+                .job
+                    font-weight: 400;
+                    font-size: 36rpx;
+                    color: #666D7F;
+                    margin-right: 32rpx;
+                    white-space: nowrap
+                .active
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                    font-weight: 500;
+                    font-size: 36rpx;
+                    color: #000000;
+        .jobs-add
+            display: flex
+            align-items: center;
+            justify-content: center;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #666D7F;
+            line-height: 38rpx;
+    .filter-bottom
+        display: flex
+        justify-content: space-between
+        padding: 24rpx 0
+        .btm-left
+            display: flex
+            .filterbtm
                 font-weight: 400;
                 font-size: 32rpx;
                 color: #666D7F;
-                line-height: 38rpx;
-        .filter-bottom
-            display: flex
-            justify-content: space-between
-            padding: 24rpx 0
-            .btm-left
-                display: flex
-                .filterbtm
-                    font-weight: 400;
-                    font-size: 32rpx;
-                    color: #666D7F;
-                    margin-right: 40rpx
-                .active
-                    font-weight: 500;
-                    font-size: 32rpx;
-                    color: #256BFA;
-            .btm-right
-                font-weight: 400;
+                margin-right: 40rpx
+            .active
+                font-weight: 500;
                 font-size: 32rpx;
-                color: #6C7282;
-                .right-sx
-                    width: 26rpx;
-                    height: 26rpx;
-                .active
-                    transform: rotate(180deg)
+                color: #256BFA;
+        .btm-right
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #6C7282;
+            .right-sx
+                width: 26rpx;
+                height: 26rpx;
+            .active
+                transform: rotate(180deg)
 </style>

packageA/pages/nearby/components/two.vue

@@ -1,6 +1,10 @@
 <template>
-    <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
-        <view class="two-head">
+    <view class="nearby-container">
+        <!-- 区县选择区域 - 可折叠 -->
+        <view 
+            class="two-head"
+            :class="{ 'area-collapsed': isAreaCollapsed }"
+        >
             <view
                 class="head-item"
                 :class="{ active: item.value === fromValue.area }"
@@ -18,66 +22,72 @@
                 不限区域
             </view>
         </view>
-        <view class="nearby-list">
-            <view class="nav-filter" @touchmove.stop.prevent>
-                <view class="filter-top">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-                        <view class="jobs-left">
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === 'all' }"
-                                @click="choosePosition('all')"
-                            >
-                                全部
-                            </view>
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === index }"
-                                v-for="(item, index) in userInfo.jobTitle"
-                                :key="index"
-                                @click="choosePosition(index)"
-                            >
-                                {{ item }}
-                            </view>
-                        </view>
-                    </scroll-view>
-                    <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
-                        <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
-                        <text>添加</text>
-                    </view>
-                </view>
-                <view class="filter-bottom">
-                    <view class="btm-left">
+        <!-- 筛选条件 - 固定显示 -->
+        <view class="nav-filter" @touchmove.stop.prevent>
+            <view class="filter-top">
+                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                    <view class="jobs-left">
                         <view
-                            class="button-click filterbtm"
-                            :class="{ active: pageState.search.order === item.value }"
-                            v-for="item in rangeOptions"
-                            @click="handelHostestSearch(item)"
-                            :key="item.value"
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === 'all' }"
+                            @click="choosePosition('all')"
                         >
-                            {{ item.text }}
+                            全部
+                        </view>
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === index }"
+                            v-for="(item, index) in userInfo.jobTitle"
+                            :key="index"
+                            @click="choosePosition(index)"
+                        >
+                            {{ item }}
                         </view>
                     </view>
-                    <view class="btm-right button-click" @click="openFilter">
-                        筛选
-                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
-                    </view>
+                </scroll-view>
+                <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
+                    <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
+                    <text>添加</text>
                 </view>
             </view>
-            <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
+            <view class="filter-bottom">
+                <view class="btm-left">
+                    <view
+                        class="button-click filterbtm"
+                        :class="{ active: pageState.search.order === item.value }"
+                        v-for="item in rangeOptions"
+                        @click="handelHostestSearch(item)"
+                        :key="item.value"
+                    >
+                        {{ item.text }}
+                    </view>
+                </view>
+                <view class="btm-right button-click" @click="openFilter">
+                    筛选
+                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                </view>
             </view>
         </view>
+        <!-- 列表滚动区域 -->
+        <scroll-view 
+            :scroll-y="true" 
+            class="nearby-scroll" 
+            @scrolltolower="scrollBottom" 
+            lower-threshold="50"
+            ref="scrollViewRef"
+            @scroll="handleScroll"
+        >
+            <view class="nearby-list">
+                <view class="one-cards">
+                    <renderJobs v-if="list.length" :list="list"></renderJobs>
+                    <empty v-else pdTop="60"></empty>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
+            </view>
+        </scroll-view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
-    </scroll-view>
+    </view>
 </template>
 
 <script setup>
@@ -103,6 +113,8 @@ const state = reactive({
 const isLoaded = ref(false);
 const showFilter = ref(false);
 const selectFilterModel = ref();
+const scrollViewRef = ref(null);
+const isAreaCollapsed = ref(false);
 const fromValue = reactive({
     area: 0,
 });
@@ -192,8 +204,20 @@ function scrollBottom() {
 // }
 function changeArea(area, item) {
     fromValue.area = area;
+    // 切换区县时列表置顶
+    if (scrollViewRef.value) {
+        scrollViewRef.value.scrollTop = 0;
+    }
     getJobList('refresh');
 }
+
+// 处理滚动事件，实现区县选择区域折叠
+function handleScroll(e) {
+    const scrollTop = e.detail.scrollTop;
+    // 当滚动超过100rpx时，折叠区县选择区域
+    isAreaCollapsed.value = scrollTop > 100;
+    console.log('scrollTop:', scrollTop, 'collapsed:', isAreaCollapsed.value);
+}
 function getJobList(type = 'add') {
     if (type === 'add' && pageState.page < pageState.maxPage) {
         pageState.page += 1;
@@ -254,13 +278,32 @@ defineExpose({ loadData, handleFilterConfirm });
 <style lang="stylus" scoped>
 .tabchecked
     color:  #4778EC !important
-.nearby-scroll
+
+.nearby-container
+    // 确保容器占据整个可用视口高度，包括安全区域
+    height: calc(100vh - var(--window-top));
+    display: flex;
+    flex-direction: column;
     overflow: hidden;
-    .two-head
+    
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+    flex: 1;
+    overflow: hidden;
+    
+.two-head
         margin: 22rpx;
         display: flex;
         flex-wrap: wrap
         // grid-template-columns: repeat(4, 1fr);
+        transition: all 0.3s ease;
+        
+        &.area-collapsed {
+            height: 0;
+            margin: 0;
+            padding: 0;
+            overflow: hidden;
+        }
         // grid-column-gap: 10rpx;
         // grid-row-gap: 24rpx;
 
@@ -291,64 +334,67 @@ defineExpose({ loadData, handleFilterConfirm });
         padding: 0 20rpx 20rpx 20rpx;
         background: #f4f4f4
     }
-    .nav-filter
-        padding: 16rpx 28rpx 0 28rpx
-        .filter-top
-            display: flex
-            justify-content: space-between;
-            .tab-scroll
-                flex: 1;
-                overflow: hidden;
-                margin-right: 20rpx
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: clip;
-                -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
-                mask-image: linear-gradient(to right, black 60%, transparent);
-                .jobs-left
-                    display: flex
-                    flex-wrap: nowrap
-                    .job
-                        font-weight: 400;
-                        font-size: 36rpx;
-                        color: #666D7F;
-                        margin-right: 32rpx;
-                        white-space: nowrap
-                    .active
-                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-                        font-weight: 500;
-                        font-size: 36rpx;
-                        color: #000000;
-            .jobs-add
+
+// 筛选条件样式 - 顶级选择器
+.nav-filter
+    padding: 16rpx 28rpx 0 28rpx
+    background: #ffffff
+    .filter-top
+        display: flex
+        justify-content: space-between;
+        .tab-scroll
+            flex: 1;
+            overflow: hidden;
+            margin-right: 20rpx
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: clip;
+            -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+            mask-image: linear-gradient(to right, black 60%, transparent);
+            .jobs-left
                 display: flex
-                align-items: center;
-                justify-content: center;
+                flex-wrap: nowrap
+                .job
+                    font-weight: 400;
+                    font-size: 36rpx;
+                    color: #666D7F;
+                    margin-right: 32rpx;
+                    white-space: nowrap
+                .active
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                    font-weight: 500;
+                    font-size: 36rpx;
+                    color: #000000;
+        .jobs-add
+            display: flex
+            align-items: center;
+            justify-content: center;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #666D7F;
+            line-height: 38rpx;
+    .filter-bottom
+        display: flex
+        justify-content: space-between
+        padding: 24rpx 0
+        .btm-left
+            display: flex
+            .filterbtm
                 font-weight: 400;
                 font-size: 32rpx;
                 color: #666D7F;
-                line-height: 38rpx;
-        .filter-bottom
-            display: flex
-            justify-content: space-between
-            padding: 24rpx 0
-            .btm-left
-                display: flex
-                .filterbtm
-                    font-weight: 400;
-                    font-size: 32rpx;
-                    color: #666D7F;
-                    margin-right: 40rpx
-                .active
-                    font-weight: 500;
-                    font-size: 32rpx;
-                    color: #256BFA;
-            .btm-right
-                font-weight: 400;
+                margin-right: 40rpx
+            .active
+                font-weight: 500;
                 font-size: 32rpx;
-                color: #6C7282;
-                .right-sx
-                    width: 26rpx;
-                    height: 26rpx;
-                .active
-                    transform: rotate(180deg)
+                color: #256BFA;
+        .btm-right
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #6C7282;
+            .right-sx
+                width: 26rpx;
+                height: 26rpx;
+            .active
+                transform: rotate(180deg)
 </style>

packageA/pages/nearby/nearby.vue

@@ -132,4 +132,5 @@ image {
             .swiper-item
                 display: flex;
                 flex-direction: column;
+                height: 100%;
 </style>

packageA/pages/personalInfo/personalInfo.vue

@@ -17,6 +17,19 @@
                 <view class="input-titile">姓名</view>
                 <input class="input-con" v-model="fromValue.name" placeholder="请输入您的姓名" />
             </view>
+            <view class="content-input" :class="{ 'input-error': passwordError }">
+                <view class="input-titile">设置密码</view>
+                <input 
+                    class="input-con" 
+                    v-model="fromValue.ytjPassword" 
+                    placeholder="请输入密码" 
+                    type="password" 
+                    maxlength="8"
+                    @input="validatePassword"
+                />
+                <view v-if="passwordError" class="error-message">{{ passwordError }}</view>
+                <view v-if="fromValue.ytjPassword && !passwordError" class="success-message">✓ 密码格式正确</view>
+            </view>
             <view class="content-sex">
                 <view class="sex-titile">性别</view>
                 <view class="sext-ri">
@@ -150,6 +163,8 @@ const openSelectPopup = (config) => {
 };
 
 const percent = ref('0%');
+// 当从“先职位后技能”链路进入时，提交后需直接返回职业规划页
+const needGoBackTwoStep = ref(false);
 const state = reactive({
     educationText: '',
     politicalAffiliationText: '',
@@ -158,6 +173,7 @@ const state = reactive({
 });
 const fromValue = reactive({
     name: '',
+    ytjPassword: '', // 新增密码字段
     sex: 0,
     birthDate: '',
     education: '',
@@ -165,10 +181,16 @@ const fromValue = reactive({
     idCard: '',
     phone: ''
 });
+
+// 输入校验相关
+const passwordError = ref('');
 // 移除重复的onLoad定义，已在上方实现
 
 // 在onLoad中初始化数据，确保页面加载时就能获取技能信息
-onLoad(() => {
+onLoad((options = {}) => {
+    if (options.needSkill === 'true') {
+        needGoBackTwoStep.value = true;
+    }
     // 初始化页面数据
     initLoad();
 });
@@ -235,6 +257,7 @@ function initLoad() {
     const currentUserInfo = userInfo.value && Object.keys(userInfo.value).length > 0 ? userInfo.value : cachedUserInfo;
     
     fromValue.name = currentUserInfo.name || '';
+    fromValue.ytjPassword = ''; // 密码输入框默认为空，不加载已有密码
     fromValue.sex = currentUserInfo.sex !== undefined ? Number(currentUserInfo.sex) : 0;
     fromValue.phone = currentUserInfo.phone || '';
     fromValue.birthDate = currentUserInfo.birthDate || '';
@@ -351,6 +374,12 @@ const confirm = () => {
         return $api.msg('请输入正确手机号');
     }
     
+    // 密码校验
+    validatePassword();
+    if (fromValue.ytjPassword && passwordError.value) {
+        return $api.msg(passwordError.value);
+    }
+    
     // 构建appSkillsList数据结构 - 使用新的技能数据结构，包含id字段
     const appSkillsList = state.skills
         .filter(skill => skill.name && skill.name.trim() !== '')
@@ -369,7 +398,12 @@ const confirm = () => {
     $api.createRequest('/app/user/resume', params, 'post').then((resData) => {
         $api.msg('完成');
         getUserResume().then(() => {
-            navBack();
+            // 如果从“缺职位+技能”链路进入，回退两层直接返回职业规划页
+            if (needGoBackTwoStep.value) {
+                navBack({ delta: 2 });
+            } else {
+                navBack();
+            }
         });
     });
 };
@@ -394,11 +428,31 @@ function addSkill() {
 
 // 删除技能
 function removeSkill(index) {
-    state.skills.splice(index, 1);
+    const skill = state.skills[index];
     
-    // 更新完成度
-    const result = getFormCompletionPercent(fromValue);
-    percent.value = result;
+    // 如果有技能id，调用删除接口
+    if (skill && skill.id) {
+        $api.createRequest(`/app/appskill/${skill.id}`, {}, 'DELETE').then(() => {
+            // 接口调用成功，从本地数组中移除
+            state.skills.splice(index, 1);
+            
+            // 更新完成度
+            const result = getFormCompletionPercent(fromValue);
+            percent.value = result;
+            
+            $api.msg('删除成功');
+        }).catch((err) => {
+            console.error('删除技能失败:', err);
+            $api.msg('删除失败，请重试');
+        });
+    } else {
+        // 没有id的技能（新增的），直接从本地数组中移除
+        state.skills.splice(index, 1);
+        
+        // 更新完成度
+        const result = getFormCompletionPercent(fromValue);
+        percent.value = result;
+    }
 }
 
 // 获取技能等级文本
@@ -418,7 +472,7 @@ function changeSkillName(index) {
     // 将当前已选中的技能名称传递给查询页面
     const selectedSkills = state.skills.map(skill => skill.name).filter(name => name);
     uni.navigateTo({
-        url: `/pages/complete-info/skill-search?selected=${encodeURIComponent(JSON.stringify(selectedSkills))}`
+        url: `/packageA/pages/complete-info/skill-search?selected=${encodeURIComponent(JSON.stringify(selectedSkills))}`
     });
 }
 
@@ -583,6 +637,54 @@ const changeSex = (sex) => {
     fromValue.sex = sex;
 };
 
+// 密码实时校验
+const validatePassword = () => {
+    const password = (fromValue.ytjPassword || '').trim();
+    
+    // 如果为空，清除错误信息
+    if (!password) {
+        passwordError.value = '';
+        return;
+    }
+    
+    // 校验规则：长度8位，包含大小写字母和数字，至少各有一个
+    if (password.length !== 8) {
+        passwordError.value = '密码长度必须为8位';
+        return;
+    }
+    
+    // 检查是否包含大写字母
+    const hasUpperCase = /[A-Z]/.test(password);
+    // 检查是否包含小写字母
+    const hasLowerCase = /[a-z]/.test(password);
+    // 检查是否包含数字
+    const hasNumber = /[0-9]/.test(password);
+    
+    if (!hasUpperCase) {
+        passwordError.value = '密码必须包含至少一个大写字母';
+        return;
+    }
+    
+    if (!hasLowerCase) {
+        passwordError.value = '密码必须包含至少一个小写字母';
+        return;
+    }
+    
+    if (!hasNumber) {
+        passwordError.value = '密码必须包含至少一个数字';
+        return;
+    }
+    
+    // 检查是否只包含字母和数字
+    if (!/^[A-Za-z0-9]+$/.test(password)) {
+        passwordError.value = '密码只能包含大小写字母和数字';
+        return;
+    }
+    
+    // 校验通过
+    passwordError.value = '';
+};
+
 const changePoliticalAffiliation = () => {
     openSelectPopup({
         title: '政治面貌',
@@ -740,6 +842,19 @@ function getDatePickerIndexes(dateStr) {
         height: 80rpx;
         border-bottom: 2rpx solid #EBEBEB
         position: relative;
+    .error-message
+        color: #ff4757;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .success-message
+        color: #2ed573;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .input-error
+        .input-con
+            border-bottom-color: #ff4757;
     .triangle::before
         position: absolute;
         right: 20rpx;

packageA/pages/post/component/videoPlayer.vue

@@ -32,9 +32,9 @@
 
         <!-- 控制栏 -->
         <view class="controls">
-            <!--   <text @click="togglePlay">{{ isPlaying ? '暂停' : '播放' }}</text>
-            <text @click="toggleFullScreen">{{ isFullScreen ? '退出全屏' : '全屏' }}</text> -->
-            <text @click="close">关闭</text>
+            <!--   <view class="control-text" @click="togglePlay">{{ isPlaying ? '暂停' : '播放' }}</view>
+            <view class="control-text" @click="toggleFullScreen">{{ isFullScreen ? '退出全屏' : '全屏' }}</view> -->
+            <view class="control-text" @click="close">关闭</view>
         </view>
     </view>
 </template>
@@ -180,7 +180,7 @@ defineExpose({ open });
     justify-content: space-around;
 }
 
-.controls text {
+.controls .control-text {
     color: #fff;
     font-size: 24rpx;
     padding: 8rpx 16rpx;

packageA/pages/post/post.vue

@@ -1,5 +1,5 @@
 <template>
-    <AppLayout title="" backGorundColor="#F4F4F4">
+    <AppLayout backGorundColor="#F4F4F4">
         <template #headerleft>
             <view class="btnback">
                 <image src="@/static/icon/back.png" @click="navBack"></image>
@@ -10,11 +10,12 @@
                 <image src="@/static/icon/share.png" @click="shareJob"></image>
             </view> -->
             <view class="btn mar_ri10">
-                <image src="@/static/icon/collect3.png" v-if="!jobInfo.isCollection" @click="jobCollection"></image>
+                <image src="@/static/icon/collect3.png" v-if="jobInfo.isCollection!==0" @click="jobCollection"></image>
                 <image src="@/static/icon/collect2.png" v-else @click="jobCollection"></image>
             </view>
         </template>
         <view class="content" v-show="!isEmptyObject(jobInfo)">
+            
             <view class="content-top btn-feel">
                 <view  style="background: #ffffff;padding: 24rpx;box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);border-radius: 20rpx 20rpx 20rpx 20rpx;position: relative;overflow: hidden;">
                     <view class="top-salary">
@@ -35,9 +36,15 @@
                             <dict-Label dictType="education" :value="jobInfo.education"></dict-Label>
                         </view>
                     </view>
-                        <view class="position-source">
+                        <!-- <view class="position-source">
                             <text>来源&nbsp;</text>
                             {{ jobInfo.dataSource }}
+                        </view> -->
+                        <view class="position-source">
+                            <view class="btn">
+                                <image src="@/static/icon/collect3.png" v-if="jobInfo.isCollection!==0" @click="jobCollection"></image>
+                                <image src="@/static/icon/collect2.png" v-else @click="jobCollection"></image>
+                            </view>
                         </view>
                         <view class="publish-time" v-if="jobInfo.postingDate">
                             {{ formatPublishTime(jobInfo.postingDate) }}
@@ -61,13 +68,46 @@
                     {{ jobInfo.description }}
                 </view>
             </view>
+            <!-- 职位图片 -->
+            <view class="content-card" v-if="jobInfo.filesList && jobInfo.filesList.length > 0">
+                <view class="card-title">
+                    <text class="title">职位图片</text>
+                </view>
+                <view class="job-images">
+                    <view class="image-item" v-for="(file, index) in jobInfo.filesList" :key="file.id">
+                        <image :src="file.fileUrl" mode="aspectFit" @click="previewImage(file.fileUrl, index)"></image>
+                    </view>
+                </view>
+            </view>
+            <!-- 联系人信息 -->
+            <view class="content-card" v-if="jobInfo.jobContactList && jobInfo.jobContactList.length > 0">
+                <view class="card-title">
+                    <text class="title">联系人信息</text>
+                </view>
+                <view class="contact-list">
+                    <view class="contact-item" v-for="(contact, index) in jobInfo.jobContactList" :key="index">
+                        <view class="contact-info">
+                            <view class="contact-label">联系人：</view>
+                            <view class="contact-value">{{ contact.contactPerson }}</view>
+                        </view>
+                        <view class="contact-info">
+                            <view class="contact-label">职位：</view>
+                            <view class="contact-value">{{ contact.position }}</view>
+                        </view>
+                        <view class="contact-info">
+                            <view class="contact-label">电话：</view>
+                            <view class="contact-value">{{ contact.contactPersonPhone }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
             <!-- 公司信息 -->
             <view class="content-card">
                 <view class="card-title">
                     <text class="title">公司信息</text>
                     <text
                         class="btntext button-click"
-                        @click="navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.company.companyId}`)"
+                        @click="handleCompanyDetailClick"
                     >
                         单位详情
                     </text>
@@ -131,16 +171,15 @@
                     </view>
                 </view>
             </view>
-            <view class="content-card" v-else>
+            <view class="content-card" v-if="currentUserType === 0">
                 <view class="card-title">
                     <view class="title">申请人列表</view>
                 </view>
                 <view class="applicant-list">
-                    <view v-for="applicant in applicants" :key="applicant.userId" class="applicant-item">
+                    <view v-for="applicant in jobInfo.applyUsers" :key="applicant.userId" class="applicant-item">
                         <view class="item-header">
                             <view class="name">{{ applicant.name }}</view>
                             <view class="right-header">
-                                <view class="matching-degree">匹配度：{{ applicant.matchingDegree }}</view>
                                 <button class="resume-button" @click="viewResume(applicant.userId)">查看简历</button>
                             </view>
                         </view>
@@ -165,8 +204,8 @@
                                     期望薪资：
                                     <Salary-Expectation
                                         style="display: inline-block"
-                                        :max-salary="applicant.maxSalary"
-                                        :min-salary="applicant.minSalary"
+                                        :max-salary="applicant.salaryMax"
+                                        :min-salary="applicant.salaryMin"
                                         :is-month="true"
                                     ></Salary-Expectation>
                                 </view>
@@ -179,10 +218,22 @@
         <view style="height: 34px"></view>
         <template #footer>
             <view class="footer">
-                <view class="btn-wq button-click" @click="jobApply">立即前往</view>
+                <view class="btn-wq button-click" @click="jobApply">{{ jobInfo.isApply === 1 ? '取消投递简历' : '投递简历' }}</view>
             </view>
         </template>
         <VideoPlayer ref="videoPalyerRef" />
+        
+        <!-- 确认弹窗 -->
+        <view v-if="showConfirmDialog" class="confirm-dialog">
+            <view class="dialog-content">
+                <view class="dialog-title">{{ jobInfo.isApply === 1 ? '确认取消投递' : '确认投递' }}</view>
+                <view class="dialog-message">{{ jobInfo.isApply === 1 ? '确定要取消投递此职位吗？' : '确定要投递此职位吗？' }}</view>
+                <view class="dialog-buttons">
+                    <view class="btn-cancel button-click" @click="hideDialog">取消</view>
+                    <view class="btn-confirm button-click" @click="confirmAction">确认</view>
+                </view>
+            </view>
+        </view>
     </AppLayout>
 </template>
 
@@ -190,7 +241,7 @@
 import point from '@/static/icon/point.png';
 import VideoPlayer from './component/videoPlayer.vue';
 import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
-import { onLoad, onShow, onHide } from '@dcloudio/uni-app';
+import { onLoad, onShow, onHide, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 import dictLabel from '@/components/dict-Label/dict-Label.vue';
 import RadarMap from './component/radarMap.vue';
 import { storeToRefs } from 'pinia';
@@ -227,33 +278,9 @@ const raderData = ref({
 });
 const videoPalyerRef = ref(null);
 const explainUrlRef = ref('');
+const showConfirmDialog = ref(false);
 
-const applicants = ref([
-    {
-        createTime: null,
-        userId: 1,
-        name: '青岛测试账号331',
-        age: '28', // 假设年龄有值
-        sex: '1',
-        birthDate: null,
-        education: '4',
-        politicalAffiliation: '',
-        phone: '',
-        avatar: '',
-        salaryMin: '10000',
-        salaryMax: '15000',
-        area: '3',
-        status: '0',
-        loginIp: '',
-        loginDate: null,
-        jobTitleId: '157,233,373',
-        experience: '3',
-        isRecommend: 1,
-        jobTitle: ['人力资源专员/助理', 'Java', '运维工程师'],
-        applyDate: '2025-09-26',
-        matchingDegree: 1,
-    },
-]);
+// 申请人列表直接使用接口返回的applyUsers数组
 
 onLoad((option) => {
 	console.log(option, 'option');
@@ -275,7 +302,6 @@ onShow(() => {
     }
     // #endif
 });
-
 function initLoad(option) {
     const jobId = decodeURIComponent(option.jobId);
     if (jobId !== jobIdRef.value) {
@@ -327,16 +353,21 @@ function getDetail(jobId) {
 }
 
 function getCompanyIsAJobs(companyId) {
-    $api.createRequest(`/app/company/count/${companyId}`).then((resData) => {
-        companyCount.value = resData.data;
-    });
+    if (companyId) {
+        $api.createRequest(`/app/company/count/${companyId}`).then((resData) => {
+            companyCount.value = resData.data;
+        });
+    }
+    // $api.createRequest(`/app/company/count/${companyId}`).then((resData) => {
+    //     companyCount.value = resData.data;
+    // });
 }
 
 function getTextWidth(text, size = 12) {
-    const canvas = document.createElement('canvas');
-    const context = canvas.getContext('2d');
-    context.font = `${12}px Arial`;
-    return -(context.measureText(text).width / 2) - 20; // 计算文字中心点
+    // 在小程序环境中，document 对象不存在，使用估算方法
+    // 简单估算：每个字符大约占 8px 宽度
+    const estimatedWidth = text.length * 8;
+    return -(estimatedWidth / 2) - 20; // 计算文字中心点
 }
 
 function getCompetivetuveness(jobId) {
@@ -399,24 +430,58 @@ function getCompetivetuveness(jobId) {
 
 // 申请岗位
 function jobApply() {
+    const tokenValue = uni.getStorageSync('token') || '';
+    if (!tokenValue) {
+        $api.msg('请您先登录');
+        return;
+    }
+    // 显示确认弹窗
+    showConfirmDialog.value = true;
+}
+
+// 隐藏弹窗
+function hideDialog() {
+    showConfirmDialog.value = false;
+}
+
+// 确认操作
+function confirmAction() {
+    const jobId = jobInfo.value.jobId;
+    if (jobInfo.value.isApply === 1) {
+        // 取消投递
+        $api.createRequest(`/app/job/applyJobCencal`, { jobId }, 'DELETE').then((resData) => {
+            $api.msg('取消投递成功');
+            getDetail(jobId); // 刷新职位信息
+            showConfirmDialog.value = false;
+        });
+    } else {
+        // 确认投递
+        $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
+            $api.msg('申请成功');
+            getDetail(jobId); // 刷新职位信息
+            showConfirmDialog.value = false;
+        });
+    }
+}
+
+// 确认投递
+function confirmApply() {
     const jobId = jobInfo.value.jobId;
     $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
-            getDetail(jobId);
-            $api.msg('申请成功');
-            const jobUrl = jobInfo.value.jobUrl;
-            // return window.open(jobUrl);
-        });
-    // if (jobInfo.value.isApply) {
-    //     const jobUrl = jobInfo.value.jobUrl;
-    //     return window.open(jobUrl);
-    // } else {
-    //     $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
-    //         getDetail(jobId);
-    //         $api.msg('申请成功');
-    //         const jobUrl = jobInfo.value.jobUrl;
-    //         return window.open(jobUrl);
-    //     });
-    // }
+        $api.msg('申请成功');
+        const jobUrl = jobInfo.value.jobUrl;
+        // return window.open(jobUrl);
+        showConfirmDialog.value = false;
+    });
+}
+
+// 取消投递
+function cancelApply() {
+    const jobId = jobInfo.value.jobId;
+    $api.createRequest(`/app/job/applyJobCencal`, { jobId }, 'DELETE').then((resData) => {
+        $api.msg('取消投递成功');
+        showConfirmDialog.value = false;
+    });
 }
 
 // 取消/收藏岗位
@@ -475,6 +540,50 @@ function formatPublishTime(dateString) {
         return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
     }
 }
+
+// 预览图片
+function previewImage(url, index) {
+    // 获取所有图片的URL列表
+    const allImageUrls = jobInfo.value.filesList.map(file => file.fileUrl);
+    uni.previewImage({
+        urls: allImageUrls,
+        current: index
+    });
+}
+
+// 查看简历
+function viewResume(userId) {
+    navTo(`/packageA/pages/resumeDetail/resumeDetail?userId=${userId}`);
+}
+
+// 处理查看单位详情
+function handleCompanyDetailClick() {
+    // console.log('----企业ID--', jobInfo.value.company?.companyId)
+    // console.log('----企业data--', jobInfo.value)
+    if (jobInfo.value.company?.companyId) {
+        navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.value.company.companyId}`);
+    } else {
+        $api.msg('没有企业信息');
+    }
+}
+
+// 分享给朋友
+onShareAppMessage(() => {
+    return {
+        title: '喀什智慧就业平台',
+        path: '/pages/index/index',
+        imageUrl: ''
+    };
+});
+
+// 分享到朋友圈
+onShareTimeline(() => {
+    return {
+        title: '喀什智慧就业平台',
+        path: '/pages/index/index',
+        imageUrl: ''
+    };
+});
 </script>
 
 <style lang="stylus" scoped>
@@ -576,6 +685,55 @@ for i in 0..100
         }
     }
 }
+
+// 职位图片样式
+.job-images{
+    margin-top: 30rpx
+    display: flex
+    flex-wrap: wrap
+    gap: 20rpx
+    .image-item{
+        width: calc(50% - 10rpx)
+        height: 300rpx
+        border-radius: 12rpx
+        overflow: hidden
+        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1)
+        image{
+            width: 100%
+            height: 100%
+            object-fit: cover
+        }
+    }
+}
+
+// 联系人信息样式
+.contact-list{
+    margin-top: 30rpx
+    .contact-item{
+        padding: 20rpx
+        background-color: #f8f9fa
+        border-radius: 12rpx
+        .contact-info{
+            display: flex
+            align-items: center
+            margin-bottom: 15rpx
+            &:last-child{
+                margin-bottom: 0
+            }
+            .contact-label{
+                font-weight: 500
+                font-size: 28rpx
+                color: #333333
+                width: 120rpx
+            }
+            .contact-value{
+                font-weight: 400
+                font-size: 28rpx
+                color: #495265
+            }
+        }
+    }
+}
 // ai
 .ai-explain{
     margin-top: 28rpx
@@ -656,7 +814,7 @@ for i in 0..100
             top: 0
             right: 0
             width: fit-content;
-            height: 76rpx;
+            height: 65rpx;
             padding: 0 24rpx
             background: rgba(37,107,250,0.1);
             box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
@@ -868,4 +1026,70 @@ for i in 0..100
     font-weight: bold;
     color: #333;
 }
+// 确认弹窗样式
+.confirm-dialog {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 9999;
+}
+
+.dialog-content {
+    width: 80%;
+    max-width: 500rpx;
+    background-color: #fff;
+    border-radius: 20rpx;
+    padding: 40rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.dialog-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 30rpx;
+}
+
+.dialog-message {
+    font-size: 28rpx;
+    color: #666;
+    margin-bottom: 40rpx;
+    text-align: center;
+}
+
+.dialog-buttons {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    gap: 20rpx;
+}
+
+.btn-cancel, .btn-confirm {
+    flex: 1;
+    height: 80rpx;
+    border-radius: 12rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 28rpx;
+    font-weight: 500;
+}
+
+.btn-cancel {
+    background-color: #f5f5f5;
+    color: #666;
+}
+
+.btn-confirm {
+    background-color: #256BFA;
+    color: #fff;
+}
 </style>

packageA/pages/resumeDetail/resumeDetail.vue

@@ -0,0 +1,385 @@
+<template>
+    <AppLayout backGorundColor="#F4F4F4">
+        <template #headerleft>
+            <view class="btnback">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
+            </view>
+        </template>
+        <template #header>
+            <view class="title">简历详情</view>
+        </template>
+        <view class="mys-container">
+            <!-- 个人信息 -->
+            <view class="mys-tops btn-feel">
+                <view class="tops-left">
+                    <view class="name">
+                        <text>{{ userInfo.name || '暂无姓名' }}</text>
+                    </view>
+                    <view class="subName">
+                        <dict-Label class="mar_ri10" dictType="sex" :value="userInfo.sex"></dict-Label>
+                        <text class="mar_ri10">{{ userInfo.age }}岁</text>
+                        <dict-Label class="mar_ri10" dictType="education" :value="userInfo.education"></dict-Label>
+                        <dict-Label
+                            class="mar_ri10"
+                            dictType="affiliation"
+                            :value="userInfo.politicalAffiliation"
+                        ></dict-Label>
+                    </view>
+                    <view class="subName">{{ userInfo.phone }}</view>
+                </view>
+                <view class="tops-right">
+                    <view class="right-imghead">
+                        <image v-if="userInfo.sex === '0'" src="@/static/icon/boy.png"></image>
+                        <image v-else src="@/static/icon/girl.png"></image>
+                    </view>
+                    <view class="right-sex">
+                        <image v-if="userInfo.sex === '0'" src="@/static/icon/boy1.png"></image>
+                        <image v-else src="@/static/icon/girl1.png"></image>
+                    </view>
+                </view>
+            </view>
+            <!-- 求职期望 -->
+            <view class="mys-line"></view>
+            <view class="mys-info">
+                <view class="mys-h4">
+                    <text>求职期望</text>
+                </view>
+                <view class="mys-text">
+                    <text>期望薪资：</text>
+                    <text>{{ userInfo.salaryMin / 1000 }}k-{{ userInfo.salaryMax / 1000 }}k</text>
+                </view>
+                <view class="mys-text">
+                    <text>期望工作地：</text>
+                    <dict-Label dictType="area" :value="Number(userInfo.area)"></dict-Label>
+                </view>
+                <view class="mys-list">
+                    <view class="cards" v-for="(title, index) in userInfo.jobTitle" :key="index">
+                        {{ title }}
+                    </view>
+                </view>
+            </view>
+            <!-- 技能列表 -->
+            <view class="work-experience-container">
+                <view class="exp-header">
+                    <text class="exp-title">技能</text>
+                </view>
+                <view class="exp-list" v-if="userInfo.appSkillsList && userInfo.appSkillsList.length > 0">
+                    <view class="exp-item" v-for="(skill, index) in userInfo.appSkillsList" :key="skill.id">
+                        <view class="exp-company-row">
+                            <text class="exp-company">{{ skill.name }}</text>
+                            <text class="exp-position">{{ getSkillLevelText(skill.levels) }}</text>
+                        </view>
+                        <view class="exp-divider" v-if="index !== userInfo.appSkillsList.length - 1"></view>
+                    </view>
+                </view>
+                <view class="exp-empty" v-else>
+                    <image class="empty-img" src="/static/icons/empty-work.png" mode="widthFix"></image>
+                    <text class="empty-text">暂无技能信息</text>
+                </view>
+            </view>
+
+            <!-- 工作经历 -->
+            <view class="work-experience-container">
+                <!-- 标题栏：仅显示标题 -->
+                <view class="exp-header">
+                    <text class="exp-title">工作经历</text>
+                </view>
+
+                <!-- 工作经历列表 -->
+                <view class="exp-list" v-if="workExperiences.length > 0">
+                    <view class="exp-item" v-for="(item, index) in workExperiences" :key="item.id">
+                        <!-- 公司名称 + 职位 -->
+                        <view class="exp-company-row">
+                            <text class="exp-company">{{ item.companyName }}</text>
+                            <text class="exp-position">{{ item.position }}</text>
+                        </view>
+
+                        <!-- 工作时间 -->
+                        <view class="exp-date-row">
+                            <text class="exp-label">工作时间：</text>
+                            <text class="exp-date">{{ item.startDate }} - {{ item.endDate || '至今' }}</text>
+                        </view>
+
+                        <!-- 工作描述（支持多行） -->
+                        <view class="exp-desc-row" v-if="item.description">
+                            <text class="exp-label">工作描述：</text>
+                            <text class="exp-desc">{{ item.description }}</text>
+                        </view>
+
+                        <!-- 分隔线（最后一项不显示） -->
+                        <view class="exp-divider" v-if="index !== workExperiences.length - 1"></view>
+                    </view>
+                </view>
+
+                <!-- 空状态提示（无工作经历时显示） -->
+                <view class="exp-empty" v-else>
+                    <image class="empty-img" src="/static/icons/empty-work.png" mode="widthFix"></image>
+                    <text class="empty-text">暂无工作经历</text>
+                </view>
+            </view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { reactive, inject, ref, onMounted } from 'vue';
+const { $api, navTo, navBack, config } = inject('globalFunction');
+import { onLoad } from '@dcloudio/uni-app';
+import useDictStore from '@/stores/useDictStore';
+const { getDictData } = useDictStore();
+
+const userInfo = ref({});
+const workExperiences = ref([]);
+const isLoading = ref(false);
+
+// 获取技能等级文本
+const getSkillLevelText = (level) => {
+    const levelMap = {
+        '1': '初级',
+        '2': '中级',
+        '3': '高级'
+    };
+    return levelMap[level] || level || '暂无等级';
+};
+
+// 页面加载时获取数据
+onLoad((option) => {
+    const { userId } = option;
+    if (userId) {
+        getResumeDetail(userId);
+    }
+});
+
+// 获取简历详情
+const getResumeDetail = async (userId) => {
+    try {
+        isLoading.value = true;
+        const resData = await $api.createRequest(`/app/user/userResume/${userId}`);
+        if (resData.code === 200) {
+            userInfo.value = resData.data;
+            // 从简历详情中获取工作经历，而不是单独请求
+            workExperiences.value = resData.data.experiencesList || [];
+        }
+    } catch (error) {
+        console.error('获取简历详情失败:', error);
+        $api.msg('获取简历详情失败');
+    } finally {
+        isLoading.value = false;
+    }
+};
+</script>
+
+<style lang="stylus" scoped>
+image{
+    width: 100%;
+    height: 100%
+}
+.mys-container{
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
+    .mys-tops{
+        display: flex
+        justify-content: space-between
+        padding: 52rpx 48rpx
+        .tops-left{
+            .name{
+                font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                font-weight: 600;
+                font-size: 44rpx;
+                color: #333333;
+                display: flex
+                align-items: center
+                justify-content: flex-start
+            }
+            .subName{
+                margin-top: 12rpx
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #333333;
+            }
+
+        }
+        .tops-right{
+            position: relative
+            .right-imghead{
+                width: 136rpx;
+                height: 136rpx;
+                border-radius: 50%;
+                background: #e8e8e8
+                overflow: hidden
+            }
+            .right-sex{
+                position: absolute
+                right: -10rpx
+                top: -10rpx
+                width: 50rpx
+                height: 50rpx
+            }
+        }
+    }
+    .mys-line{
+        margin: 0 28rpx
+        height: 0rpx;
+        border-radius: 0rpx 0rpx 0rpx 0rpx;
+        border: 2rpx dashed #000000;
+        opacity: 0.16;
+    }
+    .mys-info{
+        padding: 28rpx
+        .mys-h4{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            font-weight: 600;
+            font-size: 32rpx;
+            color: #000000;
+            margin-bottom: 8rpx
+            display: flex;
+            justify-content: space-between
+            align-items: center
+        }
+        .mys-text{
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #333333;
+            margin-top: 16rpx
+        }
+        .mys-list{
+            display: flex
+            align-items: center
+            flex-wrap: wrap;
+            .cards{
+                margin: 28rpx 28rpx 0 0
+                height: 80rpx;
+                padding: 0 38rpx;
+                width: fit-content
+                display: flex
+                align-items: center
+                justify-content: center
+                border-radius: 12rpx 12rpx 12rpx 12rpx;
+                border: 2rpx solid #E8EAEE;
+            }
+        }
+    }
+}
+
+
+/* 容器样式（适配多端，用rpx做单位） */
+.work-experience-container {
+  padding: 20rpx 30rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin: 20rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+/* 标题栏：两端对齐 */
+.exp-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 25rpx;
+}
+
+.exp-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+/* 经历列表容器 */
+.exp-list {
+  margin-top: 10rpx;
+}
+
+/* 单个经历卡片 */
+.exp-item {
+  padding: 20rpx 0;
+}
+
+/* 公司名称 + 职位（横向排列，职位右对齐） */
+.exp-company-row {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 15rpx;
+}
+
+.exp-company {
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #000000;
+}
+
+.exp-position {
+  font-size: 24rpx;
+  font-weight: bold;
+  color: #000000;
+}
+
+/* 工作时间/描述：标签+内容横向排列 */
+.exp-date-row, .exp-desc-row {
+  display: flex;
+  margin-bottom: 12rpx;
+  line-height: 1.6;
+  color: #000000;
+}
+
+/* 标签样式（固定宽度，统一对齐） */
+.exp-label {
+  font-size: 26rpx;
+  color: #000;
+  min-width: 160rpx;
+}
+
+/* 内容样式 */
+.exp-date, .exp-desc {
+  font-size: 26rpx;
+  color: #000000;
+  flex: 1; /* 内容占满剩余宽度，支持换行 */
+}
+
+/* 工作描述（支持多行换行） */
+.exp-desc {
+  word-break: break-all;
+}
+
+/* 分隔线 */
+.exp-divider {
+  height: 1rpx;
+  background-color: #f5f5f5;
+  margin-top: 20rpx;
+}
+
+/* 空状态样式 */
+.exp-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 80rpx 0;
+  color: #999;
+}
+
+.empty-img {
+  width: 140rpx;
+  height: auto;
+  margin-bottom: 25rpx;
+  opacity: 0.6;
+}
+
+.empty-text {
+  font-size: 26rpx;
+  text-align: center;
+  line-height: 1.5;
+}
+
+.btnback{
+    width: 64rpx;
+    height: 64rpx;
+}
+
+.title {
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #000000;
+    text-align: center;
+    margin-right: 64rpx;
+}
+</style>

packageA/pages/selectDate/selectDate.vue

@@ -50,7 +50,8 @@ const { $api, navTo, navBack } = inject('globalFunction');
 const weekMap = ['日', '一', '二', '三', '四', '五', '六'];
 const calendarData = ref([]);
 const current = ref({});
-import { Solar, Lunar } from '@/packageA/lib/lunar-javascript@1.7.2.js';
+import lunarModule from '@/packageA/lib/lunar-javascript@1.7.2.js';
+const { Solar, Lunar } = lunarModule;
 
 const isRecord = ref(false);
 const recordNum = ref(4);

packageB/apiRc/policy/index.js

@@ -0,0 +1,9 @@
+import request from "@/utilsRc/request";
+//政策列表
+export function getPolicyList(queryParams) {
+  return request({
+    url: "/portal/policyInfo/portalList",
+    method: "get",
+    params: queryParams,
+  });
+}

packageB/institution/evaluationAgency.vue

@@ -0,0 +1,364 @@
+<template>
+	<div class="app-box">
+		<div class="con-box">
+		    <!-- <view class="collection-search">
+		        <view class="search-content">
+		            <view class="header-input button-click">
+		                <uni-icons class="iconsearch" color="#6A6A6A" type="search" size="22"></uni-icons>
+		                <input
+		                    class="input"
+		                    v-model="searchKeyword"
+		                    @confirm="searchVideo"
+		                    placeholder="输入考试名称"
+		                    placeholder-class="inputplace"
+		                />
+		                <uni-icons 
+		                    v-if="searchKeyword" 
+		                    class="clear-icon" 
+		                    type="clear" 
+		                    size="24" 
+		                    color="#999" 
+		                    @click="clearSearch"
+		                />
+		            </view>
+		        </view>
+		    </view> -->
+			<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+				<div class="cards" v-for="(item,index) in dataList" :key="item.examPaperId">
+					<div class="cardHead">
+						<div class="cardHeadLeft">
+							<div class="cardTitle">{{item.organName}}</div>
+						</div>
+						<div class="rightBtn" @click="handleOperation(item)">机构详情</div>
+					</div>
+					<div class="heng"></div>
+					<div class="cardCon">
+						<div class="conten">机构联系人：{{item.contactName}}</div>
+						<div class="conten">联系方式：{{item.contactPhone}}</div>
+						<div class="conten">机构地址：{{item.address}}</div>
+					</div>
+				</div>
+			</scroll-view>
+		</div>
+		
+	</div>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack,urls } = inject('globalFunction');
+import config from "@/config.js"
+const userInfo = ref({});
+const Authorization = ref('');
+const searchKeyword = ref('');
+const dataList=ref([])
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
+const baseUrl = config.imgBaseUrl
+const handleScrollToLower = () => {
+    getDataList('add');
+};
+onLoad(() => {
+	
+});
+onShow(()=>{
+	Authorization.value=uni.getStorageSync('Padmin-Token')||''
+	getDataList('refresh');
+})
+// 搜索视频
+function searchVideo() {
+    getDataList('refresh');
+}
+
+// 清除搜索内容
+function clearSearch() {
+    searchKeyword.value = '';
+    getDataList('refresh');
+}
+// 获取考试列表
+function getDataList(type = 'add') {
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
+    if (type === 'refresh') {
+        pageNum.value = 1;
+		params={
+			address:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+		}
+		$api.myRequest('/train/public/rate/organ/table', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=resData.rows
+				totalNum.value=resData.total
+			}
+			
+		});
+    }
+    if (type === 'add' && pageNum.value < maxPage) {
+        pageNum.value += 1;
+		params={
+			address:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+		}
+		$api.myRequest('/train/public/rate/organ/table', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=dataList.value.concat(resData.rows)
+				totalNum.value=resData.total
+			}
+		});
+	}
+}
+
+function handleOperation(row) {
+	navTo(`/packageB/institution/evaluationAgencyDetail?organId=${row.organId}`);
+}
+</script>
+
+<style lang="stylus" scoped>
+.app-box{
+	width: 100%;
+	height: 100vh;
+	position: relative;
+	.con-box{
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top:0;
+		z-index: 10;
+		padding: 20rpx 28rpx;
+		box-sizing: border-box;
+		overflow: hidden;
+		.collection-search{
+		    padding: 10rpx 20rpx;
+		    .search-content{
+		        position: relative
+		        display: flex
+		        align-items: center
+		        padding: 14rpx 0
+		        .header-input{
+		            padding: 0
+		            width: calc(100%);
+		            position: relative
+		            .iconsearch{
+		                position: absolute
+		                left: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		            }
+		            .input{
+		                padding: 0 80rpx 0 80rpx
+		                height: 80rpx;
+		                background: #FFFFFF;
+		                border-radius: 75rpx 75rpx 75rpx 75rpx;
+		                border: 2rpx solid #ECECEC
+		                font-size: 28rpx;
+		            }
+		            .clear-icon{
+		                position: absolute
+		                right: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		                cursor: pointer
+		            }
+		            .inputplace{
+		                font-weight: 400;
+		                font-size: 28rpx;
+		                color: #B5B5B5;
+		            }
+		        }
+		    }
+		}
+		.main-scroll {
+		    width: 100%;
+		    height: 100%;
+			.cards{
+				width: 100%;
+				min-height: 260rpx;
+				height: auto;
+				background: linear-gradient(0deg, #E3EFFF 0%, #FBFDFF 100%);
+				// box-shadow: 0px 0px 6px 0px rgba(0,71,200,0.32);
+				border-radius: 12rpx;
+				border: 2px solid #EDF5FF;
+				margin-bottom: 30rpx;
+				padding: 30rpx 40rpx 0;
+				box-sizing: border-box
+				.cardHead{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cardHeadLeft{
+						display: flex;
+						align-items: center
+						width: 70%;
+						.cardTitle{
+							font-weight: bold;
+							font-size: 28rpx;
+							color: #0069CB;
+							max-width: 100%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+						.titleType{
+							border-radius: 4px;
+							font-size: 22rpx;
+							color: #157EFF;
+							width: 100rpx;
+							height: 38rpx;
+							text-align: center;
+							line-height: 38rpx;
+							margin-left: 10rpx;
+						}
+						
+					}
+					
+				}
+				.heng{
+					width: 30%;
+					height: 4rpx;
+					background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+					margin: 10rpx 0 20rpx;
+				}
+				.cardCon{
+					display: flex;
+					flex-wrap: wrap;
+					.conten{
+						width: 100%;
+						font-size: 24rpx;
+						color: #666666;
+						display: flex;
+						align-items: center
+						margin-bottom: 10rpx;
+					}
+					.status-tags{
+						display: flex;
+						align-items: center;
+					}
+				}
+				.flooter{
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+						padding-top: 14rpx;
+					}
+				}
+			}
+		}
+	}
+	.cards2{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100vh;
+		background-color: rgba(0,0,0,0.5);
+		z-index: 10000;
+		padding: 100rpx 50rpx;
+		box-sizing: border-box;
+		.cardCon{
+			height: 70%;
+			background-color: #fff;
+			padding: 20rpx;
+			box-sizing: border-box;
+			.cardHead{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				font-size: 30rpx;
+				font-weight: 600;
+			}
+			
+		}
+	}
+}
+.titleType{
+	display: inline-block
+	border-radius: 4px;
+	font-size: 22rpx;
+	color: #157EFF;
+	width: 100rpx;
+	height: 38rpx;
+	text-align: center;
+	line-height: 38rpx;
+	margin-left: 10rpx;
+}
+.primary{
+	border: 1px solid #157EFF!important;
+	color: #157EFF!important
+}
+.success{
+	border: 1px solid #05A636!important;
+	color: #05A636!important
+}
+.info{
+	border: 1px solid #898989!important;
+	color: #898989!important
+}
+.tertiary{
+	border: 1px solid #E6A340!important;
+	color: #E6A340!important
+}
+.primary2{
+	border: 1px solid #F56C6C!important;
+	color: #F56C6C!important
+}
+.rightBtn{
+	width: 140rpx;
+	height: 44rpx;
+	line-height: 44rpx;
+	background: linear-gradient(90deg, #00C0FA 0%, #1271FF 100%);
+	border-radius: 4px;
+	color: #fff;
+	font-size: 24rpx;
+	text-align: center;
+}
+.detailTitle{
+	font-size: 32rpx;
+	font-weight: 600;
+	margin: 30rpx 0;
+}
+.detailCon{
+	font-size: 28rpx;
+	line-height: 40rpx;
+}
+.exam-info {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 35rpx;
+	margin-top: 20rpx;
+}
+
+.info-item {
+	flex: 1;
+	text-align: center;
+}
+
+.info-value {
+	font-family: 'D-DIN-Medium';
+	font-size: 26rpx;
+	font-weight: 600;
+	color: #409EFF;
+	margin-bottom: 8rpx;
+}
+
+.info-label {
+	font-size: 26rpx;
+	color: #333;
+}
+
+.info-divider {
+	width: 2px;
+	background-color: #C3E1FF;
+}
+</style>

packageB/institution/evaluationAgencyDetail.vue

@@ -0,0 +1,256 @@
+<template>
+	<div class="app-box">
+		<div class="con-box">
+			<div class="cards">
+				<div class="cardHead">
+					<div class="cardHeadLeft">
+						<div class="cardTitle">{{organ.organName}}</div>
+					</div>
+					<div class="rightBtn" @click="handleOperation()"></div>
+				</div>
+				<div class="heng"></div>
+				<div class="cardCon">
+					<div class="conten">机构联系人：{{organ.contactName}}</div>
+					<div class="conten">联系方式：{{organ.contactPhone}}</div>
+					<div class="conten">机构地址：{{organ.address}}</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 40rpx;">
+				<div class="title">
+					<div></div>
+					<div>评价流程说明</div>
+				</div>
+				<div class="kcCon">
+					<div class="kcIntroduction" v-if="organ.processDescription">{{organ.processDescription}}</div>
+					<div v-else style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 40rpx;">
+				<div class="title">
+					<div></div>
+					<div>评价项目</div>
+				</div>
+				<div class="kcCon">
+					<div class="kcIntroduction" v-if="organ.organContent">{{organ.organContent}}</div>
+					<div v-else style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 30rpx;">
+				<div class="title">
+					<div></div>
+					<div>资质证书</div>
+				</div>
+				<div class="kcCon">
+					<div v-for="(item, index) in certs":key = "index" style="width: 100%;">
+						<div v-for="(url, index2) in item" :key = "index2" style="width: 100%;">
+							<image :src="url" mode="" style="width: 100%;"></image>
+						</div>
+					</div>
+					<div v-if="certs.length==0" style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack,urls } = inject('globalFunction');
+import config from "@/config.js"
+const organ = ref({});
+const courses = ref([]);
+const certs = ref([]);
+const certs2 = ref([]);
+const teams=ref([])
+const certIndex=ref(1)
+const organId=ref('')
+const Authorization=ref('')
+onLoad((options) => {
+	organId.value=options.organId
+});
+onShow(()=>{
+	Authorization.value=uni.getStorageSync('Padmin-Token')||''
+	let params={
+		organId:organId.value
+	}
+	$api.myRequest('/train/public/rate/organ/model', params).then((resData) => {
+		if(resData.code==200){
+			organ.value = (resData.data ? resData.data :{});
+			certs2.value = (resData ? JSON.parse(resData.data.zhengshu):[]);
+			for(var i =0;i<certs2.value.length;i++){
+			  certs2.value[i].url =config.LCBaseUrl + "/file/minio" + certs2.value[i].url;
+			}
+			var certsArr = [];var flag = 0;
+			for(var i =0;i<certs2.value.length;i++){
+			  flag ++
+			  certsArr.push(certs2.value[i])
+			  if(flag == 3){
+			    var arrs = [];
+			    for(var j =0;j<3;j++){
+			      arrs.push(certsArr[j].url)
+			    }
+			    certs.value.push(arrs);
+			    certsArr = [];
+			    flag = 0;
+			  }else{
+			    if(i == certs2.value.length -1){
+			      var arrs = [];
+			      for(var j =0;j<certsArr.length;j++){
+			        arrs.push(certsArr[j].url)
+			      }
+			      certs.value.push(arrs);
+			    }
+			  }
+			}
+		}
+		
+	});
+})
+
+</script>
+
+<style lang="stylus" scoped>
+	.app-box{
+		width: 100%;
+		height: 100vh;
+		position: relative;
+		.con-box{
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			left: 0;
+			top:0;
+			z-index: 10;
+			padding: 20rpx 28rpx;
+			box-sizing: border-box;
+			overflow: hidden;
+			.cards{
+				width: 100%;
+				min-height: 260rpx;
+				height: auto;
+				background: linear-gradient(0deg, #D4E3FE 0%, #EBF1FF 100%);
+				border-radius: 12rpx;
+				border: 2px solid #EDF5FF;
+				margin-bottom: 40rpx;
+				padding: 20rpx 30rpx 0;
+				box-sizing: border-box
+				.cardHead{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cardHeadLeft{
+						display: flex;
+						align-items: center
+						width: 100%;
+						.cardTitle{
+							font-weight: bold;
+							font-size: 32rpx;
+							color: #0069CB;
+							max-width: 100%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+						.titleType{
+							border-radius: 4px;
+							font-size: 22rpx;
+							color: #157EFF;
+							width: 100rpx;
+							height: 38rpx;
+							text-align: center;
+							line-height: 38rpx;
+							margin-left: 10rpx;
+						}
+						
+					}
+					
+				}
+				.heng{
+					width: 30%;
+					height: 4rpx;
+					background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+					margin: 10rpx 0 20rpx;
+				}
+				.cardCon{
+					display: flex;
+					flex-wrap: wrap;
+					.conten{
+						width: 100%;
+						font-size: 26rpx;
+						color: #666666;
+						display: flex;
+						align-items: center
+						margin-bottom: 10rpx;
+					}
+					.status-tags{
+						display: flex;
+						align-items: center;
+					}
+				}
+				.flooter{
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+						padding-top: 14rpx;
+					}
+				}
+			}
+		}
+	}
+	.title{
+		width: 100%
+		display: flex
+		align-items: center
+		font-size: 32rpx
+		font-weight: 600
+	}
+	.title>view:first-child{
+		width: 10rpx;
+		height: 46rpx;
+		background-color: #FD7565;
+		margin-right: 20rpx;
+		border-radius: 10rpx;
+	}
+	.kcCon{
+		margin-top: 20rpx;
+		width: 100%
+	}
+	.kcIntroduction{
+		background: rgba(20,136,245,0.1);
+		padding: 20rpx;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		margin-bottom: 20rpx;
+	}
+	.faculty{
+		border: 1px solid #ddd;
+		border-radius: 10rpx;
+		padding: 10rpx;
+		margin-bottom: 20rpx;
+		box-sizing: border-box;
+		.facultyHead{
+			width: 100%;
+			height: 80rpx;
+			border-radius: 10rpx;
+			color: #fff;
+			font-size: 30rpx;
+			background: linear-gradient(88deg, #3E8BFF 0%, #0DB5FB 100%);
+			display: flex;
+			align-items: center
+			padding: 0 20rpx;
+			box-sizing: border-box;
+		}
+		.facultyCon{
+			font-size: 26rpx;
+			color: #666666;
+			padding: 20rpx 0;
+			box-sizing: border-box;
+		}
+	}
+</style>

packageB/institution/trainingInstitution.vue

@@ -0,0 +1,364 @@
+<template>
+	<div class="app-box">
+		<div class="con-box">
+		    <!-- <view class="collection-search">
+		        <view class="search-content">
+		            <view class="header-input button-click">
+		                <uni-icons class="iconsearch" color="#6A6A6A" type="search" size="22"></uni-icons>
+		                <input
+		                    class="input"
+		                    v-model="searchKeyword"
+		                    @confirm="searchVideo"
+		                    placeholder="输入考试名称"
+		                    placeholder-class="inputplace"
+		                />
+		                <uni-icons 
+		                    v-if="searchKeyword" 
+		                    class="clear-icon" 
+		                    type="clear" 
+		                    size="24" 
+		                    color="#999" 
+		                    @click="clearSearch"
+		                />
+		            </view>
+		        </view>
+		    </view> -->
+			<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+				<div class="cards" v-for="(item,index) in dataList" :key="item.examPaperId">
+					<div class="cardHead">
+						<div class="cardHeadLeft">
+							<div class="cardTitle">{{item.organName}}</div>
+						</div>
+						<div class="rightBtn" @click="handleOperation(item)">机构详情</div>
+					</div>
+					<div class="heng"></div>
+					<div class="cardCon">
+						<div class="conten">机构联系人：{{item.contactName}}</div>
+						<div class="conten">联系方式：{{item.contactPhone}}</div>
+						<div class="conten">机构地址：{{item.address}}</div>
+					</div>
+				</div>
+			</scroll-view>
+		</div>
+		
+	</div>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack,urls } = inject('globalFunction');
+import config from "@/config.js"
+const userInfo = ref({});
+const Authorization = ref('');
+const searchKeyword = ref('');
+const dataList=ref([])
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
+const baseUrl = config.imgBaseUrl
+const handleScrollToLower = () => {
+    getDataList('add');
+};
+onLoad(() => {
+	
+});
+onShow(()=>{
+	Authorization.value=uni.getStorageSync('Padmin-Token')||''
+	getDataList('refresh');
+})
+// 搜索视频
+function searchVideo() {
+    getDataList('refresh');
+}
+
+// 清除搜索内容
+function clearSearch() {
+    searchKeyword.value = '';
+    getDataList('refresh');
+}
+// 获取考试列表
+function getDataList(type = 'add') {
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
+    if (type === 'refresh') {
+        pageNum.value = 1;
+		params={
+			address:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+		}
+		$api.myRequest('/train/public/train/organ/table', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=resData.rows
+				totalNum.value=resData.total
+			}
+			
+		});
+    }
+    if (type === 'add' && pageNum.value < maxPage) {
+        pageNum.value += 1;
+		params={
+			address:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+		}
+		$api.myRequest('/train/public/train/organ/table', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=dataList.value.concat(resData.rows)
+				totalNum.value=resData.total
+			}
+		});
+	}
+}
+
+function handleOperation(row) {
+	navTo(`/packageB/institution/trainingInstitutionDetail?organId=${row.organId}`);
+}
+</script>
+
+<style lang="stylus" scoped>
+.app-box{
+	width: 100%;
+	height: 100vh;
+	position: relative;
+	.con-box{
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top:0;
+		z-index: 10;
+		padding: 20rpx 28rpx;
+		box-sizing: border-box;
+		overflow: hidden;
+		.collection-search{
+		    padding: 10rpx 20rpx;
+		    .search-content{
+		        position: relative
+		        display: flex
+		        align-items: center
+		        padding: 14rpx 0
+		        .header-input{
+		            padding: 0
+		            width: calc(100%);
+		            position: relative
+		            .iconsearch{
+		                position: absolute
+		                left: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		            }
+		            .input{
+		                padding: 0 80rpx 0 80rpx
+		                height: 80rpx;
+		                background: #FFFFFF;
+		                border-radius: 75rpx 75rpx 75rpx 75rpx;
+		                border: 2rpx solid #ECECEC
+		                font-size: 28rpx;
+		            }
+		            .clear-icon{
+		                position: absolute
+		                right: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		                cursor: pointer
+		            }
+		            .inputplace{
+		                font-weight: 400;
+		                font-size: 28rpx;
+		                color: #B5B5B5;
+		            }
+		        }
+		    }
+		}
+		.main-scroll {
+		    width: 100%;
+		    height: 100%;
+			.cards{
+				width: 100%;
+				min-height: 260rpx;
+				height: auto;
+				background: linear-gradient(0deg, #E3EFFF 0%, #FBFDFF 100%);
+				// box-shadow: 0px 0px 6px 0px rgba(0,71,200,0.32);
+				border-radius: 12rpx;
+				border: 2px solid #EDF5FF;
+				margin-bottom: 30rpx;
+				padding: 30rpx 40rpx 0;
+				box-sizing: border-box
+				.cardHead{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cardHeadLeft{
+						display: flex;
+						align-items: center
+						width: 70%;
+						.cardTitle{
+							font-weight: bold;
+							font-size: 28rpx;
+							color: #0069CB;
+							max-width: 100%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+						.titleType{
+							border-radius: 4px;
+							font-size: 22rpx;
+							color: #157EFF;
+							width: 100rpx;
+							height: 38rpx;
+							text-align: center;
+							line-height: 38rpx;
+							margin-left: 10rpx;
+						}
+						
+					}
+					
+				}
+				.heng{
+					width: 30%;
+					height: 4rpx;
+					background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+					margin: 10rpx 0 20rpx;
+				}
+				.cardCon{
+					display: flex;
+					flex-wrap: wrap;
+					.conten{
+						width: 100%;
+						font-size: 24rpx;
+						color: #666666;
+						display: flex;
+						align-items: center
+						margin-bottom: 10rpx;
+					}
+					.status-tags{
+						display: flex;
+						align-items: center;
+					}
+				}
+				.flooter{
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+						padding-top: 14rpx;
+					}
+				}
+			}
+		}
+	}
+	.cards2{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100vh;
+		background-color: rgba(0,0,0,0.5);
+		z-index: 10000;
+		padding: 100rpx 50rpx;
+		box-sizing: border-box;
+		.cardCon{
+			height: 70%;
+			background-color: #fff;
+			padding: 20rpx;
+			box-sizing: border-box;
+			.cardHead{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				font-size: 30rpx;
+				font-weight: 600;
+			}
+			
+		}
+	}
+}
+.titleType{
+	display: inline-block
+	border-radius: 4px;
+	font-size: 22rpx;
+	color: #157EFF;
+	width: 100rpx;
+	height: 38rpx;
+	text-align: center;
+	line-height: 38rpx;
+	margin-left: 10rpx;
+}
+.primary{
+	border: 1px solid #157EFF!important;
+	color: #157EFF!important
+}
+.success{
+	border: 1px solid #05A636!important;
+	color: #05A636!important
+}
+.info{
+	border: 1px solid #898989!important;
+	color: #898989!important
+}
+.tertiary{
+	border: 1px solid #E6A340!important;
+	color: #E6A340!important
+}
+.primary2{
+	border: 1px solid #F56C6C!important;
+	color: #F56C6C!important
+}
+.rightBtn{
+	width: 140rpx;
+	height: 44rpx;
+	line-height: 44rpx;
+	background: linear-gradient(90deg, #00C0FA 0%, #1271FF 100%);
+	border-radius: 4px;
+	color: #fff;
+	font-size: 24rpx;
+	text-align: center;
+}
+.detailTitle{
+	font-size: 32rpx;
+	font-weight: 600;
+	margin: 30rpx 0;
+}
+.detailCon{
+	font-size: 28rpx;
+	line-height: 40rpx;
+}
+.exam-info {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 35rpx;
+	margin-top: 20rpx;
+}
+
+.info-item {
+	flex: 1;
+	text-align: center;
+}
+
+.info-value {
+	font-family: 'D-DIN-Medium';
+	font-size: 26rpx;
+	font-weight: 600;
+	color: #409EFF;
+	margin-bottom: 8rpx;
+}
+
+.info-label {
+	font-size: 26rpx;
+	color: #333;
+}
+
+.info-divider {
+	width: 2px;
+	background-color: #C3E1FF;
+}
+</style>

packageB/institution/trainingInstitutionDetail.vue

@@ -0,0 +1,267 @@
+<template>
+	<div class="app-box">
+		<div class="con-box">
+			<div class="cards">
+				<div class="cardHead">
+					<div class="cardHeadLeft">
+						<div class="cardTitle">{{trainOrgan.organName}}</div>
+					</div>
+					<div class="rightBtn" @click="handleOperation()"></div>
+				</div>
+				<div class="heng"></div>
+				<div class="cardCon">
+					<div class="conten">机构联系人：{{trainOrgan.contactName}}</div>
+					<div class="conten">联系方式：{{trainOrgan.contactPhone}}</div>
+					<div class="conten">机构地址：{{trainOrgan.address}}</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 40rpx;">
+				<div class="title">
+					<div></div>
+					<div>课程介绍</div>
+				</div>
+				<div class="kcCon">
+					<div class="kcIntroduction" v-for="(item, index) in courses" :key="index">{{item}}</div>
+					<div v-if="courses.length==0" style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 40rpx;">
+				<div class="title">
+					<div></div>
+					<div>师资团队</div>
+				</div>
+				<div class="kcCon">
+					<div class="faculty" v-for="(item, index) in teams" :key = "index">
+						<div class="facultyHead">{{item.tramName}}</div>
+						<div class="facultyCon">老师介绍：{{item.tramContent}}</div>
+					</div>
+					<div v-if="teams.length==0" style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 30rpx;">
+				<div class="title">
+					<div></div>
+					<div>资质证书</div>
+				</div>
+				<div class="kcCon">
+					<div v-for="(item, index) in certs":key = "index" style="width: 100%;">
+						<div v-for="(url, index2) in item" :key = "index2" style="width: 100%;">
+							<image :src="url" mode="" style="width: 100%;"></image>
+						</div>
+					</div>
+					<div v-if="certs.length==0" style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack,urls } = inject('globalFunction');
+import config from "@/config.js"
+const trainOrgan = ref({});
+const courses = ref([]);
+const certs = ref([]);
+const certs2 = ref([]);
+const teams=ref([])
+const certIndex=ref(1)
+const organId=ref('')
+const Authorization=ref('')
+onLoad((options) => {
+	organId.value=options.organId
+});
+onShow(()=>{
+	Authorization.value=uni.getStorageSync('Padmin-Token')||''
+	let params={
+		organId:organId.value
+	}
+	$api.myRequest('/train/public/train/organ/model', params).then((resData) => {
+		if(resData.code==200){
+			trainOrgan.value = (resData.data ? resData.data :{});
+			courses.value = (resData ? (resData.data.course ? (resData.data.course + "").split(",") :[]) :[]);
+			certs2.value = (resData ? JSON.parse(resData.data.zhengshu):[]);
+			list()
+		}
+		
+	});
+})
+function list(){
+	$api.myRequest('/train/public/train/organ/team/list', {organId:organId.value}).then((res) => {
+		if(res.code==200){
+			teams.value=res.data;
+			for(var i =0;i<certs2.value.length;i++){
+			  certs2.value[i].url =config.LCBaseUrl + "/file/minio" + certs2.value[i].url;
+			}
+			var certsArr = [];var flag = 0;
+			for(var i =0;i<certs2.value.length;i++){
+			  flag ++
+			  certsArr.push(certs2.value[i])
+			  if(flag == 3){
+			    var arrs = [];
+			    for(var j =0;j<3;j++){
+			      arrs.push(certsArr[j].url)
+			    }
+			    certs.value.push(arrs);
+			    certsArr = [];
+			    flag = 0;
+			  }else{
+			    if(i == certs2.value.length -1){
+			      var arrs = [];
+			      for(var j =0;j<certsArr.length;j++){
+			        arrs.push(certsArr[j].url)
+			      }
+			      certs.value.push(arrs);
+			    }
+			  }
+			}
+		}
+	})
+}
+</script>
+
+<style lang="stylus" scoped>
+	.app-box{
+		width: 100%;
+		height: 100vh;
+		position: relative;
+		.con-box{
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			left: 0;
+			top:0;
+			z-index: 10;
+			padding: 20rpx 28rpx;
+			box-sizing: border-box;
+			overflow: hidden;
+			.cards{
+				width: 100%;
+				min-height: 260rpx;
+				height: auto;
+				background: linear-gradient(0deg, #D4E3FE 0%, #EBF1FF 100%);
+				border-radius: 12rpx;
+				border: 2px solid #EDF5FF;
+				margin-bottom: 40rpx;
+				padding: 20rpx 30rpx 0;
+				box-sizing: border-box
+				.cardHead{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cardHeadLeft{
+						display: flex;
+						align-items: center
+						width: 100%;
+						.cardTitle{
+							font-weight: bold;
+							font-size: 32rpx;
+							color: #0069CB;
+							max-width: 100%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+						.titleType{
+							border-radius: 4px;
+							font-size: 22rpx;
+							color: #157EFF;
+							width: 100rpx;
+							height: 38rpx;
+							text-align: center;
+							line-height: 38rpx;
+							margin-left: 10rpx;
+						}
+						
+					}
+					
+				}
+				.heng{
+					width: 30%;
+					height: 4rpx;
+					background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+					margin: 10rpx 0 20rpx;
+				}
+				.cardCon{
+					display: flex;
+					flex-wrap: wrap;
+					.conten{
+						width: 100%;
+						font-size: 26rpx;
+						color: #666666;
+						display: flex;
+						align-items: center
+						margin-bottom: 10rpx;
+					}
+					.status-tags{
+						display: flex;
+						align-items: center;
+					}
+				}
+				.flooter{
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+						padding-top: 14rpx;
+					}
+				}
+			}
+		}
+	}
+	.title{
+		width: 100%
+		display: flex
+		align-items: center
+		font-size: 32rpx
+		font-weight: 600
+	}
+	.title>view:first-child{
+		width: 10rpx;
+		height: 46rpx;
+		background-color: #FD7565;
+		margin-right: 20rpx;
+		border-radius: 10rpx;
+	}
+	.kcCon{
+		margin-top: 20rpx;
+		width: 100%
+	}
+	.kcIntroduction{
+		background: rgba(20,136,245,0.1);
+		padding: 20rpx;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		margin-bottom: 20rpx;
+	}
+	.faculty{
+		border: 1px solid #ddd;
+		border-radius: 10rpx;
+		padding: 10rpx;
+		margin-bottom: 20rpx;
+		box-sizing: border-box;
+		.facultyHead{
+			width: 100%;
+			height: 80rpx;
+			border-radius: 10rpx;
+			color: #fff;
+			font-size: 30rpx;
+			background: linear-gradient(88deg, #3E8BFF 0%, #0DB5FB 100%);
+			display: flex;
+			align-items: center
+			padding: 0 20rpx;
+			box-sizing: border-box;
+		}
+		.facultyCon{
+			font-size: 26rpx;
+			color: #666666;
+			padding: 20rpx 0;
+			box-sizing: border-box;
+		}
+	}
+</style>

packageB/jobFair/detailCom.vue

@@ -28,6 +28,14 @@
 				<view> 2、招聘会主办单位：{{ fair.jobFairHostUnit }} </view>
 				<view> 3、招聘会承办单位：{{ fair.jobFairOrganizeUnit }} </view>
 			</view>
+			<view class="jobfair-title"> 签到签退码： </view>
+			<view class="jobfair-content">
+				<view>{{ fair.checkCode }} </view>
+			</view>
+			<view class="jobfair-title"> 展区展位名： </view>
+			<view class="jobfair-content">
+				<view>{{ fair.jobFairAreaBoothName }} </view>
+			</view>
 			<view class="jobfair-title"> 内容描述： </view>
 			<view class="jobfair-content">
 				{{ fair.jobFairIntroduction }}
@@ -120,13 +128,13 @@
 				</view>
 				<view class="bottom">
 					<view class="tag">
-						<view class="tag-item">性别：{{ item.personInfo.sex == 0 ? "男" : "女" }}</view>
+						<view class="tag-item">性别：{{ item.personInfo.sex}}</view>
 						<view class="tag-item success">年龄：{{ item.personInfo.age }}</view>
 					</view>
 				</view>
 
 				<view class="btn">
-					<button type="primary" plain>查看</button>
+					<button type="primary" @click="getDetailPopup(item)" plain>查看</button>
 					<button type="primary" @click="interviewBtn(item)" v-if="item.status == 1">
 						面试邀请
 					</button>
@@ -142,7 +150,68 @@
 			<view v-if="loading" class="loading">加载中...</view>
 			<view v-if="!loading && detail.list.length >= detail.total" class="no-more">没有更多数据了</view>
 		</scroll-view>
-
+		<!-- 简历详情弹窗 -->
+		 <uni-popup ref="resumeDetailPopup" type="center" :maskClick="false">
+			<view class="popup-content job-dialog" :style="getItemBackgroundStyle('zphbm-k.png')">
+				<view class="title">
+					<image :src="`${imgBaseUrl}/jobfair/xb.png`" mode="aspectFit"></image>
+					简历
+				</view>
+				<view class="dialog-content">
+					<view class="flexBox detail-item1">
+						<view class="label">姓名：</view>
+						<view class="value">
+							{{detailObj.name}}
+						</view>
+					</view>
+					<view class="flexBox detail-item1">
+						<view class="label">性别：</view>
+						<view class="value">
+							{{detailObj.sex}}
+						</view>
+					</view>
+					<view class="flexBox detail-item1">
+						<view class="label">年龄：</view>
+						<view class="value">
+							{{detailObj.age}}
+						</view>
+					</view>
+					<view class="flexBox detail-item1">
+						<view class="label">联系方式：</view>
+						<view class="value">
+							{{detailObj.phone}}
+						</view>
+					</view>
+					<view class="flexBox detail-item1">
+						<view class="label">期望薪资：</view>
+						<view class="value">
+							{{detailObj.salaryMin}}-{{ detailObj.salaryMax }}
+						</view>
+					</view>
+					<view class="flexBox detail-item1">
+						<view class="label">学历：</view>
+						<view class="value">
+							{{detailObj.education}}
+						</view>
+					</view>
+					<view class="flexBox detail-item1">
+						<view class="label">期望岗位：</view>
+						<view class="value">
+							{{detailObj.jobTitleId}}
+						</view>
+					</view>
+					<view class="flexBox detail-item1">
+						<view class="label">政治面貌：</view>
+						<view class="value">
+							{{detailObj.politicalAffiliation}}
+						</view>
+					</view>
+				</view>
+				<view class="btn-box">
+					<button type="default" @click="closeResumeDetailPopup">关闭</button>
+				</view>
+			</view>
+		</uni-popup>
 		<!-- 面试邀请弹窗 -->
 		<uni-popup ref="interviewPopup" type="center" :maskClick="false">
 			<view class="popup-content job-dialog" :style="getItemBackgroundStyle('zphbm-k.png')">
@@ -365,7 +434,17 @@
 			loading.value = false;
 		}
 	};
-
+	const resumeDetailPopup = ref()
+	const detailObj = reactive({});
+	//简历详情
+	const getDetailPopup= (item)=>{
+		Object.assign(detailObj,item.personInfo);
+		resumeDetailPopup.value.open();
+	}
+	const closeResumeDetailPopup =()=>{
+		Object.assign(detailObj, {});
+		resumeDetailPopup.value.close();
+	}
 	// 面试邀请
 	const interviewBtn = (item) => {
 		Object.assign(openGw, item);
@@ -859,7 +938,9 @@
 		.dialog-content {
 			padding: 10rpx;
 			height: 80%;
-
+			.flexBox{
+				display: flex;
+			}
 			.detail-item1 {
 				// display: flex;
 				// align-items: center;

packageB/jobFair/detailPerson.vue

@@ -43,7 +43,7 @@
 			<view class="jobfair-content">
 				<view class="card-times">
 					<view class="time-left">
-						<view class="left-date">{{
+<view class="left-date">{{
               parseDateTime(fair.jobFairStartTime).time
             }}</view>
 						<view class="left-dateDay">{{
@@ -134,7 +134,9 @@
 							<text :style="{ color: getStatusText(job.jobFairPersonJob?.status).color }">{{ getStatusText(job.jobFairPersonJob?.status).text }}</text>
 						</view>
 						<view v-else class="btn">
-							<button plain style="color: #1685f7;border-color:#1685f7" @click="deliverResume(job)">简历投递</button>
+							<button plain :disabled="deliveringJobs[job.jobId]" style="color: #1685f7;border-color:#1685f7" @click="deliverResume(job)">
+								{{ deliveringJobs[job.jobId] ? '投递中...' : '简历投递' }}
+							</button>
 						</view>
 					</view>
 				</view>
@@ -317,39 +319,63 @@
 	const closeFeedBackPopup = () => {
 		feedBackPopup.value.close();
 	};
+	// 投递简历loading状态，使用对象存储每个job的投递状态
+	const deliveringJobs = reactive({});
 	// 岗位投递
 	function deliverResume(job) {
-		const raw = uni.getStorageSync("Padmin-Token");
-		const token = typeof raw === "string" ? raw.trim() : "";
-		const headers = token ? {
-			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
-		} : {};
-	
-		$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", {
-						jobFairId: job.jobFairId, // 招聘会id
-						personId: resData.info.userId, // 当前登录用户id
-						enterpriseId: job.companyId, // 企业id
-						jobId: job.jobId, // 岗位id
-						idCard:resData.info.personCardNo
-					}, "post", 9100, {
-						"Content-Type": "application/json"
-					}).then((data) => {
-						if (data && data.code === 200) {
-							$api.msg("简历投递成功");
-							getList(false);
+		uni.showModal({
+            title: "提示",
+            content: "请确认是否投递简历？",
+            showCancel: true,
+            confirmText: "确定",
+            cancelText: "取消",
+            success: (res) => {
+				if(res.confirm){
+					if(deliveringJobs[job.jobId]) return
+					deliveringJobs[job.jobId] = true
+					const raw = uni.getStorageSync("Padmin-Token");
+					const token = typeof raw === "string" ? raw.trim() : "";
+					const headers = token ? {
+						Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
+					} : {};
+				
+					$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", {
+									jobFairId: job.jobFairId, // 招聘会id
+									personId: resData.info.userId, // 当前登录用户id
+									enterpriseId: job.companyId, // 企业id
+									jobId: job.jobId, // 岗位id
+									idCard:resData.info.personCardNo
+								}, "post", 9100, {
+									"Content-Type": "application/json"
+								}).then((data) => {
+									if (data && data.code === 200) {
+										$api.msg("简历投递成功");
+										if (!job.jobFairPersonJob) {
+											job.jobFairPersonJob = {};
+										}
+										job.jobFairPersonJob.status = "1";
+										getList(false);
+									} else {
+										$api.msg((data && data.msg) || "简历投递失败");
+									}
+									deliveringJobs[job.jobId] = false
+								});
+							});
 						} else {
-							$api.msg((data && data.msg) || "简历投递失败");
+							$api.msg('请先登录');
+							deliveringJobs[job.jobId] =false
 						}
+					}).catch(() => {
+						deliveringJobs[job.jobId] =false;
 					});
-				});
-			} else {
-				$api.msg('请先登录')
+				}
+				
 			}
-		});
-	
+        })
+		
 	}
 
 	// 提交面试邀请

packageB/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<AppLayout title="" :use-scroll-view="false">
 		<view class="wrap">
-			<view class="login_index">
+			<!-- <view class="login_index">
 				<input class="input" placeholder="请输入账号" placeholder-class="inputplace" v-model="form.username" />
 				<view class="login_yzm">
 					<input class="input" type="password" placeholder="请输入密码" placeholder-class="inputplace"
@@ -13,7 +13,7 @@
 				</view>
 
 				<button class="com-btn" @click="register">登 录</button>
-			</view>
+			</view> -->
 		</view>
 	</AppLayout>
 </template>
@@ -43,8 +43,8 @@
 	const flag=ref('hlw')
 
 	const form = reactive({
-		username: 'langchaojituan',
-		password: 'Aa123456?',
+		username: '913700004941904564',
+		password: '913700004941904564',
 		rememberMe: false,
 		code: '',
 		uuid: ''
@@ -57,7 +57,43 @@
 	})
 
 	onMounted(() => {
-		getCodeImg()
+		// getCodeImg()
+		let form={}
+		if (uni.getStorageSync('userInfo').isCompanyUser=='1' || uni.getStorageSync('userInfo').isCompanyUser=='2') {
+			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: ""
+			}
+		}
+		$api.myRequest('/auth/login2/ks',form,'post',10100).then((res) => {
+			if (res.code=='200') {
+				uni.setStorageSync('Padmin-Token', res.data.access_token)
+				uni.navigateBack({
+					delta:2
+				})
+			}
+		}).catch(() => {
+			uni.hideLoading()
+			uni.showToast({
+				icon: 'none',
+				title: '登录失败，请重试'
+			})
+		})
 	})
 
 	function register() {

packageB/login2.vue

@@ -0,0 +1,301 @@
+<template>
+	<AppLayout title="" :use-scroll-view="false">
+		<view class="wrap">
+			<view class="login_index">
+				<input class="input" placeholder="请输入账号" placeholder-class="inputplace" v-model="form.username" />
+				<view class="login_yzm">
+					<input class="input" type="password" placeholder="请输入密码" placeholder-class="inputplace"
+						v-model="form.password" />
+				</view>
+				<view class="login_yzm">
+					<input class="input" placeholder="请输入验证码" placeholder-class="inputplace" v-model="form.code" />
+					<image class="yzm" :src="codeUrl" @click="getCodeImg"></image>
+				</view>
+
+				<button class="com-btn" @click="register">登 录</button>
+			</view>
+		</view>
+	</AppLayout>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		inject,
+		watch,
+		ref,
+		onMounted,
+		onUnmounted
+	} from 'vue'
+	import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app';
+	const {
+		$api,
+		navTo,
+		vacanciesTo,
+		navBack
+	} = inject("globalFunction");
+	const placeholderStyle = 'font-size:30rpx'
+	const checked = ref(true)
+	const codeUrl = ref('')
+	const flag=ref('nw')
+
+	const form = reactive({
+		username: '',
+		password: '',
+		rememberMe: false,
+		code: '',
+		uuid: ''
+	})
+
+	onLoad((option) => {
+		console.log("111")
+		if(option.flag){
+			flag.value=option.flag
+		}
+	})
+
+	onMounted(() => {
+		getCodeImg()
+		// 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: ""
+		// 	}
+		// }
+		// $api.myRequest('/auth/login2/ks',form,'post',10100).then((res) => {
+		// 	if (res.code=='200') {
+		// 		uni.setStorageSync('Padmin-Token', res.data.access_token)
+		// 		uni.navigateBack({
+		// 			delta:2
+		// 		})
+		// 	}
+		// }).catch(() => {
+		// 	uni.hideLoading()
+		// 	uni.showToast({
+		// 		icon: 'none',
+		// 		title: '登录失败，请重试'
+		// 	})
+		// })
+	})
+
+	function register() {
+		if (!form.username) {
+			uni.showToast({
+				icon: 'none',
+				title: '请输入用户名'
+			})
+			return
+		}
+		if (!form.password) {
+			uni.showToast({
+				icon: 'none',
+				title: '请输入密码'
+			})
+			return
+		}
+		if (!form.uuid) {
+			uni.showToast({
+				icon: 'none',
+				title: '请输入验证码'
+			})
+			return
+		}
+		uni.showLoading({
+			title: '登录中...',
+			mask: true
+		})
+		if(flag.value=='hlw'){
+			$api.myRequest('/auth/login',form,'post',10100).then((res) => {
+				uni.setStorageSync('Padmin-Token', res.data.access_token)
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+				codeUrl.value = 'data:image/gif;base64,' + res.img
+			}).catch(() => {
+				uni.hideLoading()
+				uni.showToast({
+					icon: 'none',
+					title: '登录失败，请重试'
+				})
+			})
+		}else if(flag.value=='nw'){
+			$api.myRequest('/auth/login',form,'post',9100).then((res) => {
+				uni.setStorageSync('Padmin-Token', res.data.access_token)
+				uni.reLaunch({
+					url: '/packageB/priority/helpFilter'
+				})
+				codeUrl.value = 'data:image/gif;base64,' + res.img
+			}).catch(() => {
+				uni.hideLoading()
+				uni.showToast({
+					icon: 'none',
+					title: '登录失败，请重试'
+				})
+			})
+		}
+		
+	}
+
+	function getCodeImg() {
+		if(flag.value=='hlw'){
+			$api.myRequest('/code',{},'get',10100).then((resData) => {
+				codeUrl.value = 'data:image/gif;base64,' + resData.img
+				form.uuid = resData.uuid
+			});
+		}else if(flag.value=='nw'){
+			$api.myRequest('/code',{},'get',9100).then((resData) => {
+				codeUrl.value = 'data:image/gif;base64,' + resData.img
+				form.uuid = resData.uuid
+			});
+		}
+		
+	}
+</script>
+
+<style scoped lang="stylus">
+	.wrap {
+		background-color: #ffffff;
+		height: 100vh;
+		position: relative;
+
+		.lg-head {
+			height: 480rpx;
+			background: #46ca98;
+			position: relative;
+
+			.view_logo {
+				text-align: center;
+
+				.login_logo {
+					width: 300rpx;
+					height: 300rpx;
+					margin-top: 100rpx;
+				}
+			}
+
+			.bg-cover {
+				position: absolute;
+				bottom: -4rpx;
+				left: 0;
+				right: 0;
+				height: 30rpx;
+				background-size: 100% 100%;
+				z-index: 1;
+			}
+		}
+	}
+
+	.login_index {
+		font-size: 36rpx;
+		font-weight: 500;
+		width: 596rpx;
+		margin: 0 auto;
+
+		::v-deep .is-input-border {
+			border: 0;
+			border-bottom: 1px solid #dcdfe6 !important;
+			border-radius: 0;
+		}
+
+		::v-deep .uni-input-input {
+			font-size: 32rpx;
+			padding-left: 10rpx;
+		}
+
+		::v-deep .uniui-contact-filled:before {
+			color: #46ca98;
+			font-size: 50rpx;
+		}
+
+		::v-deep .uniui-locked-filled:before {
+			color: #46ca98;
+			font-size: 50rpx;
+		}
+
+		.login_yzm {
+			margin-top: 40rpx;
+			display: flex;
+			align-items: center;
+
+			.yzm {
+				width: 200rpx;
+				height: 80rpx;
+			}
+		}
+
+		.com-btn {
+			height: 100rpx;
+			background: #46ca98;
+			border-radius: 50rpx;
+			color: #fff;
+			margin-top: 100rpx;
+		}
+
+		.login_wt {
+			margin: 0 auto;
+			text-align: right;
+			font-size: 24rpx;
+			color: rgba(134, 134, 136, 1);
+		}
+	}
+
+	.lg-bottom {
+		position: absolute;
+		bottom: -3px;
+		left: 0;
+		width: 100%;
+
+		.bottom-svg {
+			position: absolute;
+			bottom: -3px;
+			left: 0;
+			width: 100%;
+		}
+	}
+
+	.login_tongyi {
+
+		font-size: 26rpx;
+		color: rgba(196, 196, 196, 1);
+		width: 620rpx;
+		margin: 32rpx auto;
+		text-align: center;
+
+		text {
+			color: rgba(86, 176, 236, 1);
+		}
+	}
+
+	.input {
+		padding: 0 30rpx 0 80rpx;
+		height: 80rpx;
+		background: #FFFFFF;
+		border-radius: 75rpx 75rpx 75rpx 75rpx;
+		font-size: 28rpx;
+	}
+
+	.inputplace {
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #B5B5B5;
+	}
+</style>

packageB/notice/detail.vue

@@ -0,0 +1,79 @@
+<template>
+	<AppLayout :show-bg-image="false">
+		<view class="main-list" >
+		    <view class="title">
+		      {{ dataInfo.title }}
+			</view>
+			<view class="publishTime">
+			  发布日期：{{ dataInfo.publishTime }}
+			</view>
+		    <view >
+		      <view class="gk-l-i-bottom" v-html="dataInfo.content"></view>
+		    </view>
+		</view>
+	</AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from "vue";
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack, vacanciesTo } = inject("globalFunction");
+import config from "@/config.js";
+import AppLayout from "@/components/AppLayout/AppLayout.vue";
+const baseUrl = config.imgBaseUrl;
+const dataInfo = ref([]);
+const id = ref('');
+const getBackgroundStyle = (imageName) => ({
+  backgroundImage: `url(${baseUrl}/${imageName})`,
+  backgroundSize: "cover", // 覆盖整个容器
+  backgroundPosition: "center", // 居中
+  backgroundRepeat: "no-repeat",
+});
+onLoad((options) => {
+	id.value=options.id
+	getData();
+});
+
+function getData() {
+
+	let params={
+		id:id.value
+	}
+	$api.myRequest('/train/public/announcement/selectById', params).then((resData) => {
+		if(resData.code==200){
+			var td = new RegExp("<td", "g")
+			var table = new RegExp('<table style="width: auto;', "g")
+			resData.data.content  = (resData.data.content + "").replace(td, '<td style = "border:1px solid #cecece;font-size:0.8rem;" ')
+			resData.data.content  = (resData.data.content + "").replace(table, '<table style="width: auto; border-collapse: collapse;" ')
+			dataInfo.value=resData.data
+		}
+		
+	});
+}
+
+</script>
+
+<style lang="scss" scoped>
+.main-list {
+  background-color: #ffffff;
+  padding: 20rpx 25rpx 28rpx 25rpx;
+  margin: 30rpx 30rpx;
+  box-shadow: 0px 3px 20px 0px rgba(0, 105, 234, 0.1);
+  border-radius: 12px;
+}
+.title {
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #282828;
+	margin-bottom: 16rpx;
+	display: flex;
+	justify-content: center;
+}
+.publishTime{
+	text-align: center;
+	font-size: 24rpx;
+	color: #a2a2a2;
+	margin-top: 12rpx;
+	margin-bottom: 20rpx;
+}
+</style>

packageB/notice/index.vue

@@ -0,0 +1,203 @@
+<template>
+  <AppLayout :title="title" :show-bg-image="false">
+	<view class="tab-container">
+		<view class="tab-item" :class="{ active: currentTab === 'train' }" @click="switchTab('train')">
+		  培训公告
+		</view>
+		<view class="tab-item" :class="{ active: currentTab === 'evaluate' }"  @click="switchTab('evaluate')">
+		  评价公告
+		</view>
+	</view>
+	<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+		<view class="main-list" >
+		  <view
+			:style="getBackgroundStyle('frame-activity.png')"
+		    class="policy-list"
+		    v-for="(item, index) in policyList"
+		    :key="index"
+		    @click="goPolicyDetail(item)" >
+		    <view class="title">
+		      {{ item.title }}
+			</view>
+			<view class="bottom-line">
+				<view>
+				  <uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>
+				  发布日期：{{ item.publishTime }}
+				</view>
+			</view>
+		    <view >
+		      <view class="gk-l-i-bottom" v-html="item.content"></view>
+		    </view>
+		    
+		  </view>
+		</view>
+	</scroll-view>
+	
+    
+  </AppLayout>
+</template>
+
+<script setup>
+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";
+const title = ref("");
+const baseUrl = config.imgBaseUrl;
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
+// Tab 控制
+const currentTab = ref("train"); // 默认显示培训公告
+
+function switchTab(tabName) {
+  currentTab.value = tabName;
+  getPolicyData('refresh',currentTab)
+}
+const handleScrollToLower = () => {
+    getPolicyData('add',currentTab);
+};
+const getBackgroundStyle = (imageName) => ({
+  backgroundImage: `url(${baseUrl}/${imageName})`,
+  backgroundSize: "100% 100%", // 覆盖整个容器
+  backgroundPosition: "center", // 居中
+  backgroundRepeat: "no-repeat",
+});
+onMounted(() => {
+  getPolicyData('refresh',currentTab);
+});
+const policyList = ref([]);
+function getPolicyData(type = 'add',currentTab='train') {
+	let current=ref('1')
+	if(currentTab.value=='train'){
+		current.value='1'
+	}else if(currentTab.value=='evaluate'){
+		current.value='2'
+	}
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
+	if (type === 'refresh') {
+	    pageNum.value = 1;
+		params={
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+			type:current.value,
+			shenhe: '1',
+		}
+		$api.myRequest('/train/public/announcement/list', params).then((resData) => {
+			if(resData.code==200){
+				for(var i = 0;i<resData.rows.length;i++){
+					resData.rows[i].content = resData.rows[i].content.replace(/<[^>]+>/g,"");
+				}
+				policyList.value=resData.rows
+				totalNum.value=resData.total
+			}
+			
+		});
+	}
+	if (type === 'add' && pageNum.value < maxPage) {
+	    pageNum.value += 1;
+		params={
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+			type:current.value,
+			shenhe: '1',
+		}
+		$api.myRequest('/train/public/announcement/list', params).then((resData) => {
+			if(resData.code==200){
+				for(var i = 0;i<resData.rows.length;i++){
+					resData.rows[i].content = resData.rows[i].content.replace(/<[^>]+>/g,"");
+				}
+				policyList.value=policyList.value.concat(resData.rows)
+				totalNum.value=resData.total
+			}
+		});
+	}
+}
+
+function goPolicyDetail(item) {
+  uni.navigateTo({
+	  url:`/packageB/notice/detail?id=${item.id}`
+    // url: `/packageRc/pages/policy/policyDetail?id=${item.id}`
+  });
+}
+</script>
+
+<style lang="scss" scoped>
+.main-list {
+  // background-color: #ffffff;
+  // padding: 20rpx 25rpx 28rpx 25rpx;
+  margin: 0 30rpx 30rpx 30rpx;
+  // box-shadow: 0px 3px 20px 0px rgba(0, 105, 234, 0.1);
+  // border-radius: 12px;
+}
+.tab-container {
+  display: flex;
+  height: 80rpx;
+  background-color: #fff;
+  margin: 0 30rpx 20rpx;
+  border-radius: 12rpx;
+  overflow: hidden;
+  margin-top: 10rpx;
+}
+
+.tab-item {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  color: #666;
+  transition: all 0.3s;
+}
+
+.tab-item.active {
+  background-color: #ffffff;
+  color: #4c6efb;
+  font-weight: bold;
+  // box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, 0.05);
+  border-bottom: 2rpx solid #4c6efb;
+}
+.gk-l-i-bottom{
+	margin-top: 16px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 3;
+	-webkit-box-orient: vertical;
+}
+.main-scroll {
+	width: 100%;
+	height: 90%;
+}
+
+.policy-list {
+  width: 100%;
+  margin: 0 auto;
+  color: #333333;
+  border-radius: 24rpx;
+  background: #ffffff;
+  margin-bottom: 24rpx;
+  padding: 28rpx 22rpx;
+  box-sizing: border-box;
+  position: relative;
+
+
+  .title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #282828;
+    margin-bottom: 16rpx;
+    display: flex;
+  }
+
+
+  .bottom-line {
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #a2a2a2;
+    margin-top: 12rpx;
+  }
+}
+</style>

packageB/priority/helpFilter.vue

@@ -40,7 +40,7 @@
                 <!-- 所属区域（下拉选择） -->
                 <view class="search-item">
                   <text class="label">所属区域：</text>
-				  <uni-data-picker ref="picker" class="picker" placeholder="请选择所属区域" popup-title="请选择所属区域" :localdata="regions" v-model="formData.helpArea"
+				  <uni-data-picker ref="picker" class="picker" placeholder="请选择所属区域" popup-title="请选择所属区域" :localdata="regions" v-model="formData.deptTags"
 					  @change="onchange" >
 				  </uni-data-picker>
                 </view>
@@ -158,7 +158,7 @@
 					<view class="form-btns">
 						<button class="mini-btn form-box-btn detail-btn"  size="mini" v-if="false">详情</button>
 						<button class="mini-btn form-box-btn follow-btn"  size="mini" @click="goFollow(item)">跟进</button>
-						<button class="mini-btn form-box-btn recommend-btn"  size="mini" >智能推荐</button>
+						<button class="mini-btn form-box-btn recommend-btn"  size="mini" @click="goRecommend(item)">智能推荐</button>
 					</view>
 				</view>
 			</view>
@@ -180,10 +180,11 @@ const initialForm = {
   idCard: '',
   taskType: '',
   createByName: '',
-  helpArea: [],
-  startTime: '',
-  endTime: '',
-  deptId:''
+//   helpArea: [],
+//   startTime: '',
+//   endTime: '',
+//   deptId:'',
+  deptTags:''
 }
 const formData = reactive({ ...initialForm });
 const taskTypeOptions=ref([])
@@ -226,12 +227,22 @@ const handleReset = () =>{
 	 getDataList('refresh')
 }
 onMounted(async () => {
-  await loadLevelData('201');
+  // await loadLevelData('201');
 });
 onLoad(() => {
-	getDictionary()
-	// getDeptOptions()
-    getDataList('refresh');
+	let token=uni.getStorageSync('fourLevelLinkage-token')
+	if(token){
+		$api.myRequest("/system/user/login/user/info", {}, "GET", 9100, {
+			Authorization: `Bearer ${uni.getStorageSync("fourLevelLinkage-token")}`
+		}).then(async (resData) => {
+
+			await loadLevelData(resData.sysUser.dept.deptId);
+			getDictionary()
+			getDataList('refresh');
+		});
+	}else{
+		navTo('/packageB/login2');
+	}
 });
 function getDictionary(){
 	$api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => {
@@ -254,9 +265,9 @@ function getTaskTypeLabelByValue(value) {
 	  return item ? item.text : '暂无帮扶类型'
 }
  // 加载某一级的数据（parentId 为空表示根）
-async function loadLevelData(parentId) {
+async function loadLevelData(parentId,node) {
     let header = {
-		'Authorization': uni.getStorageSync('Padmin-Token'),
+		'Authorization': uni.getStorageSync('fourLevelLinkage-token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	};
 	let params = { parentId };
@@ -269,15 +280,14 @@ async function loadLevelData(parentId) {
 		}
 		const formatted = (resData.data || []).map(item => ({
 			text: item.deptName, 
-			value: item.deptId,
+			value: item.tags,
+			deptId: item.deptId,
 			children: [] 
 		}));
-		if (parentId === '201') {
-			// 第一层
-			regions.value = formatted;
-		} else {
-			// 找到父节点并注入 children
+		if(node){
 			injectChildren(parentId, formatted);
+		}else{
+			regions.value=formatted
 		}
 	} catch (error) {
 		console.error("加载部门数据失败:", error);
@@ -288,7 +298,7 @@ async function loadLevelData(parentId) {
 function injectChildren(parentValue, childrenData) {
     const findAndInject = (nodes) => {
 		for (let node of nodes) {
-			if (node.value === parentValue) {
+			if (node.deptId === parentValue) {
 				// 如果 children 已存在且非空，避免重复加载
 				if (!node.children || node.children.length === 0) {
 					node.children = childrenData;
@@ -308,7 +318,7 @@ function injectChildren(parentValue, childrenData) {
 // 当用户选择时触发（注意：change 在每级选择后都会触发）
 function onchange(e) {
 	const selectedValues = e.detail.value;
-	formData.deptId=selectedValues.map(item => item.value).join(',');
+	// formData.deptId=selectedValues.map(item => item.value).join(',');
 	if (selectedValues.length === 0) return;
 	// 获取最后一级选中的 value
 	const lastSelectedValue = selectedValues[selectedValues.length - 1];
@@ -317,7 +327,7 @@ function onchange(e) {
 	if (node && (!node.children || node.children.length === 0)) {
 		// 检查接口是否还有下一级（可通过接口返回判断，或先尝试加载）
 		// 这里我们直接尝试加载下一级
-		loadLevelData(lastSelectedValue.value);
+		loadLevelData(node.deptId , node);
 		picker.value.show()
 	}
 }
@@ -336,7 +346,7 @@ function findNodeByValue(nodes, value) {
 }
 function getDeptOptions(){
 	let header={
-		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	}
 	let params={
@@ -349,7 +359,7 @@ function getDataList(type = 'add') {
 	let maxPage=Math.ceil(totalNum.value/pageSize.value)
 	let params=({...formData})
 	let header={
-		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	}
     if (type === 'refresh') {
@@ -374,7 +384,11 @@ function getDataList(type = 'add') {
 	}
 }
 function goFollow(item) {
-    navTo(`/packageB/priority/helpFollow?id=${item.goal_person_id}&&name=${item.name}&&taskType=${getTaskTypeLabelByValue(item.task_type)}`);
+    navTo(`/packageB/priority/helpFollow?task_id=${item.task_id}&person_id=${item.person_id}&&name=${item.name}&&taskType=${getTaskTypeLabelByValue(item.task_type)}`);
+}
+//智能推荐
+const goRecommend = (item) => {
+  navTo('/packageB/priority/recommend');
 }
 </script>
 

packageB/priority/helpFollow.vue

@@ -105,7 +105,8 @@ const formData = reactive({
 const personInfo=ref({
 	goalPersonId:'',
 	name:'',
-	taskType:''
+	taskType:'',
+	task_id:''
 })
 const followWays = ref([])
 const followList = ref([])
@@ -161,11 +162,12 @@ const onDateChange = ( e) => {
 }
 function getFollowList(){
 	let header={
-		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	}
 	let params={
-		goalPersonId:personInfo.value.goalPersonId
+		personId:personInfo.value.person_id,
+		taskId:personInfo.value.task_id
 	}
 	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
 		console.log("resData",resData)
@@ -209,7 +211,7 @@ const handleSubmit = () => {
   formRef.value?.validate()
     .then(() => {
 		let header={
-			'Authorization':uni.getStorageSync('Padmin-Token')
+			'Authorization':uni.getStorageSync('fourLevelLinkage-token')
 		}
 		formData.goalPersonId=personInfo.value.goalPersonId
 		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
@@ -245,9 +247,10 @@ const handleReset = () => {
 	  formData.nextContactDate = '';
 }
 onLoad((options) => {
-	personInfo.value.goalPersonId=options.id
+	personInfo.value.person_id=options.person_id
 	personInfo.value.name=options.name
 	personInfo.value.taskType=options.taskType
+	personInfo.value.task_id=options.task_id
 	getDictionary()
 	getFollowList()
 });

packageB/priority/recommend.vue

@@ -0,0 +1,412 @@
+<template>
+  <AppLayout :title="title" :show-bg-image="false">
+    <view class="main-list" :style="getBackgroundStyle('k.png')">
+      <view class="list-top">
+        <view class="list-title">
+          <text>岗位推荐列表</text>
+          <view class="title-line" style="left: 70rpx"></view>
+        </view>
+      </view>
+      <view class="jobListBox">
+        <view class="item" v-for="(job, index) in list" :key="index">
+          <view class="falls-card">
+            <view class="falls-card-pay">
+              <view class="pay-text">
+                <Salary-Expectation
+                  :max-salary="job.maxSalary"
+                  :min-salary="job.minSalary"
+                  :is-month="true"
+                ></Salary-Expectation>
+              </view>
+              <image
+                v-if="job.isHot"
+                class="flame"
+                src="/static/icon/flame.png"
+              ></image>
+            </view>
+            <view class="falls-card-title">{{ job.jobTitle }}</view>
+            <view class="fl_box fl_warp">
+              <view class="falls-card-education mar_ri10" v-if="job.education">
+                <dict-Label
+                  dictType="education"
+                  :value="job.education"
+                ></dict-Label>
+              </view>
+              <view class="falls-card-experience" v-if="job.experience">
+                <dict-Label
+                  dictType="experience"
+                  :value="job.experience"
+                ></dict-Label>
+              </view>
+            </view>
+            <view class="falls-card-company">
+              {{ config.appInfo.areaName }}
+              <dict-Label
+                dictType="area"
+                :value="job.jobLocationAreaCode"
+              ></dict-Label>
+            </view>
+            <view class="falls-card-pepleNumber">
+              <view>
+                <image class="point2" src="/static/icon/pintDate.png"></image>
+                <view class="fl_1">
+                  {{ job.postingDate || "发布日期" }}
+                </view>
+              </view>
+              <view>
+                <image
+                  class="point3"
+                  src="/static/icon/pointpeople.png"
+                ></image>
+                <view class="fl_1">
+                  {{ vacanciesTo(job.vacancies) }}
+                </view>
+              </view>
+            </view>
+            <view class="falls-card-company2">
+              <image class="point3" src="/static/icon/point3.png"></image>
+              <view class="fl_1">
+                {{ job.companyName }}
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="main-list" :style="getBackgroundStyle('k.png')">
+      <view class="list-top">
+        <view class="list-title">
+          <text>政策推荐列表</text>
+          <view class="title-line" style="left: 70rpx"></view>
+        </view>
+      </view>
+      <view
+        style="margin-bottom: 24rpx; border-radius: 16rpx"
+        class="policy-list"
+        v-for="(item, index) in policyList"
+        :key="index"
+        @click="goPolicyDetail(item)"
+      >
+        <view class="sign">推荐</view>
+        <view class="title">
+          <image src="../../packageRc/static/zcLeft.png" />
+          {{ item.zcmc }}</view
+        >
+        <view class="infos">
+          <view v-if="item.zcLevel">{{ item.zcLevel }}</view>
+          <view v-if="item.sourceUnit">{{ item.sourceUnit }}</view>
+        </view>
+        <view class="bottom-line">
+          <view
+            ><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons
+            >发布日期：{{ item.createTime }}</view
+          >
+          <view>
+            <!-- 浏览数<text style="color: #6aa7e8">{{ item.viewNum }}</text> -->
+          </view>
+        </view>
+      </view>
+    </view>
+  </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from "vue";
+const { $api, navTo, navBack, vacanciesTo } = inject("globalFunction");
+import config from "@/config.js";
+import { getPolicyList } from "@/packageB/apiRc/policy/index.js";
+import AppLayout from "@/components/AppLayout/AppLayout.vue";
+import dictLabel from "@/components/dict-Label/dict-Label.vue";
+const title = ref("");
+const baseUrl = config.imgBaseUrl;
+const list = ref([]);
+const getBackgroundStyle = (imageName) => ({
+  backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+  backgroundSize: "cover", // 覆盖整个容器
+  backgroundPosition: "center", // 居中
+  backgroundRepeat: "no-repeat",
+});
+onMounted(() => {
+  getJobRecommend();
+  getPolicyData();
+});
+function getJobRecommend() {
+  $api
+    .createRequest(
+      "/cms/job/recommend",
+      { pageSize: 8 },
+      "GET",
+      false,
+      {},
+      false
+    )
+    .then((resData) => {
+      if (resData.code == 200) {
+        list.value = resData.data
+      }
+    });
+}
+const policyList = ref([]);
+function getPolicyData() {
+  getPolicyList({ pageNum: 1, pageSize: 8 }).then((res) => {
+    if(res.code == 200){
+      policyList.value = res.rows;
+    }
+  });
+}
+
+function goPolicyDetail(item) {
+  uni.navigateTo({
+    url: `/packageRc/pages/policy/policyDetail?id=${item.id}`
+  });
+}
+</script>
+
+<style lang="scss" scoped>
+.main-list {
+  background-color: #ffffff;
+  padding: 20rpx 25rpx 28rpx 25rpx;
+  margin: 30rpx 30rpx;
+  box-shadow: 0px 3px 20px 0px rgba(0, 105, 234, 0.1);
+  border-radius: 12px;
+}
+
+.list-top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.list-title {
+  font-weight: bold;
+  font-size: 36rpx;
+  color: #404040;
+  position: relative;
+}
+
+.title-line {
+  position: absolute;
+  bottom: -10rpx;
+  left: 36rpx;
+  width: 70rpx;
+  height: 8rpx;
+  background: linear-gradient(90deg, #ffad58 0%, #ff7a5b 100%);
+  border-radius: 4rpx;
+}
+
+.jobListBox {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  padding-top: 28rpx;
+  margin-top: 10rpx;
+}
+
+.item {
+  width: 48%;
+  position: relative;
+  border-radius: 6px;
+  margin-bottom: 10px;
+  background-color: #fff;
+  box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05);
+
+  .falls-card {
+    padding: 30rpx;
+
+    .falls-card-title {
+      font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue",
+        Helvetica, Arial, "Microsoft YaHei", sans-serif;
+      color: #606060;
+      text-align: left;
+      word-break: break-all;
+      font-weight: 500;
+      font-size: 32rpx;
+      color: #333333;
+      margin-top: 10rpx;
+    }
+
+    .falls-card-pay {
+      // height: 50rpx;
+      word-break: break-all;
+      color: #002979;
+      text-align: left;
+      display: flex;
+      align-items: end;
+      position: relative;
+
+      .pay-text {
+        font-family: DIN-Medium;
+        color: #4c6efb;
+        padding-right: 10rpx;
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #4c6efb;
+        line-height: 45rpx;
+        text-align: left;
+      }
+
+      .flame {
+        position: absolute;
+        bottom: 0;
+        right: -10rpx;
+        transform: translate(0, -30%);
+        width: 24rpx;
+        height: 31rpx;
+      }
+    }
+
+    .falls-card-education,
+    .falls-card-experience {
+      width: fit-content;
+      height: 30rpx;
+      background: #f4f4f4;
+      border-radius: 4rpx;
+      padding: 6rpx 20rpx;
+      line-height: 30rpx;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #6c7282;
+      text-align: center;
+      margin-top: 20rpx;
+      white-space: nowrap;
+    }
+
+    .falls-card-company,
+    .falls-card-pepleNumber {
+      margin-top: 20rpx;
+      font-size: 24rpx;
+      color: #999999;
+      line-height: 25rpx;
+      text-align: left;
+    }
+
+    .falls-card-pepleNumber {
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+      margin-top: 10rpx;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #999999;
+      line-height: 46rpx;
+
+      view {
+        display: flex;
+        align-items: center;
+        white-space: nowrap;
+
+        .point2 {
+          margin: 0rpx 6rpx 0 2rpx;
+          height: 22rpx;
+          width: 22rpx;
+        }
+
+        .point3 {
+          margin: 0rpx 4rpx 0 0;
+          height: 28rpx;
+          width: 28rpx;
+        }
+      }
+    }
+
+    .falls-card-matchingrate {
+      margin-top: 10rpx;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      font-size: 21rpx;
+      color: #4778ec;
+      text-align: left;
+    }
+
+    .falls-card-company2 {
+      margin-top: 4rpx;
+      font-size: 24rpx;
+      color: #999999;
+      text-align: left;
+      display: flex;
+
+      .point3 {
+        margin: 4rpx 4rpx 0 0;
+        height: 26rpx;
+        width: 26rpx;
+      }
+    }
+  }
+}
+
+.policy-list {
+  width: 100%;
+  margin: 0 auto;
+  color: #333333;
+  border-radius: 24rpx;
+  background: #ffffff;
+  padding: 28rpx 22rpx;
+  margin-top: 24rpx;
+  box-sizing: border-box;
+  position: relative;
+
+  .sign {
+    position: absolute;
+    font-size: 24rpx;
+    right: 0;
+    top: 0;
+    padding: 4rpx 14rpx;
+    border: 1rpx solid #ec4827;
+    background: rgba(227, 79, 49, 0.09);
+    border-top-right-radius: 24rpx;
+    border-bottom-left-radius: 24rpx;
+    color: #ec4827;
+  }
+
+  .top-line {
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #a2a2a2;
+    margin-bottom: 16rpx;
+
+    .salary {
+      font-size: 32rpx;
+      color: #4c6efb;
+      font-weight: bold;
+    }
+  }
+
+  .title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #282828;
+    margin-bottom: 16rpx;
+    display: flex;
+
+    image {
+      width: 46rpx;
+      height: 46rpx;
+      margin-right: 11rpx;
+    }
+  }
+
+  .infos {
+    display: flex;
+    flex-wrap: wrap;
+    font-size: 24rpx;
+    margin-bottom: 16rpx;
+    line-height: 42rpx;
+
+    view {
+      padding: 0 16rpx;
+      margin-right: 10rpx;
+      background: #f2f2f2;
+    }
+  }
+
+  .bottom-line {
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #a2a2a2;
+    margin-top: 12rpx;
+  }
+}
+</style>

packageB/train/index.vue

@@ -3,7 +3,7 @@
         <view class="tab-container">
 			<image src="/packageB/static/images/train/bj.jpg" mode=""></image>
 			<view>
-				<view class="btns" @click="jumps('/packageB/train/video/videoList')">
+				<!-- <view class="btns" @click="jumps('/packageB/train/video/videoList')">
 					<image src="/packageB/static/images/train/spxx-k.png" mode=""></image>
 					<view>
 						<text>培训视频</text>
@@ -12,8 +12,8 @@
 							<image src="/packageB/static/images/train/arrow.png" mode=""></image>
 						</view>
 					</view>
-				</view>
-				<view class="btns" @click="jumps('/packageB/train/practice/startPracticing')">
+				</view> -->
+				<view class="btns" @click="jumps('/packageB/train/practice/startPracticingList')">
 					<image src="/packageB/static/images/train/zxxl-k.png" mode=""></image>
 					<view>
 						<text>专项练习</text>
@@ -35,7 +35,7 @@
 					</view>
 					
 				</view>
-				<view class="btns" @click="jumps('/packageB/train/wrongAnswer/mistakeNotebook')">
+				<!-- <view class="btns" @click="jumps('/packageB/train/wrongAnswer/mistakeNotebook')">
 					<image src="/packageB/static/images/train/ctb-k.png" mode=""></image>
 					<view>
 						<text>错题本 </text>
@@ -45,7 +45,7 @@
 						</view>
 					</view>
 					
-				</view>
+				</view> -->
 			</view>
         </view>
     <!-- </AppLayout> -->
@@ -58,8 +58,57 @@ const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction
 import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
 
-function jumps(url){
-	navTo(url);
+onLoad(() => {
+    thirdLogin()
+});
+
+async function jumps(url){
+	if(await thirdLogin()){
+		navTo(url);
+	}
+}
+
+
+async function thirdLogin(){
+	let form={}
+	if (uni.getStorageSync('userInfo').isCompanyUser=='1' || uni.getStorageSync('userInfo').isCompanyUser=='2') {
+		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;
+	}
 }
 </script>
 

packageB/train/mockExam/examList.vue

@@ -129,6 +129,7 @@
 <script setup>
 import { inject, ref, reactive } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
+import dayjs from "dayjs";
 const { $api, navTo, navBack,urls } = inject('globalFunction');
 import config from "@/config.js"
 const userInfo = ref({});
@@ -152,13 +153,7 @@ onLoad(() => {
 });
 onShow(()=>{
 	getDictionary()
-	const date = new Date();
-	let year = date.getFullYear();
-	let month = date.getMonth() + 1; // 月份从0开始，需要加1
-	let day = date.getDate();
-	month=month>9?month:'0'+month
-	day=day>9?day:'0'+day
-	dates.value=year+'-'+month+'-'+day
+	dates.value=dayjs().format('YYYY-MM-DD HH:mm:ss')
 	Authorization.value=uni.getStorageSync('Padmin-Token')||''
 	getHeart();
 })
@@ -337,13 +332,12 @@ function handleOperation(row,i) {
 		    height: 90%;
 			.cards{
 				width: 100%;
-				height: 280rpx;
 				background: linear-gradient(0deg, #E3EFFF 0%, #FBFDFF 100%);
 				// box-shadow: 0px 0px 6px 0px rgba(0,71,200,0.32);
 				border-radius: 12rpx;
 				border: 2px solid #EDF5FF;
 				margin-bottom: 30rpx;
-				padding: 30rpx 40rpx 0;
+				padding: 30rpx 40rpx 10rpx;
 				box-sizing: border-box
 				.cardHead{
 					display: flex;

packageB/train/mockExam/startExam.vue

@@ -606,6 +606,8 @@ function exit(){
 			}
 			.questionNums{
 			  width: 100%;
+			  height: 90vh;
+			  overflow-y: auto;
 			  display: flex;
 			  flex-wrap: wrap;
 			}
@@ -618,6 +620,7 @@ function exit(){
 			  border: 2px solid #E0E0E0;
 			  font-size: 28rpx;
 			  margin-right: 15px;
+			  margin-bottom: 15px;
 			  cursor: pointer;
 			}
 			.questionsActive{

packageB/train/practice/startPracticing.vue

@@ -109,7 +109,7 @@
 					<div>题号</div>
 					<div style="font-size: 40rpx;" @click="clones()">×</div>
 				</div>
-				<div class="questionNums">
+				<div class="questionNums" style = "height:77vh;overflow: auto;">
 				  <div class="questions" :class="item.whether=='正确'?'questionCorrect':item.whether=='错误'?'questionError':questionIndex==(index+1)?'questionsActive':''" @click="switchs(index)" v-for="(item,index) in problemList" :key="index">{{index+1}}</div>
 				</div>
 			</div>
@@ -125,6 +125,7 @@ import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
 const userInfo = ref({});
 const Authorization = ref('');
+const cataType = ref('');
 const radio = ref('');
 const radio2 = ref('');
 const checkList = ref([]);
@@ -161,6 +162,7 @@ watch(questionIndex, (newVal, oldVal) => {
 // });
 
 onLoad((options) => {
+	cataType.value = options.cataType;
 	Authorization.value=uni.getStorageSync('Padmin-Token')||''
 	getHeart();
 });
@@ -202,7 +204,8 @@ function queryData(){
 		'Content-Type':"application/x-www-form-urlencoded"
 	}
 	$api.myRequest('/train/public/trainPractice/getQuestions', {
-		userId: userInfo.value.userId
+		userId: userInfo.value.userId,
+		category: cataType.value
 	},'post',9100,header).then((resData) => {
 		if(resData&&resData.code==200){
 			resData.data.forEach((item,i)=>{

packageB/train/practice/startPracticingList.vue

@@ -0,0 +1,393 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" @onScrollBottom="getDataList('add')">
+ <!--       <template #headerleft>
+            <view class="btnback">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
+            </view>
+        </template> -->
+        <!-- <template #headContent>
+            <view class="collection-search">
+                <view class="search-content">
+                    <view class="header-input button-click">
+                        <uni-icons class="iconsearch" color="#6A6A6A" type="search" size="22"></uni-icons>
+                        <input
+                            class="input"
+                            v-model="searchKeyword"
+                            @confirm="searchVideo"
+                            placeholder="输入"
+                            placeholder-class="inputplace"
+                        />
+                        <uni-icons 
+                            v-if="searchKeyword" 
+                            class="clear-icon" 
+                            type="clear" 
+                            size="24" 
+                            color="#999" 
+                            @click="clearSearch"
+                        />
+                    </view>
+                </view>
+            </view>
+        </template> -->
+        <view class="main-list">
+			<view class="list-title">
+				<text>专项训练列表</text>
+				<view class="title-line"></view>
+			</view>
+            <view class="video-grid" v-if="dataList.length>0">
+                <view 
+                    v-for="item in dataList" 
+                    :key="item.category_value"
+                    class="train-item"
+                >
+					<div class = "cards">
+						<div class="cardHead">
+							<div class="cardHeadLeft">
+								<div class="cardTitle">{{item.category}}</div>
+							</div>
+						</div>
+						<div class="heng"></div>
+						<div class="cardCon">
+							<div class="conten">难度：{{item.difficulty}}</div>
+						</div>
+						<div class="flooter">
+							<div @click="goZxxl(item)">去考试</div>
+						</div>
+					</div>
+                </view>
+            </view>
+            <empty v-else pdTop="200"></empty>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+// state
+const title = ref('');
+const searchKeyword = ref('');
+const dataList=ref([])
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
+const baseUrl = config.imgBaseUrl
+const getItemBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/train/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const trainVideoImgUrl=config.trainVideoImgUrl
+
+onLoad(async () => {
+    await thirdLogin()
+    getDataList('refresh');
+});
+
+// 搜索视频
+function searchVideo() {
+    getDataList('refresh');
+}
+
+// 清除搜索内容
+function clearSearch() {
+    searchKeyword.value = '';
+    getDataList('refresh');
+}
+
+// 获取视频列表
+function getDataList(type = 'add') {
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
+    if (type === 'refresh') {
+        pageNum.value = 1;
+		params={
+			category:'',
+			hour:'',
+			level:'',
+			searchValue:searchKeyword.value,
+			orderStr:'',
+			pageSize:pageSize.value,
+			pageNum:pageNum.value
+		}
+		$api.myRequest('/train/public/trainQuestion/getQuestionTypes', params).then((resData) => {
+			dataList.value=resData.rows
+			totalNum.value=resData.total
+		});
+    }
+    if (type === 'add' && pageNum.value < maxPage) {
+        pageNum.value += 1;
+		params={
+			category:'',
+			pageSize:pageSize.value,
+			pageNum:pageNum.value
+		}
+		$api.myRequest('/train/public/trainQuestion/getQuestionTypes', params).then((resData) => {
+			dataList.value=dataList.value.concat(resData.rows)
+			totalNum.value=resData.total
+		});
+		
+	}
+}
+
+function goZxxl(item){
+	navTo(`/packageB/train/practice/startPracticing?cataType=${item.category_value}`);
+}
+
+// 播放视频
+async function playVideo(video) {
+	if(await thirdLogin()){
+	}
+}
+
+
+async function thirdLogin(){
+	let form={}
+	if (uni.getStorageSync('userInfo').isCompanyUser=='1'|| uni.getStorageSync('userInfo').isCompanyUser=='2') {
+		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;
+	}
+}
+</script>
+
+<style lang="stylus" scoped>
+.btnback{
+    width: 64rpx;
+    height: 64rpx;
+}
+image {
+    height: 100%;
+    width: 100%;
+}
+.train-item{
+	width:100%;
+}
+
+.cards{
+	width: 100%;
+	height: 240rpx;
+	background: linear-gradient(0deg, #E3EFFF 0%, #FBFDFF 100%);
+	// box-shadow: 0px 0px 6px 0px rgba(0,71,200,0.32);
+	border-radius: 12rpx;
+	border: 2px solid #EDF5FF;
+	margin-bottom: 30rpx;
+	padding: 30rpx 40rpx 0;
+	box-sizing: border-box
+	.cardHead{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.cardHeadLeft{
+			display: flex;
+			align-items: center
+			width: 98%;
+			.cardTitle{
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #0069CB;
+				max-width: 98%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+			.titleType{
+				border-radius: 4px;
+				font-size: 22rpx;
+				color: #157EFF;
+				width: 100rpx;
+				height: 38rpx;
+				text-align: center;
+				line-height: 38rpx;
+				margin-left: 10rpx;
+			}
+			
+		}
+		
+	}
+	.heng{
+		width: 120rpx;
+		height: 4rpx;
+		background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+		margin: 10rpx 0 20rpx;
+	}
+	.cardCon{
+		display: flex;
+		flex-wrap: wrap;
+		.conten{
+			width: 50%;
+			font-size: 22rpx;
+			color: #666666;
+			display: flex;
+			align-items: center
+			margin-bottom: 10rpx;
+		}
+		.status-tags{
+			display: flex;
+			align-items: center;
+		}
+	}
+	.flooter{
+		border-top: 1px solid #ccc;
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		view{
+			font-size: 28rpx;
+			margin-left: 30rpx;
+			color: #2175F3;
+			padding-top: 14rpx;
+		}
+	}
+}
+
+.events.data-v-4c19f00c {
+  pointer-events: none; /* 这会禁用所有指针事件 */
+  opacity: 0.5; /* 可选：改变透明度以视觉上表示不可点击 */
+  cursor: not-allowed; /* 可选：改变鼠标光标样式 */
+}
+.collection-search{
+    padding: 10rpx 20rpx;
+    .search-content{
+        position: relative
+        display: flex
+        align-items: center
+        padding: 14rpx 0
+        .header-input{
+            padding: 0
+            width: calc(100%);
+            position: relative
+            .iconsearch{
+                position: absolute
+                left: 30rpx;
+                top: 50%
+                transform: translate(0, -50%)
+                z-index: 1
+            }
+            .input{
+                padding: 0 80rpx 0 80rpx
+                height: 80rpx;
+                background: #FFFFFF;
+                border-radius: 75rpx 75rpx 75rpx 75rpx;
+                border: 2rpx solid #ECECEC
+                font-size: 28rpx;
+            }
+            .clear-icon{
+                position: absolute
+                right: 30rpx;
+                top: 50%
+                transform: translate(0, -50%)
+                z-index: 1
+                cursor: pointer
+            }
+            .inputplace{
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #B5B5B5;
+            }
+        }
+    }
+}
+.main-list{
+    background-color: #ffffff;
+    padding: 20rpx 20rpx 28rpx 20rpx;
+	margin:10rpx 30rpx ;
+	box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1);
+	border-radius: 12px;
+}
+.list-title{
+	font-weight: bold;
+	font-size: 36rpx;
+	color: #404040;
+	position: relative;
+	margin-bottom: 20px;
+}
+.title-line{
+	position: absolute;
+	bottom: -10rpx;
+	left: 36rpx;
+	width: 70rpx;
+	height: 8rpx;
+	background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%);
+	border-radius: 4rpx;
+}
+.video-grid{
+    display: flex;
+	flex-wrap: wrap;
+}
+.video-item{
+}
+.video-item:active{
+    transform: scale(0.98);
+}
+.video-cover{
+    position: relative;
+    width: 100%;
+    padding-top: 56.25%; /* 16:9 比例 */
+    background: #f0f0f0;
+	border-radius: 4rpx;
+}
+.video-cover image{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+.video-info{
+    padding: 16rpx 16rpx 0 16rpx;
+	font-size: 26rpx;
+	color: #333;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	text-align: center;
+}
+.video-title{
+    font-size: 28rpx;
+    color: #333;
+    line-height: 40rpx;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+</style>

packageB/train/video/videoDetail.vue

@@ -9,8 +9,20 @@
 			<view class="video-detail-container">
 			    <!-- 视频播放组件 -->
 			    <view class="video-wrapper">
-					<video id="myVideo" :src="videoInfo.currentUrl" :poster="trainVideoImgUrl+ videoInfo.cover" @seeked="onSeeked"
-						 enable-danmu controls style="width: 100%;" @pause="onPause" @timeupdate="onTimeupdate" @ended="onEnded"></video>
+					<video 
+						v-if="videoInfo && videoInfo.cover && isVideoReady" 
+						id="myVideo" 
+						:src="videoInfo.currentUrl" 
+						:poster="trainVideoImgUrl+ videoInfo.cover"
+						:initial-time="initialTime"
+						:autoplay="shouldAutoPlay"
+						enable-danmu 
+						controls 
+						style="width: 100%;" 
+						@pause="onPause" 
+						@timeupdate="onTimeupdate" 
+						@ended="onEnded">
+					</video>
 			    </view>
 			</view>
 			<view class="video-info" :style="getItemBackgroundStyle('video-bj2.png')">
@@ -132,7 +144,7 @@
 </template>
 
 <script setup>
-import { inject, reactive,ref, onMounted, onUnmounted, nextTick } from 'vue';
+import { inject, reactive,ref, onMounted, onUnmounted, nextTick ,watch} from 'vue';
 import { onLoad,onHide,onUnload } from '@dcloudio/uni-app';
 const { $api, navTo, navBack } = inject('globalFunction');
 import config from "@/config.js"
@@ -146,10 +158,13 @@ const trainVideoImgUrl=config.trainVideoImgUrl
 const categories=ref([])
 const levalLabels=ref([])
 const latestTime = ref(0)
+const initialTime = ref(0)
 const totalTime=ref(0)
 const baseUrl = config.imgBaseUrl
 const pageEnterTime = ref(0)
 const currentChapter = ref(0)
+const isVideoReady = ref(false)
+const shouldAutoPlay = ref(false)
 const getItemBackgroundStyle = (imageName) => ({
     backgroundImage: `url(${baseUrl}/train/${imageName})`,
     backgroundSize: '100% 100%',      // 覆盖整个容器
@@ -166,18 +181,38 @@ const params = reactive({
 	videoId: '',
 	userId: ''
 })
+// 监听 initialTime 变化，确保设置完成后再渲染
+watch(initialTime, (newVal) => {
+	if (newVal >= 0 && videoInfo.value && videoInfo.value.cover) {
+		// 延迟渲染，确保初始时间设置生效
+		nextTick(() => {
+			isVideoReady.value = true
+			shouldAutoPlay.value = newVal > 0
+		})
+	}
+})
+// 监听 videoInfo 变化
+watch([videoInfo, initialTime], ([newVideoInfo, newInitialTime]) => {
+	if (newVideoInfo && newVideoInfo.cover && newInitialTime >= 0) {
+		nextTick(() => {
+			isVideoReady.value = true
+			shouldAutoPlay.value = newInitialTime > 0
+		})
+	}
+}, { deep: true })
 onLoad((options) => {
 	getHeart()
 	pageEnterTime.value = Date.now() // 记录毫秒时间戳
 	videoId.value=options.id
 	getDictionary()
 });
-onHide(() => {
-    updateVideoInfo() // 用缓存值，不要调 getCurrentTime
-	reportPageDuration()
-})
+// onHide(() => {
+//     updateVideoInfo() // 用缓存值，不要调 getCurrentTime
+// 	reportPageDuration()
+// })
 onUnload(() => {
-    updateVideoInfo()
+    //updateVideoInfo()
+	saveCurrentChapterProgress()
 	reportPageDuration()
 })
 function getData() {
@@ -195,17 +230,22 @@ function getData() {
 		videoInfo.value.currentUrl=trainVideoImgUrl+videoInfo.value.trainClassList[0].url
 		videoInfo.value.percentage=((videoInfo.value.process/(videoInfo.value.hour*60))*100).toFixed(2)
 		videoInfo.value.uploadTime=videoInfo.value.uploadTime.split(' ')[0]
+		if(videoInfo.value.process !=null){
+			queryModelUserPlay(videoInfo.value.trainClassList[0].classId)
+		} else {
+			// 如果没有历史进度，直接准备渲染
+			initialTime.value = 0
+		}
+		updateVideoInfo()
 	});
 }
 function getHeart() {
 	const raw = uni.getStorageSync("Padmin-Token");
 	const token = typeof raw === "string" ? raw.trim() : "";
-	const headers = token ? { Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}` }: {}
+	const headers = token ? { Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}` }: {};
 	$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => {
       if (resData.code == 200) {
         getUserInfo();
-      } else {
-		  navTo('/packageB/login')
       }
     });
 }
@@ -244,16 +284,18 @@ function getLevelLabelByValue(value) {
 }
 function onPause(e){
 	updateVideoInfo()
+	saveCurrentChapterProgress()
 }
 function onEnded(e){
 	updateVideoInfo()
+	saveCurrentChapterProgress()
 }
 function onTimeupdate(e){
 	latestTime.value = e.detail.currentTime
 }
-function onSeeked(){
-	updateVideoInfo()
-}
+// function onSeeked(){
+// 	updateVideoInfo()
+// }
 // 更新播放时长
 function updateVideoInfo(){
 	totalTime.value=0
@@ -275,15 +317,20 @@ function updateVideoInfo(){
 		'Authorization':uni.getStorageSync('Padmin-Token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	}
-	if(videoInfo.value.isCollect===null && videoInfo.value.process ===null){
-		$api.myRequest('/train/public/videoUser/add', paramsData,'post',9100,header).then((resData) => {
-			console.log("视频播放时长更新成功")
-		});
-	}else{
-		$api.myRequest('/train/public/videoUser/update', paramsData,'post',9100,header).then((resData) => {
-			console.log("视频播放时长更新成功")
-		});
-	}
+	
+	$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, header).then((resData) => {
+	  if (resData.code == 200) {
+		if(videoInfo.value.isCollect===null && videoInfo.value.process ===null && paramsData.process ==0 ){
+			$api.myRequest('/train/public/videoUser/add', paramsData,'post',9100,header).then((resData) => {
+				console.log("视频播放时长更新成功")
+			});
+		}else{
+			$api.myRequest('/train/public/videoUser/update', paramsData,'post',9100,header).then((resData) => {
+				console.log("视频播放时长更新成功")
+			});
+		}
+	  }
+	})
 }
 // 计算并上报停留时长
 function reportPageDuration() {
@@ -307,8 +354,58 @@ function reportPageDuration() {
 	}
 }
 function chapterChange(video,index){
+	saveCurrentChapterProgress()
 	currentChapter.value=index
 	videoInfo.value.currentUrl=trainVideoImgUrl+video.url
+	isVideoReady.value = false
+	shouldAutoPlay.value = false
+	queryModelUserPlay(video.classId)
+}
+const updateUserPlayClassHousr = (classId,hour) => {
+	let paramsData={
+		userId:userId.value,
+		classId:classId,
+		hour:hour,
+		dqHour:latestTime.value
+	}
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest('/train/public/videoUser/updateUserPlayClassHousr', paramsData,'post',9100,header).then((resData) => {
+		if(resData.code == 200){
+			console.log("学习时长更新成功")
+		}
+	});
+}
+const queryModelUserPlay = (classId) => {
+	let queryParams = {
+		classId: classId,
+		userId: userId.value,
+	};
+	let header = {
+		Authorization: uni.getStorageSync("Padmin-Token"),
+		"Content-Type": "application/x-www-form-urlencoded",
+	};
+	$api.myRequest("/train/public/videoUser/modelUserPlay", queryParams, "post", 9100, header).then((resData) => {
+		if(resData.code == 200){
+			initialTime.value=Number(resData?.data?.dqHour ?? 0)
+		}else {
+			initialTime.value = 0
+		}
+	}).catch(() => {
+		initialTime.value = 0
+	});
+}
+
+// 保存当前章节进度
+function saveCurrentChapterProgress() {
+	if (videoInfo.value.trainClassList && videoInfo.value.trainClassList.length > 0) {
+		const currentVideo = videoInfo.value.trainClassList[currentChapter.value];
+		if (currentVideo) {
+			updateUserPlayClassHousr(currentVideo.classId, currentVideo.hour);
+		}
+	}
 }
 onUnmounted(() => {
 
@@ -489,4 +586,4 @@ onUnmounted(() => {
     font-size: 28rpx;
     color: #303133;
 }
-</style>
+</style>

packageB/train/video/videoList.vue

@@ -80,7 +80,8 @@ const getItemBackgroundStyle = (imageName) => ({
 });
 const trainVideoImgUrl=config.trainVideoImgUrl
 
-onLoad(() => {
+onLoad(async () => {
+    await thirdLogin()
     getDataList('refresh');
 });
 
@@ -135,8 +136,53 @@ function getDataList(type = 'add') {
 	
 
 // 播放视频
-function playVideo(video) {
-    navTo(`/packageB/train/video/videoDetail?id=${video.videoId}`);
+async function playVideo(video) {
+	if(await thirdLogin()){
+		navTo(`/packageB/train/video/videoDetail?id=${video.videoId}`);
+	}
+}
+
+
+async function thirdLogin(){
+	let form={}
+	if (uni.getStorageSync('userInfo').isCompanyUser=='1'|| uni.getStorageSync('userInfo').isCompanyUser=='2') {
+		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;
+	}
 }
 </script>
 

packageCa/apiCa/job.js

@@ -2,11 +2,11 @@ import request from '@/packageCa/utilCa/request.js'
 
 const api = {}
 // 获取职业大类 中类 
-api.queryJobDictionaryListByParentCode = (code) => request.globalRequest(`/Job/QueryJobDictionaryListByParentCode?code=${code}`,'GET', {}, 1,3)
+api.queryJobDictionaryListByParentCode = (code) => request.globalRequest(`/Job/QueryJobDictionaryListByParentCode?code=${code}`,'GET', {}, 1)
 // 搜索
-api.queryJobListByParentCode = (name,code) => request.globalRequest(`/Job/QueryJobListByParentCode?name=${name}&code=${code}`,'GET', {}, 1,3)
+api.queryJobListByParentCode = (name,code) => request.globalRequest(`/Job/QueryJobListByParentCode?name=${name}&code=${code}`,'GET', {}, 1)
 // 职业详情
-api.queryJobDetailById = (id) => request.globalRequest(`/Job/QueryJobDetailById?id=${id}`,'GET', {}, 2,3)
+api.queryJobDetailById = (id) => request.globalRequest(`/Job/QueryCeremonyDetail?id=${id}`,'GET', {}, 2)
 
 export default api
 

packageCa/apiCa/studentProfile.js

@@ -2,31 +2,32 @@ import request from '@/packageCa/utilCa/request.js'
 
 const api = {}
 // 获取生涯罗盘
-api.getCareerCompassList = (name) => request.globalRequest(`/StudentProfile/GetCareerCompassList`,'GET', {}, 1)
+api.getCareerCompassList = (name) => request.globalRequest(`/GXCareerPlan/GetGXWechatCoursePlanList`,'GET', {})
 // 保存生涯罗盘--职业方向
-api.saveGXCareerPlan = (jobId) => request.globalRequest(`/StudentProfile/SaveGXCareerPlan?jobId=${jobId}`,'POST', {}, 1)
+api.saveGXCareerPlan = (jobId) => request.globalRequest(`/GXCareerPlan/SaveGXCareerPlan?jobId=${jobId}`,'POST', {})
 // 生涯罗盘--获取职业规划
-api.getGXCareerPlanList = (keyword,page,ps) => request.globalRequest(`/StudentProfile/GetGXCareerPlanList?keyword=${keyword}&page=${page}&ps=${ps}`,'GET', {}, 1)
+api.getGXCareerPlanList = (keyword,page,ps) => request.globalRequest(`/GXCareerPlan/GetGXCareerPlanList?keyword=${keyword}&page=${page}&ps=${ps}`,'GET', {})
 
 // smart目标制定：获取学习目标
-api.querySmartTargets = () => request.globalRequest(`/StudentProfile/QuerySmartTargets`,'GET', {}, 1)
+api.querySmartTargets = () => request.globalRequest(`/GXStudent/QuerySmartTargets`,'GET', {})
 // smart目标制定：获取单个目标
-api.querySmartInfo = (encodeId) => request.globalRequest(`/StudentProfile/QuerySmartInfo?encodeId=${encodeId}`,'GET', {}, 1)
+api.querySmartInfo = (encodeId) => request.globalRequest(`/GXStudent/QuerySmartInfo?encodeId=${encodeId}`,'GET', {})
 // smart目标制定：保存smart目标
-api.saveSmartTarget = (data) => request.globalRequest(`/StudentProfile/SaveSmartTarget`,'POST', data, 1)
+api.saveSmartTarget = (data) => request.globalRequest(`/GXStudent/SaveSmartTargetNew`,'POST', data)
 // smart目标制定：删除Smart目标
-api.deleteSmartTarg = (encodeId) => request.globalRequest(`/StudentProfile/DeleteSmartTarg?encodeId=${encodeId}`,'POST', {}, 1)
+api.deleteSmartTarg = (encodeId) => request.globalRequest(`/GXStudent/DeleteSmartTarg?encodeId=${encodeId}`,'POST', {})
 // smart目标制定：获取年度计划
-api.queryPlanList = (encodeId) => request.globalRequest(`/StudentProfile/QueryPlanList?encodeId=${encodeId}`,'GET', {}, 1)
+api.queryPlanList = (encodeId) => request.globalRequest(`/GXStudent/QueryPlanList?encodeId=${encodeId}`,'GET', {})
 // smart目标制定：保存年度计划
-api.savePlanList = (data) => request.globalRequest(`/StudentProfile/SavePlanList`,'POST', data, 1)
+api.savePlanList = (data) => request.globalRequest(`/GXStudent/SavePlanListNew`,'POST', data)
+
 // 获取生涯档案（高校
-api.getGXWechatStudentProfile = () => request.globalRequest(`/StudentProfile/GetGXWechatStudentProfile`,'GET', {}, 1)
+api.getGXWechatStudentProfile = () => request.globalRequest(`/GXStudentProfile/GetGXStudentProfile`,'GET', {})
 
 //获取职业路径职业列表 
-api.queryCareerPath = () => request.globalRequest(`/StudentManage/QueryCareerPath`,'POST', {}, 1)
+api.queryCareerPath = () => request.globalRequest(`/GXStudent/QueryCareerPath`,'POST', {})
 // 获取职业详情，参数encodeId 加密id
-api.queryPathInfo = (encodeId) => request.globalRequest(`/StudentManage/QueryPathInfo?encodeId=${encodeId}`,'POST', {}, 1)
+api.queryPathInfo = (encodeId) => request.globalRequest(`/GXStudent/QueryPathInfo?encodeId=${encodeId}`,'POST', {})
 
 
 export default api

packageCa/apiCa/testManage.js

@@ -2,124 +2,52 @@ import request from '@/packageCa/utilCa/request.js'
 
 const api = {}
 
-// 检查综合解释是否完成
-api.checkUnionTest = () => request.globalRequest(`/TaskManage/CheckUnionTest`,'GET', {}, 2,5)
-api.queryUnionTestResult = () => request.globalRequest(`/Test/QueryUnionTestResult`,'GET', {}, 2,5)
-
 // 测评列表
-api.queryTaskListForWeChart = (eduLevel) => request.globalRequest(`/TaskManage/QueryTaskListForWeChart?eduLevel=${eduLevel}`,'GET', {}, 2,5)
+api.queryTaskListForWeChart = () => request.globalRequest(`/TestRecordProcess/GetTestTypeList`,'GET', {})
 // 获取测评题目
-api.queryTestContent = (type) => request.globalRequest(`/TaskManage/QueryTestContent?type=${type}`,'GET', {}, 2,5)
+api.queryTestContent = (type) => request.globalRequest(`/TestManage/QueryTestContent?type=${type}`,'GET', {})
 
-// 保存学科信心测评结果
-api.saveSubjectTest = (testStr) => request.globalRequest(`/TaskManage/SaveSubjectTest?testStr=${testStr}`,'POST', "", 2,5)
-// 保存自我评估
-api.saveStudentSscoreResult = (data) => request.globalRequest(`/Test/SaveStudentSscoreResult`,'POST', data, 2,5)
-// 保存MBTI
-api.saveMBTITest = (data) => request.globalRequest(`/TaskManage/SaveMBTITest`,'POST', data, 2,5)
 // 保存工作价值
-api.saveWorkValuesResult = (data) => request.globalRequest(`/TaskManage/SaveWorkValuesResult`,'POST', data, 2,5)
-// 保存多元智能
-api.saveMultipleIntelligenceResult = (data) => request.globalRequest(`/TaskManage/SaveMultipleIntelligenceResult`,'POST', data, 2,5)
+api.saveWorkValuesResult = (data) => request.globalRequest(`/TestManagenew/SaveWorkValuesResultNew`,'POST', data)
 // 保存人格测评
-api.saveCharacterTestResult = (data) => request.globalRequest(`/TaskManage/SaveCharacterTestResult`,'POST', data, 2,5)
+api.saveCharacterTestResult = (data) => request.globalRequest(`/TestManagenew/SavePersonTestNew`,'POST', data)
 // 保存兴趣测评
-api.saveInterestTestResult = (data) => request.globalRequest(`/TaskManage/SaveInterestTestResult`,'POST', data, 2,5)
-// 保存初中测评结果
-api.querySaveTestRecord = (data) => request.globalRequest(`/ResearchStudy/QuerySaveTestRecord`,'POST', data, 1)
-// 保存简易测评
-api.saveCustomerTestResult = (data) => request.globalRequest(`/TaskManage/SaveCustomerTestResult`,'POST', data, 2,5)
+api.saveInterestTestResult = (data) => request.globalRequest(`/TestManagenew/SaveInterestTestNew`,'POST', data)
 //保存测评结果(通用能力，多元能力，领导力) 
-api.saveCustomTestResult = (data) => request.globalRequest(`/TaskManage/SaveCustomTestResult`,'POST', data, 2,5)
-//保存结果(学习力相关测评(文本类)，图形类(-45：推理能力测评，),(生涯构建)(生涯适应力)) 
-api.saveStudyCustomTestResult = (data) => request.globalRequest(`/TestManage/SaveStudyCustomTestResult`,'POST', data, 1,0)
-//保存结果(学习力:图形类：22：注意力测评，23：记忆力测评，25：场独立-场依存认知风格测评)
-api.saveStudyGraphic_TestResult = (data) => request.globalRequest(`/TestManage/SaveStudyGraphic_TestResult`,'POST', data, 1,0)
-//保存结果(学习力:图形类：沉思型-冲动型认知风格测评，
-api.saveStudyGraphic_DependencyResult = (data) => request.globalRequest(`/TestManage/SaveStudyGraphic_DependencyResult`,'POST', data, 1,0)
+api.saveCustomTestResult = (data) => request.globalRequest(`/TestManagenew/SaveCustomTestResultNew`,'POST', data)
 
-
-// 获取自我评估结果
-api.querySubjectScoreResult = () => request.globalRequest(`/TaskManage/QuerySubjectScoreResult`,'GET', {}, 2,5)
 // 获取兴趣测评结果
-api.queryInterestTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryInterestTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
-// 获取学科信心结果
-api.querySubjectResult = (year,term,recordId) => request.globalRequest(`/TestManage/QuerySubjectResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {},1)
-// 获取MBTI结果
-api.queryMBTIResult = (year,term,recordId)=> request.globalRequest(`/TestManage/QueryMBTIResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
-// 获取多元智能结果
-api.multipleIntelligenceResult = (year,term,recordId) => request.globalRequest(`/TestManage/MultipleIntelligenceResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
+api.queryInterestTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryInterestTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {})
 // 获取工作价值结果
-api.workValuesResult = (year,term,recordId) => request.globalRequest(`/TestManage/WorkValuesResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
+api.workValuesResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryWorkValuesResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {})
 // 获取人格测评结果
-api.personalityTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/PersonalityTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {},1)
-// 获取初中兴趣题目
-api.getTestTitle = (testtype) => request.globalRequest(`/ResearchStudy/GetTestTitle?testtype=${testtype}`,'GET', {}, 1)
-// 获取初中测评结果
-api.queryJuniorTestRecord = (year,term,recordId) => request.globalRequest(`/ResearchStudy/QueryJuniorTestRecord?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
-// 获取简易测评
-api.queryCustomerTestTite = (testtype) => request.globalRequest(`/TaskManage/QueryTestContent?type=${testtype}`,'GET', {}, 2,5)
-// 获取简易测评报告
-api.queryPrimaryInterestResult = () => request.globalRequest(`/TaskManage/QueryPrimaryInterestResult`,'GET', {}, 2,5)
-// 获取多元智能结果（简版）
-api.multipleIntelligenceSimpleResult = () => request.globalRequest(`/Test/MultipleIntelligenceSimpleResult`,'GET', {}, 2,5)
+api.personalityTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryPersonalityTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {})
 // 获取测评结果(通用能力，多元能力，领导力) 
-api.queryCustomTestResult = (testType,year,term,recordId) => request.globalRequest(`/TestManage/QueryCustomTestResult?type=${testType}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
-//获取测评结果(生涯构建和学习力相关测评)
-api.getStudyCustomTestResult = (testType,year,term,recordId) => request.globalRequest(`/TestManage/GetStudyCustomTestResult?testType=${testType}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1,0)
-//获取结果时间维度对比(生涯构建和学习力相关测评)
-api.getStudyTimeGroupTestResult = (testType,userId,year,term,recordId) => request.globalRequest(`/TestManage/GetStudyTimeGroupTestResult?testType=${testType}&userId=${userId}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1,0)
-//小程序获取时间维度接口(所有生涯测评)
-api.getCareerYearAndTermList = (testType) => request.globalRequest(`/TestManage/GetCareerYearAndTermList?testType=${testType}`,'GET', {}, 1,0)
+api.queryCustomTestResult = (testType,year,term,recordId) => request.globalRequest(`/TestManage/QueryCustomTestResult?type=${testType}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {})
 
+//小程序获取时间维度接口(所有生涯测评)
+api.getCareerYearAndTermList = (testType) => request.globalRequest(`/TestManage/GetCareerYearAndTermList?testType=${testType}`,'GET', {})
 
 //兴趣测评对比数据
-api.getInterestTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetInterestTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
+api.getInterestTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetInterestTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {})
 //人格测评对比数据
-api.getPersonTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetPersonTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//多元智能测评对比数据
-api.getMultipleTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMultipleTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
+api.getPersonTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetPersonTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {})
 //工作价值观测评对比数据
-api.getWorkValuesTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetWorkValuesTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//MBTI测评对比数据
-api.getMBTITestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMBTITestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-
-//学科信心测评对比数据
-api.getSubjectTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetSubjectTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-
-//SCL-90对比/领导力数据
-api.getCustomTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,typeId,userId,recordId) => request.globalRequest(`/TestManage/GetCustomTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&typeId=${typeId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
+api.getWorkValuesTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetWorkValuesTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {})
 
 //多元能力测评对比数据
-api.getMultipleAbilityGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMultipleAbilityGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
+api.getMultipleAbilityGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMultipleAbilityGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {})
 
 //通用职业能力测评对比数据
-api.getBeCurrentJobGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetBeCurrentJobGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-
-//获取学习力测评(文本类)群体维度对比数据,(生涯构建)
-api.getStudyTestGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetStudyTestGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//记忆力测评群体维度对比数据
-api.getLearningMemoryGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetLearningMemoryGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//场独立-场依存认知风格测评群体维度对比数据
-api.getLearningUniqueGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetLearningUniqueGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//沉思型-冲动型认知风格测评群体维度对比数据
-api.getLearningDependencyGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetLearningDependencyGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//学习力（图形类）测评群体维度对比数据(22：注意力测评，-45：推理能力测评)
-api.getGraphic_TestGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetGraphic_TestGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
+api.getBeCurrentJobGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetBeCurrentJobGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {})
 //获取测评分类标签
-api.getTestTypeTagLIst = () => request.globalRequest(`/TestManage/GetTestTypeTagLIst`,'GET', {}, 1)
+api.getTestTypeTagLIst = () => request.globalRequest(`/TestRecordProcess/GetTestTypeList`,'GET', {})
 
 //获取测评报告日期列表
-api.getCareerYearAndTermListNew = (testType,userId) => request.globalRequest(`/TestManage/GetCareerYearAndTermListNew?testType=${testType}&userId=${userId}`,'GET', {}, 1)
+api.getCareerYearAndTermListNew = (testType,userId) => request.globalRequest(`/TestManage/GetCareerYearAndTermListNew?testType=${testType}&userId=${userId}`,'GET', {})
 
 // 保存测评答题过程记录
-api.saveTestRecordProcess = (data) => request.globalRequest(`/TestRecordProcess/SaveTestRecordProcess`,'POST', data, 1)
-//获取测评答题记录
-api.getTestRecordProcessList = (testType) => request.globalRequest(`/TestRecordProcess/GetTestRecordProcessList?testType=${testType}`,'GET', {}, 1)
-// 删除测评数据
-api.removeTestRecordProcess = (testType) => request.globalRequest(`/TestRecordProcess/RemoveTestRecordProcess?testType=${testType}`,'POST', {}, 1)
-// 获取测评列表答题记录状态
-api.getUserTestTypeProcessList = (testTypes) => request.globalRequest(`/TestRecordProcess/GetUserTestTypeProcessList?testTypes=${testTypes}`,'GET', {}, 1)
+api.saveTestRecordProcess = (data) => request.globalRequest(`/TestRecordProcess/SaveTestRecordProcess`,'POST', data)
 
 
 export default api

packageCa/apiCa/user.js

@@ -3,79 +3,14 @@ import request from '@/packageCa/utilCa/request.js'
 const api = {}
 
 //根据openId,获取token,并判断用户是否已绑定账号
-api.queryKaShiToken = (userId,name) => request.globalRequest(`/KaShi/QueryKaShiToken?userId=${userId}&name=${name}&schoolId=2268`,'GET', {})
+api.queryKaShiToken = (idCard,name) => request.globalRequest(`/Home/QueryKaShiToken?userIdNO=${idCard}&name=${name}&schoolId=2371`,'GET', {})
 // 获取ai面试路径
-api.queryAIUrl = (userId,name) => request.globalRequest(`/KaShi/QueryAIUrl?userId=${userId}&name=${name}&schoolId=2268`,'GET', {})
-
-//根据openId,获取token,并判断用户是否已绑定账号
-api.getAccessTokenAndUser = (params) => request.globalRequest(`/WeChartToken/GetAccessTokenAndUser?openId=${params}`,'GET', {})
-
-//获取用户token 生涯平台token
-api.queryWechartToken = (userId,schoolId,userType) => request.globalRequest(`/Auth/QueryWechartToken?userId=${userId}&schoolId=${schoolId}&userType=${userType}`,'GET', {},1,4)
-// 获取openid
-api.getOpenId = (params) => request.globalRequest(`/WishOrder/GetOpenId?code=${params}`,'GET', {}, "")
-
-// 微信支付
-api.createWeiXinOrder = (data) => request.globalRequest(`/TenpayOrder/CreateWeiXinOrder`, 'POST', data)
-
-// 用户绑定登录
-api.userBindLogin = (data) => request.globalRequest(`/user/UserBindLogin`, 'POST', data)
-//用户解绑账号或切换账号（有返回User, Token话,前端重新绑定到header上）
-api.userUnBindOrChangeCodeNumber = (userId,type) => request.globalRequest(`/user/UserUnBindOrChangeCodeNumber?userId=${userId}&type=${type}`,'GET', {}, 1)
-//获取当前微信用户已绑定的账号列表
-api.getUserCodeNumber = () => request.globalRequest(`/user/GetUserCodeNumber`,'GET', {}, 1)
-//根据学号获取学校列表
-api.getSchoolByCodeNumber = (params) => request.globalRequest(`/user/GetSchoolByCodeNumber?codeNumber=${params}`,'GET', {}, 1)
-
-// 判断学生是否完成生涯成熟度问卷, taskId大于0，需要进行问卷，taskId 等于0，不需要问卷
-// api.getQuestionnaireTitlePower = () => request.globalRequest(`/CareerMaturityTask/GetQuestionnaireTitlePower`,'GET', {}, 1)
-// 获取生涯成熟度题目
-// api.getTestTitleListList = () => request.globalRequest(`/CareerMaturityTask/GetTestTitleListList`,'GET', {}, 1)
-// 保存生涯成熟度测评结果
-// api.saveCareerMaturityTestResult = (data) => request.globalRequest(`/CareerMaturityTask/SaveCareerMaturityTestResult`, 'POST', data, 1)
-
-// 获取手机验证码
-api.getMobileCode = (mobile) => request.globalRequest(`/WeChartUser/GetMobileCode?mobile=${mobile}&token=SQEIfNmlFufmOMNVPZCvNVWpDeldYjH`,'GET', {}, 1)
-// 提交手机注册
-api.checkSmsCode = (data) => request.globalRequest(`/user/CheckSmsCode`, 'POST', data, 1)
+api.queryAIUrl = (idCard,name) => request.globalRequest(`/Home/QueryAIUrl?userIdNO=${idCard}&name=${name}&schoolId=2371`,'GET', {})
 
 // 获取个人档案
-api.queryStudentProfile = () => request.globalRequest(`/StudentResource/QueryStudentProfile`,'GET', {}, 2,4)
-// 添加，取消个人意向
-api.doIntention = (type,id,actionType) => request.globalRequest(`/StudentResource/DoIntention?type=${type}&actionType=${actionType}&id=${id}`,'GET', {}, 2,4)
-//绑vip卡
-api.bindCard = (data) => request.globalRequest(`/user/BindCard`,'POST', data, 1)
+api.queryStudentProfile = () => request.globalRequest(`/StudentResource/QueryStudentProfile`,'GET', {})
 
-// 一体机激活 绑定 获取列表
-api.queryMachineOrderCountList = (machineNumber) => request.globalRequest(`/Onemachine/QueryMachineOrderCountList?machineNumber=${machineNumber}`,'GET', {}, 1)
-// 绑定设备
-api.activityMachine = (data) => request.globalRequest(`/Onemachine/ActivityMachine`,'POST', data, 1)
-// 解绑
-api.removeMachine = (orderId,machineModelId,machineNumber) => request.globalRequest(`/Onemachine/RemoveMachine?orderId=${orderId}&machineModelId=${machineModelId}&machineNumber=${machineNumber}`,'POST', {}, 1)
 
-// ai咨询问题
-api.aISearch = (keyword,sessionId) => request.globalRequest(`/AIAgents/search?keyword=${keyword}&sessionId=${sessionId}`,'GET', {}, 1)
-// ai获取历史咨询
-api.aIGetHistoryRecord = (page) => request.globalRequest(`/AIAgents/GetHistoryRecord?page=${page}&pageSize=20`,'GET', {}, 1)
-
-// 保存人脸图片
-api.queryUploadPhoto = (address) => request.globalRequest(`/user/QueryUploadPhoto?address=${address}`,'GET', {}, 1)
-
-// 保存操作日志
-api.saveUserOperationLog = (data) => request.globalRequest(`/UserOperationLog/SaveUserOperationLog`,'POST', data, 3)
-	
-// 获取操作日志
-api.getUserOperationLogList = (pageIndex,pageSize,keyword,operationType) => request.globalRequest(`/UserOperationLog/GetUserOperationLogList?pageIndex=${pageIndex}&pageSize=${pageSize}&keyword=${keyword}&operationType=${operationType}`,'GET', {}, 1)	
-// 设备登录
-api.loginOneMachine = (machineNo) => request.globalRequest(`/user/LoginOneMachine?machineNo=${machineNo}`,'POST', {}, 1)
-// 获取系统菜单权限
-api.querySchoolMenu = () => request.globalRequest(`/user/QuerySchoolMenu`,'GET', {}, 1)
-
-// 保存高校个人信息
-api.saveUserBasisInfo = (mobileCode,data) => request.globalRequest(`/user/SaveUserBasisInfo?mobileCode=${mobileCode}`,'POST', data, 1)
-
-// 获取高校个人信息
-api.getUserBasisInfo = () => request.globalRequest(`/user/GetUserBasisInfo`,'GET', {}, 1)
 export default api
 
 

packageCa/job/details.vue

@@ -3,125 +3,80 @@
 		<view class="content">
 			<view class="head">
 				<view class="h3">
-					{{jobDetailData.Name}}
+					{{jonInfo.Name}}
 				</view>
-				<view class="h2">所属大类：<text>{{jobDetailData.BigCategoryName}}</text></view>
-				<view class="h2">所属中类：<text>{{jobDetailData.MidCategoryName}}</text></view>
-				<view class="h2">所属小类：<text>{{jobDetailData.SmallCategoryName}}</text></view>
-				<view class="intention-btn" v-if="jobDetailData.ShowIntention" v-text="jobDetailData.IsIntention?'取消意向':'加入意向'" @click="changeIntention"></view>
+				<view class="h2">所属大类：<text>{{bigType}}</text></view>
+				<view class="h2">所属中类：<text>{{midType}}</text></view>
+				<view class="h2">所属小类：<text>{{smallType}}</text></view>
 			</view>
 			<view class="txt-content">
-				<view class="article-item" v-if="jobDetailData.VideoUrl">
+				<view class="article-item" v-if="jonInfo.VideoUrl">
 					<text class="h4">职业新说：</text>
-					<video :src="jobDetailData.VideoUrl"></video>
+					<video :src="jonInfo.VideoUrl"></video>
 				</view>
-				<view class="article-item" v-if="jobDetailData.TopIntroduction">
+				<view class="article-item" v-if="jonInfo.TopIntroduction">
 					<text class="h4">职业说明：</text>
-					<view class="article-content" v-html="jobDetailData.TopIntroduction"></view>
+					<view class="article-content" v-html="jonInfo.TopIntroduction"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.TopWorkContent">
+				<view class="article-item" v-if="jonInfo.TopWorkContent">
 					<text class="h4">工作内容：</text>
-					<view class="article-content" v-html="jobDetailData.TopWorkContent"></view>
+					<view class="article-content" v-html="jonInfo.TopWorkContent"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.QualityRequirements">
+				<view class="article-item" v-if="jonInfo.QualityRequirements">
 					<text class="h4">从业要求：</text>
-					<view class="article-content" v-html="jobDetailData.QualityRequirements"></view>
+					<view class="article-content" v-html="jonInfo.QualityRequirements"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.AbilityRequirements">
+				<view class="article-item" v-if="jonInfo.AbilityRequirements">
 					<text class="h4">能力要求：</text>
-					<view class="article-content" v-html="jobDetailData.AbilityRequirements"></view>
+					<view class="article-content" v-html="jonInfo.AbilityRequirements"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.SalaryStr">
+				<view class="article-item" v-if="jonInfo.SalaryStr">
 					<text class="h4">薪资范围：</text>
-					<view class="article-content" v-html="jobDetailData.SalaryStr"></view>
+					<view class="article-content" v-html="jonInfo.SalaryStr"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.CareerProspects">
+				<view class="article-item" v-if="jonInfo.CareerProspects">
 					<text class="h4">就业前景：</text>
-					<view class="article-content" v-html="jobDetailData.CareerProspects"></view>
+					<view class="article-content" v-html="jonInfo.CareerProspects"></view>
 				</view>
-				<view class="article-item" v-if="listOne.length > 0">
+				<view class="article-item" v-if="jonInfo.JobSkill">
 					<text class="h4">职业技能：</text>
-					<view class="attr-wrap">
-						<view class="row" v-for="(item,index) in listOne" :key="index">
-							<view class="name">
-								<text class="label">{{index + 1}}</text>{{item.Name}}
-							</view>
-							<view class="desc">
-								{{item.Explain}}
-							</view>
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.JobSkill"></view>
 				</view>
-				<view class="article-item" v-if="listTwo.length > 0">
+				<view class="article-item" v-if="jonInfo.JobAbility">
 					<text class="h4">职业能力：</text>
-					<view class="attr-wrap">
-						<view class="row" v-for="(item,index) in listTwo" :key="index">
-							<view class="name">
-								<text class="label">{{index + 1}}</text>{{item.Name}}
-							</view>
-							<view class="desc">
-								{{item.Explain}}
-							</view>
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.JobAbility"></view>
 				</view>
-				<view class="article-item" v-if="listThree.length > 0">
+				<view class="article-item" v-if="jonInfo.JobKnowledge">
 					<text class="h4">具备知识：</text>
-					<view class="attr-wrap">
-						<view class="row" v-for="(item,index) in listThree" :key="index">
-							<view class="name">
-								<text class="label">{{index + 1}}</text>{{item.Name}}
-							</view>
-							<view class="desc">
-								{{item.Explain}}
-							</view>
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.JobKnowledge"></view>
 				</view>
-				<view class="article-item" v-if="listFour.length > 0">
+				<view class="article-item" v-if="jonInfo.JobRequire">
 					<text class="h4">职业素养：</text>
-					<view class="attr-wrap">
-						<view class="row" v-for="(item,index) in listFour" :key="index">
-							<view class="name">
-								<text class="label">{{index + 1}}</text>{{item.Name}}
-							</view>
-							<view class="desc">
-								{{item.Explain}}
-							</view>
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.JobRequire"></view>
 				</view>
-				<view class="article-item" v-if="listFive.length > 0">
+				
+				<view class="article-item" v-if="jonInfo.JobActivity">
 					<text class="h4">职业活动：</text>
-					<view class="attr-wrap">
-						<view class="row" v-for="(item,index) in listFive" :key="index">
-							<view class="name">
-								<text class="label">{{index + 1}}</text>{{item.Name}}
-							</view>
-							<view class="desc">
-								{{item.Explain}}
-							</view>
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.JobActivity"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.DevelopmentPath">
+				<view class="article-item" v-if="jonInfo.JobPath">
 					<text class="h4">发展路径：</text>
-					<view class="article-content" v-html="jobDetailData.DevelopmentPath"></view>
+					<view class="article-content" v-html="jonInfo.JobPath"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.SpecialtyList != null && jobDetailData.SpecialtyList.length > 0">
+				<view class="article-item" v-if="jonInfo.TopWorkContent">
 					<text class="h4">推荐专业：</text>
-					<view class="sp-wrap">
-						<view  class="item" v-for="(item,index) in jobDetailData.SpecialtyList":key="index">
-							{{item.Name}}
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.TopWorkContent"></view>
+				</view>
+				<view class="article-item" v-if="jonInfo.SalaryStr">
+					<text class="h4">薪资范围：</text>
+					<view class="article-content" v-html="jonInfo.SalaryStr"></view>
+				</view>
+				<view class="article-item" v-if="jonInfo.CareerProspects">
+					<text class="h4">就业前景：</text>
+					<view class="article-content" v-html="jonInfo.CareerProspects"></view>
 				</view>
 			</view>
 		</view>
-		<view class="fiexd-visitor" v-if="isVisitor">
-			<navigator class="btn" url="/pagesUserInfo/binding/binding?routeType=6">请先登录</navigator>
-		</view>
-		<!-- <u-modal :show="showLogin" content='观看完整内容,请先登录' width='500rpx' @confirm="showLogin=false"></u-modal> -->
 	</view>
 </template>
 
@@ -135,21 +90,27 @@ import api1 from "@/packageCa/apiCa/user.js"
 				isVisitor: false, //游客
 				user: uni.getStorageSync("CAuserInfo").user,
 				id: 0,
-				jobDetailData: {
-					Name: "",
-					BigCategoryName: "",
-					MidCategoryName: "",
-					SmallCategoryName: "",
-					VideoUrl: "",
-					TopIntroduction: "",
-					TopWorkContent: "",
-					QualityRequirements: "",
-				},
-				listOne: [],//职业技能
-				listTwo: [],//职业能力
-				listThree: [],//具备知识
-				listFour: [],//职业素养
-				listFive: [],//职业活动
+				// jonInfo: {
+				// 	Name: "",
+				// 	BigCategoryName: "",
+				// 	MidCategoryName: "",
+				// 	SmallCategoryName: "",
+				// 	VideoUrl: "",
+				// 	TopIntroduction: "",
+				// 	TopWorkContent: "",
+				// 	QualityRequirements: "",
+				// },
+				// listOne: [],//职业技能
+				// listTwo: [],//职业能力
+				// listThree: [],//具备知识
+				// listFour: [],//职业素养
+				// listFive: [],//职业活动
+				
+				jonInfo: {},
+				isIntention: "",
+				bigType: "",
+				midType: "",
+				smallType: "",
 			}
 		},
 		onLoad(e) {
@@ -162,23 +123,15 @@ import api1 from "@/packageCa/apiCa/user.js"
 			this.queryJobDetailById();
 		},
 		methods: {
-			showConfirmInfor(){
-				uni.showModal({
-					content:"观看完整内容,请先登录",
-					confirmText:"确认",
-					confirmColor:"#1677ff",
-					showCancel:false
-				})		
-			},			
 			changeIntention(){
 				uni.showLoading({
 					title: "加载中"
 				})
-				let isIntention = this.jobDetailData.IsIntention;
+				let isIntention = this.jonInfo.IsIntention;
 				api1.doIntention(2,this.id,isIntention?1:0).then((res)=>{
 					uni.hideLoading();
 					if(res.Result == 1){
-						this.jobDetailData.IsIntention = !this.jobDetailData.IsIntention;
+						this.jonInfo.IsIntention = !this.jonInfo.IsIntention;
 					}
 				})
 			},
@@ -190,44 +143,11 @@ import api1 from "@/packageCa/apiCa/user.js"
 				api.queryJobDetailById(this.id).then((res) => {
 					uni.hideLoading();
 					if(res.Result == 1){
-						this.jobDetailData = res.Data;
-						let attList  = res.Data.AttList;
-						if(attList != null){
-							let  listOne = [],//职业技能
-								listTwo = [],//职业能力
-								listThree = [],//具备知识
-								listFour = [],//职业素养
-								listFive = [];//职业活动
-							attList.forEach(item => {
-								switch(item.Identify){
-									case 1 :{
-										listOne.push(item);
-										break;
-									}
-									case 2 :{
-										listTwo.push(item);
-										break;
-									}
-									case 3 :{
-										listThree.push(item);
-										break;
-									}
-									case 5 :{
-										listFour.push(item);
-										break;
-									}
-									case 6 :{
-										listFive.push(item);
-										break;
-									}
-								}
-							});
-							this.listOne = listOne;
-							this.listTwo = listTwo;
-							this.listThree = listThree;
-							this.listFour = listFour;
-							this.listFive = listFive;
-						}
+						  this.jonInfo = res.Data.info;
+						  this.isIntention = res.Data.exit;
+						  this.bigType = res.Data.parent3
+						  this.midType = res.Data.parent2
+						  this.smallType = res.Data.parent1
 					}
 				})
 			},

packageCa/job/index.vue

@@ -10,11 +10,10 @@
 				<text class="icon icon-search"></text>
 				<input type="search" v-model="kw" placeholder="请输入职业名称"  @input="inputKeywrok"/>
 				<view class="list-wrap" v-show="kw != ''">
-					<navigator  class="link" :url="'/packageCa/job/details?id='+item.Id" v-for="(item, index) in jobDataList" :key="index">{{item.Name}}</navigator>
+					<navigator  class="link" :url="'/packageCa/job/details?id='+item.EnCodeId" v-for="(item, index) in jobDataList" :key="index">{{item.Name}}</navigator>
 				</view>
 			</view>
 		</view>
-		<!-- :style="{height: winHeight - barHeight - loginHeight + 'px'}" -->
 		<view class="u-menu-wrap" >
 			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop"  :scroll-into-view="itemId">
 				<view v-for="(item,index) in jobList" :key="index" class="u-tab-item"
@@ -37,17 +36,6 @@
 				</view>
 			</scroll-view>
 		</view>
-		<view class="fiexd-visitor" v-if="isVisitor">
-			<navigator class="btn" url="/packageB/pagesUserInfo/binding/binding?routeType=6">请先登录</navigator>
-		</view>
-<!-- 		<u-modal :show="showTip" @confirm="showTip=false" @cancel="showTip=false" confirmText="我明白了">
-			<view class="slot-content">
-				<view class="tip-layer">
-					<view class="title">{{layerTitile}}</view>
-					<view class="desc" v-html="layerDesc"></view>
-			  </view>
-			</view>
-		</u-modal> -->
 	</view>
 </template>
 
@@ -59,8 +47,6 @@
 			return {
 				kw: "", //搜索关键
 				user: uni.getStorageSync("CAuserInfo").user,
-				isVisitor: false, //游客
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				winHeight: wx.getWindowInfo().windowHeight,
 				jobDataList: [],
 				jobList,
@@ -81,10 +67,8 @@
 		},
 		onLoad(e) {
 			if(this.user == undefined || this.user == null){
-				this.isVisitor = true;
 				this.loginHeight=99;
 			}else {
-				this.isVisitor = false;
 				this.loginHeight=0;
 			}
 			this.scrollRightTop = 1;

packageCa/job/smallList.vue

@@ -75,7 +75,7 @@
 					//this.showLogin = true;
 				}else {
 					uni.navigateTo({
-						url: `/packageCa/job/details?id=${item.Id}&name=${item.Name}`
+						url: `/packageCa/job/details?id=${item.EnCodeId}&name=${item.Name}`
 					})
 				}
 			},

packageCa/pagesTest/customTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-    <view class="title-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" v-if="taskId ==0" @click="goback"></view>
-            <text v-if="testTitle != ''">{{testTitle}}</text>
-        </view>
+    <view class="title-wrap" style="padding-top: 40rpx;">
         <view class="progress-block">
             <view class="row">
                 <view class="title-index">
@@ -60,7 +56,6 @@
     export default {
         data() {
             return {
-                barHeight: wx.getWindowInfo().statusBarHeight,
                 list: [],
                 allNum: 0, //总题目数
                 pageIndex: 0, //显示页
@@ -104,7 +99,7 @@
                 this.taskId = e.taskId 
             }
              this.computeTitle(this.testType);
-            this.getHistoryTitle();
+			 this.getTitle();
         },
         methods: {
             // 返回
@@ -141,16 +136,6 @@
                     }
                 }
             },
-			//获取答题记录
-			getHistoryTitle(){
-				api.getTestRecordProcessList(this.testType).then(res => {
-					if (res.Result === 1) {
-						let data = res.Data;
-						this.historyTitle = data;
-						this.getTitle();
-					}
-				})
-			},
             // 获取题目
             getTitle() {
                 uni.showLoading({
@@ -162,45 +147,7 @@
                         let list = res.Data.List.Item1;
                         list.forEach(item => {
                             item.Value = "";
-							this.historyTitle.forEach(ritem=>{
-								if(item.Id == ritem.TestTitleId){
-									switch (ritem.TestResult) {
-									    case "A": {
-											item.Value = 1;
-									        break;
-									    }
-									    case "B": {
-									        item.Value = 2;
-									        break;
-									    }
-									    case "C": {
-									       item.Value = 3;
-									        break;
-									    }
-									    case "D": {
-									        item.Value = 4;
-									        break;
-									    }
-									    case "E": {
-									        item.Value = 5;
-									        break;
-									    }
-									    case "F": {
-									        item.Value = 6;
-									        break;
-									    }
-									}
-								}
-							})
                         })
-						if(this.historyTitle.length == 0){
-							this.pageIndex = 0;
-						}else if(this.historyTitle.length == list.length){
-							this.pageIndex = list.length - 1;
-						}else {
-							this.pageIndex = this.historyTitle.length;
-						}
-						
                         this.allNum = list.length;
                         this.list = list;
 						this.testTitle = res.Data.List.Item2;
@@ -225,54 +172,14 @@
                     console.log('单击事件被触发');
                     this.lastTapTime = now;
                     this.list[INDEX].Value = NUM;
-					this.saveTestRecordProcess(this.list[INDEX].Id,NUM);
                     setTimeout(() => {
-                        if (this.pageIndex != this.list.length - 1) {
-                            this.pageIndex = INDEX + 1;
-                        }
+                       if(this.pageIndex != this.list.length - 1){
+						   this.pageIndex = INDEX + 1;
+                       }
                     }, 300)
                 }
             },
-			//存储答题记录
-			saveTestRecordProcess(ID,VALUE){
-				let val = ""
-				switch (VALUE) {
-				    case 1: {
-						val = "A";
-				        break;
-				    }
-				    case 2: {
-				        val = "B";
-				        break;
-				    }
-				    case 3: {
-				       val = "C";
-				        break;
-				    }
-				    case 4: {
-				        val = "D";
-				        break;
-				    }
-				    case 5: {
-				        val = "E";
-				        break;
-				    }
-				    case 6: {
-				        val = "F";
-				        break;
-				    }
-				}
-				let data = {
-					testType: this.testType,
-					testTitleId: ID,
-					testResult: val
-				}
-				api.saveTestRecordProcess(data).then(res => {
-					if (res.Result === 1) {
-					}
-				})
-			},
-            // 提交题目
+			 // 提交题目
             submitTitle() {
                 let testStr = "";
                 this.list.forEach(item => {
@@ -308,42 +215,41 @@
                     title: "提交中"
                 })
                 let data = {
-                    testType: this.testType,
+                    testType:  Number(this.testType),
                     taskId: this.taskId,
                     testStr
                 }
-				api.removeTestRecordProcess(this.testType).then((res) => {
-					 return api.saveCustomTestResult(data);
-				}).then((res) => {
-                        uni.hideLoading();
-                        if (res.Result === 1) {
-                            uni.showToast({
-                                title: "提交成功",
-                                icon: "success"
-                            })
-                            let pages = getCurrentPages(); // 当前页面
-                            let beforePage = pages[pages.length - 2]; // 上一页
-                            if (beforePage != undefined) {
-                                beforePage.data.refreshIfNeeded = true;
-                            }
-                            setTimeout(() => {
-                                if (this.testType == -27) {
-                                    uni.redirectTo({
-                                        url: `/packageCa/testReport/multipleAbilityTestReport?id=${res.Data.TestId}`
-                                    })
-                                } else if (this.testType == -28) {
-                                    uni.redirectTo({
-                                        url: `/packageCa/testReport/generalCareerTestReport?id=${res.Data.TestId}`
-                                    })
-                                } 
-                            }, 1000)
-                        } else {
-                            uni.showToast({
-                                title: res.Message,
-                                icon: "none"
-                            })
-                        }
-                    })
+				api.saveCustomTestResult(data).then((res) => {
+					uni.hideLoading();
+					if (res.Result === 1) {
+						uni.showToast({
+							title: "提交成功",
+							icon: "success"
+						})
+						let pages = getCurrentPages(); // 当前页面
+						let beforePage = pages[pages.length - 2]; // 上一页
+						if (beforePage != undefined) {
+							beforePage.data.refreshIfNeeded = true;
+						}
+						setTimeout(() => {
+							if (this.testType == -27) {
+								uni.redirectTo({
+									url: `/packageCa/testReport/multipleAbilityTestReport`
+								})
+							} else if (this.testType == -28) {
+								uni.redirectTo({
+									url: `/packageCa/testReport/generalCareerTestReport`
+								})
+							} 
+						}, 1000)
+					} else {
+						uni.hideLoading();
+						uni.showToast({
+							title: res.Message,
+							icon: "none"
+						})
+					}
+				})
             }
         }
     }

packageCa/pagesTest/interestTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-	<view class="title-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>职业兴趣测评</text>
-		</view>
+	<view class="title-wrap" style="padding-top: 40rpx;">
 		<view class="progress-block">
 			<view class="row">
 				<view class="title-index">
@@ -68,7 +64,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				list: [],
 				allNum: 0,//总题目数
 				pageIndex: 0, //显示页
@@ -158,7 +153,7 @@
 			}
 		},
 		onLoad(e) {
-			this.getHistoryTitle();
+			this.getTitle();
 		},
 		methods: {
 			// 返回
@@ -179,16 +174,6 @@
 				});
 				//uni.navigateBack(-1);
 			},
-			//获取答题记录
-			getHistoryTitle(){
-				api.getTestRecordProcessList(11).then(res => {
-					if (res.Result === 1) {
-						let data = res.Data;
-						this.historyTitle = data;
-						this.getTitle();
-					}
-				})
-			},
 			// 获取题目
 			getTitle() {
 				uni.showLoading({
@@ -200,26 +185,7 @@
 						let list = res.Data;
 						list.forEach(item => {
 							item.Value = 0
-							this.historyTitle.forEach(ritem=>{
-								if(item.Id == ritem.TestTitleId){
-									item.Value = Number(ritem.TestResult);
-								}
-							})
 						})
-						if(this.historyTitle.length > 180){
-							let len = this.historyTitle.length - 180;
-							for(let i = 0; i < len; i++){
-								this.checkTitleList[i].Value = this.historyTitle[i + 180];
-								this.checkTitleList[i].Checked = true;
-							}
-						}
-						if(this.historyTitle.length == 0){
-							this.pageIndex = 0;
-						}else if(this.historyTitle.length == list.length){
-							this.pageIndex = list.length - 1;
-						}else {
-							this.pageIndex = this.historyTitle.length;
-						}
 						this.allNum = list.length + 3;
 						this.list = list;
 					}
@@ -241,11 +207,8 @@
 					 // 处理单击事件
 					this.lastTapTime = now; 
 					this.list[INDEX].Value = NUM;
-					this.saveTestRecordProcess(this.list[INDEX].Id,NUM);
 					setTimeout(()=>{
-						if(this.pageIndex != this.allNum - 1){
 							this.pageIndex = INDEX + 1;
-						}
 					},400)
 				}
 			},
@@ -260,7 +223,6 @@
 						this.firstDescVal = ITEM.Value;
 						this.secondDescVal = "";
 						this.thirdDescVal = "";
-						this.saveTestRecordProcess(181,ITEM.Value);
 						break;
 					}
 					case 2: {
@@ -272,13 +234,11 @@
 						this.checkTitleList[INDEX].Checked = true;
 						this.secondDescVal = ITEM.Value;
 						this.thirdDescVal = "";
-						this.saveTestRecordProcess(182,ITEM.Value);
 						break;
 					}
 					case 3: {
 						this.checkTitleList[INDEX].Checked = true;
 						this.thirdDescVal = ITEM.Value;
-						this.saveTestRecordProcess(183,ITEM.Value);
 						break;
 					}
 				}
@@ -289,27 +249,8 @@
 				},400)
 
 			},
-			//存储答题记录
-			saveTestRecordProcess(ID,VALUE){
-				let data = {
-					testType: 11,
-					testTitleId: ID,
-					testResult: VALUE
-				}
-				api.saveTestRecordProcess(data).then(res => {
-					if (res.Result === 1) {
-					}
-				})
-			},
 			// 提交题目
 			submitTitle() {
-				
-				// uni.showToast({
-				// 	title: "请选择三个特质描述",
-				// 	icon: "none"
-				// })
-				// return;
-
 				let testStr = "";
 				this.list.forEach(item => {
 					testStr += `${item.Id}|${item.Value - 1},`
@@ -319,9 +260,7 @@
 					title: "提交中"
 				})
 				let data = {testStr}
-				api.removeTestRecordProcess(11).then((res) => {
-					 return api.saveInterestTestResult(data);
-				}).then((res) => {
+				api.saveInterestTestResult(data).then((res) => {
 					uni.hideLoading();
 					if (res.Result === 1) {
 						uni.showToast({

packageCa/pagesTest/personalTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-	<view class="title-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback()"></view>
-			<text>人格测评</text>
-		</view>
+	<view class="title-wrap" style="padding-top: 40rpx;">
 		<view class="progress-block">
 			<view class="row">
 				<view class="title-index">
@@ -52,7 +48,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				list: [],
 				allNum: 0,//总题目数
 				pageIndex: 0, //显示页
@@ -86,7 +81,7 @@
 			}
 		},
 		created() {
-			this.getHistoryTitle();
+			this.getTitle();
 		},
 		methods: {
 			// 返回
@@ -107,16 +102,6 @@
 				});
 				//uni.navigateBack(-1);
 			},
-			//获取答题记录
-			getHistoryTitle(){
-				api.getTestRecordProcessList(15).then(res => {
-					if (res.Result === 1) {
-						let data = res.Data;
-						this.historyTitle = data;
-						this.getTitle();
-					}
-				})
-			},
 			// 获取题目
 			getTitle() {
 				uni.showLoading({
@@ -128,37 +113,7 @@
 						let list = res.Data.List;
 						list.forEach(item => {
 							item.Value = 0
-							this.historyTitle.forEach(ritem=>{
-								if(item.TitleId == ritem.TestTitleId){
-									switch (ritem.TestResult) {
-									    case "A": {
-											item.Value = 4;
-									        break;
-									    }
-									    case "B": {
-									        item.Value = 3;
-									        break;
-									    }
-									    case "C": {
-									        item.Value = 2;
-									        break;
-									    }
-									    case "D": {
-									        item.Value = 1;
-									        break;
-									    }
-									}
-								}
-							})
 						})
-						if(this.historyTitle.length == 0){
-							this.pageIndex = 0;
-						}else if(this.historyTitle.length == list.length){
-							this.pageIndex = list.length - 1;
-						}else {
-							this.pageIndex = this.historyTitle.length;
-						}
-						
 						this.allNum = list.length;
 						this.list = list;
 					}
@@ -180,7 +135,6 @@
 					 // 处理单击事件
 					this.lastTapTime = now; 
 					this.list[INDEX].Value = NUM;
-					this.saveTestRecordProcess(this.list[INDEX].TitleId,NUM);
 					setTimeout(()=>{
 						if(this.pageIndex != this.list.length - 1){
 							this.pageIndex = INDEX + 1;
@@ -188,37 +142,6 @@
 					},400)
 				}
 			},
-			//存储答题记录
-			saveTestRecordProcess(ID,VALUE){
-				let val = ""
-				switch (VALUE) {
-				    case 4: {
-						val = "A";
-				        break;
-				    }
-				    case 3: {
-				        val = "B";
-				        break;
-				    }
-				    case 2: {
-				       val = "C";
-				        break;
-				    }
-				    case 1: {
-				        val = "D";
-				        break;
-				    }
-				}
-				let data = {
-					testType: 15,
-					testTitleId: ID,
-					testResult: val
-				}
-				api.saveTestRecordProcess(data).then(res => {
-					if (res.Result === 1) {
-					}
-				})
-			},
 			// 提交题目
 			submitTitle() {
 				let testStr = "";
@@ -249,9 +172,7 @@
 					testStr,
 					testType: 15
 				}
-				api.removeTestRecordProcess(15).then((res) => {
-					 return api.saveCharacterTestResult(data);
-				}).then((res) => {
+				api.saveCharacterTestResult(data).then((res) => {
 					uni.hideLoading();
 					if (res.Result === 1) {
 						uni.showToast({
@@ -263,7 +184,7 @@
 						beforePage.data.refreshIfNeeded = true;
 						setTimeout(()=>{
 							uni.redirectTo({
-								url: `/packageCa/testReport/personalTestReport?year=${res.Data.Year}`
+								url: `/packageCa/testReport/personalTestReport`
 							})
 						},1000)
 						

packageCa/pagesTest/testList.vue

@@ -1,25 +1,9 @@
 <template>
 	<view class="test-list-wrap" style="display:block;">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>生涯测评</text>
-		</view>
-		<view class="contrast-box" >
-		    <view class="desc">
-		        <text class="icon"></text>
-		        <view class="txt-item">
-					<text v-for="(item,index) in selectTypeStr" :key="index">{{item}}</text>
-		        </view>
-		    </view>
-		    <view class="btn" @click="showContrastLayer">
-		        筛选
-		    </view>
-		</view>
-		<view class="content" style="overflow:hidden;">
-			<view class="p-item" v-for="(pitem,pindex) in filteredData" :key="pindex">
-				<view class="h1">{{pitem.title}}</view>
-				<view class="item" v-for="(item,index) in pitem.list" :key="index">
-				    <view class="h2">{{item.TestName}}</view>
+		<view class="content" style="overflow:hidden; padding-top: 40rpx;" >
+			<view class="p-item" >
+				<view class="item" v-for="(item,index) in dataList" :key="index">
+				    <view class="h2">{{item.Name}}</view>
 				    <view class="do-time">
 				        约{{item.AvgTime == 0 ? '1' : item.AvgTime}}分钟
 				    </view>
@@ -27,51 +11,16 @@
 				        {{item.Brief}}
 				    </view>
 				    <view class="btn-wrap">
-				    	<view class="btn" v-if="item.HasTest" @click="navTest(item,1)">
-				    	    重新测评
+				    	<view class="btn"  @click="navTest(item,1)" v-text="item.RecordId>0?'重新测评':'开始测评'">
+				    	    
 				    	</view>
-				    	<view class="btn" v-else @click="navTest(item,1)">
-				    	    开始测评
-				    	</view>
-				    	<view class="btn" v-if="item.HasTestRecordProcess && item.Type != 25" @click="navTest(item,2)">
-				    	    继续测评
-				    	</view>
-				        <view class="report-btn" v-if="item.HasTest" @click="navReport(item)">
+				        <view class="report-btn" v-if="item.RecordId>0" @click="navReport(item)">
 				            查看报告
 				        </view>
 				    </view>
 				</view>
 			</view>
 		</view>
-		
-		<!-- 筛选 -->
-		<uni-popup ref="pop_card" type="bottom">
-		    <view class="search-content">
-		        <view class="head-title">
-					<text>筛选</text>
-					<view @click="closeDialog()" class="s_close"></view>
-				</view>
-		        <view class="item-content">
-		            <view class="title">测评等级</view>
-		            <view class="options">
-						<view class="item"  v-for="(item,index) in levelOption" :class="checkedTestLevel==item.value?'on':''"  @click="checkedTestLevel = item.value" :key="index">{{item.name}}</view>
-		            </view>
-		            <view class="title">测评类型</view>
-		            <view class="options">
-						<view class="item"  v-for="(item,index) in typeOption" :class="checkedTestType==item.value?'on':''"  @click="checkedTestType = item.value" :key="index">{{item.name}}</view>
-		            </view>
-		            <view class="title">测评功能</view>
-		            <view class="options">
-						<view class="item"  v-for="(item,index) in fnOption" :class="checkedTestFun==item.value?'on':''"  @click="checkedTestFun = item.value" :key="index">{{item.name}}</view>
-		            </view>
-		        </view>
-		        <view class="btn-wrap">
-		            <view class="btn" v-on:click="confirmCompute">
-		                确认筛选
-		            </view>
-		        </view>
-		    </view>
-		</uni-popup>	
 	</view>
 </template>
 
@@ -80,148 +29,14 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				refreshIfNeeded: false, //是否返回刷新
 				dataList: [],
-				selectTypeStr: ["全部"],
-				showContrast: false,//显示筛选
-				levelOption: [
-					{
-						name: "全部",
-						value: 0
-					},
-					{
-						name: "基础型",
-						value: 1
-					},
-					{
-						name: "进阶型",
-						value: 2
-					},
-					{
-						name: "专项型",
-						value: 3
-					},
-				],
-				typeOption: [
-					{
-						name: "全部",
-						value: 0
-					},
-					{
-						name: "生涯类",
-						value: 1
-					},
-					{
-						name: "学习力类",
-						value: 2
-					},
-					{
-						name: "心理健康类",
-						value: 3
-					},
-					{
-						name: "其他",
-						value: 4
-					},
-				],
-				fnOption: [
-					{
-						name: "全部",
-						value: 0
-					},
-					{
-						name: "情感态度",
-						value: 1
-					},
-					{
-						name: "智力能力",
-						value: 2
-					},
-					{
-						name: "认知学习",
-						value: 3
-					},
-					{
-						name: "人格特质",
-						value: 4
-					},
-					{
-						name: "心理健康",
-						value: 5
-					}
-				],
-				testLevel:0 ,// 测评等级
-				testType: 0,// 测评类型
-				testFun: 0,// 测评功能
-				checkedTestLevel: 0,// 测评等级
-				checkedTestType: 0,// 测评类型
-				checkedTestFun: 0,// 测评功能
-				testList1: [], //情感
-				testList2: [], //智力
-				testList3: [], //认知学习
-				testList4: [], //人格特质
-				testList5: [], //心理健康
-				testList6: [], //其他测评
-				filteredData: [],//筛选后数据
 			}
 		},
 		onShow() {
 			this.queryTaskListForWeChart();
 		},
 		methods: {
-			closeDialog(){
-				this.$refs.pop_card.close();
-			},
-			//确认筛选
-			confirmCompute(){
-				this.testLevel = this.checkedTestLevel;
-				this.testType = this.checkedTestType;
-				this.testFun = this.checkedTestFun;
-				if(this.checkedTestLevel == 0 && this.checkedTestType == 0 && this.checkedTestFun == 0){
-					this.selectTypeStr = ["全部"];
-				}else {
-					let arr = [];
-					if(this.checkedTestLevel != 0){
-						arr.push(this.levelOption[this.checkedTestLevel].name);
-					}
-					if(this.checkedTestType != 0){
-						arr.push(this.typeOption[this.checkedTestType].name);
-					}
-					if(this.checkedTestFun != 0){
-						arr.push(this.fnOption[this.checkedTestFun].name);
-					}
-					this.selectTypeStr = arr;
-				}
-				
-				this.filteredData = this.dataList.map(category => {
-					const filteredList = category.list.filter(item => {
-						// 处理TestLevel筛选
-						const levelMatch = this.testLevel === 0 || item.TestLevel === this.testLevel;
-						
-						// 处理TestType特殊映射（其他类对应TestType=0）
-						const typeMatch = this.testType === 0 ? true : 
-						this.testType === 4 ? item.TestType === 0 : 
-						item.TestType === this.testType;
-						
-						// 处理TestFun筛选
-						const funMatch = this.testFun === 0 || item.TestFun === this.testFun;
-						
-						return levelMatch && typeMatch && funMatch;
-					});
-					return { ...category, list: filteredList };
-				}).filter(category => category.list.length > 0); // 过滤空分组
-				//this.showContrast = false;
-				this.$refs.pop_card.close();
-			},
-			// 显示筛选列表
-			showContrastLayer(){
-				 //this.showContrast = true;
-				 this.$refs.pop_card.open('bottom') //底部弹出
-				 this.checkedTestLevel = this.testLevel;
-				 this.checkedTestType = this.testType;
-				 this.checkedTestFun = this.testFun;
-			},
 			// 返回
 			goback(){
 				uni.navigateBack(-1);
@@ -231,195 +46,16 @@
 				uni.showLoading({
 					title: "加载中"
 				})
-				let eduLevel = uni.getStorageSync("CAuserInfo").user.GradeLevel;
-				new Promise((resolve,reject)=>{
-					return api.getTestTypeTagLIst().then((res)=>{
-						resolve(res)
-					})
-				}).then((res)=>{
-					let arr = [];
-					res.Data.forEach(item=>{
-						return arr.push(item.Type);
-					})
-					return api.getUserTestTypeProcessList(JSON.stringify(arr)).then((res1)=>{
-						 return [res, res1];
-					})	
-				}).then(([res1, res2]) => {
-				    if (res1.Result === 1 && res2.Result === 1) {
-						return api.queryTaskListForWeChart(eduLevel).then((res) => {
-							return [res, res1, res2];
-						});
-				    }
-				}).then(([res, res1, res2]) => {
-					 uni.hideLoading();
-				    if (res && res.Result === 1) {
-				        this.testList1 = [];
-				        this.testList2 = [];
-				        this.testList3 = [];
-				        this.testList4 = [];
-				        this.testList5 = [];
-				        this.testList6 = [];
-				        let list = res.Data.TestList;
-						list.forEach(item=>{
-							// 处理答题记录匹配
-							 item.HasTestRecordProcess = false;
-							 res2.Data.forEach(ritem=>{
-								 if(item.TestType == ritem.TestType){
-									 item.HasTestRecordProcess = ritem.HasTestRecordProcess;
-								 }
-							 })
-						})
-				        let num = 0;
-				        let arr = []; 
-				        let arr1 = []; 
-				        list.forEach(item=>{
-				        	if(item.HasTest){
-				        		num++
-				        	}
-				        	let isMatch = false;
-							// 处理测评分类匹配
-				        	res1.Data.forEach((yitem, yindex) => {
-				        		if (item.TestType == yitem.Type) {
-				        			item.Type = item.TestType;
-				        			item.TestType = yitem.TestType;
-				        			item.TestLevel = yitem.TestLevel;
-				        			item.TestFun = yitem.TestFun;
-				        			arr.push(item); 
-				        			isMatch = true;
-				        		}
-				        	})
-				        	if (!isMatch) {
-				        		item.Type = item.TestType;
-				        		item.TestType = 0;
-				        		item.TestLevel = 0;
-				        		item.TestFun = 0;
-				        		arr1.push(item);
-				        	}
-				        })
-				        this.testList6 = arr1;
-				        this.testList = list;
-				        arr.forEach((item, index) => {
-				        	switch (item.Type) {
-				        			// 1 情感态度
-				        			// 高中，大学职业兴趣11
-				        			// 工作价值观17
-				        			// 学习动机测评-33
-				        			// 自我效能感测评-34
-				        			// 小学兴趣测评-31
-				        			//初中兴趣测评18
-				        		case 11: 
-				        		case 17:
-				        		// case 18:
-				        		// case -31:
-				        		// case -33:
-				        		// case -34: 
-								{
-				        			this.testList1.push(item);
-				        			// this.interestList.push(item);
-				        			break;
-				        		}
-				        			// 2 智力能力
-				        			// 注意力22
-				        			// 记忆力23
-				        			// 多元智能16
-				        			// 小学多元智能 -32
-				        			// 多元性向潜能发展6
-				        			// 推理能力测评-45
-				        			// 批判性思维倾向测评-38
-				        			// 创造力倾向测评-37
-				        			// 多元(职业)能力测评-27
-				        			// 通用(职业)能力测评-28
-				        		// case 22:
-				        		// case 23:
-				        		// case 16:
-				        		// case 6:
-				        		// case -32:
-				        		// case -45:
-				        		// case -38:
-				        		// case -37:
-				        		case -27:
-				        		case -28: {
-				        			this.testList2.push(item);
-				        			break;
-				        		}
-				        		// 3认知学习
-				        		// 学科信心-2
-				        		// 学科能力测评20
-				        		// 学科自评-9999
-				        		// 学习习惯-36
-				        		// 领导力测评-29
-				        		// 生涯建构测评-42
-				        		// 生涯适应力测评-43
-				        		// 意志力测评 -35
-				        		// 场独立-场依存认知风格测评 25
-				        		// 沉思型-冲动型认知风格测评 26
-				        		// 儿童元认知测评 -39
-				        		// 元认知测评 -40
-				        		// 学习资源管理能力测评 -41
-				        		// 问题解决能力测评-44
-				        		// case -2:
-				        		// case 20:
-				        		// case -9999:
-				        		// case -36:
-				        		// case -29:
-				        		// case -42:
-				        		// case -43:
-				        		// case -35:
-				        		// case 25:
-				        		// case 26: 
-				        		// case -39:
-				        		// case -40:
-				        		// case -41:
-				        		// case -44:
-				        		// {
-				        		// 	this.testList3.push(item);
-				        		// 	// this.workValueList.push(item);
-				        		// 	break;
-				        		// }
-				        		// 4.人格特质
-				        		// MBTI 4
-				        		// 人格测评15
-				        		// case 4:
-				        		case 15: {
-				        			this.testList4.push(item);
-				        			break;
-				        		}
-				        		// 5.心理健康
-				        		// SCL-90
-				        		// case -10: {
-				        		// 	this.testList5.push(item);
-				        		// 	break;
-				        		// }
-				        	}
-				        })
-				        let allList = [];
-				        if(this.testList1.length>0){
-				        	allList.push({title: '情感态度', list: this.testList1});
-				        }
-				        if(this.testList2.length>0){
-				        	allList.push({title: '智力能力', list: this.testList2}); 
-				        }
-				        if(this.testList3.length>0){
-				        	allList.push({title: '认知学习', list: this.testList3}); 
-				        }
-				        if(this.testList4.length>0){
-				        	allList.push({title: '人格特质', list: this.testList4}); 
-				        }
-				        // if(this.testList5.length>0){
-				        // 	allList.push({title: '心理健康', list: this.testList5}); 
-				        // }
-				        // if(this.testList6.length>0){
-				        // 	allList.push({title: '其他测评', list: this.testList6}); 
-				        // }
-				        this.dataList = allList;
-				        this.confirmCompute();
-				    }
-				}).catch((error) => {
-				    console.error('请求出错:', error);
-				});
+				api.queryTaskListForWeChart().then((res)=>{
+						uni.hideLoading();
+					if (res && res.Result === 1) {
+						this.dataList = res.Data.DataList.filter(item=>(item.Type !== 4 && item.Type != -29));
+					}
+				})
+				
 			},
-			routerUrl(TYPE){
-				switch (TYPE) {
+			navTest(item,index) {
+				switch (item.Type) {
 					case 11: {
 						// 高中兴趣测评
 						uni.navigateTo({
@@ -458,21 +94,6 @@
 					}
 				}
 			},
-			navTest(item,index) {
-				if(index == 1){
-					uni.showLoading({
-					    title: "加载中..."
-					})
-					api.removeTestRecordProcess(item.Type).then((res) => {
-						if (res.Result == 1) {
-							uni.hideLoading();
-							this.routerUrl(item.Type)
-						}
-					})
-				}else {
-					this.routerUrl(item.Type)
-				}
-			},
 			navReport(item) {
 			    switch (item.Type) {
 			        case 11: {
@@ -543,50 +164,7 @@
             background-size: 38rpx 38rpx;
         }
     }
-	.progress-box {
-		display: flex;
-		align-items: center;
-		margin-bottom: 36rpx;
-		.progress-txt {
-			display: flex;
-			align-items: center;
-			font-size: 24rpx;
-			width: 175rpx;
-			color: #333333;
-			margin-right: 20rpx;
-			.strong {
-				font-size: 32rpx;
-				color: #20B664;
-				font-weight: 600;
-				margin-left: 6rpx;
-			}
-		}
-		.progress-bar {
-			width: 500rpx;
-			height: 24rpx;
-			background: #F8F8F8;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			.progress {
-				position: relative;
-				background-image: repeating-linear-gradient(-45deg, #20B664, #20B664 20rpx, #47C580  20rpx, #47C580 30rpx);
-				height: 24rpx;
-				border-radius: 20rpx;
-				transition: width 1s ease-in-out;
-				&::after {
-					display: block;
-					content: "";
-					  position: absolute;
-					  right: -20rpx;
-					  top: -8rpx;
-					  width: 40rpx;
-					  height: 40rpx;
-					  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAA2FBMVEUAAAA60X84z4A60YE50X850n860H860IA6z4A4z4A60X850IA50X84z4Awz4D///860X8iv2khu2ciwmskyW8guWUlzHEky3Ajx20hvWglznEl0HMm0nQjxWwm1HUgt2Q3z3zk+O112KK67dGR47Yu03kyznktzXYuyHQz0nsvxXIqwm/I8NoqyHInv2ys6Mc9yHwr0Xbx+/Wt7Mpa15NZ0ZBO1os/0IEyynfI8tyD3Ktn1Jjx/PbW8+Of5b6E4q9LzYZA1oVLyYTW9eSf6cGf5r+C2qpp35/QM//cAAAAD3RSTlMA70B/37+vn2Agz7+PYBCLRPBlAAACh0lEQVQ4y6XV2XqqMBAAYKKI1i2DgNZWK6AHEHetS7X72d7/jc4kGBJFvTlzARf833yTySRo55HLV8oEgOhGNVdXP2RlEZ0MUsxdpSUdgRuEi8fHx05nMRwCQOEyvzNQhs1m8wGD887TD8bvLqQlSFutVhNDasZJ7dzmAYKmbaPmWOonLCafseG9jZHJjcmFlnZyf6/oh+u6hraL+EbuUtoHAlG3i/pGbiJ6UoDAsjIa+dfz36/hcZVGYnMAlpXVmxVl8ZLkFoUUILIyetunSXii37pMfKY3HhVxrBsgh7gIkWmmejsbD2zbp2l46c4XNa1OwDRTPeDf+XP18cJe/WNPFkBYFYEp9HwsMw5areAV379EB4dYRxWi9lH7HpXxjKv8ie+N6PcQt9GAUTvRPlVjZdtb1rl0LxdQ0XQw24nu05MYsz6/btK9XEBZI9BuNLieUbr0lvQkPuScdHCFAA3ETMf+Ghd5kn+gzgkAw1yLVc5Uq84gwwSxqt8VvLW5FphoZZg6nDM9f5vPFdxXZhCxrlUQOyL3mI7NwUmzZe4QDDxRsSP0H/zum/ulLFqZ7wCquN07R+j4e0aXezNeH2bHzMp8u7jdbIVcc+6h8D4ta83tb/U0AKmzER31hPZpf8wqsT6Z9aKu1CEU+fC7PaG//fbBm2MH9wyv1bPDhh9Dx9RpbmVO3tWzE0IhueXAbUiNPMFvJyeNJeZhQNQ7yx0ffKRSB1CQl8zoXGMoOpSXDBYC01t6AlBTL0ZXaoxTPclco9criaSVeudc0t2dsErUCLgjJ6MnLpDShR9QAcCNHbVuCykYd5f/gshhF0/bjE5HUQAAeun/fpoy6rmqoRN05Uo+I/8B7R+IPTrIPJ8AAAAASUVORK5CYII=');
-					  background-size: 100%;
-				}
-			}
-		}
-	}
-    .test-list-wrap {
+	.test-list-wrap {
         padding: 0 20rpx 130rpx;
 
         .content {
@@ -747,196 +325,4 @@
             }
         }
     }
-	.contrast-box {
-	    display: flex;
-	    align-items: center;
-	    justify-content: space-between;
-	    width: 666rpx;
-	    height: 76rpx;
-	    margin-bottom: 20rpx;
-	    padding: 0 20rpx;
-	    background: #E7F1FF;
-	    border-radius: 12rpx 12rpx 12rpx 12rpx;
-	    border: 2rpx solid #FFFFFF;
-		
-	    .desc {
-	        display: flex;
-	        align-items: center;
-	
-	        .icon {
-	            width: 28rpx;
-	            height: 28rpx;
-	            background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAHfSURBVEiJ1Va9btswEP5OlBNr01JAMgpUeYNm7FDAeoP2Ddq1UzK5Roc6Q6AoS7auzps4QDt0i4fu1lYVWThFP7Z4HSIpspC4cCMmyLeQR+nu4/GOvAOeAwYn+dQ9zWf/o0vtBSdIvE0KBpkvmfg7AKyY3i5T85eckLzRZS/NICvZnrBdze8kdMN8AWAj4V1gVfgkxFcwhqX8EcAFGeISYPl7tLtXb7jl2dZkJTww7FoyzFelLRsgzwm4tmu0NbcBMz6tVtiPx9Z5kvR8VoXPqvDjUe+oUKI+yjRDPa+P1AkSjwyx2IZQAW/+jHZ+3vd9EGbvlFIyHlsX1dqDPPznhpSSTU+1EjpBMiRDzEwTM3vCdXy1eljC7u/eJpSpiyXN+nPLyiMAiMcUaSeUE5IS2Guvaz1SN1yeuWF+9iiETpAMAT4AcNDZxd+E+y6+NsKrLztzYpwD6rD5gGtLGgC4TnuH7WqhM4aeZS0XbpitPZc6s9RD19ViE54macDvWRV+M47Pq1oQY7/qgZwg8ZwgGb44zl+XcvfVggjfSIgpAJAQ05Lg0gmSD43f1qpFTRiPrQhAtDWputGpxgpp1p8DHAEcNavFg9vEq8+9H7e6621iZ3BP89ngJJ92alQX/gLMKt2XTOFMygAAAABJRU5ErkJggg==") no-repeat;
-	            background-size: 100%;
-	        }
-	
-	        .txt-item {
-	            width: 400rpx;
-	            line-height: 21px;
-	            overflow: hidden;
-	            text-overflow: ellipsis;
-	            white-space: nowrap;
-				margin-left: 20rpx;
-	            text {
-	
-	                display: inline-block;
-	                line-height: 50rpx;
-	                font-size: 24rpx;
-	                color: #1677ff;
-	                margin-left: 16rpx;
-	
-	                &::after {
-	                    content: "";
-	                    display: inline-block;
-	                    width: 2rpx;
-	                    height: 12rpx;
-	                    margin-left: 16rpx;
-	                    background: #1677ff;
-	                }
-	            }
-	        }
-	    }
-	
-	    .btn {
-	        display: flex;
-	        align-items: center;
-	        justify-content: center;
-	        width: 120rpx;
-	        height: 48rpx;
-	        background: #FFFFFF;
-	        border-radius: 8rpx 8rpx 8rpx 8rpx;
-	        font-size: 24rpx;
-	        color: #333333;
-	
-	        &::after {
-	            content: "";
-	            display: block;
-	            width: 0;
-	            height: 0;
-	            margin-left: 6rpx;
-	            border-top: 12rpx solid #333;
-	            border-left: 12rpx solid #fff;
-	            border-right: 12rpx solid #fff;
-	        }
-	    }
-	}
-	.search-content {
-	    width: 100%;
-	    background: #fff;
-	    border-top-left-radius: 28rpx;
-	    border-top-right-radius: 28rpx;
-	    overflow: hidden;
-	
-	    .head-title {
-	        width: 100%;
-	        height: 96rpx;
-	        line-height: 96rpx;
-	        text-align: center;
-	        font-size: 36rpx;
-	        color: #333;
-			font-weight:550;
-			margin-top:10rpx;
-			position:relative;
-	    }
-	
-	    .item-content {
-	        padding: 0 0 0 30rpx;
-	
-	        .s-line {
-	            position: relative;
-	            width: 630rpx;
-	            margin: 15rpx auto 45rpx;
-	            height: 2rpx;
-	            background: #FAFAFA;
-	
-	            &:before {
-	                content: "";
-	                display: block;
-	                position: absolute;
-	                left: -85rpx;
-	                top: -16rpx;
-	                width: 32rpx;
-	                height: 32rpx;
-	                border-radius: 50%;
-	                background: #EEF1F8;
-	            }
-	
-	            &::after {
-	                content: "";
-	                display: block;
-	                position: absolute;
-	                right: -58rpx;
-	                top: -16rpx;
-	                width: 32rpx;
-	                height: 32rpx;
-	                border-radius: 50%;
-	                background: #EEF1F8;
-	            }
-	        }
-	
-	        .title {
-	            font-size: 28rpx;
-	            color: #333333;
-	            padding: 30rpx 0 20rpx;
-	        }
-	
-	        .options {
-	            display: flex;
-	            flex-wrap: wrap;
-	
-	            .v-line {
-	                border-bottom: 1px dotted #f1ececb8;
-	                margin: 26rpx 0;
-	            }
-	
-	            .item {
-	                position: relative;
-	                min-width: 170rpx;
-	                margin-right: 30rpx;
-	                height: 76rpx;
-	                text-align: center;
-	                line-height: 76rpx;
-	                background: #F5F5F5;
-	                margin-bottom: 30rpx;
-	                padding: 0 20rpx;
-	                border-radius: 12rpx;
-	                font-size: 28rpx;
-	                color: #333333;
-	
-	                &.disable {
-	                    color: #C6C6C6;
-	                    background: #F8F8F8;
-	                }
-	
-	                &.on {
-	                    background: #E7F1FF;
-	                    color: #1677ff;
-	
-	                }
-	            }
-	        }
-	    }
-	
-	    .btn-wrap {
-	        display: flex;
-	        justify-content: center;
-	        padding-top: 10rpx;
-	        padding-bottom: 40rpx;
-	
-	        .btn {
-	            width: 688rpx;
-	            height: 88rpx;
-	            line-height: 88rpx;
-	            text-align: center;
-	            background: #1677ff;
-	            font-size: 32rpx;
-	            color: #fff;
-	            border-radius: 60rpx;
-	        }
-	    }
-	}
-.s_close{position:absolute;top:30rpx;right:6%;width:30rpx;height:30rpx;
-background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAgCAYAAAAFQMh/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RjkzQkY4QkFCMjY0MTFGMDlGOThGMzcyM0VCRTJGMkYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RjkzQkY4QkJCMjY0MTFGMDlGOThGMzcyM0VCRTJGMkYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTNCRjhCOEIyNjQxMUYwOUY5OEYzNzIzRUJFMkYyRiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTNCRjhCOUIyNjQxMUYwOUY5OEYzNzIzRUJFMkYyRiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PvssjGYAAAO/SURBVHjatJf7a5V1HMef5bN2tduObjp1hMlOTbCpaKTifpI0b1EKXgo0U4Lw/0j8ZSoohkpFKjLvUYrWREX8Qa0oQaw5O7Yzt45jbW7u4nZ8f+R14MvDOdtz9PSB13jOs+37/n6u3+/Ji0aj2zzPaxenxF9i2Mu9lYo66BG/+foxT3SLAXFUtORY9AUxWywTM0WvKDHhWlEkqsSgaBD/5kj0Rdb/VKzms0U34bMjs6jYIvLFd+JBDoTfYc1FiJr9IS6PiUQiteTgZVEhyghHC/l41vDOFRvEKtbuE1fEAXHehBOEOErIJxL2TnFH9GcpmifeFl8gWsJ7E90lfhRtJhzXQ5xqnuR4Pk4kRbN4lIXwfLFZvC9e5d1ZPD2DQ0kTHtLDfUJbgrcW+smiXHSJfwj/SJZPIW0U68QrTni/EqdZ66mZcOrZiumuvRNviUIxXkwl17dpuUw2S2wVK4ia2UWxQ5yjZb10whbWBK2U74S9nJANsrG+NKJzaJkPxGuO6H7xfVA0KJyyNhEjVNWiQEwRlfRgM5tIVe+btMzH4iVhqftV7BQnMnVGOmEPgTjP1YS9HPFOejH1O6velY6nl8Qe8YOb06D5I+TsBq1hLbaENnuXdHSQ7/lMpAieXhffiOPpwhtW2CNk9fSyDYNixMsI9wREk4jWZ8pp2FC7BdcO3bRZFUyh1xOIfU2f/hem2f2QQ+EavV5BXoucGR/nYGnIdqaGtQHyGLRhp8pD22ihTtkMsUYsZKLlBTafz6ZaRxkyoUNti74h1lNcZeSwiYKz0L/O7ycz9c6FOdVG83i6+Fx8SAWn+nQ7g7+HaBTSbjbtHoo/M6QllMc1TKPVDA+zX8QhcZLPCTa0lApfyEk2gOdd2Xo8jTG4gQXNbjLwjzvz2oTvkYIaUlOF5/c5z4fCCtsCm8RH5NBjOOxDNBHo81YmWQH1UIhwhN5Pe3MNCk+lUDaSsyS7tlPmIIMknf2NeITQF7NWKf/TFqx2PxDez2ib8by7JXaHvHleZaN2YVhLy9WhUciVZ8D1eAzh/YRCqnIK6VtxmHCOZkN43uWEeyztVsKGYqlh43MbXMpBnvK0idl7aITwZrKfKT5bezHjdTmbsd6/YJVvHn/JH1Q69969hLfVy96SVHQ7ua4h7BVgvd/lc0cqdnJ6BJ7nq4zlspFRauFewDXqPSo84n6TiHEFfV5R9/BoJPePcTCPm2ivz2Fv0+YncYwLXa6snxFbRE9Pp8jiPvfeDg7x2P/wFbWPVitAx3L8+xMBBgBa0QNtbOSplwAAAABJRU5ErkJggg==") center no-repeat;
-background-size:30rpx;
-}
 </style>

packageCa/pagesTest/workValuesTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-	<view class="title-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>工作价值观测评</text>
-		</view>
+	<view class="title-wrap" style="padding-top: 40rpx;">
 		<view class="progress-block">
 			<view class="row">
 				<view class="title-index">
@@ -51,7 +47,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				list: [],
 				allNum: 0,//总题目数
 				pageIndex: 0, //显示页
@@ -86,7 +81,7 @@
 			}
 		},
 		created() {
-			this.getHistoryTitle();
+			this.getTitle();
 		},
 		methods: {
 			// 返回
@@ -114,16 +109,6 @@
 				}
 				this.pageIndex--
 			},
-			//获取答题记录
-			getHistoryTitle(){
-				api.getTestRecordProcessList(17).then(res => {
-					if (res.Result === 1) {
-						let data = res.Data;
-						this.historyTitle = data;
-						this.getTitle();
-					}
-				})
-			},
 			// 获取题目
 			getTitle() {
 				uni.showLoading({
@@ -135,20 +120,7 @@
 						let list = res.Data.List;
 						list.forEach(item => {
 							item.Value = 0;
-							this.historyTitle.forEach(ritem=>{
-								if(item.TitleId == ritem.TestTitleId){
-									item.Value = Number(ritem.TestResult) + 1;
-								}
-							})
 						})
-						if(this.historyTitle.length == 0){
-							this.pageIndex = 0;
-						}else if(this.historyTitle.length == list.length){
-							this.pageIndex = list.length - 1;
-						}else {
-							this.pageIndex = this.historyTitle.length;
-						}
-						
 						this.allNum = list.length;
 						this.list = list;
 					}
@@ -165,28 +137,14 @@
 					 console.log('单击事件被触发');
 					this.lastTapTime = now; 
 					this.list[INDEX].Value = NUM;
-					//
-					this.saveTestRecordProcess(this.list[INDEX].TitleId,NUM-1);
+				
 					setTimeout(()=>{
 						if(this.pageIndex != this.list.length - 1){
 							this.pageIndex = INDEX + 1;
-							
 						}
 					},300)
 				}
 			},
-			//存储答题记录
-			saveTestRecordProcess(ID,VALUE){
-				let data = {
-					testType: 17,
-					testTitleId: ID,
-					testResult: VALUE
-				}
-				api.saveTestRecordProcess(data).then(res => {
-					if (res.Result === 1) {
-					}
-				})
-			},
 			// 提交题目
 			submitTitle() {
 				let testStr = "";
@@ -217,9 +175,7 @@
 				let data = {
 					testStr
 				}
-				api.removeTestRecordProcess(17).then((res) => {
-					 return api.saveWorkValuesResult(data);
-				}).then((res) => {
+				api.saveWorkValuesResult(data).then((res) => {
 					uni.hideLoading();
 					if (res.Result === 1) {
 						uni.showToast({
@@ -231,7 +187,7 @@
 						beforePage.data.refreshIfNeeded = true;
 						setTimeout(()=>{
 							uni.redirectTo({
-								url: `/packageCa/testReport/workValuesTestReport?year=${res.Data.Year}`
+								url: `/packageCa/testReport/workValuesTestReport`
 							})
 						},1000)
 					} else {

packageCa/search/AIAudition.vue

@@ -9,7 +9,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				user: null,//用户信息
 				userId: 0,
 				name: "",

packageCa/search/search.vue

@@ -1,10 +1,6 @@
 <template>
 	<view class="index-wrap">
 		<view class="yanshi-wrap">
-			<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-				<view class="go-back"  @click="goback"></view>
-				<text>素质测评</text>
-			</view>
 			<view class="section">
 				<view class="head-title">测评中心</view>
 				<view class="nav-block">
@@ -53,45 +49,22 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				user: null,//用户信息
-				userId: 0,
-				name: ""
+				name: "",
+				idCard: ""
 			}
 		},
 		onLoad(e) {
-			this.userId = e.userId;
+			if(e.idCard){
+				this.idCard = e.idCard;
+			}else {
+				this.idCard = e.userId;
+			}
 			this.name = e.name;
-			this.queryWechartToken();
+			console.log(e);
+			this.queryKaShiToken();
 		},
 		methods: {
-			// 返回
-			goback() {
-				uni.navigateBack(-1);
-			},
-			async getUserInfor(){
-				const res = await api.getUserBasisInfo();
-				if (res.Result == 1) {
-					const data = res.Data.data;
-					if(data === null){
-						uni.showToast({
-							title: "请先完善个人信息",
-							duration:2000,
-							icon: "none"
-						})
-						setTimeout(() => {
-							uni.navigateTo({
-								url: "/packageCa/userCenter/fillInInformation"
-							})
-						}, 2000);
-					}
-				} else {
-					uni.showToast({
-						title: res.Message,
-						icon: "none"
-					})
-				}
-			},	
 			// 演示入
 			navDetail(index){
 				switch (index){
@@ -137,44 +110,17 @@
 			
 			// 登录获取用户信息
 			async queryKaShiToken() {
-				const res = await api.queryKaShiToken(this.userId,this.name)
+				const res = await api.queryKaShiToken(this.idCard,this.name)
 				if(res.Result == 1){
-					return res.Data;
+					let params = {
+						token:res.Data.token, 
+						user: res.Data.userInfo
+					};
+					uni.setStorageSync('CAuserInfo',params);
 				}else {
 					return null
 				}
 			},
-			// 获取token
-			async queryWechartToken() {
-				uni.showLoading({
-					title: "加载中"
-				})
-				const data = await this.queryKaShiToken();
-				if(data.userInfo != null){
-					const res = await api.queryWechartToken(data.userInfo.Id,2268,1)
-					uni.hideLoading();
-					if(res.Result == 1){
-						let params = {
-							token:data.token,
-							user:data.userInfo,
-							userToken: res.Data.token
-						};
-						uni.setStorageSync('CAuserInfo',params);
-						this.getUserInfor();
-					}
-				}else {
-					uni.showToast({
-						title: "获取用户信息失败",
-						icon: "none"
-					})
-					setTimeout(()=>{
-						uni.reLaunch({
-							url: "/pages/index/index"
-						})
-					},1500)
-					
-				}
-			}
 		}
 	}
 </script>

packageCa/testReport/components/contrastBox.vue

@@ -30,9 +30,9 @@
 						{{optionStr2}}
 						<view class="iocn"></view>
 					</view>
-		        <!--    <view class="title">群体维度</view>
+		           <view class="title">群体维度</view>
 		            <view class="options">
-		                <view class="item" :class="[schoolLevel == 1?'on':'', gradeShow?'':'disable']" v-on:click="selectSchoolLevel(1)"  >班级</view>
+		               <view class="item" :class="[schoolLevel == 1?'on':'', gradeShow?'':'disable']" v-on:click="selectSchoolLevel(1)"  >班级</view>
 		                <view class="item" :class="[schoolLevel == 2?'on':'', gradeShow?'':'disable']" v-on:click="selectSchoolLevel(2)">年级</view>
 		                <view class="item" v-on:click="selectSchoolLevel(3)" :class="schoolLevel == 3?'on':''">学校</view>
 		            </view>
@@ -40,7 +40,7 @@
 		            <view class="options">
 		                <view class="item" v-on:click="selectSex(1)" :class="sexType == 1?'on':''">男</view>
 		                <view class="item" v-on:click="selectSex(2)" :class="sexType == 2?'on':''">女</view>
-		            </view> -->
+		            </view>
 		        </view>
 		        <view class="content" v-else>
 		            <view class="title">我的报告</view>
@@ -54,19 +54,21 @@
 		            	{{optionStr2}}
 		            	<view class="iocn"></view>
 		            </view>
-		        <!--    <view class="title">群体维度</view>
+		           <view class="title">群体维度</view>
 		            <view class="options">
-		                <view v-for="(item, index) in departList" :key="index">
-		                    <view class="item" v-on:click="selectSchoolLevel(item)" :class="schoolLevel == item.DepartId?'on':''">
+		                <view >
+							<!-- v-for="(item, index) in departList" :key="index" -->
+		                    <!-- <view class="item" v-on:click="selectSchoolLevel(item)" :class="schoolLevel == item.DepartId?'on':''">
 		                        {{item.Name}}
-		                    </view>
+		                    </view> -->
+							 <view class="item" v-on:click="selectSchoolLevel(3)" :class="schoolLevel == 3?'on':''">全体人员</view>
 		                </view>
 		            </view>
 		            <view class="title">受测对象</view>
 		            <view class="options">
 		                <view class="item" v-on:click="selectSex(1)" :class="sexType == 1?'on':''">男</view>
 		                <view class="item" v-on:click="selectSex(2)" :class="sexType == 2?'on':''">女</view>
-		            </view> -->
+		            </view>
 		        </view>
 		        <view class="btn-wrap">
 		            <view class="btn" v-on:click="confirmCompute">
@@ -340,22 +342,25 @@
 			//选中群体维度
 			selectSchoolLevel(info) {
 				console.log(info);
-			    if (this.platformType == 1) {
-			        this.departName = info.Name;
-			        //高校
-					this.schoolLevel = info.DepartId;
-					this.sexType = 0;
-			    } else {
-					if(!this.gradeShow && info < 3){
-						return uni.showToast({
-						    title: "当前学期未进行分班,无法进行对比",
-						    icon: "none"
-						})
-					}
-					//普教
-					this.schoolLevel = info;
-					this.sexType = 0;
-			    }
+			  //   if (this.platformType == 1) {
+			  //       this.departName = info.Name;
+			  //       //高校
+					// this.schoolLevel = info.DepartId;
+					// this.sexType = 0;
+			  //   } else {
+					// if(!this.gradeShow && info < 3){
+					// 	return uni.showToast({
+					// 	    title: "当前学期未进行分班,无法进行对比",
+					// 	    icon: "none"
+					// 	})
+					// }
+					// //普教
+					// this.schoolLevel = info;
+					// this.sexType = 0;
+			  //   }
+				this.departName = "全体人员"
+			    this.sexType = 0;
+			    this.schoolLevel = info;
 				this.optionStr2 = "";
 				this.selYTItem2 = null;
 				this.selRepItem2 = null;

packageCa/testReport/generalCareerTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
 			 <contrastBox  @updateValue="handleChildValueChange" :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -75,8 +71,8 @@
 	import contrastBox from "@/packageCa/testReport/components/contrastBox.vue"
     import api from "@/packageCa/apiCa/testManage.js";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
-    // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
+	const echarts = require('../utilCa/echarts.min.js');
+    import * as echarts1 from '../utilCa/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);
     export default {
@@ -86,7 +82,6 @@
 		},
         data() {
             return {
-                barHeight: wx.getWindowInfo().statusBarHeight,
                 videoUrl: "",
 				introduceUrl: "",
                 id: "",

packageCa/testReport/interestTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
 			<contrastBox  :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -245,7 +241,7 @@
 	import contrastBox from "@/packageCa/testReport/components/contrastBox.vue"
     import api from "@/packageCa/apiCa/testManage.js";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
     // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);
@@ -258,7 +254,6 @@
         data() {
             return {
                 platform: uni.getDeviceInfo().platform,
-                barHeight: wx.getWindowInfo().statusBarHeight,
                 showTip: false,
                 layerTitile: "",
                 layerDesc: "",

packageCa/testReport/multipleAbilityTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
             <contrastBox  :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -115,7 +111,7 @@
     import api from "@/packageCa/apiCa/testManage.js"
     import wayData from "./multipleAbilityData.json";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
     // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);
@@ -127,7 +123,6 @@
         data() {
             return {
                 platform: uni.getDeviceInfo().platform,
-                barHeight: wx.getWindowInfo().statusBarHeight,
 				introduceUrl: "https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh/report/multipleAbilityTestReport-1.png",
 				introduceUrl2: "https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh/report/multipleAbilityTestReport-2.png",
                 videoUrl: "http://2-video.oss-cn-shenzhen.aliyuncs.com/2023%E5%B9%B4%E8%A7%86%E9%A2%91/%E5%88%9D%E4%B8%AD%E8%AF%BE%E7%A8%8B%E8%B5%84%E6%BA%90/%E5%A4%9A%E5%85%83%E6%99%BA%E8%83%BD%E6%B5%8B%E8%AF%84%E8%A7%A3%E8%AF%BB1.16%E4%BF%AE%E6%94%B92.mp4",

packageCa/testReport/personalTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
             <contrastBox   :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -402,7 +398,7 @@
     import opts from "./chartOpts.js"
     import api from "@/packageCa/apiCa/testManage.js";
 	import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
     // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);
@@ -414,7 +410,6 @@
         data() {
             return {
                 platform: uni.getDeviceInfo().platform,
-                barHeight: wx.getWindowInfo().statusBarHeight,
                 showTip: false,
                 videoUrl: "http://2-video.oss-cn-shenzhen.aliyuncs.com/2023%E5%B9%B4%E8%A7%86%E9%A2%91/%E5%88%9D%E4%B8%AD%E8%AF%BE%E7%A8%8B%E8%B5%84%E6%BA%90/%E4%BA%BA%E6%A0%BC%E6%B5%8B%E8%AF%84%E8%A7%A3%E8%AF%BB1.16%E4%BF%AE%E6%94%B92.mp4",
                 introduceUrl: "https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh/report/personalTestReport.png",

packageCa/testReport/workValuesTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
 			<contrastBox  :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
 			<view class="section-block">
@@ -43,8 +39,7 @@
 	import contrastBox from "@/packageCa/testReport/components/contrastBox.vue"
     import api from "@/packageCa/apiCa/testManage.js";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
-    // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
+	const echarts = require('../utilCa/echarts.min.js');
     // // 注册主题
     // echarts.registerTheme('theme', theme);
     export default {
@@ -54,7 +49,6 @@
 		},
         data() {
             return {
-                barHeight: wx.getWindowInfo().statusBarHeight,
 				showVideo: false,
 				showIntroduce: false, // 测评介绍
                 videoUrl: "http://2-video.oss-cn-shenzhen.aliyuncs.com/2023%E5%B9%B4%E8%A7%86%E9%A2%91/%E5%88%9D%E4%B8%AD%E8%AF%BE%E7%A8%8B%E8%B5%84%E6%BA%90/%E5%B7%A5%E4%BD%9C%E4%BB%B7%E5%80%BC%E8%A7%82%E8%A7%A3%E8%AF%BB1.16%E4%BF%AE%E6%94%B92.mp4",

packageCa/userCenter/careerCompass.vue

@@ -1,15 +1,11 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-		    <text>生涯罗盘</text>
-		</view>
 		<view class="content">
 			<view class="title">
 				生涯罗盘
 			</view>
 			<view class="section">
-				<view class="table">
+				<view class="table" v-if="compassList.length > 0">
 					<view class="tr">
 						<view class="th">
 						</view>
@@ -44,6 +40,13 @@
 						</view>
 					</view>
 				</view>
+				<view class="empty" v-else>
+					<view class="icon"></view>
+					<view class="txt">暂无推荐职业，请先进行兴趣测评</view>
+					<view class="nav-btn" @click="navTest">
+						去测评
+					</view>
+				</view>
 			</view>
 			<view class="title">
 				我的职业
@@ -105,7 +108,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				compassList: [],//罗盘列表
 				checkedIndex: null,
 				jobList: [],//我的职业
@@ -119,13 +121,20 @@
 			this.getGXCareerPlanList();
 		},
 		methods: {
-			goBack() {
-				uni.navigateBack(-1);
-			},			
+			// 去测评
+			navTest(){
+				uni.navigateTo({
+					url: `/packageCa/pagesTest/testList`
+				})
+			},
 			//选中职业添加
 			async checkedJob(ITEM){
+				uni.showLoading({
+					title: "添加中..."
+				}) 
 				this.checkedIndex = ITEM.JobId;
 				const res = await api.saveGXCareerPlan(ITEM.JobId);
+				uni.hideLoading();
 				if (res.Result == 1) {
 					uni.showToast({
 						title: "添加成功",
@@ -162,9 +171,9 @@
 				const res = await api.getGXCareerPlanList("",this.page,10);
 				if (res.Result == 1) {
 					this.jobList = res.Data.list;
-					// if(res.Data.list.length < 10){
-					// 	this.noMore = true;
-					// }
+					if(res.Data.list.length == 0){
+						this.noMore = true;
+					}
 				} else {
 					uni.showToast({
 						title: res.Message,
@@ -221,6 +230,36 @@
 		    background-size: 38rpx 38rpx;
 		}
 	}
+	.empty {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding-top: 60rpx;
+		padding-bottom: 100rpx;
+		.icon {
+			width: 240rpx;
+			height: 240rpx;
+			background: url("#{$image-oss-url}/empty.png") no-repeat;
+			background-size: 100%;
+			margin-bottom: 20rpx;
+		}
+		.txt {
+			font-size: 28rpx;
+			color: #A4B3E5;
+		}
+		.nav-btn {
+			width: 335rpx;
+			height: 80rpx;
+			margin: 40rpx auto 0;
+			background-color: #1989fa;
+			border-radius: 40rpx;
+			font-size: 28rpx;
+			color: #fff;
+			text-align: center;
+			line-height: 80rpx;
+		}
+	}
 	.index-wrap {
 		 .content {
 			 padding: 0 20rpx;

packageCa/userCenter/fillInInformation.vue

@@ -1,563 +0,0 @@
-<template>
-	<view class="index-wrap">
-		<view class="title-h1">
-			请先完善个人信息
-		</view>
-		<view class="item-list">
-			<view class="item">
-				<view class="title"><text>*</text>学历(必选)</view>
-				<view class="option">
-					<view class="subject-item" :class="eduLevel===3?'on':''" @click="changeEduLevel(3)">研究生</view>
-					<view class="subject-item" :class="eduLevel===2?'on':''" @click="changeEduLevel(2)">本科</view>
-					<view class="subject-item" :class="eduLevel===1?'on':''" @click="changeEduLevel(1)">专科</view>
-				</view>
-			</view>
-			<view class="item">
-				<view class="title"><text>*</text>专业类(必选)</view>
-				<view class="input-wrap">
-					<view class="input-value" :class="specialtyName!== ''?'':'placeholder'"
-						@click="showZhuanYeDialog(true)">
-						{{specialtyName !== ''? specialtyName: "请选择专业类"}}
-					</view>
-					<view class="icon-select">
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="btn-wrap">
-			<view class="btn"  @click="commitForm">
-				确认提交
-			</view>
-		</view>
-		<uni-popup ref="pop_zhuanye" type="bottom"  style="background: #fff !important;">
-			<view class="layer-inner">
-				<view class="head">
-					<text>选择专业类</text>
-					<view class="close-btn" @click="showZhuanYeDialog(false)"></view>
-				</view>
-				<view class="content">
-					<view class="li" :class="item.value == specialtyName?'on':''" v-for="(item,index) in showSpecialtyList"
-						:key="index" @click="checkSpecialty(item)">
-						<text>{{item.label}}</text>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import api from "@/packageCa/apiCa/user.js"
-	export default {
-		data() {
-			return {
-				schoolName: "", // 
-				eduLevel: 2, //3研究生，2本科，1专科
-				specialtyName: "", // 
-				showSpecialtyList: [{
-						label: '哲学',
-						value: '哲学'
-					},
-					{
-						label: '经济学',
-						value: '经济学'
-					},
-					{
-						label: '法学',
-						value: '法学'
-					},
-					{
-						label: '教育学',
-						value: '教育学'
-					},
-					{
-						label: '文学',
-						value: '文学'
-					},
-					{
-						label: '历史学',
-						value: '历史学'
-					},
-					{
-						label: '理学',
-						value: '理学'
-					},
-					{
-						label: '工学',
-						value: '工学'
-					},
-					{
-						label: '农学',
-						value: '农学'
-					},
-					{
-						label: '医学',
-						value: '医学'
-					},
-					{
-						label: '管理学',
-						value: '管理学'
-					},
-					{
-						label: '艺术学',
-						value: '艺术学'
-					},
-					{
-						label: '军事学',
-						value: '军事学'
-					},
-					{
-						label: '交叉学科',
-						value: '交叉学科'
-					},],
-				specialtyOption1: [{
-						label: '农林牧渔大类',
-						value: '农林牧渔大类'
-					},
-					{
-						label: '资源环境与安全大类',
-						value: '资源环境与安全大类'
-					},
-					{
-						label: '能源动力与材料大类',
-						value: '能源动力与材料大类'
-					},
-					{
-						label: '土木建筑大类',
-						value: '土木建筑大类'
-					},
-					{
-						label: '水利大类',
-						value: '水利大类'
-					},
-					{
-						label: '装备制造大类',
-						value: '装备制造大类'
-					},
-					{
-						label: '生物与化工大类',
-						value: '生物与化工大类'
-					},
-					{
-						label: '轻工纺织大类',
-						value: '轻工纺织大类'
-					},
-					{
-						label: '食品药品与粮食',
-						value: '食品药品与粮食'
-					},
-					{
-						label: '交通运输大类',
-						value: '交通运输大类'
-					},
-					{
-						label: '电子信息大类',
-						value: '电子信息大类'
-					},
-					{
-						label: '医药卫生大类',
-						value: '医药卫生大类'
-					},
-					{
-						label: '财经商贸大类',
-						value: '财经商贸大类'
-					},
-					{
-						label: '旅游大类',
-						value: '旅游大类'
-					},
-					{
-						label: '文化艺术大类',
-						value: '文化艺术大类'
-					},
-					{
-						label: '新闻传播大类',
-						value: '新闻传播大类'
-					},
-					{
-						label: '教育与体育大类',
-						value: '教育与体育大类'
-					},
-					{
-						label: '公安与司法大类',
-						value: '公安与司法大类'
-					},
-					{
-						label: '公共管理与服务大类',
-						value: '公共管理与服务大类'
-					},
-				],
-				specialtyOption2: [{
-						label: '哲学',
-						value: '哲学'
-					},
-					{
-						label: '经济学',
-						value: '经济学'
-					},
-					{
-						label: '法学',
-						value: '法学'
-					},
-					{
-						label: '教育学',
-						value: '教育学'
-					},
-					{
-						label: '文学',
-						value: '文学'
-					},
-					{
-						label: '历史学',
-						value: '历史学'
-					},
-					{
-						label: '理学',
-						value: '理学'
-					},
-					{
-						label: '工学',
-						value: '工学'
-					},
-					{
-						label: '农学',
-						value: '农学'
-					},
-					{
-						label: '医学',
-						value: '医学'
-					},
-					{
-						label: '管理学',
-						value: '管理学'
-					},
-					{
-						label: '艺术学',
-						value: '艺术学'
-					},
-					{
-						label: '军事学',
-						value: '军事学'
-					},
-					{
-						label: '交叉学科',
-						value: '交叉学科'
-					},
-				],
-			
-			}
-		},
-		computed: {
-		},
-		created() {
-			// this.getUserInfor();
-		},
-		methods: {
-			async getUserInfor(){
-				const res = await api.getUserBasisInfo();
-				if (res.Result == 1) {
-					const data = res.Data.data;
-					this.specialtyName=data.SpecialtyName;
-					this.eduLevel=data.EduLevel;
-				} else {
-					uni.showToast({
-						title: res.Message,
-						icon: "none"
-					})
-				}
-			},			
-			//显示专业弹窗
-			showZhuanYeDialog(type){
-				if(type==false){
-					this.$refs.pop_zhuanye.close();
-				}else{
-					this.$refs.pop_zhuanye.open('bottom');
-				}
-			},
-			// 改变学历
-			changeEduLevel(INDEX){
-				if(INDEX == 1){
-					this.showSpecialtyList = this.specialtyOption1;
-				}else {
-					this.showSpecialtyList = this.specialtyOption2;
-				}
-				this.specialtyName = "";
-				this.eduLevel = INDEX;
-			},
-			//选中专业类
-			checkSpecialty(ITEM) {
-				this.specialtyName = ITEM.value;
-				this.showZhuanYeDialog(false)
-			},
-			//确认表单
-			async commitForm() {
-				if (this.specialtyName == "") {
-					uni.showToast({
-						title: "请先选择专业类",
-						icon: "none"
-					})
-					return;
-				}
-				uni.showLoading({
-					title: "保存中..."
-				}) 
-				let mobileCode =  this.code;
-				const data = {
-					//SchoolName: this.schoolName,
-					EduLevel: this.eduLevel,
-					SpecialtyName: this.specialtyName,
-					//Phone: this.mobile,
-					//StartYear: this.startYear
-				}
-				const res = await api.saveUserBasisInfo(mobileCode,data);
-				uni.hideLoading();
-				if (res.Result == 1) {
-					uni.navigateBack()
-				} else {
-					uni.showToast({
-						title: res.Message,
-						icon: "none"
-					})
-				}
-			},
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.index-wrap {
-		padding: 40rpx 20rpx 60rpx;
-
-		.title-h1 {
-			font-size: 36rpx;
-			color: #000000;
-			font-weight: 600;
-			margin-bottom: 40rpx;
-		}
-
-		.item-list {
-			.item {
-				padding-bottom: 20px;
-
-				.title {
-					font-size: 28rpx;
-					color: #333;
-					margin-bottom: 20rpx;
-					text{
-						color:red;
-					}
-				}
-
-				.input-wrap {
-					width: 670rpx;
-					height: 84rpx;
-					border-radius: 12rpx;
-					border: 2rpx solid #EEEEEE;
-					padding: 0 20rpx;
-					display: flex;
-					align-items: center;
-
-					.icon-input {
-						width: 32rpx;
-						height: 32rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAMAAABF0y+mAAAAM1BMVEUAAAAwMDAyMjIzMzMyMjIwMDAzMzMyMjIzMzMyMjIzMzMzMzM0NDQwMDAzMzMzMzMzMzNtKHn7AAAAEHRSTlMAIN+/fzDvYM9wn49AEK9QVfMC+gAAAGNJREFUKM/VzTsSgDAIRVEiIf8o+1+tGcOkIjQ2etvDPOAbdV/bztzBzH6DFHjULD21zURTUf0XHg1OM55KqolqNkuGHe63BtEwSIY5wyAuI7+KgmUQ5i5nEgrmkmXxwlWFV91t2QjwOGHVAgAAAABJRU5ErkJggg==") no-repeat;
-						background-size: 100%;
-					}
-					.icon-select {
-						width: 16rpx;
-						height: 16rpx;
-						margin-left: 24rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAS5JREFUWEftltsRgjAQRXehEeyACQ1IJUolYiXSiRRAMnQgjTDRZdCJCOQhhB/yH+7JZnMWhI0XbpwPO8Bega4CjLELIuYeG7IBgJJznmGSJDcAOHsMV6MKAngAQLQRQEMA91c5jhsBFBjHcRSGIUH4rkLTtm3aNWEPQVfhbSFiWlVV+fGAT4h3OJ32S0SMsTMi0qtYbanhPwBrO0FKmQkhCvV0oypeQ0xSylwIcR2WdnIWLAxRkPXG7nUSgJoyCILTAoom5aZTTTU7DfuXQU3pKqrZ8NEmHJL+AaENNwJQRGVjy4ZzfjB5y8Y/JBbK7hRb1zWNXO0yBjBV9lA0OgIrAB2EbbhxDwxPMaZsl3BnAKUS9EQjRMxosunKbSUil4+57LHuAZeQuT07wF6BJ0iYZ7lPYQRvAAAAAElFTkSuQmCC") no-repeat;
-						background-size: 100%;
-					}
-
-					.input-value {
-						width: 580rpx;
-						height: 84rpx;
-						font-size: 28rpx;
-						color: #333;
-						line-height: 84rpx;
-						padding-left: 20rpx;
-
-						&.placeholder {
-							font-size: 28rpx;
-							color: #999;
-						}
-
-						&::-webkit-input-placeholder {
-							font-size: 28rpx;
-							color: #999;
-						}
-					}
-					.mb-input-value {
-						width: 440rpx;
-						height: 84rpx;
-						font-size: 28rpx;
-						color: #333;
-						border-radius: 12rpx;
-						border: 2rpx solid #EEEEEE;
-						line-height: 84rpx;
-						padding-left: 40rpx;
-						&::-webkit-input-placeholder {
-							font-size: 28rpx;
-							color: #999;
-						}
-					}
-					.get-code-btn {
-						width: 240rpx;
-						height: 80rpx;
-						margin-left: 30rpx;
-						line-height: 80rpx;
-						background-color: #1b88ff;
-						border-radius: 12rpx;
-						font-size: 32rpx;
-						text-align: center;
-						color: #ffffff;
-						z-index: 9;
-						&.disable {
-							background: #9f9f9f;
-						}
-					}
-				}
-
-				.option {
-					display: flex;
-					flex-wrap: wrap;
-					justify-content: space-around;
-					.subject-item {
-						width: 210rpx;
-						height: 76rpx;
-						background: #F3F4F6;
-						border-radius: 12rpx;
-						font-size: 28rpx;
-						color: #333;
-						margin-bottom: 20rpx;
-						margin-right: 30rpx;
-						text-align: center;
-						line-height: 76rpx;
-
-						&:nth-child(3n) {
-							margin-right: 0;
-						}
-
-						&.on {
-							background: #F3F4F6;
-							color: #1677ff;
-						}
-
-						&.disadble {
-							color: #bbb;
-						}
-					}
-				}
-			}
-		}
-
-		.btn-wrap {
-			position: fixed;
-			bottom: 100rpx;
-			left: 50%;
-			transform: translateX(-50%);
-			display: flex;
-			justify-content: center;
-			z-index: 9;
-
-			.btn {
-				width: 688rpx;
-				height: 88rpx;
-				line-height: 88rpx;
-				text-align: center;
-				background: #1677ff;
-				font-size: 32rpx;
-				color: #fff;
-				border-radius: 60rpx;
-
-				&.disable {
-					background: #F3F4F6;
-					color: #bbb;
-				}
-			}
-		}
-		.layer-inner {
-			background:#fff;
-			border-radius:10px 10px 0 0;
-			.head {
-				position: relative;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				height: 120rpx;
-				width: 100%;
-				font-size: 34rpx;
-				color: #000000;
-
-				.close-btn {
-					position: absolute;
-					top: 39rpx;
-					right: 27rpx;
-					width: 52rpx;
-					height: 52rpx;
-					background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAQAAAADQ4RFAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAHdElNRQfmChMLCDGRh9c8AAAAmklEQVQ4y7WUMQ7DMAhFnzpmRO3979ABqVN8m/YWdLGcqEkM+lI92Qb+R3wAPgRPjMoxnOANQRCsLGnIwtq98X5pCZvRuucLHuMxY9tYGvffD0tYdsA2ZbsEvWabAp4b09SPDlYp0t4JSAt0YPOhYEH4ja0m+jg+QvzMfKuh/CE9oRBCyQVxhTYSGlYYDWEIpXGXFou0woRl+QUj09L9Yg66GgAAAABJRU5ErkJggg==") center no-repeat;
-					background-size: 50%;
-				}
-			}
-
-			.content {
-				max-height: 640rpx;
-				overflow: auto;
-				padding: 0 40rpx;
-
-				.li {
-					position: relative;
-					height: 114rpx;
-					line-height: 114rpx;
-					border-bottom: 2rpx solid #f5f5f5;
-
-					text {
-						font-size: 30rpx;
-						color: #000000;
-						margin-right: 20rpx;
-					}
-
-					&.on {
-						text {
-							color: #1b88ff;
-						}
-
-						&::after {
-							position: absolute;
-							right: 10rpx;
-							top: 50%;
-							transform: translateY(-50%);
-							content: "";
-							background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAZCAMAAACM5megAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAATlBMVEUbiP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8AAAAx8hE2AAAAGHRSTlMAH0f2c0SVAfc7bv6JI/hS+UhR+1D0jxRK42VSAAAAAWJLR0QZ7G61iAAAAAd0SU1FB+YKFBEcF+FCm4sAAABsSURBVCjPzdHHDoAwDANQs1cLlJn//1KGEIKqrY+QY/QOiQ2QiRgA4iTlRCTjJC9+QsqPSMVJ3ShGdCuiwgToegu5zrWQ+6MX8j39QMaby41MILoLmWC6JzKkgGFHI+voQKxGTLMshACrdu83CdwKBKKZxqUAAAAASUVORK5CYII=") no-repeat;
-							background-size: 100%;
-							display: block;
-							width: 35rpx;
-							height: 25rpx;
-						}
-					}
-				}
-			}
-
-			.op-block {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				padding: 30rpx 40rpx 0;
-				width: 670rpx;
-				height: 115rpx;
-
-				.commit-btn {
-					width: 361rpx;
-					height: 77rpx;
-					line-height: 77rpx;
-					text-align: center;
-					background-color: #1b88ff;
-					border-radius: 38rpx;
-					font-size: 30rpx;
-					color: #ffffff;
-				}
-			}
-		}
-	}
-</style>

packageCa/userCenter/learningPlan.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-		    <text>学习计划制定</text>
-		</view>
 		<view class="content">
 			<view class="title-h1">PDCA 循环法</view>
 			<view class="banner"></view>
@@ -128,7 +124,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				tabs:['目标一 ', '目标二 ', '目标三 ', '目标四 ', '目标五 '],
 				targetForm: {}, //当前选中的目标
 				targetList: [],//目标列表
@@ -150,9 +145,6 @@
 			this.queryPlanList();
 		},
 		methods: {
-			goBack(){
-				uni.navigateBack(-1);
-			},
 			// 切换目标标签
 			changeTarget(ITEM){
 				if(ITEM.EncodeId == this.checkedTargetCode){
@@ -309,20 +301,21 @@
 				padding: 40rpx 30rpx 0;
 				margin-top: 40rpx;
 				.target-tabbar {
-					margin-bottom: 50rpx;
+					margin-bottom: 30rpx;
 					display: flex;
 					flex-wrap: wrap;
 					.item {
 						position: relative;
-						width: 155rpx;
+						width: 150rpx;
 						height: 64rpx;
 						line-height: 64rpx;
 						text-align: center;
 						border-radius: 34rpx;
 						border: solid 2rpx #eeeeee;
-						font-size: 28rpx;
+						font-size: 26rpx;
 						color: #999999;
 						margin-right: 20rpx;
+						margin-bottom: 20rpx;
 						&.on {
 							color: #1989fa;
 							border-color: #1989fa;

packageCa/userCenter/personDocument.vue

@@ -1,23 +1,6 @@
 <template>
 	<view class="document">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>生涯档案</text>
-		</view>
-		<view class="person-info" style="display:none;">
-			<view class="img-wrap">
-				<image v-if="customInfo.AllHeadimgUrl" :src="customInfo.AllHeadimgUrl"></image>
-				<image v-else src="https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh/avatar.png"  mode=""></image>
-			</view>
-			<view class="txt-wrap">
-				<view class="top">
-					<view class="name">{{user.RealName}}</view>
-					<!-- <view class="grades">{{user.GradeName}}{{user.ClassName}}</view> -->
-				</view>
-				<view class="bottom">{{user.SchoolName}}</view>
-			</view>
-		</view>
-		<view class="section" style="margin-top:60rpx;">
+	<!-- 	<view class="section" style="margin-top:60rpx;">
 			<view class="head">
 				<view class="left-txt">
 					<view class="icon icon-1"></view>
@@ -44,8 +27,8 @@
 			<view class="footer">
 				<navigator url="/packageCa/job/index" class="btn">添加意向职业</navigator>
 			</view>
-		</view>
-		<view class="section">
+		</view> -->
+		<view class="section" >
 			<view class="head">
 				<view class="left-txt">
 					<view class="icon icon-4"></view>
@@ -223,7 +206,7 @@
 			<view class="content" v-if="universalResult != null&&universalResult !=''">
 				<view class="text-wrap">
 					<view class="row">
-						<text class="label">优势的能力： </text>
+						<text class="label">优秀的能力： </text>
 						<view class="long-value" v-if="universalResult != null && universalResult.length > 0 && universalGroupList1.length > 0">
 							<text  v-for="(item, index) in universalGroupList1" :key="index">
 									{{item}} <text v-if="index < universalGroupList1.length -1">、</text>
@@ -233,6 +216,17 @@
 							<text>无</text>
 						</view>
 					</view>
+					<view class="row">
+						<text class="label">优势的能力： </text>
+						<view class="long-value" v-if="universalResult != null && universalResult.length > 0 && universalGroupList2.length > 0">
+							<text  v-for="(item, index) in universalGroupList2" :key="index">
+									{{item}} <text v-if="index < universalGroupList2.length -1">、</text>
+							</text>
+						</view>
+						<view class="long-value"  v-else>
+							<text>无</text>
+						</view>
+					</view>
 				</view>
 			</view>
 			<view class="content" v-else>
@@ -258,7 +252,6 @@ import api1 from "@/packageCa/apiCa/studentProfile.js"
 		data() {
 			return {
 				refreshIfNeeded: false, //是否返回刷新
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				user: uni.getStorageSync("CAuserInfo").user,
 				customInfo: uni.getStorageSync("customInfo"),
 				intentionJobList: [],//意向职业
@@ -298,6 +291,7 @@ import api1 from "@/packageCa/apiCa/studentProfile.js"
 				multGroupList1: [],//多元能力能力强
 				universalResult: "",//通用能力
 				universalGroupList1: [],//通用能力 优势
+				universalGroupList2: [],//通用能力 优势
 			}
 		},
 		onShow() {
@@ -308,19 +302,16 @@ import api1 from "@/packageCa/apiCa/studentProfile.js"
 		created() {
 		},
 		methods: {
-			goback(){
-				uni.navigateBack(-1);
-			},
 			// 获取个人档案
 			async queryStudentProfile() {
 				uni.showLoading({
 					title: "加载中"
 				})
 				const gradeLevel = this.user.GradeLevel;
-				const res = gradeLevel == 3? await api1.getGXWechatStudentProfile() : await api.queryStudentProfile();
+				const res = await api1.getGXWechatStudentProfile();
 				uni.hideLoading();
 				if(res.Result == 1){
-					let data = gradeLevel == 3? res.Data.list : res.Data;
+					let data =  res.Data;
 					// 意向职业
 					this.intentionJobList = data.IntentionJobList;
 					// 意向专业
@@ -373,6 +364,7 @@ import api1 from "@/packageCa/apiCa/studentProfile.js"
 						this.multResult = data.MultResult;
 						// 通用能力
 						this.universalGroupList1 = data.UniversalGroupList1;
+						this.universalGroupList2 = data.UniversalGroupList2;
 						this.universalResult = data.UniversalResult;
 					}
 				}

packageCa/userCenter/professionPath.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-		    <text>职业路径</text>
-		</view>
 		<view class="content">
 			<view class="section">
 				<view class="title-h1">
@@ -22,9 +18,6 @@
 						<view class="th">
 							我的意向
 						</view>
-						<view class="th">
-							专业匹配
-						</view>
 					</view>
 					<view class="tr" v-for="(item,index) in jobList" @click="checkedJob(item)" :key="index">
 						<view class="td">
@@ -39,9 +32,9 @@
 						<view class="td">
 							<view class="is-has" v-if="item.IsIntention"></view>
 						</view>
-						<view class="td">
+					<!-- 	<view class="td">
 							<view class="is-has" v-if="item.IsSpecialtyMatch"></view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view class="empty" v-else>
@@ -51,7 +44,7 @@
 						去测评
 					</view>
 				</view>
-				<view class="title-h1">
+				<view class="title-h1" v-if="jobList.length > 0">
 					职业介绍
 				</view>
 				<view class="desc">
@@ -60,7 +53,7 @@
 					</view>
 					{{jobIntroduce}}
 				</view>
-				<view class="title-h1">
+				<view class="title-h1" v-if="jobList.length > 0">
 					发展路径
 				</view>
 				<view class="desc">
@@ -68,9 +61,9 @@
 						{{jobPath}}
 					</view>
 				</view>
-				<view class="path-map">
+				<view class="path-map" v-if="jobList.length > 0">
 					<view class="origin-item">
-						大学生
+						我
 					</view>
 					<view class="path-list" :class="isLoadingEnd?'show':'ing'">
 						<view class="line-1">
@@ -137,7 +130,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				jobList: [],//
 				checkedCode: null,
 				jobIntroduce: "",
@@ -183,6 +175,9 @@
 			// 获取职业
 			async queryPathInfo(){
 				this.isLoadingEnd = false;
+				if(this.jobList.length == 0){
+					return;
+				}
 				const res = await api.queryPathInfo(this.checkedCode);
 				if (res.Result == 1) {
 					let data = res.Data;
@@ -207,7 +202,7 @@
 			// 去测评
 			navTest(){
 				uni.navigateTo({
-					url: `/pagesTest/interestTestCollect/interestTestTitle`
+					url: `/packageCa/pagesTest/interestTestTitle`
 				})
 			},
 			//选中职业
@@ -221,9 +216,6 @@
 					icon:"none"
 				});
 			},
-			goBack(){
-				uni.navigateBack(-1);
-			},
 		}
 	}
 </script>
@@ -312,7 +304,7 @@
 					.tr {
 						display: -webkit-box;
 						.th {
-							width: 145rpx;
+							width: 170rpx;
 							height: 72rpx;
 							line-height: 72rpx;
 							text-align: center;
@@ -331,7 +323,7 @@
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							width: 145rpx;
+							width: 170rpx;
 							min-height: 72rpx;
 							font-size: 24rpx;
 							color: #333333;

packageCa/userCenter/smartTarget.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-			<text>smart目标制定</text>
-		</view>
 		<view class="content">
 			<view class="banner-wrap"></view>
 			<view class="desc">
@@ -87,7 +83,7 @@
 				<view class="form-wrap" >
 					<view class="form-item">
 						<view class="label">
-							目标描述
+							<text>*</text>目标描述
 						</view>
 						<view class="input-wrap">
 							<textarea v-model="targetForm.TargetDesc"
@@ -96,7 +92,7 @@
 					</view>
 					<view class="form-item">
 						<view class="label">
-							目标类型
+							<text>*</text>目标类型
 						</view>
 						<view class="check-wrap">
 							<view class="checked-item" @click="targetForm.TargetType = 1">
@@ -182,10 +178,10 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				tabs:['目标一 ', '目标二 ', '目标三 ', '目标四 ', '目标五 '],
 				targetList: [],////目标列表
 				checkedTargetCode: "",//// 目标码
+				videoUrlVisitor: "",
 				newTargetParams: {
 					Id: 0,
 					TargetDesc: "",
@@ -215,9 +211,6 @@
 					url:"/packageCa/userCenter/learningPlan"
 				})	
 			},
-			goBack(){
-				uni.navigateBack(-1);
-			},
 			// 添加目标
 			addTarget(){
 				this.targetForm = {
@@ -234,6 +227,20 @@
 			},
 			// 保存目标
 			async saveTarget(){
+				if(this.targetForm.TargetDesc == ""){
+					uni.showToast({
+						title: "请输入目标描述",
+						icon: "none"
+					})
+					return;
+				}
+				if(this.targetForm.TargetType == ""){
+					uni.showToast({
+						title: "请选择目标类型",
+						icon: "none"
+					})
+					return;
+				}
 				const res = await api.saveSmartTarget(this.targetForm);
 				if (res.Result == 1) {
 					uni.showToast({
@@ -383,10 +390,18 @@
 			background-size: 38rpx 38rpx;
 		}
 	}
+	.video-content {
+		padding: 0;
+		width: 710rpx;
+		background: #000;
+		.video {
+			width: 100%;
+			// height: 400rpx;
+		}
+	}
 
 	.index-wrap {
 		.content {
-			padding-top: 60rpx;
 			padding-bottom: 60rpx;
 
 			.banner-wrap {
@@ -563,6 +578,9 @@
 							font-size: 28rpx;
 							color: #333333;
 							margin-bottom: 30rpx;
+							text {
+								color: #ff0000;
+							}
 						}
 						.check-wrap {
 							display: flex;

packageCa/utilCa/config.js

@@ -1,40 +1,10 @@
-let baseUrl = ""
-let baseUrl1 = ""
-let baseUrl2 = ""
-let baseUrl3 = ""
-let baseUrl4 = ""
-let baseUrl5 = ""
-let baseUrl6 = ""
-let baseUrl7 = ""
-let baseUrl8 = ""
-let filestore_site = "";
-// #ifdef MP-WEIXIN
-// 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译
-if (wx.getAccountInfoSync().miniProgram.envVersion === 'develop') {
-    baseUrl = 'http://dev.51xuanxiao.com:8005/api' // 开发环境
-	baseUrl3 = 'http://dev.51xuanxiao.com:8007/api' // 职业环境
-	baseUrl4 = 'http://dev.51xuanxiao.com:8009/api' // 用户环境
-	baseUrl5 = 'http://dev.51xuanxiao.com:8006/api' // 测评环境
-	filestore_site = 'http://192.168.1.168:31128' //文件地址
-} else {
-    baseUrl = 'https://yanxueapi.51xuanxiao.com/api' // 生产环境
-    baseUrl3 = "https://jobapi.51xuanxiao.com/api"// 职业环境
-    baseUrl4 = "https://authapi.51xuanxiao.com/api"// 用户环境
-    baseUrl5 = "https://testapi.51xuanxiao.com/api"// 测评环境
-	filestore_site = 'https://filestore.plan.51xuanxiao.com' //文件地址
-}
-// #endif
+// let baseUrl = ""
+// // #ifdef MP-WEIXIN
+// // 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译
 
-export {
-    baseUrl,
-    baseUrl1,
-    baseUrl2,
-    baseUrl3,
-    baseUrl4,
-    baseUrl5,
-    baseUrl6,
-    baseUrl7,
-    baseUrl8,
-	filestore_site
-}
+// baseUrl = 'https://www.xjksly.cn/career' // 生产环境
+// // #endif
 
+// export {
+//     baseUrl
+// }

packageCa/utilCa/imageUrl.js

@@ -1,20 +0,0 @@
-// 公共图片基地址
-const BASE_IMAGE_URL = 'https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh';
-
-/**
- * 图片地址拼接方法
- * @param {string} path - 图片路径（相对于基地址的路径）
- * @param {string} [process] - OSS图片处理参数，例如：'image/resize,m_fixed,w_348/quality,q_80'
- * @returns {string} 完整的图片URL
- */
-export function ossImageUrl(path, process) {
-  
-  // 如果有处理参数，拼接处理参数
-  if (process) {
-    return `${BASE_IMAGE_URL}/${path}?x-oss-process=${process}`;
-  }
-  
-  // 没有处理参数时，直接返回原始路径
-  return `${BASE_IMAGE_URL}/${path}`;
-}
-

packageCa/utilCa/request.js

@@ -1,15 +1,5 @@
-import {
-    baseUrl,
-    baseUrl1,
-    baseUrl2,
-    baseUrl3,
-    baseUrl4,
-    baseUrl5,
-    baseUrl6,
-    baseUrl7,
-    baseUrl8
-} from './config.js'
-
+// const baseUrl = "https://localhost:7026/career";
+const baseUrl = "https://www.xjksly.cn/career";
 const request = {}
 const headers = {}
 
@@ -18,77 +8,23 @@ request.globalRequest = (url, method, data, power, type) => {
     // 1 == 不通过access_token校验的接口
     // 2 == 文件下载接口列表
     const userInfo = uni.getStorageSync('CAuserInfo')
-    // console.log('缓存userinfo:',userInfo);
-    switch (power) {
-        case 1:
-        case 3:
-            headers['Token'] = userInfo.token
-			// if(power == 3){
-			// 	const deviceInfo = wx.getDeviceInfo()
-			// 	let data = {
-			// 		model: deviceInfo.model,
-			// 		system: deviceInfo.system,
-			// 		platform: deviceInfo.platform
-			// 	}
-			// 	headers['DeviceInfo'] = JSON.stringify(data)
-			// }
-            break;
-        case 2:
-            headers['Authorization'] = userInfo.userToken
-            break;
-        default:
-            break;
-    }
-    let host = "";
-    let key = "";
-    if (type == 1) {
-        host = baseUrl1;
-    } else if (type == 2) {
-        host = baseUrl2;
-    } else if (type == 3) {
-        host = baseUrl3;
-    } else if (type == 4) {
-        host = baseUrl4;
-    } else if (type == 5) {
-        host = baseUrl5;
-    } else if (type == 7) {
-        host = baseUrl7;
-        key = `?PartnerKey=51xuanxiao&PartnerSecret=mC6XRjDWUzGAdxcCqRBWGb88uR`;
-    } else if (type == 8) {
-        host = baseUrl8;
-        //key = `?AppKey=51xuanxiao&AppSecret=mC6XRjDWUzGAdxcCqRBWGb88uR`;
-    } else {
-        host = baseUrl;
-    }
+	console.log("ca用户",userInfo);
+	if(userInfo != ""){
+		headers['Token'] = userInfo.token
+	}
     return uni.request({
         timeout: 60000,
-        url: host + url + key,
+        url: baseUrl + url,
         method,
         data: data,
         dataType: 'json',
         header: headers
     }).then(res => {
-		//console.log("ressss===="+JSON.stringify(res.data));	
-		// console.log("type===="+type);	
-        if (type == 7) {
-            if (res[1].data.code == 0) {
-                return res[1].data
-            } else {
-                throw res[1].data
-            }
-        } else if (type == 8) {
-            if (res[1].data.Code == 0) {
-                return res[1].data
-            } else {
-                throw res[1].data
-            }
-        } else {
-            if (res.data.Result) {
-                return res.data
-            } else {
-                throw res.data
-            }
-        }
+		if (res.data.Result) {
+			return res.data
+		} else {
+			throw res.data
+		}
     }).catch(parmas => {
         switch (parmas.status) {
             case 401:

packageRc/apiRc/service/jobRecommend.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2024-09-25 11:14:29
  * @LastEditors: shirlwang
- * @LastEditTime: 2025-11-04 08:56:59
+ * @LastEditTime: 2025-12-23 17:40:23
  */
 import request from '@/utilsRc/request'
 
@@ -17,7 +17,7 @@ export function listJobRecommend(query) {
 export function getWorkListReq(query) {
   return request({
     // url: '/personnel/personBaseInfo/postRecommend',
-    url: '/company/unitPostInfo/postElectedList',
+    url: '/manage/info/postElectedList',
     method: 'get',
     params: query
   })
@@ -43,7 +43,7 @@ export function addJobRecommend(data) {
 //岗位推荐保存和办结
 export function saveJobRecommend(data) {
   return request({
-    url: '/process/processJobRecommend/create',
+    url: '/process/processJobRecommend/createJob',
     method: 'post',
     data: data
   })
@@ -70,7 +70,7 @@ export function delJobRecommend(ids) {
 export function getAddedJobs(params) {
   return request({
     // url: '/company/postDeliverInfo/list',
-    url: '/company/unitPostInfo/no/permission/list',
+    url: '/manage/info/no/permission/list',
     method: 'get',
     params,
   })

packageRc/pages/daiban/daiban.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2025-10-16 15:15:47
  * @LastEditors: shirlwang
- * @LastEditTime: 2025-11-06 16:09:23
+ * @LastEditTime: 2025-12-24 09:53:12
 -->
 <template>
   <view>
@@ -572,6 +572,7 @@ view{box-sizing: border-box;display: block;}
         display: flex;
         justify-content: space-between;
         align-items: center;
+        flex-wrap: wrap;
         .name{
           font-size: 32rpx;
           display: flex;

packageRc/pages/daiban/daibandetail.vue

@@ -412,7 +412,7 @@
       @close="showTime = false"
     ></u-datetime-picker> -->
     <!-- 社区端 - 显示隐藏退出组件 -->
-    <exitPopup />
+    <!-- <exitPopup /> -->
     <DealDone ref="dealDone" @finished="getListPersonDemand();"/>
     <!-- <uni-popup background-color="#fff" type="bottom"
       ref="openDeal"