111

# Conflicts:
#	packageA/pages/UnitDetails/UnitDetails.vue
#	pages.json
#	pages/careerfair/careerfair.vue

.gitignore

@@ -1 +1,26 @@
 /unpackage/
+/node_modules/
+/docs/
+/.qoder/
+/.idea/
+.DS_Store
+/dist/
+/build/
+.vscode/
+*.log
+*.tmp
+*.swp
+.env
+.env.*
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+/coverage/
+/.nyc_output/
+/.turbo/
+/cache/
+/output/
+/hs_err_pid*
+*.local
+yarn.lock

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/ks-app-employment-service.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ks-app-employment-service.iml" filepath="$PROJECT_DIR$/.idea/ks-app-employment-service.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

App.vue

@@ -3,17 +3,20 @@ import { reactive, inject, onMounted } from 'vue';
 import { onLaunch, onShow, onHide } from '@dcloudio/uni-app';
 import useUserStore from './stores/useUserStore';
 import useDictStore from './stores/useDictStore';
+import { tabbarManager } from './utils/tabbarManager';
 const { $api, navTo, appendScriptTagElement } = inject('globalFunction');
 import config from '@/config.js';
 
 onLaunch((options) => {
     useUserStore().initSeesionId(); //更新
     useDictStore().getDictData();
-    // uni.hideTabBar();
 
-    // 尝试从缓存恢复用户信息
+    // 先尝试从缓存恢复用户信息
     const restored = useUserStore().restoreUserInfo();
     
+    // 用户信息恢复后再初始化自定义tabbar
+    tabbarManager.initTabBar();
+    
     if (restored) {
         // 如果成功恢复用户信息，验证token是否有效
         let token = uni.getStorageSync('token') || '';

apiRc/company/index.js

@@ -0,0 +1,514 @@
+// 获取人员基本信息详情
+
+
+
+// import { post, get } from '../../utils/request.js'
+
+// export function getPersonInfo(id) {
+// 	return get({
+// 		url: `personnel/personBaseInfo/${id}`,
+// 		method: 'get'
+// 	})
+// }
+
+import request from '@/utilsRc/request'
+
+// 根据 userId 获取企业详情
+export function companyDetails(userId) {
+	return request({
+		method: 'get',
+		url: `/company/unitBaseInfo/user/${userId}`,
+	})
+}
+
+// 企业-推荐人员信息
+export function recommendedPerson(params) {
+	return request({
+		url: '/company/unitBaseInfo/recommend/person',
+		method: 'get',
+		params
+	})
+}
+
+// 人员邀请
+export function invitePerson(params) {
+	return request({
+		url: '/company/unitBaseInfo/invite',
+		method: 'get',
+		params
+	})
+}
+
+// 获取企业招聘岗位列表
+export function jobList(params) {
+	return request({
+		url: '/company/unitPostInfo/list',
+		method: 'get',
+		params
+	})
+}
+
+// 查找已投递、已推荐、已邀请的人员信息
+export function listMatch(query) {
+	return request({
+		url: '/company/unitBaseInfo/relevance',
+		method: 'get',
+		params: query
+	})
+}
+
+// 添加企业基本信息
+export function addJobBase(data) {
+	return request({
+		url: '/company/unitBaseInfo',
+		method: 'post',
+		data: data
+	})
+}
+
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+	return request({
+		url: '/system/center/user/deptTree',
+		method: 'get'
+	})
+}
+
+// 企业发布招聘岗位
+export function addJob(data) {
+	return request({
+		url: '/company/unitPostInfo',
+		method: 'post',
+		data: data
+	})
+}
+
+// 获取招聘工种列表
+export function jobTypeList(params) {
+	return request({
+		url: '/basicdata/workType/list',
+		method: 'get',
+		params
+	})
+}
+
+// 企业基本信息列表
+export function jobBaseList(query) {
+	return request({
+		url: '/company/unitBaseInfo/list',
+		method: 'get',
+		params: query
+	})
+}
+
+// 获取企业招聘岗位信息详细信息
+export function getJob(id) {
+	return request({
+		url: `/company/unitPostInfo/${id}`,
+		method: 'get'
+	})
+}
+// 修改企业招聘岗位信息
+export function updateJob(data) {
+	return request({
+		url: '/company/unitPostInfo',
+		method: 'put',
+		data: data
+	})
+}
+
+// 修改企业基本信息
+export function updateJobBase(data) {
+	return request({
+		url: '/company/unitBaseInfo',
+		method: 'put',
+		data: data
+	})
+}
+// 查询角色详细
+export function getJobService(id) {
+	return request({
+		url: '/personnel/personBaseInfo/' + id,
+		method: 'get'
+	})
+}
+
+// 查询推荐人员、已推荐、已邀请 详情
+export function getUnitBaseInfo(id) {
+	return request({
+		url: '/manage/personDemand/' + id,
+		method: 'get'
+	})
+}
+
+
+// 查询工种列表
+export function listJobType(query) {
+	return request({
+		url: '/basicdata/workType/list',
+		method: 'get',
+		params: query
+	})
+}
+
+// 人员基本信息 - 列表
+export function personInfoList(query) {
+	return request({
+		url: '/personnel/personBaseInfo/list',
+		method: 'get',
+		params: query
+	})
+}
+
+// 获取人员基本信息详情
+export function getPersonInfo(id) {
+	return request({
+		url: `/personnel/personBaseInfo/${id}`,
+		method: 'get'
+	})
+}
+
+
+// 删除人员基本信息
+export function delPersonInfo(ids) {
+	return request({
+		url: '/personnel/personBaseInfo/' + ids,
+		method: 'delete'
+	})
+}
+
+// 删除录入人员 公用 type = 1 失业中 2 就业困难 3 离校生 4 其他人员
+export function delPersonUser(ids) {
+	return request({
+		url: `/personnel/personInputInfo/${ids}`,
+		method: 'delete',
+	})
+}
+
+// 新增人员基本信息
+export function addPersonInfo(data) {
+	return request({
+		url: '/personnel/personBaseInfo',
+		method: 'post',
+		data: data
+	})
+}
+
+// 修改人员基本信息
+export function updatePersonInfo(data) {
+	return request({
+		url: '/personnel/personBaseInfo',
+		method: 'put',
+		data
+	})
+}
+
+//社区人员审核
+export function personInfoAudit(data) {
+	return request({
+		url: '/personnel/personBaseInfo/audit',
+		method: 'post',
+		data: data
+	})
+}
+
+
+//记录查看身份证
+export function recordLookIdCard(params) {
+	return request({
+		url: '/personnel/personBaseInfo/recordLookIdCard',
+		method: 'get',
+		params
+	})
+}
+
+
+
+
+/* 失业人员 --------------------------------------------- start */
+
+// 新增失业人员
+export function addPersonUnemployed(data) {
+	return request({
+		url: '/person/unemployment',
+		method: 'post',
+		data
+	})
+}
+
+// 失业人员修改
+export function updatePersonUnemployed(data) {
+	return request({
+		url: '/person/unemployment',
+		method: 'put',
+		data,
+	})
+}
+
+// 失业人员列表
+export function unemployment(params) {
+	return request({
+		url: '/person/unemployment/list',
+		method: 'get',
+		params
+	})
+}
+
+// 失业人员详情
+export function unemploymentDetails(id) {
+	return request({
+		url: `/person/unemployment/${id}`,
+		method: 'get',
+	})
+}
+
+// 失业人员删除
+export function unemploymentDelete(id) {
+	return request({
+		url: `/person/unemployment/${id}`,
+		method: 'delete',
+	})
+}
+
+/* 失业人员 --------------------------------------------- end */
+
+
+/* 就业困难人员 --------------------------------------------- start */
+
+// 新增就业困难
+export function addPersonDifficult(data) {
+	return request({
+		url: '/person/findingEmployment',
+		method: 'post',
+		data
+	})
+}
+
+// 修改就业困难
+export function updatePersonDifficult(data) {
+	return request({
+		url: '/person/findingEmployment',
+		method: 'put',
+		data
+	})
+}
+
+// 就业困难列表
+export function findingEmployment(params) {
+	return request({
+		url: '/person/findingEmployment/list',
+		method: 'get',
+		params
+	})
+}
+
+// 就业困难详情
+export function findingEmploymentDetails(id) {
+	return request({
+		url: `/person/findingEmployment/${id}`,
+		method: 'get',
+	})
+}
+
+// 就业困难删除
+export function findingEmploymentDelete(id) {
+	return request({
+		url: `/person/findingEmployment/${id}`,
+		method: 'delete',
+	})
+}
+/* 就业困难人员 --------------------------------------------- end */
+
+
+/* 离校未就业高校生 --------------------------------------------- start */
+
+// 新增离校未就业高校生
+export function addLeaveSchool(data) {
+	return request({
+		url: '/person/leavingSchoolInfo',
+		method: 'post',
+		data
+	})
+}
+
+// 修改离校未就业高校生
+export function updateLeaveSchool(data) {
+	return request({
+		url: '/person/leavingSchoolInfo',
+		method: 'put',
+		data,
+	})
+}
+
+// 高校未就业列表
+export function leavingSchoolInfo(params) {
+	return request({
+		url: '/person/leavingSchoolInfo/list',
+		method: 'get',
+		params
+	})
+}
+
+// 高校未就业详情
+export function leavingSchoolInfoDetails(id) {
+	return request({
+		url: `/person/leavingSchoolInfo/${id}`,
+		method: 'get',
+	})
+}
+
+
+// 高校未就业删除
+export function leavingSchoolInfoDelete(id) {
+	return request({
+		url: `/person/leavingSchoolInfo/${id}`,
+		method: 'delete',
+	})
+}
+
+
+/* 离校未就业高校生 --------------------------------------------- end */
+
+/* 其他人员 --------------------------------------------- start */
+
+// 新增其他人员
+export function addOther(data) {
+	return request({
+		url: '/person/other',
+		method: 'post',
+		data
+	})
+}
+
+// 其他人员修改
+export function updateOther(data) {
+	return request({
+		url: '/person/other',
+		method: 'post',
+		data,
+	})
+}
+
+
+// 其他人员列表
+export function other(params) {
+	return request({
+		url: '/person/other/list',
+		method: 'get',
+		params
+	})
+}
+
+// 其他人员详情
+export function otherDetails(id) {
+	return request({
+		url: `/person/other/${id}`,
+		method: 'get',
+	})
+}
+
+// 其他人员删除
+export function otherDelete(id) {
+	return request({
+		url: `/person/other/${id}`,
+		method: 'delete',
+	})
+}
+/* 其他人员 --------------------------------------------- end */
+
+// 需求预警列表
+export function personAlertList(params) {
+	return request({
+		url: '/manage/personDemand/warningList',
+		method: 'get',
+		params
+	})
+}
+export function personDealList(params) {
+	return request({
+		url: '/manage/personDemand/dealingList',
+		method: 'get',
+		params
+	})
+}
+// 服务追踪  服务类型/服务id
+export function serviceTraceability({
+	demandType,
+	id
+}) {
+	return request({
+		// url: `/system/personRequirementsRecords/serviceTraceability/${demandType}/${id}`,
+		url: `/timelime/timelime/fwzs/${id}`,
+		method: 'get',
+	})
+}
+
+// 需求办结
+export function requirementCompletion(url, data) {
+	return request({
+		url,
+		method: 'post',
+		data
+	})
+}
+
+//岗位审核
+export function jobAudit(data) {
+	return request({
+		url: '/company/unitPostInfo/audit',
+		method: 'post',
+		data: data
+	})
+}
+
+//社群  首页未完成数
+// export function getPeopleCount() {
+// 	return request({
+// 		url: '/pc/index/getPeopleCount',
+// 		method: 'get',
+// 	})
+// }
+
+//社群   首页未完成数
+export function getDemandUnfinished() {
+	return request({
+		url: '/pc/index/todo',
+		method: 'get',
+	})
+}
+
+
+
+// 删除企业招聘岗位信息
+export function delJob(ids) {
+	return request({
+		url: '/company/unitPostInfo/' + ids,
+		method: 'delete'
+	})
+}
+
+//  所在社区列表
+export function deptList(params) {
+	return request({
+		'url': `/system/center/user/deptList`,
+		'method': 'get',
+		params
+	})
+}
+
+//  所在社区列表
+export function returnPerson(params) {
+	return request({
+		'url': `/personnel/personBaseInfo/returnPerson`,
+		'method': 'get',
+		params
+	})
+}
+//  根据人的身份证查询人的详细信息
+export function getIdNumberInfo(params) {
+	return request({
+		'url': `/personnel/personBaseInfo/getIdNumberInfo`,
+		'method': 'get',
+		params
+	})
+}

apiRc/jobPath.js

@@ -0,0 +1,46 @@
+/*
+ * @Date: 2025-11-12
+ * @Description: 职业路径相关接口
+ */
+import request from '@/utilsRc/request'
+
+// 根据职业名称获取路径列表
+export function getJobPathPage(params) {
+  return request({
+    url: '/jobPath/getJobPathPage',
+    method: 'get',
+    params,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 根据职业路径ID获取详情
+export function getJobPathDetail(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 (!requestParams.id) {
+    return Promise.reject('缺少必需的 id 参数');
+  }
+  
+  return request({
+    url: '/jobPath/getJobPathById',
+    method: 'get',
+    params: requestParams,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取职业路径数量
+export function getJobPathNum() {
+  return request({
+    url: '/jobPath/getJobPathNum',
+    method: 'get',
+    baseUrlType: 'zytp'
+  })
+}
+

apiRc/jobRecommend.js

@@ -0,0 +1,33 @@
+/*
+ * @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

@@ -0,0 +1,45 @@
+/*
+ * @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/jobType/index.js

@@ -0,0 +1,15 @@
+/*
+ * @Date: 2025-10-31 11:06:15
+ * @LastEditors: lip
+ * @LastEditTime: 2025-11-03 12:48:22
+ */
+// import { post, get } from '@/utilsRc/request'
+
+import request from '@/utilsRc/request'
+export function listJobType(query) {
+  return request({
+    url: '/basicdata/workType/list',
+    method: 'get',
+    params: query
+  })
+}

apiRc/login.js

@@ -0,0 +1,77 @@
+/*
+ * @Date: 2025-10-31 11:06:15
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 15:51:28
+ */
+import request from '@/utilsRc/request'
+
+// 登录方法
+export function login(data) {
+  return request({
+    method: 'get',
+    url: '/not/login/person/zkrLogin',
+    params: data,
+  })
+}
+export function smsLogin(data) {
+  return request({
+    method: 'post',
+    url: '/personnel/personBaseInfo/loginGrAndQy',
+    data,
+    headers: {
+      isToken: false
+    }
+  })
+}
+export function wechatLogin(data) {
+  return request({
+    method: 'post',
+    url: '/personnel/personBaseInfo/loginGrAndQy',
+    data,
+    headers: {
+      isToken: false
+    }
+  })
+}
+export function register(data) {
+  return request({
+    method: 'post',
+    url: '/personnel/personBaseInfo/loginGrAndQy',
+    data,
+    headers: {
+      isToken: false
+    }
+  })
+}
+
+// 身份证号码登录
+export function idCardLogin(data) {
+  return request({
+    method: 'post',
+    url: '/app/idCardLogin',
+    data,
+    headers: {
+      isToken: false
+    }
+  })
+}
+
+// 手机号登录
+export function phoneLogin(data) {
+  return request({
+    method: 'post',
+    url: '/app/phoneLogin',
+    data,
+    headers: {
+      isToken: false
+    }
+  })
+}
+
+// 获取用户详细信息
+export function getInfo() {
+  return request({
+    url: '/getInfo',
+    method: 'get'
+  })
+}

apiRc/needs/assistService.js

@@ -0,0 +1,58 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 08:56:51
+ */
+import request from '@/utilsRc/request'
+
+// 查询援助需求列表
+export function listAssistService(query) {
+  return request({
+    url: '/demand/personAssistDemandInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询援助需求详细
+export function getAssistService(ids) {
+  return request({
+    url: '/demand/personAssistDemandInfo/' + ids,
+    method: 'get'
+  })
+}
+
+// 新增援助需求
+export function addAssistService(data) {
+  return request({
+    url: '/demand/personAssistDemandInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改援助需求
+export function updateAssistService(data) {
+  return request({
+    url: '/demand/personAssistDemandInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除援助需求
+export function delAssistService(ids) {
+  return request({
+    url: '/manage/personDemand/' + ids,
+    method: 'delete'
+  })
+}
+
+// 个人援助需求办结
+export function finishAssistService(data) {
+  return request({
+    url: '/demand/personAssistDemandInfo/assistDone',
+    method: 'post',
+    data: data
+  })
+}

apiRc/needs/entrepreneurshipService.js

@@ -0,0 +1,58 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 08:56:35
+ */
+import request from '@/utilsRc/request'
+
+// 查询创业需求列表
+export function listEntrepreneurshipService(query) {
+  return request({
+    url: '/demand/personEntrepreneurshipDemandInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询创业需求详细
+export function getEntrepreneurshipService(ids) {
+  return request({
+    url: '/demand/personEntrepreneurshipDemandInfo/' + ids,
+    method: 'get'
+  })
+}
+
+// 新增创业需求
+export function addEntrepreneurshipService(data) {
+  return request({
+    url: '/demand/personEntrepreneurshipDemandInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改创业需求
+export function updateEntrepreneurshipService(data) {
+  return request({
+    url: '/demand/personEntrepreneurshipDemandInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除创业需求
+export function delEntrepreneurshipService(ids) {
+  return request({
+    url: '/manage/personDemand/' + ids,
+    method: 'delete'
+  })
+}
+
+// 个人援助需求办结
+export function finishEntrepreneurshipService(data) {
+  return request({
+    url: '/demand/personEntrepreneurshipDemandInfo/entrepreneurshipDone',
+    method: 'post',
+    data: data
+  })
+}

apiRc/needs/jobService.js

@@ -0,0 +1,57 @@
+/*
+ * @Date: 2025-04-07 14:23:47
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 08:56:39
+ */
+import request from '@/utilsRc/request'
+
+// 查询求职需求列表
+export function listJobService(query) {
+  return request({
+    url: '/manage/personDemand/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询求职需求详细
+export function getJobService(ids) {
+  return request({
+    url: '/manage/personDemand/' + ids,
+    method: 'get'
+  })
+}
+
+// 新增求职需求
+export function addJobService(data) {
+  return request({
+    url: '/manage/personDemand',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改求职需求
+export function updateJobService(data) {
+  return request({
+    url: '/manage/personDemand',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除求职需求
+export function delJobService(ids) {
+  return request({
+    url: '/manage/personDemand/' + ids,
+    method: 'delete'
+  })
+}
+
+//查询服务次数
+export function serviceTraceability(userId) {
+	return request({
+		url: '/timelime/timelime/getFwcs/' + userId,
+		method: 'get'
+	})
+}

apiRc/needs/otherService.js

@@ -0,0 +1,58 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 08:56:42
+ */
+import request from '@/utilsRc/request'
+
+// 查询其他需求列表
+export function listOtherService(query) {
+  return request({
+    url: '/demand/personOtherDemandInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询其他需求详细
+export function getOtherService(ids) {
+  return request({
+    url: '/demand/personOtherDemandInfo/' + ids,
+    method: 'get'
+  })
+}
+
+// 新增其他需求
+export function addOtherService(data) {
+  return request({
+    url: '/demand/personOtherDemandInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改其他需求
+export function updateOtherService(data) {
+  return request({
+    url: '/demand/personOtherDemandInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除其他需求
+export function delOtherService(ids) {
+  return request({
+    url: '/manage/personDemand/' + ids,
+    method: 'delete'
+  })
+}
+
+// 个人援助需求办结
+export function finishOtherService(data) {
+  return request({
+    url: '/demand/personOtherDemandInfo/otherDemandDone',
+    method: 'post',
+    data: data
+  })
+}

apiRc/needs/person.js

@@ -0,0 +1,34 @@
+/*
+ * @Date: 2025-10-31 11:06:15
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-05 15:33:21
+ */
+// 人员接口
+// import { post, get } from '@/utilsRc/request'
+import request from '@/utilsRc/request'
+export function getPersonBase(params) {
+  return request({
+    url: '/personnel/personBaseInfo/list',
+    method: 'get',
+
+    params
+  })
+}
+export function getPersonList(params) {
+  return request({
+    url: '/personnel/personBaseInfo/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 新增角色
+export function addInvestigate(data) {
+  return request({
+    // url: '//process/processInterview',
+    url: '/timelime/timelime',
+    method: 'post',
+    data: data
+  })
+}

apiRc/needs/personDemand.js

@@ -0,0 +1,52 @@
+/*
+ * @Date: 2025-11-03 08:48:44
+ * @LastEditors: lip
+ * @LastEditTime: 2025-11-03 12:48:41
+ */
+// 查询个人需求信息列表
+// import { post, get } from '@/utilsRc/request'
+import request from '@/utilsRc/request'
+export function listPersonDemand(query) {
+  return request({
+    method: 'get',
+    url: '/manage/personDemand/list',
+  
+    params: query
+  })
+}
+export function delPersonDemand(id) {
+  return request({
+    url: '/manage/personDemand/' + id,
+    method: 'delete'
+  })
+}
+
+
+// 查询个人需求信息详细
+export function getPersonDemand(id) {
+  return request({
+    method: 'get',
+    url: '/manage/personDemand/' + id,
+  })
+}
+
+// 新增个人需求信息
+export function addPersonDemand(data) {
+  // 确保传递数据前进行日志输出
+  console.log('addPersonDemand函数接收到的数据:', data);
+  return request({
+    url: '/manage/personDemand',
+    method: 'post', // 修改为大写POST，确保请求参数正确传递
+    data: data
+  })
+}
+
+// 修改个人需求信息
+export function updatePersonDemand(data) {
+  return request({
+    url: '/manage/personDemand',
+    method: 'put',
+    data: data
+  })
+}
+

apiRc/needs/trainService.js

@@ -0,0 +1,49 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 08:56:47
+ */
+import request from '@/utilsRc/request'
+
+// 查询培训需求列表
+export function listTrainService(query) {
+  return request({
+    url: '/demand/personTrainDemandInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询培训需求详细
+export function getTrainService(ids) {
+  return request({
+    url: '/demand/personTrainDemandInfo/' + ids,
+    method: 'get'
+  })
+}
+
+// 新增培训需求
+export function addTrainService(data) {
+  return request({
+    url: '/demand/personTrainDemandInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改培训需求
+export function updateTrainService(data) {
+  return request({
+    url: '/demand/personTrainDemandInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除培训需求
+export function delTrainService(ids) {
+  return request({
+    url: '/manage/personDemand/' + ids,
+    method: 'delete'
+  })
+}

apiRc/person.js

@@ -0,0 +1,84 @@
+/*
+ * @Date: 2025-10-31 13:50:15
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-10-31 14:30:31
+ */
+import request from '@/utilsRc/request'
+
+// 人员信息保存
+export function savePersonBase(data) {
+  return request({
+    'url': '/personnel/personBaseInfo',
+    'method': 'put',
+    'data': data
+  })
+}
+
+// 人员信息查询
+export function getPersonBase(userId) {
+  return request({
+    'url': `/personnel/personBaseInfo/user/${userId}`,
+    'method': 'get',
+  })
+}
+// 获取行政区划列表
+export function getQUList() {
+	return request({
+	  url: `/manage/xzqh//xzqhTree`,
+	  method: 'get'
+	})
+  }
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+  return request({
+    url: '/system/center/user/deptTree',
+    method: 'get'
+  })
+}
+
+
+// 社群端 根据所在社区 获取姓名
+export function generateUserName(deptId) {
+  return request({
+    url: `/generateUserName/${deptId}`,
+    method: 'get'
+  })
+}
+
+// 获取部门列表
+export function getDeptList(name,personId) {
+	return request({
+	  url: `/system/center/user/getDeptList?name=${name}&parentId=${personId}`,
+	  method: 'get'
+	})
+  }
+// 求职工种列表
+export function touristWork() {
+	return request({
+		url: `/basicdata/workType/workTypeTree`,
+		method: 'get'
+	})
+}
+// 获取招聘工种列表
+export function jobTypeList(params) {
+	return request({
+		url: '/basicdata/workType/list',
+		method: 'get',
+		params
+	})
+}
+// 未读消息数量
+ 
+export function unreadNum() {
+	return request({
+		url: '/manage/tjgw/notReadNum',
+		method: 'get',
+	})
+}
+// 地图类型列表
+export function jyshdt(cyfhjd) {
+	return request({
+		url: `/jyshdt/jyshdt/queryList?lx=${cyfhjd}`,
+		method: 'get',
+	})
+}

apiRc/personinfo/index.js

@@ -0,0 +1,56 @@
+/*
+ * @Descripttion: 
+ * @Author: lip
+ * @Date: 2025-11-03 12:35:56
+ * @LastEditors: shirlwang
+ */
+// import { post, get } from '../../utils/request.js'
+import request from '@/utilsRc/request'
+
+// 登录方法
+export function personInfoList(data) {
+  return request({
+		method: 'get',
+    url: '/personnel/personBaseInfo/list',
+    params: data,
+  })
+}
+// 需求预警列表
+export function personAlertList(params) {
+	return request({
+		method: 'get',
+		url: '/manage/personDemand/warningList',
+	
+		params
+	})
+}
+//经办人数据获取
+export function getJbrInfo() {
+	return request({
+		method: 'get',
+		url: `/system/center/user/selectHxjbr`,
+		method: 'get'
+	})
+}
+export function getPersonBase() {
+	return request({
+		method: 'get',
+		url: `/system/center/user/selectHxjbr`,
+		method: 'get'
+	})
+}
+export function returnPerson(params) {
+	return request({
+		method: 'get',
+		'url': `/personnel/personBaseInfo/returnPerson`,
+		
+		params
+	})
+}
+export function getStatistic(params) {
+	return request({
+		method: 'get',
+		'url': `/pc/index/fwqkfx`,
+		params
+	})
+}

apiRc/service/investigate.js

@@ -0,0 +1,50 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 08:56:56
+ */
+import request from '@/utilsRc/request'
+
+// 查询角色列表
+export function listInvestigate(query) {
+  return request({
+    url: '/process/processInterview/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色详细
+export function getInvestigate(ids) {
+  return request({
+    url: '/process/processInterview/' + ids,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addInvestigate(data) {
+  return request({
+    // url: '/process/processInterview',
+    url: '/timelime/timelime',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改角色
+export function updateInvestigate(data) {
+  return request({
+    url: '/process/processInterview',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除角色
+export function delInvestigate(ids) {
+  return request({
+    url: '/process/processInterview/' + ids,
+    method: 'delete'
+  })
+}

apiRc/service/jobRecommend.js

@@ -0,0 +1,86 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 08:56:59
+ */
+import request from '@/utilsRc/request'
+
+// 查询角色列表
+export function listJobRecommend(query) {
+  return request({
+    url: '/process/processJobRecommend/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询角色列表
+export function getWorkListReq(query) {
+  return request({
+    // url: '/personnel/personBaseInfo/postRecommend',
+    url: '/company/unitPostInfo/postElectedList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色详细
+export function getJobRecommend(ids) {
+  return request({
+    url: '/process/processJobRecommend/' + ids,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addJobRecommend(data) {
+  return request({
+    url: '/process/processJobRecommend',
+    method: 'post',
+    data: data
+  })
+}
+
+//岗位推荐保存和办结
+export function saveJobRecommend(data) {
+  return request({
+    url: '/process/processJobRecommend/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改角色
+export function updateJobRecommend(data) {
+  return request({
+    url: '/process/processJobRecommend',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除角色
+export function delJobRecommend(ids) {
+  return request({
+    url: '/process/processJobRecommend/' + ids,
+    method: 'delete'
+  })
+}
+
+// 获取绑定的职位
+export function getAddedJobs(params) {
+  return request({
+    // url: '/company/postDeliverInfo/list',
+    url: '/company/unitPostInfo/no/permission/list',
+    method: 'get',
+    params,
+  })
+}
+
+// // 获取推荐岗位
+// export function getAddedJobs(params) {
+//   return request({
+//     url: '/personnel/personBaseInfo/postRecommend',
+//     method: 'get',
+//     params,
+//   })
+// }

apiRc/service/jobTrack.js

@@ -0,0 +1,49 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 08:57:02
+ */
+import request from '@/utilsRc/request'
+
+// 查询角色列表
+export function listJobTrack(query) {
+  return request({
+    url: '/process/processEmploymentTracking/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色详细
+export function getJobTrack(ids) {
+  return request({
+    url: '/process/processEmploymentTracking/' + ids,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addJobTrack(data) {
+  return request({
+    url: '/process/processEmploymentTracking',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改角色
+export function updateJobTrack(data) {
+  return request({
+    url: '/process/processEmploymentTracking',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除角色
+export function delJobTrack(ids) {
+  return request({
+    url: '/process/processEmploymentTracking/' + ids,
+    method: 'delete'
+  })
+}

apiRc/service/policyConsultation.js

@@ -0,0 +1,49 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 08:57:05
+ */
+import request from '@/utilsRc/request'
+
+// 查询角色列表
+export function listPolicyConsultation(query) {
+  return request({
+    url: '/process/processPolicyConsult/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色详细
+export function getPolicyConsultation(ids) {
+  return request({
+    url: '/process/processPolicyConsult/' + ids,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addPolicyConsultation(data) {
+  return request({
+    url: '/process/processPolicyConsult',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改角色
+export function updatePolicyConsultation(data) {
+  return request({
+    url: '/process/processPolicyConsult',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除角色
+export function delPolicyConsultation(ids) {
+  return request({
+    url: '/process/processPolicyConsult/' + ids,
+    method: 'delete'
+  })
+}

apiRc/service/skillTrain.js

@@ -0,0 +1,49 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 08:57:09
+ */
+import request from '@/utilsRc/request'
+
+// 查询角色列表
+export function listSkillTrain(query) {
+  return request({
+    url: '/process/processSkillTraining/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色详细
+export function getSkillTrain(ids) {
+  return request({
+    url: '/process/processSkillTraining/' + ids,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addSkillTrain(data) {
+  return request({
+    url: '/process/processSkillTraining',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改角色
+export function updateSkillTrain(data) {
+  return request({
+    url: '/process/processSkillTraining',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除角色
+export function delSkillTrain(ids) {
+  return request({
+    url: '/process/processSkillTraining/' + ids,
+    method: 'delete'
+  })
+}

apiRc/system/dict.js

@@ -0,0 +1,63 @@
+/*
+ * @Date: 2025-10-31 15:06:34
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 12:20:28
+ */
+import request from '@/utilsRc/request'
+// 查询字典数据列表
+export function listData (query) {
+  return request({
+    url: '/system/dict/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典数据详细
+export function getData (dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts (dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+// 根据字典类型查询字典数据信息
+export function getDict (dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+// 新增字典数据
+export function addData (data) {
+  return request({
+    url: '/system/dict/data/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典数据
+export function updateData (data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除字典数据
+export function delData (dictCode) {
+  return request({
+    url: '/system/dict/data/remove' + dictCode,
+    method: 'get'
+  })
+}

apiRc/timeLine/index.js

@@ -0,0 +1,26 @@
+import request from '@/utilsRc/request'
+
+// 查询时间轴列表
+export function timelineList(params) {
+  return request({
+    url: '/timelime/timelime/timeline',
+    method: 'get',
+	params
+  })
+}
+
+// 查询时间轴详情列表
+export function timeList(params) {
+  return request({
+    url: '/timelime/timelime/list',
+    method: 'get',
+	params
+  })
+}
+//获取时间轴详细信息
+export function timeDetails(id) {
+	return request({
+		url: '/timelime/timelime/' + id,
+		method: 'get'
+	})
+}

apiRc/user/user.js

@@ -0,0 +1,15 @@
+/*
+ * @Date: 2025-01-XX
+ * @LastEditors: 
+ * @LastEditTime: 
+ */
+import request from '@/utilsRc/request'
+
+// 获取用户信息（职业规划推荐用）
+export function appUserInfo() {
+  return request({
+    url: '/app/user/appUserInfo',
+    method: 'get',
+    baseUrlType: 'user' // 使用用户接口专用baseUrl
+  })
+}

common/globalFunction.js

@@ -2,7 +2,8 @@ import useUserStore from "../stores/useUserStore";
 import {
     request,
     createRequest,
-    uploadFile
+    uploadFile,
+	myRequest
 } from "../utils/request";
 import streamRequest, {
     chatRequest
@@ -49,7 +50,7 @@ const prePage = () => {
     return prePage.$vm;
 }
 
-
+export const urls ='http://10.110.145.145/images/train/'
 
 /**
  * 页面跳转封装，支持 query 参数传递和返回回调
@@ -885,13 +886,15 @@ export const $api = {
     uploadFile,
     formatFileSize,
     sendingMiniProgramMessage,
-    copyText
+    copyText,
+	myRequest
 }
 
 
 
 export default {
     $api,
+	urls,
     navTo,
     navBack,
     cloneDeep,
@@ -916,4 +919,4 @@ export default {
     insertSortData,
     isInWechatMiniProgramWebview,
     isEmptyObject,
-}
+}

components/AppLayout/AppLayout.vue

@@ -6,6 +6,7 @@
         >
             <!-- 顶部头部区域 -->
             <view
+                v-if="title"
                 class="container-header"
                 :style="border ? { borderBottom: `2rpx solid ${borderColor}` } : { borderBottom: 'none' }"
             >
@@ -49,7 +50,7 @@ const emit = defineEmits(['onScrollBottom']);
 defineProps({
     title: {
         type: String,
-        default: '标题',
+        default: '',
     },
     border: {
         type: Boolean,
@@ -89,6 +90,10 @@ const handleScrollToLower = () => {
     width: 100vw;
     height: calc(100% - var(--window-bottom));
     overflow: hidden;
+    /* H5环境安全区域适配 */
+    /* #ifdef H5 */
+    height: 100vh;
+    /* #endif */
 }
 .app-container {
     // background-image: url('@/static/icon/background2.png');
@@ -139,7 +144,13 @@ const handleScrollToLower = () => {
 .container-main {
     flex: 1;
     overflow: hidden;
+    padding-bottom: 20rpx;
 }
+/* #ifdef H5 */
+.container-main {
+    padding-bottom: 120rpx!important;
+}
+/* #endif */
 
 .main-scroll {
     width: 100%;

components/CustomTabBar/CustomTabBar.vue

@@ -0,0 +1,345 @@
+<template>
+    <view class="custom-tabbar">
+        <view 
+            class="tabbar-item" 
+            v-for="(item, index) in tabbarList" 
+            :key="index"
+            @click.stop="switchTab(item, index)"
+            @tap.stop="switchTab(item, index)"
+        >
+            <view class="tabbar-icon">
+                <image 
+                    :src="currentItem === item.id ? item.selectedIconPath : item.iconPath"
+                    mode="aspectFit"
+                />
+            </view>
+            <view class="badge" v-if="item.badge && item.badge > 0">{{ item.badge }}</view>
+            <view class="tabbar-text" :class="{ 'active': currentItem === item.id }">
+                {{ item.text }}
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, computed, watch, onMounted } from 'vue';
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import { useReadMsg } from '@/stores/useReadMsg';
+import { checkLoginAndNavigate } from '@/utils/loginHelper';
+
+const props = defineProps({
+    currentPage: {
+        type: Number,
+        default: 0
+    }
+});
+
+const userStore = useUserStore();
+const { userInfo } = storeToRefs(userStore);
+const readMsg = useReadMsg();
+const currentItem = ref(props.currentPage);
+
+// 监听props变化
+watch(() => props.currentPage, (newPage) => {
+    currentItem.value = newPage;
+});
+
+// 生成tabbar配置的函数
+const generateTabbarList = () => {
+    const baseItems = [
+        {
+            id: 0,
+            text: '职位',
+            path: '/pages/index/index',
+            iconPath: '/static/tabbar/calendar.png',
+            selectedIconPath: '/static/tabbar/calendared.png',
+            centerItem: false,
+            badge: readMsg.badges[0]?.count || 0,
+        },
+        {
+            id: 2,
+            text: 'AI+',
+            path: '/pages/chat/chat',
+            iconPath: '/static/tabbar/logo3.png',
+            selectedIconPath: '/static/tabbar/logo3.png',
+            centerItem: true,
+            badge: readMsg.badges[2]?.count || 0,
+        },
+        {
+            id: 3,
+            text: '消息',
+            path: '/pages/msglog/msglog',
+            iconPath: '/static/tabbar/chat4.png',
+            selectedIconPath: '/static/tabbar/chat4ed.png',
+            centerItem: false,
+            badge: readMsg.badges[3]?.count || 0,
+        },
+        {
+            id: 4,
+            text: '我的',
+            path: '/pages/mine/mine',
+            iconPath: '/static/tabbar/mine.png',
+            selectedIconPath: '/static/tabbar/mined.png',
+            centerItem: false,
+            badge: readMsg.badges[4]?.count || 0,
+        },
+    ];
+
+    // 获取用户类型，统一使用isCompanyUser字段（0=企业用户，1=求职者, 3=网格员） 
+    // 优先从store获取，如果为空则直接从缓存获取
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    
+    // 获取isCompanyUser字段
+    const storeIsCompanyUser = userInfo.value?.isCompanyUser;
+    const cachedIsCompanyUser = cachedUserInfo.isCompanyUser;
+    
+    // 获取用户类型的逻辑：
+    // 1. 优先使用store中的isCompanyUser
+    // 2. 如果store中没有，使用缓存中的isCompanyUser
+    // 3. 最后默认为1（求职者）
+    const userType = Number(storeIsCompanyUser !== undefined ? storeIsCompanyUser : (cachedIsCompanyUser !== undefined ? cachedIsCompanyUser : 1));
+    if (userType === 0 || userType === 2) {
+        // 企业用户：显示发布岗位
+        baseItems.splice(1, 0, {
+            id: 1,
+            text: '发布岗位',
+            path: '/pages/job/publishJob',
+            iconPath: '/static/tabbar/post.png',
+            selectedIconPath: '/static/tabbar/posted.png',
+            centerItem: false,
+            badge: 0,
+        });
+    } else {
+        // 求职者用户（包括未登录状态）：显示招聘会
+        // 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,
+        });
+        // #endif
+    }
+
+    return baseItems;
+};
+
+// 根据用户类型生成不同的导航栏配置
+const tabbarList = computed(() => {
+    return generateTabbarList();
+});
+
+// 强制刷新tabbar的方法
+const forceRefresh = () => {
+    // 触发响应式更新
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const currentUserType = userInfo.value?.isCompanyUser !== undefined ? userInfo.value.isCompanyUser : (cachedUserInfo.isCompanyUser !== undefined ? cachedUserInfo.isCompanyUser : 1);
+};
+
+// 监听用户类型变化（只监听isCompanyUser字段）
+watch(() => userInfo.value?.isCompanyUser, (newIsCompanyUser, oldIsCompanyUser) => {
+    if (newIsCompanyUser !== oldIsCompanyUser) {
+        // 强制触发computed重新计算
+        forceRefresh();
+    }
+}, { immediate: true });
+
+// 监听用户信息变化（包括登录状态）
+watch(() => userInfo.value, (newUserInfo, oldUserInfo) => {
+    if (newUserInfo !== oldUserInfo) {
+        // 强制触发computed重新计算
+        forceRefresh();
+    }
+}, { immediate: true, deep: true });
+
+// 切换tab
+const switchTab = (item, index) => {
+    console.log('switchTab called', item, index);
+    
+    // 检查是否为需要登录的页面
+    const loginRequiredPages = [
+        '/pages/job/publishJob',
+        '/pages/mine/mine',
+        '/pages/mine/company-mine'
+    ];
+    
+    if (loginRequiredPages.includes(item.path)) {
+        // 检查用户是否已登录
+        const token = uni.getStorageSync('token') || '';
+        const hasLogin = userStore.hasLogin;
+        
+        if (!token || !hasLogin) {
+            // 未登录，根据平台类型跳转到对应的登录页面
+            checkLoginAndNavigate();
+            return; // 不进行页面跳转
+        }
+        
+        // 已登录，处理特定页面的逻辑
+        if (item.path === '/pages/job/publishJob') {
+            // 检查企业信息是否完整
+            const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+            const storeUserInfo = userInfo.value || {};
+            const currentUserInfo = storeUserInfo.id ? storeUserInfo : cachedUserInfo;
+            
+            // 判断企业信息字段company是否为null或undefined
+            if (!currentUserInfo.company || currentUserInfo.company === null) {
+                // 企业信息为空，跳转到企业信息补全页面
+                uni.navigateTo({
+                    url: '/pages/complete-info/company-info',
+                });
+            } else {
+                // 企业信息完整，跳转到发布岗位页面
+                uni.navigateTo({
+                    url: '/pages/job/publishJob',
+                });
+            }
+            
+            currentItem.value = item.id;
+            return;
+        }
+        
+        if (item.path === '/pages/mine/mine') {
+            // 根据用户类型跳转到不同的"我的"页面
+            const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+            const storeIsCompanyUser = userInfo.value?.isCompanyUser;
+            const cachedIsCompanyUser = cachedUserInfo.isCompanyUser;
+            
+            // 获取用户类型
+            const userType = Number(storeIsCompanyUser !== undefined ? storeIsCompanyUser : (cachedIsCompanyUser !== undefined ? cachedIsCompanyUser : 1));
+            
+            let targetPath = '/pages/mine/mine'; // 默认求职者页面
+            
+            if (userType === 0) {
+                // 企业用户，跳转到企业我的页面
+                targetPath = '/pages/mine/company-mine';
+            } else {
+                // 求职者或其他用户类型，跳转到普通我的页面
+                targetPath = '/pages/mine/mine';
+            }
+            
+            // 跳转到对应的页面
+            uni.navigateTo({
+                url: targetPath,
+            });
+            
+            currentItem.value = item.id;
+            return;
+        }
+    }
+    
+    // 判断是否为 tabBar 页面
+    const tabBarPages = [
+        '/pages/index/index',
+        '/pages/careerfair/careerfair',
+        '/pages/chat/chat',
+        '/pages/msglog/msglog',
+        '/pages/mine/mine'
+    ];
+    
+    if (tabBarPages.includes(item.path)) {
+        // TabBar 页面使用 redirectTo 避免页面栈溢出
+        uni.redirectTo({
+            url: item.path,
+        });
+    } else {
+        // 非 TabBar 页面使用 navigateTo
+        uni.navigateTo({
+            url: item.path,
+        });
+    }
+    
+    currentItem.value = item.id;
+};
+
+onMounted(() => {
+    currentItem.value = props.currentPage;
+    // 调试信息：显示当前用户状态和tabbar配置
+    forceRefresh();
+});
+</script>
+
+<style lang="scss" scoped>
+.custom-tabbar {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 88rpx;
+    background-color: #ffffff;
+    border-top: 1rpx solid #e5e5e5;
+    display: flex;
+    align-items: center;
+    padding-bottom: env(safe-area-inset-bottom);
+    z-index: 9999;
+    box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
+    pointer-events: auto;
+}
+
+.tabbar-item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    color: #5E5F60;
+    font-size: 22rpx;
+    position: relative;
+    cursor: pointer;
+    pointer-events: auto;
+    -webkit-tap-highlight-color: transparent;
+}
+
+.tabbar-icon {
+    width: 44rpx;
+    height: 44rpx;
+    margin-bottom: 4rpx;
+    position: relative;
+}
+
+.tabbar-icon image {
+    width: 100%;
+    height: 100%;
+}
+
+.tabbar-text {
+    font-size: 20rpx;
+    line-height: 1;
+    transition: color 0.3s ease;
+}
+
+.tabbar-text.active {
+    color: #256BFA;
+    font-weight: 500;
+}
+
+.badge {
+    position: absolute;
+    top: 4rpx;
+    right: 20rpx;
+    min-width: 30rpx;
+    height: 30rpx;
+    background-color: #ff4444;
+    color: #fff;
+    font-size: 18rpx;
+    border-radius: 15rpx;
+    text-align: center;
+    line-height: 30rpx;
+    padding: 0 10rpx;
+    transform: scale(0.8);
+}
+
+/* 中间按钮特殊样式 */
+.tabbar-item:has(.center-item) {
+    .tabbar-icon {
+        width: 60rpx;
+        height: 60rpx;
+        margin-bottom: 0;
+    }
+}
+</style>

components/MsgTips/MsgTips.vue

@@ -13,10 +13,10 @@
             </view>
             <text class="text-content button-click">{{ content }}</text>
             <template v-if="showButton">
-                <button class="popup-button button-click" v-if="isTip" @click="close">{{ buttonText }}</button>
+                <button class="popup-button button-click reset-button" v-if="isTip" @click="close">{{ buttonText }}</button>
                 <view v-else class="confirm-btns">
-                    <button class="popup-button button-click" @click="close">{{ cancelText }}</button>
-                    <button class="popup-button button-click" @click="confirm">{{ confirmText }}</button>
+                    <button class="popup-button button-click reset-button" @click="close">{{ cancelText }}</button>
+                    <button class="popup-button button-click reset-button" @click="confirm">{{ confirmText }}</button>
                 </view>
             </template>
         </view>
@@ -138,8 +138,8 @@ export default {
     }
 }
 
-// 重置button样式
-button {
+// 重置button样式，使用类选择器代替标签选择器
+.reset-button {
     padding: 0;
     margin: 0;
     border: none;
@@ -148,7 +148,7 @@ button {
     line-height: inherit;
 }
 
-button::after {
+.reset-button::after {
     border: none;
 }
 </style>

components/UserTypeSwitcher/UserTypeSwitcher.vue

@@ -31,13 +31,13 @@ const userTypes = [
     { value: 3, label: '政府人员' }
 ];
 
-const currentUserType = computed(() => userInfo.value?.userType || 0);
+const currentUserType = computed(() => userInfo.value?.isCompanyUser !== undefined ? userInfo.value.isCompanyUser : 0);
 
 const switchUserType = (userType) => {
     console.log('切换用户类型:', userType);
     console.log('切换前 userInfo:', userInfo.value);
     
-    userInfo.value.userType = userType;
+    userInfo.value.isCompanyUser = userType;
     
     console.log('切换后 userInfo:', userInfo.value);
     

components/area-cascade-picker/README.md

@@ -70,6 +70,7 @@ const openPicker = () => {
 | cancel | Function | 否 | - | 取消选择的回调函数 |
 | change | Function | 否 | - | 选择变化的回调函数 |
 | defaultValue | Object | 否 | null | 默认选中的地址（暂未实现） |
+| forceRefresh | Boolean | 否 | false | 是否强制刷新数据（忽略缓存） |
 
 #### success 回调参数
 
@@ -107,6 +108,14 @@ const openPicker = () => {
 areaPicker.value?.close()
 ```
 
+### clearCache()
+
+清除地址数据缓存
+
+```javascript
+areaPicker.value?.clearCache()
+```
+
 ## 数据格式
 
 组件使用树形结构的地址数据，格式如下：
@@ -209,12 +218,73 @@ const selectLocation = () => {
 </script>
 ```
 
+## 性能优化
+
+### 懒加载方案（已实现）⭐
+
+组件已实现**懒加载**机制，大幅优化90M+地址数据的加载性能：
+
+#### 核心优化
+
+1. **首次加载**：只加载省份列表（< 1MB，3-5秒完成）
+2. **按需加载**：用户选择省份后，再加载该省份的详细数据（2-5MB，5-10秒）
+3. **智能缓存**：已加载的数据会缓存，切换省份时秒开
+4. **自动降级**：如果服务器不支持分片接口，自动从完整数据中提取
+
+#### 性能对比
+
+| 场景 | 优化前 | 优化后（懒加载） |
+|------|--------|------------------|
+| 首次打开选择器 | 加载90M+（3-5分钟） | 加载省份列表（< 1MB，3-5秒） |
+| 选择省份 | 无需加载 | 加载该省份数据（2-5MB，5-10秒） |
+| 切换省份 | 无需加载 | 从缓存读取（< 1秒） |
+
+#### 使用方式
+
+组件已自动使用懒加载模式，无需修改调用代码：
+
+```javascript
+// 正常使用，自动懒加载
+areaPicker.value?.open({
+    success: (addressData) => {
+        console.log('选择的地址：', addressData)
+    }
+})
+
+// 强制刷新数据（忽略缓存）
+areaPicker.value?.open({
+    forceRefresh: true,  // 强制从服务器重新加载
+    success: (addressData) => {
+        console.log('选择的地址：', addressData)
+    }
+})
+
+// 清除缓存
+areaPicker.value?.clearCache()
+```
+
+### 服务器分片接口（最佳方案）🚀
+
+如果服务器可以提供分片接口，性能会进一步提升。详见：[地址数据懒加载优化方案.md](../../docs/地址数据懒加载优化方案.md)
+
+需要的接口：
+- 省份列表接口：`/address_provinces.json`（轻量级，< 1MB）
+- 省份详情接口：`/address_province_{code}.json`（按需加载，每个2-5MB）
+
+### 缓存机制
+
+1. **自动缓存**：已加载的数据会自动缓存到 IndexedDB（H5）或 uni.storage（小程序）
+2. **缓存有效期**：默认7天，过期后自动重新加载
+3. **离线支持**：网络失败时自动使用缓存数据
+4. **存储方案**：优先使用 IndexedDB，自动降级到 uni.storage
+
 ## 注意事项
 
-1. **数据来源**：当前使用本地模拟数据，生产环境建议接入后端API
+1. **数据来源**：当前从远程JSON文件加载，生产环境建议接入后端API
 2. **数据更新**：如需接入后端API，修改 `loadAreaData` 方法即可
-3. **性能优化**：地址数据量大时，建议使用懒加载
+3. **性能优化**：已集成缓存机制，首次加载后速度大幅提升
 4. **兼容性**：支持 H5、微信小程序等多端
+5. **存储限制**：小程序环境有存储限制，如遇问题会自动清理旧缓存
 
 ## 接入后端API
 
@@ -242,6 +312,21 @@ async loadAreaData() {
 
 ## 更新日志
 
+### v1.2.0 (2025-01-XX)
+- 🚀 **懒加载优化**：实现按需加载，首次加载从几分钟减少到几秒
+- ✅ 首次只加载省份列表（< 1MB，3-5秒）
+- ✅ 按需加载省份详情（选择省份时才加载）
+- ✅ 智能缓存已加载的数据，切换省份秒开
+- ✅ 支持服务器分片接口（最佳性能）
+- ✅ 自动降级方案（兼容完整数据）
+
+### v1.1.0 (2025-01-XX)
+- 🚀 **性能优化**：集成智能缓存系统，优化90M+地址数据加载
+- ✅ 支持 IndexedDB 和 uni.storage 双缓存方案
+- ✅ 支持缓存过期管理和自动清理
+- ✅ 支持强制刷新数据
+- ✅ 优化首次加载体验，后续加载秒开
+
 ### v1.0.0 (2025-10-21)
 - ✨ 初始版本
 - ✅ 实现五级联动选择功能

components/area-cascade-picker/area-cascade-picker.vue

@@ -85,33 +85,35 @@
 </template>
 
 <script>
-import addressJson from '@/static/json/xinjiang.json';
+import { createRequest } from '@/utils/request';
 export default {
     name: 'AreaCascadePicker',
     data() {
-        return {
-            maskClick: false,
-            title: '选择地址',
-            confirmCallback: null,
-            cancelCallback: null,
-            changeCallback: null,
-            selectedIndex: [0, 0, 0, 0, 0],
-            // 原始数据
-            areaData: [],
-            // 各级列表
-            provinceList: [],
-            cityList: [],
-            districtList: [],
-            streetList: [],
-            communityList: [],
-            // 当前选中的项
-            selectedProvince: null,
-            selectedCity: null,
-            selectedDistrict: null,
-            selectedStreet: null,
-            selectedCommunity: null,
-        };
-    },
+            return {
+                maskClick: false,
+                title: '选择地址',
+                confirmCallback: null,
+                cancelCallback: null,
+                changeCallback: null,
+                selectedIndex: [0, 0, 0, 0, 0],
+                // 原始数据（懒加载模式下，只存储省份列表）
+                areaData: [],
+                // 各级列表
+                provinceList: [],
+                cityList: [],
+                districtList: [],
+                streetList: [],
+                communityList: [],
+                // 当前选中的项
+                selectedProvince: null,
+                selectedCity: null,
+                selectedDistrict: null,
+                selectedStreet: null,
+                selectedCommunity: null,
+                // 加载状态
+                isLoading: false,
+            };
+        },
     methods: {
         async open(newConfig = {}) {
             const {
@@ -121,6 +123,7 @@ export default {
                 change,
                 maskClick = false,
                 defaultValue = null,
+                forceRefresh = false, // 是否强制刷新数据
             } = newConfig;
             
             this.reset();
@@ -131,50 +134,103 @@ export default {
             this.maskClick = maskClick;
             
             // 加载地区数据
-            await this.loadAreaData();
-            
-            // 初始化列表
-            this.initLists();
-            
-            this.$nextTick(() => {
-                this.$refs.popup.open();
-            });
-        },
-        
-        async loadAreaData() {
+            this.isLoading = true;
             try {
-                // 尝试调用后端API获取地区数据
-                // 如果后端API不存在，将使用模拟数据
-                console.log('正在加载地区数据...');
-                // const resp = await uni.request({
-                //     url: '/app/common/area/cascade',
-                //     method: 'GET'
-                // });
-                // if (resp.statusCode === 200 && resp.data && resp.data.data) {
-                //     this.areaData = resp.data.data;
-                // }
+                // 先显示弹窗，避免长时间等待
+                this.$nextTick(() => {
+                    this.$refs.popup.open();
+                });
                 
-                // 暂时使用模拟数据
-                this.areaData = this.getMockData();
+                // 加载省份数据
+                await this.loadAreaData(forceRefresh);
+                
+                // 只有当provinceList有数据时才初始化后续列表
+                if (this.areaData && this.areaData.length > 0) {
+                    await this.initLists();
+                    console.log('地址选择器初始化完成');
+                } else {
+                    console.warn('没有加载到省份数据');
+                    // 即使没有数据，也保持弹窗打开，让用户可以关闭它
+                }
             } catch (error) {
-                console.error('加载地区数据失败:', error);
-                // 如果后端API不存在，使用模拟数据
-                this.areaData = this.getMockData();
+                console.error('打开地址选择器失败:', error);
+                // 注意：由于loadAreaData已经处理了错误，这里不应该会被触发
+                // 但保留作为额外的安全措施
+            } finally {
+                this.isLoading = false;
             }
         },
         
-        initLists() {
+        async loadAreaData(forceRefresh = false) {
+            try {
+                console.log('正在加载省份列表...');
+                const resp = await createRequest('/cms/dict/sysarea/list', { parentCode: '' }, 'GET', false);
+                console.log('省份列表接口响应:', resp);
+                
+                // 处理正确的数据格式
+                if (resp && resp.code === 200 && resp.data) {
+                    // 数据在data字段中
+                    this.areaData = resp.data.map(item => ({
+                        code: item.code,
+                        name: item.name
+                    }));
+                    
+                    console.log('省份列表加载成功:', this.areaData);
+                    if (this.areaData.length === 0) {
+                        console.warn('省份列表为空');
+                    }
+                } else {
+                    console.error('获取省份列表失败:', resp);
+                    throw new Error(`获取省份列表失败: ${resp?.msg || '未知错误'}`);
+                }
+            } catch (error) {
+                console.error('加载省份列表失败:', error);
+                // 不抛出错误，避免阻止页面打开
+                // 而是使用默认空数据，让用户可以继续操作
+                this.areaData = [];
+                // 显示更友好的错误提示
+                uni.showToast({
+                    title: error.message || '加载地址数据失败，请检查网络连接',
+                    icon: 'none',
+                    duration: 3000
+                });
+            }
+        },
+        
+        async initLists() {
             // 初始化省列表
-            this.provinceList = this.areaData;
+            this.provinceList = this.areaData || [];
             
             if (this.provinceList.length > 0) {
                 this.selectedProvince = this.provinceList[0];
-                this.updateCityList();
+                // 懒加载：首次选择第一个省份时，加载其详情
+                await this.updateCityList();
+                
+                // 如果有城市数据，初始化第一个城市的区县数据
+                if (this.cityList.length > 0) {
+                    this.selectedCity = this.cityList[0];
+                    await this.updateDistrictList();
+                    
+                    // 如果有区县数据，初始化第一个区县的街道数据
+                    if (this.districtList.length > 0) {
+                        this.selectedDistrict = this.districtList[0];
+                        await this.updateStreetList();
+                        
+                        // 如果有街道数据，初始化第一个街道的社区数据
+                        if (this.streetList.length > 0) {
+                            this.selectedStreet = this.streetList[0];
+                            await this.updateCommunityList();
+                        }
+                    }
+                }
+                
+                // 更新选中索引
+                this.selectedIndex = [0, 0, 0, 0, 0];
             }
         },
         
-        updateCityList() {
-            if (!this.selectedProvince || !this.selectedProvince.children) {
+        async updateCityList() {
+            if (!this.selectedProvince) {
                 this.cityList = [];
                 this.districtList = [];
                 this.streetList = [];
@@ -182,55 +238,168 @@ export default {
                 return;
             }
             
-            this.cityList = this.selectedProvince.children;
+            try {
+                console.log(`正在加载城市列表，父级编码: ${this.selectedProvince.code}`);
+                
+                // 使用createRequest工具调用接口
+                const resp = await createRequest('/cms/dict/sysarea/list', { parentCode: this.selectedProvince.code }, 'GET', false);
+                
+                console.log('城市列表接口响应:', resp);
+                
+                // 处理正确的数据格式
+                let cityData = [];
+                if (resp && resp.code === 200 && resp.data) {
+                    cityData = resp.data;
+                    
+                    this.cityList = cityData.map(item => ({
+                        code: item.code,
+                        name: item.name
+                    }));
+                    console.log('城市列表加载成功:', this.cityList);
+                } else {
+                    console.error('获取城市列表失败:', resp);
+                    this.cityList = [];
+                }
+            } catch (error) {
+                console.error('加载城市列表失败:', error);
+                this.cityList = [];
+            }
+            
             this.selectedIndex[1] = 0;
             
             if (this.cityList.length > 0) {
                 this.selectedCity = this.cityList[0];
-                this.updateDistrictList();
+                await this.updateDistrictList();
+            } else {
+                this.districtList = [];
+                this.streetList = [];
+                this.communityList = [];
             }
         },
         
-        updateDistrictList() {
-            if (!this.selectedCity || !this.selectedCity.children) {
+        async updateDistrictList() {
+            if (!this.selectedCity) {
                 this.districtList = [];
                 this.streetList = [];
                 this.communityList = [];
                 return;
             }
             
-            this.districtList = this.selectedCity.children;
+            try {
+                console.log(`正在加载区县列表，父级编码: ${this.selectedCity.code}`);
+                
+                // 使用createRequest工具调用接口
+                const resp = await createRequest('/cms/dict/sysarea/list', { parentCode: this.selectedCity.code }, 'GET', false);
+                
+                console.log('区县列表接口响应:', resp);
+                
+                // 处理正确的数据格式
+                let districtData = [];
+                if (resp && resp.code === 200 && resp.data) {
+                    districtData = resp.data;
+                    
+                    this.districtList = districtData.map(item => ({
+                        code: item.code,
+                        name: item.name
+                    }));
+                    console.log('区县列表加载成功:', this.districtList);
+                } else {
+                    console.error('获取区县列表失败:', resp);
+                    this.districtList = [];
+                }
+            } catch (error) {
+                console.error('加载区县列表失败:', error);
+                this.districtList = [];
+            }
+            
             this.selectedIndex[2] = 0;
             
             if (this.districtList.length > 0) {
                 this.selectedDistrict = this.districtList[0];
-                this.updateStreetList();
+                await this.updateStreetList();
+            } else {
+                this.streetList = [];
+                this.communityList = [];
             }
         },
         
-        updateStreetList() {
-            if (!this.selectedDistrict || !this.selectedDistrict.children) {
+        async updateStreetList() {
+            if (!this.selectedDistrict) {
                 this.streetList = [];
                 this.communityList = [];
                 return;
             }
             
-            this.streetList = this.selectedDistrict.children;
+            try {
+                console.log(`正在加载街道列表，父级编码: ${this.selectedDistrict.code}`);
+                
+                // 使用createRequest工具调用接口
+                const resp = await createRequest('/cms/dict/sysarea/list', { parentCode: this.selectedDistrict.code }, 'GET', false);
+                
+                console.log('街道列表接口响应:', resp);
+                
+                // 处理正确的数据格式
+                let streetData = [];
+                if (resp && resp.code === 200 && resp.data) {
+                    streetData = resp.data;
+                    
+                    this.streetList = streetData.map(item => ({
+                        code: item.code,
+                        name: item.name
+                    }));
+                    console.log('街道列表加载成功:', this.streetList);
+                } else {
+                    console.error('获取街道列表失败:', resp);
+                    this.streetList = [];
+                }
+            } catch (error) {
+                console.error('加载街道列表失败:', error);
+                this.streetList = [];
+            }
+            
             this.selectedIndex[3] = 0;
             
             if (this.streetList.length > 0) {
                 this.selectedStreet = this.streetList[0];
-                this.updateCommunityList();
+                await this.updateCommunityList();
+            } else {
+                this.communityList = [];
             }
         },
         
-        updateCommunityList() {
-            if (!this.selectedStreet || !this.selectedStreet.children) {
+        async updateCommunityList() {
+            if (!this.selectedStreet) {
                 this.communityList = [];
                 return;
             }
             
-            this.communityList = this.selectedStreet.children;
+            try {
+                console.log(`正在加载社区列表，父级编码: ${this.selectedStreet.code}`);
+                
+                // 使用createRequest工具调用接口
+                const resp = await createRequest('/cms/dict/sysarea/list', { parentCode: this.selectedStreet.code }, 'GET', false);
+                
+                console.log('社区列表接口响应:', resp);
+                
+                // 处理正确的数据格式
+                let communityData = [];
+                if (resp && resp.code === 200 && resp.data) {
+                    communityData = resp.data;
+                    
+                    this.communityList = communityData.map(item => ({
+                        code: item.code,
+                        name: item.name
+                    }));
+                    console.log('社区列表加载成功:', this.communityList);
+                } else {
+                    console.error('获取社区列表失败:', resp);
+                    this.communityList = [];
+                }
+            } catch (error) {
+                console.error('加载社区列表失败:', error);
+                this.communityList = [];
+            }
+            
             this.selectedIndex[4] = 0;
             
             if (this.communityList.length > 0) {
@@ -238,7 +407,7 @@ export default {
             }
         },
         
-        bindChange(e) {
+        async bindChange(e) {
             const newIndex = e.detail.value;
             
             // 检查哪一列发生了变化
@@ -248,21 +417,21 @@ export default {
                     
                     // 根据变化的列更新后续列
                     if (i === 0) {
-                        // 省变化
+                        // 省变化 - 需要加载新省份的城市
                         this.selectedProvince = this.provinceList[newIndex[0]];
-                        this.updateCityList();
+                        await this.updateCityList();
                     } else if (i === 1) {
                         // 市变化
                         this.selectedCity = this.cityList[newIndex[1]];
-                        this.updateDistrictList();
+                        await this.updateDistrictList();
                     } else if (i === 2) {
                         // 区县变化
                         this.selectedDistrict = this.districtList[newIndex[2]];
-                        this.updateStreetList();
+                        await this.updateStreetList();
                     } else if (i === 3) {
                         // 街道变化
                         this.selectedStreet = this.streetList[newIndex[3]];
-                        this.updateCommunityList();
+                        await this.updateCommunityList();
                     } else if (i === 4) {
                         // 社区变化
                         this.selectedCommunity = this.communityList[newIndex[4]];
@@ -323,22 +492,48 @@ export default {
             }
         },
         
+        /**
+         * 重置所有状态（内部使用）
+         */
         reset() {
             this.maskClick = false;
             this.confirmCallback = null;
             this.cancelCallback = null;
             this.changeCallback = null;
             this.selectedIndex = [0, 0, 0, 0, 0];
+            this.selectedProvince = null;
+            this.selectedCity = null;
+            this.selectedDistrict = null;
+            this.selectedStreet = null;
+            this.selectedCommunity = null;
             this.provinceList = [];
             this.cityList = [];
             this.districtList = [];
             this.streetList = [];
             this.communityList = [];
+            this.areaData = [];
         },
         
-        // 模拟数据（用于演示）
-        getMockData() {
-            return addressJson
+        /**
+         * 清除地址数据缓存（供外部调用）
+         */
+        async clearCache() {
+            try {
+                // 清除内存缓存
+                this.reset();
+                uni.showToast({
+                    title: '缓存已清除',
+                    icon: 'success',
+                    duration: 2000
+                });
+            } catch (error) {
+                console.error('清除缓存失败:', error);
+                uni.showToast({
+                    title: '清除缓存失败',
+                    icon: 'none',
+                    duration: 2000
+                });
+            }
         }
     },
 };

components/data-picker-view/data-picker-view.vue

@@ -0,0 +1,37 @@
+<template>
+  <uni-data-pickerview
+    ref="pickerView"
+    v-bind="$attrs"
+    @change="handleChange"
+    @datachange="handleDatachange"
+    @nodeclick="handleNodeclick"
+    @update:modelValue="handleUpdateModelValue"
+  />
+</template>
+
+<script>
+export default {
+  name: 'DataPickerView',
+  inheritAttrs: false,
+  methods: {
+    updateData(data) {
+      if (this.$refs.pickerView && this.$refs.pickerView.updateData) {
+        this.$refs.pickerView.updateData(data)
+      }
+    },
+    handleChange(event) {
+      this.$emit('change', event)
+    },
+    handleDatachange(event) {
+      this.$emit('datachange', event)
+    },
+    handleNodeclick(event) {
+      this.$emit('nodeclick', event)
+    },
+    handleUpdateModelValue(value) {
+      this.$emit('update:modelValue', value)
+    }
+  }
+}
+</script>
+

components/empty/empty.vue

@@ -2,8 +2,8 @@
     <view class="empty" :style="{ background: bgcolor, marginTop: mrTop + 'rpx' }">
         <view class="ty_content" :style="{ paddingTop: pdTop + 'rpx' }">
             <view class="content_top btn-shaky">
-                <image v-if="pictrue" :src="pictrue" mode=""></image>
-                <image v-else src="@/static/icon/empty.png" mode=""></image>
+                <image v-if="pictrue" :src="pictrue" mode="" class="empty-image"></image>
+                <image v-else src="@/static/icon/empty.png" mode="" class="empty-image"></image>
             </view>
             <view class="content_c">{{ content }}</view>
         </view>
@@ -47,7 +47,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-image {
+// 使用类选择器代替标签选择器
+.empty-image {
     width: 100%;
     height: 100%;
 }

components/expected-station/expected-station.vue

@@ -5,7 +5,7 @@
             <input class="uni-input searchinput" confirm-type="search" />
         </view>
         <view class="sex-content">
-            <scroll-view :show-scrollbar="false" :scroll-y="true" class="sex-content-left">
+            <scroll-view ref="leftScroll" :show-scrollbar="false" :scroll-y="true" class="sex-content-left">
                 <view
                     v-for="item in copyTree"
                     :key="item.id"
@@ -57,6 +57,8 @@ export default {
             stationCateLog: 0,
             copyTree: [],
             scrollTop: 0,
+            scrollTimer: null,
+            lastScrollTime: 0,
         };
     },
     props: {
@@ -89,14 +91,131 @@ export default {
             }
         },
     },
+    beforeDestroy() {
+        // 组件销毁前清除定时器
+        if (this.scrollTimer) {
+            clearTimeout(this.scrollTimer);
+            this.scrollTimer = null;
+        }
+    },
     methods: {
         changeStationLog(item) {
             this.leftValue = item;
             this.rightValue = item.children;
             this.scrollTop = 0;
+            
+            // 使用更激进的防抖策略，避免频繁的左侧滚动
+            if (this.scrollTimer) {
+                clearTimeout(this.scrollTimer);
+            }
+            
+            this.scrollTimer = setTimeout(() => {
+                // 确保左侧列表滚动到正确位置，让当前选中的标签可见
+                const index = this.copyTree.findIndex(i => i.id === item.id);
+                if (index !== -1 && this.$refs.leftScroll) {
+                    const itemHeight = 160; // 每个选项高度
+                    const visibleHeight = 4 * itemHeight; // 可见区域高度
+                    
+                    // 计算目标位置
+                    const targetTop = index * itemHeight;
+                    
+                    // 获取当前左侧列表的滚动位置
+                    const currentLeftScrollTop = this.$refs.leftScroll.scrollTop || 0;
+                    
+                    // 只有当目标位置不在当前可见区域内时才滚动
+                    if (targetTop < currentLeftScrollTop || targetTop > currentLeftScrollTop + visibleHeight - itemHeight) {
+                        let targetScrollTop = targetTop;
+                        
+                        // 如果选中的标签在底部，确保它不会滚动出可见区域
+                        if (targetTop > this.$refs.leftScroll.scrollHeight - visibleHeight) {
+                            targetScrollTop = Math.max(0, this.$refs.leftScroll.scrollHeight - visibleHeight);
+                        }
+                        
+                        this.$refs.leftScroll.scrollTo({
+                            top: targetScrollTop,
+                            duration: 100 // 进一步减少滚动动画时间
+                        });
+                    }
+                }
+            }, 100);
         },
         scrollTopBack(e) {
-            this.scrollTop = e.detail.scrollTop;
+            const currentTime = Date.now();
+            
+            // 更严格的防抖处理：如果距离上次滚动时间太短，则跳过处理
+            if (currentTime - this.lastScrollTime < 80) {
+                return;
+            }
+            this.lastScrollTime = currentTime;
+            
+            // 清除之前的定时器
+            if (this.scrollTimer) {
+                clearTimeout(this.scrollTimer);
+            }
+            
+            // 设置新的定时器，延迟处理滚动事件
+            this.scrollTimer = setTimeout(() => {
+                this.scrollTop = e.detail.scrollTop;
+                
+                // 滚动时自动选中对应的左侧标签
+                const scrollTop = e.detail.scrollTop;
+                let currentSection = null;
+                let minDistance = Infinity;
+                
+                // 遍历所有右侧的二级标题，找到当前最接近顶部的那个
+                this.rightValue.forEach((section, index) => {
+                    // 更精确地估算每个section的位置（考虑标题高度和内容高度）
+                    const sectionTop = index * 280; // 增加估算高度，避免过于敏感
+                    const distance = Math.abs(sectionTop - scrollTop);
+                    
+                    if (distance < minDistance) {
+                        minDistance = distance;
+                        currentSection = section;
+                    }
+                });
+                
+                // 只有当距离足够近时才切换左侧标签，避免过于敏感
+                if (currentSection && minDistance < 100 && this.leftValue.id !== currentSection.parentId) {
+                    const parentItem = this.copyTree.find(item => item.id === currentSection.parentId);
+                    if (parentItem) {
+                        this.leftValue = parentItem;
+                        
+                        // 使用更激进的防抖策略，避免频繁的左侧滚动
+                        if (this.scrollTimer) {
+                            clearTimeout(this.scrollTimer);
+                        }
+                        
+                        this.scrollTimer = setTimeout(() => {
+                            // 只在必要时滚动左侧列表，避免频繁滚动导致的抖动
+                            const index = this.copyTree.findIndex(i => i.id === parentItem.id);
+                            if (index !== -1 && this.$refs.leftScroll) {
+                                // 获取当前左侧列表的滚动位置
+                                const currentLeftScrollTop = this.$refs.leftScroll.scrollTop || 0;
+                                const itemHeight = 160; // 每个选项高度
+                                const visibleHeight = 4 * itemHeight; // 可见区域高度
+                                
+                                // 计算目标位置
+                                const targetTop = index * itemHeight;
+                                
+                                // 只有当目标位置不在当前可见区域内时才滚动
+                                if (targetTop < currentLeftScrollTop || targetTop > currentLeftScrollTop + visibleHeight - itemHeight) {
+                                    let targetScrollTop = targetTop;
+                                    
+                                    // 如果选中的标签在底部，确保它不会滚动出可见区域
+                                    if (targetTop > this.$refs.leftScroll.scrollHeight - visibleHeight) {
+                                        targetScrollTop = Math.max(0, this.$refs.leftScroll.scrollHeight - visibleHeight);
+                                    }
+                                    
+                                    this.$refs.leftScroll.scrollTo({
+                                        top: targetScrollTop,
+                                        duration: 100 // 进一步减少滚动动画时间
+                                    });
+                                }
+                            }
+                        }, 150); // 增加延迟，避免滚动冲突
+                    }
+                }
+            }, 80); // 增加防抖延迟到80ms
         },
         addItem(item) {
             let titiles = [];
@@ -189,6 +308,10 @@ export default {
     .sex-content-left
         width: 198rpx;
         padding: 20rpx 0 0 0;
+        /* 添加硬件加速优化 */
+        transform: translateZ(0);
+        -webkit-transform: translateZ(0);
+        will-change: transform;
         .left-list-btn
             padding: 0 40rpx 0 24rpx;
             display: grid;
@@ -199,6 +322,9 @@ export default {
             font-size: 28rpx;
             position: relative
             margin-top: 60rpx
+            /* 优化渲染性能 */
+            transform: translateZ(0);
+            -webkit-transform: translateZ(0);
         .left-list-btn:first-child
             margin-top: 0
         // .positionNum
@@ -227,6 +353,10 @@ export default {
         // border-left: 2px solid #D9D9D9;
         background: #F6F6F6;
         flex: 1;
+        /* 添加硬件加速优化 */
+        transform: translateZ(0);
+        -webkit-transform: translateZ(0);
+        will-change: transform;
         .grid-sex
             display: grid;
             grid-template-columns: 50% 50%;
@@ -244,6 +374,9 @@ export default {
                 margin-top: 30rpx;
                 background: #E8EAEE;
                 color: #606060;
+                /* 优化渲染性能 */
+                transform: translateZ(0);
+                -webkit-transform: translateZ(0);
             .sex-right-btned
                 font-weight: 500
                 width: 224rpx;
@@ -251,4 +384,7 @@ export default {
                 background: rgba(37,107,250,0.06);
                 border: 2rpx solid #256BFA;
                 color: #256BFA
+                /* 优化渲染性能 */
+                transform: translateZ(0);
+                -webkit-transform: translateZ(0);
 </style>

components/jobfair/signDialog.vue

@@ -0,0 +1,639 @@
+<template>
+	<view class="job-dialog">
+		<view class="header-title">
+			<image :src="`${imgBaseUrl}/jobfair/xb.png`" mode=""></image>
+			<text>招聘会报名</text>
+		</view>
+		<view class="dialog-content">
+			<view class="detail-item" v-if="type == 2">
+				<view class="gw-label">选择展区展位：</view>
+				<!-- 展位状态说明 -->
+				<view class="status-description">
+					<view class="status-title">
+						<text>展位状态说明：</text>
+					</view>
+					<view class="status-item">
+						<view class="status-color available"></view>
+						<text class="status-text">未被占用</text>
+					</view>
+					<view class="status-item">
+						<view class="status-color occupied"></view>
+						<text class="status-text">已被占用</text>
+					</view>
+					<view class="status-item">
+						<view class="status-color pending"></view>
+						<text class="status-text">待审核占用</text>
+					</view>
+					<view class="status-item">
+						<view class="status-color selected"></view>
+						<text class="status-text">当前选中</text>
+					</view>
+				</view>
+				<view class="gw-value">
+					<view class="cd-detail" v-for="(item, index) in areaAndBoothList" :key="index">
+						<view class="cd-name">{{ item.jobFairAreaName }}</view>
+						<view class="cd-con">
+							<view class="cd-con-item" :class="getBoothStatusClass(booth)"
+								v-for="(booth, boothIndex) in item.boothList" :key="boothIndex"
+								@click="selectBooth(booth, item.jobFairAreaId)">
+								<text>{{ booth.jobFairBoothName }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="detail-item">
+				<view class="gw-label">请选择招聘岗位：</view>
+				<view class="gw-value">
+					<view class="checkbox-group">
+						<view class="checkbox-item job-item" v-for="(item, index) in jobList" :key="index"
+							:class="{ 'checked': checkList.includes(item) }" @click="toggleJobSelection(item)">
+							<view class="item-checkbox">
+								<view class="checkbox-icon" :class="{ 'checked': checkList.includes(item) }">
+									<text v-if="checkList.includes(item)">✓</text>
+								</view>
+								<view class="job-info">
+									<view class="job-name">{{ item.jobTitle }}</view>
+									<view class="salary">{{ item.salaryRange }}元/月</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="detail-item">
+				<view class="gw-label">请上传招聘海报：</view>
+				<view class="gw-value">
+					<view v-if="imageUrl">
+						<image v-if="imageUrl" :src="publicUrl + '/file/file/minio' + imageUrl" class="avatar"
+							mode="aspectFit" />
+						<button type="warn" class="del-icon" @click="imageUrl = ''" size="mini">删除</button>
+					</view>
+					<view v-else>
+						<button @click="chooseImage" class="avatar-uploader transparent-btn" type="default">
+							<view class="avatar-uploader-icon">+</view>
+						</button>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="btn-box">
+			<button style="background: #409EFF;color: #fff;" @click="submitForm">提交</button>
+			<button type="default" @click="closeDialog">取消</button>
+		</view>
+	</view>
+
+</template>
+
+<script setup>
+	import config from "@/config.js"
+	import {
+		ref,
+		reactive,
+		onMounted,
+		nextTick,
+		watch,
+		inject
+	} from 'vue';
+
+	const emit = defineEmits(['closePopup']);
+	import {
+		createRequest
+	} from '@/utils/request.js';
+	const {
+		$api
+	} = inject('globalFunction');
+
+	// 定义props
+	const props = defineProps({
+		// 招聘会类型1线上   2线下
+		signType: {
+			type: Number,
+			default: 1
+		},
+		// 报名角色  ent企业   person个人
+		signRole: {
+			type: String,
+			default: 'ent'
+		},
+		// 招聘会id
+		jobFairId: {
+			type: String,
+			default: ''
+		}
+	});
+
+	// 监听props变化
+	watch(() => props.signType, (newVal) => {
+		type.value = newVal;
+	});
+
+	// 响应式数据
+	const checkList = ref([]);
+	const imageUrl = ref('');
+	const type = ref('');
+	const id = ref('');
+	const jobList = ref([]);
+	const userId = ref('');
+	const areaAndBoothList = ref([]);
+	const jobFairAreaId = ref(null);
+	const jobFairBoothId = ref(null);
+	const avatarUploader = ref(null);
+
+	// 配置
+	const publicUrl = config.LCBaseUrl;
+	const imgBaseUrl = config.imgBaseUrl
+	const uploadUrl = config.LCBaseUrl + "/file/file/upload";
+
+	// 方法
+	const selectBooth = (booth, jobFairAreaIdVal) => {
+		if (booth.status == 0) {
+			jobFairBoothId.value = booth.jobFairBoothId;
+			jobFairAreaId.value = jobFairAreaIdVal;
+		}
+	};
+
+	const submitForm = async () => {
+		if (type.value == "2") {
+			if (!jobFairBoothId.value || !jobFairAreaId.value) {
+				uni.showToast({
+					title: '请选择展区展位',
+					icon: 'none'
+				});
+				return;
+			}
+		}
+		if (checkList.value.length === 0) {
+			uni.showToast({
+				title: '请选择招聘岗位',
+				icon: 'none'
+			});
+			return;
+		}
+		if (!imageUrl.value) {
+			uni.showToast({
+				title: '请上传招聘海报',
+				icon: 'none'
+			});
+			return;
+		}
+
+		$api.myRequest("/system/user/login/user/info", {}, "GET", 10100, {
+			Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+		}).then((userInfo) => {
+			let data = {}
+			if (type.value == "2") {
+				data = {
+					jobFairId: id.value,
+					enterpriseId: userInfo.info.userId,
+					jobInfoList: checkList.value,
+					poster: imageUrl.value,
+					jobFairAreaId: jobFairAreaId.value,
+					jobFairBoothId: jobFairBoothId.value,
+					code: userInfo.info.entCreditCode
+				};
+			} else {
+				data = {
+					jobFairId: id.value,
+					enterpriseId: userInfo.info.userId,
+					jobInfoList: checkList.value,
+					poster: imageUrl.value,
+					code: userInfo.info.entCreditCode
+				};
+			}
+			$api.myRequest("/jobfair/public/job-fair-sign-up-enterprise/sign-up", data, "post", 9100, {
+				Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+			}).then((res) => {
+				if (res.code === 200) {
+					uni.showToast({
+						title: '报名成功',
+						icon: 'success'
+					});
+					closeDialog();
+				} else {
+					uni.showToast({
+						title: res.msg || '报名失败',
+						icon: 'none'
+					});
+				}
+			});
+		})
+	};
+
+	const closeDialog = () => {
+		checkList.value = [];
+		imageUrl.value = '';
+		jobFairBoothId.value = null;
+		jobFairAreaId.value = null;
+		emit('closePopup')
+	};
+
+	const handleAvatarSuccess = (response) => {
+		imageUrl.value = response.data.url;
+		uni.showToast({
+			title: '海报上传成功',
+			icon: 'success'
+		});
+	};
+
+	const showDialog = (dialogType, dialogId) => {
+		type.value = dialogType;
+		id.value = dialogId;
+		nextTick(() => {
+			getJobList();
+			if (type.value === "2") {
+				getAreaAndBoothInfo();
+			}
+		});
+	};
+
+	// 展区展位列表
+	const getAreaAndBoothInfo = () => {
+		const data = {
+			jobFairId: props.jobFairId,
+		}
+		$api.myRequest("/jobfair/public/jobfair/area-and-booth-info-by-job-fair-id", data, "GET", 9100, {
+			Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+		}).then((resData) => {
+			areaAndBoothList.value = resData.data || [];
+		});
+	};
+
+	// 岗位列表
+	const getJobList = () => {
+		$api.myRequest("/system/user/login/user/info", {}, "GET", 10100, {
+			Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+		}).then((userInfo) => {
+			const data = {
+				jobFairId: id.value,
+				enterpriseId: userInfo.info.userId,
+				pageNum: 1,
+				pageSize: 1000,
+				code: userInfo.info.entCreditCode
+			}
+			$api.myRequest("/jobfair/public/job-info/list", data, "GET", 9100, {
+				Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+			}).then((resData) => {
+				jobList.value = resData.data.list || [];
+			});
+		});
+	};
+
+	const getBoothStatusClass = (booth) => {
+		const s = booth.status || 0;
+		if (s == 1) return "cd-con-item-checked";
+		if (s == 2) return "cd-con-item-review";
+		if (jobFairBoothId.value && jobFairBoothId.value == booth.jobFairBoothId)
+			return "cd-con-item-mychecked";
+		return "";
+	};
+
+	// 选择图片
+	const chooseImage = () => {
+		uni.chooseImage({
+			count: 1,
+			sizeType: ['original', 'compressed'],
+			sourceType: ['album', 'camera'],
+			success: (res) => {
+				const tempFilePath = res.tempFilePaths[0];
+				uploadImage(tempFilePath);
+			}
+		});
+	};
+
+	// 上传图片
+	const uploadImage = (tempFilePath) => {
+		uni.uploadFile({
+			url: uploadUrl,
+			filePath: tempFilePath,
+			name: 'file',
+			success: (uploadFileRes) => {
+				try {
+					const response = JSON.parse(uploadFileRes.data);
+					handleAvatarSuccess(response);
+				} catch (e) {
+					uni.showToast({
+						title: '上传失败，请重试',
+						icon: 'none'
+					});
+				}
+			},
+			fail: (err) => {
+				console.error('上传失败:', err);
+				uni.showToast({
+					title: '上传失败，请重试',
+					icon: 'none'
+				});
+			}
+		});
+	};
+
+	// 切换岗位选择
+	const toggleJobSelection = (item) => {
+		const index = checkList.value.indexOf(item);
+		if (index > -1) {
+			checkList.value.splice(index, 1);
+		} else {
+			checkList.value.push(item);
+		}
+	};
+
+	// 暴露方法给父组件
+	defineExpose({
+		showDialog
+	});
+
+	onMounted(() => {
+		setTimeout(() => {
+			type.value = props.signType;
+			if (props.jobFairId) {
+				id.value = props.jobFairId;
+				getJobList();
+				if (props.signType == 2) {
+					getAreaAndBoothInfo();
+				}
+			}
+		}, 100);
+	});
+
+	// 监听jobFairId变化
+	watch(() => props.jobFairId, (newVal) => {
+		if (newVal) {
+			id.value = newVal;
+			getJobList();
+			if (type.value === 2) {
+				getAreaAndBoothInfo();
+			}
+		}
+	});
+</script>
+
+<style lang="scss" scoped>
+	.del-icon {
+		margin-left: 30rpx;
+	}
+
+	.btn-box {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 30rpx;
+	}
+
+	.btn-box button {
+		padding: 0 80rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+
+	.avatar-uploader {
+		border: 2rpx solid #0983ff;
+		border-radius: 12rpx;
+		cursor: pointer;
+		position: relative;
+		overflow: hidden;
+		width: 400rpx;
+		height: 200rpx;
+	}
+
+	.avatar-uploader-icon {
+		font-size: 56rpx;
+		color: #007AFF;
+		line-height: 200rpx;
+		text-align: center;
+	}
+
+	.job-dialog {
+		width: 100%;
+		height: 100%;
+	}
+
+	.dialog-content {
+		padding: 0 20rpx;
+		height: calc(100% - 17vh);
+		overflow-y: auto;
+		box-sizing: border-box;
+	}
+
+	.checkbox-group {
+		width: 100%;
+	}
+
+	.checkbox-item {
+		display: flex;
+		align-items: center;
+		border-bottom: 2rpx solid #b5d3ff;
+		padding: 30rpx 0;
+	}
+
+	.job-item {
+		width: 97%;
+	}
+
+	.checkbox-icon {
+		width: 40rpx;
+		height: 40rpx;
+		border: 2rpx solid #ddd;
+		border-radius: 8rpx;
+		margin-right: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.checkbox-icon.checked {
+		background-color: #409eff;
+		border-color: #409eff;
+		color: white;
+	}
+
+	.job-info {
+		flex: 1;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.detail-item {
+		margin-bottom: 40rpx;
+	}
+
+	.detail-item .gw-label {
+		font-size: 32rpx;
+		color: #333333;
+		margin-bottom: 20rpx;
+	}
+
+	.detail-item .gw-value {
+		display: flex;
+		flex-wrap: wrap;
+		overflow-y: auto;
+	}
+
+	.detail-item .gw-value .cd-detail {
+		width: 100%;
+		background: #fff;
+		border-radius: 20rpx;
+		margin-bottom: 28rpx;
+		margin-top: 28rpx;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-name {
+		background: #d3e8ff;
+		color: #0076d9;
+		font-size: 40rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		padding: 0 40rpx;
+		border-radius: 16rpx;
+		overflow: hidden;
+		position: relative;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-name::after {
+		content: "";
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 10rpx;
+		height: 100%;
+		background: #349cfc;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-con {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+		padding: 30rpx 40rpx;
+		gap: 20rpx;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-con .cd-con-item {
+		width: 80rpx;
+		height: 80rpx;
+		background: #67CFA7;
+		line-height: 80rpx;
+		text-align: center;
+		color: #fff;
+		border: 2rpx solid #ddd;
+		border-radius: 20rpx;
+		cursor: pointer;
+		font-weight: 600;
+		font-size: 32rpx;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-con .cd-con-item-review {
+		background-color: #F8BB92;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-con .cd-con-item-checked {
+		background: #F6A1A1;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-con .cd-con-item-mychecked {
+		background: #79BEFE;
+	}
+
+	.item-checkbox {
+		width: 100%;
+		padding: 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.job-name {
+		font-size: 32rpx;
+		color: #409eff;
+	}
+
+	.salary {
+		font-size: 32rpx;
+		color: #ff6e27;
+		font-weight: 600;
+	}
+
+	.header-title {
+		font-size: 38rpx;
+		font-weight: 600;
+		color: #303133;
+		padding: 20rpx;
+		padding-bottom: 40rpx;
+		background: #fff;
+		display: flex;
+		align-items: center;
+		position: sticky;
+		top: 0;
+	}
+
+	.header-title image {
+		width: 14rpx;
+		height: 33rpx;
+		margin-right: 14rpx;
+	}
+
+	.avatar {
+		width: 400rpx;
+		height: 200rpx;
+		border-radius: 12rpx;
+	}
+
+	/* 展位状态说明样式 */
+	.status-description {
+		margin-top: 30rpx;
+		padding: 20rpx;
+		background-color: #f5f7fa;
+		border-radius: 8rpx;
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+	}
+
+	.status-title {
+		font-weight: bold;
+		margin-bottom: 16rpx;
+		width: 100%;
+	}
+
+	.status-item {
+		width: 43%;
+		display: flex;
+		align-items: center;
+		margin-right: 30rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.status-color {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 16rpx;
+	}
+
+	.status-color.available {
+		background-color: #67CFA7;
+		border: 2rpx solid #ddd;
+	}
+
+	.status-color.occupied {
+		background-color: #F6A1A1;
+	}
+
+	.status-color.pending {
+		background-color: #F8BB92;
+	}
+
+	.status-color.selected {
+		background-color: #79BEFE;
+	}
+
+	.status-text {
+		margin-right: 16rpx;
+	}
+
+	/* 透明按钮样式 */
+	.transparent-btn {
+		background: transparent !important;
+		border: 2rpx dashed #0983ff !important;
+	}
+</style>

components/keypress/keypress.vue

@@ -0,0 +1,52 @@
+<!-- #ifdef H5 -->
+<template>
+  <view></view>
+</template>
+
+<script>
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  }
+}
+// #endif
+</script>
+<!-- #endif -->

components/selectFilter/selectFilter.vue

@@ -206,6 +206,7 @@ defineExpose({
 .popup-content {
     color: #000000;
     height: 80vh;
+    padding-bottom: 90rpx;;
 }
 .popup-bottom {
     padding: 40rpx 28rpx 20rpx 28rpx;

components/selectJobs/selectJobs.vue

@@ -17,6 +17,7 @@
             </view>
             <view class="popup-list">
                 <expected-station
+                    style="height: 100%;"
                     :search="false"
                     @onChange="changeJobTitleId"
                     :station="state.stations"
@@ -125,6 +126,12 @@ const cleanup = () => {
 };
 
 const changeJobTitleId = (e) => {
+    if (!e.ids) {
+        count.value = 0;
+        JobsIdsValue.value = '';
+        JobsLabelValue.value = '';
+        return;
+    }
     const ids = e.ids.split(',').map((id) => Number(id));
     count.value = ids.length;
     JobsIdsValue.value = e.ids;
@@ -147,9 +154,9 @@ function serchforIt(defaultId) {
     if (state.stations.length) {
         const ids = defaultId
             ? defaultId.split(',').map((id) => Number(id))
-            : userInfo.value.jobTitleId.split(',').map((id) => Number(id));
+            : (userInfo.value.jobTitleId ? userInfo.value.jobTitleId.split(',').map((id) => Number(id)) : []);
         count.value = ids.length;
-        state.jobTitleId = defaultId ? defaultId : userInfo.value.jobTitleId;
+        state.jobTitleId = defaultId ? defaultId : (userInfo.value.jobTitleId || '');
         setCheckedNodes(state.stations, ids);
         state.visible = true;
         return;
@@ -160,7 +167,7 @@ function serchforIt(defaultId) {
             count.value = ids.length;
             setCheckedNodes(resData.data, ids);
         }
-        state.jobTitleId = userInfo.value.jobTitleId;
+        state.jobTitleId = userInfo.value.jobTitleId || '';
         state.stations = resData.data;
         state.visible = true;
     });

components/selectPopup/selectPopup.vue

@@ -13,7 +13,30 @@
                 <view class="btn-confirm" @click="confirm">确认</view>
             </view>
             <view class="popup-list">
+                <!-- 多选模式 -->
+                <view v-if="multiSelect" class="multi-select-list">
+                    <view v-if="!processedListData[0] || processedListData[0].length === 0" class="empty-tip">
+                        暂无数据
+                    </view>
+                    <view
+                        v-else
+                        class="skill-tags-container"
+                    >
+                        <view
+                            v-for="(item, index) in processedListData[0]"
+                            :key="index"
+                            class="skill-tag"
+                            :class="{ 'skill-tag-active': selectedValues.includes(item[this.rowKey]) }"
+                            @click.stop="toggleSelect(item)"
+                            @touchstart.stop="toggleSelect(item)"
+                        >
+                            <text class="skill-tag-text">{{ getLabel(item) }}</text>
+                        </view>
+                    </view>
+                </view>
+                <!-- 单选模式 -->
                 <picker-view
+                    v-else
                     indicator-style="height: 84rpx;"
                     :value="selectedIndex"
                     @change="bindChange"
@@ -54,6 +77,8 @@ export default {
             rowKey: 'value',
             selectedItems: [],
             unit: '',
+            multiSelect: false,
+            selectedValues: [],
         };
     },
     computed: {
@@ -66,6 +91,13 @@ export default {
                 });
             });
         },
+        // 计算选中的项目
+        computedSelectedItems() {
+            if (!this.multiSelect) return this.selectedItems;
+            return this.processedListData[0] ? this.processedListData[0].filter(item => 
+                this.selectedValues.includes(item[this.rowKey])
+            ) : [];
+        },
     },
     methods: {
         open(newConfig = {}) {
@@ -80,7 +112,10 @@ export default {
                 rowKey = 'value',
                 maskClick = false,
                 defaultIndex = [],
+                multiSelect = false,
+                defaultValues = [],
             } = newConfig;
+            
             this.reset();
             if (title) this.title = title;
             if (typeof success === 'function') this.confirmCallback = success;
@@ -92,10 +127,16 @@ export default {
             this.rowKey = rowKey;
             this.maskClick = maskClick;
             this.unit = unit;
+            this.multiSelect = multiSelect;
 
-            this.selectedIndex =
-                defaultIndex.length === this.listData.length ? defaultIndex : new Array(this.listData.length).fill(0);
-            this.selectedItems = this.selectedIndex.map((val, index) => this.processedListData[index][val]);
+            if (multiSelect) {
+                this.selectedValues = defaultValues || [];
+            } else {
+                this.selectedIndex =
+                    defaultIndex.length === this.listData.length ? defaultIndex : new Array(this.listData.length).fill(0);
+                this.selectedItems = this.selectedIndex.map((val, index) => this.processedListData[index][val]);
+            }
+            
             this.$nextTick(() => {
                 this.$refs.popup.open();
             });
@@ -117,6 +158,22 @@ export default {
         getLabel(item) {
             return item?.[this.rowLabel] ?? '';
         },
+        toggleSelect(item) {
+            if (!item || !this.rowKey || !item[this.rowKey]) {
+                return;
+            }
+            
+            const value = item[this.rowKey];
+            const index = this.selectedValues.indexOf(value);
+            
+            if (index > -1) {
+                // 取消选中
+                this.selectedValues.splice(index, 1);
+            } else {
+                // 选中
+                this.selectedValues.push(value);
+            }
+        },
         setColunm(index, list) {
             if (index > this.listData.length) {
                 return console.warn('最长' + this.listData.length);
@@ -135,7 +192,14 @@ export default {
             }
 
             try {
-                const result = await callback(this.selectedIndex, this.selectedItems); // 无论是 async 还是返回 Promise 的函数都可以 await
+                let result;
+                if (this.multiSelect) {
+                    // 多选模式：传递 selectedValues 和 selectedItems
+                    result = await callback(this.selectedValues, this.computedSelectedItems);
+                } else {
+                    // 单选模式：传递 selectedIndex 和 selectedItems
+                    result = await callback(this.selectedIndex, this.selectedItems);
+                }
                 if (result !== false) {
                     this.$refs.popup.close();
                 }
@@ -154,6 +218,8 @@ export default {
             this.rowKey = 'value';
             this.selectedItems = [];
             this.unit = '';
+            this.multiSelect = false;
+            this.selectedValues = [];
         },
     },
 };
@@ -224,10 +290,83 @@ export default {
         color: #666d7f;
         line-height: 38rpx;
     }
-    .btn-confirm {
+        .btn-confirm {
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #256bfa;
+        }
+    }
+
+.multi-select-list {
+    padding: 20rpx 30rpx;
+    max-height: calc(60vh - 120rpx);
+    overflow-y: auto;
+}
+
+.empty-tip {
+    text-align: center;
+    padding: 60rpx 0;
+    color: #999999;
+    font-size: 28rpx;
+}
+
+.skill-tags-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+    align-items: flex-start;
+}
+
+.skill-tag {
+    display: inline-flex;
+    align-items: center;
+    padding: 12rpx 20rpx;
+    border-radius: 20rpx;
+    background-color: #f8f9fa;
+    border: 2rpx solid #e8eaee;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    font-size: 24rpx;
+    color: #333333;
+    white-space: nowrap;
+    user-select: none;
+    
+    &:hover {
+        background-color: #e9ecef;
+        border-color: #d0d0d0;
+        transform: translateY(-1rpx);
+        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+    }
+    
+    &:active {
+        transform: translateY(0);
+        background-color: #dee2e6;
+    }
+    
+    .skill-tag-text {
+        font-size: 24rpx;
+        color: inherit;
+        line-height: 1.2;
         font-weight: 400;
-        font-size: 32rpx;
-        color: #256bfa;
+    }
+    
+    &.skill-tag-active {
+        background-color: #256bfa;
+        border-color: #256bfa;
+        color: #ffffff;
+        box-shadow: 0 2rpx 8rpx rgba(37, 107, 250, 0.3);
+        
+        .skill-tag-text {
+            color: #ffffff;
+            font-weight: 500;
+        }
+        
+        &:hover {
+            background-color: #1e5ce6;
+            border-color: #1e5ce6;
+            transform: translateY(-1rpx);
+            box-shadow: 0 4rpx 12rpx rgba(37, 107, 250, 0.4);
+        }
     }
 }
 </style>

components/tabbar/midell-box.vue

@@ -10,7 +10,7 @@
             >
                 <image :src="currentItem == item.id ? item.selectedIconPath : item.iconPath"></image>
             </view>
-            <view class="badge" v-if="item.badge">{{ item.badge }}</view>
+            <view class="badge" v-if="item.badge && item.badge > 0">{{ item.badge }}</view>
             <view class="item-bottom" :class="[currentItem == item.id ? 'item-active' : '']">
                 <text>{{ item.text }}</text>
             </view>
@@ -19,7 +19,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, computed } from 'vue';
+import { ref, onMounted, computed, watch, nextTick } from 'vue';
 import { useReadMsg } from '@/stores/useReadMsg';
 import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
@@ -36,35 +36,60 @@ const readMsg = useReadMsg();
 const { userInfo } = storeToRefs(useUserStore());
 const currentItem = ref(0);
 
-// 根据用户类型生成不同的导航栏配置
-const tabbarList = computed(() => {
+// 监听用户类型变化，重新生成tabbar配置
+watch(() => userInfo.value?.isCompanyUser, (newIsCompanyUser, oldIsCompanyUser) => {
+    console.log('midell-box用户类型变化监听:', { newIsCompanyUser, oldIsCompanyUser, userInfo: userInfo.value });
+    if (newIsCompanyUser !== oldIsCompanyUser) {
+        console.log('用户类型发生变化，重新生成tabbar:', newIsCompanyUser);
+        // tabbarList是computed，会自动重新计算
+        // 强制触发响应式更新
+        nextTick(() => {
+            console.log('tabbar配置已更新:', tabbarList.value);
+        });
+    }
+}, { immediate: true });
+
+// 监听用户信息变化（包括登录状态）
+watch(() => userInfo.value, (newUserInfo, oldUserInfo) => {
+    console.log('midell-box用户信息变化监听:', { newUserInfo, oldUserInfo });
+    if (newUserInfo !== oldUserInfo) {
+        console.log('用户信息发生变化，重新生成tabbar');
+        // 强制触发响应式更新
+        nextTick(() => {
+            console.log('tabbar配置已更新:', tabbarList.value);
+        });
+    }
+}, { immediate: true, deep: true });
+
+// 生成tabbar配置的函数
+const generateTabbarList = () => {
     const baseItems = [
         {
             id: 0,
-            text: '首页',
+            text: '职位2',
             path: '/pages/index/index',
             iconPath: '../../static/tabbar/calendar.png',
             selectedIconPath: '../../static/tabbar/calendared.png',
             centerItem: false,
-            badge: readMsg.badges[0].count,
+            badge: readMsg.badges[0]?.count || 0,
         },
         {
             id: 2,
-            text: '',
+            text: 'AI+',
             path: '/pages/chat/chat',
             iconPath: '../../static/tabbar/logo3.png',
             selectedIconPath: '../../static/tabbar/logo3.png',
             centerItem: true,
-            badge: readMsg.badges[2].count,
+            badge: readMsg.badges[2]?.count || 0,
         },
         {
             id: 3,
-            text: '消息',
+            text: '消息2',
             path: '/pages/msglog/msglog',
             iconPath: '../../static/tabbar/chat4.png',
             selectedIconPath: '../../static/tabbar/chat4ed.png',
             centerItem: false,
-            badge: readMsg.badges[3].count,
+            badge: readMsg.badges[3]?.count || 0,
         },
         {
             id: 4,
@@ -73,12 +98,12 @@ const tabbarList = computed(() => {
             iconPath: '../../static/tabbar/mine.png',
             selectedIconPath: '../../static/tabbar/mined.png',
             centerItem: false,
-            badge: readMsg.badges[4].count,
+            badge: readMsg.badges[4]?.count || 0,
         },
     ];
 
-    // 根据用户类型添加不同的导航项
-    const userType = userInfo.value?.userType || 0;
+    // 根据用户类型添加不同的导航项，未登录时默认为求职者
+    const userType = userInfo.value?.isCompanyUser !== undefined ? userInfo.value.isCompanyUser : 1;
     
     if (userType === 0) {
         // 企业用户：显示发布岗位，隐藏招聘会
@@ -86,13 +111,13 @@ const tabbarList = computed(() => {
             id: 1,
             text: '发布岗位',
             path: '/pages/job/publishJob',
-            iconPath: '../../static/tabbar/publish-job.svg',
-            selectedIconPath: '../../static/tabbar/publish-job-selected.svg',
+            iconPath: '../../static/tabbar/post.png',
+            selectedIconPath: '../../static/tabbar/posted.png',
             centerItem: false,
             badge: 0,
         });
     } else {
-        // 普通用户、网格员、政府人员：显示招聘会
+        // 求职者用户（包括未登录状态）：显示招聘会
         baseItems.splice(1, 0, {
             id: 1,
             text: '招聘会',
@@ -100,11 +125,16 @@ const tabbarList = computed(() => {
             iconPath: '../../static/tabbar/post.png',
             selectedIconPath: '../../static/tabbar/posted.png',
             centerItem: false,
-            badge: readMsg.badges[1].count,
+            badge: readMsg.badges[1]?.count || 0,
         });
     }
 
     return baseItems;
+};
+
+// 根据用户类型生成不同的导航栏配置
+const tabbarList = computed(() => {
+    return generateTabbarList();
 });
 
 onMounted(() => {
@@ -114,7 +144,7 @@ onMounted(() => {
 });
 
 const changeItem = (item) => {
-    // 判断是否为 tabBar 页面
+    // 判断是否为 TabBar 页面
     const tabBarPages = [
         '/pages/index/index',
         '/pages/careerfair/careerfair', 
@@ -124,12 +154,12 @@ const changeItem = (item) => {
     ];
     
     if (tabBarPages.includes(item.path)) {
-        // tabBar 页面使用 switchTab
-        uni.switchTab({
+        // TabBar 页面使用 redirectTo 避免页面栈溢出
+        uni.redirectTo({
             url: item.path,
         });
     } else {
-        // 非 tabBar 页面使用 navigateTo
+        // 非 TabBar 页面使用 navigateTo
         uni.navigateTo({
             url: item.path,
         });

components/wxAuthLogin/WxAuthLogin.vue

@@ -9,7 +9,7 @@
                 
                 <!-- Logo和标题 -->
                 <view class="auth-header">
-                    <image class="auth-logo" src="@/static/logo.png" mode="aspectFit"></image>
+                    <image class="auth-logo" src="@/static/logo2-S.png" mode="aspectFit"></image>
                     <view class="auth-title">欢迎使用就业服务</view>
                     <view class="auth-subtitle">需要您授权手机号登录</view>
                 </view>
@@ -102,6 +102,7 @@
 <script setup>
 import { ref, inject } from 'vue';
 import useUserStore from '@/stores/useUserStore';
+import { tabbarManager } from '@/utils/tabbarManager';
 
 const { $api } = inject('globalFunction');
 const { loginSetToken } = useUserStore();
@@ -162,22 +163,33 @@ const getPhoneNumber = (e) => {
 					userType: userType.value
 				}, 'post').then((resData) => {
 					uni.hideLoading();
-					
+					console.log(resData, 'resume.idCard');
 					if (resData.token) {
 						// 登录成功，存储token
 						loginSetToken(resData.token).then((resume) => {
+							// 更新用户类型到缓存
+                            if (resData.isCompanyUser !== undefined) {
+                                console.log(resData.isCompanyUser, 'resData.isCompanyUser');
+                                const userInfo = uni.getStorageSync('userInfo') || {};
+                                userInfo.isCompanyUser = Number(resData.isCompanyUser); // 0-企业用户，1-求职者
+                                uni.setStorageSync('userInfo', userInfo);
+                            }
+							
 							$api.msg('登录成功');
+							// 刷新tabbar以显示正确的用户类型
+							tabbarManager.refreshTabBar();
 							close();
 							emit('success');
 							
 							// 根据用户类型跳转到不同的信息补全页面
-							if (!resume.data.jobTitleId) {
-								if (userType.value === 1) {
+							if (!resume.jobTitleId) {
+                                console.log(resume, 'resume.idCard');
+								if (userType.value === 1 && !resData.idCard) {
 									// 求职者跳转到个人信息补全页面
 									uni.navigateTo({
 										url: '/pages/complete-info/complete-info?step=1'
 									});
-								} else if (userType.value === 0) {
+								} else if (userType.value === 0 && !resData.idCard) {
 									// 招聘者跳转到企业信息补全页面
 									uni.navigateTo({
 										url: '/pages/complete-info/company-info'
@@ -215,56 +227,12 @@ const wxLogin = () => {
     }
     
     // #ifdef H5
-    // H5网页微信登录逻辑
-    uni.showLoading({ title: '登录中...' });
-    
-    // 获取微信授权code
-    uni.login({
-        provider: 'weixin',
-        success: (loginRes) => {
-            console.log('微信登录成功：', loginRes);
-            
-            // 调用后端接口进行登录
-            $api.createRequest('/app/appLogin', {
-                code: loginRes.code,
-                userType: userType.value
-            }, 'post').then((resData) => {
-                uni.hideLoading();
-                
-                if (resData.token) {
-                    loginSetToken(resData.token).then((resume) => {
-                        $api.msg('登录成功');
-                        close();
-                        emit('success');
-                        
-                        if (!resume.data.jobTitleId) {
-                            if (userType.value === 1) {
-                                // 求职者跳转到个人信息补全页面
-                                uni.navigateTo({
-                                    url: '/pages/complete-info/complete-info?step=1'
-                                });
-                            } else if (userType.value === 0) {
-                                // 招聘者跳转到企业信息补全页面
-                                uni.navigateTo({
-                                    url: '/pages/complete-info/company-info'
-                                });
-                            }
-                        }
-                    });
-                } else {
-                    $api.msg('登录失败，请重试');
-                }
-            }).catch((err) => {
-                uni.hideLoading();
-                $api.msg(err.msg || '登录失败，请重试');
-            });
-        },
-        fail: (err) => {
-            uni.hideLoading();
-            console.error('微信登录失败：', err);
-            $api.msg('微信登录失败');
-        }
+    // H5端跳转到H5登录页面
+    close();
+    uni.navigateTo({
+        url: '/pages/login/h5-login'
     });
+    return;
     // #endif
     
     // #ifdef APP-PLUS
@@ -285,7 +253,16 @@ const wxLogin = () => {
                         }, 'post').then((resData) => {
                             if (resData.token) {
                                 loginSetToken(resData.token).then((resume) => {
+                                    // 更新用户类型到缓存
+                                    if (resData.isCompanyUser !== undefined) {
+                                        const userInfo = uni.getStorageSync('userInfo') || {};
+                                        userInfo.isCompanyUser = resData.isCompanyUser ? 0 : 1; // 0-企业用户，1-求职者
+                                        uni.setStorageSync('userInfo', userInfo);
+                                    }
+                                    
                                     $api.msg('登录成功');
+                                    // 刷新tabbar以显示正确的用户类型
+                                    tabbarManager.refreshTabBar();
                                     close();
                                     emit('success');
                                     
@@ -330,7 +307,16 @@ const testLogin = () => {
         uni.hideLoading();
         
         loginSetToken(resData.token).then((resume) => {
+            // 更新用户类型到缓存
+            if (resData.isCompanyUser !== undefined) {
+                const userInfo = uni.getStorageSync('userInfo') || {};
+                userInfo.isCompanyUser = resData.isCompanyUser ? 0 : 1; // 0-企业用户，1-求职者
+                uni.setStorageSync('userInfo', userInfo);
+            }
+            
             $api.msg('测试登录成功');
+            // 刷新tabbar以显示正确的用户类型
+            tabbarManager.refreshTabBar();
             close();
             emit('success');
             
@@ -522,4 +508,3 @@ defineExpose({
 button::after
     border: none
 </style>
-

config.js

@@ -1,6 +1,12 @@
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
-    baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
+    baseUrl: 'http://222.80.110.161:11111/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',
     // sseAI+
     // StreamBaseURl: 'http://39.98.44.136:8000',
     StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai',
@@ -70,4 +76,4 @@ export default {
         desc: '融合海量岗位、智能简历匹配、竞争力分析，助你精准锁定理想职位！',
         imgUrl: 'https://qd.zhaopinzao8dian.com/file/csn/qd_shareLogo.jpg',
     }
-}
+}

docs/H5端CSS引入问题解决方案.md

@@ -1,318 +0,0 @@
-# H5端CSS引入问题解决方案
-
-## ❌ 错误提示
-
-```
-iconfont.css:1 Failed to load module script: Expected a JavaScript module script but the server responded with a MIME type of "text/css". Strict MIME type checking is enforced for module scripts per HTML spec.
-```
-
-## 🔍 问题原因
-
-在 `main.js` 中使用了 **错误的方式** 引入CSS文件：
-
-```javascript
-// ❌ 错误：尝试将CSS作为JavaScript模块导入
-import './static/iconfont/iconfont.css'
-```
-
-这种 `import` 语法在H5端会导致浏览器尝试将CSS文件作为JavaScript模块加载，从而产生MIME类型错误。
-
-## ✅ 解决方案
-
-### 方案一：在 App.vue 中使用 @import（推荐）
-
-在 `App.vue` 的 `<style>` 标签中使用CSS的 `@import` 语法：
-
-```vue
-<style>
-/* 引入阿里图标库 */
-@import url("/static/iconfont/iconfont.css");
-</style>
-```
-
-**优点：**
-- ✅ 所有平台兼容（H5、小程序、App）
-- ✅ 符合CSS规范
-- ✅ 全局生效
-
-### 方案二：条件编译（如果必须在 main.js 中引入）
-
-如果确实需要在 `main.js` 中引入，使用条件编译：
-
-```javascript
-// #ifndef H5
-import './static/iconfont/iconfont.css'
-// #endif
-```
-
-然后在 `App.vue` 中单独为H5引入：
-
-```vue
-<style>
-/* #ifdef H5 */
-@import url("/static/iconfont/iconfont.css");
-/* #endif */
-</style>
-```
-
-## 📋 CSS引入方式对比
-
-### JavaScript import（不推荐用于CSS）
-
-```javascript
-// ❌ 在 main.js 中
-import './static/iconfont/iconfont.css'
-```
-
-**问题：**
-- H5端会报MIME类型错误
-- 将CSS当作JavaScript模块处理
-
-### CSS @import（推荐）
-
-```vue
-<!-- ✅ 在 App.vue 或其他 .vue 文件中 -->
-<style>
-@import url("/static/iconfont/iconfont.css");
-</style>
-```
-
-**优点：**
-- 所有平台兼容
-- 符合CSS标准
-- 不会产生MIME类型错误
-
-### 使用 <style> 标签的 src 属性（可选）
-
-```vue
-<style src="/static/iconfont/iconfont.css"></style>
-```
-
-## 🔧 修复步骤
-
-### Step 1: 删除 main.js 中的CSS import
-
-打开 `main.js`，找到并删除或注释掉：
-
-```javascript
-// import './static/iconfont/iconfont.css'  // 删除这行
-```
-
-### Step 2: 确认 App.vue 中的引入
-
-确保 `App.vue` 中有正确的CSS引入：
-
-```vue
-<style>
-@import '@/common/animation.css';
-@import '@/common/common.css';
-/* 引入阿里图标库 */
-@import url("/static/iconfont/iconfont.css");
-</style>
-```
-
-### Step 3: 清除缓存并重新编译
-
-1. 关闭开发服务器
-2. 清除浏览器缓存
-3. 重新运行 `npm run dev:h5` 或点击HBuilderX的运行按钮
-
-## 🎯 最佳实践
-
-### 全局CSS引入位置
-
-**推荐顺序：**
-
-```vue
-<!-- App.vue -->
-<style>
-/* 1. 重置样式 / 通用样式 */
-@import '@/common/reset.css';
-@import '@/common/common.css';
-
-/* 2. 第三方库样式 */
-@import url("/static/iconfont/iconfont.css");
-
-/* 3. 动画效果 */
-@import '@/common/animation.css';
-
-/* 4. 项目全局样式 */
-/* 自定义全局样式 */
-</style>
-```
-
-### 路径写法
-
-**绝对路径（推荐）：**
-```css
-@import url("/static/iconfont/iconfont.css");
-```
-
-**相对路径：**
-```css
-@import url("./static/iconfont/iconfont.css");
-@import url("@/static/iconfont/iconfont.css");
-```
-
-**注意：** 在不同平台上路径解析可能有差异，推荐使用绝对路径。
-
-## 🚫 常见错误
-
-### 错误1：在 main.js 中 import CSS
-
-```javascript
-// ❌ 错误
-import './styles/global.css'
-import '@/static/iconfont/iconfont.css'
-```
-
-**解决：** 改用 App.vue 的 `@import`
-
-### 错误2：路径不正确
-
-```css
-/* ❌ 错误：路径错误 */
-@import url("static/iconfont/iconfont.css");
-
-/* ✅ 正确：使用正确的路径 */
-@import url("/static/iconfont/iconfont.css");
-```
-
-### 错误3：缺少分号
-
-```css
-/* ❌ 错误：缺少分号 */
-@import url("/static/iconfont/iconfont.css")
-
-/* ✅ 正确：添加分号 */
-@import url("/static/iconfont/iconfont.css");
-```
-
-### 错误4：在 scoped 样式中引入
-
-```vue
-<!-- ❌ 不推荐：在 scoped 样式中引入全局CSS -->
-<style scoped>
-@import url("/static/iconfont/iconfont.css");
-</style>
-
-<!-- ✅ 推荐：全局样式不要加 scoped -->
-<style>
-@import url("/static/iconfont/iconfont.css");
-</style>
-```
-
-## 📊 平台兼容性
-
-| 引入方式 | H5 | 小程序 | App | 推荐 |
-|---------|----|----|-----|-----|
-| main.js import | ❌ | ✅ | ✅ | ❌ |
-| App.vue @import | ✅ | ✅ | ✅ | ✅ |
-| style src | ✅ | ✅ | ✅ | ✅ |
-| 条件编译 | ✅ | ✅ | ✅ | ⚠️ |
-
-## 🔍 调试方法
-
-### 1. 检查CSS是否加载
-
-在浏览器开发者工具中：
-
-```
-F12 → Network → Filter: CSS → 查找 iconfont.css
-```
-
-**成功标志：**
-- 状态码：200
-- Type: stylesheet
-- Size: 文件大小正常
-
-### 2. 检查字体文件
-
-```
-F12 → Network → Filter: Font → 查找 iconfont.ttf/woff
-```
-
-### 3. 检查控制台错误
-
-```
-F12 → Console → 查看是否有错误信息
-```
-
-### 4. 验证样式生效
-
-```javascript
-// 在控制台执行
-document.querySelector('.iconfont')
-// 应该能找到使用了 iconfont 类的元素
-```
-
-## ✅ 验证成功
-
-修复后，应该看到：
-
-1. ✅ H5端控制台无CSS加载错误
-2. ✅ 图标正常显示
-3. ✅ Network 中 iconfont.css 状态码为 200
-4. ✅ 字体文件正常加载
-
-## 📝 注意事项
-
-### uni-app 项目特点
-
-1. **多平台编译**
-   - H5端使用浏览器标准
-   - 小程序有自己的规范
-   - App使用原生渲染
-
-2. **路径处理**
-   - `@/` 代表项目根目录
-   - `/static/` 代表静态资源目录
-   - 不同平台路径解析略有差异
-
-3. **样式隔离**
-   - `scoped` 样式只在当前组件生效
-   - 全局样式在 App.vue 中引入
-   - 不要在 scoped 中引入全局CSS
-
-### Vite 项目特点
-
-如果使用 Vite 构建（HBuilderX 3.2+）：
-
-```javascript
-// main.js 中可以使用（但不推荐）
-import './static/iconfont/iconfont.css'
-```
-
-但为了兼容性，仍然推荐在 App.vue 中使用 `@import`。
-
-## 🎉 总结
-
-### 问题
-在 `main.js` 中使用 `import` 引入CSS导致H5端报错。
-
-### 解决
-1. ✅ 删除 `main.js` 中的 CSS import
-2. ✅ 在 `App.vue` 的 `<style>` 中使用 `@import`
-3. ✅ 重启开发服务器
-
-### 最佳实践
-- 所有全局CSS在 `App.vue` 中通过 `@import` 引入
-- 使用绝对路径：`/static/...`
-- 不要在 `scoped` 样式中引入全局CSS
-- 保持引入顺序：重置 → 第三方 → 动画 → 自定义
-
-## 📚 相关文档
-
-- [uni-app 样式导入](https://uniapp.dcloud.net.cn/tutorial/syntax-css.html#%E6%A0%B7%E5%BC%8F%E5%AF%BC%E5%85%A5)
-- [CSS @import](https://developer.mozilla.org/zh-CN/docs/Web/CSS/@import)
-- [Vite 静态资源处理](https://cn.vitejs.dev/guide/assets.html)
-
----
-
-**该问题已解决！** 🎉
-
-现在H5端应该可以正常加载CSS文件了。如果还有问题，请检查：
-1. 文件路径是否正确
-2. 是否清除了浏览器缓存
-3. 是否重启了开发服务器
-

docs/企业地址选择功能说明.md

@@ -1,207 +0,0 @@
-# 企业地址选择功能说明
-
-## 功能概述
-
-在企业信息补全页面（company-info.vue）中，点击"企业注册地点"字段的箭头时，会弹出一个五级联动选择器，用户可以选择省市区县街道社区的完整地址。
-
-## 实现的功能
-
-### 1. 五级联动选择
-- **省级选择**：选择省/直辖市/自治区
-- **市级选择**：根据选择的省，显示对应的市/地区
-- **区县选择**：根据选择的市，显示对应的区/县
-- **街道选择**：根据选择的区县，显示对应的街道/乡镇
-- **社区选择**：根据选择的街道，显示对应的社区/居委会
-
-### 2. 联动逻辑
-- 当选择省级时，自动更新并重置市级及以下选项
-- 当选择市级时，自动更新并重置区县及以下选项
-- 当选择区县时，自动更新并重置街道及以下选项
-- 当选择街道时，自动更新社区选项
-- 所有联动过程均实时响应，无需额外操作
-
-### 3. 地址格式
-- 选择完成后，地址格式为：`省/市/区/街道/社区`
-- 示例：`新疆维吾尔自治区/喀什地区/喀什市/学府街道/学府社区居委会`
-- 地址各级信息都会保存，包括代码和名称
-
-### 4. 数据存储
-- 保存完整的地址字符串（`registeredAddress`）
-- 保存各级行政区划代码和名称：
-  - 省：`provinceCode`、`provinceName`
-  - 市：`cityCode`、`cityName`
-  - 区县：`districtCode`、`districtName`
-  - 街道：`streetCode`、`streetName`
-  - 社区：`communityCode`、`communityName`
-
-## 技术实现
-
-### 组件架构
-- **组件名称**：`area-cascade-picker`
-- **组件位置**：`components/area-cascade-picker/area-cascade-picker.vue`
-- **依赖组件**：`uni-popup`（uni-app官方弹窗组件）
-
-### 核心技术
-- **picker-view**：uni-app的多列选择器组件
-- **五级联动**：通过监听选择变化，动态更新下级选项
-- **树形数据结构**：地区数据采用嵌套的树形结构，每级都有`children`属性
-
-### 数据格式
-```javascript
-{
-    code: '650000',           // 行政区划代码
-    name: '新疆维吾尔自治区',  // 名称
-    children: [               // 下级行政区
-        {
-            code: '653100',
-            name: '喀什地区',
-            children: [...]
-        }
-    ]
-}
-```
-
-### 数据流程
-
-1. **打开地址选择器**
-   ```javascript
-   // company-info.vue
-   const selectLocation = () => {
-       areaPicker.value?.open({
-           title: '选择企业注册地点',
-           maskClick: true,
-           success: (addressData) => {
-               // 处理选择结果
-               formData.registeredAddress = addressData.address
-               // 保存各级信息
-               formData.provinceCode = addressData.province?.code
-               formData.provinceName = addressData.province?.name
-               // ... 其他字段
-           }
-       })
-   }
-   ```
-
-2. **选择地址过程**
-   ```javascript
-   // area-cascade-picker.vue
-   bindChange(e) {
-       // 检测哪一级发生变化
-       // 更新对应级别及其下级的选项列表
-       // 触发change回调（可选）
-   }
-   ```
-
-3. **确认选择**
-   ```javascript
-   // area-cascade-picker.vue
-   confirm() {
-       const addressData = {
-           address: '新疆维吾尔自治区/喀什地区/喀什市/学府街道/学府社区居委会',
-           province: { code: '650000', name: '新疆维吾尔自治区' },
-           city: { code: '653100', name: '喀什地区' },
-           district: { code: '653101', name: '喀什市' },
-           street: { code: '65310101', name: '学府街道' },
-           community: { code: '6531010101', name: '学府社区居委会' }
-       }
-       // 调用success回调
-       callback(addressData)
-   }
-   ```
-
-## 文件结构
-
-```
-components/
-  └── area-cascade-picker/
-      └── area-cascade-picker.vue         # 五级联动地址选择组件
-pages/complete-info/
-  └── company-info.vue                    # 企业信息补全页面
-```
-
-## 数据字段
-
-在 `company-info.vue` 的 `formData` 中的地址相关字段：
-
-- `registeredAddress`: string - 完整地址（格式：省/市/区/街道/社区）
-- `registeredAddressName`: string - 地址名称
-- `provinceCode`: string - 省级行政区划代码
-- `provinceName`: string - 省级名称
-- `cityCode`: string - 市级行政区划代码
-- `cityName`: string - 市级名称
-- `districtCode`: string - 区县行政区划代码
-- `districtName`: string - 区县名称
-- `streetCode`: string - 街道行政区划代码
-- `streetName`: string - 街道名称
-- `communityCode`: string - 社区行政区划代码
-- `communityName`: string - 社区名称
-
-## 使用方法
-
-### 用户操作流程
-1. 在企业信息页面，点击"企业注册地点"右侧的箭头图标
-2. 弹出五级联动地址选择器
-3. 依次选择：
-   - 第一列：选择省/直辖市/自治区
-   - 第二列：选择市/地区（根据第一列自动更新）
-   - 第三列：选择区/县（根据第二列自动更新）
-   - 第四列：选择街道/乡镇（根据第三列自动更新）
-   - 第五列：选择社区/居委会（根据第四列自动更新）
-4. 确认选择无误后，点击右上角"确认"按钮
-5. 选择器关闭，地址自动填充到表单中
-
-### 界面说明
-- **顶部标题栏**：
-  - 左侧"取消"按钮：关闭选择器，不保存
-  - 中间标题：显示"选择企业注册地点"
-  - 右侧"确认"按钮：确认选择并保存
-- **五列选择器**：
-  - 每列显示当前级别的所有选项
-  - 可上下滑动选择
-  - 选中项高亮显示
-  - 各列之间自动联动
-
-## 注意事项
-
-1. **数据来源**：
-   - 当前使用本地模拟数据，包含主要城市的五级地址
-   - 生产环境建议接入后端API，提供完整的全国地址数据
-   - 后端API接口：`/app/common/area/cascade`（需要实现）
-
-2. **数据格式要求**：
-   - 必须是树形结构，每级通过`children`属性嵌套
-   - 每个节点必须包含`code`（行政区划代码）和`name`（名称）
-   - 最深五级：省 → 市 → 区县 → 街道 → 社区
-
-3. **性能考虑**：
-   - 地址数据量大时，建议使用懒加载方式
-   - 可以先加载省市区，街道和社区按需加载
-   - 考虑使用缓存机制，避免重复加载
-
-4. **兼容性**：
-   - 支持H5、微信小程序等多端
-   - 使用uni-app原生组件，兼容性好
-
-## 后续优化建议
-
-1. **数据优化**：
-   - 接入后端API，提供完整的全国地址数据
-   - 实现地址数据的懒加载
-   - 添加地址数据缓存机制
-
-2. **功能增强**：
-   - 支持默认值回显（编辑时显示已选地址）
-   - 添加搜索功能，快速定位地址
-   - 支持手动输入详细地址（如门牌号）
-   - 增加常用地址保存功能
-
-3. **用户体验**：
-   - 优化滑动选择的流畅度
-   - 添加选择预览功能
-   - 支持快速选择最近使用的地址
-
-4. **数据扩展**：
-   - 支持国际地址选择
-   - 添加邮政编码自动填充
-   - 提供经纬度坐标（结合地理编码服务）
-

docs/微信小程序组件依赖问题解决方案.md

@@ -1,284 +0,0 @@
-# 微信小程序组件依赖问题解决方案
-
-## 问题描述
-
-```
-components/IconfontIcon/IconfontIcon.js 已被代码依赖分析忽略，无法被其他模块引用。
-你可根据控制台中的【代码依赖分析】告警信息修改代码，或关闭【过滤无依赖文件】功能。
-```
-
-## 问题原因
-
-1. **组件未被正确引用** - 组件文件存在但没有被任何页面或组件引用
-2. **缺少 easycom 配置** - uni-app 项目需要在 `pages.json` 中配置组件自动引入
-3. **文件路径问题** - 组件路径不正确或文件名不匹配
-
-## ✅ 解决方案
-
-### 方案一：配置 easycom 自动引入（推荐）✨
-
-在 `pages.json` 中添加 `easycom` 配置：
-
-```json
-{
-  "easycom": {
-    "autoscan": true,
-    "custom": {
-      "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue",
-      "^IconfontIcon$": "@/components/IconfontIcon/IconfontIcon.vue",
-      "^WxAuthLogin$": "@/components/WxAuthLogin/WxAuthLogin.vue"
-    }
-  }
-}
-```
-
-**配置说明：**
-- `autoscan: true` - 自动扫描 `components` 目录
-- `custom` - 自定义组件路径映射
-- `^IconfontIcon$` - 组件名称（大小写敏感）
-- 配置后无需 import，直接在模板中使用
-
-**使用方式：**
-```vue
-<template>
-  <!-- 无需 import，直接使用 -->
-  <IconfontIcon name="home" :size="48" />
-  <WxAuthLogin ref="loginRef" />
-</template>
-```
-
-### 方案二：手动引入组件
-
-如果不想使用 easycom，可以在需要的页面手动引入：
-
-```vue
-<script setup>
-import IconfontIcon from '@/components/IconfontIcon/IconfontIcon.vue'
-</script>
-
-<template>
-  <IconfontIcon name="home" />
-</template>
-```
-
-### 方案三：关闭"过滤无依赖文件"功能
-
-如果组件确实暂时不需要使用，可以在微信开发者工具中关闭此功能：
-
-1. 打开微信开发者工具
-2. 点击右上角"详情"
-3. 找到"本地设置"标签
-4. 取消勾选"过滤无依赖文件"
-
-**注意：** 不推荐此方法，因为会增加打包体积。
-
-## 🔧 完整操作步骤
-
-### Step 1: 确认文件结构
-
-确保组件文件存在且路径正确：
-
-```
-components/
-├── IconfontIcon/
-│   └── IconfontIcon.vue      ✅ 文件存在
-└── WxAuthLogin/
-    └── WxAuthLogin.vue        ✅ 文件存在
-```
-
-### Step 2: 修改 pages.json
-
-已为你自动添加了 easycom 配置，位置在 `globalStyle` 后面。
-
-### Step 3: 重启微信开发者工具
-
-1. 关闭微信开发者工具
-2. 重新打开项目
-3. 等待编译完成
-
-### Step 4: 清除缓存
-
-如果问题仍然存在：
-
-1. 点击顶部菜单"工具" → "清除缓存"
-2. 选择"清除文件缓存"
-3. 重新编译项目
-
-### Step 5: 验证组件可用
-
-在任意页面中测试：
-
-```vue
-<template>
-  <view>
-    <IconfontIcon name="home" :size="48" color="#13C57C" />
-  </view>
-</template>
-
-<script setup>
-// 使用 easycom 后无需 import
-</script>
-```
-
-## 📋 配置详解
-
-### easycom 规则说明
-
-```json
-{
-  "easycom": {
-    // 是否自动扫描 components 目录
-    "autoscan": true,
-    
-    // 自定义规则
-    "custom": {
-      // 格式: "匹配规则": "组件路径"
-      "^IconfontIcon$": "@/components/IconfontIcon/IconfontIcon.vue"
-    }
-  }
-}
-```
-
-**匹配规则说明：**
-- `^` - 字符串开始
-- `$` - 字符串结束
-- `^IconfontIcon$` - 精确匹配 `IconfontIcon`
-- `^uni-(.*)` - 匹配所有 `uni-` 开头的组件
-
-### 组件命名规范
-
-**推荐命名：**
-- ✅ `IconfontIcon` - 大驼峰命名
-- ✅ `WxAuthLogin` - 大驼峰命名
-- ✅ `MyCustomComponent` - 大驼峰命名
-
-**不推荐：**
-- ❌ `iconfontIcon` - 小驼峰
-- ❌ `iconfont-icon` - 短横线
-- ❌ `Iconfont_Icon` - 下划线
-
-## 🎯 常见问题
-
-### Q1: 配置后仍然报错？
-
-**解决方法：**
-1. 检查 `pages.json` 语法是否正确（JSON格式）
-2. 确认组件路径是否正确
-3. 重启微信开发者工具
-4. 清除缓存后重新编译
-
-### Q2: 组件找不到？
-
-**检查清单：**
-- [ ] 文件路径是否正确：`@/components/IconfontIcon/IconfontIcon.vue`
-- [ ] 文件名大小写是否一致
-- [ ] 组件名称是否与配置匹配
-- [ ] 是否重启了开发者工具
-
-### Q3: 在页面中使用组件报错？
-
-**常见原因：**
-```vue
-<!-- ❌ 错误：使用了短横线命名 -->
-<iconfont-icon name="home" />
-
-<!-- ✅ 正确：使用大驼峰命名 -->
-<IconfontIcon name="home" />
-```
-
-### Q4: 多个组件如何配置？
-
-```json
-{
-  "easycom": {
-    "autoscan": true,
-    "custom": {
-      "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue",
-      "^IconfontIcon$": "@/components/IconfontIcon/IconfontIcon.vue",
-      "^WxAuthLogin$": "@/components/WxAuthLogin/WxAuthLogin.vue",
-      "^CustomButton$": "@/components/CustomButton/CustomButton.vue"
-    }
-  }
-}
-```
-
-### Q5: autoscan 和 custom 的区别？
-
-**autoscan（自动扫描）：**
-```
-components/
-├── CustomButton/
-│   └── CustomButton.vue    → 自动识别为 <CustomButton>
-├── MyCard/
-│   └── MyCard.vue          → 自动识别为 <MyCard>
-```
-
-**custom（自定义规则）：**
-```json
-{
-  "custom": {
-    "^Button$": "@/components/CustomButton/CustomButton.vue"
-  }
-}
-```
-使用 `<Button>` 会映射到 `CustomButton.vue`
-
-## 🔍 调试方法
-
-### 1. 查看编译日志
-
-在微信开发者工具控制台查看编译信息：
-```
-点击顶部"编译" → 查看控制台输出
-```
-
-### 2. 检查组件是否被打包
-
-1. 打开"详情" → "本地设置"
-2. 查看"代码依赖分析"信息
-3. 确认组件是否在依赖树中
-
-### 3. 手动引入测试
-
-```vue
-<script setup>
-// 临时测试：手动引入
-import IconfontIcon from '@/components/IconfontIcon/IconfontIcon.vue'
-console.log('组件加载成功:', IconfontIcon)
-</script>
-```
-
-## ✅ 验证成功标志
-
-配置成功后，应该看到：
-
-1. ✅ 微信开发者工具控制台无警告
-2. ✅ 组件可以正常显示
-3. ✅ 无需 import 即可使用
-4. ✅ 组件出现在代码依赖分析中
-
-## 📚 相关文档
-
-- [uni-app easycom 文档](https://uniapp.dcloud.net.cn/collocation/pages.html#easycom)
-- [微信小程序代码依赖分析](https://developers.weixin.qq.com/miniprogram/dev/devtools/codecompile.html)
-- [组件化开发文档](https://uniapp.dcloud.net.cn/tutorial/vue3-components.html)
-
-## 🎉 总结
-
-该问题已通过以下方式解决：
-
-1. ✅ 在 `pages.json` 中添加了 `easycom` 配置
-2. ✅ 配置了 `IconfontIcon` 和 `WxAuthLogin` 组件的自动引入
-3. ✅ 组件现在可以在任何页面中直接使用，无需 import
-
-**下一步：**
-- 重启微信开发者工具
-- 清除缓存
-- 开始使用组件
-
-如果问题仍然存在，请检查：
-1. 文件路径是否正确
-2. 文件名大小写是否一致
-3. pages.json 语法是否正确
-4. 是否已重启开发者工具
-

docs/微信授权登录功能说明.md

@@ -1,321 +0,0 @@
-# 微信授权登录功能说明
-
-## 功能概述
-
-本次开发实现了微信授权登录功能，当用户点击首页的特定功能时，会检查用户是否已登录，如果未登录则弹出授权弹窗，而不是直接跳转到登录页面。
-
-## 主要功能点
-
-### 1. 需要登录验证的功能入口
-
-以下功能在点击时会进行登录验证：
-
-- **附近工作** - 点击后跳转到附近工作列表页
-- **九宫格服务功能** - 包含9个服务项：
-  - 服务指导
-  - 事业单位招录
-  - 简历制作
-  - 劳动政策指引
-  - 技能培训信息
-  - 技能评价指引
-  - 题库和考试
-  - 素质测评
-  - AI智能面试
-- **职位列表** - 点击任意职位卡片查看详情
-
-### 2. 登录弹窗功能
-
-#### 弹窗特性
-- 使用 `uni-popup` 组件实现弹窗效果
-- 弹窗居中显示，支持关闭按钮
-- 不可点击遮罩关闭，确保用户必须做出选择
-
-#### 弹窗内容
-- **Logo和标题** - 显示应用logo和欢迎信息
-- **授权说明** - 列出三个要点：
-  - 保护您的个人信息安全
-  - 为您推荐更合适的岗位
-  - 享受完整的就业服务
-- **授权按钮**：
-  - 微信小程序：使用 `open-type="getPhoneNumber"` 获取手机号
-  - H5/App：使用微信登录接口
-  - 测试登录按钮（仅H5/App环境显示）
-- **用户协议** - 显示用户协议和隐私政策链接
-
-### 3. 登录流程
-
-#### 微信小程序登录流程
-1. 用户点击"微信授权登录"按钮
-2. 触发微信小程序的手机号授权
-3. 获取到 `code`、`encryptedData`、`iv`
-4. 调用后端 `/app/wxLogin` 接口
-5. 后端返回 `token`
-6. 存储 `token` 并获取用户信息
-7. 如果用户信息不完整，跳转到完善信息页面
-8. 关闭弹窗，继续用户之前的操作
-
-#### H5/App登录流程
-1. 用户点击"微信授权登录"按钮
-2. 调用 `uni.login` 获取微信授权 `code`
-3. 调用后端 `/app/wxLogin` 接口
-4. 后续流程同上
-
-#### 测试登录流程（仅开发环境）
-1. 用户点击"测试账号登录"按钮
-2. 使用测试账号密码登录
-3. 后续流程同上
-
-### 4. 登录状态管理
-
-#### 状态恢复
-- 应用启动时自动从本地缓存恢复用户信息
-- 验证 `token` 是否有效
-- 如果 `token` 失效，清除缓存但不跳转登录页
-
-#### 状态检查
-- 使用 `checkLogin()` 函数统一检查登录状态
-- 检查 `token` 是否存在
-- 检查 `hasLogin` 状态
-- 如果未登录，自动打开授权弹窗
-
-## 文件结构
-
-```
-ks-app-employment-service/
-├── components/
-│   └── WxAuthLogin/
-│       └── WxAuthLogin.vue         # 微信授权登录弹窗组件
-├── pages/
-│   └── index/
-│       └── components/
-│           └── index-one.vue       # 首页组件（已修改）
-├── stores/
-│   └── useUserStore.js             # 用户状态管理（已修改）
-├── App.vue                         # 应用入口（已修改）
-└── docs/
-    └── 微信授权登录功能说明.md     # 本文档
-```
-
-## 核心代码说明
-
-### 1. WxAuthLogin.vue 组件
-
-这是一个可复用的微信授权登录弹窗组件，提供以下接口：
-
-**Props**
-- 无
-
-**Events**
-- `success` - 登录成功时触发
-- `cancel` - 取消登录时触发
-
-**Methods**
-- `open()` - 打开弹窗
-- `close()` - 关闭弹窗
-
-**使用示例**
-```vue
-<template>
-  <WxAuthLogin ref="wxAuthLoginRef" @success="handleLoginSuccess" />
-</template>
-
-<script setup>
-import WxAuthLogin from '@/components/WxAuthLogin/WxAuthLogin.vue';
-
-const wxAuthLoginRef = ref(null);
-
-const handleLoginSuccess = () => {
-  console.log('登录成功');
-  // 执行登录后的操作
-};
-
-// 打开登录弹窗
-const showLogin = () => {
-  wxAuthLoginRef.value?.open();
-};
-</script>
-```
-
-### 2. 登录检查函数
-
-在 `index-one.vue` 中添加了统一的登录检查函数：
-
-```javascript
-// 登录检查函数
-const checkLogin = () => {
-    const tokenValue = uni.getStorageSync('token') || '';
-    if (!tokenValue || !hasLogin.value) {
-        // 未登录，打开授权弹窗
-        wxAuthLoginRef.value?.open();
-        return false;
-    }
-    return true;
-};
-```
-
-### 3. 点击事件处理
-
-所有需要登录的功能都使用统一的检查逻辑：
-
-```javascript
-// 处理附近工作点击
-const handleNearbyClick = () => {
-    if (checkLogin()) {
-        navTo('/pages/nearby/nearby');
-    }
-};
-
-// 处理服务功能点击
-const handleServiceClick = (serviceType) => {
-    if (checkLogin()) {
-        navToService(serviceType);
-    }
-};
-
-// 处理职位详情点击
-function nextDetail(job) {
-    if (checkLogin()) {
-        // 记录岗位类型，用作数据分析
-        if (job.jobCategory) {
-            const recordData = recommedIndexDb.JobParameter(job);
-            recommedIndexDb.addRecord(recordData);
-        }
-        navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
-    }
-}
-```
-
-### 4. 状态管理优化
-
-在 `useUserStore.js` 中优化了 `logOut` 函数：
-
-```javascript
-const logOut = (redirect = true) => {
-    hasLogin.value = false;
-    token.value = ''
-    resume.value = {}
-    userInfo.value = {}
-    role.value = {}
-    uni.removeStorageSync('userInfo')
-    uni.removeStorageSync('token')
-    
-    // 只有在明确需要跳转时才跳转到补全信息页
-    if (redirect) {
-        uni.redirectTo({
-            url: '/pages/complete-info/complete-info',
-        });
-    }
-}
-```
-
-## 后端接口要求
-
-### 1. 微信登录接口
-
-**接口地址**: `/app/appLogin`  
-**请求方法**: `POST`  
-**请求参数**:
-
-#### 微信小程序
-```json
-{
-  "code": "string",           // 微信登录凭证
-  "encryptedData": "string",  // 加密数据
-  "iv": "string"              // 加密算法初始向量
-}
-```
-
-#### H5/App
-```json
-{
-  "code": "string"  // 微信登录凭证
-}
-```
-
-**返回数据**:
-```json
-{
-  "token": "string",    // 用户token
-  "msg": "string",      // 返回消息
-  "code": 200          // 状态码
-}
-```
-
-### 2. 获取用户信息接口
-
-**接口地址**: `/app/user/resume`  
-**请求方法**: `GET`  
-**请求头**: `Authorization: Bearer {token}`
-
-**返回数据**:
-```json
-{
-  "code": 200,
-  "data": {
-    "name": "string",
-    "phone": "string",
-    "jobTitle": ["string"],
-    "jobTitleId": "string",
-    // ... 其他用户信息
-  }
-}
-```
-
-## 注意事项
-
-1. **小程序配置**
-   - 需要在微信小程序后台配置服务器域名
-   - 需要申请手机号授权权限
-
-2. **H5配置**
-   - 需要配置微信公众号的授权回调域名
-   - 需要引入微信JSSDK
-
-3. **安全性**
-   - Token存储在本地缓存中，注意加密
-   - 敏感操作前需要重新验证token有效性
-
-4. **用户体验**
-   - 登录弹窗不可通过点击遮罩关闭，确保用户必须做出选择
-   - 提供测试登录按钮方便开发调试
-   - 登录成功后自动刷新数据
-
-5. **兼容性**
-   - 使用条件编译确保在不同平台上正常运行
-   - 小程序、H5、App使用不同的登录逻辑
-
-## 测试建议
-
-### 功能测试
-1. 未登录状态点击"附近工作"，应弹出登录弹窗
-2. 未登录状态点击九宫格任意服务，应弹出登录弹窗
-3. 未登录状态点击职位列表，应弹出登录弹窗
-4. 登录成功后，能够正常访问所有功能
-5. 关闭登录弹窗后，不会自动跳转到登录页
-
-### 登录流程测试
-1. 微信小程序：测试手机号授权流程
-2. H5：测试微信网页授权流程
-3. 测试账号登录功能（开发环境）
-4. 测试登录失败的错误提示
-5. 测试用户取消授权的处理
-
-### 状态管理测试
-1. 测试应用重启后登录状态的恢复
-2. 测试token失效后的处理
-3. 测试退出登录功能
-4. 测试多次登录的状态切换
-
-## 更新日志
-
-### v1.0.0 (2024-10-20)
-- 创建微信授权登录弹窗组件
-- 添加登录状态检查逻辑
-- 优化用户状态管理
-- 更新首页各功能的登录验证
-- 完善登录流程和错误处理
-
-## 开发者
-- 开发时间: 2024-10-20
-- 涉及模块: 登录模块、首页模块、用户状态管理
-

docs/编译器内存溢出解决方案.md

@@ -1,138 +0,0 @@
-# 编译器内存溢出解决方案
-
-## 问题描述
-编译时出现 `FATAL ERROR: Reached heap limit Allocation failed - JavaScript heap out of memory` 错误，表示 Node.js 内存不足。
-
-## 解决方案
-
-### 方案一：增加 Node.js 内存限制（推荐）
-
-#### 在 HBuilderX 中设置
-
-1. **修改 HBuilderX 配置文件**
-   - 关闭 HBuilderX
-   - 找到 HBuilderX 安装目录
-   - 打开 `HBuilderX\plugins\node\node_modules\@dcloudio\vite-plugin-uni\dist` 目录
-   - 或者在项目根目录创建 `vue.config.js` 文件
-
-2. **创建或修改项目根目录下的 `vue.config.js`**
-   ```javascript
-   module.exports = {
-     transpileDependencies: [],
-     // 增加 Node.js 内存限制
-     configureWebpack: {
-       devServer: {
-         disableHostCheck: true
-       }
-     }
-   }
-   ```
-
-3. **修改 HBuilderX 启动配置**
-   - 找到 HBuilderX 安装目录
-   - 编辑 `HBuilderX.exe` 的启动参数
-   - 创建一个批处理文件 `start-hbuilderx.bat`：
-   ```bat
-   @echo off
-   set NODE_OPTIONS=--max-old-space-size=8192
-   start "" "HBuilderX安装路径\HBuilderX.exe"
-   ```
-   - 将内存设置为 8GB（8192MB），可根据实际情况调整为 4096、8192 或更大
-
-#### 在命令行中运行（如果使用 CLI）
-
-如果您使用命令行方式编译，可以设置环境变量：
-
-**Windows PowerShell：**
-```powershell
-$env:NODE_OPTIONS="--max-old-space-size=8192"
-```
-
-**Windows CMD：**
-```cmd
-set NODE_OPTIONS=--max-old-space-size=8192
-```
-
-**永久设置（Windows 系统环境变量）：**
-1. 右键"此电脑" → "属性" → "高级系统设置" → "环境变量"
-2. 在"用户变量"或"系统变量"中新建变量：
-   - 变量名：`NODE_OPTIONS`
-   - 变量值：`--max-old-space-size=8192`
-3. 重启 HBuilderX
-
-### 方案二：清理缓存
-
-1. **清理 HBuilderX 缓存**
-   - 在 HBuilderX 中：运行 → 清理项目缓存
-   - 或者手动删除 `unpackage` 目录
-
-2. **删除 node_modules 并重新安装**
-   ```powershell
-   Remove-Item -Recurse -Force node_modules
-   # 如果有 package.json，重新安装依赖
-   npm install
-   ```
-
-### 方案三：优化项目
-
-1. **检查大文件**
-   - 检查 `static` 目录下是否有过大的图片或资源文件
-   - 当前项目中有 85 个 icon 图片，建议：
-     - 压缩图片文件
-     - 使用雪碧图或字体图标代替多个小图标
-     - 将不常用的资源移到云存储
-
-2. **检查第三方库**
-   - 检查 `lib` 目录中的第三方库是否必需
-   - 当前已引入的库：
-     - dompurify@3.2.4es.js
-     - markdown-it.min.js
-     - highlight-uni.min.js
-     - lunar-javascript@1.7.2.js
-     - string-similarity.min.js
-   - 考虑按需引入或延迟加载
-
-3. **优化编译配置**
-   在 `manifest.json` 中的 `h5.optimization` 已启用 `treeShaking`，这很好。
-
-4. **分包加载**
-   - 已使用 `packageA` 分包，继续保持
-   - 考虑将更多页面移到分包中
-
-### 方案四：升级 HBuilderX
-
-确保使用最新版本的 HBuilderX，新版本通常有更好的内存管理。
-
-## 推荐操作步骤
-
-1. **立即执行：** 设置 `NODE_OPTIONS` 环境变量为 `--max-old-space-size=8192`
-2. **清理缓存：** 在 HBuilderX 中清理项目缓存
-3. **重启 HBuilderX：** 使用新的环境变量启动
-4. **长期优化：** 压缩静态资源，优化第三方库引入
-
-## 验证
-
-设置完成后，重新编译项目，查看是否还会出现内存溢出错误。
-
-## 参考资料
-
-- [uni-app 官方文档 - 内存溢出问题](https://uniapp.dcloud.net.cn/tutorial/run/OOM.html)
-- Node.js 内存限制说明：
-  - 默认限制：约 1.4GB（32位）或 1.7GB（64位）
-  - 建议设置：4096MB（4GB）或 8192MB（8GB）
-  - 最大可设置：取决于系统可用内存
-
-## 常见问题
-
-**Q: 设置后仍然内存溢出？**
-A: 尝试增大内存限制值，如 `--max-old-space-size=16384`（16GB）
-
-**Q: 如何检查当前 Node.js 内存限制？**
-A: 在命令行运行：`node -e "console.log(require('v8').getHeapStatistics().heap_size_limit/(1024*1024))"`
-
-**Q: 编译特别慢？**
-A: 内存充足但编译慢，可能是 CPU 性能问题，考虑：
-- 关闭不必要的后台程序
-- 使用 SSD 硬盘
-- 升级硬件配置
-

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

@@ -0,0 +1,237 @@
+# 职业图谱功能接口说明
+
+## 📋 目录
+- [一、职业路径相关接口](#一职业路径相关接口)
+- [二、职业技能相关接口](#二职业技能相关接口)
+- [三、职业推荐相关接口](#三职业推荐相关接口)
+- [四、接口使用场景](#四接口使用场景)
+
+---
+
+## 一、职业路径相关接口
+
+### 1. `getJobPathPage` - 根据职业名称获取路径列表
+- **接口路径**: `/jobPath/getJobPathPage`
+- **请求方法**: `GET`
+- **接口类型**: `zytp`
+- **参数**:
+  - `jobName` (可选): 职业名称，用于搜索
+  - `pageNo`: 页码
+  - `pageSize`: 每页数量
+- **返回数据**: 
+  ```json
+  {
+    "code": 0,
+    "data": {
+      "list": [
+        {
+          "id": 1,
+          "startJobId": 1,
+          "startJob": "AI产品经理",
+          "endJobId": 1,
+          "endJob": "推荐算法",
+          "jobOrder": "AI产品经理，AI训练师，图像识别，导航算法，推荐算法",
+          "jobCount": 5
+        }
+      ],
+      "total": 16
+    }
+  }
+  ```
+- **使用场景**:
+  - ✅ **CareerPath.vue**: 获取目标职业选项列表（下拉选择器）
+  - ✅ **CareerRecommend.vue**: 通过 `jobName` 查询获取 `jobId`（当缺少 jobId 时）
+  - ✅ **CareerPath.vue**: 查询时如果没有 jobPathId，通过 jobName 查找
+
+---
+
+### 2. ``getJobPathById`- 根据职业路径ID获取详情
+- **接口路径**: `/jobPath/getJobPathById`
+- **请求方法**: `GET`
+- **接口类型**: `zytp`
+- **参数**:
+  - `jobPathId`: 职业路径ID
+- **返回数据**: 
+  ```json
+  {
+    "data": [
+      {
+        "name": "职位名称",
+        "skillNameList": "技能1,技能2,技能3"
+      }
+    ]
+  }
+  ```
+- **使用场景**:
+  - ✅ **CareerPath.vue**: 获取职业路径的详细信息（起点、中间步骤、终点及每个职位的技能列表）
+  - 用于显示完整的职业发展路径时间线
+
+---
+
+### 3. `getJobPathNum` - 获取职业路径数量
+- **接口路径**: `/jobPath/getJobPathNum`
+- **请求方法**: `GET`
+- **接口类型**: `zytp`
+- **参数**: 无
+- **返回数据**: 
+  ```json
+  {
+    "data": 16  // 路径总数
+  }
+  ```
+- **使用场景**:
+  - ✅ **CareerPath.vue**: 显示"系统已收录 X 条职业路径"
+
+---
+
+## 二、职业技能相关接口
+
+### 4. `getJobSkillDetail` - 获取职位技能详情
+- **接口路径**: `/jobSkillDet/getJobSkillDet`
+- **请求方法**: `GET`
+- **接口类型**: `zytp`
+- **参数**:
+  - `jobId` (必需): 职位ID
+  - `jobName` (可选): 职位名称
+- **返回数据**: 
+  ```json
+  {
+    "data": [
+      {
+        "skillName": "技能名称",
+        "skillScore": "技能分数"
+      }
+    ]
+  }
+  ```
+- **使用场景**:
+  - ✅ **career-planning.vue**: 点击推荐职位卡片时，获取该职位的技能详情（用于技能详情弹窗 `SkillDetailPopup`）
+  - **调用位置**: `handleJobCardClick` 函数中
+
+---
+
+### 5. `getJobPathSkill` - 获取职业路径技能（已隐藏，暂未使用）
+- **接口路径**: `/jobSkillDet/getJobPathSkill`
+- **请求方法**: `POST`
+- **接口类型**: `zytp`
+- **参数**:
+  - `pathId`: 路径ID
+  - `currentJobName`: 当前职位名称
+- **返回数据**: `List<JobSkillDetVO>` (包含技能分数、类型等详细信息)
+- **使用场景**: 
+  - ❌ 暂未在代码中使用
+  - 💡 **潜在使用场景**: 在 `CareerPath.vue` 中，如果用户点击路径中的某个职位，需要查看该职位在路径中的详细技能信息（包含技能分数、类型等）时，可以使用此接口
+  - **当前状态**: 接口已注释隐藏，如需使用请取消注释
+
+---
+
+## 三、职业推荐相关接口
+
+### 8. `recommendJob` - 推荐职位
+- **接口路径**: `/job/recommendJobByJobName`
+- **请求方法**: `GET`
+- **接口类型**: `zytp`
+- **参数**:
+  - `jobName` (必需): 当前职位名称（从缓存中获取），通过 URL 参数传递，格式：`/job/recommendJobByJobName?jobName=职位名称`
+- **返回数据**: 
+  ```json
+  {
+    "data": [
+      {
+        "jobId": 123,
+        "jobName": "推荐职位名称",
+        "skillList": [
+          {
+            "skillName": "技能名称"
+          }
+        ]
+      }
+    ]
+  }
+  ```
+- **使用场景**:
+  - ✅ **CareerRecommend.vue**: 根据当前职位名称（从缓存中获取），获取相似推荐职位列表（显示在"相似推荐职位"区域）
+
+---
+
+## 四、接口使用场景
+
+### 📍 页面结构
+```
+career-planning.vue (主页面)
+├── Tab 0: 职业推荐 (CareerRecommend.vue)
+├── Tab 1: 职业路径 (CareerPath.vue)
+└── Tab 2: 技能发展 (SkillDevelopment.vue)
+```
+
+### 📍 职业推荐 Tab (CareerRecommend.vue)
+1. **进入页面时**:
+   - `getJobSkillDetail` - 获取当前职位的技能标签（需要 `jobId`，如果没有 `jobId` 则跳过）
+   - `recommendJob` - 获取相似推荐职位（需要 `jobId`）
+
+2. **点击职位卡片时**:
+   - `getJobSkillDetail` - 获取该职位的技能详情（显示在技能详情弹窗中）
+
+**注意**: `getJobPathPage` 接口**只在职业路径流程中使用**，不在职业推荐流程中使用。
+
+### 📍 职业路径 Tab (CareerPath.vue)
+1. **进入页面时**:
+   - `getJobPathPage` - 获取所有职业路径列表（填充目标职业下拉选择器）
+   - `getJobPathNum` - 获取职业路径总数（显示"系统已收录 X 条职业路径"）
+
+2. **选择目标职业并点击查询时**:
+   - `getJobPathPage` - 如果没有 `jobPathId`，通过 `jobName` 查找
+   - `getJobPathDetail` (实际: `getJobPathById`) - 获取职业路径详情（显示完整路径时间线）
+
+### 📍 技能发展 Tab (SkillDevelopment.vue)
+1. **进入页面时**:
+   - 暂无接口调用
+
+---
+
+## 🔑 关键接口调用流程
+
+### 流程1: 获取当前职位技能
+```
+CareerRecommend.vue
+└── getJobSkillDetail(jobId, jobName) → 获取技能列表
+    （如果没有 jobId，则跳过获取技能）
+```
+
+### 流程2: 查询职业路径
+```
+CareerPath.vue
+├── getJobPathPage() → 获取路径列表（填充下拉选择器）
+├── 用户选择目标职业
+└── getJobPathById(jobPathId) → 获取路径详情（显示时间线）
+```
+
+### 流程3: 获取推荐职位
+```
+CareerRecommend.vue
+└── recommendJob(jobId) → 获取相似推荐职位列表
+```
+
+---
+
+## ⚠️ 注意事项
+
+1. **接口返回码**: 
+   - `code: 0` 和 `code: 200` 都表示成功
+   - 已在 `request.js` 中处理
+
+2. **参数要求**:
+   - `getJobSkillDetail` 必须提供 `jobId`，如果没有 `jobId` 则跳过获取技能
+   - `getJobPathPage` **只在职业路径流程中使用**，不在职业推荐流程中使用
+
+3. **数据格式**:
+   - `getJobPathPage` 返回的 `list` 在 `response.data.list` 中
+   - `getJobPathById` 返回的详情在 `response.data` 中（数组格式）
+
+4. **接口使用范围**:
+   - `getJobPathPage` **只在职业路径流程（CareerPath.vue）中使用**
+   - 职业推荐流程（CareerRecommend.vue）**不使用** `getJobPathPage` 接口
+
+5. **接口前缀**:
+   - 所有 `zytp` 类型的接口使用: `http://ks.zhaopinzao8dian.com/api/ks_zytp/admin-api/zytp`
+

docs/阿里图标库引入指南.md

@@ -1,429 +0,0 @@
-# 阿里图标库（iconfont）引入指南
-
-## 📦 方式一：使用字体文件（推荐）
-
-### 第一步：下载图标资源
-
-1. 访问 [阿里图标库](https://www.iconfont.cn/)
-2. 注册/登录账号
-3. 搜索需要的图标，点击"添加入库"
-4. 点击右上角购物车图标
-5. 点击"添加至项目"（如果没有项目，先创建一个）
-6. 进入"我的项目"
-7. 点击"下载至本地"按钮
-
-### 第二步：解压并复制文件
-
-下载的压缩包中包含以下文件：
-```
-iconfont.css
-iconfont.ttf
-iconfont.woff
-iconfont.woff2
-iconfont.json
-demo_index.html
-demo.css
-```
-
-**需要的文件：**
-- `iconfont.css` - 样式文件
-- `iconfont.ttf` - 字体文件
-- `iconfont.woff` - 字体文件
-- `iconfont.woff2` - 字体文件
-
-### 第三步：创建项目目录
-
-在项目中创建 `static/iconfont/` 目录（如果不存在）：
-
-```
-ks-app-employment-service/
-├── static/
-│   ├── iconfont/          ← 新建此目录
-│   │   ├── iconfont.css
-│   │   ├── iconfont.ttf
-│   │   ├── iconfont.woff
-│   │   └── iconfont.woff2
-│   └── ...
-```
-
-### 第四步：修改 CSS 文件
-
-打开 `static/iconfont/iconfont.css`，修改字体文件路径：
-
-**原始路径：**
-```css
-@font-face {
-  font-family: "iconfont";
-  src: url('iconfont.woff2?t=1234567890') format('woff2'),
-       url('iconfont.woff?t=1234567890') format('woff'),
-       url('iconfont.ttf?t=1234567890') format('truetype');
-}
-```
-
-**修改为（相对路径）：**
-```css
-@font-face {
-  font-family: "iconfont";
-  src: url('./iconfont.woff2?t=1234567890') format('woff2'),
-       url('./iconfont.woff?t=1234567890') format('woff'),
-       url('./iconfont.ttf?t=1234567890') format('truetype');
-}
-```
-
-**或修改为（绝对路径，推荐）：**
-```css
-@font-face {
-  font-family: "iconfont";
-  src: url('/static/iconfont/iconfont.woff2?t=1234567890') format('woff2'),
-       url('/static/iconfont/iconfont.woff?t=1234567890') format('woff'),
-       url('/static/iconfont/iconfont.ttf?t=1234567890') format('truetype');
-}
-```
-
-### 第五步：在项目中引入
-
-#### 方法 A：全局引入（App.vue）
-
-在 `App.vue` 中引入：
-
-```vue
-<style>
-/* 引入阿里图标库 */
-@import url("/static/iconfont/iconfont.css");
-
-/* 其他全局样式 */
-@import '@/common/animation.css';
-@import '@/common/common.css';
-</style>
-```
-
-#### 方法 B：在 main.js 中引入
-
-```javascript
-// main.js
-import './static/iconfont/iconfont.css'
-```
-
-### 第六步：使用图标
-
-#### 使用方式 1：Unicode 方式
-
-```vue
-<template>
-  <view class="icon">&#xe600;</view>
-</template>
-
-<style>
-.icon {
-  font-family: "iconfont" !important;
-  font-size: 32rpx;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-</style>
-```
-
-#### 使用方式 2：Font Class 方式（推荐）
-
-```vue
-<template>
-  <view class="iconfont icon-home"></view>
-  <view class="iconfont icon-user"></view>
-  <view class="iconfont icon-search"></view>
-</template>
-
-<style scoped>
-.iconfont {
-  font-size: 32rpx;
-  color: #333;
-}
-</style>
-```
-
-#### 使用方式 3：封装为组件
-
-创建 `components/IconfontIcon/IconfontIcon.vue`：
-
-```vue
-<template>
-  <text class="iconfont" :class="iconClass" :style="iconStyle"></text>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-
-const props = defineProps({
-  name: {
-    type: String,
-    required: true
-  },
-  size: {
-    type: [String, Number],
-    default: 32
-  },
-  color: {
-    type: String,
-    default: '#333'
-  }
-})
-
-const iconClass = computed(() => `icon-${props.name}`)
-
-const iconStyle = computed(() => ({
-  fontSize: `${props.size}rpx`,
-  color: props.color
-}))
-</script>
-
-<style scoped>
-.iconfont {
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-</style>
-```
-
-**使用组件：**
-
-```vue
-<template>
-  <IconfontIcon name="home" :size="48" color="#13C57C" />
-  <IconfontIcon name="user" :size="36" color="#256BFA" />
-</template>
-
-<script setup>
-import IconfontIcon from '@/components/IconfontIcon/IconfontIcon.vue'
-</script>
-```
-
----
-
-## 📦 方式二：使用在线链接（不推荐小程序）
-
-### 第一步：获取在线链接
-
-1. 在阿里图标库"我的项目"中
-2. 点击"Font class"
-3. 点击"查看在线链接"
-4. 复制 CSS 链接
-
-### 第二步：引入在线 CSS
-
-在 `App.vue` 中：
-
-```vue
-<style>
-/* 注意：小程序不支持在线字体 */
-@import url("//at.alicdn.com/t/c/font_xxxxx.css");
-</style>
-```
-
-**⚠️ 注意：** 微信小程序不支持外部字体文件，必须使用方式一！
-
----
-
-## 📦 方式三：使用 Symbol 方式（SVG）
-
-### 第一步：获取 Symbol 代码
-
-1. 在"我的项目"中
-2. 点击"Symbol"
-3. 点击"生成代码"
-4. 复制生成的 JS 链接
-
-### 第二步：下载 JS 文件
-
-将 JS 文件下载到 `static/iconfont/iconfont.js`
-
-### 第三步：引入并使用
-
-在 `App.vue` 或需要的页面中：
-
-```vue
-<template>
-  <svg class="icon" aria-hidden="true">
-    <use xlink:href="#icon-home"></use>
-  </svg>
-</template>
-
-<script>
-// 引入 Symbol 脚本
-// 注意：需要在 main.js 中引入 iconfont.js
-</script>
-
-<style>
-.icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-</style>
-```
-
-**⚠️ 注意：** 小程序对 SVG 支持有限，推荐使用方式一！
-
----
-
-## 🎯 最佳实践建议
-
-### 1. 使用 Font Class 方式（方式一）
-
-**优点：**
-- ✅ 兼容性好，支持所有平台
-- ✅ 可以自定义颜色和大小
-- ✅ 语义化强，易于维护
-- ✅ 体积小，加载快
-
-**缺点：**
-- ❌ 只支持单色图标
-
-### 2. 创建图标组件库
-
-```
-components/
-├── IconfontIcon/
-│   └── IconfontIcon.vue    # 通用图标组件
-```
-
-### 3. 统一管理图标名称
-
-创建 `config/icons.js`：
-
-```javascript
-// 图标配置
-export const ICONS = {
-  HOME: 'home',
-  USER: 'user',
-  SEARCH: 'search',
-  LOCATION: 'location',
-  PHONE: 'phone',
-  // ... 更多图标
-}
-```
-
-使用：
-
-```vue
-<script setup>
-import { ICONS } from '@/config/icons'
-</script>
-
-<template>
-  <IconfontIcon :name="ICONS.HOME" />
-</template>
-```
-
----
-
-## 🔧 常见问题
-
-### Q1: 小程序中图标不显示？
-
-**解决方案：**
-- 确保使用本地字体文件，不要使用在线链接
-- 检查 CSS 中的字体路径是否正确
-- 确保字体文件已正确复制到 `static/iconfont/` 目录
-
-### Q2: 图标显示为方框？
-
-**解决方案：**
-- 检查字体文件是否完整
-- 检查 `@font-face` 的 `font-family` 名称是否一致
-- 清除缓存重新编译
-
-### Q3: 如何更新图标库？
-
-1. 在阿里图标库添加新图标到项目
-2. 重新下载至本地
-3. 替换 `static/iconfont/` 下的所有文件
-4. 清除缓存，重新编译
-
-### Q4: H5 和小程序路径不一致？
-
-**解决方案：**
-
-使用条件编译：
-
-```css
-@font-face {
-  font-family: "iconfont";
-  /* #ifdef H5 */
-  src: url('/static/iconfont/iconfont.woff2') format('woff2');
-  /* #endif */
-  /* #ifdef MP-WEIXIN */
-  src: url('./iconfont.ttf') format('truetype');
-  /* #endif */
-}
-```
-
----
-
-## 📝 示例代码
-
-### 完整示例：登录按钮
-
-```vue
-<template>
-  <button class="login-btn">
-    <text class="iconfont icon-phone"></text>
-    <text>手机号登录</text>
-  </button>
-</template>
-
-<style scoped>
-.login-btn {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 20rpx 40rpx;
-  background: #13C57C;
-  border-radius: 12rpx;
-  color: #fff;
-}
-
-.iconfont {
-  font-size: 32rpx;
-  margin-right: 12rpx;
-}
-</style>
-```
-
----
-
-## 🎨 推荐使用的图标
-
-### 常用图标
-- `icon-home` - 首页
-- `icon-user` - 用户
-- `icon-search` - 搜索
-- `icon-location` - 位置
-- `icon-phone` - 电话
-- `icon-message` - 消息
-- `icon-setting` - 设置
-- `icon-star` - 收藏
-- `icon-share` - 分享
-- `icon-close` - 关闭
-
----
-
-## 📚 相关资源
-
-- [阿里图标库官网](https://www.iconfont.cn/)
-- [uni-app 字体图标文档](https://uniapp.dcloud.net.cn/tutorial/syntax-css.html#%E5%AD%97%E4%BD%93%E5%9B%BE%E6%A0%87)
-- [CSS @font-face](https://developer.mozilla.org/zh-CN/docs/Web/CSS/@font-face)
-
----
-
-## ✅ 检查清单
-
-- [ ] 已下载图标文件到 `static/iconfont/` 目录
-- [ ] 已修改 CSS 中的字体文件路径
-- [ ] 已在 App.vue 中引入 iconfont.css
-- [ ] 已测试图标显示正常
-- [ ] 已封装图标组件（可选）
-- [ ] 已统一管理图标名称（可选）
-

docs/阿里图标库快速开始.md

@@ -1,407 +0,0 @@
-# 阿里图标库快速开始 🚀
-
-## 一、5分钟快速上手
-
-### Step 1: 下载图标文件（2分钟）
-
-1. 访问 https://www.iconfont.cn/
-2. 登录后搜索图标，点击"添加入库"
-3. 购物车 → 添加至项目（没有项目先创建）
-4. 我的项目 → 下载至本地
-
-### Step 2: 放置文件（1分钟）
-
-解压下载的文件，将以下4个文件复制到 `static/iconfont/` 目录：
-
-```
-✅ iconfont.css
-✅ iconfont.ttf
-✅ iconfont.woff
-✅ iconfont.woff2
-```
-
-### Step 3: 修改CSS路径（1分钟）
-
-打开 `static/iconfont/iconfont.css`，将字体路径修改为相对路径：
-
-```css
-@font-face {
-  font-family: "iconfont";
-  src: url('./iconfont.woff2?t=xxx') format('woff2'),
-       url('./iconfont.woff?t=xxx') format('woff'),
-       url('./iconfont.ttf?t=xxx') format('truetype');
-}
-```
-
-### Step 4: 全局引入（1分钟）
-
-在 `App.vue` 的 `<style>` 标签中添加：
-
-```vue
-<style>
-/* 引入阿里图标库 */
-@import url("/static/iconfont/iconfont.css");
-</style>
-```
-
-### Step 5: 开始使用 ✨
-
-```vue
-<template>
-  <!-- 直接使用 -->
-  <text class="iconfont icon-home"></text>
-  
-  <!-- 或使用组件 -->
-  <IconfontIcon name="home" :size="48" color="#13C57C" />
-</template>
-```
-
----
-
-## 二、推荐使用方式
-
-### 方式 A：使用封装的组件（最推荐）👍
-
-```vue
-<template>
-  <IconfontIcon name="phone" :size="40" color="#13C57C" />
-</template>
-
-<script setup>
-import IconfontIcon from '@/components/IconfontIcon/IconfontIcon.vue'
-</script>
-```
-
-**优点：**
-- ✅ 统一管理，易于维护
-- ✅ 支持动态修改大小和颜色
-- ✅ 语义清晰
-- ✅ 支持点击事件
-
-### 方式 B：使用配置常量（推荐）
-
-```vue
-<template>
-  <IconfontIcon 
-    :name="ICONS.HOME" 
-    :size="ICON_SIZES.LARGE" 
-    :color="ICON_COLORS.PRIMARY" 
-  />
-</template>
-
-<script setup>
-import IconfontIcon from '@/components/IconfontIcon/IconfontIcon.vue'
-import { ICONS, ICON_SIZES, ICON_COLORS } from '@/config/icons'
-</script>
-```
-
-**优点：**
-- ✅ 统一图标名称
-- ✅ 避免拼写错误
-- ✅ IDE 自动补全
-- ✅ 便于重构
-
-### 方式 C：直接使用类名
-
-```vue
-<template>
-  <text class="iconfont icon-home" style="font-size: 32rpx; color: #333;"></text>
-</template>
-```
-
----
-
-## 三、常用场景示例
-
-### 场景1：导航栏图标
-
-```vue
-<template>
-  <view class="navbar">
-    <IconfontIcon name="arrow-left" :size="40" @click="goBack" />
-    <text class="title">页面标题</text>
-    <IconfontIcon name="share" :size="36" @click="share" />
-  </view>
-</template>
-
-<script setup>
-const goBack = () => {
-  uni.navigateBack()
-}
-
-const share = () => {
-  // 分享逻辑
-}
-</script>
-```
-
-### 场景2：按钮图标
-
-```vue
-<template>
-  <button class="primary-btn">
-    <IconfontIcon name="phone" :size="32" color="#FFFFFF" />
-    <text>手机号登录</text>
-  </button>
-</template>
-
-<style>
-.primary-btn {
-  display: flex;
-  align-items: center;
-  gap: 12rpx;
-}
-</style>
-```
-
-### 场景3：列表项图标
-
-```vue
-<template>
-  <view class="list-item">
-    <IconfontIcon name="location" :size="36" color="#13C57C" />
-    <text class="text">工作地点</text>
-    <IconfontIcon name="arrow-right" :size="28" color="#999" />
-  </view>
-</template>
-```
-
-### 场景4：状态图标
-
-```vue
-<template>
-  <view class="status-box">
-    <IconfontIcon 
-      :name="status.icon" 
-      :size="64" 
-      :color="status.color" 
-    />
-    <text>{{ status.text }}</text>
-  </view>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-
-const orderStatus = ref('success')
-
-const status = computed(() => {
-  const map = {
-    success: { icon: 'success', color: '#13C57C', text: '提交成功' },
-    error: { icon: 'error', color: '#F44336', text: '提交失败' },
-    loading: { icon: 'loading', color: '#256BFA', text: '处理中...' }
-  }
-  return map[orderStatus.value]
-})
-</script>
-```
-
----
-
-## 四、组件API说明
-
-### IconfontIcon 组件
-
-**Props:**
-
-| 参数 | 类型 | 默认值 | 说明 |
-|------|------|--------|------|
-| name | String | - | 图标名称（必填），如：'home' 或 'icon-home' |
-| size | String/Number | 32 | 图标大小，单位rpx |
-| color | String | - | 图标颜色，支持十六进制、rgb等 |
-| bold | Boolean | false | 是否加粗 |
-
-**Events:**
-
-| 事件名 | 说明 | 回调参数 |
-|--------|------|----------|
-| click | 点击图标时触发 | event |
-
-**使用示例:**
-
-```vue
-<IconfontIcon 
-  name="home" 
-  :size="48" 
-  color="#13C57C"
-  :bold="true"
-  @click="handleClick"
-/>
-```
-
----
-
-## 五、配置说明
-
-### 图标名称配置（config/icons.js）
-
-```javascript
-export const ICONS = {
-  HOME: 'home',
-  USER: 'user',
-  SEARCH: 'search',
-  // ... 更多图标
-}
-```
-
-### 尺寸预设
-
-```javascript
-export const ICON_SIZES = {
-  MINI: 24,      // 24rpx
-  SMALL: 28,     // 28rpx
-  NORMAL: 32,    // 32rpx（默认）
-  LARGE: 40,     // 40rpx
-  XLARGE: 48,    // 48rpx
-}
-```
-
-### 颜色预设
-
-```javascript
-export const ICON_COLORS = {
-  PRIMARY: '#13C57C',      // 主色调
-  SECONDARY: '#256BFA',    // 次要色
-  SUCCESS: '#13C57C',      // 成功
-  WARNING: '#FF9800',      // 警告
-  DANGER: '#F44336',       // 危险
-  TEXT: '#333333',         // 文本色
-}
-```
-
----
-
-## 六、常见问题
-
-### Q1: 图标不显示？
-
-**检查清单：**
-- [ ] 文件是否已复制到 `static/iconfont/` 目录
-- [ ] CSS路径是否正确修改
-- [ ] 是否已在 App.vue 中引入
-- [ ] 图标类名是否正确（如：`icon-home`）
-- [ ] 清除缓存并重新编译
-
-### Q2: 如何查看可用的图标？
-
-1. 打开下载包中的 `demo_index.html`
-2. 或查看 `iconfont.css` 中的类名
-3. 类名格式通常为 `.icon-xxx:before`
-
-### Q3: 如何更新图标？
-
-1. 在阿里图标库添加新图标到项目
-2. 重新下载至本地
-3. 替换 `static/iconfont/` 下的所有文件
-4. 清除缓存，重新编译
-
-### Q4: 小程序能用在线链接吗？
-
-❌ 不能！微信小程序必须使用本地字体文件。
-
----
-
-## 七、最佳实践
-
-### ✅ 推荐做法
-
-1. **统一管理图标名称**
-   ```javascript
-   // 使用配置文件
-   import { ICONS } from '@/config/icons'
-   ```
-
-2. **使用封装的组件**
-   ```vue
-   <IconfontIcon name="home" />
-   ```
-
-3. **预设常用尺寸和颜色**
-   ```javascript
-   import { ICON_SIZES, ICON_COLORS } from '@/config/icons'
-   ```
-
-4. **语义化命名**
-   ```javascript
-   const ICONS = {
-     HOME: 'home',           // ✅ 语义清晰
-     USER_CENTER: 'user',    // ✅ 明确用途
-   }
-   ```
-
-### ❌ 不推荐做法
-
-1. **硬编码图标名称**
-   ```vue
-   <text class="iconfont icon-home"></text>  <!-- ❌ 不推荐 -->
-   ```
-
-2. **使用在线链接（小程序）**
-   ```css
-   @import url("//at.alicdn.com/xxx.css");  /* ❌ 小程序不支持 */
-   ```
-
-3. **直接使用 Unicode**
-   ```vue
-   <text class="iconfont">&#xe600;</text>  <!-- ❌ 不直观 -->
-   ```
-
----
-
-## 八、测试页面
-
-已为你创建了测试页面，可以查看各种使用方式：
-
-**路径:** `pages/demo/iconfont-demo.vue`
-
-在 `pages.json` 中添加页面配置即可访问：
-
-```json
-{
-  "path": "pages/demo/iconfont-demo",
-  "style": {
-    "navigationBarTitleText": "图标示例"
-  }
-}
-```
-
----
-
-## 九、相关文件
-
-```
-项目结构：
-├── components/
-│   └── IconfontIcon/
-│       └── IconfontIcon.vue          # 图标组件
-├── config/
-│   └── icons.js                      # 图标配置
-├── static/
-│   └── iconfont/
-│       ├── iconfont.css              # 样式文件
-│       ├── iconfont.ttf              # 字体文件
-│       ├── iconfont.woff             # 字体文件
-│       ├── iconfont.woff2            # 字体文件
-│       └── README.md                 # 说明文档
-├── pages/
-│   └── demo/
-│       └── iconfont-demo.vue         # 测试页面
-└── docs/
-    ├── 阿里图标库引入指南.md         # 详细文档
-    └── 阿里图标库快速开始.md         # 本文档
-```
-
----
-
-## 十、总结
-
-✅ **记住这三步：**
-
-1. **下载** - 从阿里图标库下载文件
-2. **放置** - 复制到 `static/iconfont/` 目录
-3. **引入** - 在 `App.vue` 中引入 CSS
-
-🎉 **就是这么简单！**
-
-如有问题，请参考详细文档：`docs/阿里图标库引入指南.md`
-

index.html

@@ -17,6 +17,7 @@
             })();
         </script>
         <title></title>
+        <link rel="icon" type="image/png" href="./static/logo2-S.png">
         <!-- vconsole -->
         <!--        <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
         <script>
@@ -28,4 +29,4 @@
     <div id="app"><!--app-html--></div>
     <script type="module" src="/main.js"></script>
     </body>
-</html>
+</html>

main.js

@@ -1,3 +1,8 @@
+/*
+ * @Date: 2025-11-03 10:52:09
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-04 11:14:21
+ */
 import App from '@/App'
 import * as Pinia from 'pinia'
 import globalFunction from '@/common/globalFunction'
@@ -13,6 +18,13 @@ 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 引入，无需在此处重复引入
 // import Tabbar from '@/components/tabbar/midell-box.vue'
 // 自动导入 directives 目录下所有指令
@@ -27,6 +39,7 @@ import {
 // const foldFeature = window.visualViewport && 'segments' in window.visualViewport
 // console.log('是否支持多段屏幕：', foldFeature)
 
+import { getDict } from '@/apiRc/system/dict.js';
 // 全局组件
 export function createApp() {
     const app = createSSRApp(App)
@@ -38,6 +51,24 @@ export function createApp() {
     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;
+    app.config.globalProperties.$getDictSelectOption = async (dictType, isDigital = false, forceRefresh = false) => {
+        const dictData = await getDict(dictType, forceRefresh);
+        return dictData.map(item => ({
+            value: isDigital ? Number(item.dictValue || item.dictvalue) : (item.dictValue || item.dictvalue),
+            label: item.dictLabel || item.dictlabel,
+            ...item
+        }));
+    };
     // app.component('tabbar-custom', Tabbar)
 
     for (const path in directives) {
@@ -56,6 +87,8 @@ export function createApp() {
 
     app.use(SelectPopupPlugin);
     app.use(Pinia.createPinia());
+    // 注册vuex
+    app.use(storeRc);
 
     return {
         app,

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxc63baa791b81a51a",
+        "appid" : "wx4aa34488b965a331",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
@@ -63,7 +63,11 @@
                 "desc" : "用于用户选择地图查看位置"
             }
         },
-        "libVersion" : "3.5.7"
+        "lazyCodeLoading" : "requiredComponents",
+        "libVersion" : "3.5.7",
+        "optimization" : {
+            "subPackages" : true
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

package-lock.json

@@ -0,0 +1,37 @@
+{
+  "name": "ks-app",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "@dcloudio/uni-ui": "^1.5.11",
+        "dayjs": "^1.11.19",
+        "sm-crypto": "^0.3.13"
+      }
+    },
+    "node_modules/@dcloudio/uni-ui": {
+      "version": "1.5.11",
+      "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.11.tgz",
+      "integrity": "sha512-DBtk046ofmeFd82zRI7d89SoEwrAxYzUN3WVPm1DIBkpLPG5F5QDNkHMnZGu2wNrMEmGBjBpUh3vqEY1L3jaMw=="
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.19",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
+      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw=="
+    },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+    },
+    "node_modules/sm-crypto": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmmirror.com/sm-crypto/-/sm-crypto-0.3.13.tgz",
+      "integrity": "sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==",
+      "dependencies": {
+        "jsbn": "^1.1.0"
+      }
+    }
+  }
+}

package.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "@dcloudio/uni-ui": "^1.5.11",
+    "dayjs": "^1.11.19",
+    "sm-crypto": "^0.3.13"
+  }
+}

packageA/hook/usePagination.js

@@ -1,173 +1,174 @@
-import {
-    ref,
-    reactive,
-    watch,
-    isRef,
-    nextTick
-} from 'vue'
-
-export function usePagination(
-    requestFn,
-    transformFn,
-    options = {}
-) {
-    const list = ref([])
-    const loading = ref(false)
-    const error = ref(false)
-    const finished = ref(false)
-    const firstLoading = ref(true)
-    const empty = ref(false)
-
-    const {
-        pageSize = 10,
-            search = {},
-            autoWatchSearch = false,
-            debounceTime = 300,
-            autoFetch = false,
-
-            // 字段映射
-            dataKey = 'rows',
-            totalKey = 'total',
-
-            // 分页字段名映射
-            pageField = 'current',
-            sizeField = 'pageSize',
-
-            onBeforeRequest,
-            onAfterRequest
-    } = options
-
-    const pageState = reactive({
-        page: 1,
-        pageSize: isRef(pageSize) ? pageSize.value : pageSize,
-        total: 0,
-        maxPage: 1,
-        search: isRef(search) ? search.value : search
-    })
-
-    let debounceTimer = null
-
-    const fetchData = async (type = 'refresh') => {
-        if (loading.value) return Promise.resolve()
-        console.log(type)
-        loading.value = true
-        error.value = false
-
-        if (typeof onBeforeRequest === 'function') {
-            try {
-                onBeforeRequest(type, pageState)
-            } catch (err) {
-                console.warn('onBeforeRequest 执行异常:', err)
-            }
-        }
-
-        if (type === 'refresh') {
-            pageState.page = 1
-            finished.value = false
-            if (list.value.length === 0) {
-                firstLoading.value = true
-            }
-        } else if (type === 'loadMore') {
-            if (pageState.page >= pageState.maxPage) {
-                loading.value = false
-                finished.value = true
-                return Promise.resolve('no more')
-            }
-            pageState.page += 1
-        }
-
-        const params = {
-            ...pageState.search,
-            [pageField]: pageState.page,
-            [sizeField]: pageState.pageSize,
-        }
-
-        try {
-            const res = await requestFn(params)
-
-            const rawData = res[dataKey]
-            const total = res[totalKey] || 99999999
-            console.log(total, rawData)
-            const data = typeof transformFn === 'function' ? transformFn(rawData) : rawData
-
-            if (type === 'refresh') {
-                list.value = data
-            } else {
-                list.value.push(...data)
-            }
-
-            pageState.total = total
-            pageState.maxPage = Math.ceil(total / pageState.pageSize)
-
-            finished.value = list.value.length >= total
-            empty.value = list.value.length === 0
-        } catch (err) {
-            console.error('分页请求失败:', err)
-            error.value = true
-        } finally {
-            loading.value = false
-            firstLoading.value = false
-
-            if (typeof onAfterRequest === 'function') {
-                try {
-                    onAfterRequest(type, pageState, {
-                        error: error.value
-                    })
-                } catch (err) {
-                    console.warn('onAfterRequest 执行异常:', err)
-                }
-            }
-        }
-    }
-
-    const refresh = () => fetchData('refresh')
-    const loadMore = () => fetchData('loadMore')
-
-    const resetPagination = () => {
-        list.value = []
-        pageState.page = 1
-        pageState.total = 0
-        pageState.maxPage = 1
-        finished.value = false
-        error.value = false
-        firstLoading.value = true
-        empty.value = false
-    }
-
-    if (autoWatchSearch && isRef(search)) {
-        watch(search, (newVal) => {
-            pageState.search = newVal
-            clearTimeout(debounceTimer)
-            debounceTimer = setTimeout(() => {
-                refresh()
-            }, debounceTime)
-        }, {
-            deep: true
-        })
-    }
-
-    watch(pageSize, (newVal) => {
-        pageState.pageSize = newVal
-    }, {
-        deep: true
-    })
-
-    if (autoFetch) {
-        nextTick(() => {
-            refresh()
-        })
-    }
-
-    return {
-        list,
-        loading,
-        error,
-        finished,
-        firstLoading,
-        empty,
-        pageState,
-        refresh,
-        loadMore,
-        resetPagination
-    }
-}
+import {
+    ref,
+    reactive,
+    watch,
+    isRef,
+    nextTick
+} from 'vue'
+
+export function usePagination(
+    requestFn,
+    transformFn,
+    options = {}
+) {
+    const list = ref([])
+    const loading = ref(false)
+    const error = ref(false)
+    const finished = ref(false)
+    const firstLoading = ref(true)
+    const empty = ref(false)
+
+    const {
+        pageSize = 10,
+            search = {},
+            autoWatchSearch = false,
+            debounceTime = 300,
+            autoFetch = false,
+
+            // 字段映射
+            dataKey = 'rows',
+            totalKey = 'total',
+
+            // 分页字段名映射
+            pageField = 'current',
+            sizeField = 'pageSize',
+
+            onBeforeRequest,
+            onAfterRequest
+    } = options
+
+    const pageState = reactive({
+        page: 1,
+        pageSize: isRef(pageSize) ? pageSize.value : pageSize,
+        total: 0,
+        maxPage: 1,
+        search: isRef(search) ? search.value : search
+    })
+
+    let debounceTimer = null
+
+    const fetchData = async (type = 'refresh') => {
+        if (loading.value) return Promise.resolve()
+        console.log(type)
+        loading.value = true
+        error.value = false
+
+        if (typeof onBeforeRequest === 'function') {
+            try {
+                onBeforeRequest(type, pageState)
+            } catch (err) {
+                console.warn('onBeforeRequest 执行异常:', err)
+            }
+        }
+
+        if (type === 'refresh') {
+            pageState.page = 1
+            finished.value = false
+            if (list.value.length === 0) {
+                firstLoading.value = true
+            }
+        } else if (type === 'loadMore') {
+            if (pageState.page >= pageState.maxPage) {
+                loading.value = false
+                finished.value = true
+                return Promise.resolve('no more')
+            }
+            pageState.page += 1
+        }
+
+        const params = {
+            ...pageState.search,
+            [pageField]: pageState.page,
+            [sizeField]: pageState.pageSize,
+        }
+
+        try {
+            const res = await requestFn(params)
+
+            const rawData = res[dataKey]
+            const total = res[totalKey] || 99999999
+            console.log(total, rawData)
+            const data = typeof transformFn === 'function' ? transformFn(rawData) : rawData
+
+            if (type === 'refresh') {
+                list.value = data
+            } else {
+                list.value.push(...data)
+            }
+
+            pageState.total = total
+            pageState.maxPage = Math.ceil(total / pageState.pageSize)
+
+            finished.value = list.value.length >= total
+            empty.value = list.value.length === 0
+        } catch (err) {
+            console.error('分页请求失败:', err)
+            error.value = true
+        } finally {
+            loading.value = false
+            firstLoading.value = false
+
+            if (typeof onAfterRequest === 'function') {
+                try {
+                    onAfterRequest(type, pageState, {
+                        error: error.value
+                    })
+                } catch (err) {
+                    console.warn('onAfterRequest 执行异常:', err)
+                }
+            }
+        }
+    }
+
+    const refresh = () => fetchData('refresh')
+    const loadMore = () => fetchData('loadMore')
+
+    const resetPagination = () => {
+        list.value = []
+        pageState.page = 1
+        pageState.total = 0
+        pageState.maxPage = 1
+        finished.value = false
+        error.value = false
+        firstLoading.value = true
+        empty.value = false
+    }
+
+    if (autoWatchSearch && isRef(search)) {
+        watch(search, (newVal) => {
+            pageState.search = newVal
+            clearTimeout(debounceTimer)
+            debounceTimer = setTimeout(() => {
+                refresh()
+            }, debounceTime)
+        }, {
+            deep: true
+        })
+    }
+
+    watch(pageSize, (newVal) => {
+        pageState.pageSize = newVal
+    }, {
+        deep: true
+    })
+
+    if (autoFetch) {
+        nextTick(() => {
+            refresh()
+        })
+    }
+
+    return {
+        list,
+        loading,
+        error,
+        finished,
+        firstLoading,
+        empty,
+        pageState,
+        refresh,
+        loadMore,
+        resetPagination
+    }
+}
+

packageA/pages/UnitDetails/UnitDetails.vue

@@ -1,320 +1,673 @@
 <template>
-    <AppLayout title="" :use-scroll-view="false">
-        <template #headerleft>
-            <view class="btnback">
-                <image src="@/static/icon/back.png" @click="navBack"></image>
-            </view>
-        </template>
-        <template #headerright>
-            <view class="btn mar_ri10">
-                <image
-                    src="@/static/icon/collect3.png"
-                    v-if="!companyInfo.isCollection"
-                    @click="companyCollection"
-                ></image>
-                <image src="@/static/icon/collect2.png" v-else @click="companyCollection"></image>
-            </view>
-        </template>
-        <view class="content">
-            <view class="content-top">
-                <view class="companyinfo-left">
-                    <image src="@/static/icon/companyIcon.png" mode=""></image>
-                </view>
-                <view class="companyinfo-right">
-                    <view class="row1">{{ companyInfo?.name }}</view>
-                    <view class="row2">
-                        <dict-tree-Label
-                            v-if="companyInfo?.industry"
-                            dictType="industry"
-                            :value="companyInfo?.industry"
-                        ></dict-tree-Label>
-                        <span v-if="companyInfo?.industry">&nbsp;</span>
-                        <dict-Label dictType="scale" :value="companyInfo?.scale"></dict-Label>
-                    </view>
-                </view>
-            </view>
-            <view class="conetent-info" :class="{ expanded: isExpanded }">
-                <view class="info-title">公司介绍</view>
-                <view class="info-desirption">{{ companyInfo.description }}</view>
-                <!-- <view class="info-title title2">公司地址</view>
+	<AppLayout title="" :use-scroll-view="false">
+		<template #headerleft>
+			<view class="btnback">
+				<image src="@/static/icon/back.png" @click="navBack"></image>
+			</view>
+		</template>
+		<template #headerright>
+			<view class="btn mar_ri10">
+				<image src="@/static/icon/collect3.png" v-if="!companyInfo?.isCollection"></image>
+				<image src="@/static/icon/collect2.png" v-else></image>
+			</view>
+		</template>
+		<view class="content">
+			<view class="content-top">
+				<view class="companyinfo-left">
+					<image src="@/static/icon/companyIcon.png" mode=""></image>
+				</view>
+				<view class="companyinfo-right">
+					<view class="row1">{{ companyInfo?.name || '未知公司' }}</view>
+							<view class="row2">
+								{{ getScaleLabel(companyInfo?.scale) }}
+							</view>
+				</view>
+			</view>
+			<view class="conetent-info" :class="{ expanded: isExpanded }">
+				<view class="info-title">公司介绍</view>
+				<view class="info-desirption">{{
+          companyInfo?.description || '暂无公司介绍'
+        }}</view>
+				<!-- <view class="info-title title2">公司地址</view>
                 <view class="locationCompany"></view> -->
-            </view>
-            <view class="expand" @click="expand">
-                <text>{{ isExpanded ? '收起' : '展开' }}</text>
-                <image
-                    class="expand-img"
-                    :class="{ 'expand-img-active': !isExpanded }"
-                    src="@/static/icon/downs.png"
-                ></image>
-            </view>
-            <scroll-view scroll-y class="Detailscroll-view" @scrolltolower="getJobsList('add')">
-                <view class="views">
-                    <view class="Detail-title"><text class="title">在招职位</text></view>
-                    <renderJobs
-                        v-if="pageState.list.length"
-                        :list="pageState.list"
-                        :longitude="longitudeVal"
-                        :latitude="latitudeVal"
-                    ></renderJobs>
-                    <empty v-else pdTop="200"></empty>
-                </view>
-            </scroll-view>
-        </view>
-    </AppLayout>
+			</view>
+			<view class="expand" @click="expand">
+				<text>{{ isExpanded ? "收起" : "展开" }}</text>
+				<image class="expand-img" :class="{ 'expand-img-active': !isExpanded }" src="@/static/icon/downs.png">
+				</image>
+			</view>
+			<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">
+						<view class="cards" @click="navToJobDetail(job.jobId)">
+							<view class="card-company">
+								<text class="company">{{ job.jobTitle }}</text>
+								<view class="salary"> ￥{{ job.minSalary }}-{{ job.maxSalary }}/月 </view>
+							</view>
+							<view class="card-tags">
+								<view class="tag jy">
+									{{ getExperienceLabel(job.experience) }}
+								</view>
+								<view class="tag xl">
+									{{ getEducationLabel(job.education) }}
+								</view>
+								<view class="tag yd" v-if="job.vacancies">
+									招聘{{ job.vacancies }}人
+								</view>
+							</view>
+							<view class="card-info">
+								<view class="company-address" v-if="job.jobLocation">
+									<image class="point3" src="/static/icon/point3.png"></image>
+									{{ job.jobLocation }}
+								</view>
+								<view class="push-time" v-if="job.postingDate">
+									{{ formatPublishTime(job.postingDate) }}
+								</view>
+							</view>
+						</view>
+					</view>
+				</template>
+					<empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+		</view>
+	</AppLayout>
 </template>
 
 <script setup>
-import point from '@/static/icon/point.png';
-import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
-import { onLoad, onShow } from '@dcloudio/uni-app';
-import dictLabel from '@/components/dict-Label/dict-Label.vue';
-import { storeToRefs } from 'pinia';
-import useLocationStore from '@/stores/useLocationStore';
-const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
-const { $api, navTo, vacanciesTo, navBack } = inject('globalFunction');
+	import {
+		reactive,
+		inject,
+		watch,
+		ref,
+		onMounted,
+		computed
+	} from "vue";
+	import {
+		onLoad,
+		onShow
+	} from "@dcloudio/uni-app";
+	import dictLabel from "@/components/dict-Label/dict-Label.vue";
+	import config from "@/config.js";
+	import { storeToRefs } from "pinia";
+	import useDictStore from '@/stores/useDictStore';
+	const dictStore = useDictStore();
+	import useLocationStore from "@/stores/useLocationStore";
+	const {
+		longitudeVal,
+		latitudeVal
+	} = storeToRefs(useLocationStore());
+	const {
+		$api,
+		navTo,
+		vacanciesTo,
+		navBack
+	} = inject("globalFunction");
+	const isExpanded = ref(false);
+	const pageState = reactive({
+		page: 0,
+		list: [],
+		total: 0,
+		maxPage: 1,
+		pageSize: 10,
+	});
+	const companyInfo = ref({
+		jobList: [],
+	});
+	const baseUrl = config.imgBaseUrl;
+	const getItemBackgroundStyle = (imageName) => ({
+		backgroundImage: `url(${baseUrl}/jobfair/${imageName})`,
+		backgroundSize: "100% 100%", // 覆盖整个容器
+		backgroundPosition: "center", // 居中
+		backgroundRepeat: "no-repeat",
+	});
 
-const isExpanded = ref(false);
-const pageState = reactive({
-    page: 0,
-    list: [],
-    total: 0,
-    maxPage: 1,
-    pageSize: 10,
-});
-const companyInfo = ref({});
+	// 已移除重复的onLoad函数，保留下面的async版本
+	
+	// 根据公司ID获取公司详情
+	function getCompanyDetailsById(companyId) {
+		// 使用全局注入的$api调用接口
+		$api.createRequest('/app/company/'  + companyId).then((resData) => {
+			if (resData && resData.code === 200 && resData.data) {
+				console.log('Company details:', resData.data);
+				// 确保数据格式符合页面需求，并为关键字段提供默认值
+				companyInfo.value = {
+					...resData.data,
+					name: resData.data.name || '未知公司',
+					scale: resData.data.scale || '未知规模',
+					description: resData.data.description || '暂无公司介绍',
+					isCollection: resData.data.isCollection || 0,
+					jobList: resData.data.jobList || [] // 使用正确的jobList字段
+				};
+				console.log('Company details loaded successfully');
+			} else {
+				console.error('Failed to load company details:', resData?.msg || 'Unknown error');
+				// 设置默认值，避免页面白屏
+				companyInfo.value = {
+					name: '加载失败',
+					scale: '-',
+					description: '无法获取公司信息，请稍后重试',
+					isCollection: 0,
+					jobList: []
+				};
+			}
+		}).catch((error) => {
+			console.error('API error when fetching company details:', error);
+			// 错误情况下也设置默认值
+			companyInfo.value = {
+				name: '请求失败',
+				scale: '-',
+				description: '网络请求失败，请检查网络连接',
+				isCollection: 0,
+				jobList: []
+			};
+		});
+	}
 
-onLoad((options) => {
-    console.log(options);
-    getCompanyInfo(options.companyId || options.bussinessId);
-});
+	function expand() {
+		isExpanded.value = !isExpanded.value;
+	}
 
-function companyCollection() {
-    const companyId = companyInfo.value.companyId;
-    if (companyInfo.value.isCollection) {
-        $api.createRequest(`/app/company/collection/${companyId}`, {}, 'DELETE').then((resData) => {
-            getCompanyInfo(companyId);
-            $api.msg('取消收藏成功');
-        });
-    } else {
-        $api.createRequest(`/app/company/collection/${companyId}`, {}, 'POST').then((resData) => {
-            getCompanyInfo(companyId);
-            $api.msg('收藏成功');
-        });
-    }
-}
+	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}`
+		} : {};
 
-function getCompanyInfo(id) {
-    $api.createRequest(`/app/company/${id}`).then((resData) => {
-        companyInfo.value = resData.data;
-        getJobsList();
-    });
-}
+		$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: companyInfo.value?.jobFairId, // 招聘会id
+						personId: resData.info.userId, // 当前登录用户id
+						enterpriseId: companyInfo.value?.companyId, // 企业id
+						jobId: job.jobId, // 岗位id
+						idCard:resData.info.personCardNo
+					}, "post", 9100, {
+						"Content-Type": "application/json"
+					}).then((data) => {
+						if (data && data.code === 200) {
+							$api.msg("简历投递成功");
+						} else {
+							$api.msg((data && data.msg) || "简历投递失败");
+						}
+					});
+				});
+			} else {
+				$api.msg('请先登录')
+			}
+		});
 
-function getJobsList(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/company/job/${companyInfo.value.companyId}`, params).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);
-    });
-}
+	}
+	
+	// 获取企业规模字典数据
+	onLoad(async (options) => {
+	    // 初始化companyInfo
+	    companyInfo.value = { jobList: [] };
+	    // 加载字典数据
+	    await dictStore.getDictData();
+	    
+	    if (options.job && typeof options.job === 'string') {
+	        try {
+	            companyInfo.value = JSON.parse(options.job);
+	        } catch (error) {
+	            console.error('Error parsing job data:', error);
+	            companyInfo.value = { jobList: [] };
+	        }
+	    // 处理companyId参数
+	    } else if (options.companyId) {
+	        console.log('Getting company details by companyId:', options.companyId);
+	        // 调用API获取公司详情
+	        getCompanyDetailsById(options.companyId);
+	    // 处理bussinessId参数（如果需要）
+	    } else if (options.bussinessId) {
+	        console.log('Handling bussinessId:', options.bussinessId);
+	        // 这里可以根据需要处理bussinessId
+	        // 目前先作为companyId处理
+	        getCompanyDetailsById(options.bussinessId);
+	    } else {
+	        console.warn('No valid parameters provided');
+	        companyInfo.value = { jobList: [] };
+	    }
+	});
+	
+	// 根据scale值获取对应的文本
+	function getScaleLabel(scale) {
+		// 处理空值、undefined、null等情况
+		if (scale === undefined || scale === null || scale === '') return '-';
+		
+		try {
+			// 调试日志，追踪scale值处理
+			console.log('Processing scale value:', scale);
+			// 确保scale是字符串类型
+			const scaleStr = String(scale);
+			// 使用dictStore获取企业规模标签
+			const label = dictStore.dictLabel('scale', scaleStr);
+			console.log('Retrieved scale label:', label, 'for scale:', scaleStr);
+			// 如果字典中没有找到对应标签，使用预设的默认映射
+			if (!label) {
+				const defaultScaleMap = {
+					'1': '少于50人',
+					'2': '50-100人',
+					'3': '100-500人',
+					'4': '500-1000人',
+					'5': '1000人以上'
+				};
+				const defaultLabel = defaultScaleMap[scaleStr];
+				console.log('Using default label:', defaultLabel, 'for scale:', scaleStr);
+				return defaultLabel || '-';
+			}
+			return label;
+		} catch (error) {
+			console.error('获取企业规模标签失败:', error);
+			return '-';
+		}
+	}
 
-function expand() {
-    isExpanded.value = !isExpanded.value;
-}
+	// 根据experience值获取对应的文本
+	function getExperienceLabel(experience) {
+		if (experience === undefined || experience === null || experience === '') return '经验不限';
+		
+		try {
+			const experienceStr = String(experience);
+			const label = dictStore.dictLabel('experience', experienceStr);
+			if (!label) {
+				const defaultExperienceMap = {
+					'0': '经验不限',
+					'1': '1年以内',
+					'2': '1-3年',
+					'3': '3-5年',
+					'4': '5-10年',
+					'5': '10年以上'
+				};
+				return defaultExperienceMap[experienceStr] || '经验不限';
+			}
+			return label;
+		} catch (error) {
+			console.error('获取经验标签失败:', error);
+			return '经验不限';
+		}
+	}
+
+	// 根据education值获取对应的文本
+	function getEducationLabel(education) {
+		if (education === undefined || education === null || education === '') return '学历不限';
+		
+		try {
+			const educationStr = String(education);
+			const label = dictStore.dictLabel('education', educationStr);
+			if (!label) {
+				const defaultEducationMap = {
+					'-1': '学历不限',
+					'1': '初中及以下',
+					'2': '高中',
+					'3': '中专',
+					'4': '大专',
+					'5': '本科',
+					'6': '硕士',
+					'7': '博士'
+				};
+				return defaultEducationMap[educationStr] || '学历不限';
+			}
+			return label;
+		} catch (error) {
+			console.error('获取学历标签失败:', error);
+			return '学历不限';
+		}
+	}
+
+	// 格式化发布时间为相对时间
+	function formatPublishTime(publishTime) {
+		if (!publishTime) return '';
+		
+		try {
+			const date = new Date(publishTime);
+			const now = new Date();
+			const diffTime = Math.abs(now - date);
+			const diffSeconds = Math.floor(diffTime / 1000);
+			const diffMinutes = Math.floor(diffSeconds / 60);
+			const diffHours = Math.floor(diffMinutes / 60);
+			const diffDays = Math.floor(diffHours / 24);
+			const diffWeeks = Math.floor(diffDays / 7);
+			const diffMonths = Math.floor(diffDays / 30);
+			const diffYears = Math.floor(diffDays / 365);
+			
+			if (diffSeconds < 60) {
+				return '刚刚发布';
+			} else if (diffMinutes < 60) {
+				return `${diffMinutes}分钟前`;
+			} else if (diffHours < 24) {
+				return `${diffHours}小时前`;
+			} else if (diffDays === 1) {
+				return '昨天发布';
+			} else if (diffDays < 7) {
+				return `${diffDays}天前`;
+			} else if (diffWeeks < 4) {
+				return `${diffWeeks}周前`;
+			} else if (diffMonths < 12) {
+				return `${diffMonths}个月前`;
+			} else {
+				return `${diffYears}年前`;
+			}
+		} catch (error) {
+			console.error('格式化发布时间失败:', error);
+			return '';
+		}
+	}
+
+	// 跳转到职位详情页面
+	function navToJobDetail(jobId) {
+		if (jobId) {
+			navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(jobId)}`);
+		}
+	}
 </script>
 
 <style lang="stylus" scoped>
-.btnback{
-    width: 64rpx;
-    height: 64rpx;
-}
-.btn {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 52rpx;
-    height: 52rpx;
-}
-image {
-    height: 100%;
-    width: 100%;
-}
-.content{
-    height: 100%
-    display: flex;
-    flex-direction: column
-    .content-top{
-        padding: 28rpx
-        padding-top: 50rpx
-        display: flex
-        flex-direction: row
-        flex-wrap: nowrap
-        .companyinfo-left{
-            width: 96rpx;
-            height: 96rpx;
-            margin-right: 24rpx
-        }
-        .companyinfo-right{
+	.btnback {
+		width: 64rpx;
+		height: 64rpx;
+	}
 
-            .row1{
-                font-weight: 500;
-                font-size: 32rpx;
-                color: #333333;
-            }
-            .row2{
-                font-weight: 400;
-                font-size: 28rpx;
-                color: #6C7282;
-                line-height: 45rpx;
-            }
-        }
-    }
-    .conetent-info{
-        padding: 0 28rpx
-        overflow: hidden;
-        max-height: 0rpx;
-        transition: max-height 0.3s ease;
-        .info-title{
-            font-weight: 600;
-            font-size: 28rpx;
-            color: #000000;
-        }
-        .info-desirption{
-            margin-top: 12rpx
-            font-weight: 400;
-            font-size: 28rpx;
-            color: #495265;
-            text-align: justified;
-        }
-        .title2{
-            margin-top: 48rpx
-        }
-    }
-    .expanded {
-        max-height: 1000rpx; // 足够显示完整内容
-    }
-    .expand{
-        display: flex
-        flex-wrap: nowrap
-        white-space: nowrap
-        justify-content: center
-        margin-top: 20rpx
-        margin-bottom: 28rpx
-        font-weight: 400;
-        font-size: 28rpx;
-        color: #256BFA;
-        .expand-img{
-            width: 40rpx;
-            height: 40rpx;
-        }
-        .expand-img-active{
-            transform: rotate(180deg)
-        }
-    }
-}
-.Detailscroll-view{
-    flex: 1;
-    overflow: hidden;
-    background: #F4F4F4;
-    .views{
-        padding: 28rpx
-        .Detail-title{
-            font-weight: 600;
-            font-size: 32rpx;
-            color: #000000;
-            position: relative;
-            display: flex
-            justify-content: space-between
-            .title{
-                position: relative;
-                z-index: 2;
-            }
-        }
-        .Detail-title::before{
-            position: absolute
-            content:  '';
-            left: -14rpx
-            bottom: 0
-            height: 16rpx;
-            width: 108rpx;
-            background: linear-gradient(to right, #CBDEFF, #FFFFFF);
-            border-radius: 8rpx;
-            z-index: 1;
-        }
-        .cards{
-            padding: 32rpx;
-            background: #FFFFFF;
-            box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
-            border-radius: 20rpx 20rpx 20rpx 20rpx;
-            margin-top: 22rpx;
-            .card-company{
-                display: flex
-                justify-content: space-between
-                align-items: flex-start
-                .company{
-                    font-weight: 500;
-                    font-size: 32rpx;
-                    color: #333333;
-                }
-                .salary{
-                    font-weight: 500;
-                    font-size: 28rpx;
-                    color: #4C6EFB;
-                    white-space: nowrap
-                    line-height: 48rpx
-                }
-            }
-            .card-companyName{
-                font-weight: 400;
-                font-size: 28rpx;
-                color: #6C7282;
-            }
-            .card-tags{
-                display: flex
-                flex-wrap: wrap
-                .tag{
-                    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: 14rpx;
-                    white-space: nowrap
-                    margin-right: 20rpx
-                }
-            }
-            .card-bottom{
-                margin-top: 32rpx
-                display: flex
-                justify-content: space-between
-                font-size: 28rpx;
-                color: #6C7282;
-            }
-        }
-    }
-}
+	.btn {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 52rpx;
+		height: 52rpx;
+	}
+
+	image {
+		height: 100%;
+		width: 100%;
+	}
+
+	.content {
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+
+		.content-top {
+			padding: 28rpx;
+			padding-top: 50rpx;
+			display: flex;
+			flex-direction: row;
+			flex-wrap: nowrap;
+
+			.companyinfo-left {
+				width: 96rpx;
+				height: 96rpx;
+				margin-right: 24rpx;
+			}
+
+			.companyinfo-right {
+				.row1 {
+					font-weight: 500;
+					font-size: 32rpx;
+					color: #333333;
+				}
+
+				.row2 {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #6C7282;
+					line-height: 45rpx;
+				}
+			}
+		}
+
+		.conetent-info {
+			padding: 0 28rpx;
+			overflow: hidden;
+			max-height: 0rpx;
+			transition: max-height 0.3s ease;
+
+			.info-title {
+				font-weight: 600;
+				font-size: 28rpx;
+				color: #000000;
+			}
+
+			.info-desirption {
+				margin-top: 12rpx;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #495265;
+				text-align: justified;
+			}
+
+			.title2 {
+				margin-top: 48rpx;
+			}
+		}
+
+		.expanded {
+			max-height: 1000rpx; // 足够显示完整内容
+		}
+
+		.expand {
+			display: flex;
+			flex-wrap: nowrap;
+			white-space: nowrap;
+			justify-content: center;
+			margin-top: 20rpx;
+			margin-bottom: 28rpx;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #256BFA;
+
+			.expand-img {
+				width: 40rpx;
+				height: 40rpx;
+			}
+
+			.expand-img-active {
+				transform: rotate(180deg);
+			}
+		}
+	}
+
+	.Detailscroll-view {
+		flex: 1;
+		overflow: hidden;
+		background: #F4F4F4;
+
+		.views {
+			padding: 28rpx;
+
+			.Detail-title {
+				font-weight: 600;
+				font-size: 32rpx;
+				color: #000000;
+				position: relative;
+				display: flex;
+				justify-content: space-between;
+
+				.title {
+					position: relative;
+					z-index: 2;
+				}
+			}
+
+			.Detail-title::before {
+				position: absolute;
+				content: '';
+				left: -14rpx;
+				bottom: 0;
+				height: 16rpx;
+				width: 108rpx;
+				background: linear-gradient(to right, #CBDEFF, #FFFFFF);
+				border-radius: 8rpx;
+				z-index: 1;
+			}
+
+			.cards {
+				padding: 32rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				margin-top: 22rpx;
+				padding-bottom: 18rpx;
+				background: #FFFFFF;
+
+				.card-company {
+					display: flex;
+					justify-content: space-between;
+					align-items: flex-start;
+
+					.company {
+						font-weight: 400;
+						font-size: 32rpx;
+						color: #333333;
+					}
+
+					.salary {
+						// font-weight: 600;
+						font-size: 28rpx;
+						color: #1677FF;
+						white-space: nowrap;
+						line-height: 48rpx;
+					}
+				}
+
+				.deliver-box {
+					width: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					margin-top: 5rpx;
+
+					.deliver-btn {
+						padding: 10rpx 25rpx;
+						background: #53ACFF;
+						width: max-content;
+						color: #fff;
+					}
+				}
+
+				.card-companyName {
+					font-weight: 400;
+					font-size: 28rpx;
+					margin-top: 23rpx;
+					display: flex;
+					align-items: center;
+
+					image {
+						width: 24rpx;
+						height: 24rpx;
+						margin-right: 8rpx;
+					}
+				}
+
+				.card-tags {
+					display: flex;
+					flex-wrap: wrap;
+					margin: 25rpx 0 20rpx;
+
+					image {
+						width: 24rpx;
+						height: 24rpx;
+						margin-right: 8rpx;
+					}
+
+					.jy {
+						background: #F5F5F5;
+						color: #333333;
+					}
+
+					.xl {
+						background: #F5F5F5;
+						color: #333333;
+					}
+
+					.yd {
+						background: #F5F5F5;
+						color: #333333;
+					}
+
+					.tag {
+						width: fit-content;
+						height: 30rpx;
+						border-radius: 4rpx;
+						padding: 6rpx 20rpx;
+						line-height: 30rpx;
+						font-weight: 400;
+						font-size: 24rpx;
+						text-align: center;
+						white-space: nowrap;
+						margin-right: 20rpx;
+						display: flex;
+						align-items: center;
+					}
+				}
+
+				.card-info {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 20rpx;
+					flex-wrap: wrap;
+					
+					.point3 {
+						width: 12rpx;
+						height: 12rpx;
+					}
+					
+					.company-address {
+						display: flex;
+						align-items: center;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #6C7282;
+						line-height: 34rpx;
+						flex: 1;
+						min-width: 0;
+						margin-right: 20rpx;
+
+						image {
+							width: 24rpx;
+							height: 24rpx;
+							margin-right: 8rpx;
+							flex-shrink: 0;
+						}
+						
+						text {
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+					}
+					
+					.push-time {
+						display: flex;
+						align-items: center;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #6C7282;
+						line-height: 34rpx;
+						flex-shrink: 0;
+						white-space: nowrap;
+
+						image {
+							width: 24rpx;
+							height: 24rpx;
+							margin-right: 8rpx;
+							flex-shrink: 0;
+						}
+					}
+				}
+
+				.card-bottom {
+					margin-top: 32rpx;
+					display: flex;
+					justify-content: space-between;
+					font-size: 28rpx;
+					color: #6C7282;
+				}
+			}
+		}
+	}
 </style>

packageA/pages/addWorkExperience/addWorkExperience.vue

@@ -1,16 +1,5 @@
 <template>
-	<AppLayout
-	    title="添加工作经历"
-	    border
-	    back-gorund-color="#ffffff"
-	    :show-bg-image="false"
-	>
-	    <template #headerleft>
-	        <view class="btn mar_le20 button-click" @click="navBack">取消</view>
-	    </template>
-	    <template #headerright>
-	        <view class="btn mar_ri20 button-click" @click="handleConfirm">确认</view>
-	    </template>
+	<view class="page-container">
 		<view class="content">
 			<view class="content-input">
 			    <view class="input-titile">公司名称</view>
@@ -44,8 +33,12 @@
 				<textarea class="textarea-con" v-model="formData.description" placeholder-style="font-size: 16px" maxlength="500" placeholder="请输入工作描述"/>
 			</view>
 		</view>
-	</AppLayout>
-	
+		
+		<!-- 底部确认按钮 -->
+		<view class="bottom-confirm-btn">
+			<view class="confirm-btn" @click="handleConfirm">确认</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
@@ -206,7 +199,6 @@
 			console.log('页面类型:', pageType.value);
 			
 			let resData;
-			alert(editData.value.id)
 			// 根据页面类型调用不同的接口
 			if (pageType.value === 'edit' && editData.value?.id) {
 				// 编辑模式：调用更新接口
@@ -234,12 +226,18 @@
 </script>
 
 <style lang="stylus" scoped>
+.page-container {
+    min-height: 100vh;
+    background-color: #ffffff;
+    position: relative;
+}
+
 .content{
     padding: 28rpx;
     display: flex;
     flex-direction: column;
-    justify-content: flex-start
-    height: calc(100% - 120rpx)
+    justify-content: flex-start;
+    padding-bottom: 120rpx;
 }
 .content-input
     margin-bottom: 52rpx
@@ -328,6 +326,30 @@
 			line-height: 20rpx
 			display: flex
 			align-items: center
+
+// 底部确认按钮样式
+.bottom-confirm-btn
+	position: fixed
+	bottom: 0
+	left: 0
+	right: 0
+	background-color: #ffffff
+	padding: 20rpx 28rpx
+	border-top: 2rpx solid #EBEBEB
+	z-index: 999
+	
+	.confirm-btn
+		width: 100%
+		height: 90rpx
+		background: #256BFA
+		border-radius: 12rpx
+		font-weight: 500
+		font-size: 32rpx
+		color: #FFFFFF
+		text-align: center
+		line-height: 90rpx
+		button-click: true
+
 // .content-sex
 //     height: 110rpx;
 //     display: flex

packageA/pages/browseJob/browseJob.vue

@@ -1,10 +1,5 @@
 <template>
     <AppLayout title="我的浏览" :show-bg-image="false" :use-scroll-view="false">
-        <template #headerleft>
-            <view class="btnback">
-                <image src="@/static/icon/back.png" @click="navBack"></image>
-            </view>
-        </template>
         <view class="collection-content">
             <view class="collection-search">
                 <view class="search-content">

packageA/pages/collection/collection.vue

@@ -1,10 +1,5 @@
 <template>
     <AppLayout title="我的收藏" :show-bg-image="false" :use-scroll-view="false">
-        <template #headerleft>
-            <view class="btn">
-                <image src="@/static/icon/back.png" @click="navBack"></image>
-            </view>
-        </template>
         <view class="collection-content">
             <view class="header">
                 <view class="button-click" :class="{ active: type === 0 }" @click="changeType(0)">工作职位</view>

packageA/pages/jobExpect/jobExpect.vue

@@ -31,7 +31,7 @@
                 <input
                     class="input-con triangle"
                     disabled
-                    v-if="!state.jobsText.length"
+                    v-if="!state.jobsText || !state.jobsText.length"
                     placeholder="请选择您的求职岗位"
                 />
                 <view class="input-nx" @click="changeJobs" v-else>
@@ -40,6 +40,7 @@
             </view>
         </view>
         <SelectJobs ref="selectJobsModel"></SelectJobs>
+        <SelectPopup ref="selectPopupRef"></SelectPopup>
     </AppLayout>
 </template>
 
@@ -47,16 +48,24 @@
 import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import SelectJobs from '@/components/selectJobs/selectJobs.vue';
+import SelectPopup from '@/components/selectPopup/selectPopup.vue';
 const { $api, navTo, navBack, config } = inject('globalFunction');
-const openSelectPopup = inject('openSelectPopup');
+
+// 创建本地的 openSelectPopup 函数
+const openSelectPopup = (config) => {
+    if (selectPopupRef.value) {
+        selectPopupRef.value.open(config);
+    }
+};
 import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
 const { userInfo } = storeToRefs(useUserStore());
 const { getUserResume } = useUserStore();
-const { dictLabel, oneDictData } = useDictStore();
+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 state = reactive({
@@ -72,7 +81,9 @@ const fromValue = reactive({
     area: '',
     jobTitleId: [],
 });
-onLoad(() => {
+onLoad(async () => {
+    // 初始化字典数据
+    await getDictData();
     initLoad();
 });
 const confirm = () => {
@@ -99,8 +110,12 @@ function initLoad() {
     fromValue.jobTitleId = userInfo.value.jobTitleId;
     // 回显
     state.areaText = dictLabel('area', Number(userInfo.value.area));
-    state.salayText = `${userInfo.value.salaryMin}-${userInfo.value.salaryMax}`;
-    state.jobsText = userInfo.value.jobTitle;
+    if (userInfo.value.salaryMin && userInfo.value.salaryMax) {
+        state.salayText = `${userInfo.value.salaryMin}-${userInfo.value.salaryMax}`;
+    } else {
+        state.salayText = '';
+    }
+    state.jobsText = userInfo.value.jobTitle || [];
     const result = getFormCompletionPercent(fromValue);
     percent.value = result;
 }
@@ -123,7 +138,8 @@ const changeSalary = () => {
                 const copyri = JSON.parse(JSON.stringify(salay));
                 const [lf, ri] = e.detail.value;
                 const risalay = copyri.slice(lf, copyri.length);
-                this.setColunm(1, risalay);
+                // 更新右侧选项
+                state.risalay = risalay;
                 leftIndex = salayData[0];
             }
         },

packageA/pages/moreJobs/moreJobs.vue

@@ -13,7 +13,7 @@ import useUserStore from '@/stores/useUserStore';
 const { $api, navTo, navBack, vacanciesTo } = inject('globalFunction');
 import { storeToRefs } from 'pinia';
 import useLocationStore from '@/stores/useLocationStore';
-import { usePagination } from '@/hook/usePagination';
+import { usePagination } from '@/packageA/hook/usePagination';
 import { jobMoreMap } from '@/utils/markdownParser';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
 const loadmoreRef = ref(null);

packageA/pages/myResume/myResume.vue

@@ -123,21 +123,16 @@
 
         <!-- 4. 新增：简历上传区域（固定在页面底部） -->
         <view class="resume-upload-section">
-            <!-- 上传按钮 -->
             <button class="upload-btn" @click="handleResumeUpload" :loading="isUploading" :disabled="isUploading">
                 <uni-icons type="cloud-upload" size="20"></uni-icons>
-                <!-- <image class="upload-icon" src="/static/icons/upload-file.png" mode="widthFix"></image> -->
                 <text class="upload-text">
                     {{ uploadedResumeName || '上传简历' }}
                 </text>
-                <!-- 已上传时显示“重新上传”文字 -->
                 <text class="reupload-text" v-if="uploadedResumeName">（重新上传）</text>
             </button>
 
-            <!-- 上传说明 -->
             <text class="upload-tip">支持 PDF、Word 格式，文件大小不超过 20MB</text>
 
-            <!-- 已上传文件信息（可选） -->
             <view class="uploaded-file-info" v-if="uploadedResumeName">
                 <image class="file-icon" src="/static/icons/file-icon.png" mode="widthFix"></image>
                 <text class="file-name">{{ uploadedResumeName }}</text>
@@ -272,12 +267,202 @@ const handleDeleteItem = async (item, index) => {
 };
 
 // 简历上传核心逻辑
-const handleResumeUpload = () => {};
+const handleResumeUpload = () => {
+    // 从缓存获取用户ID（参考首页实现方式）
+    // 优先从store获取，如果为空则从缓存获取
+    const storeUserId = userInfo.value?.userId;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedUserId = cachedUserInfo.userId;
+    
+    // 获取用户ID：优先使用store中的userId，如果store中没有，使用缓存中的userId
+    const userId = storeUserId || cachedUserId;
+    
+    if (!userId) {
+        $api.msg('请先登录');
+        return;
+    }
+
+    // 检查是否正在上传
+    if (isUploading.value) {
+        return;
+    }
+
+    // 选择文件（微信小程序使用 wx.chooseMessageFile，uni-app 中对应 uni.chooseMessageFile）
+    uni.chooseMessageFile({
+        count: 1, // 只能选择一个文件
+        type: 'file', // 选择任意文件类型
+        success: (res) => {
+            // 注意：文件路径在 res.tempFiles[0].path
+            const file = res.tempFiles[0];
+            const tempFilePath = file.path; // 获取临时文件路径
+            const fileName = file.name; // 获取文件名
+            
+            // 检查文件大小（20MB = 20 * 1024 * 1024 字节）
+            const maxSize = 20 * 1024 * 1024;
+            if (file.size > maxSize) {
+                $api.msg('文件大小不能超过 20MB');
+                return;
+            }
+
+            // 检查文件类型
+            const allowedTypes = ['pdf', 'doc', 'docx'];
+            const fileExtension = fileName.split('.').pop()?.toLowerCase();
+            if (!fileExtension || !allowedTypes.includes(fileExtension)) {
+                $api.msg('仅支持 PDF、Word 格式');
+                return;
+            }
+
+            // 开始上传
+            uploadResumeFile(tempFilePath, fileName, userId);
+        },
+        fail: (err) => {
+            console.error('选择文件失败:', err);
+            // 用户取消选择不提示错误
+            if (err.errMsg && !err.errMsg.includes('cancel')) {
+                $api.msg('选择文件失败，请重试');
+            }
+        }
+    });
+};
+
+// 上传简历文件到服务器（使用 wx.uploadFile，uni-app 中对应 uni.uploadFile）
+const uploadResumeFile = (filePath, fileName, userId) => {
+    // 确保 userId 存在且有效
+    if (!userId) {
+        // 如果传入的userId为空，尝试从缓存再次获取
+        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        const cachedUserId = cachedUserInfo.userId;
+        
+        if (!cachedUserId) {
+            $api.msg('用户ID不存在，无法上传');
+            return;
+        }
+        
+        // 使用缓存中的userId
+        userId = cachedUserId;
+    }
+
+    isUploading.value = true;
+    
+    // 获取token（从缓存获取，参考首页实现方式）
+    let Authorization = '';
+    const tokenValue = uni.getStorageSync('token') || '';
+    if (tokenValue) {
+        Authorization = tokenValue;
+    } else {
+        // 如果缓存中没有token，尝试从store获取
+        const userStore = useUserStore();
+        if (userStore.token) {
+            Authorization = userStore.token;
+        }
+    }
+
+    // 根据接口文档，bussinessId 应该作为 Query 参数传递，而不是 formData
+    // 将 bussinessId 拼接到 URL 上作为查询参数
+    const uploadUrl = `${config.baseUrl}/app/file/upload?bussinessId=${encodeURIComponent(String(userId))}`;
+
+    // 打印调试信息
+    console.log('上传文件参数:', {
+        url: uploadUrl,
+        fileName: fileName,
+        bussinessId: userId,
+        userId: userId,
+        token: Authorization ? '已获取' : '未获取'
+    });
+
+    // 上传文件（参考微信小程序 wx.uploadFile API）
+    uni.uploadFile({
+        url: uploadUrl, // 开发者服务器的上传接口（必须是 HTTPS），bussinessId 作为 Query 参数
+        filePath: filePath, // 本地文件路径（临时路径）
+        name: 'file', // 服务器端接收文件的字段名（需与后端一致）
+        // 注意：根据接口文档，bussinessId 通过 Query 参数传递，不需要 formData
+        header: {
+            'Authorization': encodeURIComponent(Authorization)
+        },
+        success: (uploadRes) => {
+            try {
+                // 注意：res.data 是字符串，需转为 JSON（如果后端返回 JSON）
+                // 参考方案：const result = JSON.parse(data);
+                let resData;
+                if (typeof uploadRes.data === 'string') {
+                    resData = JSON.parse(uploadRes.data);
+                } else {
+                    resData = uploadRes.data;
+                }
+
+                // 判断上传是否成功
+                if (uploadRes.statusCode === 200 && resData.code === 200) {
+                    // 上传成功，处理返回结果
+                    uploadedResumeName.value = fileName;
+                    uploadedResumeUrl.value = resData.data || resData.msg || resData.url || '';
+                    $api.msg('简历上传成功');
+                    console.log('上传成功', resData);
+                    
+                    // 可以在这里保存简历信息到后端（如果需要）
+                    // saveResumeInfo(userId, uploadedResumeUrl.value, fileName);
+                } else {
+                    // 上传失败
+                    const errorMsg = resData.msg || resData.message || '上传失败，请重试';
+                    $api.msg(errorMsg);
+                    console.error('上传失败:', resData);
+                }
+            } catch (error) {
+                // 解析响应数据失败
+                console.error('解析上传响应失败:', error);
+                console.error('原始响应数据:', uploadRes.data);
+                $api.msg('上传失败，请重试');
+            }
+        },
+        fail: (err) => {
+            // 上传失败
+            console.error('上传文件失败:', err);
+            $api.msg('上传失败，请检查网络连接');
+        },
+        // 上传进度监听（可选）
+        progress: (res) => {
+            const progress = res.progress; // 上传进度（0-100）
+            console.log('上传进度：', progress + '%');
+            // 可以在这里更新进度条 UI（如果需要）
+        },
+        complete: () => {
+            // 上传完成（无论成功或失败）
+            isUploading.value = false;
+        }
+    });
+};
 
 // 删除已上传的简历
-const handleDeleteResume = () => {};
+const handleDeleteResume = () => {
+    if (!uploadedResumeName.value) {
+        return;
+    }
+
+    uni.showModal({
+        title: '确认删除',
+        content: '确定要删除已上传的简历吗？',
+        success: (res) => {
+            if (res.confirm) {
+                // 清除本地数据
+                uploadedResumeName.value = '';
+                uploadedResumeUrl.value = '';
+                $api.msg('已删除');
+                
+                // 如果需要，可以调用后端接口删除服务器上的文件
+                // deleteResumeFile(userId);
+            }
+        }
+    });
+};
 </script>
 
+<style lang="stylus">
+/* 修复页面滚动问题：覆盖全局的 overflow: hidden */
+page {
+    overflow-y: auto !important;
+    overflow-x: hidden;
+}
+</style>
+
 <style lang="stylus" scoped>
 image{
     width: 100%;

packageA/pages/personalInfo/personalInfo.vue

@@ -52,32 +52,109 @@
             </view>
             <view class="content-input">
                 <view class="input-titile">身份证</view>
-                <input class="input-con" v-model="fromValue.idcard" placeholder="空" />
+                <input class="input-con" v-model="fromValue.idCard" placeholder="请输入身份证号码" />
             </view>
             <view class="content-input">
                 <view class="input-titile">手机号码</view>
                 <input class="input-con" v-model="fromValue.phone" placeholder="请输入您的手机号码" />
             </view>
+            <view class="content-skills">
+                <view class="skills-header">
+                    <view class="input-titile">技能信息</view>
+                    <view 
+                        class="add-skill-btn" 
+                        @click="addSkill"
+                        :class="{ 'disabled': state.skills.length >= 3 }"
+                    >
+                        + 添加技能
+                    </view>
+                </view>
+                
+                <view class="skills-list">
+                    <view class="skill-item" v-for="(skill, index) in state.skills" :key="index">
+                        <view class="skill-header">
+                            <view class="skill-number">技能 {{ index + 1 }}</view>
+                            <view class="skill-actions" v-if="state.skills.length > 1">
+                                <view class="action-btn delete-btn" @click="removeSkill(index)">删除</view>
+                            </view>
+                        </view>
+                        
+                        <view class="skill-fields">
+                            <view class="skill-field" @click="changeSkillName(index)">
+                                <view class="field-label">技能名称</view>
+                                <input
+                                    class="field-input triangle"
+                                    disabled
+                                    :value="skill.name"
+                                    placeholder="请选择技能名称"
+                                />
+                            </view>
+                            
+                            <view class="skill-field" @click="changeSkillLevel(index)">
+                                <view class="field-label">技能等级</view>
+                                <input
+                                    class="field-input triangle"
+                                    disabled
+                                    :value="getSkillLevelText(skill.level)"
+                                    placeholder="请选择技能等级"
+                                />
+                            </view>
+                        </view>
+                    </view>
+                    
+                    <view class="empty-skills" v-if="state.skills.length === 0">
+                        <text class="empty-text">暂无技能信息，点击上方按钮添加</text>
+                    </view>
+                </view>
+            </view>
         </view>
+        <SelectPopup ref="selectPopupRef"></SelectPopup>
     </AppLayout>
 </template>
 
 <script setup>
-import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { reactive, inject, watch, ref, onMounted, onUnmounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 const { $api, navTo, navBack, checkingPhoneRegExp } = inject('globalFunction');
 import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
+import SelectPopup from '@/components/selectPopup/selectPopup.vue';
+
 const { userInfo } = storeToRefs(useUserStore());
 const { getUserResume } = useUserStore();
-const { dictLabel, oneDictData } = useDictStore();
-const openSelectPopup = inject('openSelectPopup');
+const dictStore = useDictStore();
+const { dictLabel, oneDictData, complete: dictComplete, getDictSelectOption } = dictStore;
+
+// #ifdef H5
+const injectedOpenSelectPopup = inject('openSelectPopup', null);
+// #endif
+
+// #ifdef MP-WEIXIN
+const selectPopupRef = ref();
+// #endif
+
+// 创建本地的 openSelectPopup 函数，兼容 H5 和微信小程序
+const openSelectPopup = (config) => {
+    // #ifdef MP-WEIXIN
+    if (selectPopupRef.value) {
+        selectPopupRef.value.open(config);
+    }
+    // #endif
+    
+    // #ifdef H5
+    if (injectedOpenSelectPopup) {
+        injectedOpenSelectPopup(config);
+    }
+    // #endif
+};
 
 const percent = ref('0%');
 const state = reactive({
     educationText: '',
     politicalAffiliationText: '',
+    skills: [], // 新的技能数据结构，包含id字段
+    currentEditingSkillIndex: -1 // 当前正在编辑的技能索引
 });
 const fromValue = reactive({
     name: '',
@@ -85,34 +162,178 @@ const fromValue = reactive({
     birthDate: '',
     education: '',
     politicalAffiliation: '',
-    idcard: '',
+    idCard: '',
+    phone: ''
 });
+// 移除重复的onLoad定义，已在上方实现
+
+// 在onLoad中初始化数据，确保页面加载时就能获取技能信息
 onLoad(() => {
+    // 初始化页面数据
     initLoad();
-    // setTimeout(() => {
-    //     const { age, birthDate } = useUserStore().userInfo;
-    //     const newAge = calculateAge(birthDate);
-    //     // 计算年龄是否对等
-    //     if (age != newAge) {
-    //         completeResume();
-    //     }
-    // }, 1000);
 });
 
+// 监听页面显示，接收从技能查询页面返回的数据
+onShow(() => {
+    // 通过事件总线接收技能选择结果
+    uni.$on('skillSelected', handleSkillSelected);
+});
+
+// 页面卸载时移除事件监听
+onUnmounted(() => {
+    uni.$off('skillSelected', handleSkillSelected);
+});
+
+// 监听 userInfo 变化，确保数据及时更新
+watch(() => userInfo.value, (newVal) => {
+    if (newVal && Object.keys(newVal).length > 0) {
+        initLoad();
+    }
+}, { deep: true, immediate: false });
+
+// 监听字典数据加载完成，自动更新学历显示
+watch(() => dictComplete.value, (newVal) => {
+    if (newVal) {
+        console.log('字典数据加载完成，更新学历显示');
+        // 确保有学历值（如果没有则使用默认值"4"本科）
+        if (!fromValue.education) {
+            fromValue.education = '4';
+        }
+        
+        // 直接遍历字典数据查找对应标签
+        const eduValue = String(fromValue.education);
+        const eduItem = dictStore.state.education.find(item => String(item.value) === eduValue);
+        if (eduItem && eduItem.label) {
+            console.log('从字典数据中找到学历标签：', eduItem.label);
+            state.educationText = eduItem.label;
+        }
+    }
+});
+
+// 监听学历字典数据变化
+watch(() => dictStore.state.education, (newVal) => {
+    if (newVal && newVal.length > 0) {
+        console.log('学历字典数据变化，更新显示');
+        // 确保有学历值（如果没有则使用默认值"4"本科）
+        if (!fromValue.education) {
+            fromValue.education = '4';
+        }
+        
+        // 直接遍历字典数据查找对应标签
+        const eduValue = String(fromValue.education);
+        const eduItem = newVal.find(item => String(item.value) === eduValue);
+        if (eduItem && eduItem.label) {
+            console.log('从字典数据中找到学历标签：', eduItem.label);
+            state.educationText = eduItem.label;
+        }
+    }
+}, { deep: true });
+
 function initLoad() {
-    fromValue.name = userInfo.value.name;
-    fromValue.sex = Number(userInfo.value.sex);
-    fromValue.phone = userInfo.value.phone;
-    fromValue.birthDate = userInfo.value.birthDate;
-    fromValue.education = userInfo.value.education;
-    fromValue.politicalAffiliation = userInfo.value.politicalAffiliation;
-    fromValue.idcard = userInfo.value.idcard;
-    // 回显
-    state.educationText = dictLabel('education', userInfo.value.education);
-    state.politicalAffiliationText = dictLabel('affiliation', userInfo.value.politicalAffiliation);
+    // 优先从 store 获取，如果没有则从本地缓存获取
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const currentUserInfo = userInfo.value && Object.keys(userInfo.value).length > 0 ? userInfo.value : cachedUserInfo;
+    
+    fromValue.name = currentUserInfo.name || '';
+    fromValue.sex = currentUserInfo.sex !== undefined ? Number(currentUserInfo.sex) : 0;
+    fromValue.phone = currentUserInfo.phone || '';
+    fromValue.birthDate = currentUserInfo.birthDate || '';
+    // 将学历转换为字符串类型，确保类型一致
+    // 如果没有学历值，默认设置为本科（值为"4"）
+    fromValue.education = currentUserInfo.education ? String(currentUserInfo.education) : '4';
+    fromValue.politicalAffiliation = currentUserInfo.politicalAffiliation || '';
+    fromValue.idCard = currentUserInfo.idCard || '';
+    
+    // 初始化技能数据 - 从appSkillsList获取，保留原始id
+    if (currentUserInfo.appSkillsList && Array.isArray(currentUserInfo.appSkillsList)) {
+        // 过滤掉name为空的技能项
+        const validSkills = currentUserInfo.appSkillsList.filter(item => item.name && item.name.trim() !== '');
+        if (validSkills.length > 0) {
+            // 将appSkillsList转换为新的技能数据结构，保留原始id
+            state.skills = validSkills.map(skill => ({
+                id: skill.id, // 保留服务器返回的原始id
+                name: skill.name,
+                level: skill.levels || ''
+            }));
+        } else {
+            state.skills = [];
+        }
+    } else {
+        state.skills = [];
+    }
+    
+    // 初始化学历显示文本（需要等待字典数据加载完成）
+    initEducationText();
+    
+    // 回显政治面貌
+    if (currentUserInfo.politicalAffiliation) {
+        state.politicalAffiliationText = dictLabel('affiliation', currentUserInfo.politicalAffiliation);
+    }
     const result = getFormCompletionPercent(fromValue);
     percent.value = result;
 }
+
+// 初始化学历显示文本
+function initEducationText() {
+    // 确保有学历值（如果没有则使用默认值"4"本科）
+    if (!fromValue.education) {
+        fromValue.education = '4';
+    }
+    
+    console.log('初始化学历显示，当前学历值：', fromValue.education);
+    
+    // 直接遍历字典数据查找对应标签（不依赖dictLabel函数，确保准确性）
+    const findLabelFromDict = () => {
+        if (dictStore.state.education && dictStore.state.education.length > 0) {
+            const eduValue = String(fromValue.education);
+            const eduItem = dictStore.state.education.find(item => String(item.value) === eduValue);
+            if (eduItem && eduItem.label) {
+                console.log('从字典数据中找到学历标签：', eduItem.label);
+                state.educationText = eduItem.label;
+                return true;
+            } else {
+                console.log('字典数据中未找到匹配的学历标签');
+            }
+        }
+        return false;
+    };
+    
+    // 立即尝试查找
+    if (!findLabelFromDict() && dictComplete.value) {
+        // 如果字典数据已加载完成但未找到标签，尝试重新获取字典数据
+        loadEducationDictAndUpdate();
+    }
+    
+    // 等待字典数据加载完成
+    const checkDictData = () => {
+        if (dictComplete.value && dictStore.state.education && dictStore.state.education.length > 0) {
+            findLabelFromDict();
+        } else {
+            // 如果字典数据未加载，等待一段时间后重试
+            setTimeout(() => {
+                if (dictComplete.value && dictStore.state.education && dictStore.state.education.length > 0) {
+                    findLabelFromDict();
+                } else {
+                    // 尝试主动加载字典数据
+                    loadEducationDictAndUpdate();
+                }
+            }, 500);
+        }
+    };
+    
+    // 主动加载学历字典数据并更新显示
+    function loadEducationDictAndUpdate() {
+        getDictSelectOption('education').then((data) => {
+            console.log('主动加载学历字典数据：', data);
+            dictStore.state.education = data;
+            findLabelFromDict();
+        }).catch((error) => {
+            console.error('加载学历字典数据失败:', error);
+        });
+    }
+    
+    checkDictData();
+}
 const confirm = () => {
     if (!fromValue.name) {
         return $api.msg('请输入姓名');
@@ -129,19 +350,125 @@ const confirm = () => {
     if (!checkingPhoneRegExp(fromValue.phone)) {
         return $api.msg('请输入正确手机号');
     }
+    
+    // 构建appSkillsList数据结构 - 使用新的技能数据结构，包含id字段
+    const appSkillsList = state.skills
+        .filter(skill => skill.name && skill.name.trim() !== '')
+        .map(skill => ({
+            id: skill.id, // 包含技能id，用于更新操作
+            name: skill.name,
+            levels: skill.level || ''
+        }));
+    
     const params = {
         ...fromValue,
         age: calculateAge(fromValue.birthDate),
+        appSkillsList: appSkillsList
     };
+    
     $api.createRequest('/app/user/resume', params, 'post').then((resData) => {
         $api.msg('完成');
-        state.disbleDate = true;
         getUserResume().then(() => {
             navBack();
         });
     });
 };
 
+// 添加技能
+function addSkill() {
+    if (state.skills.length >= 3) {
+        $api.msg('最多只能添加3个技能');
+        return;
+    }
+    
+    // 添加新的技能对象，新增技能不需要id，后端会自动生成
+    state.skills.push({
+        name: '',
+        level: ''
+    });
+    
+    // 更新完成度
+    const result = getFormCompletionPercent(fromValue);
+    percent.value = result;
+}
+
+// 删除技能
+function removeSkill(index) {
+    state.skills.splice(index, 1);
+    
+    // 更新完成度
+    const result = getFormCompletionPercent(fromValue);
+    percent.value = result;
+}
+
+// 获取技能等级文本
+function getSkillLevelText(level) {
+    const levelMap = {
+        '1': '初级',
+        '2': '中级', 
+        '3': '高级'
+    };
+    return levelMap[level] || '';
+}
+
+// 选择技能名称
+function changeSkillName(index) {
+    state.currentEditingSkillIndex = 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))}`
+    });
+}
+
+// 选择技能等级
+function changeSkillLevel(index) {
+    const skillLevels = [
+        { label: '初级', value: '1' },
+        { label: '中级', value: '2' },
+        { label: '高级', value: '3' }
+    ];
+    
+    // 查找当前技能等级在数据中的索引
+    let defaultIndex = [0];
+    const currentSkill = state.skills[index];
+    if (currentSkill && currentSkill.level) {
+        const index = skillLevels.findIndex(item => item.value === currentSkill.level);
+        if (index >= 0) {
+            defaultIndex = [index];
+        }
+    }
+    
+    openSelectPopup({
+        title: '技能等级',
+        maskClick: true,
+        data: [skillLevels],
+        defaultIndex: defaultIndex,
+        success: (_, [value]) => {
+            state.skills[index].level = value.value;
+            // 更新完成度
+            const result = getFormCompletionPercent(fromValue);
+            percent.value = result;
+        },
+    });
+}
+
+// 技能选择回调函数
+const handleSkillSelected = (skillName) => {
+    if (skillName && state.currentEditingSkillIndex >= 0) {
+        // 更新当前编辑的技能名称
+        state.skills[state.currentEditingSkillIndex].name = skillName;
+        
+        // 重置当前编辑索引
+        state.currentEditingSkillIndex = -1;
+        
+        // 更新完成度
+        const result = getFormCompletionPercent(fromValue);
+        percent.value = result;
+    }
+};
+
 const changeDateBirt = () => {
     const datearray = generateDatePickerArrays();
     const defaultIndex = getDatePickerIndexes(fromValue.birthDate);
@@ -161,17 +488,97 @@ const changeDateBirt = () => {
         },
     });
 };
-const changeEducation = () => {
+async function changeEducation() {
+    // 确保字典数据已加载
+    if (!dictComplete.value || !dictStore.state.education || dictStore.state.education.length === 0) {
+        // 如果字典数据未加载，先加载数据
+        try {
+            await getDictSelectOption('education').then((data) => {
+                dictStore.state.education = data;
+            });
+        } catch (error) {
+            console.error('加载学历字典数据失败:', error);
+        }
+    }
+    
+    // 等待数据加载完成后再获取数据
+    let educationData = oneDictData('education');
+    
+    // 如果数据还是为空，等待一下再试
+    if (!educationData || educationData.length === 0) {
+        await new Promise(resolve => setTimeout(resolve, 100));
+        educationData = oneDictData('education');
+        if (!educationData || educationData.length === 0) {
+            $api.msg('学历数据加载中，请稍后再试');
+            return;
+        }
+    }
+    
+    // 确保有默认值
+    if (!fromValue.education) {
+        fromValue.education = '4'; // 默认设置为本科
+    }
+    
+    // 将当前学历值转换为字符串，用于查找默认索引
+    const currentEducation = String(fromValue.education);
+    // 查找当前学历在数据中的索引
+    let defaultIndex = [0];
+    if (currentEducation && educationData && educationData.length > 0) {
+        // 同时支持字符串和数字类型的匹配
+        const index = educationData.findIndex(item => {
+            const itemValue = String(item.value);
+            return itemValue === currentEducation;
+        });
+        if (index >= 0) {
+            defaultIndex = [index];
+            console.log('找到学历默认索引:', index, '当前值:', currentEducation);
+        } else {
+            // 如果字符串匹配失败，尝试数字匹配
+            const currentNum = Number(currentEducation);
+            if (!isNaN(currentNum)) {
+                const numIndex = educationData.findIndex(item => {
+                    const itemValue = Number(item.value);
+                    return !isNaN(itemValue) && itemValue === currentNum;
+                });
+                if (numIndex >= 0) {
+                    defaultIndex = [numIndex];
+                    console.log('通过数字匹配找到学历默认索引:', numIndex, '当前值:', currentNum);
+                } else {
+                    console.warn('未找到匹配的学历值:', currentEducation, '可用值:', educationData.map(item => item.value));
+                }
+            }
+        }
+    }
+    
     openSelectPopup({
         title: '学历',
         maskClick: true,
-        data: [oneDictData('education')],
+        data: [educationData],
+        defaultIndex: defaultIndex,
         success: (_, [value]) => {
-            fromValue.education = value.value;
-            state.educationText = value.label;
+            console.log('切换学历选择，新值：', value.value);
+            fromValue.education = String(value.value); // 确保存储为字符串
+            
+            // 使用相同的字典数据查找逻辑
+            const eduValue = String(value.value);
+            const eduItem = dictStore.state.education.find(item => String(item.value) === eduValue);
+            if (eduItem && eduItem.label) {
+                console.log('从字典数据中找到学历标签：', eduItem.label);
+                state.educationText = eduItem.label;
+            } else {
+                // 如果没找到，尝试重新加载字典数据
+                console.log('字典中未找到对应标签，尝试重新加载字典数据');
+                getDictSelectOption('education').then((data) => {
+                    dictStore.state.education = data;
+                    const newEduItem = data.find(item => String(item.value) === eduValue);
+                    if (newEduItem && newEduItem.label) {
+                        state.educationText = newEduItem.label;
+                    }
+                });
+            }
         },
     });
-};
+}
 const changeSex = (sex) => {
     fromValue.sex = sex;
 };
@@ -188,6 +595,7 @@ const changePoliticalAffiliation = () => {
     });
 };
 
+
 function generateDatePickerArrays(startYear = 1975, endYear = new Date().getFullYear()) {
     const years = [];
     const months = [];
@@ -207,14 +615,39 @@ function generateDatePickerArrays(startYear = 1975, endYear = new Date().getFull
 }
 
 function isValidDate(dateString) {
-    const [year, month, day] = dateString.split('-').map(Number);
+    // 添加空值检查
+    if (!dateString || typeof dateString !== 'string' || dateString.trim() === '') {
+        return false;
+    }
+    
+    const dateParts = dateString.split('-');
+    if (dateParts.length !== 3) {
+        return false;
+    }
+    
+    const [year, month, day] = dateParts.map(Number);
+    
+    // 检查是否为有效数字
+    if (isNaN(year) || isNaN(month) || isNaN(day)) {
+        return false;
+    }
 
     const date = new Date(year, month - 1, day); // 月份从0开始
     return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day;
 }
 
 const calculateAge = (birthDate) => {
+    // 添加空值检查
+    if (!birthDate) {
+        return '';
+    }
+    
     const birth = new Date(birthDate);
+    // 检查日期是否有效
+    if (isNaN(birth.getTime())) {
+        return '';
+    }
+    
     const today = new Date();
     let age = today.getFullYear() - birth.getFullYear();
     const monthDiff = today.getMonth() - birth.getMonth();
@@ -249,13 +682,33 @@ function getFormCompletionPercent(form) {
 }
 // 主函数
 function getDatePickerIndexes(dateStr) {
-    const [year, month, day] = dateStr.split('-');
+    // 添加空值检查，如果dateStr为空或null，返回默认值（当前日期）
+    if (!dateStr || typeof dateStr !== 'string' || dateStr.trim() === '') {
+        const today = new Date();
+        const year = today.getFullYear().toString();
+        const month = (today.getMonth() + 1).toString().padStart(2, '0');
+        const day = today.getDate().toString().padStart(2, '0');
+        dateStr = `${year}-${month}-${day}`;
+    }
+    
+    let dateParts = dateStr.split('-');
+    if (dateParts.length !== 3) {
+        // 如果分割后不是3部分，使用当前日期作为默认值
+        const today = new Date();
+        const year = today.getFullYear().toString();
+        const month = (today.getMonth() + 1).toString().padStart(2, '0');
+        const day = today.getDate().toString().padStart(2, '0');
+        dateStr = `${year}-${month}-${day}`;
+        dateParts = dateStr.split('-');
+    }
+    
+    const [year, month, day] = dateParts;
 
     const [years, months, days] = generateDatePickerArrays();
 
-    const yearIndex = years.indexOf(year);
-    const monthIndex = months.indexOf(month);
-    const dayIndex = days.indexOf(day);
+    const yearIndex = years.indexOf(year) >= 0 ? years.indexOf(year) : 0;
+    const monthIndex = months.indexOf(month) >= 0 ? months.indexOf(month) : 0;
+    const dayIndex = days.indexOf(day) >= 0 ? days.indexOf(day) : 0;
 
     return [yearIndex, monthIndex, dayIndex];
 }
@@ -307,6 +760,28 @@ function getDatePickerIndexes(dateStr) {
         border-radius: 2rpx
         background: #697279;
         transform: rotate(45deg)
+.input-nx
+    position: relative
+    border-bottom: 2rpx solid #EBEBEB
+    padding-bottom: 30rpx
+    display: flex
+    flex-wrap: wrap
+    .nx-item
+        padding: 16rpx 24rpx
+        width: fit-content
+        border-radius: 20rpx
+        border: 2rpx solid #E8EAEE
+        background-color: #f8f9fa
+        margin-right: 16rpx
+        margin-top: 16rpx
+        font-size: 28rpx
+        color: #333333
+        transition: all 0.2s ease
+        
+        &:hover
+            background-color: #e9ecef
+            border-color: #256bfa
+            color: #256bfa
 .content-sex
     height: 110rpx;
     display: flex
@@ -343,4 +818,130 @@ function getDatePickerIndexes(dateStr) {
         color: #FFFFFF;
         text-align: center;
         line-height: 90rpx
+
+// 技能信息样式
+.content-skills
+    margin-bottom: 52rpx
+    
+    .skills-header
+        display: flex
+        justify-content: space-between
+        align-items: center
+        margin-bottom: 32rpx
+        
+        .input-titile
+            font-weight: 400
+            font-size: 28rpx
+            color: #6A6A6A
+        
+        .add-skill-btn
+            padding: 16rpx 32rpx
+            background: #256BFA
+            color: #FFFFFF
+            border-radius: 8rpx
+            font-size: 26rpx
+            font-weight: 500
+            transition: all 0.3s ease
+            
+            &:active
+                background: #1a5cd9
+                transform: scale(0.98)
+            
+            &.disabled
+                background: #CCCCCC
+                color: #999999
+                cursor: not-allowed
+                
+                &:active
+                    background: #CCCCCC
+                    transform: none
+    
+    .skills-list
+        .skill-item
+            background: #FFFFFF
+            border: 2rpx solid #E8EAEE
+            border-radius: 12rpx
+            padding: 24rpx
+            margin-bottom: 24rpx
+            box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05)
+            transition: all 0.3s ease
+            
+            &:hover
+                box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1)
+                border-color: #256BFA
+            
+            .skill-header
+                display: flex
+                justify-content: space-between
+                align-items: center
+                margin-bottom: 20rpx
+                
+                .skill-number
+                    font-weight: 500
+                    font-size: 28rpx
+                    color: #333333
+                
+                .skill-actions
+                    .action-btn
+                        padding: 8rpx 16rpx
+                        border-radius: 6rpx
+                        font-size: 24rpx
+                        font-weight: 400
+                        transition: all 0.2s ease
+                        
+                        &.delete-btn
+                            background: #FF4D4F
+                            color: #FFFFFF
+                            
+                            &:active
+                                background: #D9363E
+                                transform: scale(0.95)
+            
+            .skill-fields
+                display: flex
+                flex-direction: column
+                gap: 20rpx
+                
+                .skill-field
+                    .field-label
+                        font-weight: 400
+                        font-size: 26rpx
+                        color: #6A6A6A
+                        margin-bottom: 8rpx
+                    
+                    .field-input
+                        font-weight: 400
+                        font-size: 28rpx
+                        color: #333333
+                        line-height: 72rpx
+                        height: 72rpx
+                        border: 2rpx solid #E8EAEE
+                        border-radius: 8rpx
+                        padding: 0 20rpx
+                        background: #F8F9FA
+                        transition: all 0.3s ease
+                        
+                        &:focus
+                            border-color: #256BFA
+                            background: #FFFFFF
+                        
+                        &.triangle::before
+                            right: 30rpx
+                            top: calc(50% - 2rpx)
+                        
+                        &.triangle::after
+                            right: 30rpx
+                            top: 50%
+    
+    .empty-skills
+        text-align: center
+        padding: 60rpx 0
+        background: #F8F9FA
+        border-radius: 12rpx
+        border: 2rpx dashed #E8EAEE
+        
+        .empty-text
+            font-size: 28rpx
+            color: #999999
+            font-weight: 400
 </style>

packageA/pages/post/component/radarMap.vue

@@ -16,25 +16,52 @@ const props = defineProps({
     },
 });
 
+// 获取雷达图数据
+function getRadarData() {
+    if (!props.value || !props.value.radarChart) {
+        // 如果没有数据，使用默认值0
+        const defaultRadarChart = {
+            skill: 0,
+            experience: 0,
+            education: 0,
+            salary: 0,
+            age: 0,
+            location: 0
+        };
+        const labels = ['学历', '年龄', '工作地', '技能', '工作经验', '期望薪资'];
+        const data = [defaultRadarChart.education, defaultRadarChart.age, defaultRadarChart.location, 
+                      defaultRadarChart.skill, defaultRadarChart.experience, defaultRadarChart.salary].map((item) => item * 0.05);
+        return { labels, data };
+    }
+    
+    const { skill, experience, education, salary, age, location } = props.value.radarChart;
+    const labels = ['学历', '年龄', '工作地', '技能', '工作经验', '期望薪资'];
+    const data = [education, age, location, skill, experience, salary].map((item) => item * 0.05);
+    return { labels, data };
+}
+
 // 监听页面初始化
 onMounted(() => {
-    if (Object.keys(props.value).length > 0) {
-        rawRadarChart();
-    }
+    // 延迟执行，确保 canvas 已经渲染
+    setTimeout(() => {
+        const { labels, data } = getRadarData();
+        rawRadarChart(labels, data);
+    }, 100);
 });
 
 // 监听 props.value 变化
 watch(
     () => props.value,
     (newVal) => {
-        if (newVal && Object.keys(newVal).length > 0) {
-            const { skill, experience, education, salary, age, location } = newVal.radarChart;
-            const labels = ['学历', '年龄', '工作地', '技能', '工作经验', '期望薪资'];
-            const data = [education, age, location, skill, experience, salary].map((item) => item * 0.05);
-            rawRadarChart(labels, data);
+        if (newVal) {
+            // 延迟执行，确保数据更新完成
+            setTimeout(() => {
+                const { labels, data } = getRadarData();
+                rawRadarChart(labels, data);
+            }, 50);
         }
     },
-    { deep: true, immediate: false } // deep 递归监听对象内部变化
+    { deep: true, immediate: true } // deep 递归监听对象内部变化，immediate 立即执行一次
 );
 
 function rawRadarChart(labels, data) {

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,33 +10,45 @@
                 <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 class="top-salary">
-                    <Salary-Expectation
-                        :max-salary="jobInfo.maxSalary"
-                        :min-salary="jobInfo.minSalary"
-                        :is-month="true"
-                    ></Salary-Expectation>
-                </view>
-                <view class="top-name">{{ jobInfo.jobTitle }}</view>
-                <view class="top-info">
-                    <view class="info-img"><image src="/static/icon/post12.png"></image></view>
-                    <view class="info-text">
-                        <dict-Label dictType="experience" :value="jobInfo.experience"></dict-Label>
+                <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">
+                        <Salary-Expectation
+                            :max-salary="jobInfo.maxSalary"
+                            :min-salary="jobInfo.minSalary"
+                            :is-month="true"
+                        ></Salary-Expectation>
                     </view>
-                    <view class="info-img mar_le20"><image src="/static/icon/post13.png"></image></view>
-                    <view class="info-text">
-                        <dict-Label dictType="education" :value="jobInfo.education"></dict-Label>
+                    <view class="top-name">{{ jobInfo.jobTitle }}</view>
+                    <view class="top-info">
+                        <view class="info-img"><image src="/static/icon/post12.png"></image></view>
+                        <view class="info-text">
+                            <dict-Label dictType="experience" :value="jobInfo.experience"></dict-Label>
+                        </view>
+                        <view class="info-img mar_le20"><image src="/static/icon/post13.png"></image></view>
+                        <view class="info-text">
+                            <dict-Label dictType="education" :value="jobInfo.education"></dict-Label>
+                        </view>
                     </view>
-                </view>
-                <view class="position-source">
-                    <text>来源&nbsp;</text>
-                    {{ jobInfo.dataSource }}
+                        <!-- <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) }}
+                        </view>
                 </view>
             </view>
             <view class="ai-explain" v-if="jobInfo.isExplain">
@@ -98,7 +110,7 @@
                     ></map>
                 </view>
             </view>
-            <view class="content-card" v-if="!userInfo.isCompanyUser">
+            <view class="content-card" v-if="currentUserType !== 0">
                 <view class="card-title">
                     <text class="title">竞争力分析</text>
                 </view>
@@ -174,7 +186,7 @@
         <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">投递简历</view>
             </view>
         </template>
         <VideoPlayer ref="videoPalyerRef" />
@@ -191,6 +203,12 @@ import RadarMap from './component/radarMap.vue';
 import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
 const { userInfo } = storeToRefs(useUserStore());
+// 与首页一致的用户类型获取：优先store，兜底缓存
+const currentUserType = computed(() => {
+    const storeIsCompanyUser = userInfo.value?.isCompanyUser;
+    const cachedIsCompanyUser = (uni.getStorageSync('userInfo') || {}).isCompanyUser;
+    return Number(storeIsCompanyUser !== undefined ? storeIsCompanyUser : cachedIsCompanyUser);
+});
 const { $api, navTo, getLenPx, parseQueryParams, navBack, isEmptyObject } = inject('globalFunction');
 import config from '@/config.js';
 const matchingDegree = ref(['一般', '良好', '优秀', '极好']);
@@ -200,7 +218,20 @@ const jobInfo = ref({});
 const state = reactive({});
 const mapCovers = ref([]);
 const jobIdRef = ref();
-const raderData = ref({});
+// 竞争力分析数据，初始化为包含默认值的完整结构，确保雷达图能正常渲染
+const raderData = ref({
+    matchScore: 0,
+    rank: 0,
+    percentile: 0,
+    radarChart: {
+        skill: 0,
+        experience: 0,
+        education: 0,
+        salary: 0,
+        age: 0,
+        location: 0
+    }
+});
 const videoPalyerRef = ref(null);
 const explainUrlRef = ref('');
 
@@ -232,16 +263,24 @@ const applicants = ref([
 ]);
 
 onLoad((option) => {
+	console.log(option, 'option');
     if (option.jobId) {
         initLoad(option);
     }
 });
 
 onShow(() => {
-    const option = parseQueryParams(); // 兼容微信内置浏览器
-    if (option.jobId) {
-        initLoad(option);
+    // 仅在 H5 环境中从 URL 获取参数（小程序环境中 onShow 不会传递 URL 参数）
+    // #ifdef H5
+    try {
+        const option = parseQueryParams(); // 兼容微信内置浏览器
+        if (option.jobId) {
+            initLoad(option);
+        }
+    } catch (e) {
+        console.warn('onShow 中解析 URL 参数失败:', e);
     }
+    // #endif
 });
 
 function initLoad(option) {
@@ -263,11 +302,11 @@ function seeExplain() {
 function getDetail(jobId) {
     return new Promise((reslove, reject) => {
         $api.createRequest(`/app/job/${jobId}`).then((resData) => {
-            const { latitude, longitude, companyName, companyId, isCompanyUser } = resData.data;
+            const { latitude, longitude, companyName, companyId } = resData.data;
             jobInfo.value = resData.data;
             reslove(resData.data);
             getCompanyIsAJobs(companyId);
-            if (isCompanyUser) {
+            if (currentUserType.value !== 0) {
                 getCompetivetuveness(jobId);
             }
             // getCompetivetuveness(jobId);
@@ -309,25 +348,82 @@ function getTextWidth(text, size = 12) {
 
 function getCompetivetuveness(jobId) {
     $api.createRequest(`/app/job/competitiveness/${jobId}`, {}, 'GET').then((resData) => {
-        raderData.value = resData.data;
-        currentStep.value = resData.data.matchScore * 0.04;
+        // 如果接口返回的数据为 null 或空，使用默认值0
+        if (resData && resData.data) {
+            // 确保 radarChart 字段存在，如果不存在则使用默认值
+            const radarChart = resData.data.radarChart || {
+                skill: 0,
+                experience: 0,
+                education: 0,
+                salary: 0,
+                age: 0,
+                location: 0
+            };
+            
+            raderData.value = {
+                matchScore: resData.data.matchScore || 0,
+                rank: resData.data.rank || 0,
+                percentile: resData.data.percentile || 0,
+                radarChart: radarChart
+            };
+            currentStep.value = (resData.data.matchScore || 0) * 0.04;
+        } else {
+            // 接口返回 null 或空数据时，使用默认值0
+            raderData.value = {
+                matchScore: 0,
+                rank: 0,
+                percentile: 0,
+                radarChart: {
+                    skill: 0,
+                    experience: 0,
+                    education: 0,
+                    salary: 0,
+                    age: 0,
+                    location: 0
+                }
+            };
+            currentStep.value = 0;
+        }
+    }).catch((error) => {
+        // 接口请求失败时，使用默认值0
+        console.error('获取竞争力分析失败:', error);
+        raderData.value = {
+            matchScore: 0,
+            rank: 0,
+            percentile: 0,
+            radarChart: {
+                skill: 0,
+                experience: 0,
+                education: 0,
+                salary: 0,
+                age: 0,
+                location: 0
+            }
+        };
+        currentStep.value = 0;
     });
 }
 
 // 申请岗位
 function jobApply() {
     const jobId = jobInfo.value.jobId;
-    if (jobInfo.value.isApply) {
-        const jobUrl = jobInfo.value.jobUrl;
-        return window.open(jobUrl);
-    } else {
-        $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
+    $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
             getDetail(jobId);
             $api.msg('申请成功');
             const jobUrl = jobInfo.value.jobUrl;
-            return window.open(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);
+    //     });
+    // }
 }
 
 // 取消/收藏岗位
@@ -360,6 +456,32 @@ function getClass(index) {
         return '';
     }
 }
+
+// 格式化发布时间
+function formatPublishTime(dateString) {
+    if (!dateString) return '';
+    
+    const date = new Date(dateString);
+    const now = new Date();
+    const diffTime = Math.abs(now - date);
+    const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24));
+    
+    if (diffDays === 0) {
+        return '今天发布';
+    } else if (diffDays === 1) {
+        return '昨天发布';
+    } else if (diffDays < 7) {
+        return `${diffDays}天前发布`;
+    } else if (diffDays < 30) {
+        const weeks = Math.floor(diffDays / 7);
+        return `${weeks}周前发布`;
+    } else {
+        const year = date.getFullYear();
+        const month = date.getMonth() + 1;
+        const day = date.getDate();
+        return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+    }
+}
 </script>
 
 <style lang="stylus" scoped>
@@ -503,11 +625,11 @@ for i in 0..100
 .content{
     padding: 0 28rpx
     height: 100%
+    padding-top: 28rpx
     .content-top{
-        background: #FFFFFF;
         box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
         border-radius: 20rpx 20rpx 20rpx 20rpx;
-        padding: 52rpx 32rpx 34rpx 32rpx
+        padding: 24rpx
         position: relative
         overflow: hidden
         .top-salary{
@@ -541,7 +663,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);
@@ -627,6 +749,20 @@ for i in 0..100
         }
     }
 }
+/* #ifdef H5 */
+.footer{
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    padding: 20rpx 0!important
+    z-index: 1000;
+    .btn-wq{
+        display: block;
+        width: 94%;
+        margin: 0 auto;
+    }
+}
+/* #endif */
 .footer{
     background: #FFFFFF;
     box-shadow: 0rpx -4rpx 24rpx 0rpx rgba(11,44,112,0.12);

packageA/pages/selectDate/selectDate.vue

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

packageB/login.vue

@@ -0,0 +1,264 @@
+<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('hlw')
+
+	const form = reactive({
+		username: 'langchaojituan',
+		password: 'Aa123456?',
+		rememberMe: false,
+		code: '',
+		uuid: ''
+	})
+
+	onLoad((option) => {
+		if(option.flag){
+			flag.value=option.flag
+		}
+	})
+
+	onMounted(() => {
+		getCodeImg()
+	})
+
+	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/pages/userCenter/personDocument1.vue

@@ -1,836 +0,0 @@
-<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 style="display:none;" class="person-info">
-			<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 style="margin-top:50rpx;" class="section">
-			<view class="head">
-				<view class="left-txt">
-					<view class="icon icon-1"></view>
-					意向职业
-				</view>
-				<view class="right-txt">
-					限5种
-				</view>
-			</view>
-			<view class="content" v-if="intentionJobList != null && intentionJobList.length > 0">
-				<view class="list">
-					<view class="item" v-for="(item, index) in intentionJobList" :key="index">
-						<text class="name">{{(index + 1) + '.' +item.Name}}</text>
-						<view class="cancel-btn" v-on:click="cancleIntention(index,2,item.EnCodeId)">取消</view>
-					</view>
-				</view>
-			</view>
-			<view class="content" v-else>
-				<view class="empty">
-					<view class="icon"></view>
-					<text>您还未添加意向职业</text>
-				</view>
-			</view>
-			<view class="footer">
-				<navigator url="/packageB/pages/job/index" class="btn">添加意向职业</navigator>
-			</view>
-		</view>
-		<view class="section">
-			<view class="head">
-				<view class="left-txt">
-					<view class="icon icon-4"></view>
-					职业兴趣测评
-				</view>
-			</view>
-			<view class="content" v-if="interestResult != null && interestResult !=''">
-				<view class="text-wrap">
-					<view class="row">
-						<text class="label">兴趣代码：</text>
-						<view class="value">
-							<text v-for="(item, index) in interestCodeList" :key="index">
-								{{item}} <text v-if="index < interestCodeList.length -1">、</text>
-							</text>
-						</view>
-					</view>
-					<view class="row">
-						<text class="label">对应学类：</text>
-						<view class="value"><text v-for="(item, index) in interestRecommendSpecialty" :key="index">
-								{{item}} <text v-if="index < interestRecommendSpecialty.length -1">、</text>
-							</text></view>
-					</view>
-				</view>
-			</view>
-			<view class="content" v-else>
-				<view class="empty">
-					<view class="icon"></view>
-					<text>您还未测评</text>
-				</view>
-			</view>
-			<view class="footer">
-				<navigator v-if="interestResult != null && interestResult !=''"
-					url="/packageB/pages/testReport/interestTestReport" class="btn">查看报告</navigator>
-				<navigator v-if="user.GradeLevel == 2 && !(interestResult != null && interestResult !='')"
-					url="/packageB/pages/pagesTest/interestTestTitle" class="btn">去测评</navigator>
-				<navigator v-if="user.GradeLevel == 1 && !(interestResult != null && interestResult !='')"
-					url="/packageB/pages/pagesTest/interestTestTitle" class="btn">去测评</navigator>
-			</view>
-		</view>
-		<view class="section">
-			<view class="head">
-				<view class="left-txt">
-					<view class="icon icon-6"></view>
-					工作价值观测评
-				</view>
-			</view>
-			<view class="content" v-if="workValueResult != null && workValueResult !=''">
-				<view class="text-wrap">
-					<view class="row">
-						<text class="label">高分价值观： </text>
-						<view class="long-value" v-if="workValueHight != null && workValueHight.length > 0">
-							<text v-for="(item, index) in workValueHight" :key="index">
-								{{item}} <text v-if="index < workValueHight.length -1">、</text>
-							</text>
-						</view>
-						<view class="long-value" v-else>
-							<text>无</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="content" v-else>
-				<view class="empty">
-					<view class="icon"></view>
-					<text>您还未测评</text>
-				</view>
-			</view>
-			<view class="footer">
-				<navigator class="btn" v-if="workValueResult != null && workValueResult !=''"
-					url="/packageB/pages/testReport/workValuesTestReport">查看报告</navigator>
-				<navigator class="btn" v-else url="/packageB/pages/pagesTest/workValuesTestTitle">去测评</navigator>
-			</view>
-		</view>
-		<view class="section">
-			<view class="head">
-				<view class="left-txt">
-					<view class="icon icon-8"></view>
-					人格测评
-				</view>
-			</view>
-			<view class="content" v-if="personResult != null && personResult !=''">
-				<view class="text-wrap">
-					<view class="row">
-						<text class="label">内外向：</text>
-						<view class="value" v-if="personGroupList1 != null && personGroupList1.length > 0">
-							<text v-for="(item, index) in personGroupList1" :key="index">
-								{{item}} <text v-if="index < personGroupList1.length -1">、</text>
-							</text>
-						</view>
-						<view class="value" v-else>
-							<text>无</text>
-						</view>
-					</view>
-					<view class="row">
-						<text class="label">人际关系：</text>
-						<view class="value" v-if="personGroupList2 != null && personGroupList2.length > 0">
-							<text v-for="(item, index) in personGroupList2" :key="index">
-								{{item}} <text v-if="index < personGroupList2.length -1">、</text>
-							</text>
-						</view>
-						<view class="value" v-else>
-							<text>无</text>
-						</view>
-					</view>
-					<view class="row">
-						<text class="label">严谨性：</text>
-						<view class="value" v-if="personGroupList3 != null && personGroupList3.length > 0">
-							<text v-for="(item, index) in personGroupList3" :key="index">
-								{{item}} <text v-if="index < personGroupList3.length -1">、</text>
-							</text>
-						</view>
-						<view class="value" v-else>
-							<text>无</text>
-						</view>
-					</view>
-					<view class="row">
-						<text class="label">开放性：</text>
-						<view class="value" v-if="personGroupList4 != null && personGroupList4.length > 0">
-							<text v-for="(item, index) in personGroupList4" :key="index">
-								{{item}} <text v-if="index < personGroupList4.length -1">、</text>
-							</text>
-						</view>
-						<view class="value" v-else>
-							<text>无</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="content" v-else>
-				<view class="empty">
-					<view class="icon"></view>
-					<text>您还未测评</text>
-				</view>
-			</view>
-			<view class="footer">
-				<navigator class="btn" v-if="personResult != null && personResult !=''"
-					url="/packageB/pages/testReport/personalTestReport">查看报告</navigator>
-				<navigator class="btn" v-else url="/packageB/pages/pagesTest/personalTestTitle">去测评</navigator>
-			</view>
-		</view>
-		<view class="section" v-if="user.GradeLevel == 2">
-			<view class="head">
-				<view class="left-txt">
-					<view class="icon icon-9"></view>
-					个人选科报告
-				</view>
-			</view>
-			<view class="content">
-				<view class="report-wrap">
-					<view class="block" v-for="(item, index) in groupDataList" :key="index">
-						<view class="row">
-							<view class="item">
-								<text class="label" v-if="index==0">第一志愿：</text>
-								<text class="label" v-if="index==1">第二志愿：</text>
-								<text class="label" v-if="index==2">第三志愿：</text>
-								<text class="value" v-text="item.GroupName != '' ? item.GroupName : '还未选择志愿'"></text>
-							</view>
-						</view>
-						<view class="row" v-show="viewScores">
-							<view class="item">
-								<text class="label">选科组合成绩：</text>
-								<text class="value">{{item.Score}}分</text>
-							</view>
-						</view>
-						<view class="row" v-show="viewScores">
-							<view class="item">
-								<text class="label">选科组合年级排名： </text>
-								<text class="value">{{item.GroupRank}}</text>
-							</view>
-						</view>
-					</view>
-					<view class="row" v-show="viewScores">
-						<view class="item">
-							<text class="label">物理：</text>
-							<text class="value">{{examSoreInfo!=null?examSoreInfo.PhysicsScore + '分':'暂无分数'}}</text>
-						</view>
-						<view class="item">
-							<text class="label">化学：</text>
-							<text class="value">{{examSoreInfo!=null?examSoreInfo.ChemistryScore + '分':'暂无分数'}}</text>
-						</view>
-						<view class="item">
-							<text class="label">生物：</text>
-							<text class="value">{{examSoreInfo!=null?examSoreInfo.BiologyScore + '分':'暂无分数'}}</text>
-						</view>
-					</view>
-					<view class="row" v-show="viewScores">
-						<view class="item">
-							<text class="label">历史：</text>
-							<text class="value">{{examSoreInfo!=null?examSoreInfo.HistoryScore + '分':'暂无分数'}}</text>
-						</view>
-						<view class="item">
-							<text class="label">地理：</text>
-							<text class="value">{{examSoreInfo!=null?examSoreInfo.GeographyScore + '分':'暂无分数'}}</text>
-						</view>
-						<view class="item">
-							<text class="label">政治：</text>
-							<text class="value">{{examSoreInfo!=null?examSoreInfo.PoliticsScore + '分':'暂无分数'}}</text>
-						</view>
-					</view>
-					<view class="row" v-show="scoreMatch">
-						<view class="item">
-							<text class="label">选科组合成绩匹配度： </text>
-							<text class="value" v-if="groupMatching==0">暂无数据</text>
-							<text class="value" v-if="groupMatching==1">低</text>
-							<text class="value" v-if="groupMatching==2">中</text>
-							<text class="value" v-if="groupMatching==3">高</text>
-						</view>
-					</view>
-					<view class="row" v-show="subjectMatch">
-						<view class="item">
-							<text class="label">学科信心匹配度：</text>
-							<text class="value" v-if="subjectMatching==0">暂无数据</text>
-							<text class="value" v-if="subjectMatching==1">低</text>
-							<text class="value" v-if="subjectMatching==2">中</text>
-							<text class="value" v-if="subjectMatching==3">高</text>
-						</view>
-					</view>
-					<view class="row" v-show="specialtyUniversityMatch">
-						<view class="item">
-							<text class="label">意向专业、院校与选科组合匹配度： </text>
-							<text class="value" v-if="specialtyMatching==0">暂无数据</text>
-							<text class="value" v-if="specialtyMatching==1">低</text>
-							<text class="value" v-if="specialtyMatching==2">中</text>
-							<text class="value" v-if="specialtyMatching==3">高</text>
-						</view>
-					</view>
-					<view class="row">
-						<view class="item">
-							<text class="label">意向专业： </text>
-							<text class="value"
-								v-if="intentionSpecialtyList != null && intentionSpecialtyList.length > 0"> <text
-									v-if="intentionSpecialtyList.length > 0"
-									v-for="(item, index) in intentionSpecialtyList" :key="index">
-									{{item.Name}} <text v-if="index < intentionSpecialtyList.length -1">、</text>
-								</text></text>
-							<text class="value" v-else>您还未添加意向信息</text>
-						</view>
-					</view>
-					<view class="row">
-						<view class="item">
-							<text class="label">意向院校：</text>
-							<text class="value"
-								v-if="intentionUniversityList != null && intentionUniversityList.length > 0">
-								<text v-for="(item, index) in intentionUniversityList" :key="index">{{item.Name}} <text
-										v-if="index < intentionUniversityList.length -1">、</text></text>
-							</text>
-							<text class="value" v-else>您还未添加意向信息</text>
-						</view>
-					</view>
-					<view class="row">
-						<view class="item">
-							<text class="label">系统推荐选科组合： </text>
-							<text class="value">{{recommendGroups}}</text>
-						</view>
-					</view>
-					<view class="row">
-						<view class="item">
-							<text class="label">学校建议选科： </text>
-							<text class="value" v-if="suggestGroupName != null">{{suggestGroupName}}
-								（{{suggestReason}}）</text>
-							<text class="value" v-else>学校暂无建议</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import api from "@/apiB/user.js";
-	export default {
-		data() {
-			return {
-				refreshIfNeeded: false, //是否返回刷新
-				barHeight: wx.getWindowInfo().statusBarHeight,
-				user: uni.getStorageSync("userInfo").user,
-				customInfo: uni.getStorageSync("customInfo"),
-				intentionJobList: [], //意向职业
-				intentionSpecialtyList: [], //意向专业
-				intentionUniversityList: [], //意向院校
-
-				interestCodeList: [], //兴趣码
-				interestRecommendSpecialty: [], //兴趣码
-				interestResult: "", //兴趣测评结果
-				customerGroup1: [], //学科效能
-				customerGroup2: [], //学科效能
-				customerResult: "", //学科效能
-				workValueHight: [], //工作价值
-				workValueResult: "", //工作价值
-				multHight: "", //多元智能
-				multResult: "", //多元智能
-				personGroupList1: [], //人格
-				personGroupList2: [], //人格
-				personGroupList3: [], //人格
-				personGroupList4: [], //人格
-				personResult: "", //人格
-				viewScores: false, //是否查看成绩
-				groupDataList: [], //志愿
-				examSoreInfo: {}, //科目成绩
-				subjectMatching: 0, //学科信心匹配度 0无，1低 2中 3高
-				groupMatching: 0, //选科组合匹配度 0无，1低 2中 3高
-				specialtyMatching: 0, //意向专业院校匹配度 0无，1低 2中 3高
-				recommendGroups: "", //推荐组合
-				suggestGroupName: null, //学校建议组合
-				suggestReason: null, //学校建议原因
-				scoreMatch: false,
-				subjectMatch: false,
-				specialtyUniversityMatch: false,
-				myStudyCourseList: [],
-			}
-		},
-		onShow() {
-			// let pages = getCurrentPages(); // 获取当前页面栈
-			// let currentPage = pages[pages.length - 1]; // 当前页面
-			// //修改后刷新
-			// if (currentPage.data.refreshIfNeeded) {
-			// 	currentPage.data.refreshIfNeeded = false;
-			// }
-			this.queryStudentProfile();
-			this.user = uni.getStorageSync("userInfo").user;
-			console.log("user====",this.user);
-			this.customInfo = uni.getStorageSync('customInfo');
-		},
-		created() {
-			// this.queryStudentProfile()
-		},
-		methods: {
-			goback() {
-				uni.navigateBack(-1);
-			},
-			// 获取个人档案
-			queryStudentProfile() {
-				uni.showLoading({
-					title: "加载中"
-				})
-				api.queryStudentProfile().then((res) => {
-					uni.hideLoading();
-					if (res.Result == 1) {
-						let data = res.Data;
-						console.log("datas====",data);
-						// 意向职业
-						this.intentionJobList = data.IntentionJobList;
-						// 意向专业
-						this.intentionSpecialtyList = data.IntentionSpecialtyList;
-						// 意向院校
-						this.intentionUniversityList = data.IntentionUniversityList;
-						// 兴趣测评
-						this.interestCodeList = data.InterestCodeList;
-						this.interestRecommendSpecialty = data.InterestRecommendSpecialty;
-						this.interestResult = data.InterestResult;
-						// 学科信心测评
-						this.customerGroup1 = data.CustomerGroup1;
-						this.customerGroup2 = data.CustomerGroup2;
-						this.customerResult = data.CustomerResult;
-						// 工作价值
-						this.workValueHight = data.WorkValueHight;
-						this.workValueResult = data.WorkValueResult;
-						// 多元智能
-						this.multHight = data.MultHight;
-						this.multResult = data.MultResult;
-
-						// 人格测评
-						this.personGroupList1 = data.PersonGroupList1;
-						this.personGroupList2 = data.PersonGroupList2;
-						this.personGroupList3 = data.PersonGroupList3;
-						this.personGroupList4 = data.PersonGroupList4;
-						this.personResult = data.PersonResult;
-
-						// 个人选科报告
-
-						this.viewScores = data.ViewScores;
-						this.scoreMatch = data.ScoreMatch;
-						this.subjectMatch = data.SubjectMatch;
-						this.specialtyUniversityMatch = data.SpecialtyUniversityMatch;
-						this.groupDataList = data.GroupDataList;
-						this.examSoreInfo = data.ExamSoreInfo;
-						this.subjectMatching = data.SubjectMatching;
-						this.groupMatching = data.GroupMatching;
-						this.specialtyMatching = data.SpecialtyMatching;
-						if (data.RecommendGroups != null && data.RecommendGroups != '') {
-							this.recommendGroups = data.RecommendGroups.split(",").join("、");
-						} else {
-							this.recommendGroups = "无"
-						}
-						if (data.SelectGroup != null) {
-							this.suggestGroupName = data.SelectGroup.SuggestGroupName;
-							this.suggestReason = data.SelectGroup.SuggestReason;
-						}
-					}
-				})
-			},
-			// 取消意向
-			cancleIntention(index, type, id) {
-				uni.showLoading({
-					title: "取消中"
-				})
-				api.doIntention(type, id, 1).then((res) => {
-					uni.hideLoading();
-					if (res.Result == 1) {
-						this.queryStudentProfile()
-						// if(type == 2){
-						// 	this.intentionJobList.splice(index, 1);
-						// }else if(type == 3){
-						// 	this.intentionUniversityList.splice(index, 1);
-						// }else {
-						// 	this.intentionSpecialtyList.splice(index, 1);
-						// }
-						uni.showToast({
-							title: "取消成功",
-							icon: "success"
-						})
-					}
-				})
-			},
-		}
-	}
-</script>
-<style lang="scss">
-	$image-oss-url: "https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh";
-
-	page {
-		background: url('#{$image-oss-url}/17.png') no-repeat;
-		background-size: contain;
-		background-color: #EEF1F8;
-		overflow-y:scroll;
-	}
-</style>
-<style lang="scss" scoped>
-	.head-bar {
-		position: relative;
-		text-align: center;
-		font-size: 36rpx;
-		font-weight: 600;
-		height: 60rpx;
-		line-height: 60rpx;
-
-		.go-back {
-			position: absolute;
-			left: 10rpx;
-			top: 0;
-			width: 60rpx;
-			height: 60rpx;
-			background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAABUklEQVRoQ+3ZOwrCQBCA4UlyCVsrQauQdPYewcNYWXoHK1s9gYeYdIKlracYWYggkgiTnccuaB3D/+1sYEMKyPxXZN4Pf0DMBOu6XpZluQOANRGduq7bc+/nNoE+/gwAq3c0IrJ72H/grtDQ9UPxAPBAxDn3/uaAkfjQvUXES9IA6fiANZuARrwZQCveBKAZrw7QjlcFWMSrAaziVQCW8eIA63hRgEe8GMArXgTgGR8N8I6PAqQQPxmQSvxkQNM0VwDYfJ3dJ53nuef/7+vZx+l+9W8pxE+aQNu2CyK6ZwsI4VlvoQDI/iFOCcF+iD/3fgqTiAKkMIlogDdCBOCJEAN4IUQBHghxgDVCBWCJUANYIVQBFgh1gDbCBKCJMANoIUwBGghzwA/EExFn3HdkF8AYIpvPrO9VDu8TVVUdiKghomNWH7q5W2Xserct9Af0K/AChQ/cMY9OGScAAAAASUVORK5CYII=") center no-repeat;
-			background-size: 38rpx 38rpx;
-		}
-	}
-
-	.document {
-		padding-bottom: 60rpx;
-
-		.person-info {
-			position: relative;
-			display: flex;
-			align-items: center;
-			width: 664rpx;
-			height: 174rpx;
-			padding: 0 20rpx;
-			margin: 65rpx auto 20rpx;
-			border: 3px solid #FFFFFF;
-			background: #EDF5FE;
-			border-radius: 12px;
-
-			.img-wrap {
-				overflow: hidden;
-				width: 112rpx;
-				height: 112rpx;
-				border-radius: 50%;
-				margin-right: 20rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.txt-wrap {
-				.top {
-					display: flex;
-					align-items: flex-end;
-					margin-bottom: 10rpx;
-
-					.name {
-						color: #000000;
-						margin-right: 20rpx;
-						font-size: 36rpx;
-					}
-
-					.grades {
-						color: #666;
-						font-size: 26rpx;
-					}
-				}
-
-				.bottom {
-					color: #666;
-					font-size: 26rpx;
-				}
-			}
-
-		}
-
-		.section {
-			width: 670rpx;
-			padding: 30rpx 20rpx 40rpx;
-			background: #FFFFFF;
-			margin: 0 auto 24rpx;
-			border-radius: 12rpx;
-
-			.head {
-				display: flex;
-				justify-content: space-between;
-
-				.left-txt {
-					display: flex;
-					align-items: center;
-					font-size: 32rpx;
-					color: #000;
-					font-weight: 500;
-
-					.icon-1 {
-						width: 32rpx;
-						height: 32rpx;
-						margin-right: 10rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABqUlEQVR4AexXQU7DMBBcW+09B0AcywvIE8oP+AF9Qg+AuFGugFTxAvoEfhB+0PKC5gxIcK7UmpkKqjSEdB1ZJIdEHtVxdmcn663tWFFc0dBFB5duDjgN9i/cB+xOFdSiEtDpyEBEeqK8jJFIRM6AnU0lAITHayYjk9VKTsrgnAwFF34pAr3yphKwoXCSvt+b5zIg8MvGXtHxE6Ag9DVZCzi8cj0UzgCFc10ETEH8TTzC89JCtFYS2sKnB9tCPsZiYdPO4ibGnCZweMTA6A/8CMBjdWPRFvIxVrcr871z12cGxqCkMX7+r0FEhGyNKaDK24VSGlsqCcVWhYcZqOIXzKcV0GagERlIUdK1wb7emqM6Ybke+wDZEm5eeR9uLkR+fNe9xXqc+IAClkvp532wufAIxvXdi68RRciX8sUMDvmtlmMY9mveGeD8v92ZGQr3JguOYRpU58CsRG8BmP8pTjo8ov8CdtZpllzT9xaAIHxLHmCKoIm5ZeMtYMs7wE0roBEZqPT/DTD9pEiZgSf2asLELhbygOBc1bgloxu2FbHh+/FT8KHL2F8AAAD//4kh6/oAAAAGSURBVAMAtjRliSH3kwIAAAAASUVORK5CYII=") no-repeat;
-						background-size: 100%;
-					}
-
-					.icon-2 {
-						width: 27rpx;
-						height: 32rpx;
-						margin-right: 10rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAgCAYAAADjaQM7AAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAH4SURBVEiJ1dfBa9NgGMfx75sWUxglRdCRophTdxAlTHpz2DGvQ8GT8yjMqwevsp62y8Sz/QP0KszjYIGO7SBjAUFY8VDX0aJisSsTgyavB9vNicmbdkvR3zHv8+bD+7wvb4gAWNq0LdAWpKQEWCQS6Yrymp07o2vbySFH0fSM9nQUEIAmpSyNAgLQQFgjxEaXgTFDNzF0cygsHadIT2UpmncpmnNk0tnD57W2w2p9mY7XioWJxY1JGVVg6Cb3Llcw9HxozWp9mdetF0osso1xIICb1iPGxwonw66cm1VC/dyZeHIy7Or52VgQgKHnlQdH0cZ4q+qncHZ6OExPZcOGQtPxmsNhnt/l24/uQJiqPrKNbz6txIY6XpPd/a3hsWqjEnt11UZFWROJeX6X52/nlXsBcMm4pqxJzdw3y1EFB98/U2s76Kks42MTx8Z297d49a5Mx2tSNOfIZfLU2k7ou5TX1e/5BRbIpLN8ONg5didevzDP1MUHVBvPWN/7e0tjXcT9eH439BCs71XoeC0+ft0JnT8Qporq9P7bH8//Bvtzz14KgZsEFAS8P8R8P5h+POU6SUD99DDpJgktbkw+BG6kgXpSyFHkLRAlTQgcEHZPTzRiadO2pNTWAAukC3w5bURKYQtBTkD/lym1EATythDkThvrke5P22GeWTkOvPwAAAAASUVORK5CYII=") no-repeat;
-						background-size: 100%;
-					}
-
-					.icon-3 {
-						width: 31rpx;
-						height: 32rpx;
-						margin-right: 10rpx;
-						//background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAAgCAYAAADqgqNBAAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAMMSURBVEiJ7ZZPSJNhHMe/z97X+W7TfLNWQxPfylLDYAqSSqEdhLl5MDwUnewQiL4XDwXRwTp0CyyS6Fb3Dl0U6qQpvovAKRFOpHQSOHGo7zT1nfvz66CTbW66iXiI/W7P8/y+v8/7+/PwvAxHsE6nTeLA9TJCB4DhEAs/eFf/2ZNpHF2mAllpaeNIN2TQGe/Vnr/tEXhjBR/hJuTR1qZMY7GMwE57L4g9u3iqYrrafLMiuj++NLI4vz5jYcCrNw2DPccK73TaJJ64TzrGWazmBlHKLxcSff78/b04vjQiRij8Ld02HAqXlZY2AuszcCZLY3GrZso5Jaby3QiuqV8XBjQtuCkgwu703xoYPjI8VZkBYCO0Dn9gBWJuIYx8fpwu3TYkhR9WZveqC+4V1966srAGladr4mKk04Z90x6dZoEzVjSXtAuJYN+WF+4VF4oMpY/6GwZZgd78xL3igm/LGxenJO+ypbmkXTvoNsRlflCZo/ZL/YkZ9Yf28sZHQ3Tv8fe7vrKCqrNlYlUySco2MCC9aY7N3On9EjILxbVPq99Ovpjosnq35ifqLM0oMpWmkiVtA+t02iSOdEPpTHPURhYG4d9eVnOZoGrhzQvnjMV8naX5MFncbQjpwtVc/cPyXgNnkuzSfYuey02ZcayV5l+FwBkEI58nXiq4pqssrDlcBEDP5QpXxOt5c2vTIIR5PhLCfIALiLHTm4n5A8vwB5Yz0mxHAiCQyucEcz6EdNuN7lVXtNxNACYBqASSGDERDJMAAIKVGKkMzANABGAFMLxzlOAbEyfRFwD4gP71vq+SFQfJo7YmAOgas3d0K/a5mLMh2WnvBXaGVFYc1Om0ScDOTZEVx1DUt1uxz3WN2TsAQB61NcmKgxJZGb9qx2lZeBaehWfhWfj/B2e7v1DvCSQBAAOTCOQBgN0nUtxbg0kgqMRITeoLIPYs6pskjidC1MNkxTFRZCq1FujPnFC+gE/zwre14OEJJAq8SSsUzIsnBV8LrmqMmIUnwvNZdapv1j8lnRScQB4Cev4BQmp+U4L3kQsAAAAASUVORK5CYII=") no-repeat;
-						background-size: 100%;
-					}
-
-					.icon-4 {
-						width: 32rpx;
-						height: 31rpx;
-						margin-right: 10rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAfCAYAAACGVs+MAAADWElEQVR4AbRWO2wTQRB9ewln0yBDg5AoHKQ0FCRRGiQKYkGFgxRLoUTYBTWmIHEX3DlpYiihsBElkRwpcSqQI6FIaSISCppI2AUSoiEWTUIS3TKz5zvrfvadZUY3t7OzszNvZm93T8MgVMsnUC9UiJuKtxZXUSskB3EVHQAH12MNCpYl5qBJSJGHLmvgMVJGeaID0OPPADEJD5EuFlvyqPsoogFQGcp8oE8p5qIuRTQAZvaJQABAEjqeIAKFB9Av+27QbJQqhAfQP3sLQqQqhAOgtliPtbdCd9ss6i98PtSugSV5AfDEjYU5bC7kwft7s9CgdW0CIoHwRNtz5Avqi8SFivLFPjkRtZRdRyYADmoeLBKgiZpWg9BWwftbYAYDk+AqZJUv9qmjCT1+hK1CAxsF5VczPxjNOlgGDhVposQMNDQ4toYYKohWXgyNdLmqQYLWC0Ohuas3Ubk1j+TFyyH9iUn6BmQbQ6DJS9dQm36M7PVpMJCwLgmAeBXWOMguMRpXwXm8fXaM9V/fWAzDVQ3pUhWQ+/2suawzV274mi2N37fLXjz8hNbxka+dU0kx06UiVYDUp39TENhGAHGGzdQCGrefYmn8nsOKQeXH7igdZ15u7Si590uug2OSkQkgU27jQSlFfaoGvV1P+/zEzuolZWuBYGCViXllzVnnDj4ouc+rivRyBhyTDE0AJKgnXcpR6wsitfvWA6Iy8cgufe5gDQyU5vd6KLiKYds4AbCaQQh4loMzdIOwvvZycwfbv7+jJ7FP9u0y8gJgA4l33LiZQUx9fo39Pz/tIdYVDz/a/UAhwKc/gEAvUGVO7b5B9ceeWpLM3nul6zHFHDIM3/PGH4CQE+Ys/zevde7rGsYaK45q+Ft3tCPibkdyNP4AJIZ2PMMiQ/DNaPXs1h+A71+vPWcwQciQAMwfhuFXgG9c07cjAW8F9Av/IXgn5mjcUwUvgI5tqEaCzgvZ9x6BRedowUVeAKdnHiPXHO62YCCF2VKKjtUpJfNBwyOBLGkbnhA7DbwA+IyWxnOnmd1jcDmkS2N4WKLsO3qW+S5hUEE3q5RF6/zvzFKNFwCrZ1fKMIwMzKwoqOQym4HV9c1GPsxA0stTNJKjK36duE1/XAw0B/ZJA+7nHwAAAP//fvvjBQAAAAZJREFUAwCMpRtDiL0m1gAAAABJRU5ErkJggg==") no-repeat;
-						background-size: 100%;
-					}
-
-					.icon-6 {
-						width: 32rpx;
-						height: 31rpx;
-						margin-right: 10rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAfCAYAAACGVs+MAAACGklEQVR4AeyW0XHaQBCG/2VSgCuIzx04HZgOQgdxB9Fk8ox5zmTkDuIOkg6gA9yBDypIAR7W351sYEDCaCzkF+9o7w7dsv+/e8stAy/DVy/PH1DvWecJeyD5WFJQ/3IpeQkBsdB7SUgE3gs8434Q6CsD93q0IUV3m/O+NfRAwO8kG9rPOJMGE+3IiQnYjRXLayvi/wp3Na7mzXhCAgk8riP28vMfyb5rR1oQsBvJLir1vbPUtqysIOoMzm135uX5XLJvqpEjCRipjBOcxkqXhTIZca7aFlJtI/sRM0HAuWEdcDVedkcQ8FtAX6IJOD0TwjvILKhsQxUloTbk/T8h2CXwKUtmxobnFQJ+RxERrbi1A8D+lxWNK4wB4LME4MyKRTqaL1bEeyHsEbG/Co6pDhHA8fI6GeEQsOwQx0pr6sFTN7vSswBO+qFXBs4624bnrYNTEwEisdHmm6uSdQJnWj8A+JQCQ8MVJC/RseRUuyCpo6SOAJHYaBNR/vkQVaM/suBTgCk2JzONdrUbdQRIfYzJuorIDoEnszdpHQH+IaUiS5G3j6gtmzoC+EjAp40ckPw0EMh7vQwfBFIGcsX3ku99kBkELN12u01l37T7NwRukwEXDr/7BU1kYVb0qhdWxJSB7kNr45EjaGPevW0jAa7h4L9oMl1oGXYb2TqSWgKApwbzoE80mS5UPvffoban1BKAHh1RSXVqeQIAAP//TF3sLQAAAAZJREFUAwCBRGeYQHx5OgAAAABJRU5ErkJggg==") no-repeat;
-						background-size: 100%;
-					}
-
-					.icon-7 {
-						width: 32rpx;
-						height: 32rpx;
-						margin-right: 10rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAMmSURBVFiFrZfPTxNBFMc/0xaxISGLhgMEY1UuxBgK6RGT9iBX9eTR9catBWrire3ZxtabN8pfIPEIMW30SkxJ5KZxjUm9GNiYSKmA42Ha7rbsrxa+SdPJzNv3/c6bmTdvBANCrqET4ikQB+pAQRSpDeqnAxGYOEOMCBtA0mG4NqwQXwEyQ4wwOQS6rzdJhTMKooxxKQLkGjqCHIJYUIeACZQ55bUoYw4lQK7zCCgNSOwkpCCKlAMLGCjcQSExEDxz2x9dATJLDshfGvF51BCsipfUewS0Z129YLiDwkSQsouItI9WMPKoBgkdpufhqgbHJjT24PMWHBpBPGhISkCq0yFklkNA8yVeSsNy3t1mtwLbhUBCRNFa+ogv+UQM9LcwHff2mtDhdhLepIJGoyvAG/3kjTp8ranQT9yEO0n1A7gWg5UqlBeg6ZsCAghI6L3kH8vwbrXXZqeg7J5sWCKW0qo/AEKeo/fTVnu3cp7cPradt32XUfsmDIwOKyCq9c5+22dGOwUr7FENFuOwiPWbdBMgXS6OKRt50wy2sRq2HDMTsxZ4FJh1FuIegeNgm6iLcWDMx6YtRL6gKp8T9xZgn3FUU8fRDTPAXeC6LWpHhosxECaJVCLcBTRNddw6WM45240CN4C5HIy0U8qJCb9qzvYWNCQl71Owu2m1Ezo8cBAxBsxmYC5v9X3xvIHtiAu5zjfPi2ilaiUagAMD9rdUIopqcO8h3LKNHxnwfkFFwQ2fgJZq+guIakqEXyrukH9Iea9/n4AQwqdsappQWuhNNE74XlEz9yMHOLWaQq6zEbgCmoip5ZieV5EBONiDVsU75Ha0UBHoCrhoQTKOOoJByffphh8gJMoYnJGCIR8XfwLa/QT2esmBWm9RmiUJ5HB+fLhjBpULnPAb+NH+74Uqz5y+Gaosn2yL6Nx+LcAADhxsBVucsCrKGK4PE5lBI0IayOBXNXUQBqb4iwAaXOGs3ykGkoJ4RcXS4oOBhLSfZoBJhBygo1KugaAiipy70wd7nLo9WiQGIR731/wyg8YIsf7+oQR0nWZJIkgjSQJ1/rFpD+mg+A9dEv37gzwmcAAAAABJRU5ErkJggg==") no-repeat;
-						background-size: 100%;
-					}
-
-					.icon-5 {
-						width: 32rpx;
-						height: 32rpx;
-						margin-right: 10rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAKSSURBVFiF7ZdNSBRxGMZ/s7Pp6n44SplEwUBGeSjWPhErBmI7FQ2UFFi0EXTNoIsn7VLQxfZWEhh0KiIvnjqkh8AOsbtgFB1qIy1py7RWzY216fDfcdd1x51dZe3gA8uwzDvP87zvfz6eP/zHUNeSqw8wgBgQLNGMAnQAg2muSDEXx9SDLmPPSY/hrJSMNEEfoNm4VgN6gEmnSzJ2n/AY7XcbTI4lcFqxuLwO9JubCFyvI/wkwatHiWAingoCD4BLOeUKYlKnAK12m5N9bT78uofqWpmf4ylLt5YGTLjrZI5cUWi9XMO757OEnyZa3r/4bZ5WgYtAhyShNB6t5sA5H42HqwrR2jdgwiFLNAXcNAXcO5EIzyVSvbdbRm+562Sl+bSXvWe8KFts0xVvYBEMmmWn3A0oF+43UL+joiQaAAfi5ooh1rHscJB5zPQya0eASGlLsHJogB/EBNYU6wbWDawbsDQwPTHPzI/5VRGZS/wt2kBoLJokdHyU/s5vfHmdLEn4U3iOx9fi9LZ9BvEZXwKrN+EdYCiVNK6ODEwHRwam2eqv5FB7DbuOVSNvkCxFU38M3j6b4eXDX4y/SU4BQ0AofbRtACCKCB43AG0smuwai8ZVz0aZ/Wd9bG+t2pxT//XD8Oxwf+d3fWZi/iOi4xAwtYwGIKKSgYhRaoFajXRelCtEVGvrqTfO32vo7o6prnRNIQ4F6MrSZTLrj93spyK+ojFE6CwkaprvyaOHTia5Zv9i2JvKcjC7jeThH0Sk5gWoZMJJvuIg9kOLRv6mJhFNaYUIdDJ7g1wCqyXSyD9iswG9iAYWoCI6zzdCc9OSvfnIPd9ViqgV/FgvUdEjXimCLO7avKHKHmxVVncTW378A9QT5wUjCfL+AAAAAElFTkSuQmCC") no-repeat;
-						background-size: 100%;
-					}
-
-					.icon-8 {
-						width: 27rpx;
-						height: 32rpx;
-						margin-right: 10rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAgCAYAAADjaQM7AAADJUlEQVR4AeRW4VnbMBB98gRhgzAB9gRUHwOUTFAyAWECYILABEkngAX62UxgZ4J4AzKB1fdkK7ZjSGmpf3GfLtKdzvfuTifHET5KaT5Fml8hLVJyTn5tmPJmiV/5gvuTY+7+DOZBihVgtmTO+AYgBiDHYspugcgsIZuXze17oMfBUkYrB8AVPkYTVO4OMMw8j3FA74MpQhhG23uipPTMLO7odL7nyBAAGYAdapoCJmWGPcC3wZSRjxCBSsDNYeNT8gznZ/e4SNZ7lmxjS5uED6zJGixxH3AIluY8A9PNaE0AgiTBiRwNWWdb4ZK2c585PAnwya/4MwSDuaU+jMw/HKQwK6A0p6Og0BxdE2TpS6dM69JqY0rdlRZ9MDkBmBkacvc0nLDFeeDFPkL4gIx0K+5taTMFqnvAWdikgKiqfnIqyRzmVjZ9MJgf3Amj5IMZBYHroC/5gGaqoEaYAlDEJe3EO84ZAtmkZAM9NqJs4wMwXOKQbFJ3n2+QpGAmK5p07WIGIWdUH4wIBfYUnbdgOuD6oobt9kx0BjapG6RyLzR4JofBLM0yCATuVqApo3ZdL7PWufYEXAdQS+FXLW/jGUU6cjewMTs1nlFuhvnOhUoPqDspNOMoGG3MkpEeBkG9hoCSB616bOM5LPUKNDLXnb1dW8aOtrPk2ZgtXvz7TuVpz0Zn2THsLfXC1hsEaO35dmnBKsR4mybsqjvAsPXNlg3yStb8hHSz9IH4YIoV0oK64pW2aqIuEEhNZrqg/ZS59+6YcEeOmLVb+EDqV5uuAXXQPgYUmazOLOLtB+QAo1FVPUa+ASpGOBqKd5yxaVjGOquJV4324/gqAyLWfDEahnfsbphVpqXOrNBiJF4TaH8XCeZmgDtFZEbI0PnyhUQiIu/IJapqE5RjzcxsLNdDv18BzCZqz3KY/P/THJTR6W9813GvddGRP7Xsg+l/SNcALuF1OIGNTzjffAqh83AfTBs22UFfSJol/xsXgHmgn96xDMHwV6Qy86zpuHKsgLOsxAlsnMCeUe77+giYopNTRovwpSWnp3Qqx/xWpOOLRJlkOFKR3wAAAP//prmx5wAAAAZJREFUAwAwoC6lMoqQ5AAAAABJRU5ErkJggg==") no-repeat;
-						background-size: 100%;
-					}
-
-					.icon-9 {
-						width: 26rpx;
-						height: 32rpx;
-						margin-right: 10rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAgCAYAAAAMq2gFAAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAHESURBVEiJ3ZcxctpAFIa/X5MZ4845gcUNnBNk0nhUkgqTCt8gnAB0AuwbyI0hVXCnSRNuYN8gOoKrgBu9FEjMSsgWxIhk/Fc7b7Xvf//u27dPAgi+2RCjD/jsFwkiirsKlZGM9kxQhBh5mZJmYfQ99r9dVfC9A5AAcDCid2WDwUzGIO4pce3BxHwTY0HHtacpn3980cy1nd9ax/P47to2FFWRAMQ9JTIGu+lw/AZTs4LDC+mlBeXvt8XbS4Z/l3XBxPyqZMjn8nFVtuXYKutMjF2HLomJcW3oz2Aj65rC20uG/4hIjDDaBg9NEiVxV2FW566bIzLCfBj3FAFJcZpHg8fXEiWZc85vrQOgtKAqkfHhaUEbiOqICpXB4ErGHcByuToTp0OaLZ6Ijo4ZCk4wQqeCXAYTuylJ+Og2PYULu1zwfn6p9VYEE/MRPwEf41Pc0zwnji/UzgOJuwopIVv7q1JR65j7YGp5lBicCU5WITEE5svfXLda3DhqR8HU+mye35n7sO1WgjJVecQm7teB1GC3C7tStR5vSwJ/UVSVMkg9TgVfd1m38R7VwTzGLzYVz8CjdIgNIfFQ/WV7NUQkOMxvyx8J8rz3lpEgKQAAAABJRU5ErkJggg==") no-repeat;
-						background-size: 100%;
-					}
-
-					.icon-10 {
-						width: 27rpx;
-						height: 32rpx;
-						margin-right: 10rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAfCAYAAAAWRbZDAAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAL6SURBVEiJvZY/TBNxFMc/r9dKQ69QjG0RNDmQBBbiDUJqXBCcaRyMiWEyYXBSF4yJDAQTBwdxYlIXQsJmd8HEBHVgKGHRmEATA+Gf4QTqn5T25wAt0N5xUMDv+N6993nv/d798hPKlFEbMrScZioRQ0QuK+gQRUiJGppdXB2wixHXpKFQCJ/P0DRMUVxWgonCRAg5xWT/ZGpSlmUV272u1YKR96vd0iyUeitISgnT2SzJ1MpKsrE2PCdg4CcElMKMcNjUNF6gMIEQnt12RWEpSIqQVEpNe4Tk80cXrI6Y3/J6vYZSOQPAA6bevpJ0m5IUqrFRle6xNE28mke8Z3ziL/YHdQ893TXEb1SlAlcmG/K5FKQKHyksEZJZMgNeJxDA+mbO8VwAWIaF5QwKSe0178u5PSZTw2cUzmxyrIlgQCt8k3j3k/6hReJdVQw+PF+wD4+uMjz6g8EHtcRvVO8Uv63ZxZUGu5ouRcNrgFmA7QUdVQId6alrc8V2lVM39faPSSVYAobXLrhMpFECE9l3DJ6Tg7nrULCRxBrXbn9jeHT1WDDXMU583iQxvg7A8OgP6iK+smGunW2kczQ3VvDq2UWux3QWljOnB+vuqub1s4u0tVby8kk9PfGasmGOY+y8qgO7/1Jefb0RmhsqaGutPDlYMKCVgPJysrvpv66+bWcb6SwLSxnW07l99vqIj7qoj410li+zf20TtjRWFG6jra2tlCvs/tN5pmZ+2yabHGvi7uPvfHWAdcZ0hp7U2/psYT3xs7S1/imxBwMawYDGvTvn+Dpb6ge4csDi2MI6YzqdMd0xyM1/JNhIYo2pmV+sp7OHStLS6KevN1IebGrmFxOfNw8FAlhY2iof5nTAx5Xj6k98OnxnxWprraQuWnph28L6XyweaYzFclp/W1hfb4TrZWxbAXbVPtYWVhf1EY+Wd/8dpNO9G/1+C0DU9lNdLtWG3wMdwYDnWC8sO80vZ1Kw845UWNJ7yzDHP6TfiGCeKGmvFJZCDfwDa27tlQaAF3UAAAAASUVORK5CYII=") no-repeat;
-						background-size: 100%;
-					}
-				}
-
-				.right-txt {
-					font-size: 28rpx;
-					color: #999;
-				}
-			}
-
-			.content {
-				.report-wrap {
-					padding: 40rpx 0 0;
-
-					.row {
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						margin-bottom: 35rpx;
-
-						&:last-child {
-							margin-bottom: 0;
-						}
-
-						.item {
-							.label {
-								color: #999999;
-								font-size: 28rpx;
-							}
-
-							.value {
-								color: #333;
-								font-size: 28rpx;
-							}
-						}
-					}
-				}
-
-				.course-list {
-					display: flex;
-					flex-wrap: wrap;
-					justify-content: space-between;
-					padding: 40rpx 0 15rpx;
-
-					.item {
-						width: 320rpx;
-						background: #F8F9FB;
-						border-radius: 12rpx;
-						overflow: hidden;
-						margin-bottom: 20rpx;
-
-						.img-wrap {
-							display: flex;
-							justify-content: center;
-							overflow: hidden;
-							width: 320rpx;
-							height: 184rpx;
-
-							image {
-								height: 100%;
-							}
-						}
-
-						.title {
-							padding: 10rpx 20rpx 0;
-							height: 76rpx;
-							color: #333333;
-							font-size: 28rpx;
-							overflow: hidden;
-							display: -webkit-box;
-							-webkit-line-clamp: 2;
-							/*! autoprefixer: ignore next */
-							-webkit-box-orient: vertical;
-						}
-
-						.count {
-							margin-top: 10rpx;
-							font-size: 24rpx;
-							color: #999999;
-							padding: 0 20rpx 20rpx;
-						}
-					}
-				}
-
-				.text-wrap {
-					padding: 40rpx 0 15rpx;
-
-					.row {
-						display: flex;
-						margin-bottom: 25rpx;
-
-						.label {
-							font-size: 28rpx;
-							color: #999;
-						}
-
-						.value {
-							width: 500rpx;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							white-space: nowrap;
-							font-size: 28rpx;
-							color: #333;
-
-							&.w450 {
-								width: 450rpx;
-							}
-						}
-
-						.long-value {
-							width: 450rpx;
-							font-size: 28rpx;
-							color: #333;
-							overflow: hidden;
-							display: -webkit-box;
-							-webkit-line-clamp: 2;
-							/*! autoprefixer: ignore next */
-							-webkit-box-orient: vertical;
-						}
-					}
-				}
-
-				.list {
-					padding: 40rpx 0 15rpx;
-
-					.item {
-						display: flex;
-						align-items: center;
-						margin-bottom: 25rpx;
-
-						.name {
-							color: #1677ff;
-							font-size: 28rpx;
-							margin-right: 20rpx;
-						}
-
-						.cancel-btn {
-							width: 92rpx;
-							height: 48rpx;
-							line-height: 48rpx;
-							text-align: center;
-							background: #FCF6EC;
-							border-radius: 8rpx 8rpx 8rpx 8rpx;
-							border: 2rpx solid #FAECD8;
-							font-size: 26rpx;
-							color: #E6A23C;
-						}
-					}
-				}
-
-				.empty {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-					padding: 40rpx 0 25rpx;
-
-					.icon {
-						width: 128rpx;
-						height: 128rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAATlBMVEUAAABLac1KaMtNbM5Lac1IaMxGZMVPY89JZstNW9ZKaMxJZs1LaMtLaM1Jac1KaM1KaMtKatBKZ8xKaMxKaMpHZMhLaNFKac5LaM1MZ84Bwi/qAAAAGnRSTlMAM4AZmR8IEHAFeFBAJzhgSBNoWGAMLIqVOe7t0vgAAAVXSURBVHja7ZmJrqMgFIYFyiKLUpf2zvu/6Hix5UhprVAaMxO/m5umafQ/nFWwOjg4ODg4ODg4+M8h1b6wvtoXinm1Ky221Z4YjHd1AZUYY7GbBURhh9S7lALqMKD2MIGZ9i5Pq51o8ITYYfWBBfv2wu6rfYBR1OiJBhH2KhWxi/8XksDoQeAFsm3IUxc4S2XhXkCVwE+QUbq7tTMksGjKqXNQj2kb9iRUFvflXKAFXkVq9iQQrFh/A/mubyiZV8hNs3CLoLHXSnnfqwyIRz82Lb7RRwsuu3yhXqyIWnmLQ1N9AX0P8opDmb6ZoIs/TLIOOxR/E6Y5EB93wJY/1Reo8tScUnO5XIwxZKwrjxFzRbLPpoh9pg/lXBODAszZ28BvxrIPOt3vCmgF9KFbR4OeQL0JdjY3v9z0w2OEDRKrjuQjE/SnmYiCEKDgdgStQAILPqjGZS/h0unD8tcw9dKCoVe6MTxn1i8rwiX1Tf+C3nBhPm2A1lL2QUVASjO0AQZ9OxrWGTAXADqvH6HtFpB4WNPsDmzB/xu41HBliGJ5DpDzdWYt+S6RBcwFgQfDuuNZDtBv628Mf6ZQvioc1l2OAwR7lwDG6YUGTfwu3D+Q0janOyHoJybFAANXo9CbInEq+gwY0RrkMUJn74LhIZ4mOQLWOyCBWUbh4IiCQwxSIkA3t4AoCyjEwCFSH1WUjwBFidBZMRzLMtUDwk+BC0rFTwSoPHDIRpivAYaSGf0gYVFKb4X4rCUoGeLXTJdjrU/OwZwUgDpYPJcQGGtJOQhFmMbFp52F+by5BuARX+TkIGThcB8HXKQ+KjdyMT1QBrU3wOsnnFQwhWeGTw1wtzASpySAM7iMAcrdQmOc1gKIwAUN6Oa7SbJdf3aYavNzAJLQkXJq7QPWuB2RzKkCKEPvyoRjIi5vDptDxzL7gIF7pY0gJrzDjM9cgpKhk7wG929HwRXEN9IRJcO5Fn75CdBlwsr79KhRKtrLJ761aZfb2sH3YpooL66wIUrSJ8El1iVBcgysPJ3AAJ2+EaGBOSqtE+j+ejqdflwmCbjbVlT46C7c14Q66OVpwjlAIN65RpLE4NIu3JujrTtTK35OMz/uQI1mHNj14VaCwzg4o3WUuJ48rfEJTaok7EPdDBBFsxZ3eQKu4g9UdFulQR8aF3Lf144n/qjueloge4RqqGhaJdI9HLkPMMh5vPLZ7wDu//iNocnYjsP4aBFbZIHgUSVY1cmbOKjrxVkdgxpMA8F7KMrus6GHM0I9SXfYpXsQd/UnPCvsoYckQgX2iE7djmmRnpTB4wG4s8hDFgUsWeZ7KfyS6xPxaemRPpEfHZVyK/ErfsDtsrXRQelSX5V8OQhcf6ZG27WwcIDUy4fqj1+WMdpY1QlwhhgGpRtDyZvDcgK7kEJQEb6Lqs9RWzSkhgECDzWl4MKfdIIN3ogLBfWKWdAvbEH8VrIex5HVkbOgdRWEd9jR8ncVXF4fXAvn7usNRJXXhx0TDIoQjgb8zRencGThaBvCgoIdcMKJeD60xYDolbJa9UOHAYGqrwImAAXl0aA3mGDlC3VIz0zI1lMMajv8QKdMAfcmTFBGtVKDEKIbhr7Z/lZuPUNbOEf7EsxWu8J7cHEm9S/sKe6n9fW3GEubrMjYyPl5gmzkPMH5yFhsTyP5ZuFJFjTzmWxZTsxmkzQ/k+KcuTODvRUvpE3df2QFq9flOQFo/j8ox/B6RZ+UhEbruFG/NuAce4/mfcKXmA0h+FgdiBbD601JmOWElThAEu5bhimwsBHRtNXHjQj4fismQSsuCwyj8ffPf8AwOjg4OPjX+AveIUqXZPVRsgAAAABJRU5ErkJggg==") no-repeat;
-						background-size: 100%;
-						margin-bottom: 30rpx;
-					}
-
-					text {
-						font-size: 24rpx;
-						color: #A4B3E5;
-					}
-				}
-			}
-
-			.footer {
-				display: flex;
-				justify-content: center;
-				padding-top: 10rpx;
-
-				.btn {
-					width: 400rpx;
-					height: 80rpx;
-					text-align: center;
-					line-height: 80rpx;
-					background: #1677ff;
-					font-size: 28rpx;
-					color: #fff;
-					border-radius: 60rpx;
-				}
-			}
-		}
-	}
-</style>

packageB/priority/helpFilter.vue

@@ -0,0 +1,512 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" @onScrollBottom="getDataList('add')">
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>筛选条件</text>
+					<view class="title-line"></view>
+				</view>
+				<view class="title-right button-sp-area">
+					<button class="mini-btn search-box-btn" type="primary" size="mini" @click="handleSearch">查询</button>
+					<button class="mini-btn reset-box-btn" type="default" size="mini" @click="handleReset">重置</button>
+				</view>
+			</view>
+			
+            <view class="search-container">
+                <!-- 人员姓名 -->
+                <view class="search-item">
+                  <text class="label">人员姓名：</text>
+				  <uni-easyinput v-model="formData.name" placeholder="请输入人员姓名"></uni-easyinput>
+                </view>
+            
+                <!-- 身份证号 -->
+                <view class="search-item">
+                  <text class="label">身份证号：</text>
+				  <uni-easyinput v-model="formData.idCard" placeholder="请输入身份证号"></uni-easyinput>
+                </view>
+            
+                <!-- 帮扶类型（下拉选择） -->
+                <view class="search-item">
+                  <text class="label">帮扶类型：</text>
+				  <uni-data-select v-model="formData.taskType" :localdata="taskTypeOptions" placeholder="请选择帮扶类型" @change="onTaskTypeChange"></uni-data-select>
+                </view>
+            
+                <!-- 帮扶人员 -->
+                <view class="search-item">
+                  <text class="label">帮扶人员：</text>
+				  <uni-easyinput v-model="formData.createByName" placeholder="请输入帮扶人员姓名"></uni-easyinput>
+                </view>
+            
+                <!-- 所属区域（下拉选择） -->
+                <view class="search-item">
+                  <text class="label">所属区域：</text>
+				  <uni-data-picker ref="picker" class="picker" placeholder="请选择所属区域" popup-title="请选择所属区域" :localdata="regions" v-model="formData.helpArea"
+					  @change="onchange" >
+				  </uni-data-picker>
+                </view>
+            
+                <!-- 开始时间 -->
+                <view class="search-item" v-if="false">
+                  <text class="label">开始时间：</text>
+				  <uni-datetime-picker type="date" placeholder="请选择开始时间"  v-model="formData.startTime" @maskClick="onStartTimeChange" />
+                </view>
+            
+                <!-- 结束时间 -->
+                <view class="search-item" v-if="false">
+                  <text class="label">结束时间：</text>
+				  <uni-datetime-picker type="date" placeholder="请选择结束时间"  v-model="formData.endTime" @maskClick="onEndTimeChange" />
+                </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 class="title-total">
+					共<text class="total-num">{{totalNum}}</text>条记录
+				</view>
+			</view>
+			<view class="list-box" v-if="dataList.length>0">
+				<view class="con-box" v-for="(item,index) in dataList" :key="index">
+					<view class="form-title">
+						<view class="form-name">
+							{{item.name}}
+						</view>
+						<view class="form-type">
+							{{getTaskTypeLabelByValue(item.task_type)}}
+						</view>
+					</view>
+					<view class="form-item" v-if="item.phone">
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/tele.png'" mode=""></image>
+							<view class="item-label">
+								联系电话：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.phone}}
+						</view>
+					</view>
+					<view class="form-item" v-if="item.id_card">
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+							<view class="item-label">
+								身份证号：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.id_card}}
+						</view>
+					</view>
+					<view class="form-item" v-if="item.dept_name">
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+							<view class="item-label">
+								所属区域：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.dept_name}}
+						</view>
+					</view>
+					<view class="form-item" v-if="item.create_by_name">
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+							<view class="item-label">
+								帮扶人员：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.create_by_name}}
+						</view>
+					</view>
+					<view class="form-item" v-if="item.create_by_dept_name">
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+							<view class="item-label">
+								帮扶单位：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.create_by_dept_name}}
+						</view>
+					</view>
+					<view class="form-item" v-if="item.follow_date">
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+							<view class="item-label">
+								帮扶日期：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.follow_date}}
+						</view>
+					</view>
+					<view class="form-item" v-if="item.next_contact_date">
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+							<view class="item-label">
+								下次联系：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.next_contact_date}}
+						</view>
+					</view>
+					<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>
+					</view>
+				</view>
+			</view>
+		    <empty v-else pdTop="200"></empty>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive,onMounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+// state
+const title = ref('');
+const initialForm = {
+  name: '',
+  idCard: '',
+  taskType: '',
+  createByName: '',
+  helpArea: [],
+  startTime: '',
+  endTime: '',
+  deptId:''
+}
+const formData = reactive({ ...initialForm });
+const taskTypeOptions=ref([])
+const dataList=ref([])
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const trainVideoImgUrl=config.trainVideoImgUrl
+const picker = ref(null)
+
+
+// 所属区域选项（可根据实际替换为动态数据）
+const regions = ref([])
+
+// 事件处理
+const onTaskTypeChange = (e) => {
+	formData.taskType=e
+}
+const onStartTimeChange = (e) => {
+  formData.startTime = e.detail.value
+}
+
+const onEndTimeChange = (e) => {
+  formData.endTime = e.detail.value
+}
+
+const handleSearch = () => {
+  // 在这里调用接口进行搜索
+  getDataList('refresh')
+}
+const handleReset = () =>{
+	 Object.assign(formData, initialForm);
+	 getDataList('refresh')
+}
+onMounted(async () => {
+  await loadLevelData('201');
+});
+onLoad(() => {
+	getDictionary()
+	// getDeptOptions()
+    getDataList('refresh');
+});
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				taskTypeOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getTaskTypeLabelByValue(value) {
+	if (!Array.isArray(taskTypeOptions.value)) {
+	    return ''
+	  }
+	  const item = taskTypeOptions.value.find(item => item.value === String(value))
+	  return item ? item.text : '暂无帮扶类型'
+}
+ // 加载某一级的数据（parentId 为空表示根）
+async function loadLevelData(parentId) {
+    let header = {
+		'Authorization': uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	};
+	let params = { parentId };
+
+	try {
+		const resData = await $api.myRequest('/dispatch/dept/list', params, 'get', 9100, header);
+		if(resData.data.length==0){
+			picker.value.hide()
+			return
+		}
+		const formatted = (resData.data || []).map(item => ({
+			text: item.deptName, 
+			value: item.deptId,
+			children: [] 
+		}));
+		if (parentId === '201') {
+			// 第一层
+			regions.value = formatted;
+		} else {
+			// 找到父节点并注入 children
+			injectChildren(parentId, formatted);
+		}
+	} catch (error) {
+		console.error("加载部门数据失败:", error);
+		uni.showToast({ title: '加载失败', icon: 'none' });
+	}
+}
+// 将子级数据注入到对应的父节点
+function injectChildren(parentValue, childrenData) {
+    const findAndInject = (nodes) => {
+		for (let node of nodes) {
+			if (node.value === parentValue) {
+				// 如果 children 已存在且非空，避免重复加载
+				if (!node.children || node.children.length === 0) {
+					node.children = childrenData;
+				}
+				return true;
+			}
+			if (node.children && node.children.length > 0) {
+				if (findAndInject(node.children)) return true;
+			}
+		}
+		return false;
+	}
+
+	findAndInject(regions.value);
+  // 强制更新
+}
+// 当用户选择时触发（注意：change 在每级选择后都会触发）
+function onchange(e) {
+	const selectedValues = e.detail.value;
+	formData.deptId=selectedValues.map(item => item.value).join(',');
+	if (selectedValues.length === 0) return;
+	// 获取最后一级选中的 value
+	const lastSelectedValue = selectedValues[selectedValues.length - 1];
+	// 查找该节点是否有 children，如果没有则尝试加载
+	const node = findNodeByValue(regions.value, lastSelectedValue);
+	if (node && (!node.children || node.children.length === 0)) {
+		// 检查接口是否还有下一级（可通过接口返回判断，或先尝试加载）
+		// 这里我们直接尝试加载下一级
+		loadLevelData(lastSelectedValue.value);
+		picker.value.show()
+	}
+}
+// 工具函数：根据 value 查找节点
+function findNodeByValue(nodes, value) {
+	for (let node of nodes) {
+		if (node.value === value.value) {
+			return node;
+		}
+		if (node.children && node.children.length > 0) {
+			const found = findNodeByValue(node.children, value);
+			if (found) return found;
+		}
+	}
+	return null;
+}
+function getDeptOptions(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		parentId:''
+	}
+	$api.myRequest('/dispatch/dept/list', params,'get',9100,header).then((resData) => {
+	});
+}
+function getDataList(type = 'add') {
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params=({...formData})
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+    if (type === 'refresh') {
+        pageNum.value = 1;
+		params.pageSize=pageSize.value
+		params.pageNum=pageNum.value
+		$api.myRequest('/dispatch/assist/records/pageRecords', params,'get',9100,header).then((resData) => {
+			if(resData&&resData.code == 200){
+				dataList.value=resData.rows
+				totalNum.value=resData.total
+			}
+		});
+    }
+    if (type === 'add' && pageNum.value < maxPage) {
+        pageNum.value += 1;
+		params.pageSize=pageSize.value
+		params.pageNum=pageNum.value
+		$api.myRequest('/dispatch/assist/records/pageRecords', params,'get',9100,header).then((resData) => {
+			dataList.value=dataList.value.concat(resData.rows)
+		});
+		
+	}
+}
+function goFollow(item) {
+    navTo(`/packageB/priority/helpFollow?id=${item.goal_person_id}&&name=${item.name}&&taskType=${getTaskTypeLabelByValue(item.task_type)}`);
+}
+</script>
+
+<style lang="stylus" scoped>
+
+image
+  height: 100%
+  width: 100%
+
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 30rpx 28rpx 30rpx
+  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
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.list-box
+  margin-top: 40rpx
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 32rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 130rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  overflow: hidden
+  text-overflow: ellipsis
+  white-space: nowrap
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+</style>

packageB/priority/helpFollow.vue

@@ -0,0 +1,397 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="info-box">
+			<view class="info-item info-line">
+				<image class="info-img" :src="baseUrl+'/dispatch/person-icon.png'" mode=""></image>
+				<view class="info-label">
+					人员姓名
+				</view>
+				<view class="info-value">
+					{{personInfo.name}}
+				</view>
+			</view>
+			<view class="info-item">
+				<image class="info-img" :src="baseUrl+'/dispatch/help-icon.png'" mode=""></image>
+				<view class="info-label">
+					帮扶类型
+				</view>
+				<view class="info-value">
+					{{personInfo.taskType}}
+				</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"></view>
+				</view>
+			</view>
+			
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+                  <!-- 跟进日期 -->
+                  <uni-forms-item label="跟进日期：" name="followDate" required >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.followDate" @change="onFollowDateChange" />
+                  </uni-forms-item>
+            
+                  <!-- 跟进方式 -->
+                  <uni-forms-item label="跟进方式：" name="followWay" required >
+					  <uni-data-select v-model="formData.followWay" placeholder="请选择跟进方式" :localdata="followWays" @change="onMethodChange"></uni-data-select>
+                  </uni-forms-item>
+            
+                  <!-- 跟进内容 -->
+                  <uni-forms-item label="跟进内容：" name="content" required>
+					  <uni-easyinput type="textarea" v-model="formData.content" placeholder="请输入跟进内容"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 跟进结果 -->
+                  <uni-forms-item label="跟进结果：" name="result" required>
+					  <uni-easyinput type="textarea" v-model="formData.result" placeholder="请输入跟进结果"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 下一步计划 -->
+                  <uni-forms-item label="下一步计划：" name="nextPlan">
+					  <uni-easyinput type="textarea" v-model="formData.nextPlan" placeholder="请输入下一步计划（可选）"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 下次联系时间 -->
+                  <uni-forms-item label="下次联系：" name="nextContactDate" >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.nextContactDate" @change="onDateChange" />
+                  </uni-forms-item>
+                </uni-forms>
+            
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">保存跟进</button>
+                  <button class="btn reset-btn"  @click="handleReset">重置</button>
+                </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"></view>
+				</view>
+				<view class="title-total">
+					共<text class="total-num">{{followListNum}}</text>条记录
+				</view>
+			</view>
+			<view class="list-box" v-if="followListNum>0">
+				<uni-steps :options="followList" active-color="#007AFF" :active="active" direction="column" />
+			</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"
+
+const title = ref('');
+const formData = reactive({
+  goalPersonId:'',
+  followDate: '',
+  followWay: '',
+  content: '',
+  result: '',
+  nextPlan: '',
+  nextContactDate: ''
+})
+const personInfo=ref({
+	goalPersonId:'',
+	name:'',
+	taskType:''
+})
+const followWays = ref([])
+const followList = ref([])
+const followListNum=ref(0)
+const active=ref(null)
+// 表单引用
+const formRef = ref(null)
+
+// 校验规则
+const rules = {
+	followDate: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进日期'
+		}]
+	},
+	followWay: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进方式'
+		}]
+	},
+	content: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进内容'
+		}]
+	},
+	result: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进结果'
+		}]
+	}
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+
+const onFollowDateChange = (e)=>{
+	formData.followDate=e
+}
+const onMethodChange = (e) => {
+	formData.followWay=e
+}
+// 事件处理
+const onDateChange = ( e) => {
+  formData.nextContactDate=e
+}
+function getFollowList(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		goalPersonId:personInfo.value.goalPersonId
+	}
+	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
+		console.log("resData",resData)
+		if(resData && resData.code == 200){
+			if(resData.data && resData.data.length>0){
+				followListNum.value=resData.data.length
+				resData.data.forEach(item=>{
+					const obj={
+						title:item.followDate,
+						desc:`跟进方式：${getFollowWaysLabelByValue(item.followWay)}\n跟进人：${item.createByName}\n跟进内容：${item.content}`
+					}
+					followList.value.push(obj)
+				})
+			}
+			
+		}
+	});
+}
+
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_follow_way').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				followWays.value.push(obj)
+			})
+		}
+	});
+}
+function getFollowWaysLabelByValue(value) {
+	if (!Array.isArray(followWays.value)) {
+	    return ''
+	  }
+	  const item = followWays.value.find(item => item.value === String(value))
+	  return item ? item.text : '暂无跟进方式'
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('Padmin-Token')
+		}
+		formData.goalPersonId=personInfo.value.goalPersonId
+		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
+			console.log("resData",resData)
+			if(resData && resData.code == 200){
+				handleReset()
+				uni.showToast({
+				  title: '保存成功',
+				  icon: 'success',
+				  duration: 2000 
+				});
+			}else{
+				uni.showToast({
+				  title: resData.msg,
+				  icon: 'none',
+				  duration: 2000
+				});
+			}
+			
+		});
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleReset = () => {
+	  formData.followDate = '';
+	  formData.followWay = '';
+	  formData.content = '';
+	  formData.result = '';
+	  formData.nextPlan = '';
+	  formData.nextContactDate = '';
+}
+onLoad((options) => {
+	personInfo.value.goalPersonId=options.id
+	personInfo.value.name=options.name
+	personInfo.value.taskType=options.taskType
+	getDictionary()
+	getFollowList()
+});
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.info-box
+  margin: 30rpx 30rpx
+  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
+  border-radius: 20rpx
+  padding: 40rpx 0
+  display: flex
+  align-items: center
+.info-img
+  width: 40rpx
+  height: 40rpx
+  margin-bottom: 20rpx
+.info-line
+  border-right: 2rpx solid #B7D6FF
+.info-item
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  width: 50%
+.info-label
+  font-size: 26rpx
+  color: #6E7E9B
+  margin-bottom: 20rpx
+.info-value
+  font-weight: bold
+  font-size: 28rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  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: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+.list-box
+  margin-top: 40rpx
+
+.form-container 
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+:deep(.uni-steps__column-circle )
+  width: 24rpx !important
+  height: 24rpx !important
+  background: radial-gradient(circle, 
+    #00C0FA 0%, 
+    #015EEA 50%, 
+    #FFFFFF 51%,  
+    #FFFFFF 100%) !important
+  border-radius: 50%
+  border: 2rpx solid #015EEA
+:deep(.uni-steps__column-title)
+  font-size: 28rpx !important
+  color: #006CFF !important
+  margin-bottom: 24rpx
+:deep(.uni-steps__column-desc)
+  font-size: 28rpx
+  color: #898989 !important
+  line-height: 1.5
+:deep(.uni-steps__column-text )
+  padding: 16rpx 0 !important
+  border: none
+:deep(.uni-steps__column-line)
+  background-color: #368BFF !important
+:deep(.uni-steps__column-line--before)
+  background-color:rgba(0,0,0,0) !important
+:deep(.uni-date-x)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-stat-box)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>